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 /desktop/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 'desktop/inc')
| -rw-r--r-- | desktop/inc/app.hxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index 2f44f7307d13..f53f08cf3422 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -49,7 +49,7 @@ namespace desktop --------------------------------------------------------------------*/ class CommandLineArgs; class Lockfile; -class AcceptorMap : public std::map< rtl::OUString, Reference<XInitialization> > {}; +class AcceptorMap : public std::map< OUString, Reference<XInitialization> > {}; struct ConvertData; class Desktop : public Application { @@ -128,7 +128,7 @@ class Desktop : public Application static void SetRestartState(); void SynchronizeExtensionRepositories(); - void SetSplashScreenText( const ::rtl::OUString& rText ); + void SetSplashScreenText( const OUString& rText ); void SetSplashScreenProgress( sal_Int32 ); // Bootstrap methods @@ -144,18 +144,18 @@ class Desktop : public Application void CreateTemporaryDirectory(); void RemoveTemporaryDirectory(); - sal_Bool InitializeInstallation( const rtl::OUString& rAppFilename ); + sal_Bool InitializeInstallation( const OUString& rAppFilename ); bool InitializeConfiguration(); void FlushConfiguration(); static sal_Bool shouldLaunchQuickstart(); sal_Bool InitializeQuickstartMode( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext ); - void HandleBootstrapPathErrors( ::utl::Bootstrap::Status, const ::rtl::OUString& aMsg ); - void StartSetup( const ::rtl::OUString& aParameters ); + void HandleBootstrapPathErrors( ::utl::Bootstrap::Status, const OUString& aMsg ); + void StartSetup( const OUString& aParameters ); // Create a error message depending on bootstrap failure code and an optional file url - ::rtl::OUString CreateErrorMsgString( utl::Bootstrap::FailureCode nFailureCode, - const ::rtl::OUString& aFileURL ); + OUString CreateErrorMsgString( utl::Bootstrap::FailureCode nFailureCode, + const OUString& aFileURL ); static void PreloadModuleData( const CommandLineArgs& ); static void PreloadConfigurationData(); @@ -184,9 +184,9 @@ class Desktop : public Application static sal_Bool isUIOnSessionShutdownAllowed(); // on-demand acceptors - static void createAcceptor(const rtl::OUString& aDescription); + static void createAcceptor(const OUString& aDescription); static void enableAcceptors(); - static void destroyAcceptor(const rtl::OUString& aDescription); + static void destroyAcceptor(const OUString& aDescription); bool m_bCleanedExtensionCache; bool m_bServicesRegistered; |