diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
| commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
| tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /svx/source/gallery2/gallery1.cxx | |
| parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff) | |
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).
Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'svx/source/gallery2/gallery1.cxx')
| -rw-r--r-- | svx/source/gallery2/gallery1.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index 4baf9166a6c3..7adec4461277 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -99,7 +99,7 @@ INetURLObject GalleryThemeEntry::ImplGetURLIgnoreCase( const INetURLObject& rURL // ----------------------------------------------------------------------------- -void GalleryThemeEntry::SetName( const rtl::OUString& rNewName ) +void GalleryThemeEntry::SetName( const OUString& rNewName ) { if( aName != rNewName ) { @@ -127,9 +127,9 @@ SvStream& operator<<( SvStream& rOut, const GalleryImportThemeEntry& rEntry ) write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rEntry.aThemeName, RTL_TEXTENCODING_UTF8); write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rEntry.aUIName, RTL_TEXTENCODING_UTF8); write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, (rEntry.aURL.GetMainURL( INetURLObject::NO_DECODE )), RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rtl::OUString(), RTL_TEXTENCODING_UTF8); //aImportName + write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, OUString(), RTL_TEXTENCODING_UTF8); //aImportName - write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOut, rtl::OString()); + write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOut, OString()); return rOut; } @@ -170,7 +170,7 @@ public: // - Gallery - // ----------- -Gallery::Gallery( const rtl::OUString& rMultiPath ) +Gallery::Gallery( const OUString& rMultiPath ) : nReadTextEncoding ( osl_getThreadTextEncoding() ) , nLastFileNumber ( 0 ) , bMultiPath ( sal_False ) @@ -213,7 +213,7 @@ Gallery* Gallery::GetGalleryInstance() // ------------------------------------------------------------------------ -void Gallery::ImplLoad( const rtl::OUString& rMultiPath ) +void Gallery::ImplLoad( const OUString& rMultiPath ) { const sal_Int32 nTokenCount = comphelper::string::getTokenCount(rMultiPath, ';'); sal_Bool bIsReadOnlyDir; @@ -301,10 +301,10 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbDirIsR if( xContentAccess.is() ) { - static const ::rtl::OUString s_sTitle("Title"); - static const ::rtl::OUString s_sIsReadOnly("IsReadOnly"); - static const ::rtl::OUString s_sSDG_EXT("sdg"); - static const ::rtl::OUString s_sSDV_EXT("sdv"); + static const OUString s_sTitle("Title"); + static const OUString s_sIsReadOnly("IsReadOnly"); + static const OUString s_sSDG_EXT("sdg"); + static const OUString s_sSDV_EXT("sdv"); while( xResultSet->next() ) { @@ -443,7 +443,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbDirIsR // ------------------------------------------------------------------------ -GalleryThemeEntry* Gallery::ImplGetThemeEntry( const rtl::OUString& rThemeName ) +GalleryThemeEntry* Gallery::ImplGetThemeEntry( const OUString& rThemeName ) { GalleryThemeEntry* pFound = NULL; @@ -459,7 +459,7 @@ GalleryThemeEntry* Gallery::ImplGetThemeEntry( const rtl::OUString& rThemeName ) // ------------------------------------------------------------------------ -rtl::OUString Gallery::GetThemeName( sal_uIntPtr nThemeId ) const +OUString Gallery::GetThemeName( sal_uIntPtr nThemeId ) const { GalleryThemeEntry* pFound = NULL; @@ -473,7 +473,7 @@ rtl::OUString Gallery::GetThemeName( sal_uIntPtr nThemeId ) const // try fallback, if no entry was found if( !pFound ) { - rtl::OString aFallback; + OString aFallback; switch( nThemeId ) { @@ -502,10 +502,10 @@ rtl::OUString Gallery::GetThemeName( sal_uIntPtr nThemeId ) const break; } - pFound = const_cast<Gallery*>(this)->ImplGetThemeEntry(rtl::OStringToOUString(aFallback, RTL_TEXTENCODING_ASCII_US)); + pFound = const_cast<Gallery*>(this)->ImplGetThemeEntry(OStringToOUString(aFallback, RTL_TEXTENCODING_ASCII_US)); } - return( pFound ? pFound->GetThemeName() : rtl::OUString() ); + return( pFound ? pFound->GetThemeName() : OUString() ); } // ------------------------------------------------------------------------ |