diff options
| author | Noel Grandin <noel@peralex.com> | 2014-11-03 14:03:54 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-11-05 08:44:19 +0200 |
| commit | 705c48d32eec0aa5180e60ca157daca4b154e4a3 (patch) | |
| tree | 97f43496f4b429a2b8d03b1e71cb2a1c33142a15 /desktop/source | |
| parent | b7d8a58ff2698ffc6e22943f64aa97c5ea253bd9 (diff) | |
fdo#38835 strip out OUString globals
they are largely unnecessary these days, since our OUString infrastructure
gained optimised handling for static char constants.
Change-Id: I07f73484f82d0582252cb4324d4107c998432c37
Diffstat (limited to 'desktop/source')
| -rw-r--r-- | desktop/source/app/app.cxx | 6 | ||||
| -rw-r--r-- | desktop/source/migration/services/oo3extensionmigration.cxx | 8 | ||||
| -rw-r--r-- | desktop/source/migration/services/wordbookmigration.cxx | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index b13727111d78..1158142a4f52 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1075,9 +1075,9 @@ void impl_checkRecoveryState(bool& bCrashed , bool impl_callRecoveryUI(bool bEmergencySave , bool bExistsRecoveryData) { - static OUString SERVICENAME_RECOVERYUI("com.sun.star.comp.svx.RecoveryUI"); - static OUString COMMAND_EMERGENCYSAVE("vnd.sun.star.autorecovery:/doEmergencySave"); - static OUString COMMAND_RECOVERY("vnd.sun.star.autorecovery:/doAutoRecovery"); + static const char SERVICENAME_RECOVERYUI[] = "com.sun.star.comp.svx.RecoveryUI"; + static const char COMMAND_EMERGENCYSAVE[] = "vnd.sun.star.autorecovery:/doEmergencySave"; + static const char COMMAND_RECOVERY[] = "vnd.sun.star.autorecovery:/doAutoRecovery"; css::uno::Reference< css::uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx index 22085edab261..3ace9469bc50 100644 --- a/desktop/source/migration/services/oo3extensionmigration.cxx +++ b/desktop/source/migration/services/oo3extensionmigration.cxx @@ -49,10 +49,10 @@ using namespace ::com::sun::star::uno; namespace migration { -static OUString sExtensionSubDir( "/user/uno_packages/" ); -static OUString sSubDirName( "cache" ); -static OUString sDescriptionXmlFile( "/description.xml" ); -static OUString sExtensionRootSubDirName( "/uno_packages" ); +static const char sExtensionSubDir[] = "/user/uno_packages/"; +static const char sSubDirName[] = "cache"; +static const char sDescriptionXmlFile[] = "/description.xml"; +static const char sExtensionRootSubDirName[] = "/uno_packages"; // component operations diff --git a/desktop/source/migration/services/wordbookmigration.cxx b/desktop/source/migration/services/wordbookmigration.cxx index 92b7aa9b2b46..6870450fc559 100644 --- a/desktop/source/migration/services/wordbookmigration.cxx +++ b/desktop/source/migration/services/wordbookmigration.cxx @@ -33,8 +33,8 @@ namespace migration - static OUString sSourceSubDir( "/user/wordbook" ); - static OUString sTargetSubDir( "/user/wordbook" ); + static const char sSourceSubDir[] = "/user/wordbook"; + static const char sTargetSubDir[] = "/user/wordbook"; |