ooo-build r11667 - in trunk: . patches/test

[kyoshida svn gnome org]

Author: kyoshida
Date: Thu Feb 21 19:00:47 2008
New Revision: 11667
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11667&view=rev

Log:
2008-02-21  Kohei Yoshida  <kyoshida novell com>

	* patches/test/sc-sheet-gridline-toggle.diff: slightly updated to honor
	global "view gridlines" option over the per-sheet option.  Patch still
	needs work to be applicable to ooo-build.


Modified:
   trunk/ChangeLog
   trunk/patches/test/sc-sheet-gridline-toggle.diff

Modified: trunk/patches/test/sc-sheet-gridline-toggle.diff
==============================================================================
--- trunk/patches/test/sc-sheet-gridline-toggle.diff	(original)
+++ trunk/patches/test/sc-sheet-gridline-toggle.diff	Thu Feb 21 19:00:47 2008
@@ -1,7 +1,7 @@
 diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=officecfg.vpj officecfg.clean/registry/data/org/openoffice/Office/UI/CalcCommands.xcu officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
 --- officecfg.clean/registry/data/org/openoffice/Office/UI/CalcCommands.xcu	2008-02-20 15:04:18.000000000 -0500
-+++ officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu	2008-02-20 17:55:05.000000000 -0500
-@@ -1439,6 +1439,11 @@
++++ officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu	2008-02-21 11:25:19.000000000 -0500
+@@ -1439,6 +1439,14 @@
                      <value xml:lang="en-US">E-mail as ~OpenDocument Spreadsheet...</value>
                  </prop>
              </node>
@@ -9,6 +9,9 @@
 +                <prop oor:name="Label" oor:type="xs:string">
 +                    <value xml:lang="en-US">Toggle Grid Lines for Current Sheet</value>
 +                </prop>
++                <prop oor:name="Properties" oor:type="xs:int">
++                    <value>1</value>
++                </prop>
 +            </node>
          </node>
  		<node oor:name="Popups">
@@ -276,7 +279,7 @@
  // ============================================================================
 diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/ui/view/gridwin4.cxx sc/source/ui/view/gridwin4.cxx
 --- sc.clean/source/ui/view/gridwin4.cxx	2008-02-05 11:16:56.000000000 -0500
-+++ sc/source/ui/view/gridwin4.cxx	2008-02-20 23:48:16.000000000 -0500
++++ sc/source/ui/view/gridwin4.cxx	2008-02-21 10:13:46.000000000 -0500
 @@ -79,6 +79,7 @@
  #include "inputopt.hxx"
  #include "fillinfo.hxx"
@@ -285,16 +288,17 @@
  
  #ifndef _SV_VIRDEV_HXX
  #include <vcl/virdev.hxx>
-@@ -564,7 +565,12 @@ void ScGridWindow::Draw( SCCOL nX1, SCRO
+@@ -564,7 +565,13 @@ void ScGridWindow::Draw( SCCOL nX1, SCRO
  	aOutputData.SetEditObject( GetEditObject() );
  	aOutputData.SetViewShell( pViewData->GetViewShell() );
  
 -	BOOL bGrid = rOpts.GetOption( VOPT_GRID );
 +    BOOL bGrid = rOpts.GetOption( VOPT_GRID );
-+    const ScTableViewOptions* pTabOptions = pDoc->GetTableViewOptions(nTab);
-+    if (pTabOptions)
-+        // sheet view options take precedence over global view options.
++    if (bGrid)
++    {
++        const ScTableViewOptions* pTabOptions = pDoc->GetTableViewOptions(nTab);
 +        bGrid = pTabOptions->mbDisplayGrid;
++    }
 +
  	BOOL bPage = rOpts.GetOption( VOPT_PAGEBREAKS );
  
@@ -398,7 +402,7 @@
              bool bSelected = false;
 diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/uiconfig/scalc/toolbar/formatobjectbar.xml sc/uiconfig/scalc/toolbar/formatobjectbar.xml
 --- sc.clean/uiconfig/scalc/toolbar/formatobjectbar.xml	2008-02-05 11:16:54.000000000 -0500
-+++ sc/uiconfig/scalc/toolbar/formatobjectbar.xml	2008-02-21 01:47:44.000000000 -0500
++++ sc/uiconfig/scalc/toolbar/formatobjectbar.xml	2008-02-21 11:32:04.000000000 -0500
 @@ -50,4 +50,6 @@
   <toolbar:toolbaritem xlink:href=".uno:InsertColumns" toolbar:helpid="helpid:26268"  toolbar:visible="false" />
   <toolbar:toolbaritem xlink:href=".uno:DeleteRows" toolbar:helpid="helpid:26236"  toolbar:visible="false" />