diff options
| author | Noel Grandin <noel@peralex.com> | 2013-09-26 13:52:29 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-10-04 08:48:56 +0200 |
| commit | 50977e5ad36a56a2a0fd471ef654a22bc9f747da (patch) | |
| tree | 7397829d1ddf093959e94f3da1885f93ade6c5d8 /sc/source/ui/dbgui | |
| parent | e699c7fcd150315e4fc3abf21c9d2e732ad9aae1 (diff) | |
convert sc/source/ui/inc/sc*.hxx from String to OUString
Change-Id: I7994cf3916bc34876ae838dd7158c03dd732074e
Diffstat (limited to 'sc/source/ui/dbgui')
| -rw-r--r-- | sc/source/ui/dbgui/scuiasciiopt.cxx | 18 | ||||
| -rw-r--r-- | sc/source/ui/dbgui/scuiimoptdlg.cxx | 2 |
2 files changed, 10 insertions, 10 deletions
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; i<nCount; i++) - pLbType->InsertEntry( 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 ) |