#i120341# - Make SCSTR_FIELDSEP less translation-error-prone

sc/inc/sc.hrc

@@ -1062,7 +1062,10 @@
 #define SCSTR_SET_TAB_BG_COLOR  (STR_START + 403)
 #define SCSTR_NO_TAB_BG_COLOR   (STR_START + 404)
 
-#define STR_END                 (SCSTR_NO_TAB_BG_COLOR)
+#define SCSTR_FIELDSEP_TAB      (STR_START + 405)
+#define SCSTR_FIELDSEP_SPACE    (STR_START + 406)
+
+#define STR_END                 (SCSTR_FIELDSEP_SPACE)
 
 #define BMP_START               (STR_END)
 

sc/source/ui/dbgui/scuiasciiopt.cxx

@@ -245,7 +245,6 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName,
 
         aCharSetUser( ScResId( SCSTR_CHARSET_USER ) ),
         aColumnUser ( ScResId( SCSTR_COLUMN_USER ) ),
-        aFldSepList ( ScResId( SCSTR_FIELDSEP ) ),
         aTextSepList( ScResId( SCSTR_TEXTSEP ) ),
         mcTextSep   ( ScAsciiOptions::cDefaultTextSep ),
         maStrTextToColumns( ScResId( STR_TEXTTOCOLUMNS ) ),

sc/source/ui/dbgui/scuiimoptdlg.cxx

@@ -135,8 +135,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();

sc/source/ui/inc/scuiasciiopt.hxx

@@ -82,7 +82,6 @@ class ScImportAsciiDlg : public ModalDialog
 
     String                      aCharSetUser;
     String                      aColumnUser;
-    String                      aFldSepList;
     String                      aTextSepList;
     String                      maFieldSeparators;  // selected field separators
     sal_Unicode                 mcTextSep;

sc/source/ui/src/scstring.src

@@ -482,7 +482,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