GNOME.org
 

[gnumeric] docs update and fix for implict ')' for array functions

commit 0399b9f80aa243f5e39c52a8d4ae871394b6cae4
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Wed Jul 25 09:10:25 2012 -0600

    docs update and fix for implict ')' for array functions
    
    2012-07-25  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* src/wbc-gtk-edit.c (wbcg_edit_finish): reset the expr_txt pointer
    	when changing the txt pointer. Fixes #680548
    
    2012-07-25  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* figures/menu-format-column.png: updated
    	* figures/menu-format-labelled.png: updated
    	* gui-menus.xml: updated

 ChangeLog                              |    5 +
 NEWS                                   |    1 +
 doc/C/ChangeLog                        |    6 ++
 doc/C/figures/menu-format-column.png   |  Bin 6541 -> 8985 bytes
 doc/C/figures/menu-format-labelled.png |  Bin 4548 -> 22038 bytes
 doc/C/gui-menus.xml                    |  144 +++++++++++++++++++++++---------
 src/wbc-gtk-edit.c                     |    5 +-
 7 files changed, 118 insertions(+), 43 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index b27ee26..41238cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-25  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* src/wbc-gtk-edit.c (wbcg_edit_finish): reset the expr_txt pointer
+	when changing the txt pointer. Fixes #680548
+
 2012-07-24  Morten Welinder  <terra gnome org>
 
 	* src/dependent.c (link_unlink_expr_dep): Fix problem from
diff --git a/NEWS b/NEWS
index 5c688a6..19ba5f0 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@ Gnumeric 1.11.6
 
 Andreas:
 	* Some documentation updates.
