incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arie...@apache.org
Subject svn commit: r1364473 - in /incubator/ooo/trunk/main/sc: inc/sc.hrc source/ui/dbgui/scuiasciiopt.cxx source/ui/dbgui/scuiimoptdlg.cxx source/ui/inc/scuiasciiopt.hxx source/ui/src/scstring.src
Date Mon, 23 Jul 2012 02:05:37 GMT
Author: arielch
Date: Mon Jul 23 02:05:37 2012
New Revision: 1364473

URL: http://svn.apache.org/viewvc?rev=1364473&view=rev
Log:
#i120341# - Make SCSTR_FIELDSEP less translation-error-prone

Modified:
    incubator/ooo/trunk/main/sc/inc/sc.hrc
    incubator/ooo/trunk/main/sc/source/ui/dbgui/scuiasciiopt.cxx
    incubator/ooo/trunk/main/sc/source/ui/dbgui/scuiimoptdlg.cxx
    incubator/ooo/trunk/main/sc/source/ui/inc/scuiasciiopt.hxx
    incubator/ooo/trunk/main/sc/source/ui/src/scstring.src

Modified: incubator/ooo/trunk/main/sc/inc/sc.hrc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sc/inc/sc.hrc?rev=1364473&r1=1364472&r2=1364473&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sc/inc/sc.hrc (original)
+++ incubator/ooo/trunk/main/sc/inc/sc.hrc Mon Jul 23 02:05:37 2012
@@ -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)
 

Modified: incubator/ooo/trunk/main/sc/source/ui/dbgui/scuiasciiopt.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sc/source/ui/dbgui/scuiasciiopt.cxx?rev=1364473&r1=1364472&r2=1364473&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sc/source/ui/dbgui/scuiasciiopt.cxx (original)
+++ incubator/ooo/trunk/main/sc/source/ui/dbgui/scuiasciiopt.cxx Mon Jul 23 02:05:37 2012
@@ -245,7 +245,6 @@ ScImportAsciiDlg::ScImportAsciiDlg( Wind
 
 		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 ) ),

Modified: incubator/ooo/trunk/main/sc/source/ui/dbgui/scuiimoptdlg.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sc/source/ui/dbgui/scuiimoptdlg.cxx?rev=1364473&r1=1364472&r2=1364473&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sc/source/ui/dbgui/scuiimoptdlg.cxx (original)
+++ incubator/ooo/trunk/main/sc/source/ui/dbgui/scuiimoptdlg.cxx Mon Jul 23 02:05:37 2012
@@ -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();

Modified: incubator/ooo/trunk/main/sc/source/ui/inc/scuiasciiopt.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sc/source/ui/inc/scuiasciiopt.hxx?rev=1364473&r1=1364472&r2=1364473&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sc/source/ui/inc/scuiasciiopt.hxx (original)
+++ incubator/ooo/trunk/main/sc/source/ui/inc/scuiasciiopt.hxx Mon Jul 23 02:05:37 2012
@@ -82,7 +82,6 @@ class ScImportAsciiDlg : public ModalDia
 
     String                      aCharSetUser;
     String                      aColumnUser;
-    String                      aFldSepList;
     String                      aTextSepList;
     String                      maFieldSeparators;  // selected field separators
 	sal_Unicode                 mcTextSep;

Modified: incubator/ooo/trunk/main/sc/source/ui/src/scstring.src
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sc/source/ui/src/scstring.src?rev=1364473&r1=1364472&r2=1364473&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sc/source/ui/src/scstring.src (original)
+++ incubator/ooo/trunk/main/sc/source/ui/src/scstring.src Mon Jul 23 02:05:37 2012
@@ -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



Mime
View raw message