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

[Tor Lillqvist]

 patches/dev300/calc-formula-variable-sep-config-check-sc.diff |   24 +++++-----
 1 file changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 080915d1573a0476afc022cfb4da75a369c008c2
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Oct 5 14:28:46 2010 +0300

    Make calc-formula-variable-sep-config-check-sc.diff apply again

diff --git a/patches/dev300/calc-formula-variable-sep-config-check-sc.diff b/patches/dev300/calc-formula-variable-sep-config-check-sc.diff
index 6cda23f..c23d036 100644
--- a/patches/dev300/calc-formula-variable-sep-config-check-sc.diff
+++ b/patches/dev300/calc-formula-variable-sep-config-check-sc.diff
@@ -26,18 +26,17 @@ diff --git sc/inc/globstr.hrc sc/inc/globstr.hrc
 index 7503ce2..629cbb4 100644
 --- sc/inc/globstr.hrc
 +++ sc/inc/globstr.hrc
-@@ -592,8 +592,10 @@
- #define STR_FORM_DROPDOWN           451
- #define STR_FORM_SPINNER            452
- #define STR_FORM_SCROLLBAR          453
+@@ -592,7 +592,9 @@
+ #define STR_FORM_DROPDOWN           453
+ #define STR_FORM_SPINNER            454
+ #define STR_FORM_SCROLLBAR          455 
 +
-+#define STR_OPTIONS_WARN_SEPARATORS 454
-                                        
--#define STR_COUNT                       454
-+#define STR_COUNT                       455
++#define STR_OPTIONS_WARN_SEPARATORS 456
  
- #endif
+-#define STR_COUNT                       456
++#define STR_COUNT                       457
  
+ #endif
 diff --git sc/source/core/tool/docoptio.cxx sc/source/core/tool/docoptio.cxx
 index fcb9a0d..b62650f 100644
 --- sc/source/core/tool/docoptio.cxx
@@ -277,7 +276,7 @@ diff --git sc/source/ui/src/globstr.src sc/source/ui/src/globstr.src
 index eceefa6..5be3d92 100644
 --- sc/source/ui/src/globstr.src
 +++ sc/source/ui/src/globstr.src
-@@ -1809,5 +1809,9 @@ Resource RID_GLOBSTR
+@@ -1809,6 +1809,10 @@ Resource RID_GLOBSTR
      {
          Text [ en-US ] = "DataPilot table needs at least two rows of data to create or refresh." ;
      };
@@ -285,8 +284,9 @@ index eceefa6..5be3d92 100644
 +    {
 +        Text [ en-US ] = "Because the current formula separator settings conflict with the locale, the formula separators have been reset to their default values.";
 +    };
- };
- 
+     String STR_UNDO_INSERT_CURRENT_DATE
+     {
+         Text [ en-US ] = "Insert Current Date";
 diff --git sc/source/ui/view/gridwin.cxx sc/source/ui/view/gridwin.cxx
 index 98a923a..b55baf5 100644
 --- sc/source/ui/view/gridwin.cxx