+	* Fix implicit ')' for array functions. [#680548]
 
 Morten:
 	* Fix xls read crash.  [#679992]
diff --git a/doc/C/ChangeLog b/doc/C/ChangeLog
index 4aa441f..c42608f 100644
--- a/doc/C/ChangeLog
+++ b/doc/C/ChangeLog
@@ -1,3 +1,9 @@
+2012-07-25  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* figures/menu-format-column.png: updated
+	* figures/menu-format-labelled.png: updated
+	* gui-menus.xml: updated
+
 2012-07-18  Andreas J. Guelzow <aguelzow pyrshep ca>
 
 	* figures/menu-view-properties-dialog-cm.png: new
diff --git a/doc/C/figures/menu-format-column.png b/doc/C/figures/menu-format-column.png
index 7c880d7..909d194 100644
Binary files a/doc/C/figures/menu-format-column.png and b/doc/C/figures/menu-format-column.png differ
diff --git a/doc/C/figures/menu-format-labelled.png b/doc/C/figures/menu-format-labelled.png
index 58e5f05..f443eee 100644
Binary files a/doc/C/figures/menu-format-labelled.png and b/doc/C/figures/menu-format-labelled.png differ
diff --git a/doc/C/gui-menus.xml b/doc/C/gui-menus.xml
index 326c769..5efec4d 100644
--- a/doc/C/gui-menus.xml
+++ b/doc/C/gui-menus.xml
@@ -1535,14 +1535,15 @@
     </para>
 
     <figure id="menu-format-labelled.png">
-      <title>The <guimenu>Format</guimenu> Menu.</title>
+      <title>The <guimenu>Format</guimenu> Menu and Its <guimenu>Cells</guimenu>
+      Submenu.</title>
       <screenshot>
         <mediaobject>
             <imageobject>
               <imagedata fileref="figures/menu-format-labelled.png" />
             </imageobject>
             <textobject>
-              <phrase>An image of the Format menu.</phrase>
+              <phrase>An image of the Format menu and its Cells submenu.</phrase>
             </textobject>
         </mediaobject>
       </screenshot>
@@ -1552,18 +1553,74 @@
     <variablelist> 
       <varlistentry>
        <term><guimenu>The Format Menu</guimenu> offers these menuitems:</term>
+
+
        <listitem>
        <para>
          <itemizedlist>
           <listitem>
            <para>
-            <guimenuitem>Cells...</guimenuitem> &mdash; The
-	    <guimenuitem>Cells...</guimenuitem> menu item opens the
-	    cell format dialog. This dialog is used to set cell data
-	    types and formats. It is explained in <xref
-	    linkend="sect-data-format" />.
+            <guimenuitem>Cells</guimenuitem> &mdash; The
+	    <guimenuitem>Cells...</guimenuitem> menu item opens a sub-menu
+	    with choices to allows the user to modify the formatting of the
+	    selected cells.
+	   </para>
+
+	  <para>
+	    <itemizedlist>
+	      <listitem>
+		<para>
+		  <guimenuitem>Format...</guimenuitem> &mdash; The
+		  <guimenuitem>Format...</guimenuitem> menu item opens the
+		  cell format dialog. This dialog is used to set cell data
+		  types and formats. It is explained in <xref
+		  linkend="sect-data-format" />.
+		</para>
+	      </listitem>
+	      <listitem>
+		<para>
+		  <guimenuitem>Conditional Formating...</guimenuitem> &mdash; The
+		  <guimenuitem>Conditional Formating...</guimenuitem> menu item 
+		  opens the
+		  conditional format dialog. This dialog is used to set cell data
+		  types and formats that depend on values in the wworkbook.
+		  It is explained in <xref
+		  linkend="sect-data-format-conditional" />.
+		</para>
+	      </listitem>
+	      <listitem>
+		<para>
+		  <guimenuitem>Merge</guimenuitem> &mdash;
+		  This menu item combines the current selection into a single
+		  large cell.
+		</para>
+	      </listitem>
+	      <listitem>
+		<para>
+		  <guimenuitem>Unmerge</guimenuitem> &mdash;
+		  This menu item divides a merged selection into the original
+		  cells.
+		</para>
+	      </listitem>
+	      <listitem>
+		<para>
+		  <guimenuitem>Auto Fit Height</guimenuitem> &mdash;
+		  This menu item makes &gnum;
+		  automatically choose the optimal row heights to display
+		  all of the text in the current selection.
+		</para>
+	      </listitem>
+	      <listitem>
+		<para>
+		  <guimenuitem>Auto Fit Width</guimenuitem> &mdash;
+		  This menu item makes &gnum;
+		  automatically choose the optimal columnn widths to display
+		  all of the text in the current selection.
+		</para>
+	      </listitem>
+	    </itemizedlist>
 	  </para>
-        </listitem>
+	  </listitem>
 
         <listitem>
          <para>
@@ -1601,7 +1658,7 @@
 	 </listitem>
 	 <listitem>
 	   <para>
-	     <guimenuitem>Auto Fit Selection</guimenuitem> &mdash;
+	     <guimenuitem>Auto Fit Width</guimenuitem> &mdash;
 	     This menu item makes &gnum;
 	     automatically choose the optimal column size to display
 	     all of the text in the current selection.
@@ -1637,56 +1694,61 @@
 	     zoom this is 48 points or 64 pixels.
 	   </para>
 	 </listitem>
-       </itemizedlist>
-     </para>
-   </listitem>
-
-
-        <listitem>
-         <para>
-           <guimenuitem>Row</guimenuitem> &mdash; The <guimenuitem>Row</guimenuitem>
-					 menu item provides the same functions as the <guimenuitem>Column</guimenuitem>
-					 menu item but operates on rows.
-					 <itemizedlist>
+	 </itemizedlist>
+	</para>
+	</listitem>
+	
+	
+	<listitem>
+	  <para>
+	    <guimenuitem>Row</guimenuitem> &mdash; The 
+	    <guimenuitem>Row</guimenuitem>
+	    menu item provides the same functions as the 
+	    <guimenuitem>Column</guimenuitem>
+	    menu item but operates on rows.
+	    <itemizedlist>
               <listitem>
                 <para>
-                <guimenuitem>Height...</guimenuitem> &mdash; This menu item opens a
-								dialog which allows the user to type in a row height in pixels.
-								</para>
+		  <guimenuitem>Height...</guimenuitem> &mdash; This menu item 
+		  opens a
+		  dialog which allows the user to type in a row height in pixels.
+		</para>
 	      </listitem>
               <listitem>
                 <para>
-                <guimenuitem>Auto Fit Selection</guimenuitem> &mdash; This menu item
-								changes the rows which hold the selection to the optimal height
-								to hold the text in the selection. 
-								</para>
+		  <guimenuitem>Auto Fit Height</guimenuitem> &mdash; This menu
+		  item
+		  changes the rows which hold the selection to the optimal height
+		  to hold the text in the selection. 
+		</para>
 	      </listitem>
               <listitem>
                 <para>
-                <guimenuitem>Hide</guimenuitem> &mdash; The 
-								  <guimenuitem>Hide</guimenuitem> menu item will hide the rows
-									in the selection. The workbook still contains the data in the
-									hidden rows but those rows are not shown. 
-									</para>
+		  <guimenuitem>Hide</guimenuitem> &mdash; The 
+		  <guimenuitem>Hide</guimenuitem> menu item will hide the rows
+		  in the selection. The workbook still contains the data in the
+		  hidden rows but those rows are not shown. 
+		</para>
 	      </listitem>
               <listitem>
                 <para>
-                <guimenuitem>Unhide</guimenuitem> &mdash; This menu item will make
-								hidden rows visible. The selection must span the rows which are
-								hidden for this menu item to unhide the hidden rows.
+		  <guimenuitem>Unhide</guimenuitem> &mdash; This menu item will 
+		  make
+		  hidden rows visible. The selection must span the rows which are
+		  hidden for this menu item to unhide the hidden rows.
 	        </para>
 	      </listitem>
               <listitem>
                 <para>
-                <guimenuitem>Standard Height</guimenuitem> &mdash; This menu item 
-                resizes the rows back to the default height of 12.75 points or
-								17 pixels (at 100 percent zoom).
+		  <guimenuitem>Standard Height</guimenuitem> &mdash; This menu item 
+		  resizes the rows back to the default height of 12.75 points or
+		  17 pixels (at 100 percent zoom).
 	        </para>
 	      </listitem>
-           </itemizedlist>
-         </para>
+	    </itemizedlist>
+	  </para>
         </listitem>
-
+	
 
         <listitem>
          <para>
diff --git a/src/wbc-gtk-edit.c b/src/wbc-gtk-edit.c
index 4f1527b..db03913 100644
--- a/src/wbc-gtk-edit.c
+++ b/src/wbc-gtk-edit.c
@@ -254,9 +254,10 @@ wbcg_edit_finish (WBCGtk *wbcg, WBCEditResult result,
 								 NULL, &tmp_err);
 				parse_error_free (&tmp_err);
 
-				if (texpr_test != NULL)
+				if (texpr_test != NULL) {
 					txt = free_txt = tmp;
-				else
+					expr_txt = gnm_expr_char_start_p (txt);
+				} else
 					g_free (tmp);
 			}
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]