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/workben | |
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/workben')
-rw-r--r-- | svx/workben/msview/msview.cxx | 21 | ||||
-rw-r--r-- | svx/workben/msview/xmlconfig.cxx | 21 | ||||
-rw-r--r-- | svx/workben/msview/xmlconfig.hxx | 42 |
3 files changed, 41 insertions, 43 deletions
diff --git a/svx/workben/msview/msview.cxx b/svx/workben/msview/msview.cxx index bb0ce74668ed..0a5add1befe7 100644 --- a/svx/workben/msview/msview.cxx +++ b/svx/workben/msview/msview.cxx @@ -63,7 +63,6 @@ #include "xmlconfig.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; @@ -649,7 +648,7 @@ void AtomContainerTreeListBox::InsertAtom( const Atom* pAtom, SvTreeListEntry* p char buffer[1024]; - rtl::OUString aText; + OUString aText; AtomConfig* pAtomConfig = dynamic_cast< AtomConfig*>( gAtomConfigMap[rHeader.nRecType].get() ); if( pAtomConfig ) @@ -658,11 +657,11 @@ void AtomContainerTreeListBox::InsertAtom( const Atom* pAtom, SvTreeListEntry* p if( !aText.getLength() ) { sprintf( buffer, "unknown_0x%04x", rHeader.nRecType ); - aText += rtl::OUString::createFromAscii( buffer ); + aText += OUString::createFromAscii( buffer ); } sprintf( buffer, " (I: %lu L: %lu)", (UINT32)rHeader.nRecVer, (UINT32)rHeader.nRecLen ); - aText += String( rtl::OUString::createFromAscii( buffer ) ); + aText += String( OUString::createFromAscii( buffer ) ); SvTreeListEntry* pEntry = 0; if( pAtom->isContainer() && pAtom->findFirstChildAtom() ) @@ -713,13 +712,13 @@ extern void load_config( const OUString& rPath ); class PPTDocument { public: - PPTDocument( const rtl::OUString& rFilePath ); + PPTDocument( const OUString& rFilePath ); ~PPTDocument(); Atom* getRootAtom() const; private: - void Load( const rtl::OUString& rFilePath ); + void Load( const OUString& rFilePath ); Atom* mpAtom; SvStream* mpDocStream; @@ -728,7 +727,7 @@ private: typedef boost::shared_ptr< PPTDocument > PPTDocumentPtr; -PPTDocument::PPTDocument(const rtl::OUString& rFilePath) +PPTDocument::PPTDocument(const OUString& rFilePath) : mpAtom(0), mpDocStream(0) { Load( rFilePath ); @@ -740,7 +739,7 @@ PPTDocument::~PPTDocument() delete mpDocStream; } -void PPTDocument::Load( const rtl::OUString& rFilePath ) +void PPTDocument::Load( const OUString& rFilePath ) { maStorage = new SotStorage( rFilePath, STREAM_STD_READ ); if( !maStorage->GetError() ) @@ -924,7 +923,7 @@ static String GetAtomText( const Atom* pAtom ) (UINT32)rHeader.nRecInstance, (UINT32)rHeader.nImpVerInst, (UINT32)rHeader.nRecLen ); - aText = rtl::OUString::createFromAscii( buffer ); + aText = OUString::createFromAscii( buffer ); if( pAtom->isContainer() ) { @@ -1130,12 +1129,12 @@ void MSViewerWorkWindow::Resize() if( argc >= 2 ) { - const rtl::OUString aFile1( rtl::OUString::createFromAscii(argv[1]) ); + const OUString aFile1( OUString::createFromAscii(argv[1]) ); PPTDocumentPtr pDocument1( new PPTDocument( aFile1 ) ); if( argc == 3 ) { - const rtl::OUString aFile2( rtl::OUString::createFromAscii(argv[2]) ); + const OUString aFile2( OUString::createFromAscii(argv[2]) ); PPTDocumentPtr pDocument2; pDocument2.reset( new PPTDocument( aFile2 ) ); diff --git a/svx/workben/msview/xmlconfig.cxx b/svx/workben/msview/xmlconfig.cxx index 1b2cbdf51e8f..e182ed64e5d1 100644 --- a/svx/workben/msview/xmlconfig.cxx +++ b/svx/workben/msview/xmlconfig.cxx @@ -39,7 +39,6 @@ #include <ctype.h> #include <stack> -using ::rtl::OUString; using ::com::sun::star::io::XInputStream; using ::com::sun::star::io::IOException; @@ -329,9 +328,9 @@ void load_config( const OUString& rPath ) catch( Exception& ) { OSL_FAIL( - (rtl::OString("load_config(), " + (OString("load_config(), " "exception caught: ") + - rtl::OUStringToOString( + OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } @@ -339,7 +338,7 @@ void load_config( const OUString& rPath ) /////////////////////////////////////////////////////////////////////// -rtl::OUString ElementConfig::format( SvStream& rStream, sal_Size& nLength ) const +OUString ElementConfig::format( SvStream& rStream, sal_Size& nLength ) const { OUString aRet; if( maName.getLength() ) @@ -360,7 +359,7 @@ rtl::OUString ElementConfig::format( SvStream& rStream, sal_Size& nLength ) cons return aRet; } -rtl::OUString ElementConfig::dump_hex( SvStream& rStream, sal_Size& nLength ) +OUString ElementConfig::dump_hex( SvStream& rStream, sal_Size& nLength ) { char buffer[128]; OUString aOut, aEmpty; @@ -402,7 +401,7 @@ rtl::OUString ElementConfig::dump_hex( SvStream& rStream, sal_Size& nLength ) return aOut; } -rtl::OUString ElementConfig::dump_byte( SvStream& rStream, sal_Size& nLength ) +OUString ElementConfig::dump_byte( SvStream& rStream, sal_Size& nLength ) { OUString aRet; if( nLength >= sizeof(sal_Char) ) @@ -419,7 +418,7 @@ rtl::OUString ElementConfig::dump_byte( SvStream& rStream, sal_Size& nLength ) return aRet; } -rtl::OUString ElementConfig::dump_uint( SvStream& rStream, sal_Size& nLength ) +OUString ElementConfig::dump_uint( SvStream& rStream, sal_Size& nLength ) { OUString aRet; if( nLength >= sizeof( sal_uInt32 ) ) @@ -436,14 +435,14 @@ rtl::OUString ElementConfig::dump_uint( SvStream& rStream, sal_Size& nLength ) return aRet; } -rtl::OUString ElementConfig::dump_unistring( SvStream& rStream, sal_Size& nLength ) +OUString ElementConfig::dump_unistring( SvStream& rStream, sal_Size& nLength ) { String aString = SvxMSDffManager::MSDFFReadZString( rStream, nLength, sal_True ); nLength = 0; return aString; } -rtl::OUString ElementConfig::dump_float( SvStream& rStream, sal_Size& nLength ) +OUString ElementConfig::dump_float( SvStream& rStream, sal_Size& nLength ) { OUString aRet; if( nLength >= sizeof( float ) ) @@ -462,7 +461,7 @@ rtl::OUString ElementConfig::dump_float( SvStream& rStream, sal_Size& nLength ) /////////////////////////////////////////////////////////////////////// -rtl::OUString ElementConfigContainer::format( SvStream& rStream, sal_Size& nLength ) const +OUString ElementConfigContainer::format( SvStream& rStream, sal_Size& nLength ) const { OUString aRet; @@ -528,7 +527,7 @@ rtl::OUString ElementConfigContainer::format( SvStream& rStream, sal_Size& nLeng /////////////////////////////////////////////////////////////////////// -rtl::OUString SwitchElementConfig::format( SvStream& rStream, sal_Size& nLength ) const +OUString SwitchElementConfig::format( SvStream& rStream, sal_Size& nLength ) const { OUString aValue; diff --git a/svx/workben/msview/xmlconfig.hxx b/svx/workben/msview/xmlconfig.hxx index d6cd4e04e0f0..8250bf3e3753 100644 --- a/svx/workben/msview/xmlconfig.hxx +++ b/svx/workben/msview/xmlconfig.hxx @@ -32,22 +32,22 @@ class ElementConfig { public: ElementConfig() : mnType( ECT_HEXDUMP ) {} - ElementConfig( const rtl::OUString& rName, ElementConfigType rType ) : maName( rName ), mnType( rType ) {} - ElementConfig( const rtl::OUString& rName ) : maName( rName ) {} + ElementConfig( const OUString& rName, ElementConfigType rType ) : maName( rName ), mnType( rType ) {} + ElementConfig( const OUString& rName ) : maName( rName ) {} ElementConfig( ElementConfigType rType ) : mnType( rType ) {} - virtual rtl::OUString format( SvStream& rStream, sal_Size& nLength ) const; + virtual OUString format( SvStream& rStream, sal_Size& nLength ) const; - const rtl::OUString& getName() const { return maName; } + const OUString& getName() const { return maName; } ElementConfigType getType() const { return mnType; } - static rtl::OUString dump_hex( SvStream& rStream, sal_Size& nLength ); - static rtl::OUString dump_byte( SvStream& rStream, sal_Size& nLength ); - static rtl::OUString dump_uint( SvStream& rStream, sal_Size& nLength ); - static rtl::OUString dump_unistring( SvStream& rStream, sal_Size& nLength ); - static rtl::OUString dump_float( SvStream& rStream, sal_Size& nLength ); + static OUString dump_hex( SvStream& rStream, sal_Size& nLength ); + static OUString dump_byte( SvStream& rStream, sal_Size& nLength ); + static OUString dump_uint( SvStream& rStream, sal_Size& nLength ); + static OUString dump_unistring( SvStream& rStream, sal_Size& nLength ); + static OUString dump_float( SvStream& rStream, sal_Size& nLength ); private: - rtl::OUString maName; + OUString maName; ElementConfigType mnType; }; typedef boost::shared_ptr< ElementConfig > ElementConfigPtr; @@ -58,12 +58,12 @@ typedef std::list< ElementConfigPtr > ElementConfigList; class ElementValueConfig : public ElementConfig { public: - ElementValueConfig( const rtl::OUString& rName, const rtl::OUString& rValue ) : ElementConfig( rName ), maValue( rValue ) {} + ElementValueConfig( const OUString& rName, const OUString& rValue ) : ElementConfig( rName ), maValue( rValue ) {} - const rtl::OUString& getValue() const { return maValue; } + const OUString& getValue() const { return maValue; } private: - rtl::OUString maValue; + OUString maValue; }; /////////////////////////////////////////////////////////////////////// @@ -72,11 +72,11 @@ class ElementConfigContainer : public ElementConfig { public: ElementConfigContainer() : ElementConfig( ETC_CONTAINER ) {} - ElementConfigContainer( const ::rtl::OUString& rName, ElementConfigType rType ) : ElementConfig( rName, rType ) {} - ElementConfigContainer( const ::rtl::OUString& rName ) : ElementConfig( rName, ETC_CONTAINER ) {} + ElementConfigContainer( const OUString& rName, ElementConfigType rType ) : ElementConfig( rName, rType ) {} + ElementConfigContainer( const OUString& rName ) : ElementConfig( rName, ETC_CONTAINER ) {} ElementConfigContainer( ElementConfigType rType ) : ElementConfig( rType ) {} - virtual rtl::OUString format( SvStream& rStream, sal_Size& nLength ) const; + virtual OUString format( SvStream& rStream, sal_Size& nLength ) const; void addElementConfig( ElementConfigPtr p ) { maElementConfigList.push_back( p ); } @@ -89,12 +89,12 @@ protected: class CaseElementConfig : public ElementConfigContainer { public: - CaseElementConfig( const rtl::OUString& rValue ) : maValue( rValue ) {} + CaseElementConfig( const OUString& rValue ) : maValue( rValue ) {} - const rtl::OUString& getValue() const { return maValue; } + const OUString& getValue() const { return maValue; } private: - rtl::OUString maValue; + OUString maValue; }; /////////////////////////////////////////////////////////////////////// @@ -104,7 +104,7 @@ class SwitchElementConfig : public ElementConfigContainer public: SwitchElementConfig( ElementConfigType rType ) : ElementConfigContainer( rType ) {} - virtual rtl::OUString format( SvStream& rStream, sal_Size& nLength ) const; + virtual OUString format( SvStream& rStream, sal_Size& nLength ) const; }; /////////////////////////////////////////////////////////////////////// @@ -112,7 +112,7 @@ public: class AtomConfig : public ElementConfigContainer { public: - AtomConfig( const ::rtl::OUString& rName, bool bIsContainer ) : ElementConfigContainer( rName ), mbIsContainer( bIsContainer ) {} + AtomConfig( const OUString& rName, bool bIsContainer ) : ElementConfigContainer( rName ), mbIsContainer( bIsContainer ) {} bool isContainer() const { return mbIsContainer; } |