diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-06-01 12:16:28 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-06-01 15:21:18 +0100 |
| commit | 511e0e173887815c4efc4d41db3ad10ec38ad003 (patch) | |
| tree | b1b39cdb042b1f76a7bde131ba46bbc3f9b2668c /desktop/source/migration/services/basicmigration.cxx | |
| parent | ed132e5b9dfaa226395534462eff956df9a7412f (diff) | |
tweak these a bit to allow better template
Diffstat (limited to 'desktop/source/migration/services/basicmigration.cxx')
| -rw-r--r-- | desktop/source/migration/services/basicmigration.cxx | 32 |
1 files changed, 6 insertions, 26 deletions
diff --git a/desktop/source/migration/services/basicmigration.cxx b/desktop/source/migration/services/basicmigration.cxx index f4adfa27ed9d..40474a23d25e 100644 --- a/desktop/source/migration/services/basicmigration.cxx +++ b/desktop/source/migration/services/basicmigration.cxx @@ -43,9 +43,8 @@ namespace migration //......................................................................... - static ::rtl::OUString sSourceUserBasic = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/user/basic" ) ); - static ::rtl::OUString sTargetUserBasic = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/user/__basic_80" ) ); - + #define sSourceUserBasic ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/user/basic")) + #define sTargetUserBasic ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/user/__basic_80")) // ============================================================================= // component operations @@ -53,35 +52,16 @@ namespace migration ::rtl::OUString BasicMigration_getImplementationName() { - static ::rtl::OUString* pImplName = 0; - if ( !pImplName ) - { - ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); - if ( !pImplName ) - { - static ::rtl::OUString aImplName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.desktop.migration.Basic" ) ); - pImplName = &aImplName; - } - } - return *pImplName; + return ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.desktop.migration.Basic")); } // ----------------------------------------------------------------------------- Sequence< ::rtl::OUString > BasicMigration_getSupportedServiceNames() { - static Sequence< ::rtl::OUString >* pNames = 0; - if ( !pNames ) - { - ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); - if ( !pNames ) - { - static Sequence< ::rtl::OUString > aNames(1); - aNames.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.migration.Basic" ) ); - pNames = &aNames; - } - } - return *pNames; + Sequence< ::rtl::OUString > aNames(1); + aNames.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.migration.Basic" ) ); + return aNames; } // ============================================================================= |