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

[Kohei Yoshida]

 patches/dev300/calc-insert-current-time-sc.diff |    8 ++++----
 patches/vba/cws-vbasupportdev300.diff           |   10 ++++------
 2 files changed, 8 insertions(+), 10 deletions(-)

New commits:
commit c5f3aadc745f11a9319f696a619a439e3d014c8e
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Mon Aug 16 15:44:13 2010 -0400

    Sorted out the problem with overlapping resource ID values.
    
    * patches/dev300/calc-insert-current-time-sc.diff:
    * patches/vba/cws-vbasupportdev300.diff:

diff --git a/patches/dev300/calc-insert-current-time-sc.diff b/patches/dev300/calc-insert-current-time-sc.diff
index e0726b3..ee5b380 100644
--- a/patches/dev300/calc-insert-current-time-sc.diff
+++ b/patches/dev300/calc-insert-current-time-sc.diff
@@ -29,11 +29,11 @@ index 5547bb4..9341e0d 100644
 --- sc/inc/sc.hrc
 +++ sc/inc/sc.hrc
 @@ -1676,6 +1676,9 @@
- #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_DATA_FORM               (SC_OOO_BUILD_START + 6) // menu (in Data menu)
+ #define RID_SCDLG_DATAFORM          (SC_OOO_BUILD_START + 7) // dialog
  
-+#define SID_INSERT_CURRENT_DATE     (SC_OOO_BUILD_START + 5)
-+#define SID_INSERT_CURRENT_TIME     (SC_OOO_BUILD_START + 6)
++#define SID_INSERT_CURRENT_DATE     (SC_OOO_BUILD_START + 8)
++#define SID_INSERT_CURRENT_TIME     (SC_OOO_BUILD_START + 9)
 +
  #endif
  
diff --git a/patches/vba/cws-vbasupportdev300.diff b/patches/vba/cws-vbasupportdev300.diff
index cd9248b..e840c06 100644
--- a/patches/vba/cws-vbasupportdev300.diff
+++ b/patches/vba/cws-vbasupportdev300.diff
@@ -13372,16 +13372,14 @@ index 87f02b5..2c5b37e 100644
  
  // "Zoom / Synchronize sheets" in options dialog
  #define SID_SC_OPT_SYNCZOOM             (SC_VIEW_START + 98)
-@@ -1672,6 +1670,13 @@
+@@ -1672,6 +1670,11 @@
  #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