diff options
| author | Noel Grandin <noel@peralex.com> | 2013-08-19 16:27:07 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-08-22 10:49:25 +0200 |
| commit | d09631bd9d7a614c9680df6823446bd430f6bba7 (patch) | |
| tree | d9681a39019c5176a25b4abf7d919f3b5d430cdb /svtools | |
| parent | 823a6cb82555709e50f281a68ff64442001a011b (diff) | |
convert include/svtools/ctrl*.hxx from String to OUString
Change-Id: I86b78137f02a11c5a2c34930b19cef22acd7ac69
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/control/ctrlbox.cxx | 12 | ||||
| -rw-r--r-- | svtools/source/control/ctrltool.cxx | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 88c1c89657d5..743d0657cce4 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -1072,12 +1072,12 @@ FontNameBox::~FontNameBox() // ------------------------------------------------------------------- -void FontNameBox::SaveMRUEntries( const String& aFontMRUEntriesFile, sal_Unicode cSep ) const +void FontNameBox::SaveMRUEntries( const OUString& aFontMRUEntriesFile, sal_Unicode cSep ) const { OString aEntries(OUStringToOString(GetMRUEntries(cSep), RTL_TEXTENCODING_UTF8)); - if (aEntries.isEmpty() || !aFontMRUEntriesFile.Len()) + if (aEntries.isEmpty() || aFontMRUEntriesFile.isEmpty()) return; SvFileStream aStream; @@ -1097,9 +1097,9 @@ void FontNameBox::SaveMRUEntries( const String& aFontMRUEntriesFile, sal_Unicode // ------------------------------------------------------------------- -void FontNameBox::LoadMRUEntries( const String& aFontMRUEntriesFile, sal_Unicode cSep ) +void FontNameBox::LoadMRUEntries( const OUString& aFontMRUEntriesFile, sal_Unicode cSep ) { - if( ! aFontMRUEntriesFile.Len() ) + if( aFontMRUEntriesFile.isEmpty() ) return; SvFileStream aStream( aFontMRUEntriesFile, STREAM_READ ); @@ -1126,9 +1126,9 @@ void FontNameBox::InitFontMRUEntriesFile() rtl::Bootstrap::expandMacros(sUserConfigDir); maFontMRUEntriesFile = sUserConfigDir; - if( maFontMRUEntriesFile.Len() ) + if( !maFontMRUEntriesFile.isEmpty() ) { - maFontMRUEntriesFile.AppendAscii( FONTNAMEBOXMRUENTRIESFILE ); + maFontMRUEntriesFile += FONTNAMEBOXMRUENTRIESFILE; } } diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx index 818ed913b602..5adcc8d1c5a5 100644 --- a/svtools/source/control/ctrltool.cxx +++ b/svtools/source/control/ctrltool.cxx @@ -876,7 +876,7 @@ FontSizeNames::FontSizeNames( LanguageType eLanguage ) //------------------------------------------------------------------------ -long FontSizeNames::Name2Size( const String& rName ) const +long FontSizeNames::Name2Size( const OUString& rName ) const { if ( mnElem ) { @@ -894,7 +894,7 @@ long FontSizeNames::Name2Size( const String& rName ) const //------------------------------------------------------------------------ -String FontSizeNames::Size2Name( long nValue ) const +OUString FontSizeNames::Size2Name( long nValue ) const { String aStr; @@ -918,7 +918,7 @@ String FontSizeNames::Size2Name( long nValue ) const //------------------------------------------------------------------------ -String FontSizeNames::GetIndexName( sal_uLong nIndex ) const +OUString FontSizeNames::GetIndexName( sal_uLong nIndex ) const { String aStr; |