diff options
Diffstat (limited to 'sc/source/ui/inc')
| -rw-r--r-- | sc/source/ui/inc/scuiasciiopt.hxx | 12 | ||||
| -rw-r--r-- | sc/source/ui/inc/scuiautofmt.hxx | 12 | ||||
| -rw-r--r-- | sc/source/ui/inc/scuiimoptdlg.hxx | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/sc/source/ui/inc/scuiasciiopt.hxx b/sc/source/ui/inc/scuiasciiopt.hxx index 57e537a02436..68ed4e2dbcec 100644 --- a/sc/source/ui/inc/scuiasciiopt.hxx +++ b/sc/source/ui/inc/scuiasciiopt.hxx @@ -70,10 +70,10 @@ class ScImportAsciiDlg : public ModalDialog ScCsvTableBox* mpTableBox; - String aCharSetUser; - String aColumnUser; - String aTextSepList; - String maFieldSeparators; // selected field separators + OUString aCharSetUser; + OUString aColumnUser; + OUString aTextSepList; + OUString maFieldSeparators; // selected field separators sal_Unicode mcTextSep; CharSet meCharSet; /// Selected char set. @@ -82,7 +82,7 @@ class ScImportAsciiDlg : public ModalDialog public: ScImportAsciiDlg( - Window* pParent, String aDatName, + Window* pParent, OUString aDatName, SvStream* pInStream, ScImportAsciiCall eCall ); ~ScImportAsciiDlg(); @@ -95,7 +95,7 @@ private: /** Set separators in ui from maFieldSeparators */ void SetSeparators(); /** Returns all separator characters in a string. */ - String GetSeparators() const; + OUString GetSeparators() const; /** Enables or disables all separator checkboxes and edit fields. */ void SetupSeparatorCtrls(); diff --git a/sc/source/ui/inc/scuiautofmt.hxx b/sc/source/ui/inc/scuiautofmt.hxx index 9e9772968474..fb016b233785 100644 --- a/sc/source/ui/inc/scuiautofmt.hxx +++ b/sc/source/ui/inc/scuiautofmt.hxx @@ -50,12 +50,12 @@ private: CheckBox aBtnAlignment; CheckBox aBtnAdjust; PushButton aBtnRename; - String aStrTitle; - String aStrLabel; - String aStrClose; - String aStrDelTitle; - String aStrDelMsg; - String aStrRename; + OUString aStrTitle; + OUString aStrLabel; + OUString aStrClose; + OUString aStrDelTitle; + OUString aStrDelMsg; + OUString aStrRename; //------------------------ ScAutoFormat* pFormat; diff --git a/sc/source/ui/inc/scuiimoptdlg.hxx b/sc/source/ui/inc/scuiimoptdlg.hxx index 6ef770a968a9..d68b69c00d9e 100644 --- a/sc/source/ui/inc/scuiimoptdlg.hxx +++ b/sc/source/ui/inc/scuiimoptdlg.hxx @@ -33,7 +33,7 @@ public: ScImportOptionsDlg( Window* pParent, sal_Bool bAscii = sal_True, const ScImportOptions* pOptions = NULL, - const String* pStrTitle = NULL, + const OUString* pStrTitle = NULL, sal_Bool bMultiByte = false, sal_Bool bOnlyDbtoolsEncodings = false, sal_Bool bImport = sal_True ); |