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

Lionel Elie Mamane lionel at mamane.lu
Sun Jul 28 10:59:43 PDT 2013


 sc/inc/globstr.hrc                |    3 +++
 sc/source/ui/inc/miscdlgs.hrc     |    3 ---
 sc/source/ui/miscdlgs/filldlg.cxx |    1 +
 sc/source/ui/src/globstr.src      |    5 +++++
 sc/source/ui/src/miscdlgs.src     |    5 -----
 5 files changed, 9 insertions(+), 8 deletions(-)

New commits:
commit 0ec4caed104e409f623f078aafdbc218ea3da347
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Sun Jul 28 19:55:33 2013 +0200

    move global string to globstr file
    
    Solves warning: global resources should have number >= 256
    
    Change-Id: Ic1066b6c190c151550e2fc4c4b932ff397d453a5

diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 2f8e562..9c064fb 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -725,6 +725,9 @@
 #define STR_CORRELATION_UNDO_NAME               589
 #define STR_COVARIANCE_UNDO_NAME                590
 
+// Row fillers
+#define STR_VALERR              591
+
 
 #endif
 
diff --git a/sc/source/ui/inc/miscdlgs.hrc b/sc/source/ui/inc/miscdlgs.hrc
index ff0b8ad..67e5d5e 100644
--- a/sc/source/ui/inc/miscdlgs.hrc
+++ b/sc/source/ui/inc/miscdlgs.hrc
@@ -75,9 +75,6 @@
 #define FL_ENTRYLIST    10
 #define LB_ENTRYLIST    11
 
-// Row fillers
-#define STR_VALERR      50
-
 // Auto format
 #define LB_FORMAT           1
 #define FL_FORMAT           9
diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx
index 1e275fe..cfca8e8 100644
--- a/sc/source/ui/miscdlgs/filldlg.cxx
+++ b/sc/source/ui/miscdlgs/filldlg.cxx
@@ -30,6 +30,7 @@
 
 #include "scresid.hxx"
 #include "document.hxx"
+#include "globstr.hrc"
 #include "miscdlgs.hrc"
 
 #define _FILLDLG_CXX
diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index bd9579c..acab6b0 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -2089,6 +2089,11 @@ Resource RID_GLOBSTR
     {
         Text [ en-US ] = "click to open hyperlink:";
     };
+    String STR_VALERR
+    {
+        Text [ en-US ] = "Invalid value" ;
+    };
+
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/src/miscdlgs.src b/sc/source/ui/src/miscdlgs.src
index fc1bdc0..ad18772 100644
--- a/sc/source/ui/src/miscdlgs.src
+++ b/sc/source/ui/src/miscdlgs.src
@@ -585,11 +585,6 @@ ModalDialog RID_SCDLG_SHOW_TAB
 };
 
 
-String STR_VALERR
-{
-        Text [ en-US ] = "Invalid value" ;
-};
-
 #define TXT_COLS \
     Text [ en-US ] = "~Columns" ; \
 


More information about the Libreoffice-commits mailing list