ooo-build r11668 - trunk/patches/test

[kyoshida svn gnome org]

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

Log:
fixed silly patch conflicts.

Modified:
   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:42:48 2008
@@ -43,6 +43,7 @@
  #define FID_TAB_APPEND			(TAB_POPUP_START+5)
  #define FID_TAB_INDEX			(TAB_POPUP_START+6)
  #define FID_TAB_RTL				(TAB_POPUP_START+7)
+ #define FID_TAB_USE_R1C1		(TAB_POPUP_START+8)
 +#define FID_TAB_TOGGLE_GRID     (TAB_POPUP_START+9)
  
  #define TAB_POPUP_END			(DATA_MENU_END + 20)
@@ -104,12 +105,6 @@
  
  #define SC_CURSORPOSITIONX					"CursorPositionX"
  #define SC_CURSORPOSITIONY					"CursorPositionY"
-@@ -112,4 +113,5 @@
- #define SC_VIEWID							"ViewId"
- #define SC_VIEW								"View"
- 
-+
- #endif
 diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/sdi/docsh.sdi sc/sdi/docsh.sdi
 --- sc.clean/sdi/docsh.sdi	2008-02-05 11:16:54.000000000 -0500
 +++ sc/sdi/docsh.sdi	2008-02-20 18:33:41.000000000 -0500
@@ -117,6 +112,7 @@
  	FID_DELETE_TABLE	[ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ]
  	FID_TAB_RENAME		[ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ]
  	FID_TAB_RTL			[ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ]
+ 	FID_TAB_USE_R1C1	[ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ]
 +    FID_TAB_TOGGLE_GRID [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ]
  
  	SID_TABLE_ACTIVATE	[ ExecMethod = Execute; ]
@@ -376,17 +372,17 @@
  {
  	rSettings.realloc(SC_TABLE_VIEWSETTINGS_COUNT);
  	beans::PropertyValue* pSettings = rSettings.getArray();
-@@ -181,6 +182,10 @@ void ScViewDataTable::WriteUserDataSeque
+@@ -180,6 +180,10 @@ void ScViewDataTable::WriteUserDataSeque
+         pSettings[SC_TABLE_ZOOM_VALUE].Value <<= nZoomValue;
          pSettings[SC_TABLE_PAGE_VIEW_ZOOM_VALUE].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_PAGEVIEWZOOMVALUE));
          pSettings[SC_TABLE_PAGE_VIEW_ZOOM_VALUE].Value <<= nPageZoomValue;
- 
++
 +        const ScTableViewOptions* pTabViewOpt = rViewData.GetDocument()->GetTableViewOptions(nTab);
 +        pSettings[SC_TABLE_SHOWGRID].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SHOWGRID));
 +        pSettings[SC_TABLE_SHOWGRID].Value <<= static_cast<sal_Bool>(pTabViewOpt->mbDisplayGrid);
-+
- //        pSettings[SC_TABLE_SELECTED].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_TABLESELECTED));
- //        pSettings[SC_TABLE_SELECTED].Value <<= bool(rViewData.GetMarkData().GetTableSelect( nTab ));
  	}
+ }
+
 @@ -287,6 +292,12 @@ void ScViewDataTable::ReadUserDataSequen
              aPageZoomX = aPageZoomY = aZoom;
              rHasZoom = true;