[Libreoffice-commits] core.git: sc/inc

[Caolán McNamara]

 sc/inc/sc.hrc |   32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

New commits:
commit 54c0b9977a6421ecb7383fa48636075c6ca9967e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Feb 15 10:55:10 2017 +0000

    these ooo-build resources were like this to minimize merge conflicts
    
    just roll them into the normal mix now
    
    Change-Id: I65d37ce3067e6d23a7ca42b76a5e15526aefa001

diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 4d1e380..cd375f8 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1234,35 +1234,31 @@
 
 #define WID_CONDFRMT_REF                (SC_DIALOGS_START + 163)
 
-#define SC_DIALOGS_END                  (WID_CONDFRMT_REF + 1)
-
-#define MID_1   1
-#define MID_2   2
-#define MID_3   3
-#define MID_4   4
-
-// ooo-build specific resources
-
-#define SC_OOO_BUILD_START          (SC_DIALOGS_END)
-
 // toggle sheet grid
-#define FID_TAB_TOGGLE_GRID         (SC_OOO_BUILD_START + 1)
+#define FID_TAB_TOGGLE_GRID             (SC_DIALOGS_START + 164)
 
 // formula options page
-#define RID_SCPAGE_FORMULA          (SC_OOO_BUILD_START + 2)
+#define RID_SCPAGE_FORMULA              (SC_DIALOGS_START + 165)
 
 // insert current date and time to cell via command
-#define SID_INSERT_CURRENT_DATE     (SC_OOO_BUILD_START + 4)
-#define SID_INSERT_CURRENT_TIME     (SC_OOO_BUILD_START + 5)
+#define SID_INSERT_CURRENT_DATE         (SC_DIALOGS_START + 166)
+#define SID_INSERT_CURRENT_TIME         (SC_DIALOGS_START + 167)
 
 // data Form
-#define SID_DATA_FORM               (SC_OOO_BUILD_START + 7) // menu (in Data menu)
+#define SID_DATA_FORM                   (SC_DIALOGS_START + 168) // menu (in Data menu)
 
 // compatibility options page
-#define RID_SCPAGE_COMPATIBILITY    (SC_OOO_BUILD_START + 9)
+#define RID_SCPAGE_COMPATIBILITY        (SC_DIALOGS_START + 169)
 
 // init option page
-#define RID_SCPAGE_DEFAULTS         (SC_OOO_BUILD_START + 10)
+#define RID_SCPAGE_DEFAULTS             (SC_DIALOGS_START + 170)
+
+#define SC_DIALOGS_END                  (RID_SCPAGE_DEFAULTS + 1)
+
+#define MID_1   1
+#define MID_2   2
+#define MID_3   3
+#define MID_4   4
 
 #endif