Kaydet (Commit) eec63d5e authored tarafından Ariel Constenla-Haile's avatar Ariel Constenla-Haile Kaydeden (comit) Eike Rathke

i#120341# - Make SCSTR_FIELDSEP less translation-error-prone

(cherry picked from commit 30441cd6)

Conflicts:
	sc/inc/sc.hrc

Change-Id: Ia306ca5b791504590657fcb8b6e404a75f8a4c79
üst 3b42b444
...@@ -929,7 +929,10 @@ ...@@ -929,7 +929,10 @@
#define SCSTR_FORMULA_SYNTAX_XL_A1 (STR_START + 410) #define SCSTR_FORMULA_SYNTAX_XL_A1 (STR_START + 410)
#define SCSTR_FORMULA_SYNTAX_XL_R1C1 (STR_START + 411) #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) #define BMP_START (STR_END)
......
...@@ -133,8 +133,12 @@ ScImportOptionsDlg::ScImportOptionsDlg( ...@@ -133,8 +133,12 @@ ScImportOptionsDlg::ScImportOptionsDlg(
aBtnCancel ( this, ScResId( BTN_CANCEL ) ), aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
aBtnHelp ( this, ScResId( BTN_HELP ) ) 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): // 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)) ); pTextSepTab = new ScDelimiterTable( String(ScResId(SCSTR_TEXTSEP)) );
String aStr = pFieldSepTab->FirstDel(); String aStr = pFieldSepTab->FirstDel();
......
...@@ -512,7 +512,17 @@ String SCSTR_COLUMN_USER ...@@ -512,7 +512,17 @@ String SCSTR_COLUMN_USER
String SCSTR_FIELDSEP 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 String SCSTR_TEXTSEP
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment