From 50977e5ad36a56a2a0fd471ef654a22bc9f747da Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 26 Sep 2013 13:52:29 +0200 Subject: convert sc/source/ui/inc/sc*.hxx from String to OUString Change-Id: I7994cf3916bc34876ae838dd7158c03dd732074e --- sc/source/ui/attrdlg/scdlgfact.cxx | 2 +- sc/source/ui/attrdlg/scdlgfact.hxx | 2 +- sc/source/ui/dbgui/scuiasciiopt.cxx | 18 +++++++++--------- sc/source/ui/dbgui/scuiimoptdlg.cxx | 2 +- sc/source/ui/inc/scuiasciiopt.hxx | 12 ++++++------ sc/source/ui/inc/scuiautofmt.hxx | 12 ++++++------ sc/source/ui/inc/scuiimoptdlg.hxx | 2 +- sc/source/ui/miscdlgs/scuiautofmt.cxx | 4 ++-- sc/source/ui/unoobj/filtuno.cxx | 2 +- 9 files changed, 28 insertions(+), 28 deletions(-) (limited to 'sc/source/ui') diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index a2f01ef83745..a1e15f69b14d 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -1070,7 +1070,7 @@ AbstractScImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScImportOptions int nId, sal_Bool bAscii, const ScImportOptions* pOptions, - const String* pStrTitle, + const OUString* pStrTitle, sal_Bool bMultiByte, sal_Bool bOnlyDbtoolsEncodings, sal_Bool bImport ) diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index 94a9564c1678..6bb1068c6ac6 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -541,7 +541,7 @@ public: int nId, 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 ); diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index fd44245b9a30..4a7a9d00efa7 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -234,7 +234,7 @@ static void save_Separators( // ---------------------------------------------------------------------------- -ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName, +ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,OUString aDatName, SvStream* pInStream, ScImportAsciiCall eCall ) : ModalDialog (pParent, "TextImportCsvDialog", "modules/scalc/ui/textimportcsv.ui"), @@ -407,7 +407,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName, // *** column type ListBox *** xub_StrLen nCount = comphelper::string::getTokenCount(aColumnUser, ';'); for (xub_StrLen i=0; iInsertEntry( aColumnUser.GetToken( i ) ); + pLbType->InsertEntry( aColumnUser.getToken( i, ';' ) ); pLbType->SetSelectHdl( LINK( this, ScImportAsciiDlg, LbColTypeHdl ) ); pFtType->Disable(); @@ -564,7 +564,7 @@ void ScImportAsciiDlg::SetSeparators() OString sString(OUStringToOString(maFieldSeparators, RTL_TEXTENCODING_MS_1252)); const sal_Char *aSep = sString.getStr(); - int len = maFieldSeparators.Len(); + sal_Int32 len = maFieldSeparators.getLength(); for (int i = 0; i < len; ++i) { switch( aSep[i] ) @@ -588,17 +588,17 @@ void ScImportAsciiDlg::SetSelectedCharSet() meCharSet = osl_getThreadTextEncoding(); } -String ScImportAsciiDlg::GetSeparators() const +OUString ScImportAsciiDlg::GetSeparators() const { - String aSepChars; + OUString aSepChars; if( pCkbTab->IsChecked() ) - aSepChars += '\t'; + aSepChars += "\t"; if( pCkbSemicolon->IsChecked() ) - aSepChars += ';'; + aSepChars += ";"; if( pCkbComma->IsChecked() ) - aSepChars += ','; + aSepChars += ","; if( pCkbSpace->IsChecked() ) - aSepChars += ' '; + aSepChars += " "; if( pCkbOther->IsChecked() ) aSepChars += pEdOther->GetText(); return aSepChars; diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx index a28b7264d150..d5f478821e8c 100644 --- a/sc/source/ui/dbgui/scuiimoptdlg.cxx +++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx @@ -112,7 +112,7 @@ ScImportOptionsDlg::ScImportOptionsDlg( Window* pParent, sal_Bool bAscii, const ScImportOptions* pOptions, - const String* pStrTitle, + const OUString* pStrTitle, sal_Bool bMultiByte, sal_Bool bOnlyDbtoolsEncodings, sal_Bool bImport ) 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 ); diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx index 4ddc2f6d3818..803852676cac 100644 --- a/sc/source/ui/miscdlgs/scuiautofmt.cxx +++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx @@ -308,10 +308,10 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, RemoveHdl) { if ( (nIndex > 0) && (aLbFormat.GetEntryCount() > 0) ) { - String aMsg( aStrDelMsg.GetToken( 0, '#' ) ); + String aMsg( aStrDelMsg.getToken( 0, '#' ) ); aMsg += aLbFormat.GetSelectEntry(); - aMsg += aStrDelMsg.GetToken( 1, '#' ); + aMsg += aStrDelMsg.getToken( 1, '#' ); if ( RET_YES == QueryBox( this, WinBits( WB_YES_NO | WB_DEF_YES ), aMsg ).Execute() ) diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx index a40500c4eed4..6f6b3ddc04f4 100644 --- a/sc/source/ui/unoobj/filtuno.cxx +++ b/sc/source/ui/unoobj/filtuno.cxx @@ -252,7 +252,7 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException) sal_Unicode cAsciiDel = ';'; rtl_TextEncoding eEncoding = RTL_TEXTENCODING_DONTKNOW; - String aTitle; + OUString aTitle; if ( aFilterString == ScDocShell::GetAsciiFilterName() ) { -- cgit