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

[Ariel Constenla-Haile]

 sc/inc/sc.hrc                       |    5 ++++-
 sc/source/ui/dbgui/scuiimoptdlg.cxx |    6 +++++-
 sc/source/ui/src/scstring.src       |   12 +++++++++++-
 3 files changed, 20 insertions(+), 3 deletions(-)

New commits:
commit eec63d5e1d82c7809e14e46aa7cc9d9f71d2f2fa
Author: Ariel Constenla-Haile <arielch at apache.org>
Date:   Mon Jul 23 01:05:37 2012 +0000

    i#120341# - Make SCSTR_FIELDSEP less translation-error-prone
    
    (cherry picked from commit 30441cd652260941ade8f3e6898205ab2a1d0cdf)
    
    Conflicts:
    	sc/inc/sc.hrc
    
    Change-Id: Ia306ca5b791504590657fcb8b6e404a75f8a4c79

diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 8c4752b..0044fc4 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -929,7 +929,10 @@
 #define SCSTR_FORMULA_SYNTAX_XL_A1   (STR_START + 410)
 #define SCSTR_FORMULA_SYNTAX_XL_R1C1 (STR_START + 411)
 
-#define STR_END                 (SCSTR_FORMULA_SYNTAX_XL_R1C1)
+#define SCSTR_FIELDSEP_TAB      (STR_START + 412)
+#define SCSTR_FIELDSEP_SPACE    (STR_START + 413)
+
+#define STR_END                 (SCSTR_FIELDSEP_SPACE)
 
 #define BMP_START               (STR_END)
 
diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx
index 0b63c33..1c231bf 100644
--- a/sc/source/ui/dbgui/scuiimoptdlg.cxx
+++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx
@@ -133,8 +133,12 @@ ScImportOptionsDlg::ScImportOptionsDlg(
         aBtnCancel  ( this, ScResId( BTN_CANCEL ) ),
         aBtnHelp    ( this, ScResId( BTN_HELP ) )
 {
+    String sFieldSep( ScResId( SCSTR_FIELDSEP ) );
+    sFieldSep.SearchAndReplaceAscii( "%TAB",   String(ScResId(SCSTR_FIELDSEP_TAB)) );
+    sFieldSep.SearchAndReplaceAscii( "%SPACE", String(ScResId(SCSTR_FIELDSEP_SPACE)) );
+
     // im Ctor-Initializer nicht moeglich (MSC kann das nicht):
-    pFieldSepTab = new ScDelimiterTable( String(ScResId(SCSTR_FIELDSEP)) );
+    pFieldSepTab = new ScDelimiterTable( sFieldSep );
     pTextSepTab  = new ScDelimiterTable( String(ScResId(SCSTR_TEXTSEP)) );
 
     String aStr = pFieldSepTab->FirstDel();
diff --git a/sc/source/ui/src/scstring.src b/sc/source/ui/src/scstring.src
index 7154ec5..23ee913 100644
--- a/sc/source/ui/src/scstring.src
+++ b/sc/source/ui/src/scstring.src
@@ -512,7 +512,17 @@ String SCSTR_COLUMN_USER
 
 String SCSTR_FIELDSEP
 {
-    Text [ en-US ] = ",\t44\t;\t59\t:\t58\t{Tab}\t9\t{space}\t32 " ;
+    Text = ",\t44\t;\t59\t:\t58\t{%TAB}\t9\t{%SPACE}\t32 " ;
+};
+
+String SCSTR_FIELDSEP_TAB
+{
+    Text [ en-US ] = "Tab" ;
+};
+
+String SCSTR_FIELDSEP_SPACE
+{
+    Text [ en-US ] = "space" ;
 };
 
 String SCSTR_TEXTSEP