From d1fb13adf9ab73e53851e5d56cbbbe33bcdcd82c Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 18 Aug 2011 22:30:22 +0100 Subject: convert tools::Config to rtl::OString --- padmin/source/fontentry.cxx | 2 +- padmin/source/newppdlg.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'padmin') diff --git a/padmin/source/fontentry.cxx b/padmin/source/fontentry.cxx index ab84a548c1bc..7e928665b5cd 100644 --- a/padmin/source/fontentry.cxx +++ b/padmin/source/fontentry.cxx @@ -376,7 +376,7 @@ FontImportDialog::FontImportDialog( Window* pParent ) : Config& rPadminRC( getPadminRC() ); rPadminRC.SetGroup( "FontImport" ); - m_aFromDirEdt.SetText( String( rPadminRC.ReadKey( "FromPath" ), RTL_TEXTENCODING_UTF8 ) ); + m_aFromDirEdt.SetText( rtl::OStringToOUString(rPadminRC.ReadKey("FromPath"), RTL_TEXTENCODING_UTF8) ); RefreshTimeoutHdl( NULL ); } diff --git a/padmin/source/newppdlg.cxx b/padmin/source/newppdlg.cxx index 0da40ce90f02..cde0720aae28 100644 --- a/padmin/source/newppdlg.cxx +++ b/padmin/source/newppdlg.cxx @@ -76,7 +76,7 @@ PPDImportDialog::PPDImportDialog( Window* pParent ) : Config& rConfig = getPadminRC(); rConfig.SetGroup( PPDIMPORT_GROUP ); - m_aPathBox.SetText( String( rConfig.ReadKey( "LastDir" ), RTL_TEXTENCODING_UTF8 ) ); + m_aPathBox.SetText( rtl::OStringToOUString(rConfig.ReadKey("LastDir"), RTL_TEXTENCODING_UTF8) ); for (sal_Int32 i = 0; i < 11; ++i) { ByteString aEntry(rConfig.ReadKey(rtl::OString::valueOf(i))); @@ -117,7 +117,7 @@ void PPDImportDialog::Import() break; if( nEntries < 0 ) { - sal_Int32 nNextEntry = rConfig.ReadKey( "NextEntry" ).ToInt32(); + sal_Int32 nNextEntry = rConfig.ReadKey("NextEntry").toInt32(); rConfig.WriteKey( rtl::OString::valueOf(nNextEntry), ByteString( aImportPath, RTL_TEXTENCODING_UTF8 ) ); nNextEntry = nNextEntry < 10 ? nNextEntry+1 : 0; rConfig.WriteKey( "NextEntry", rtl::OString::valueOf(nNextEntry) ); -- cgit