[ooo-build-commit] .: patches/dev300 patches/vba

[Kohei Yoshida]

 patches/dev300/calc-formula-variable-separators-sc.diff |    8 ++++----
 patches/dev300/sc-datapilot-autoformat.diff             |   10 ++++++----
 patches/dev300/sc-sheet-gridline-toggle.diff            |    4 ++--
 patches/vba/cws-vbasupportdev300.diff                   |   15 +++++++--------
 4 files changed, 19 insertions(+), 18 deletions(-)

New commits:
commit bf85d62e92946791c28da4fd630cbbed4adc37e5
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Mon Feb 8 23:50:55 2010 -0500

    Re-organized ooo-build specific resource IDs in sc/inc/sc.hrc.
    
    * patches/dev300/calc-formula-variable-separators-sc.diff:
    * patches/dev300/sc-datapilot-autoformat.diff:
    * patches/dev300/sc-sheet-gridline-toggle.diff:
    * patches/vba/cws-vbasupportdev300.diff:

diff --git a/patches/dev300/calc-formula-variable-separators-sc.diff b/patches/dev300/calc-formula-variable-separators-sc.diff
index 3a0e051..4a4e442 100644
--- a/patches/dev300/calc-formula-variable-separators-sc.diff
+++ b/patches/dev300/calc-formula-variable-separators-sc.diff
@@ -133,12 +133,12 @@ index 7301766..2eba0d8 100644
 --- sc/inc/sc.hrc
 +++ sc/inc/sc.hrc
 @@ -1660,5 +1660,9 @@
- // Autoformat for DataPilot
- #define SID_PIVOT_AFMT              (SC_OOO_BUILD_START + 4)
+ // Toggle sheet grid
+ #define FID_TAB_TOGGLE_GRID         (SC_OOO_BUILD_START + 2)
  
 +// Formula options page
-+#define RID_SCPAGE_FORMULA          (SC_OOO_BUILD_START + 5)
-+#define HID_SCPAGE_FORMULA          (SC_OOO_BUILD_START + 6)
++#define RID_SCPAGE_FORMULA          (SC_OOO_BUILD_START + 3)
++#define HID_SCPAGE_FORMULA          (SC_OOO_BUILD_START + 4)
 +
  #endif
  
diff --git a/patches/dev300/sc-datapilot-autoformat.diff b/patches/dev300/sc-datapilot-autoformat.diff
index 2610b2e..6b8e83c 100644
--- a/patches/dev300/sc-datapilot-autoformat.diff
+++ b/patches/dev300/sc-datapilot-autoformat.diff
@@ -2,13 +2,15 @@ diff --git sc/inc/sc.hrc sc/inc/sc.hrc
 index d67b625..33d0240 100644
 --- sc/inc/sc.hrc
 +++ sc/inc/sc.hrc
-@@ -1664,6 +1664,9 @@
- #define SID_DATA_FORM               (SC_OOO_BUILD_START + 2) // menu (in Data menu)
- #define RID_SCDLG_DATAFORM          (SC_OOO_BUILD_START + 3) // dialog
+@@ -1664,8 +1664,11 @@
+ // ----------------------------------------------------------------------------
+ // ooo-build specific resources
+ 
+ #define SC_OOO_BUILD_START          (SC_DIALOGS_END)
  
 -#endif
 +// Autoformat for DataPilot
-+#define SID_PIVOT_AFMT              (SC_OOO_BUILD_START + 4)
++#define SID_PIVOT_AFMT              (SC_OOO_BUILD_START + 1)
 +
 +#endif 
  
diff --git a/patches/dev300/sc-sheet-gridline-toggle.diff b/patches/dev300/sc-sheet-gridline-toggle.diff
index c690a8d..ced4a10 100644
--- a/patches/dev300/sc-sheet-gridline-toggle.diff
+++ b/patches/dev300/sc-sheet-gridline-toggle.diff
@@ -44,10 +44,10 @@ index d7e1983..f7d4695 100644
 +++ sc/inc/sc.hrc
 @@ -1672,6 +1672,9 @@
  // Autoformat for DataPilot
- #define SID_PIVOT_AFMT              (SC_OOO_BUILD_START + 4)
+ #define SID_PIVOT_AFMT              (SC_OOO_BUILD_START + 1)
  
 +// Toggle sheet grid
-+#define FID_TAB_TOGGLE_GRID         (SC_OOO_BUILD_START + 5)
++#define FID_TAB_TOGGLE_GRID         (SC_OOO_BUILD_START + 2)
 +
  #endif 
  
diff --git a/patches/vba/cws-vbasupportdev300.diff b/patches/vba/cws-vbasupportdev300.diff
index addbbb7..26263a1 100644
--- a/patches/vba/cws-vbasupportdev300.diff
+++ b/patches/vba/cws-vbasupportdev300.diff
@@ -12905,16 +12905,15 @@ index 950e374..a706de2 100644
  
  // "Zoom / Synchronize sheets" in options dialog
  #define SID_SC_OPT_SYNCZOOM             (SC_VIEW_START + 98)
-@@ -1672,6 +1670,13 @@
- // Toggle sheet grid
- #define FID_TAB_TOGGLE_GRID         (SC_OOO_BUILD_START + 5)
+@@ -1672,7 +1670,12 @@
+ // Formula options page
+ #define RID_SCPAGE_FORMULA          (SC_OOO_BUILD_START + 3)
+ #define HID_SCPAGE_FORMULA          (SC_OOO_BUILD_START + 4)
  
-+#define SC_OOO_BUILD_START          (SC_DIALOGS_END)
-+
 +// Data Form
-+#define SID_DATAFORM_NEW            (SC_OOO_BUILD_START + 1) // message
-+#define SID_DATA_FORM               (SC_OOO_BUILD_START + 2) // menu (in Data menu)
-+#define RID_SCDLG_DATAFORM          (SC_OOO_BUILD_START + 3) // dialog
++#define SID_DATAFORM_NEW            (SC_OOO_BUILD_START + 5) // message
++#define SID_DATA_FORM               (SC_OOO_BUILD_START + 6) // menu (in Data menu)
++#define RID_SCDLG_DATAFORM          (SC_OOO_BUILD_START + 7) // dialog
 +
  #endif