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 /sot/inc | |
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 'sot/inc')
-rw-r--r-- | sot/inc/sot/object.hxx | 10 | ||||
-rw-r--r-- | sot/inc/sot/stg.hxx | 8 | ||||
-rw-r--r-- | sot/inc/sot/storage.hxx | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/sot/inc/sot/object.hxx b/sot/inc/sot/object.hxx index b1b9316afcd3..435dda8d4626 100644 --- a/sot/inc/sot/object.hxx +++ b/sot/inc/sot/object.hxx @@ -57,7 +57,7 @@ SotFactory * ClassName::ClassFactory() \ if( !*ppFactory ) \ { \ *ppFactory = new FactoryName( GlobalName, \ - rtl::OUString( #ClassName ), ClassName::CreateInstance ); \ + OUString( #ClassName ), ClassName::CreateInstance ); \ } \ return *ppFactory; \ } \ @@ -93,7 +93,7 @@ SotFactory * ClassName::ClassFactory() \ if( !*ppFactory ) \ { \ *ppFactory = new FactoryName( GlobalName, \ - rtl::OUString( #ClassName ), ClassName::CreateInstance ); \ + OUString( #ClassName ), ClassName::CreateInstance ); \ (*ppFactory)->PutSuperClass( Super1::ClassFactory() ); \ } \ return *ppFactory; \ @@ -134,7 +134,7 @@ SotFactory * ClassName::ClassFactory() \ if( !*ppFactory ) \ { \ *ppFactory = new FactoryName( GlobalName, \ - rtl::OUString( #ClassName ), ClassName::CreateInstance ); \ + OUString( #ClassName ), ClassName::CreateInstance ); \ (*ppFactory)->PutSuperClass( Super1::ClassFactory() ); \ (*ppFactory)->PutSuperClass( Super2::ClassFactory() ); \ } \ @@ -175,7 +175,7 @@ SotFactory * ClassName::ClassFactory() \ if( !*ppFactory ) \ { \ *ppFactory = new FactoryName( GlobalName, \ - rtl::OUString( #ClassName ), ClassName::CreateInstance ); \ + OUString( #ClassName ), ClassName::CreateInstance ); \ (*ppFactory)->PutSuperClass( Super1::ClassFactory() ); \ (*ppFactory)->PutSuperClass( Super2::ClassFactory() ); \ (*ppFactory)->PutSuperClass( Super3::ClassFactory() ); \ @@ -220,7 +220,7 @@ SotFactory * ClassName::ClassFactory() \ if( !*ppFactory ) \ { \ *ppFactory = new SotFactory( GlobalName, \ - rtl::OUString( #ClassName ), ClassName::CreateInstance ); \ + OUString( #ClassName ), ClassName::CreateInstance ); \ (*ppFactory)->PutSuperClass( Super1::ClassFactory() ); \ (*ppFactory)->PutSuperClass( Super2::ClassFactory() ); \ (*ppFactory)->PutSuperClass( Super3::ClassFactory() ); \ diff --git a/sot/inc/sot/stg.hxx b/sot/inc/sot/stg.hxx index 61a047650a3c..bd124cc8df00 100644 --- a/sot/inc/sot/stg.hxx +++ b/sot/inc/sot/stg.hxx @@ -113,7 +113,7 @@ public: virtual sal_Bool Revert() = 0; virtual BaseStorageStream* OpenStream( const String & rEleName, StreamMode = STREAM_STD_READWRITE, - sal_Bool bDirect = sal_True, const rtl::OString* pKey=0 ) = 0; + sal_Bool bDirect = sal_True, const OString* pKey=0 ) = 0; virtual BaseStorage* OpenStorage( const String & rEleName, StreamMode = STREAM_STD_READWRITE, bool bDirect = false ) = 0; @@ -213,7 +213,7 @@ public: virtual sal_Bool Revert(); virtual BaseStorageStream* OpenStream( const String & rEleName, StreamMode = STREAM_STD_READWRITE, - sal_Bool bDirect = sal_True, const rtl::OString* pKey=0 ); + sal_Bool bDirect = sal_True, const OString* pKey=0 ); virtual BaseStorage* OpenStorage( const String & rEleName, StreamMode = STREAM_STD_READWRITE, bool bDirect = false ); @@ -249,7 +249,7 @@ protected: ~UCBStorageStream(); public: TYPEINFO(); - UCBStorageStream( const String& rName, StreamMode nMode, sal_Bool bDirect, const rtl::OString* pKey, sal_Bool bRepair, ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XProgressHandler > xProgress ); + UCBStorageStream( const String& rName, StreamMode nMode, sal_Bool bDirect, const OString* pKey, sal_Bool bRepair, ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XProgressHandler > xProgress ); UCBStorageStream( UCBStorageStream_Impl* ); virtual sal_uLong Read( void * pData, sal_uLong nSize ); @@ -329,7 +329,7 @@ public: virtual sal_Bool Revert(); virtual BaseStorageStream* OpenStream( const String & rEleName, StreamMode = STREAM_STD_READWRITE, - sal_Bool bDirect = sal_True, const rtl::OString* pKey=0 ); + sal_Bool bDirect = sal_True, const OString* pKey=0 ); virtual BaseStorage* OpenStorage( const String & rEleName, StreamMode = STREAM_STD_READWRITE, bool bDirect = false ); diff --git a/sot/inc/sot/storage.hxx b/sot/inc/sot/storage.hxx index 2f92517270c0..db3995dfc374 100644 --- a/sot/inc/sot/storage.hxx +++ b/sot/inc/sot/storage.hxx @@ -103,7 +103,7 @@ friend class SvStorage; String m_aName; // Name des Storage sal_Bool m_bIsRoot:1, // z.B.: File-Storage m_bDelStm:1; - rtl::OString m_aKey; // aKey.Len != 0 -> Verschluesselung + OString m_aKey; // aKey.Len != 0 -> Verschluesselung long m_nVersion; protected: @@ -132,7 +132,7 @@ public: virtual sal_Bool Validate(); - const rtl::OString& GetKey() const; + const OString& GetKey() const; void SetVersion( long nVers ) { |