diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-03-24 14:00:06 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-03-26 12:18:08 +0100 |
| commit | d41b5a88bd4fdff79975d0a64a56d6aae2be1f22 (patch) | |
| tree | 79f755f5f8bdc4d4e9485e6afe2c12fac168413f | |
| parent | 35fe7d4365f0fd9e118d17bb4b579cf303cd6720 (diff) | |
reduce over use of static OUStrings
306 files changed, 545 insertions, 709 deletions
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx index 2c740088e452..ca210b89260e 100644 --- a/framework/source/accelerators/acceleratorconfiguration.cxx +++ b/framework/source/accelerators/acceleratorconfiguration.cxx @@ -73,12 +73,8 @@ namespace framework { - const ::rtl::OUString CFG_ENTRY_PRIMARY(RTL_CONSTASCII_USTRINGPARAM("PrimaryKeys")); - const ::rtl::OUString CFG_ENTRY_SECONDARY(RTL_CONSTASCII_USTRINGPARAM("SecondaryKeys")); - const ::rtl::OUString CFG_ENTRY_GLOBAL(RTL_CONSTASCII_USTRINGPARAM("Global")); - const ::rtl::OUString CFG_ENTRY_MODULES(RTL_CONSTASCII_USTRINGPARAM("Modules")); - const ::rtl::OUString CFG_PROP_COMMAND(RTL_CONSTASCII_USTRINGPARAM("Command")); - + const char CFG_ENTRY_SECONDARY[] = "SecondaryKeys"; + const char CFG_PROP_COMMAND[] = "Command"; #ifdef fpc #error "Who exports this define? I use it as namespace alias ..." @@ -1245,14 +1241,14 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::changesOccurred(const css::util: ::rtl::OUString sPrimarySecondary = ::utl::extractFirstFromConfigurationPath(sPath, &sPath); ::rtl::OUString sGlobalModules = ::utl::extractFirstFromConfigurationPath(sPath, &sPath); - if ( sGlobalModules.equals(CFG_ENTRY_GLOBAL) ) + if ( sGlobalModules.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_GLOBAL)) ) { ::rtl::OUString sModule; sKey = ::utl::extractFirstFromConfigurationPath(sPath, &sPath); if ( !sKey.isEmpty() && !sPath.isEmpty() ) reloadChanged(sPrimarySecondary, sGlobalModules, sModule, sKey); } - else if ( sGlobalModules.equals(CFG_ENTRY_MODULES) ) + else if ( sGlobalModules.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_MODULES)) ) { ::rtl::OUString sModule = ::utl::extractFirstFromConfigurationPath(sPath, &sPath); sKey = ::utl::extractFirstFromConfigurationPath(sPath, &sPath); @@ -1487,9 +1483,9 @@ void XCUBasedAcceleratorConfiguration::insertKeyToConfiguration( const css::awt: else m_xCfg->getByName(CFG_ENTRY_SECONDARY) >>= xAccess; - if ( m_sGlobalOrModules.equals(CFG_ENTRY_GLOBAL) ) + if ( m_sGlobalOrModules.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_GLOBAL)) ) xAccess->getByName(CFG_ENTRY_GLOBAL) >>= xContainer; - else if ( m_sGlobalOrModules.equals(CFG_ENTRY_MODULES) ) + else if ( m_sGlobalOrModules.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_MODULES)) ) { css::uno::Reference< css::container::XNameContainer > xModules; xAccess->getByName(CFG_ENTRY_MODULES) >>= xModules; @@ -1532,9 +1528,9 @@ void XCUBasedAcceleratorConfiguration::removeKeyFromConfiguration( const css::aw else m_xCfg->getByName(CFG_ENTRY_SECONDARY) >>= xAccess; - if ( m_sGlobalOrModules.equals(CFG_ENTRY_GLOBAL) ) + if ( m_sGlobalOrModules.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_GLOBAL)) ) xAccess->getByName(CFG_ENTRY_GLOBAL) >>= xContainer; - else if ( m_sGlobalOrModules.equals(CFG_ENTRY_MODULES) ) + else if ( m_sGlobalOrModules.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_MODULES)) ) { css::uno::Reference< css::container::XNameAccess > xModules; xAccess->getByName(CFG_ENTRY_MODULES) >>= xModules; @@ -1554,7 +1550,7 @@ void XCUBasedAcceleratorConfiguration::reloadChanged( const ::rtl::OUString& sPr css::uno::Reference< css::container::XNameContainer > xContainer; m_xCfg->getByName(sPrimarySecondary) >>= xAccess; - if ( sGlobalModules.equals(CFG_ENTRY_GLOBAL) ) + if ( sGlobalModules.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_GLOBAL)) ) xAccess->getByName(CFG_ENTRY_GLOBAL) >>= xContainer; else { @@ -1602,14 +1598,14 @@ void XCUBasedAcceleratorConfiguration::reloadChanged( const ::rtl::OUString& sPr xCommand->getByName(sLocale) >>= sCommand; } - if (sPrimarySecondary.equals(CFG_ENTRY_PRIMARY)) + if (sPrimarySecondary.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_PRIMARY))) { if (sCommand.isEmpty()) m_aPrimaryReadCache.removeKey(aKeyEvent); else m_aPrimaryReadCache.setKeyCommandPair(aKeyEvent, sCommand); } - else if (sPrimarySecondary.equals(CFG_ENTRY_SECONDARY)) + else if (sPrimarySecondary.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(CFG_ENTRY_SECONDARY))) { if (sCommand.isEmpty()) m_aSecondaryReadCache.removeKey(aKeyEvent); diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx index 1b34cb13c3e1..13c1a94e4dad 100644 --- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx @@ -73,16 +73,10 @@ namespace framework { -//----------------------------------------------- -// Accelerators.xcu -extern const ::rtl::OUString CFG_ENTRY_PRIMARY; -extern const ::rtl::OUString CFG_ENTRY_SECONDARY; - -extern const ::rtl::OUString CFG_ENTRY_GLOBAL; -extern const ::rtl::OUString CFG_ENTRY_MODULES; - -extern const ::rtl::OUString CFG_PROP_COMMAND; +const char CFG_ENTRY_PRIMARY[] = "PrimaryKeys"; +const char CFG_ENTRY_GLOBAL[] = "Global"; +const char CFG_ENTRY_MODULES[] = "Modules"; /** "global" type to make accelerator presets unique, so they can be used in combination with the salhelper::SingletonRef mechanism! */ diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 9edec64f4b63..73f6ac6e9eda 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -199,17 +199,17 @@ static const ::rtl::OUString CMD_DO_SESSION_RESTORE(RTL_CONSTASCII_USTRINGPARAM( static const ::rtl::OUString CMD_DO_DISABLE_RECOVERY(RTL_CONSTASCII_USTRINGPARAM("/disableRecovery")); // disable recovery and auto save (!) temp. for this office session static const ::rtl::OUString CMD_DO_SET_AUTOSAVE_STATE(RTL_CONSTASCII_USTRINGPARAM("/setAutoSaveState")); // disable/enable auto save (not crash save) for this office session -static const ::rtl::OUString REFERRER_USER(RTL_CONSTASCII_USTRINGPARAM("private:user")); +static const char REFERRER_USER[] = "private:user"; -static const ::rtl::OUString PROP_DISPATCH_ASYNCHRON(RTL_CONSTASCII_USTRINGPARAM("DispatchAsynchron")); -static const ::rtl::OUString PROP_PROGRESS(RTL_CONSTASCII_USTRINGPARAM("StatusIndicator")); -static const ::rtl::OUString PROP_SAVEPATH(RTL_CONSTASCII_USTRINGPARAM("SavePath")); -static const ::rtl::OUString PROP_ENTRY_ID(RTL_CONSTASCII_USTRINGPARAM("EntryID")); -static const ::rtl::OUString PROP_AUTOSAVE_STATE(RTL_CONSTASCII_USTRINGPARAM("AutoSaveState")); +static const char PROP_DISPATCH_ASYNCHRON[] = "DispatchAsynchron"; +static const char PROP_PROGRESS[] = "StatusIndicator"; +static const char PROP_SAVEPATH[] = "SavePath"; +static const char PROP_ENTRY_ID[] = "EntryID"; +static const char PROP_AUTOSAVE_STATE[] = "AutoSaveState"; -static const ::rtl::OUString OPERATION_START(RTL_CONSTASCII_USTRINGPARAM("start")); -static const ::rtl::OUString OPERATION_STOP(RTL_CONSTASCII_USTRINGPARAM("stop")); -static const ::rtl::OUString OPERATION_UPDATE(RTL_CONSTASCII_USTRINGPARAM("update")); +static const char OPERATION_START[] = "start"; +static const char OPERATION_STOP[] = "stop"; +static const char OPERATION_UPDATE[] = "update"; static const sal_Int32 MIN_DISCSPACE_DOCSAVE = 5; // [MB] static const sal_Int32 MIN_DISCSPACE_CONFIGSAVE = 1; // [MB] @@ -2483,7 +2483,7 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa ::comphelper::MediaDescriptor lDescriptor; // its an UI feature - so the "USER" itself must be set as referer - lDescriptor[::comphelper::MediaDescriptor::PROP_REFERRER()] <<= REFERRER_USER; + lDescriptor[::comphelper::MediaDescriptor::PROP_REFERRER()] <<= ::rtl::OUString(REFERRER_USER); lDescriptor[::comphelper::MediaDescriptor::PROP_SALVAGEDFILE()] <<= ::rtl::OUString(); // recovered documents are loaded hidden, and shown all at once, later @@ -2930,7 +2930,7 @@ css::frame::FeatureStateEvent AutoRecovery::implst_createFeatureStateEvent( aEvent.FeatureURL.Complete = AutoRecovery::implst_getJobDescription(eJob); aEvent.FeatureDescriptor = sEventType; - if (sEventType.equals(OPERATION_UPDATE) && pInfo) + if (pInfo && sEventType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(OPERATION_UPDATE))) { // pack rInfo for transport via UNO ::comphelper::NamedValueCollection aInfo; diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index ddec78ff8b73..8885258f854a 100644 --- a/sc/source/ui/vba/vbaapplication.cxx +++ b/sc/source/ui/vba/vbaapplication.cxx @@ -1787,11 +1787,10 @@ double SAL_CALL ScVbaApplication::InchesToPoints( double Inches ) throw (uno::Ru return MetricField::ConvertDoubleValue( Inches, 0, 0, FUNIT_INCH, FUNIT_POINT ); } -rtl::OUString& +rtl::OUString ScVbaApplication::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaApplication") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaApplication")); } uno::Sequence< rtl::OUString > diff --git a/sc/source/ui/vba/vbaapplication.hxx b/sc/source/ui/vba/vbaapplication.hxx index 84816902088d..ad8c83309c38 100644 --- a/sc/source/ui/vba/vbaapplication.hxx +++ b/sc/source/ui/vba/vbaapplication.hxx @@ -141,7 +141,7 @@ public: virtual double SAL_CALL InchesToPoints( double Inches ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif /* SC_VBA_APPLICATION_HXX */ diff --git a/sc/source/ui/vba/vbaassistant.cxx b/sc/source/ui/vba/vbaassistant.cxx index 3c91b9cde00b..80132d6e5b39 100644 --- a/sc/source/ui/vba/vbaassistant.cxx +++ b/sc/source/ui/vba/vbaassistant.cxx @@ -113,11 +113,10 @@ ScVbaAssistant::Name( ) throw (css::script::BasicErrorException, css::uno::Runt return m_sName; } -rtl::OUString& +rtl::OUString ScVbaAssistant::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaAssistant") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaAssistant")); } uno::Sequence< rtl::OUString > diff --git a/sc/source/ui/vba/vbaassistant.hxx b/sc/source/ui/vba/vbaassistant.hxx index 8490927c3240..01662cbc7930 100644 --- a/sc/source/ui/vba/vbaassistant.hxx +++ b/sc/source/ui/vba/vbaassistant.hxx @@ -64,7 +64,7 @@ public: virtual ::rtl::OUString SAL_CALL Name( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sc/source/ui/vba/vbaaxes.cxx b/sc/source/ui/vba/vbaaxes.cxx index ae182c8a795e..2ecc2ef9caaa 100644 --- a/sc/source/ui/vba/vbaaxes.cxx +++ b/sc/source/ui/vba/vbaaxes.cxx @@ -183,11 +183,10 @@ ScVbaAxes::createCollectionObject(const css::uno::Any& aSource) return aSource; // pass through ( it's already an XAxis object } -rtl::OUString& +rtl::OUString ScVbaAxes::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaAxes") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaAxes")); } uno::Sequence< rtl::OUString > diff --git a/sc/source/ui/vba/vbaaxes.hxx b/sc/source/ui/vba/vbaaxes.hxx index f135f8e65c71..702c7bea836b 100644 --- a/sc/source/ui/vba/vbaaxes.hxx +++ b/sc/source/ui/vba/vbaaxes.hxx @@ -44,7 +44,7 @@ public: css::uno::Any SAL_CALL Item( const css::uno::Any& aIndex, const css::uno::Any& aIndex2 ) throw (css::uno::RuntimeException); virtual css::uno::Any createCollectionObject(const css::uno::Any&); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); static css::uno::Reference< ov::excel::XAxis > createAxis( const css::uno::Reference< ov::excel::XChart >& xChart, const css::uno::Reference< css::uno::XComponentContext >& xContext, sal_Int32 nType, sal_Int32 nAxisGroup ) throw ( css::uno::RuntimeException ); }; diff --git a/sc/source/ui/vba/vbaaxis.cxx b/sc/source/ui/vba/vbaaxis.cxx index 28dbc8aab1a0..0c3ff43e57fb 100644 --- a/sc/source/ui/vba/vbaaxis.cxx +++ b/sc/source/ui/vba/vbaaxis.cxx @@ -647,11 +647,10 @@ void SAL_CALL ScVbaAxis::setLeft( double left ) throw (css::script::BasicErrorEx oShapeHelper->setLeft( left ); } -rtl::OUString& +rtl::OUString ScVbaAxis::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaAxis") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaAxis")); } uno::Sequence< rtl::OUString > diff --git a/sc/source/ui/vba/vbaaxis.hxx b/sc/source/ui/vba/vbaaxis.hxx index f139828319bd..ea03f5e0eda9 100644 --- a/sc/source/ui/vba/vbaaxis.hxx +++ b/sc/source/ui/vba/vbaaxis.hxx @@ -94,7 +94,7 @@ public: virtual void SAL_CALL setLeft( double left ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sc/source/ui/vba/vbaaxistitle.cxx b/sc/source/ui/vba/vbaaxistitle.cxx index cc5b0d791b13..f2d9ddeb36c8 100644 --- a/sc/source/ui/vba/vbaaxistitle.cxx +++ b/sc/source/ui/vba/vbaaxistitle.cxx @@ -34,11 +34,10 @@ ScVbaAxisTitle::ScVbaAxisTitle( const uno::Reference< XHelperInterface >& xParen { } -rtl::OUString& +rtl::OUString ScVbaAxisTitle::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaAxisTitle") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaAxisTitle")); } uno::Sequence< rtl::OUString > diff --git a/sc/source/ui/vba/vbaaxistitle.hxx b/sc/source/ui/vba/vbaaxistitle.hxx index 0360e40be4aa..f461fa761e15 100644 --- a/sc/source/ui/vba/vbaaxistitle.hxx +++ b/sc/source/ui/vba/vbaaxistitle.hxx @@ -39,7 +39,7 @@ class ScVbaAxisTitle : public AxisTitleBase public: ScVbaAxisTitle( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& _xTitleShape ); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif diff --git a/sc/source/ui/vba/vbaborders.cxx b/sc/source/ui/vba/vbaborders.cxx index 7fbe157e2bdf..46719890a00c 100644 --- a/sc/source/ui/vba/vbaborders.cxx +++ b/sc/source/ui/vba/vbaborders.cxx @@ -152,10 +152,9 @@ private: } ScVbaBorder(); // no impl protected: - virtual rtl::OUString& getServiceImplName() + virtual rtl::OUString getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaBorder") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaBorder")); } virtual css::uno::Sequence<rtl::OUString> getServiceNames() { @@ -555,11 +554,10 @@ void SAL_CALL ScVbaBorders::setWeight( const uno::Any& _weight ) throw (uno::Run } -rtl::OUString& +rtl::OUString ScVbaBorders::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaBorders") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaBorders")); } uno::Sequence< rtl::OUString > diff --git a/sc/source/ui/vba/vbaborders.hxx b/sc/source/ui/vba/vbaborders.hxx index 0164328a9e83..0dd088dc8b19 100644 --- a/sc/source/ui/vba/vbaborders.hxx +++ b/sc/source/ui/vba/vbaborders.hxx @@ -69,7 +69,7 @@ public: virtual css::uno::Any SAL_CALL getWeight() throw (css::uno::RuntimeException); virtual void SAL_CALL setWeight( const css::uno::Any& ) throw (css::uno::RuntimeException); // xxxxBASE - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sc/source/ui/vba/vbacharacters.cxx b/sc/source/ui/vba/vbacharacters.cxx index 2b163afc2a74..d5ec10974b39 100644 --- a/sc/source/ui/vba/vbacharacters.cxx +++ b/sc/source/ui/vba/vbacharacters.cxx @@ -116,11 +116,10 @@ ScVbaCharacters::Delete( ) throw (css::uno::RuntimeException) } -rtl::OUString& +rtl::OUString ScVbaCharacters::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCharacters") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaCharacters")); } uno::Sequence< rtl::OUString > diff --git a/sc/source/ui/vba/vbacharacters.hxx b/sc/source/ui/vba/vbacharacters.hxx index b9711fcb86df..31dc9b22415d 100644 --- a/sc/source/ui/vba/vbacharacters.hxx +++ b/sc/source/ui/vba/vbacharacters.hxx @@ -67,7 +67,7 @@ public: // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sc/source/ui/vba/vbachart.cxx b/sc/source/ui/vba/vbachart.cxx index db9d23ea2c6a..f706b3cd66b2 100644 --- a/sc/source/ui/vba/vbachart.cxx +++ b/sc/source/ui/vba/vbachart.cxx @@ -1062,11 +1062,10 @@ ScVbaChart::getAxisPropertySet(sal_Int32 _nAxisType, sal_Int32 _nAxisGroup) thro } -rtl::OUString& +rtl::OUString ScVbaChart::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaChart") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaChart")); } uno::Sequence< rtl::OUString > diff --git a/sc/source/ui/vba/vbachart.hxx b/sc/source/ui/vba/vbachart.hxx index e984ecf7bbed..43409be7fe41 100644 --- a/sc/source/ui/vba/vbachart.hxx +++ b/sc/source/ui/vba/vbachart.hxx @@ -95,7 +95,7 @@ public: virtual css::uno::Reference< ov::excel::XChartTitle > SAL_CALL getChartTitle( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual css::uno::Any SAL_CALL Axes( const css::uno::Any& Type, const css::uno::Any& AxisGroup ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sc/source/ui/vba/vbachartobject.cxx b/sc/source/ui/vba/vbachartobject.cxx index 4a02bdabc1c7..da5086ded68d 100644 --- a/sc/source/ui/vba/vbachartobject.cxx +++ b/sc/source/ui/vba/vbachartobject.cxx @@ -137,11 +137,10 @@ ScVbaChartObject::getChart() throw (css::uno::RuntimeException) return new ScVbaChart( this, mxContext, xEmbeddedObjectSupplier->getEmbeddedObject(), xTableChart ); } -rtl::OUString& +rtl::OUString ScVbaChartObject::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaChartObject") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaChartObject")); } uno::Sequence< rtl::OUString > diff --git a/sc/source/ui/vba/vbachartobject.hxx b/sc/source/ui/vba/vbachartobject.hxx index 5b54069bc199..24616bd57ab8 100644 --- a/sc/source/ui/vba/vbachartobject.hxx +++ b/sc/source/ui/vba/vbachartobject.hxx @@ -64,7 +64,7 @@ public: virtual void SAL_CALL Delete() throw ( css::script::BasicErrorException ); virtual void Activate() throw ( css::script::BasicErrorException ); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sc/source/ui/vba/vbachartobjects.cxx b/sc/source/ui/vba/vbachartobjects.cxx index 869311d678e7..1a790d619b4e 100644 --- a/sc/source/ui/vba/vbachartobjects.cxx +++ b/sc/source/ui/vba/vbachartobjects.cxx @@ -174,11 +174,10 @@ ScVbaChartObjects::createCollectionObject( const css::uno::Any& aSource ) return uno::makeAny( uno::Reference< excel::XChartObject > ( new ScVbaChartObject( getParent(), mxContext, xTableChart, xDrawPageSupplier ) ) ); } -rtl::OUString& +rtl::OUString ScVbaChartObjects::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaChartObjects") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaChartObjects")); } css::uno::Sequence<rtl::OUString> diff --git a/sc/source/ui/vba/vbachartobjects.hxx b/sc/source/ui/vba/vbachartobjects.hxx index ee0b7b13f2cd..832621b57c6d 100644 --- a/sc/source/ui/vba/vbachartobjects.hxx +++ b/sc/source/ui/vba/vbachartobjects.hxx @@ -69,7 +69,7 @@ public: // ScVbaCollectionBaseImpl virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); // ChartObjects_BASE - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sc/source/ui/vba/vbacharttitle.cxx b/sc/source/ui/vba/vbacharttitle.cxx index 09f678704422..ebeb21285f75 100644 --- a/sc/source/ui/vba/vbacharttitle.cxx +++ b/sc/source/ui/vba/vbacharttitle.cxx @@ -34,11 +34,10 @@ ScVbaChartTitle::ScVbaChartTitle( const uno::Reference< XHelperInterface >& xPar { } -rtl::OUString& +rtl::OUString ScVbaChartTitle::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaChartTitle") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaChartTitle")); } uno::Sequence< rtl::OUString > diff --git a/sc/source/ui/vba/vbacharttitle.hxx b/sc/source/ui/vba/vbacharttitle.hxx index db0f3e31529f..c8cc6d3c62fd 100644 --- a/sc/source/ui/vba/vbacharttitle.hxx +++ b/sc/source/ui/vba/vbacharttitle.hxx @@ -39,7 +39,7 @@ class ScVbaChartTitle : public ChartTitleBase public: ScVbaChartTitle( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& _xTitleShape ); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif diff --git a/sc/source/ui/vba/vbacomment.cxx b/sc/source/ui/vba/vbacomment.cxx index bfb5d62f39f2..bce3c19673f5 100644 --- a/sc/source/ui/vba/vbacomment.cxx +++ b/sc/source/ui/vba/vbacomment.cxx @@ -229,11 +229,10 @@ ScVbaComment::Text( const uno::Any& aText, const uno::Any& aStart, const uno::An return sAnnoText; } -rtl::OUString& +rtl::OUString ScVbaComment::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaComment") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaComment")); } uno::Sequence< rtl::OUString > diff --git a/sc/source/ui/vba/vbacomment.hxx b/sc/source/ui/vba/vbacomment.hxx index 81670dca678a..352d782f9edb 100644 --- a/sc/source/ui/vba/vbacomment.hxx +++ b/sc/source/ui/vba/vbacomment.hxx @@ -74,7 +74,7 @@ public: virtual css::uno::Reference< ov::excel::XComment > SAL_CALL Previous() throw (css::uno::RuntimeException); virtual rtl::OUString SAL_CALL Text( const css::uno::Any& Text, const css::uno::Any& Start, const css::uno::Any& Overwrite ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sc/source/ui/vba/vbacomments.cxx b/sc/source/ui/vba/vbacomments.cxx index c4c290da3b2a..7557efc32bc0 100644 --- a/sc/source/ui/vba/vbacomments.cxx +++ b/sc/source/ui/vba/vbacomments.cxx @@ -97,11 +97,10 @@ ScVbaComments::getElementType() throw (uno::RuntimeException) return excel::XComment::static_type(0); } -rtl::OUString& +rtl::OUString ScVbaComments::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaComments") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaComments")); } css::uno::Sequence<rtl::OUString> diff --git a/sc/source/ui/vba/vbacomments.hxx b/sc/source/ui/vba/vbacomments.hxx index 8b65a3cafc8a..fb578eb3df9a 100644 --- a/sc/source/ui/vba/vbacomments.hxx +++ b/sc/source/ui/vba/vbacomments.hxx @@ -55,7 +55,7 @@ public: // ScVbaComments_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); private: diff --git a/sc/source/ui/vba/vbadialog.cxx b/sc/source/ui/vba/vbadialog.cxx index 493d6b89db2f..5477dfd3caaa 100644 --- a/sc/source/ui/vba/vbadialog.cxx +++ b/sc/source/ui/vba/vbadialog.cxx @@ -85,11 +85,10 @@ ScVbaDialog::mapIndexToName( sal_Int32 nIndex ) return rtl::OUString(); } -rtl::OUString& +rtl::OUString ScVbaDialog::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaDialog") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaDialog")); } uno::Sequence< rtl::OUString > diff --git a/sc/source/ui/vba/vbadialog.hxx b/sc/source/ui/vba/vbadialog.hxx index 9a336937a7c1..3bde7a7ff987 100644 --- a/sc/source/ui/vba/vbadialog.hxx +++ b/sc/source/ui/vba/vbadialog.hxx @@ -44,7 +44,7 @@ public: // Methods virtual rtl::OUString mapIndexToName( sal_Int32 nIndex ); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); static sal_Int32 GetSupportedDialogCount(); diff --git a/sc/source/ui/vba/vbadialogs.cxx b/sc/source/ui/vba/vbadialogs.cxx index c64babea9069..f196ee2fa90c 100644 --- a/sc/source/ui/vba/vbadialogs.cxx +++ b/sc/source/ui/vba/vbadialogs.cxx @@ -46,11 +46,10 @@ ScVbaDialogs::Item( const uno::Any &aItem ) throw (uno::RuntimeException) return uno::Any( aDialog ); } -rtl::OUString& +rtl::OUString ScVbaDialogs::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaDialogs") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaDialogs")); } uno::Sequence< rtl::OUString > diff --git a/sc/source/ui/vba/vbadialogs.hxx b/sc/source/ui/vba/vbadialogs.hxx index 70c818fa0031..cda36dd18424 100644 --- a/sc/source/ui/vba/vbadialogs.hxx +++ b/sc/source/ui/vba/vbadialogs.hxx @@ -50,7 +50,7 @@ public: // XDialogs virtual void SAL_CALL Dummy() throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sc/source/ui/vba/vbafiledialog.cxx b/sc/source/ui/vba/vbafiledialog.cxx index cb4917d4c9c3..7ae0a9eafb7a 100644 --- a/sc/source/ui/vba/vbafiledialog.cxx +++ b/sc/source/ui/vba/vbafiledialog.cxx @@ -54,11 +54,10 @@ ScVbaFileDialog::~ScVbaFileDialog() } } -rtl::OUString& +rtl::OUString ScVbaFileDialog::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaFileDialog") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaFileDialog")); } css::uno::Sequence<rtl::OUString> diff --git a/sc/source/ui/vba/vbafiledialog.hxx b/sc/source/ui/vba/vbafiledialog.hxx index ac905f541185..16ed4de39a01 100644 --- a/sc/source/ui/vba/vbafiledialog.hxx +++ b/sc/source/ui/vba/vbafiledialog.hxx @@ -46,7 +46,7 @@ public: virtual ~ScVbaFileDialog() ; // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); //XFileDialog virtual css::uno::Reference< ov::XFileDialogSelectedItems > SAL_CALL getSelectedItems() throw (css::uno::RuntimeException); diff --git a/sc/source/ui/vba/vbafiledialogselecteditems.cxx b/sc/source/ui/vba/vbafiledialogselecteditems.cxx index 547841a2c987..21fa2e75d88c 100644 --- a/sc/source/ui/vba/vbafiledialogselecteditems.cxx +++ b/sc/source/ui/vba/vbafiledialogselecteditems.cxx @@ -40,12 +40,11 @@ VbaFileDialogSelectedItems::VbaFileDialogSelectedItems( const css::uno::Referenc } -rtl::OUString& VbaFileDialogSelectedItems::getServiceImplName() +rtl::OUString VbaFileDialogSelectedItems::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("VbaFileDialogSelectedItems") ); - return sImplName; - + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VbaFileDialogSelectedItems")); } + css::uno::Sequence<rtl::OUString> VbaFileDialogSelectedItems::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/sc/source/ui/vba/vbafiledialogselecteditems.hxx b/sc/source/ui/vba/vbafiledialogselecteditems.hxx index b43364dff709..030242a9e867 100644 --- a/sc/source/ui/vba/vbafiledialogselecteditems.hxx +++ b/sc/source/ui/vba/vbafiledialogselecteditems.hxx @@ -50,7 +50,7 @@ public: virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); protected: - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); private: }; diff --git a/sc/source/ui/vba/vbafilesearch.cxx b/sc/source/ui/vba/vbafilesearch.cxx index 928ed9a0c5c1..f526011c629e 100644 --- a/sc/source/ui/vba/vbafilesearch.cxx +++ b/sc/source/ui/vba/vbafilesearch.cxx @@ -225,10 +225,9 @@ Reference< XFoundFiles > SAL_CALL ScVbaFileSearch::getFoundFiles() throw (css::u return xFoundFiles; } -rtl::OUString& ScVbaFileSearch::getServiceImplName() +rtl::OUString ScVbaFileSearch::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("VbaFileSearch") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VbaFileSearch")); } css::uno::Sequence< rtl::OUString > ScVbaFileSearch::getServiceNames() diff --git a/sc/source/ui/vba/vbafilesearch.hxx b/sc/source/ui/vba/vbafilesearch.hxx index 33e9caa53ca6..f89fd11577e4 100644 --- a/sc/source/ui/vba/vbafilesearch.hxx +++ b/sc/source/ui/vba/vbafilesearch.hxx @@ -71,7 +71,7 @@ public: virtual void SAL_CALL NewSearch( ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence< rtl::OUString > getServiceNames(); }; diff --git a/sc/source/ui/vba/vbafont.cxx b/sc/source/ui/vba/vbafont.cxx index c3630abb9b06..2be56260987b 100644 --- a/sc/source/ui/vba/vbafont.cxx +++ b/sc/source/ui/vba/vbafont.cxx @@ -482,11 +482,10 @@ ScVbaFont::getOutlineFont() throw (uno::RuntimeException) return mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharContoured" ) ) ); } -rtl::OUString& +rtl::OUString ScVbaFont::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaFont") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaFont")); } uno::Sequence< rtl::OUString > diff --git a/sc/source/ui/vba/vbafont.hxx b/sc/source/ui/vba/vbafont.hxx index b87672a1223a..852791927168 100644 --- a/sc/source/ui/vba/vbafont.hxx +++ b/sc/source/ui/vba/vbafont.hxx @@ -80,7 +80,7 @@ public: virtual css::uno::Any SAL_CALL getOutlineFont() throw (css::uno::RuntimeException) ; virtual void SAL_CALL setOutlineFont( const css::uno::Any& _outlinefont ) throw (css::uno::RuntimeException) ; // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx index 13bf8f84aac9..5688021719b6 100644 --- a/sc/source/ui/vba/vbaformat.cxx +++ b/sc/source/ui/vba/vbaformat.cxx @@ -800,11 +800,10 @@ ScVbaFormat<Ifc1>::getXPropertyState() throw ( uno::RuntimeException ) } template< typename Ifc1 > -rtl::OUString& +rtl::OUString ScVbaFormat<Ifc1>::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaFormat") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaFormat")); } template< typename Ifc1 > diff --git a/sc/source/ui/vba/vbaformat.hxx b/sc/source/ui/vba/vbaformat.hxx index 3646665f5b24..d2c0e0908135 100644 --- a/sc/source/ui/vba/vbaformat.hxx +++ b/sc/source/ui/vba/vbaformat.hxx @@ -102,7 +102,7 @@ public: virtual void SAL_CALL setReadingOrder( const css::uno::Any& ReadingOrder ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getReadingOrder( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sc/source/ui/vba/vbaformatcondition.cxx b/sc/source/ui/vba/vbaformatcondition.cxx index 9874a44c2618..7a722439416e 100644 --- a/sc/source/ui/vba/vbaformatcondition.cxx +++ b/sc/source/ui/vba/vbaformatcondition.cxx @@ -157,11 +157,10 @@ ScVbaFormatCondition::notifyRange() throw ( script::BasicErrorException ) } } -rtl::OUString& +rtl::OUString ScVbaFormatCondition::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaFormatCondition") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaFormatCondition")); } uno::Sequence< rtl::OUString > diff --git a/sc/source/ui/vba/vbaformatcondition.hxx b/sc/source/ui/vba/vbaformatcondition.hxx index aa1a3e5bb740..fec0b0be4e7d 100644 --- a/sc/source/ui/vba/vbaformatcondition.hxx +++ b/sc/source/ui/vba/vbaformatcondition.hxx @@ -65,7 +65,7 @@ public: virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& Index ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual css::uno::Reference< ::ooo::vba::excel::XFont > SAL_CALL Font( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif diff --git a/sc/source/ui/vba/vbaformatconditions.cxx b/sc/source/ui/vba/vbaformatconditions.cxx index ddf8ef4247dd..96f61c7432bc 100644 --- a/sc/source/ui/vba/vbaformatconditions.cxx +++ b/sc/source/ui/vba/vbaformatconditions.cxx @@ -269,11 +269,10 @@ ScVbaFormatConditions::removeFormatCondition( const rtl::OUString& _sStyleName, } } -rtl::OUString& +rtl::OUString ScVbaFormatConditions::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaFormatConditions") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaFormatConditions")); } uno::Sequence< rtl::OUString > diff --git a/sc/source/ui/vba/vbaformatconditions.hxx b/sc/source/ui/vba/vbaformatconditions.hxx index e191e277c2cf..a64b49fe96c6 100644 --- a/sc/source/ui/vba/vbaformatconditions.hxx +++ b/sc/source/ui/vba/vbaformatconditions.hxx @@ -71,7 +71,7 @@ public: virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); virtual css::uno::Any createCollectionObject(const css::uno::Any&); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sc/source/ui/vba/vbafoundfiles.cxx b/sc/source/ui/vba/vbafoundfiles.cxx index efbddd3451b1..b4229bcecec9 100644 --- a/sc/source/ui/vba/vbafoundfiles.cxx +++ b/sc/source/ui/vba/vbafoundfiles.cxx @@ -126,10 +126,9 @@ css::uno::Type VbaFoundFiles::getElementType() throw (css::uno::RuntimeException return ov::XFoundFiles::static_type(0); } -rtl::OUString& VbaFoundFiles::getServiceImplName() +rtl::OUString VbaFoundFiles::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("VbaFoundFiles") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VbaFoundFiles")); } css::uno::Sequence< rtl::OUString > VbaFoundFiles::getServiceNames() diff --git a/sc/source/ui/vba/vbafoundfiles.hxx b/sc/source/ui/vba/vbafoundfiles.hxx index 7a0a1e7b2a19..79fd52604598 100644 --- a/sc/source/ui/vba/vbafoundfiles.hxx +++ b/sc/source/ui/vba/vbafoundfiles.hxx @@ -82,7 +82,7 @@ public: virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence< rtl::OUString > getServiceNames(); }; diff --git a/sc/source/ui/vba/vbaglobals.cxx b/sc/source/ui/vba/vbaglobals.cxx index 59b8108858d5..43df5dfe15e7 100644 --- a/sc/source/ui/vba/vbaglobals.cxx +++ b/sc/source/ui/vba/vbaglobals.cxx @@ -281,11 +281,10 @@ ScVbaGlobals::getAvailableServiceNames( ) throw (uno::RuntimeException) return serviceNames; } -rtl::OUString& +rtl::OUString ScVbaGlobals::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaGlobals") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaGlobals")); } uno::Sequence< rtl::OUString > diff --git a/sc/source/ui/vba/vbaglobals.hxx b/sc/source/ui/vba/vbaglobals.hxx index a320ebdf94f6..01d80f4b382e 100644 --- a/sc/source/ui/vba/vbaglobals.hxx +++ b/sc/source/ui/vba/vbaglobals.hxx @@ -91,7 +91,7 @@ typedef ::cppu::ImplInheritanceHelper1< VbaGlobalsBase, ov::excel::XGlobals > Sc // XMultiServiceFactory virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames( ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif // diff --git a/sc/source/ui/vba/vbainterior.cxx b/sc/source/ui/vba/vbainterior.cxx index 58675d860a66..b5e4746fe141 100644 --- a/sc/source/ui/vba/vbainterior.cxx +++ b/sc/source/ui/vba/vbainterior.cxx @@ -394,11 +394,10 @@ ScVbaInterior::setPatternColorIndex( const uno::Any& _patterncolorindex ) throw throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Invalid Pattern Color" )), uno::Reference< uno::XInterface >() ); } -rtl::OUString& +rtl::OUString ScVbaInterior::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaInterior") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaInterior")); } uno::Sequence< rtl::OUString > diff --git a/sc/source/ui/vba/vbainterior.hxx b/sc/source/ui/vba/vbainterior.hxx index 9dfb14646487..e25a06d48a25 100644 --- a/sc/source/ui/vba/vbainterior.hxx +++ b/sc/source/ui/vba/vbainterior.hxx @@ -82,7 +82,7 @@ public: virtual css::uno::Any SAL_CALL getPatternColorIndex() throw (css::uno::RuntimeException); virtual void SAL_CALL setPatternColorIndex( const css::uno::Any& _patterncolorindex ) throw (css::uno::RuntimeException); //XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif diff --git a/sc/source/ui/vba/vbamenu.cxx b/sc/source/ui/vba/vbamenu.cxx index ae6d4e4b1223..19c1392eeb0c 100644 --- a/sc/source/ui/vba/vbamenu.cxx +++ b/sc/source/ui/vba/vbamenu.cxx @@ -66,12 +66,12 @@ ScVbaMenu::MenuItems( const uno::Any& aIndex ) throw (script::BasicErrorExceptio return uno::makeAny( xMenuItems ); } -rtl::OUString& +rtl::OUString ScVbaMenu::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaMenu") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaMenu")); } + uno::Sequence<rtl::OUString> ScVbaMenu::getServiceNames() { diff --git a/sc/source/ui/vba/vbamenu.hxx b/sc/source/ui/vba/vbamenu.hxx index 3141b5718447..392053929a29 100644 --- a/sc/source/ui/vba/vbamenu.hxx +++ b/sc/source/ui/vba/vbamenu.hxx @@ -49,7 +49,7 @@ public: virtual css::uno::Any SAL_CALL MenuItems( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif//SC_VBA_MENU_HXX diff --git a/sc/source/ui/vba/vbamenubar.cxx b/sc/source/ui/vba/vbamenubar.cxx index 1ad19a6a3b51..6d9b625326d5 100644 --- a/sc/source/ui/vba/vbamenubar.cxx +++ b/sc/source/ui/vba/vbamenubar.cxx @@ -48,12 +48,12 @@ ScVbaMenuBar::Menus( const uno::Any& aIndex ) throw (script::BasicErrorException return uno::makeAny( xMenus ); } -rtl::OUString& +rtl::OUString ScVbaMenuBar::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaMenuBar") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaMenuBar")); } + uno::Sequence<rtl::OUString> ScVbaMenuBar::getServiceNames() { diff --git a/sc/source/ui/vba/vbamenubar.hxx b/sc/source/ui/vba/vbamenubar.hxx index 15253d4e73cb..f48956ca1941 100644 --- a/sc/source/ui/vba/vbamenubar.hxx +++ b/sc/source/ui/vba/vbamenubar.hxx @@ -45,7 +45,7 @@ public: virtual css::uno::Any SAL_CALL Menus( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif//SC_VBA_MENUBAR_HXX diff --git a/sc/source/ui/vba/vbamenubars.cxx b/sc/source/ui/vba/vbamenubars.cxx index ec1859173101..33d43897657f 100644 --- a/sc/source/ui/vba/vbamenubars.cxx +++ b/sc/source/ui/vba/vbamenubars.cxx @@ -116,12 +116,12 @@ ScVbaMenuBars::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) throw } // XHelperInterface -rtl::OUString& +rtl::OUString ScVbaMenuBars::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaMenuBars") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaMenuBars")); } + uno::Sequence<rtl::OUString> ScVbaMenuBars::getServiceNames() { diff --git a/sc/source/ui/vba/vbamenubars.hxx b/sc/source/ui/vba/vbamenubars.hxx index 2579eb74f8aa..cc52aa699b44 100644 --- a/sc/source/ui/vba/vbamenubars.hxx +++ b/sc/source/ui/vba/vbamenubars.hxx @@ -55,7 +55,7 @@ public: virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException); virtual css::uno::Any SAL_CALL Item( const css::uno::Any& aIndex, const css::uno::Any& /*aIndex2*/ ) throw( css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sc/source/ui/vba/vbamenuitem.cxx b/sc/source/ui/vba/vbamenuitem.cxx index 8843544f31f0..37a701e8e726 100644 --- a/sc/source/ui/vba/vbamenuitem.cxx +++ b/sc/source/ui/vba/vbamenuitem.cxx @@ -64,12 +64,12 @@ ScVbaMenuItem::Delete( ) throw (script::BasicErrorException, uno::RuntimeExcepti m_xCommandBarControl->Delete(); } -rtl::OUString& +rtl::OUString ScVbaMenuItem::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaMenuItem") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaMenuItem")); } + uno::Sequence<rtl::OUString> ScVbaMenuItem::getServiceNames() { diff --git a/sc/source/ui/vba/vbamenuitem.hxx b/sc/source/ui/vba/vbamenuitem.hxx index 5c22b3409a28..4ab24307118f 100644 --- a/sc/source/ui/vba/vbamenuitem.hxx +++ b/sc/source/ui/vba/vbamenuitem.hxx @@ -50,7 +50,7 @@ public: virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif//SC_VBA_MENUITEM_HXX diff --git a/sc/source/ui/vba/vbamenuitems.cxx b/sc/source/ui/vba/vbamenuitems.cxx index 5722830fce0a..8df35adac119 100644 --- a/sc/source/ui/vba/vbamenuitems.cxx +++ b/sc/source/ui/vba/vbamenuitems.cxx @@ -132,12 +132,12 @@ uno::Reference< excel::XMenuItem > SAL_CALL ScVbaMenuItems::Add( const rtl::OUSt } // XHelperInterface -rtl::OUString& +rtl::OUString ScVbaMenuItems::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaMenuItems") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaMenuItems")); } + uno::Sequence<rtl::OUString> ScVbaMenuItems::getServiceNames() { diff --git a/sc/source/ui/vba/vbamenuitems.hxx b/sc/source/ui/vba/vbamenuitems.hxx index 8a8dd6021b2d..49410804b388 100644 --- a/sc/source/ui/vba/vbamenuitems.hxx +++ b/sc/source/ui/vba/vbamenuitems.hxx @@ -54,7 +54,7 @@ public: virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XMenuItem > SAL_CALL Add( const rtl::OUString& Caption, const css::uno::Any& OnAction, const css::uno::Any& ShortcutKey, const css::uno::Any& Before, const css::uno::Any& Restore, const css::uno::Any& StatusBar, const css::uno::Any& HelpFile, const css::uno::Any& HelpContextID ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sc/source/ui/vba/vbamenus.cxx b/sc/source/ui/vba/vbamenus.cxx index e604d7b59242..b7d50e590a92 100644 --- a/sc/source/ui/vba/vbamenus.cxx +++ b/sc/source/ui/vba/vbamenus.cxx @@ -118,12 +118,12 @@ uno::Reference< excel::XMenu > SAL_CALL ScVbaMenus::Add( const rtl::OUString& Ca } // XHelperInterface -rtl::OUString& +rtl::OUString ScVbaMenus::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaMenus") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaMenus")); } + uno::Sequence<rtl::OUString> ScVbaMenus::getServiceNames() { diff --git a/sc/source/ui/vba/vbamenus.hxx b/sc/source/ui/vba/vbamenus.hxx index a85e73bdb394..49180037b375 100644 --- a/sc/source/ui/vba/vbamenus.hxx +++ b/sc/source/ui/vba/vbamenus.hxx @@ -54,7 +54,7 @@ public: virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XMenu > SAL_CALL Add( const rtl::OUString& Caption, const css::uno::Any& Before, const css::uno::Any& Restore ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sc/source/ui/vba/vbaname.cxx b/sc/source/ui/vba/vbaname.cxx index fab19796ced9..6509f628edc0 100644 --- a/sc/source/ui/vba/vbaname.cxx +++ b/sc/source/ui/vba/vbaname.cxx @@ -210,11 +210,10 @@ ScVbaName::Delete() throw (css::uno::RuntimeException) mxNames->removeByName( mxNamedRange->getName() ); } -rtl::OUString& +rtl::OUString ScVbaName::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaName") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaName")); } uno::Sequence< rtl::OUString > diff --git a/sc/source/ui/vba/vbaname.hxx b/sc/source/ui/vba/vbaname.hxx index fc6d210ffa10..16422845b7c5 100644 --- a/sc/source/ui/vba/vbaname.hxx +++ b/sc/source/ui/vba/vbaname.hxx @@ -82,7 +82,7 @@ public: virtual void SAL_CALL Delete() throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif /* SC_VBA_NAME_HXX */ diff --git a/sc/source/ui/vba/vbanames.cxx b/sc/source/ui/vba/vbanames.cxx index 01910c7e354b..ea06ef21e054 100644 --- a/sc/source/ui/vba/vbanames.cxx +++ b/sc/source/ui/vba/vbanames.cxx @@ -239,11 +239,10 @@ ScVbaNames::createCollectionObject( const uno::Any& aSource ) return uno::makeAny( uno::Reference< excel::XName > ( new ScVbaName( getParent(), mxContext, xName, mxNames , mxModel ) ) ); } -rtl::OUString& +rtl::OUString ScVbaNames::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaNames") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaNames")); } css::uno::Sequence<rtl::OUString> diff --git a/sc/source/ui/vba/vbanames.hxx b/sc/source/ui/vba/vbanames.hxx index a3fddb13286d..b2404e776605 100644 --- a/sc/source/ui/vba/vbanames.hxx +++ b/sc/source/ui/vba/vbanames.hxx @@ -75,7 +75,7 @@ public: virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); // ScVbaNames_BASE - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sc/source/ui/vba/vbaoleobject.cxx b/sc/source/ui/vba/vbaoleobject.cxx index 05cc60de33d7..1f26ccf986a3 100644 --- a/sc/source/ui/vba/vbaoleobject.cxx +++ b/sc/source/ui/vba/vbaoleobject.cxx @@ -133,11 +133,11 @@ ScVbaOLEObject::setWidth( double _width ) throw (uno::RuntimeException) { m_xControl->setWidth( _width ); } -rtl::OUString& + +rtl::OUString ScVbaOLEObject::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaOLEObject") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaOLEObject")); } uno::Sequence< rtl::OUString > diff --git a/sc/source/ui/vba/vbaoleobject.hxx b/sc/source/ui/vba/vbaoleobject.hxx index e329789cd7a4..136f536e0da8 100644 --- a/sc/source/ui/vba/vbaoleobject.hxx +++ b/sc/source/ui/vba/vbaoleobject.hxx @@ -41,7 +41,7 @@ class ScVbaOLEObject : public OLEObjectImpl_BASE { protected: css::uno::Reference< css::drawing::XControlShape > m_xControlShape; - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); css::uno::Reference< ov::msforms::XControl> m_xControl; public: diff --git a/sc/source/ui/vba/vbaoleobjects.cxx b/sc/source/ui/vba/vbaoleobjects.cxx index 7cecaff5784b..3d509bda5330 100644 --- a/sc/source/ui/vba/vbaoleobjects.cxx +++ b/sc/source/ui/vba/vbaoleobjects.cxx @@ -166,11 +166,11 @@ ScVbaOLEObjects::getElementType() throw (uno::RuntimeException) { return ooo::vba::excel::XOLEObject::static_type(0); } -rtl::OUString& + +rtl::OUString ScVbaOLEObjects::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaOLEObjects") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaOLEObjects")); } uno::Sequence< rtl::OUString > diff --git a/sc/source/ui/vba/vbaoleobjects.hxx b/sc/source/ui/vba/vbaoleobjects.hxx index c949d578422a..890ee56b9ccb 100644 --- a/sc/source/ui/vba/vbaoleobjects.hxx +++ b/sc/source/ui/vba/vbaoleobjects.hxx @@ -40,7 +40,7 @@ class ScVbaOLEObjects : public OLEObjectsImpl_BASE { protected: virtual css::uno::Any getItemByStringIndex( const rtl::OUString& sIndex ) throw (css::uno::RuntimeException); - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); public: ScVbaOLEObjects( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, diff --git a/sc/source/ui/vba/vbaoutline.cxx b/sc/source/ui/vba/vbaoutline.cxx index caf506cdf73b..4b2f8f946010 100644 --- a/sc/source/ui/vba/vbaoutline.cxx +++ b/sc/source/ui/vba/vbaoutline.cxx @@ -46,11 +46,10 @@ ScVbaOutline::ShowLevels( const uno::Any& RowLevels, const uno::Any& ColumnLevel } } -rtl::OUString& +rtl::OUString ScVbaOutline::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaOutline") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaOutline")); } uno::Sequence< rtl::OUString > diff --git a/sc/source/ui/vba/vbaoutline.hxx b/sc/source/ui/vba/vbaoutline.hxx index 4b297a0a9079..ab3a3ce49dd6 100644 --- a/sc/source/ui/vba/vbaoutline.hxx +++ b/sc/source/ui/vba/vbaoutline.hxx @@ -47,7 +47,7 @@ public: virtual void SAL_CALL ShowLevels( const css::uno::Any& RowLevels, const css::uno::Any& ColumnLevels ) throw (css::uno::RuntimeException) ; // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif diff --git a/sc/source/ui/vba/vbapagebreak.cxx b/sc/source/ui/vba/vbapagebreak.cxx index 3939c33128cc..3183623cc84b 100644 --- a/sc/source/ui/vba/vbapagebreak.cxx +++ b/sc/source/ui/vba/vbapagebreak.cxx @@ -95,11 +95,10 @@ uno::Reference< excel::XRange> ScVbaPageBreak<Ifc1>::Location() throw ( script:: } template< typename Ifc1 > -rtl::OUString& +rtl::OUString ScVbaPageBreak<Ifc1>::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaPageBreak") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaPageBreak")); } template< typename Ifc1 > @@ -118,11 +117,10 @@ ScVbaPageBreak<Ifc1>::getServiceNames() template class ScVbaPageBreak< excel::XHPageBreak >; /* class ScVbaHPageBreak */ -rtl::OUString& +rtl::OUString ScVbaHPageBreak::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaHPageBreak") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaHPageBreak")); } uno::Sequence< rtl::OUString > @@ -152,11 +150,10 @@ ScVbaVPageBreak::~ScVbaVPageBreak() { } -rtl::OUString& +rtl::OUString ScVbaVPageBreak::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaVPageBreak") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaVPageBreak")); } uno::Sequence< rtl::OUString > diff --git a/sc/source/ui/vba/vbapagebreak.hxx b/sc/source/ui/vba/vbapagebreak.hxx index c047a8e3c06a..3093a01a50a7 100644 --- a/sc/source/ui/vba/vbapagebreak.hxx +++ b/sc/source/ui/vba/vbapagebreak.hxx @@ -60,7 +60,7 @@ public: virtual css::uno::Reference< ov::excel::XRange> SAL_CALL Location() throw ( css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; @@ -79,7 +79,7 @@ public: virtual ~ScVbaHPageBreak(){} // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; @@ -97,7 +97,7 @@ public: virtual ~ScVbaVPageBreak(); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sc/source/ui/vba/vbapagebreaks.cxx b/sc/source/ui/vba/vbapagebreaks.cxx index 18d785924c8c..b4f2d4eeac6e 100644 --- a/sc/source/ui/vba/vbapagebreaks.cxx +++ b/sc/source/ui/vba/vbapagebreaks.cxx @@ -238,11 +238,10 @@ ScVbaHPageBreaks::getElementType() throw (uno::RuntimeException) return excel::XHPageBreak::static_type(0); } -rtl::OUString& +rtl::OUString ScVbaHPageBreaks::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaHPageBreaks") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaHPageBreaks")); } uno::Sequence< rtl::OUString > @@ -299,11 +298,10 @@ ScVbaVPageBreaks::getElementType() throw ( uno::RuntimeException ) return excel::XVPageBreak::static_type( 0 ); } -rtl::OUString& +rtl::OUString ScVbaVPageBreaks::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM( "ScVbaVPageBreaks" ) ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaVPageBreaks")); } uno::Sequence< rtl::OUString > diff --git a/sc/source/ui/vba/vbapagebreaks.hxx b/sc/source/ui/vba/vbapagebreaks.hxx index 5b8feb57c221..2c6671d48acf 100644 --- a/sc/source/ui/vba/vbapagebreaks.hxx +++ b/sc/source/ui/vba/vbapagebreaks.hxx @@ -64,7 +64,7 @@ public: virtual css::uno::Any createCollectionObject(const css::uno::Any&); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; @@ -91,7 +91,7 @@ public: virtual css::uno::Any createCollectionObject( const css::uno::Any& ); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sc/source/ui/vba/vbapagesetup.cxx b/sc/source/ui/vba/vbapagesetup.cxx index 32be9b883db6..2831df0fcf92 100644 --- a/sc/source/ui/vba/vbapagesetup.cxx +++ b/sc/source/ui/vba/vbapagesetup.cxx @@ -611,11 +611,10 @@ void SAL_CALL ScVbaPageSetup::setPrintHeadings( sal_Bool printHeadings) throw (c } } -rtl::OUString& +rtl::OUString ScVbaPageSetup::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaPageSetup") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaPageSetup")); } uno::Sequence< rtl::OUString > diff --git a/sc/source/ui/vba/vbapagesetup.hxx b/sc/source/ui/vba/vbapagesetup.hxx index 86e92d67f748..fb234200aec1 100644 --- a/sc/source/ui/vba/vbapagesetup.hxx +++ b/sc/source/ui/vba/vbapagesetup.hxx @@ -87,7 +87,7 @@ public: virtual void SAL_CALL setPaperSize( sal_Int32 paperSize ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif diff --git a/sc/source/ui/vba/vbapivotcache.cxx b/sc/source/ui/vba/vbapivotcache.cxx index 7b2b4c6ddf61..ff50c7a8aeb1 100644 --- a/sc/source/ui/vba/vbapivotcache.cxx +++ b/sc/source/ui/vba/vbapivotcache.cxx @@ -51,11 +51,11 @@ ScVbaPivotCache::Refresh() throw (css::uno::RuntimeException) { m_xTable->refresh(); } -rtl::OUString& + +rtl::OUString ScVbaPivotCache::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaPivotCache") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaPivotCache")); } uno::Sequence< rtl::OUString > diff --git a/sc/source/ui/vba/vbapivotcache.hxx b/sc/source/ui/vba/vbapivotcache.hxx index da8c7752bd46..44f10459a158 100644 --- a/sc/source/ui/vba/vbapivotcache.hxx +++ b/sc/source/ui/vba/vbapivotcache.hxx @@ -47,7 +47,7 @@ public: virtual void SAL_CALL Refresh() throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sc/source/ui/vba/vbapivottable.cxx b/sc/source/ui/vba/vbapivottable.cxx index cffd07eeb5e1..dfb60214fe3e 100644 --- a/sc/source/ui/vba/vbapivottable.cxx +++ b/sc/source/ui/vba/vbapivottable.cxx @@ -44,11 +44,10 @@ ScVbaPivotTable::PivotCache() throw (uno::RuntimeException) return new ScVbaPivotCache( uno::Reference< XHelperInterface >(), mxContext, m_xTable ); } -rtl::OUString& +rtl::OUString ScVbaPivotTable::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaPivotTable") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaPivotTable")); } uno::Sequence< rtl::OUString > diff --git a/sc/source/ui/vba/vbapivottable.hxx b/sc/source/ui/vba/vbapivottable.hxx index 5f244a8ef95e..75398d1c2a8a 100644 --- a/sc/source/ui/vba/vbapivottable.hxx +++ b/sc/source/ui/vba/vbapivottable.hxx @@ -43,7 +43,7 @@ public: ScVbaPivotTable( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::sheet::XDataPilotTable >& xTable ); virtual css::uno::Reference< ov::excel::XPivotCache > SAL_CALL PivotCache( ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sc/source/ui/vba/vbapivottables.cxx b/sc/source/ui/vba/vbapivottables.cxx index b7e090d1a841..d2f5c47813f3 100644 --- a/sc/source/ui/vba/vbapivottables.cxx +++ b/sc/source/ui/vba/vbapivottables.cxx @@ -75,11 +75,10 @@ ScVbaPivotTables::getElementType() throw (uno::RuntimeException) return excel::XPivotTable::static_type(0); } -rtl::OUString& +rtl::OUString ScVbaPivotTables::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaPivotTables") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaPivotTables")); } css::uno::Sequence<rtl::OUString> diff --git a/sc/source/ui/vba/vbapivottables.hxx b/sc/source/ui/vba/vbapivottables.hxx index 4928756e179b..69744d06cc81 100644 --- a/sc/source/ui/vba/vbapivottables.hxx +++ b/sc/source/ui/vba/vbapivottables.hxx @@ -59,7 +59,7 @@ public: // ScVbaPivotTables_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); }; diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index 089f5168edcb..2ec55b3378d4 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -389,7 +389,7 @@ public: virtual uno::Any createCollectionObject( const uno::Any& aSource ); - virtual rtl::OUString& getServiceImplName() { static rtl::OUString sDummy; return sDummy; } + virtual rtl::OUString getServiceImplName() { return rtl::OUString(); } virtual uno::Sequence< rtl::OUString > getServiceNames() { return uno::Sequence< rtl::OUString >(); } @@ -6259,11 +6259,10 @@ ScVbaRange::PivotTable() throw (uno::RuntimeException) } -rtl::OUString& +rtl::OUString ScVbaRange::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaRange") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaRange")); } uno::Sequence< rtl::OUString > diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx index 26f639f10b4e..23290c1f6dc8 100644 --- a/sc/source/ui/vba/vbarange.hxx +++ b/sc/source/ui/vba/vbarange.hxx @@ -317,7 +317,7 @@ public: // XErrorQuery virtual ::sal_Bool SAL_CALL hasError( ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif /* SC_VBA_RANGE_HXX */ diff --git a/sc/source/ui/vba/vbastyle.cxx b/sc/source/ui/vba/vbastyle.cxx index aaf3dfd24f49..670480cad7af 100644 --- a/sc/source/ui/vba/vbastyle.cxx +++ b/sc/source/ui/vba/vbastyle.cxx @@ -166,12 +166,10 @@ ScVbaStyle::getMergeCells( ) throw (script::BasicErrorException, uno::RuntimeEx return uno::Any(); } - -rtl::OUString& +rtl::OUString ScVbaStyle::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaStyle") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaStyle")); } uno::Sequence< rtl::OUString > diff --git a/sc/source/ui/vba/vbastyle.hxx b/sc/source/ui/vba/vbastyle.hxx index 70b23a989287..25fd7bd7a323 100644 --- a/sc/source/ui/vba/vbastyle.hxx +++ b/sc/source/ui/vba/vbastyle.hxx @@ -60,7 +60,7 @@ public: virtual void SAL_CALL setMergeCells( const css::uno::Any& MergeCells ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getMergeCells( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sc/source/ui/vba/vbastyles.cxx b/sc/source/ui/vba/vbastyles.cxx index b07d98e81b80..3a8b8c1a0a7f 100644 --- a/sc/source/ui/vba/vbastyles.cxx +++ b/sc/source/ui/vba/vbastyles.cxx @@ -163,11 +163,10 @@ ScVbaStyles::Delete(const rtl::OUString _sStyleName) throw ( script::BasicErrorE } } -rtl::OUString& +rtl::OUString ScVbaStyles::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaStyles") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaStyles")); } uno::Sequence< rtl::OUString > diff --git a/sc/source/ui/vba/vbastyles.hxx b/sc/source/ui/vba/vbastyles.hxx index 821233f75ea0..e06e395560dd 100644 --- a/sc/source/ui/vba/vbastyles.hxx +++ b/sc/source/ui/vba/vbastyles.hxx @@ -51,7 +51,7 @@ public: virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); virtual css::uno::Any createCollectionObject(const css::uno::Any&); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sc/source/ui/vba/vbatextframe.cxx b/sc/source/ui/vba/vbatextframe.cxx index dffbed8b511f..34fee9e27961 100644 --- a/sc/source/ui/vba/vbatextframe.cxx +++ b/sc/source/ui/vba/vbatextframe.cxx @@ -49,11 +49,10 @@ ScVbaTextFrame::Characters() throw (uno::RuntimeException) return uno::makeAny( uno::Reference< ov::excel::XCharacters >( new ScVbaCharacters( this, mxContext, aPalette, xSimpleText, aStart, aLength, sal_True ) ) ); } -rtl::OUString& +rtl::OUString ScVbaTextFrame::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaTextFrame") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaTextFrame")); } uno::Sequence< rtl::OUString > diff --git a/sc/source/ui/vba/vbatextframe.hxx b/sc/source/ui/vba/vbatextframe.hxx index e45af4e1c2be..3292801928b4 100644 --- a/sc/source/ui/vba/vbatextframe.hxx +++ b/sc/source/ui/vba/vbatextframe.hxx @@ -42,7 +42,7 @@ public: // Methods virtual css::uno::Any SAL_CALL Characters( ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sc/source/ui/vba/vbatitle.hxx b/sc/source/ui/vba/vbatitle.hxx index 1f955f4ee19a..ef8bd25a1caa 100644 --- a/sc/source/ui/vba/vbatitle.hxx +++ b/sc/source/ui/vba/vbatitle.hxx @@ -147,10 +147,9 @@ public: return static_cast< sal_Int32 >(nSOOrientation / 100) ; } // XHelperInterface - rtl::OUString& getServiceImplName() + rtl::OUString getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("TitleImpl") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TitleImpl")); } css::uno::Sequence< rtl::OUString > getServiceNames() { diff --git a/sc/source/ui/vba/vbavalidation.cxx b/sc/source/ui/vba/vbavalidation.cxx index 25c8c47d0424..03ce70ab85fd 100644 --- a/sc/source/ui/vba/vbavalidation.cxx +++ b/sc/source/ui/vba/vbavalidation.cxx @@ -324,11 +324,10 @@ ScVbaValidation::getFormula2() throw (uno::RuntimeException) return xCond->getFormula2(); } -rtl::OUString& +rtl::OUString ScVbaValidation::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaValidation") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaValidation")); } uno::Sequence< rtl::OUString > diff --git a/sc/source/ui/vba/vbavalidation.hxx b/sc/source/ui/vba/vbavalidation.hxx index 1ac0f3e35858..526ee43c225f 100644 --- a/sc/source/ui/vba/vbavalidation.hxx +++ b/sc/source/ui/vba/vbavalidation.hxx @@ -64,7 +64,7 @@ public: virtual void SAL_CALL Delete( ) throw (css::uno::RuntimeException); virtual void SAL_CALL Add( const css::uno::Any& Type, const css::uno::Any& AlertStyle, const css::uno::Any& Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2 ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx index 4e03d96cf9b1..f196a5c8fc3a 100644 --- a/sc/source/ui/vba/vbawindow.cxx +++ b/sc/source/ui/vba/vbawindow.cxx @@ -851,11 +851,10 @@ ScVbaWindow::PrintPreview( const css::uno::Any& EnableChanges ) throw (css::scri PrintPreviewHelper( EnableChanges, excel::getBestViewShell( m_xModel ) ); } -rtl::OUString& +rtl::OUString ScVbaWindow::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaWindow") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaWindow")); } uno::Sequence< rtl::OUString > diff --git a/sc/source/ui/vba/vbawindow.hxx b/sc/source/ui/vba/vbawindow.hxx index 45685f201fa5..12b460aca441 100644 --- a/sc/source/ui/vba/vbawindow.hxx +++ b/sc/source/ui/vba/vbawindow.hxx @@ -127,7 +127,7 @@ public: virtual void SAL_CALL PrintOut( const css::uno::Any& From, const css::uno::Any&To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual void SAL_CALL PrintPreview( const css::uno::Any& EnableChanges ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sc/source/ui/vba/vbawindows.cxx b/sc/source/ui/vba/vbawindows.cxx index e1c950727b95..b15d7539cd6c 100644 --- a/sc/source/ui/vba/vbawindows.cxx +++ b/sc/source/ui/vba/vbawindows.cxx @@ -238,11 +238,10 @@ ScVbaWindows::Arrange( ::sal_Int32 /*ArrangeStyle*/, const uno::Any& /*ActiveWor } -rtl::OUString& +rtl::OUString ScVbaWindows::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaWindows") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaWindows")); } css::uno::Sequence<rtl::OUString> diff --git a/sc/source/ui/vba/vbawindows.hxx b/sc/source/ui/vba/vbawindows.hxx index f3586d23ccd9..5ddcab785914 100644 --- a/sc/source/ui/vba/vbawindows.hxx +++ b/sc/source/ui/vba/vbawindows.hxx @@ -56,7 +56,7 @@ public: virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sc/source/ui/vba/vbaworkbook.cxx b/sc/source/ui/vba/vbaworkbook.cxx index 935d5290d2f6..c282a57d56f7 100644 --- a/sc/source/ui/vba/vbaworkbook.cxx +++ b/sc/source/ui/vba/vbaworkbook.cxx @@ -405,11 +405,10 @@ ScVbaWorkbook::Names( const uno::Any& aIndex ) throw (uno::RuntimeException) return uno::Any( xNames ); } -rtl::OUString& +rtl::OUString ScVbaWorkbook::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaWorkbook") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaWorkbook")); } uno::Sequence< rtl::OUString > diff --git a/sc/source/ui/vba/vbaworkbook.hxx b/sc/source/ui/vba/vbaworkbook.hxx index f51ce051d1a7..985b3ed7640a 100644 --- a/sc/source/ui/vba/vbaworkbook.hxx +++ b/sc/source/ui/vba/vbaworkbook.hxx @@ -81,7 +81,7 @@ public: virtual ::rtl::OUString SAL_CALL getCodeName() throw ( css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); virtual css::uno::Reference< css::frame::XModel > getDocModel() { return mxModel; } diff --git a/sc/source/ui/vba/vbaworkbooks.cxx b/sc/source/ui/vba/vbaworkbooks.cxx index 267d9451b934..9466200b1b09 100644 --- a/sc/source/ui/vba/vbaworkbooks.cxx +++ b/sc/source/ui/vba/vbaworkbooks.cxx @@ -310,11 +310,10 @@ ScVbaWorkbooks::Open( const rtl::OUString& rFileName, const uno::Any& /*UpdateLi return aRet; } -rtl::OUString& +rtl::OUString ScVbaWorkbooks::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaWorkbooks") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaWorkbooks")); } css::uno::Sequence<rtl::OUString> diff --git a/sc/source/ui/vba/vbaworkbooks.hxx b/sc/source/ui/vba/vbaworkbooks.hxx index 51273b180cf1..82886a9d7db8 100644 --- a/sc/source/ui/vba/vbaworkbooks.hxx +++ b/sc/source/ui/vba/vbaworkbooks.hxx @@ -57,7 +57,7 @@ public: // ScVbaWorkbooks_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); // XWorkbooks diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx index f659da3c486b..f73a81f3b0c1 100644 --- a/sc/source/ui/vba/vbaworksheet.cxx +++ b/sc/source/ui/vba/vbaworksheet.cxx @@ -1094,12 +1094,12 @@ ScVbaWorksheet::getControlShape( const ::rtl::OUString& sName ) } -rtl::OUString& +rtl::OUString ScVbaWorksheet::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaWorksheet") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaWorksheet")); } + void SAL_CALL ScVbaWorksheet::setEnableCalculation( ::sal_Bool bEnableCalculation ) throw ( script::BasicErrorException, uno::RuntimeException) { diff --git a/sc/source/ui/vba/vbaworksheet.hxx b/sc/source/ui/vba/vbaworksheet.hxx index 95c933e0b7c0..d02244439062 100644 --- a/sc/source/ui/vba/vbaworksheet.hxx +++ b/sc/source/ui/vba/vbaworksheet.hxx @@ -170,7 +170,7 @@ public: virtual void SAL_CALL PrintOut( const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName, const css::uno::Any& IgnorePrintAreas ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); // XUnoTunnel virtual ::sal_Int64 SAL_CALL getSomething(const css::uno::Sequence<sal_Int8 >& rId ) throw(css::uno::RuntimeException); diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx index 732e07ac79d2..89f169a3e8bf 100644 --- a/sc/source/ui/vba/vbaworksheets.cxx +++ b/sc/source/ui/vba/vbaworksheets.cxx @@ -498,11 +498,10 @@ ScVbaWorksheets::getItemByStringIndex( const rtl::OUString& sIndex ) throw (uno: return ScVbaWorksheets_BASE::getItemByStringIndex( sIndex ); } -rtl::OUString& +rtl::OUString ScVbaWorksheets::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaWorksheets") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaWorksheets")); } css::uno::Sequence<rtl::OUString> diff --git a/sc/source/ui/vba/vbaworksheets.hxx b/sc/source/ui/vba/vbaworksheets.hxx index c15d713e1230..c34ec0822788 100644 --- a/sc/source/ui/vba/vbaworksheets.hxx +++ b/sc/source/ui/vba/vbaworksheets.hxx @@ -76,7 +76,7 @@ public: // ScVbaWorksheets_BASE virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& Index2 ) throw (css::uno::RuntimeException); - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); static bool nameExists( css::uno::Reference <css::sheet::XSpreadsheetDocument>& xSpreadDoc, const ::rtl::OUString & name, SCTAB& nTab ) throw ( css::lang::IllegalArgumentException ); diff --git a/sc/source/ui/vba/vbawsfunction.cxx b/sc/source/ui/vba/vbawsfunction.cxx index 685377da4324..0692afb21a20 100644 --- a/sc/source/ui/vba/vbawsfunction.cxx +++ b/sc/source/ui/vba/vbawsfunction.cxx @@ -300,11 +300,10 @@ ScVbaWSFunction::getExactName( const ::rtl::OUString& aApproximateName ) throw ( return sName; } -rtl::OUString& +rtl::OUString ScVbaWSFunction::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaWSFunction") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaWSFunction")); } uno::Sequence< rtl::OUString > diff --git a/sc/source/ui/vba/vbawsfunction.hxx b/sc/source/ui/vba/vbawsfunction.hxx index 2e1c768b9588..5fc1afd337d5 100644 --- a/sc/source/ui/vba/vbawsfunction.hxx +++ b/sc/source/ui/vba/vbawsfunction.hxx @@ -51,7 +51,7 @@ public: virtual sal_Bool SAL_CALL hasProperty(const rtl::OUString& Name) throw(css::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getExactName( const ::rtl::OUString& aApproximateName ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif diff --git a/sw/source/ui/vba/vbaaddin.cxx b/sw/source/ui/vba/vbaaddin.cxx index 3e0873c00646..e7565c19c01a 100644 --- a/sw/source/ui/vba/vbaaddin.cxx +++ b/sw/source/ui/vba/vbaaddin.cxx @@ -84,11 +84,10 @@ void SAL_CALL SwVbaAddin::setInstalled( ::sal_Bool _installed ) throw (uno::Runt } } -rtl::OUString& +rtl::OUString SwVbaAddin::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaAddin") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaAddin")); } uno::Sequence< rtl::OUString > diff --git a/sw/source/ui/vba/vbaaddin.hxx b/sw/source/ui/vba/vbaaddin.hxx index 9f4e8c5f797f..c77c566f3b4f 100644 --- a/sw/source/ui/vba/vbaaddin.hxx +++ b/sw/source/ui/vba/vbaaddin.hxx @@ -54,7 +54,7 @@ public: virtual void SAL_CALL setInstalled( ::sal_Bool _installed ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif /* SW_VBA_ADDIN_HXX */ diff --git a/sw/source/ui/vba/vbaaddins.cxx b/sw/source/ui/vba/vbaaddins.cxx index 2e206cca07c0..b0bb6aa9e5d0 100644 --- a/sw/source/ui/vba/vbaaddins.cxx +++ b/sw/source/ui/vba/vbaaddins.cxx @@ -88,11 +88,10 @@ SwVbaAddins::createCollectionObject( const css::uno::Any& aSource ) return aSource; } -rtl::OUString& +rtl::OUString SwVbaAddins::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaAddins") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaAddins")); } css::uno::Sequence<rtl::OUString> diff --git a/sw/source/ui/vba/vbaaddins.hxx b/sw/source/ui/vba/vbaaddins.hxx index 2d5b651f76fe..d48cd56f84fe 100644 --- a/sw/source/ui/vba/vbaaddins.hxx +++ b/sw/source/ui/vba/vbaaddins.hxx @@ -46,7 +46,7 @@ public: // SwVbaAddins_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sw/source/ui/vba/vbaapplication.cxx b/sw/source/ui/vba/vbaapplication.cxx index cbfbe90ef2a9..e0e34cd5a207 100644 --- a/sw/source/ui/vba/vbaapplication.cxx +++ b/sw/source/ui/vba/vbaapplication.cxx @@ -197,11 +197,10 @@ SwVbaApplication::getCurrentDocument() throw (css::uno::RuntimeException) return getCurrentWordDoc( mxContext ); } -rtl::OUString& +rtl::OUString SwVbaApplication::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaApplication") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaApplication")); } uno::Sequence< rtl::OUString > diff --git a/sw/source/ui/vba/vbaapplication.hxx b/sw/source/ui/vba/vbaapplication.hxx index 9d741013a7a8..f4f0ac6478ad 100644 --- a/sw/source/ui/vba/vbaapplication.hxx +++ b/sw/source/ui/vba/vbaapplication.hxx @@ -68,7 +68,7 @@ public: virtual void SAL_CALL setEnableCancelKey( sal_Int32 _enableCancelKey ) throw (css::uno::RuntimeException); virtual float SAL_CALL CentimetersToPoints( float _Centimeters ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); protected: virtual css::uno::Reference< css::frame::XModel > getCurrentDocument() throw (css::uno::RuntimeException); diff --git a/sw/source/ui/vba/vbaautotextentry.cxx b/sw/source/ui/vba/vbaautotextentry.cxx index 8ad0f0f45673..be4b7bd496bb 100644 --- a/sw/source/ui/vba/vbaautotextentry.cxx +++ b/sw/source/ui/vba/vbaautotextentry.cxx @@ -84,11 +84,10 @@ uno::Reference< word::XRange > SAL_CALL SwVbaAutoTextEntry::Insert( const uno::R return uno::Reference< word::XRange >( pWhere ); } -rtl::OUString& +rtl::OUString SwVbaAutoTextEntry::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaAutoTextEntry") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaAutoTextEntry")); } uno::Sequence< rtl::OUString > @@ -127,11 +126,10 @@ SwVbaAutoTextEntries::createCollectionObject( const css::uno::Any& aSource ) return uno::makeAny( uno::Reference< word::XAutoTextEntry >( new SwVbaAutoTextEntry( this, mxContext, xEntry ) ) ); } -rtl::OUString& +rtl::OUString SwVbaAutoTextEntries::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaAutoTextEntries") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaAutoTextEntries")); } css::uno::Sequence<rtl::OUString> diff --git a/sw/source/ui/vba/vbaautotextentry.hxx b/sw/source/ui/vba/vbaautotextentry.hxx index c5c22da79b56..2754b4275aa4 100644 --- a/sw/source/ui/vba/vbaautotextentry.hxx +++ b/sw/source/ui/vba/vbaautotextentry.hxx @@ -51,7 +51,7 @@ public: virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL Insert( const css::uno::Reference< ooo::vba::word::XRange >& _where, const css::uno::Any& _richtext ) throw ( css::uno::RuntimeException ); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; @@ -74,7 +74,7 @@ public: // SwVbaAutoTextEntries_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sw/source/ui/vba/vbabookmark.cxx b/sw/source/ui/vba/vbabookmark.cxx index d254659ac260..49a9d14f8c01 100644 --- a/sw/source/ui/vba/vbabookmark.cxx +++ b/sw/source/ui/vba/vbabookmark.cxx @@ -92,11 +92,10 @@ uno::Any SAL_CALL SwVbaBookmark::Range() throw ( uno::RuntimeException ) return uno::makeAny( uno::Reference< word::XRange>( new SwVbaRange( this, mxContext, xTextDocument, xTextRange->getStart(), xTextRange->getEnd(), xTextRange->getText() ) ) ); } -rtl::OUString& +rtl::OUString SwVbaBookmark::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaBookmark") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaBookmark")); } uno::Sequence< rtl::OUString > diff --git a/sw/source/ui/vba/vbabookmark.hxx b/sw/source/ui/vba/vbabookmark.hxx index 42aee48ca0bb..c7f495e9f6cb 100644 --- a/sw/source/ui/vba/vbabookmark.hxx +++ b/sw/source/ui/vba/vbabookmark.hxx @@ -60,7 +60,7 @@ public: virtual css::uno::Any SAL_CALL Range() throw ( css::uno::RuntimeException ); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif /* SW_VBA_BOOKMARK_HXX */ diff --git a/sw/source/ui/vba/vbabookmarks.cxx b/sw/source/ui/vba/vbabookmarks.cxx index 2990feaf9487..ae6c17ce1fd6 100644 --- a/sw/source/ui/vba/vbabookmarks.cxx +++ b/sw/source/ui/vba/vbabookmarks.cxx @@ -213,11 +213,10 @@ SwVbaBookmarks::Exists( const rtl::OUString& rName ) throw (css::uno::RuntimeExc return bExist; } -rtl::OUString& +rtl::OUString SwVbaBookmarks::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaBookmarks") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaBookmarks")); } css::uno::Sequence<rtl::OUString> diff --git a/sw/source/ui/vba/vbabookmarks.hxx b/sw/source/ui/vba/vbabookmarks.hxx index 0060bb67c357..744033f7b9c0 100644 --- a/sw/source/ui/vba/vbabookmarks.hxx +++ b/sw/source/ui/vba/vbabookmarks.hxx @@ -60,7 +60,7 @@ public: // SwVbaBookmarks_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); // XBookmarks diff --git a/sw/source/ui/vba/vbaborders.cxx b/sw/source/ui/vba/vbaborders.cxx index 26d5a6bf18be..3118b1ef9563 100644 --- a/sw/source/ui/vba/vbaborders.cxx +++ b/sw/source/ui/vba/vbaborders.cxx @@ -149,11 +149,11 @@ private: } SwVbaBorder(); // no impl protected: - virtual rtl::OUString& getServiceImplName() + virtual rtl::OUString getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaBorder") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaBorder")); } + virtual css::uno::Sequence<rtl::OUString> getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; @@ -360,11 +360,10 @@ void SAL_CALL SwVbaBorders::setShadow( sal_Bool /*_shadow*/ ) throw (uno::Runtim // TODO: } -rtl::OUString& +rtl::OUString SwVbaBorders::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaBorders") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaBorders")); } uno::Sequence< rtl::OUString > diff --git a/sw/source/ui/vba/vbaborders.hxx b/sw/source/ui/vba/vbaborders.hxx index 536960aeee84..caf966967d7c 100644 --- a/sw/source/ui/vba/vbaborders.hxx +++ b/sw/source/ui/vba/vbaborders.hxx @@ -56,7 +56,7 @@ public: virtual sal_Bool SAL_CALL getShadow() throw (css::uno::RuntimeException); virtual void SAL_CALL setShadow( sal_Bool _shadow ) throw (css::uno::RuntimeException); - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sw/source/ui/vba/vbacell.cxx b/sw/source/ui/vba/vbacell.cxx index 2aada3408af2..3d8bfc3401fc 100644 --- a/sw/source/ui/vba/vbacell.cxx +++ b/sw/source/ui/vba/vbacell.cxx @@ -97,11 +97,10 @@ void SAL_CALL SwVbaCell::SetHeight( float height, sal_Int32 heightrule ) throw ( setHeight( uno::makeAny( height ) ); } -rtl::OUString& +rtl::OUString SwVbaCell::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaCell") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaCell")); } uno::Sequence< rtl::OUString > diff --git a/sw/source/ui/vba/vbacell.hxx b/sw/source/ui/vba/vbacell.hxx index 1e26b79440ca..be7ed9540ff4 100644 --- a/sw/source/ui/vba/vbacell.hxx +++ b/sw/source/ui/vba/vbacell.hxx @@ -59,7 +59,7 @@ public: virtual void SAL_CALL SetHeight( float height, sal_Int32 heightrule ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif /* SW_VBA_CELL_HXX */ diff --git a/sw/source/ui/vba/vbacells.cxx b/sw/source/ui/vba/vbacells.cxx index a104ea29c1ca..f0ae51bea074 100644 --- a/sw/source/ui/vba/vbacells.cxx +++ b/sw/source/ui/vba/vbacells.cxx @@ -201,11 +201,10 @@ SwVbaCells::createCollectionObject( const uno::Any& aSource ) return aSource; } -rtl::OUString& +rtl::OUString SwVbaCells::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaCells") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaCells")); } uno::Sequence<rtl::OUString> diff --git a/sw/source/ui/vba/vbacells.hxx b/sw/source/ui/vba/vbacells.hxx index e3fe940aa256..c35d2254bb0b 100644 --- a/sw/source/ui/vba/vbacells.hxx +++ b/sw/source/ui/vba/vbacells.hxx @@ -66,7 +66,7 @@ public: // SwVbaCells_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sw/source/ui/vba/vbacheckbox.cxx b/sw/source/ui/vba/vbacheckbox.cxx index 61509e9dc16e..bd4799ffdf90 100644 --- a/sw/source/ui/vba/vbacheckbox.cxx +++ b/sw/source/ui/vba/vbacheckbox.cxx @@ -75,11 +75,10 @@ void SAL_CALL SwVbaCheckBox::setValue( sal_Bool value ) throw ( uno::RuntimeExce mxFormField->addParam( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ECMA_FORMCHECKBOX_CHECKED )), sValue, sal_True ); } -rtl::OUString& +rtl::OUString SwVbaCheckBox::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaCheckBox") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaCheckBox")); } uno::Sequence< rtl::OUString > diff --git a/sw/source/ui/vba/vbacheckbox.hxx b/sw/source/ui/vba/vbacheckbox.hxx index e8e4da8e2efa..5ba1650f7bd6 100644 --- a/sw/source/ui/vba/vbacheckbox.hxx +++ b/sw/source/ui/vba/vbacheckbox.hxx @@ -50,7 +50,7 @@ public: void SAL_CALL setValue( sal_Bool value ) throw ( css::uno::RuntimeException ); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif /* SW_VBA_CHECKBOX_HXX */ diff --git a/sw/source/ui/vba/vbacolumn.cxx b/sw/source/ui/vba/vbacolumn.cxx index e5abefd4e599..a5770486eb9d 100644 --- a/sw/source/ui/vba/vbacolumn.cxx +++ b/sw/source/ui/vba/vbacolumn.cxx @@ -88,11 +88,10 @@ void SwVbaColumn::SelectColumn( const uno::Reference< frame::XModel >& xModel, c xSelection->select( uno::makeAny( xSelRange ) ); } -rtl::OUString& +rtl::OUString SwVbaColumn::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaColumn") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaColumn")); } uno::Sequence< rtl::OUString > diff --git a/sw/source/ui/vba/vbacolumn.hxx b/sw/source/ui/vba/vbacolumn.hxx index fe7926fee2de..20e33f382505 100644 --- a/sw/source/ui/vba/vbacolumn.hxx +++ b/sw/source/ui/vba/vbacolumn.hxx @@ -56,7 +56,7 @@ public: static void SelectColumn( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nStartColumn, sal_Int32 nEndColumn ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif /* SW_VBA_COLUMN_HXX */ diff --git a/sw/source/ui/vba/vbacolumns.cxx b/sw/source/ui/vba/vbacolumns.cxx index 1d8cc55fc406..88b3cc86c061 100644 --- a/sw/source/ui/vba/vbacolumns.cxx +++ b/sw/source/ui/vba/vbacolumns.cxx @@ -138,11 +138,10 @@ SwVbaColumns::createCollectionObject( const uno::Any& aSource ) return aSource; } -rtl::OUString& +rtl::OUString SwVbaColumns::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaColumns") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaColumns")); } uno::Sequence<rtl::OUString> diff --git a/sw/source/ui/vba/vbacolumns.hxx b/sw/source/ui/vba/vbacolumns.hxx index f6f14ea098e3..26f39d9c5f13 100644 --- a/sw/source/ui/vba/vbacolumns.hxx +++ b/sw/source/ui/vba/vbacolumns.hxx @@ -66,7 +66,7 @@ public: // SwVbaColumns_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sw/source/ui/vba/vbadialog.cxx b/sw/source/ui/vba/vbadialog.cxx index 14f9a40da019..296033670721 100644 --- a/sw/source/ui/vba/vbadialog.cxx +++ b/sw/source/ui/vba/vbadialog.cxx @@ -59,11 +59,10 @@ SwVbaDialog::mapIndexToName( sal_Int32 nIndex ) return rtl::OUString(); } -rtl::OUString& +rtl::OUString SwVbaDialog::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaDialog") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaDialog")); } uno::Sequence< rtl::OUString > diff --git a/sw/source/ui/vba/vbadialog.hxx b/sw/source/ui/vba/vbadialog.hxx index 763fc192cb04..5c46bd961696 100644 --- a/sw/source/ui/vba/vbadialog.hxx +++ b/sw/source/ui/vba/vbadialog.hxx @@ -44,7 +44,7 @@ public: // Methods virtual rtl::OUString mapIndexToName( sal_Int32 nIndex ); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sw/source/ui/vba/vbadialogs.cxx b/sw/source/ui/vba/vbadialogs.cxx index 3bebd662e0cf..c6e65024a921 100644 --- a/sw/source/ui/vba/vbadialogs.cxx +++ b/sw/source/ui/vba/vbadialogs.cxx @@ -41,11 +41,10 @@ SwVbaDialogs::Item( const uno::Any &aItem ) throw (uno::RuntimeException) return uno::Any( aDialog ); } -rtl::OUString& +rtl::OUString SwVbaDialogs::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaDialogs") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaDialogs")); } uno::Sequence< rtl::OUString > diff --git a/sw/source/ui/vba/vbadialogs.hxx b/sw/source/ui/vba/vbadialogs.hxx index 7895bbb385ea..d4736353a49c 100644 --- a/sw/source/ui/vba/vbadialogs.hxx +++ b/sw/source/ui/vba/vbadialogs.hxx @@ -47,7 +47,7 @@ public: virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sw/source/ui/vba/vbadocument.cxx b/sw/source/ui/vba/vbadocument.cxx index f43985ee3992..604521849ef4 100644 --- a/sw/source/ui/vba/vbadocument.cxx +++ b/sw/source/ui/vba/vbadocument.cxx @@ -250,12 +250,12 @@ SwVbaDocument::PageSetup( ) throw (uno::RuntimeException) return uno::makeAny( uno::Reference< word::XPageSetup >( new SwVbaPageSetup( this, mxContext, mxModel, xPageProps ) ) ); } -rtl::OUString& +rtl::OUString SwVbaDocument::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaDocument") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaDocument")); } + uno::Any SAL_CALL SwVbaDocument::getAttachedTemplate() throw (uno::RuntimeException) { diff --git a/sw/source/ui/vba/vbadocument.hxx b/sw/source/ui/vba/vbadocument.hxx index f5fbbcb6cf39..00ff23ae02e1 100644 --- a/sw/source/ui/vba/vbadocument.hxx +++ b/sw/source/ui/vba/vbadocument.hxx @@ -95,7 +95,7 @@ public: virtual ::sal_Bool SAL_CALL hasProperty( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif /* SW_VBA_DOCUMENT_HXX */ diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx index 1606d102f9e8..6dfcc14b99bb 100644 --- a/sw/source/ui/vba/vbadocumentproperties.cxx +++ b/sw/source/ui/vba/vbadocumentproperties.cxx @@ -307,7 +307,7 @@ public: //XDefaultProperty virtual ::rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (uno::RuntimeException) { return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Value")); } // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual uno::Sequence<rtl::OUString> getServiceNames(); }; @@ -459,11 +459,10 @@ SwVbaBuiltInDocumentProperty::setLinkSource( const rtl::OUString& /*LinkSource*/ throw uno::RuntimeException(); } -rtl::OUString& +rtl::OUString SwVbaBuiltInDocumentProperty::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaBuiltinDocumentProperty") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaBuiltinDocumentProperty")); } uno::Sequence<rtl::OUString> @@ -615,11 +614,10 @@ SwVbaBuiltinDocumentProperties::createCollectionObject( const uno::Any& aSource } // XHelperInterface -rtl::OUString& +rtl::OUString SwVbaBuiltinDocumentProperties::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaBuiltinDocumentProperties") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaBuiltinDocumentProperties")); } uno::Sequence<rtl::OUString> @@ -756,11 +754,10 @@ SwVbaCustomDocumentProperties::Add( const ::rtl::OUString& Name, ::sal_Bool Link } // XHelperInterface -rtl::OUString& +rtl::OUString SwVbaCustomDocumentProperties::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaCustomDocumentProperties") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaCustomDocumentProperties")); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/vba/vbadocumentproperties.hxx b/sw/source/ui/vba/vbadocumentproperties.hxx index 3f9a6c193741..f22eff61f701 100644 --- a/sw/source/ui/vba/vbadocumentproperties.hxx +++ b/sw/source/ui/vba/vbadocumentproperties.hxx @@ -51,7 +51,7 @@ public: virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; @@ -62,7 +62,7 @@ public: // XDocumentProperties virtual css::uno::Reference< ::ooo::vba::XDocumentProperty > SAL_CALL Add( const ::rtl::OUString& Name, ::sal_Bool LinkToContent, ::sal_Int8 Type, const css::uno::Any& Value, const css::uno::Any& LinkSource ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); }; #endif /* SW_VBA_DOCUMENTPROPERTY_HXX */ diff --git a/sw/source/ui/vba/vbadocuments.cxx b/sw/source/ui/vba/vbadocuments.cxx index 3c977f654ccd..e394a54c373b 100644 --- a/sw/source/ui/vba/vbadocuments.cxx +++ b/sw/source/ui/vba/vbadocuments.cxx @@ -159,11 +159,10 @@ SwVbaDocuments::Open( const ::rtl::OUString& Filename, const uno::Any& /*Confirm return aRet; } -rtl::OUString& +rtl::OUString SwVbaDocuments::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaDocuments") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaDocuments")); } uno::Sequence<rtl::OUString> diff --git a/sw/source/ui/vba/vbadocuments.hxx b/sw/source/ui/vba/vbadocuments.hxx index 050817e7f95f..b4a82e76933c 100644 --- a/sw/source/ui/vba/vbadocuments.hxx +++ b/sw/source/ui/vba/vbadocuments.hxx @@ -50,7 +50,7 @@ public: // SwVbaDocuments_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); // Methods diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx index 489f57fe4019..e12cd591ee8f 100644 --- a/sw/source/ui/vba/vbafield.cxx +++ b/sw/source/ui/vba/vbafield.cxx @@ -60,11 +60,10 @@ sal_Bool SAL_CALL SwVbaField::Update() throw (uno::RuntimeException) } // XHelperInterface -rtl::OUString& +rtl::OUString SwVbaField::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaField") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaField")); } uno::Sequence<rtl::OUString> @@ -566,11 +565,10 @@ sal_Int32 SAL_CALL SwVbaFields::Update() throw (uno::RuntimeException) } // XHelperInterface -rtl::OUString& +rtl::OUString SwVbaFields::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaFields") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaFields")); } // XEnumerationAccess diff --git a/sw/source/ui/vba/vbafield.hxx b/sw/source/ui/vba/vbafield.hxx index 57bdf44bb2cf..fd1b0e6fd717 100644 --- a/sw/source/ui/vba/vbafield.hxx +++ b/sw/source/ui/vba/vbafield.hxx @@ -45,7 +45,7 @@ public: virtual sal_Bool SAL_CALL Update() throw ( css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; @@ -73,7 +73,7 @@ public: virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sw/source/ui/vba/vbafind.cxx b/sw/source/ui/vba/vbafind.cxx index 52a0d8c22e3e..aed99c2efe4d 100644 --- a/sw/source/ui/vba/vbafind.cxx +++ b/sw/source/ui/vba/vbafind.cxx @@ -401,11 +401,10 @@ SwVbaFind::ClearFormatting( ) throw (uno::RuntimeException) mxPropertyReplace->setSearchAttributes( aSearchAttribs ); } -rtl::OUString& +rtl::OUString SwVbaFind::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaFind") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaFind")); } uno::Sequence< rtl::OUString > diff --git a/sw/source/ui/vba/vbafind.hxx b/sw/source/ui/vba/vbafind.hxx index 41c256391e4a..c214150f9db3 100644 --- a/sw/source/ui/vba/vbafind.hxx +++ b/sw/source/ui/vba/vbafind.hxx @@ -95,7 +95,7 @@ public: virtual void SAL_CALL ClearFormatting( ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif /* SW_VBA_FIND_HXX */ diff --git a/sw/source/ui/vba/vbafont.cxx b/sw/source/ui/vba/vbafont.cxx index 89ce1801c334..e7bdc6e9eeee 100644 --- a/sw/source/ui/vba/vbafont.cxx +++ b/sw/source/ui/vba/vbafont.cxx @@ -108,11 +108,10 @@ SwVbaFont::setUnderline( const uno::Any& _underline ) throw (uno::RuntimeExcepti } } -rtl::OUString& +rtl::OUString SwVbaFont::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaFont") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaFont")); } void SAL_CALL diff --git a/sw/source/ui/vba/vbafont.hxx b/sw/source/ui/vba/vbafont.hxx index 2e42936c345e..ac8ed60c2387 100644 --- a/sw/source/ui/vba/vbafont.hxx +++ b/sw/source/ui/vba/vbafont.hxx @@ -26,7 +26,7 @@ public: virtual css::uno::Any SAL_CALL getStrikethrough() throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getShadow() throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif diff --git a/sw/source/ui/vba/vbaformfield.cxx b/sw/source/ui/vba/vbaformfield.cxx index ec3e16bc74d1..6f5de191aa1d 100644 --- a/sw/source/ui/vba/vbaformfield.cxx +++ b/sw/source/ui/vba/vbaformfield.cxx @@ -116,11 +116,10 @@ uno::Any SAL_CALL SwVbaFormField::CheckBox() throw ( uno::RuntimeException ) return uno::makeAny( uno::Reference< word::XCheckBox >( new SwVbaCheckBox( this, mxContext, mxModel, mxFormField ) ) ); } -rtl::OUString& +rtl::OUString SwVbaFormField::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaFormField") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaFormField")); } uno::Sequence< rtl::OUString > diff --git a/sw/source/ui/vba/vbaformfield.hxx b/sw/source/ui/vba/vbaformfield.hxx index 00ba837443cb..519a88a1bd70 100644 --- a/sw/source/ui/vba/vbaformfield.hxx +++ b/sw/source/ui/vba/vbaformfield.hxx @@ -53,7 +53,7 @@ public: css::uno::Any SAL_CALL CheckBox() throw ( css::uno::RuntimeException ); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif /* SW_VBA_FORMFIELD_HXX */ diff --git a/sw/source/ui/vba/vbaformfields.cxx b/sw/source/ui/vba/vbaformfields.cxx index 632aa0e5469b..949fa7b9c7d2 100644 --- a/sw/source/ui/vba/vbaformfields.cxx +++ b/sw/source/ui/vba/vbaformfields.cxx @@ -183,11 +183,10 @@ SwVbaFormFields::createCollectionObject( const css::uno::Any& aSource ) return aSource; } -rtl::OUString& +rtl::OUString SwVbaFormFields::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaFormFields") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaFormFields")); } css::uno::Sequence<rtl::OUString> diff --git a/sw/source/ui/vba/vbaformfields.hxx b/sw/source/ui/vba/vbaformfields.hxx index 335fceb74379..9884f5ca9846 100644 --- a/sw/source/ui/vba/vbaformfields.hxx +++ b/sw/source/ui/vba/vbaformfields.hxx @@ -51,7 +51,7 @@ public: // SwVbaFormFields_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sw/source/ui/vba/vbaframe.cxx b/sw/source/ui/vba/vbaframe.cxx index 04d13a09674c..702196468846 100644 --- a/sw/source/ui/vba/vbaframe.cxx +++ b/sw/source/ui/vba/vbaframe.cxx @@ -52,11 +52,10 @@ void SAL_CALL SwVbaFrame::Select() throw ( uno::RuntimeException ) xSelectSupp->select( uno::makeAny( mxTextFrame ) ); } -rtl::OUString& +rtl::OUString SwVbaFrame::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaFrame") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaFrame")); } uno::Sequence< rtl::OUString > diff --git a/sw/source/ui/vba/vbaframe.hxx b/sw/source/ui/vba/vbaframe.hxx index 745d5f2096c0..1530971b0b2b 100644 --- a/sw/source/ui/vba/vbaframe.hxx +++ b/sw/source/ui/vba/vbaframe.hxx @@ -49,7 +49,7 @@ public: virtual void SAL_CALL Select() throw ( css::uno::RuntimeException ); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif /* SW_VBA_FRAME_HXX */ diff --git a/sw/source/ui/vba/vbaframes.cxx b/sw/source/ui/vba/vbaframes.cxx index e3aba63cfb02..e4c8c2d16f57 100644 --- a/sw/source/ui/vba/vbaframes.cxx +++ b/sw/source/ui/vba/vbaframes.cxx @@ -87,11 +87,10 @@ SwVbaFrames::createCollectionObject( const css::uno::Any& aSource ) return uno::makeAny( uno::Reference< word::XFrame > ( new SwVbaFrame( this, mxContext, mxModel, xTextFrame ) ) ); } -rtl::OUString& +rtl::OUString SwVbaFrames::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaFrames") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaFrames")); } css::uno::Sequence<rtl::OUString> diff --git a/sw/source/ui/vba/vbaframes.hxx b/sw/source/ui/vba/vbaframes.hxx index 38015fd47c44..dc5550f69a49 100644 --- a/sw/source/ui/vba/vbaframes.hxx +++ b/sw/source/ui/vba/vbaframes.hxx @@ -51,7 +51,7 @@ public: // SwVbaFrames_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sw/source/ui/vba/vbaglobals.cxx b/sw/source/ui/vba/vbaglobals.cxx index 19ba048b1426..dc0cde523be5 100644 --- a/sw/source/ui/vba/vbaglobals.cxx +++ b/sw/source/ui/vba/vbaglobals.cxx @@ -147,11 +147,10 @@ float SAL_CALL SwVbaGlobals::CentimetersToPoints( float _Centimeters ) throw (un return getApplication()->CentimetersToPoints( _Centimeters ); } -rtl::OUString& +rtl::OUString SwVbaGlobals::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaGlobals") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaGlobals")); } uno::Sequence< rtl::OUString > diff --git a/sw/source/ui/vba/vbaglobals.hxx b/sw/source/ui/vba/vbaglobals.hxx index 3ad5cf4195e4..bc7b9b122985 100644 --- a/sw/source/ui/vba/vbaglobals.hxx +++ b/sw/source/ui/vba/vbaglobals.hxx @@ -76,7 +76,7 @@ public: virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames( ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif /* SW_VBA_GLOBALS_HXX */ diff --git a/sw/source/ui/vba/vbaheaderfooter.cxx b/sw/source/ui/vba/vbaheaderfooter.cxx index 0a7bd993d6d3..41199f300a40 100644 --- a/sw/source/ui/vba/vbaheaderfooter.cxx +++ b/sw/source/ui/vba/vbaheaderfooter.cxx @@ -92,11 +92,10 @@ SwVbaHeaderFooter::Shapes( const uno::Any& index ) throw (uno::RuntimeException) return uno::makeAny( xCol ); } -rtl::OUString& +rtl::OUString SwVbaHeaderFooter::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaHeaderFooter") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaHeaderFooter")); } uno::Sequence< rtl::OUString > diff --git a/sw/source/ui/vba/vbaheaderfooter.hxx b/sw/source/ui/vba/vbaheaderfooter.hxx index 91c18e8958d9..ac9e09eae575 100644 --- a/sw/source/ui/vba/vbaheaderfooter.hxx +++ b/sw/source/ui/vba/vbaheaderfooter.hxx @@ -55,7 +55,7 @@ public: virtual css::uno::Any SAL_CALL Shapes( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif /* SW_VBA_HEADERFOOTER_HXX */ diff --git a/sw/source/ui/vba/vbaheadersfooters.cxx b/sw/source/ui/vba/vbaheadersfooters.cxx index 27b27569988b..90e4bed2de17 100644 --- a/sw/source/ui/vba/vbaheadersfooters.cxx +++ b/sw/source/ui/vba/vbaheadersfooters.cxx @@ -128,11 +128,10 @@ SwVbaHeadersFooters::createCollectionObject( const uno::Any& aSource ) return aSource; } -rtl::OUString& +rtl::OUString SwVbaHeadersFooters::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaHeadersFooters") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaHeadersFooters")); } uno::Sequence<rtl::OUString> diff --git a/sw/source/ui/vba/vbaheadersfooters.hxx b/sw/source/ui/vba/vbaheadersfooters.hxx index 253942b0b164..6f05bf0771ba 100644 --- a/sw/source/ui/vba/vbaheadersfooters.hxx +++ b/sw/source/ui/vba/vbaheadersfooters.hxx @@ -53,7 +53,7 @@ public: // SwVbaHeadersFooters_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sw/source/ui/vba/vbalistformat.cxx b/sw/source/ui/vba/vbalistformat.cxx index 15eed9a8b421..a0dd017d66ea 100644 --- a/sw/source/ui/vba/vbalistformat.cxx +++ b/sw/source/ui/vba/vbalistformat.cxx @@ -98,11 +98,10 @@ void SAL_CALL SwVbaListFormat::ConvertNumbersToText( ) throw (css::uno::Runtime throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() ); } -rtl::OUString& +rtl::OUString SwVbaListFormat::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaListFormat") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaListFormat")); } uno::Sequence< rtl::OUString > diff --git a/sw/source/ui/vba/vbalistformat.hxx b/sw/source/ui/vba/vbalistformat.hxx index 0483df54e02a..8dc29c2aab8a 100644 --- a/sw/source/ui/vba/vbalistformat.hxx +++ b/sw/source/ui/vba/vbalistformat.hxx @@ -52,7 +52,7 @@ public: virtual void SAL_CALL ConvertNumbersToText( ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif /* SW_VBA_LISTFORMAT_HXX */ diff --git a/sw/source/ui/vba/vbalistgalleries.cxx b/sw/source/ui/vba/vbalistgalleries.cxx index 7ddd7145a6c2..c0778f9ef6ed 100644 --- a/sw/source/ui/vba/vbalistgalleries.cxx +++ b/sw/source/ui/vba/vbalistgalleries.cxx @@ -93,11 +93,10 @@ SwVbaListGalleries::createCollectionObject( const css::uno::Any& aSource ) return aSource; } -rtl::OUString& +rtl::OUString SwVbaListGalleries::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaListGalleries") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaListGalleries")); } css::uno::Sequence<rtl::OUString> diff --git a/sw/source/ui/vba/vbalistgalleries.hxx b/sw/source/ui/vba/vbalistgalleries.hxx index a6e829783a27..4834bafd5f1f 100644 --- a/sw/source/ui/vba/vbalistgalleries.hxx +++ b/sw/source/ui/vba/vbalistgalleries.hxx @@ -52,7 +52,7 @@ public: // SwVbaListGalleries_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sw/source/ui/vba/vbalistgallery.cxx b/sw/source/ui/vba/vbalistgallery.cxx index 016de8c7ba70..899984add66e 100644 --- a/sw/source/ui/vba/vbalistgallery.cxx +++ b/sw/source/ui/vba/vbalistgallery.cxx @@ -50,11 +50,10 @@ SwVbaListGallery::ListTemplates( const uno::Any& index ) throw (uno::RuntimeExce return uno::makeAny( xCol ); } -rtl::OUString& +rtl::OUString SwVbaListGallery::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaListGallery") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaListGallery")); } uno::Sequence< rtl::OUString > diff --git a/sw/source/ui/vba/vbalistgallery.hxx b/sw/source/ui/vba/vbalistgallery.hxx index 6371e8613f5d..16c3b03c48e4 100644 --- a/sw/source/ui/vba/vbalistgallery.hxx +++ b/sw/source/ui/vba/vbalistgallery.hxx @@ -50,7 +50,7 @@ public: virtual css::uno::Any SAL_CALL ListTemplates( const css::uno::Any& index ) throw ( css::uno::RuntimeException ); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif /* SW_VBA_LISTGALLERY_HXX */ diff --git a/sw/source/ui/vba/vbalistlevel.cxx b/sw/source/ui/vba/vbalistlevel.cxx index 2a4f8f226e49..4f76556c4e9d 100644 --- a/sw/source/ui/vba/vbalistlevel.cxx +++ b/sw/source/ui/vba/vbalistlevel.cxx @@ -377,11 +377,10 @@ void SAL_CALL SwVbaListLevel::setTrailingCharacter( ::sal_Int32 _trailingcharact pListHelper->setPropertyValueWithNameAndLevel( mnLevel, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("LabelFollowedBy") ), uno::makeAny( nLabelFollowedBy ) ); } -rtl::OUString& +rtl::OUString SwVbaListLevel::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaListLevel") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaListLevel")); } uno::Sequence< rtl::OUString > diff --git a/sw/source/ui/vba/vbalistlevel.hxx b/sw/source/ui/vba/vbalistlevel.hxx index 9be001ae3ecc..12664e89439a 100644 --- a/sw/source/ui/vba/vbalistlevel.hxx +++ b/sw/source/ui/vba/vbalistlevel.hxx @@ -73,7 +73,7 @@ public: virtual void SAL_CALL setTrailingCharacter( ::sal_Int32 _trailingcharacter ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif /* SW_VBA_LISTLEVEL_HXX */ diff --git a/sw/source/ui/vba/vbalistlevels.cxx b/sw/source/ui/vba/vbalistlevels.cxx index 2c1301127dd1..6860185d91e1 100644 --- a/sw/source/ui/vba/vbalistlevels.cxx +++ b/sw/source/ui/vba/vbalistlevels.cxx @@ -96,11 +96,10 @@ SwVbaListLevels::createCollectionObject( const css::uno::Any& aSource ) return aSource; } -rtl::OUString& +rtl::OUString SwVbaListLevels::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaListLevels") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaListLevels")); } css::uno::Sequence<rtl::OUString> diff --git a/sw/source/ui/vba/vbalistlevels.hxx b/sw/source/ui/vba/vbalistlevels.hxx index 595c0fb34bf2..b46c917bb873 100644 --- a/sw/source/ui/vba/vbalistlevels.hxx +++ b/sw/source/ui/vba/vbalistlevels.hxx @@ -53,7 +53,7 @@ public: // SwVbaListLevels_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sw/source/ui/vba/vbalisttemplate.cxx b/sw/source/ui/vba/vbalisttemplate.cxx index 49305c74e5a5..461ab69e3ed8 100644 --- a/sw/source/ui/vba/vbalisttemplate.cxx +++ b/sw/source/ui/vba/vbalisttemplate.cxx @@ -57,11 +57,10 @@ void SwVbaListTemplate::applyListTemplate( uno::Reference< beans::XPropertySet > xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NumberingRules") ) , uno::makeAny( xNumberingRules ) ); } -rtl::OUString& +rtl::OUString SwVbaListTemplate::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaListTemplate") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaListTemplate")); } uno::Sequence< rtl::OUString > diff --git a/sw/source/ui/vba/vbalisttemplate.hxx b/sw/source/ui/vba/vbalisttemplate.hxx index d876cffb0300..f4019a13a7d1 100644 --- a/sw/source/ui/vba/vbalisttemplate.hxx +++ b/sw/source/ui/vba/vbalisttemplate.hxx @@ -52,7 +52,7 @@ public: virtual css::uno::Any SAL_CALL ListLevels( const css::uno::Any& index ) throw ( css::uno::RuntimeException ); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif /* SW_VBA_LISTTEMPLATE_HXX */ diff --git a/sw/source/ui/vba/vbalisttemplates.cxx b/sw/source/ui/vba/vbalisttemplates.cxx index e54aa1637291..9004f1ef9fc5 100644 --- a/sw/source/ui/vba/vbalisttemplates.cxx +++ b/sw/source/ui/vba/vbalisttemplates.cxx @@ -90,11 +90,10 @@ SwVbaListTemplates::createCollectionObject( const css::uno::Any& aSource ) return aSource; } -rtl::OUString& +rtl::OUString SwVbaListTemplates::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaListTemplates") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaListTemplates")); } css::uno::Sequence<rtl::OUString> diff --git a/sw/source/ui/vba/vbalisttemplates.hxx b/sw/source/ui/vba/vbalisttemplates.hxx index a42137984899..6e0ff1eff626 100644 --- a/sw/source/ui/vba/vbalisttemplates.hxx +++ b/sw/source/ui/vba/vbalisttemplates.hxx @@ -53,7 +53,7 @@ public: // SwVbaListTemplates_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sw/source/ui/vba/vbaoptions.cxx b/sw/source/ui/vba/vbaoptions.cxx index 47a81de0da0f..f2ad2fde2a44 100644 --- a/sw/source/ui/vba/vbaoptions.cxx +++ b/sw/source/ui/vba/vbaoptions.cxx @@ -264,12 +264,10 @@ void SAL_CALL SwVbaOptions::setAutoFormatApplyBulletedLists( ::sal_Bool /*_autof // not support in Writer } - -rtl::OUString& +rtl::OUString SwVbaOptions::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaOptions") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaOptions")); } uno::Sequence< rtl::OUString > diff --git a/sw/source/ui/vba/vbaoptions.hxx b/sw/source/ui/vba/vbaoptions.hxx index 7ef21fd3b406..568104e2a687 100644 --- a/sw/source/ui/vba/vbaoptions.hxx +++ b/sw/source/ui/vba/vbaoptions.hxx @@ -82,7 +82,7 @@ public: virtual css::uno::Any getValueEvent(); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif /* SW_VBA_OPTIONS_HXX */ diff --git a/sw/source/ui/vba/vbapagesetup.cxx b/sw/source/ui/vba/vbapagesetup.cxx index c0f1bf6dad20..0668001abe28 100644 --- a/sw/source/ui/vba/vbapagesetup.cxx +++ b/sw/source/ui/vba/vbapagesetup.cxx @@ -252,11 +252,10 @@ void SAL_CALL SwVbaPageSetup::setSectionStart( ::sal_Int32 /*_sectionstart*/ ) t // #FIXME: } -rtl::OUString& +rtl::OUString SwVbaPageSetup::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaPageSetup") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaPageSetup")); } uno::Sequence< rtl::OUString > diff --git a/sw/source/ui/vba/vbapagesetup.hxx b/sw/source/ui/vba/vbapagesetup.hxx index 243ffca33e28..5776a967c1f5 100644 --- a/sw/source/ui/vba/vbapagesetup.hxx +++ b/sw/source/ui/vba/vbapagesetup.hxx @@ -62,7 +62,7 @@ public: virtual void SAL_CALL setSectionStart( ::sal_Int32 _sectionstart ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif diff --git a/sw/source/ui/vba/vbapane.cxx b/sw/source/ui/vba/vbapane.cxx index 2db1d8a27850..379d14128100 100644 --- a/sw/source/ui/vba/vbapane.cxx +++ b/sw/source/ui/vba/vbapane.cxx @@ -56,11 +56,10 @@ SwVbaPane::Close( ) throw ( css::uno::RuntimeException ) dispatchRequests( mxModel,url ); } -rtl::OUString& +rtl::OUString SwVbaPane::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaPane") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaPane")); } uno::Sequence< rtl::OUString > diff --git a/sw/source/ui/vba/vbapane.hxx b/sw/source/ui/vba/vbapane.hxx index e496272bbed6..95ecc16d8513 100644 --- a/sw/source/ui/vba/vbapane.hxx +++ b/sw/source/ui/vba/vbapane.hxx @@ -49,7 +49,7 @@ public: virtual void SAL_CALL Close( ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif /* SW_VBA_PANE_HXX */ diff --git a/sw/source/ui/vba/vbapanes.cxx b/sw/source/ui/vba/vbapanes.cxx index a69eb236a219..aadf51f320d0 100644 --- a/sw/source/ui/vba/vbapanes.cxx +++ b/sw/source/ui/vba/vbapanes.cxx @@ -105,11 +105,10 @@ SwVbaPanes::createCollectionObject( const css::uno::Any& aSource ) return aSource; } -rtl::OUString& +rtl::OUString SwVbaPanes::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaPanes") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaPanes")); } css::uno::Sequence<rtl::OUString> diff --git a/sw/source/ui/vba/vbapanes.hxx b/sw/source/ui/vba/vbapanes.hxx index 82fa5391bb25..a0e03456334c 100644 --- a/sw/source/ui/vba/vbapanes.hxx +++ b/sw/source/ui/vba/vbapanes.hxx @@ -51,7 +51,7 @@ public: // SwVbaPanes_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sw/source/ui/vba/vbaparagraph.cxx b/sw/source/ui/vba/vbaparagraph.cxx index 1861f316cf87..a91966cb0719 100644 --- a/sw/source/ui/vba/vbaparagraph.cxx +++ b/sw/source/ui/vba/vbaparagraph.cxx @@ -63,11 +63,10 @@ SwVbaParagraph::setStyle( const uno::Any& style ) throw ( uno::RuntimeException xRange->setStyle( style ); } -rtl::OUString& +rtl::OUString SwVbaParagraph::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaParagraph") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaParagraph")); } uno::Sequence< rtl::OUString > @@ -167,11 +166,10 @@ SwVbaParagraphs::createCollectionObject( const css::uno::Any& aSource ) return uno::makeAny( uno::Reference< word::XParagraph >( new SwVbaParagraph( this, mxContext, mxTextDocument, xTextRange ) ) ); } -rtl::OUString& +rtl::OUString SwVbaParagraphs::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaParagraphs") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaParagraphs")); } css::uno::Sequence<rtl::OUString> diff --git a/sw/source/ui/vba/vbaparagraph.hxx b/sw/source/ui/vba/vbaparagraph.hxx index c7b185690cfc..d6caceb15925 100644 --- a/sw/source/ui/vba/vbaparagraph.hxx +++ b/sw/source/ui/vba/vbaparagraph.hxx @@ -55,7 +55,7 @@ public: virtual void SAL_CALL setStyle( const css::uno::Any& style ) throw ( css::uno::RuntimeException ); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; @@ -77,7 +77,7 @@ public: // SwVbaParagraphs_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sw/source/ui/vba/vbaparagraphformat.cxx b/sw/source/ui/vba/vbaparagraphformat.cxx index 1fcd264b129a..ec17e5329978 100644 --- a/sw/source/ui/vba/vbaparagraphformat.cxx +++ b/sw/source/ui/vba/vbaparagraphformat.cxx @@ -557,11 +557,10 @@ sal_Int32 SwVbaParagraphFormat::getMSWordAlignment( sal_Int32 _alignment ) return wdAlignment; } -rtl::OUString& +rtl::OUString SwVbaParagraphFormat::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaParagraphFormat") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaParagraphFormat")); } uno::Sequence< rtl::OUString > diff --git a/sw/source/ui/vba/vbaparagraphformat.hxx b/sw/source/ui/vba/vbaparagraphformat.hxx index c827cd40bffa..465ec64252ce 100644 --- a/sw/source/ui/vba/vbaparagraphformat.hxx +++ b/sw/source/ui/vba/vbaparagraphformat.hxx @@ -90,7 +90,7 @@ public: virtual void SAL_CALL setWidowControl( const css::uno::Any& _widowcontrol ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif /* SW_VBA_PARAGRAPHFORMAT_HXX */ diff --git a/sw/source/ui/vba/vbarange.cxx b/sw/source/ui/vba/vbarange.cxx index 5b97fa87ab27..aa383fd2f963 100644 --- a/sw/source/ui/vba/vbarange.cxx +++ b/sw/source/ui/vba/vbarange.cxx @@ -415,11 +415,11 @@ SwVbaRange::Fields( const uno::Any& index ) throw (uno::RuntimeException) return xCol->Item( index, uno::Any() ); return uno::makeAny( xCol ); } -rtl::OUString& + +rtl::OUString SwVbaRange::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaRange") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaRange")); } uno::Sequence< rtl::OUString > diff --git a/sw/source/ui/vba/vbarange.hxx b/sw/source/ui/vba/vbarange.hxx index e2a623630cb8..fa134f41847f 100644 --- a/sw/source/ui/vba/vbarange.hxx +++ b/sw/source/ui/vba/vbarange.hxx @@ -93,7 +93,7 @@ public: virtual css::uno::Any SAL_CALL Fields( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif /* SW_VBA_RANGE_HXX */ diff --git a/sw/source/ui/vba/vbareplacement.cxx b/sw/source/ui/vba/vbareplacement.cxx index 2cc874f17ed6..85fd9ba63a8b 100644 --- a/sw/source/ui/vba/vbareplacement.cxx +++ b/sw/source/ui/vba/vbareplacement.cxx @@ -57,11 +57,10 @@ void SAL_CALL SwVbaReplacement::ClearFormatting( ) throw (uno::RuntimeException) mxPropertyReplace->setReplaceAttributes( aPropValues ); } -rtl::OUString& +rtl::OUString SwVbaReplacement::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaReplacement") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaReplacement")); } uno::Sequence< rtl::OUString > diff --git a/sw/source/ui/vba/vbareplacement.hxx b/sw/source/ui/vba/vbareplacement.hxx index 020265cf2c41..99296bd71854 100644 --- a/sw/source/ui/vba/vbareplacement.hxx +++ b/sw/source/ui/vba/vbareplacement.hxx @@ -52,7 +52,7 @@ public: virtual void SAL_CALL ClearFormatting() throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif /* SW_VBA_REPLACEMENT_HXX */ diff --git a/sw/source/ui/vba/vbarevision.cxx b/sw/source/ui/vba/vbarevision.cxx index 5c1f0e841bce..f73073ee13f4 100644 --- a/sw/source/ui/vba/vbarevision.cxx +++ b/sw/source/ui/vba/vbarevision.cxx @@ -82,11 +82,10 @@ SwVbaRevision::Reject( ) throw ( css::uno::RuntimeException ) pDoc->RejectRedline( GetPosition(), sal_True ); } -rtl::OUString& +rtl::OUString SwVbaRevision::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaRevision") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaRevision")); } uno::Sequence< rtl::OUString > diff --git a/sw/source/ui/vba/vbarevision.hxx b/sw/source/ui/vba/vbarevision.hxx index 1ecadcd1f6bc..efa29d47a40f 100644 --- a/sw/source/ui/vba/vbarevision.hxx +++ b/sw/source/ui/vba/vbarevision.hxx @@ -52,7 +52,7 @@ public: virtual void SAL_CALL Reject( ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif /* SW_VBA_REVISION_HXX */ diff --git a/sw/source/ui/vba/vbarevisions.cxx b/sw/source/ui/vba/vbarevisions.cxx index e9ebc7e3b473..0815864335d8 100644 --- a/sw/source/ui/vba/vbarevisions.cxx +++ b/sw/source/ui/vba/vbarevisions.cxx @@ -166,11 +166,10 @@ void SAL_CALL SwVbaRevisions::RejectAll( ) throw (css::uno::RuntimeException) throw uno::RuntimeException(); } -rtl::OUString& +rtl::OUString SwVbaRevisions::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaRevisions") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaRevisions")); } css::uno::Sequence<rtl::OUString> diff --git a/sw/source/ui/vba/vbarevisions.hxx b/sw/source/ui/vba/vbarevisions.hxx index 142bf8987b48..c0fb06059df7 100644 --- a/sw/source/ui/vba/vbarevisions.hxx +++ b/sw/source/ui/vba/vbarevisions.hxx @@ -57,7 +57,7 @@ public: // SwVbaRevisions_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sw/source/ui/vba/vbarow.cxx b/sw/source/ui/vba/vbarow.cxx index 2ec5d4ff9e52..3f432f075d99 100644 --- a/sw/source/ui/vba/vbarow.cxx +++ b/sw/source/ui/vba/vbarow.cxx @@ -113,11 +113,10 @@ void SAL_CALL SwVbaRow::SetHeight( float height, sal_Int32 heightrule ) throw (c setHeight( uno::makeAny( height ) ); } -rtl::OUString& +rtl::OUString SwVbaRow::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaRow") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaRow")); } uno::Sequence< rtl::OUString > diff --git a/sw/source/ui/vba/vbarow.hxx b/sw/source/ui/vba/vbarow.hxx index e4cf51f4e99a..9102c813ba81 100644 --- a/sw/source/ui/vba/vbarow.hxx +++ b/sw/source/ui/vba/vbarow.hxx @@ -61,7 +61,7 @@ public: static void SelectRow( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nStartRow, sal_Int32 nEndRow ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif /* SW_VBA_ROW_HXX */ diff --git a/sw/source/ui/vba/vbarows.cxx b/sw/source/ui/vba/vbarows.cxx index eb5327718a13..29b6dcea5b06 100644 --- a/sw/source/ui/vba/vbarows.cxx +++ b/sw/source/ui/vba/vbarows.cxx @@ -360,11 +360,10 @@ SwVbaRows::createCollectionObject( const uno::Any& aSource ) return aSource; } -rtl::OUString& +rtl::OUString SwVbaRows::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaRows") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaRows")); } uno::Sequence<rtl::OUString> diff --git a/sw/source/ui/vba/vbarows.hxx b/sw/source/ui/vba/vbarows.hxx index eb310dc0e1e6..9ef9f4ce7808 100644 --- a/sw/source/ui/vba/vbarows.hxx +++ b/sw/source/ui/vba/vbarows.hxx @@ -78,7 +78,7 @@ public: // SwVbaRows_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sw/source/ui/vba/vbasection.cxx b/sw/source/ui/vba/vbasection.cxx index 6ca39e55dbfd..beb3d2e5f188 100644 --- a/sw/source/ui/vba/vbasection.cxx +++ b/sw/source/ui/vba/vbasection.cxx @@ -74,11 +74,10 @@ SwVbaSection::PageSetup( ) throw (uno::RuntimeException) return uno::makeAny( uno::Reference< word::XPageSetup >( new SwVbaPageSetup( this, mxContext, mxModel, mxPageProps ) ) ); } -rtl::OUString& +rtl::OUString SwVbaSection::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaSection") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaSection")); } uno::Sequence< rtl::OUString > diff --git a/sw/source/ui/vba/vbasection.hxx b/sw/source/ui/vba/vbasection.hxx index 648d03cfbe00..3c247e9a529c 100644 --- a/sw/source/ui/vba/vbasection.hxx +++ b/sw/source/ui/vba/vbasection.hxx @@ -54,7 +54,7 @@ public: virtual css::uno::Any SAL_CALL PageSetup( ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif /* SW_VBA_SECTION_HXX */ diff --git a/sw/source/ui/vba/vbasections.cxx b/sw/source/ui/vba/vbasections.cxx index ab1a4cd04787..6cfa248e2774 100644 --- a/sw/source/ui/vba/vbasections.cxx +++ b/sw/source/ui/vba/vbasections.cxx @@ -180,11 +180,10 @@ SwVbaSections::createCollectionObject( const css::uno::Any& aSource ) return aSource; } -rtl::OUString& +rtl::OUString SwVbaSections::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaSections") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaSections")); } css::uno::Sequence<rtl::OUString> diff --git a/sw/source/ui/vba/vbasections.hxx b/sw/source/ui/vba/vbasections.hxx index 6aa6fd83dced..ab980e643b14 100644 --- a/sw/source/ui/vba/vbasections.hxx +++ b/sw/source/ui/vba/vbasections.hxx @@ -55,7 +55,7 @@ public: // SwVbaSections_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sw/source/ui/vba/vbaselection.cxx b/sw/source/ui/vba/vbaselection.cxx index 14152f836978..7d0266369f18 100644 --- a/sw/source/ui/vba/vbaselection.cxx +++ b/sw/source/ui/vba/vbaselection.cxx @@ -1174,11 +1174,10 @@ SwVbaSelection::Paragraphs( const uno::Any& aIndex ) throw (uno::RuntimeExceptio return aRet; } -rtl::OUString& +rtl::OUString SwVbaSelection::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaSelection") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaSelection")); } uno::Sequence< rtl::OUString > diff --git a/sw/source/ui/vba/vbaselection.hxx b/sw/source/ui/vba/vbaselection.hxx index c1a089a48a9d..55257645bca1 100644 --- a/sw/source/ui/vba/vbaselection.hxx +++ b/sw/source/ui/vba/vbaselection.hxx @@ -113,7 +113,7 @@ public: virtual css::uno::Any SAL_CALL Paragraphs( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif /* SW_VBA_SELECTION_HXX */ diff --git a/sw/source/ui/vba/vbastyle.cxx b/sw/source/ui/vba/vbastyle.cxx index 9b037b02c2ef..f591a6e1a5d1 100644 --- a/sw/source/ui/vba/vbastyle.cxx +++ b/sw/source/ui/vba/vbastyle.cxx @@ -233,11 +233,10 @@ void SAL_CALL SwVbaStyle::setNextParagraphStyle( const uno::Any& _nextparagraphs return nNumberingLevel; } -rtl::OUString& +rtl::OUString SwVbaStyle::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaStyle") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaStyle")); } uno::Sequence< rtl::OUString > diff --git a/sw/source/ui/vba/vbastyle.hxx b/sw/source/ui/vba/vbastyle.hxx index b6a2867f3dfb..7343a4c70c13 100644 --- a/sw/source/ui/vba/vbastyle.hxx +++ b/sw/source/ui/vba/vbastyle.hxx @@ -76,7 +76,7 @@ public: virtual ::rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")); } // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sw/source/ui/vba/vbastyles.cxx b/sw/source/ui/vba/vbastyles.cxx index 09ead7502f39..595f5a3dcd86 100644 --- a/sw/source/ui/vba/vbastyles.cxx +++ b/sw/source/ui/vba/vbastyles.cxx @@ -358,11 +358,10 @@ SwVbaStyles::Item( const uno::Any& Index1, const uno::Any& Index2 ) throw (uno:: return SwVbaStyles_BASE::Item( Index1, Index2 ); } -rtl::OUString& +rtl::OUString SwVbaStyles::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaStyles") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaStyles")); } uno::Sequence< rtl::OUString > diff --git a/sw/source/ui/vba/vbastyles.hxx b/sw/source/ui/vba/vbastyles.hxx index 209d58a1caa9..eaa46278c294 100644 --- a/sw/source/ui/vba/vbastyles.hxx +++ b/sw/source/ui/vba/vbastyles.hxx @@ -45,7 +45,7 @@ public: virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); virtual css::uno::Any createCollectionObject(const css::uno::Any&); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sw/source/ui/vba/vbasystem.cxx b/sw/source/ui/vba/vbasystem.cxx index 368dae6e0ce3..7dbdecde99d0 100644 --- a/sw/source/ui/vba/vbasystem.cxx +++ b/sw/source/ui/vba/vbasystem.cxx @@ -269,11 +269,10 @@ SwVbaSystem::PrivateProfileString( const rtl::OUString& rFilename, const rtl::OU return uno::makeAny( uno::Reference< XPropValue > ( new ScVbaPropValue( &maPrivateProfileStringListener ) ) ); } -rtl::OUString& +rtl::OUString SwVbaSystem::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaSystem") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaSystem")); } uno::Sequence< rtl::OUString > diff --git a/sw/source/ui/vba/vbasystem.hxx b/sw/source/ui/vba/vbasystem.hxx index 4d06529536dd..264c748d6965 100644 --- a/sw/source/ui/vba/vbasystem.hxx +++ b/sw/source/ui/vba/vbasystem.hxx @@ -66,7 +66,7 @@ public: virtual css::uno::Any SAL_CALL PrivateProfileString( const rtl::OUString& rFilename, const rtl::OUString& rSection, const rtl::OUString& rKey ) throw ( css::uno::RuntimeException ); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif /* SW_VBA_SYSTEM_HXX */ diff --git a/sw/source/ui/vba/vbatable.cxx b/sw/source/ui/vba/vbatable.cxx index b60e9249b34e..ba569256182a 100644 --- a/sw/source/ui/vba/vbatable.cxx +++ b/sw/source/ui/vba/vbatable.cxx @@ -99,11 +99,10 @@ SwVbaTable::Columns( const uno::Any& index ) throw (uno::RuntimeException) } // XHelperInterface -rtl::OUString& +rtl::OUString SwVbaTable::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaTable") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaTable")); } uno::Sequence<rtl::OUString> diff --git a/sw/source/ui/vba/vbatable.hxx b/sw/source/ui/vba/vbatable.hxx index 16345024381d..53b41d1f2188 100644 --- a/sw/source/ui/vba/vbatable.hxx +++ b/sw/source/ui/vba/vbatable.hxx @@ -26,7 +26,7 @@ public: virtual css::uno::Any SAL_CALL Columns( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif diff --git a/sw/source/ui/vba/vbatableofcontents.cxx b/sw/source/ui/vba/vbatableofcontents.cxx index 09a29238bafe..3a15f1b0871a 100644 --- a/sw/source/ui/vba/vbatableofcontents.cxx +++ b/sw/source/ui/vba/vbatableofcontents.cxx @@ -102,11 +102,10 @@ void SAL_CALL SwVbaTableOfContents::Update( ) throw (uno::RuntimeException) mxDocumentIndex->update(); } -rtl::OUString& +rtl::OUString SwVbaTableOfContents::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaTableOfContents") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaTableOfContents")); } uno::Sequence< rtl::OUString > diff --git a/sw/source/ui/vba/vbatableofcontents.hxx b/sw/source/ui/vba/vbatableofcontents.hxx index 27b39a5da234..011d7c6b8a26 100644 --- a/sw/source/ui/vba/vbatableofcontents.hxx +++ b/sw/source/ui/vba/vbatableofcontents.hxx @@ -62,7 +62,7 @@ public: virtual void SAL_CALL Update( ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif /* SW_VBA_TABLEOFCONTENTS_HXX */ diff --git a/sw/source/ui/vba/vbatables.cxx b/sw/source/ui/vba/vbatables.cxx index b35624c3d176..917d7d0e6adc 100644 --- a/sw/source/ui/vba/vbatables.cxx +++ b/sw/source/ui/vba/vbatables.cxx @@ -191,11 +191,10 @@ SwVbaTables::createCollectionObject( const uno::Any& aSource ) } // XHelperInterface -rtl::OUString& +rtl::OUString SwVbaTables::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaTables") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaTables")); } // XEnumerationAccess diff --git a/sw/source/ui/vba/vbatables.hxx b/sw/source/ui/vba/vbatables.hxx index e2f002f5c5fc..5011ec4e8e31 100644 --- a/sw/source/ui/vba/vbatables.hxx +++ b/sw/source/ui/vba/vbatables.hxx @@ -22,7 +22,7 @@ public: virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sw/source/ui/vba/vbatablesofcontents.cxx b/sw/source/ui/vba/vbatablesofcontents.cxx index 0401e8add560..c05627ff84a9 100644 --- a/sw/source/ui/vba/vbatablesofcontents.cxx +++ b/sw/source/ui/vba/vbatablesofcontents.cxx @@ -173,11 +173,10 @@ SwVbaTablesOfContents::createCollectionObject( const uno::Any& aSource ) return aSource; } -rtl::OUString& +rtl::OUString SwVbaTablesOfContents::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaTablesOfContents") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaTablesOfContents")); } uno::Sequence<rtl::OUString> diff --git a/sw/source/ui/vba/vbatablesofcontents.hxx b/sw/source/ui/vba/vbatablesofcontents.hxx index 04b30d0b12db..78e14050b130 100644 --- a/sw/source/ui/vba/vbatablesofcontents.hxx +++ b/sw/source/ui/vba/vbatablesofcontents.hxx @@ -55,7 +55,7 @@ public: // SwVbaTablesOfContents_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sw/source/ui/vba/vbatabstop.cxx b/sw/source/ui/vba/vbatabstop.cxx index 4ed72202bc95..71771dfb00cd 100644 --- a/sw/source/ui/vba/vbatabstop.cxx +++ b/sw/source/ui/vba/vbatabstop.cxx @@ -40,11 +40,10 @@ SwVbaTabStop::~SwVbaTabStop() { } -rtl::OUString& +rtl::OUString SwVbaTabStop::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaTabStop") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaTabStop")); } uno::Sequence< rtl::OUString > diff --git a/sw/source/ui/vba/vbatabstop.hxx b/sw/source/ui/vba/vbatabstop.hxx index 0de7c0d7e4ba..1ef4ac9b3f85 100644 --- a/sw/source/ui/vba/vbatabstop.hxx +++ b/sw/source/ui/vba/vbatabstop.hxx @@ -46,7 +46,7 @@ public: virtual ~SwVbaTabStop(); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif /* SW_VBA_TABSTOP_HXX */ diff --git a/sw/source/ui/vba/vbatabstops.cxx b/sw/source/ui/vba/vbatabstops.cxx index bdc68a29775e..486bb2101f4f 100644 --- a/sw/source/ui/vba/vbatabstops.cxx +++ b/sw/source/ui/vba/vbatabstops.cxx @@ -258,11 +258,10 @@ SwVbaTabStops::createCollectionObject( const css::uno::Any& aSource ) return aSource; } -rtl::OUString& +rtl::OUString SwVbaTabStops::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaTabStops") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaTabStops")); } css::uno::Sequence<rtl::OUString> diff --git a/sw/source/ui/vba/vbatabstops.hxx b/sw/source/ui/vba/vbatabstops.hxx index f5b000131ebe..4a1a75e8764c 100644 --- a/sw/source/ui/vba/vbatabstops.hxx +++ b/sw/source/ui/vba/vbatabstops.hxx @@ -56,7 +56,7 @@ public: // SwVbaTabStops_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sw/source/ui/vba/vbatemplate.cxx b/sw/source/ui/vba/vbatemplate.cxx index d09d65e85954..2071ebdd223a 100644 --- a/sw/source/ui/vba/vbatemplate.cxx +++ b/sw/source/ui/vba/vbatemplate.cxx @@ -125,11 +125,10 @@ SwVbaTemplate::AutoTextEntries( const uno::Any& index ) throw (uno::RuntimeExcep return uno::makeAny( xCol ); } -rtl::OUString& +rtl::OUString SwVbaTemplate::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaTemplate") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaTemplate")); } uno::Sequence< rtl::OUString > diff --git a/sw/source/ui/vba/vbatemplate.hxx b/sw/source/ui/vba/vbatemplate.hxx index 138841855560..b346e920cc6c 100644 --- a/sw/source/ui/vba/vbatemplate.hxx +++ b/sw/source/ui/vba/vbatemplate.hxx @@ -48,7 +48,7 @@ public: virtual rtl::OUString SAL_CALL getPath() throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL AutoTextEntries( const css::uno::Any& index ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif /* SW_VBA_TEMPLATE_HXX */ diff --git a/sw/source/ui/vba/vbavariable.cxx b/sw/source/ui/vba/vbavariable.cxx index 4004fa6aba35..0d4e9738fc3a 100644 --- a/sw/source/ui/vba/vbavariable.cxx +++ b/sw/source/ui/vba/vbavariable.cxx @@ -85,11 +85,10 @@ SwVbaVariable::getIndex() throw ( css::uno::RuntimeException ) return 0; } -rtl::OUString& +rtl::OUString SwVbaVariable::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaVariable") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaVariable")); } uno::Sequence< rtl::OUString > diff --git a/sw/source/ui/vba/vbavariable.hxx b/sw/source/ui/vba/vbavariable.hxx index bee3654f3b4e..c11a8f3e0c7d 100644 --- a/sw/source/ui/vba/vbavariable.hxx +++ b/sw/source/ui/vba/vbavariable.hxx @@ -54,7 +54,7 @@ public: virtual sal_Int32 SAL_CALL getIndex() throw ( css::uno::RuntimeException ); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif /* SW_VBA_VARIABLE_HXX */ diff --git a/sw/source/ui/vba/vbavariables.cxx b/sw/source/ui/vba/vbavariables.cxx index 1886707fd365..f047fb94c8fc 100644 --- a/sw/source/ui/vba/vbavariables.cxx +++ b/sw/source/ui/vba/vbavariables.cxx @@ -83,11 +83,10 @@ SwVbaVariables::Add( const rtl::OUString& rName, const uno::Any& rValue ) throw return uno::makeAny( uno::Reference< word::XVariable >( new SwVbaVariable( getParent(), mxContext, mxUserDefined, rName ) ) ); } -rtl::OUString& +rtl::OUString SwVbaVariables::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaVariables") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaVariables")); } css::uno::Sequence<rtl::OUString> diff --git a/sw/source/ui/vba/vbavariables.hxx b/sw/source/ui/vba/vbavariables.hxx index 9897709bc9a4..55355c3f0845 100644 --- a/sw/source/ui/vba/vbavariables.hxx +++ b/sw/source/ui/vba/vbavariables.hxx @@ -52,7 +52,7 @@ public: // SwVbaVariables_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); // XVariables diff --git a/sw/source/ui/vba/vbaview.cxx b/sw/source/ui/vba/vbaview.cxx index e17fd7a0d766..2b8d3d1124c7 100644 --- a/sw/source/ui/vba/vbaview.cxx +++ b/sw/source/ui/vba/vbaview.cxx @@ -379,11 +379,10 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType ) return xTextRange; } -rtl::OUString& +rtl::OUString SwVbaView::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaView") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaView")); } uno::Sequence< rtl::OUString > diff --git a/sw/source/ui/vba/vbaview.hxx b/sw/source/ui/vba/vbaview.hxx index bfe77313489b..9cf047661334 100644 --- a/sw/source/ui/vba/vbaview.hxx +++ b/sw/source/ui/vba/vbaview.hxx @@ -63,7 +63,7 @@ public: virtual void SAL_CALL setType( ::sal_Int32 _type ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif /* SW_VBA_VIEW_HXX */ diff --git a/sw/source/ui/vba/vbawindow.cxx b/sw/source/ui/vba/vbawindow.cxx index 43cf4764d223..f199905fcc7b 100644 --- a/sw/source/ui/vba/vbawindow.cxx +++ b/sw/source/ui/vba/vbawindow.cxx @@ -137,11 +137,10 @@ SwVbaWindow::ActivePane() throw (uno::RuntimeException) return uno::makeAny( uno::Reference< word::XPane >( new SwVbaPane( this, mxContext, m_xModel ) ) ); } -rtl::OUString& +rtl::OUString SwVbaWindow::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaWindow") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaWindow")); } uno::Sequence< rtl::OUString > diff --git a/sw/source/ui/vba/vbawindow.hxx b/sw/source/ui/vba/vbawindow.hxx index 99b259631324..20efd9df24bf 100644 --- a/sw/source/ui/vba/vbawindow.hxx +++ b/sw/source/ui/vba/vbawindow.hxx @@ -57,7 +57,7 @@ public: virtual css::uno::Any SAL_CALL Panes( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL ActivePane() throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/sw/source/ui/vba/vbawrapformat.cxx b/sw/source/ui/vba/vbawrapformat.cxx index 5320e0a2af32..99716116d588 100644 --- a/sw/source/ui/vba/vbawrapformat.cxx +++ b/sw/source/ui/vba/vbawrapformat.cxx @@ -221,11 +221,10 @@ void SAL_CALL SwVbaWrapFormat::setDistanceRight( float _distanceright ) throw (u setDistance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("RightMargin") ), _distanceright ); } -rtl::OUString& +rtl::OUString SwVbaWrapFormat::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaWrapFormat") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaWrapFormat")); } uno::Sequence< rtl::OUString > diff --git a/sw/source/ui/vba/vbawrapformat.hxx b/sw/source/ui/vba/vbawrapformat.hxx index ed00df65a8c1..a9aa7ce70fcc 100644 --- a/sw/source/ui/vba/vbawrapformat.hxx +++ b/sw/source/ui/vba/vbawrapformat.hxx @@ -63,7 +63,7 @@ public: virtual float SAL_CALL getDistanceRight() throw (css::uno::RuntimeException); virtual void SAL_CALL setDistanceRight( float _distanceright ) throw (css::uno::RuntimeException); - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/vbahelper/inc/vbahelper/vbaapplicationbase.hxx b/vbahelper/inc/vbahelper/vbaapplicationbase.hxx index a27afa5d5b01..ed42d577c260 100644 --- a/vbahelper/inc/vbahelper/vbaapplicationbase.hxx +++ b/vbahelper/inc/vbahelper/vbaapplicationbase.hxx @@ -70,7 +70,7 @@ public: virtual void SAL_CALL Quit() throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif diff --git a/vbahelper/inc/vbahelper/vbadocumentbase.hxx b/vbahelper/inc/vbahelper/vbadocumentbase.hxx index d2c1a1ad7e29..79d71f060220 100644 --- a/vbahelper/inc/vbahelper/vbadocumentbase.hxx +++ b/vbahelper/inc/vbahelper/vbadocumentbase.hxx @@ -66,7 +66,7 @@ public: virtual void SAL_CALL Activate() throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/vbahelper/inc/vbahelper/vbahelperinterface.hxx b/vbahelper/inc/vbahelper/vbahelperinterface.hxx index 02d9f348a6bf..7e4875ff0b52 100644 --- a/vbahelper/inc/vbahelper/vbahelperinterface.hxx +++ b/vbahelper/inc/vbahelper/vbahelperinterface.hxx @@ -73,7 +73,7 @@ public: InheritedHelperInterfaceImpl() {} InheritedHelperInterfaceImpl( const css::uno::Reference< css::uno::XComponentContext >& xContext ) : mxContext( xContext ) {} InheritedHelperInterfaceImpl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext ) : mxParent( xParent ), mxContext( xContext ) {} - virtual rtl::OUString& getServiceImplName() = 0; + virtual rtl::OUString getServiceImplName() = 0; virtual css::uno::Sequence<rtl::OUString> getServiceNames() = 0; // XHelperInterface Methods @@ -146,10 +146,9 @@ public: implementation name. */ #define VBAHELPER_IMPL_GETSERVICEIMPLNAME( classname ) \ -::rtl::OUString& classname::getServiceImplName() \ +::rtl::OUString classname::getServiceImplName() \ { \ - static ::rtl::OUString saImplName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( #classname ) ); \ - return saImplName; \ + return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( #classname ) ); \ } // ---------------------------------------------------------------------------- @@ -176,7 +175,7 @@ css::uno::Sequence< ::rtl::OUString > classname::getServiceNames() \ declaration. */ #define VBAHELPER_DECL_XHELPERINTERFACE \ - virtual ::rtl::OUString& getServiceImplName(); \ + virtual ::rtl::OUString getServiceImplName(); \ virtual css::uno::Sequence< ::rtl::OUString > getServiceNames(); // ---------------------------------------------------------------------------- diff --git a/vbahelper/inc/vbahelper/vbashape.hxx b/vbahelper/inc/vbahelper/vbashape.hxx index 60f77769c7b4..12ffd6afa9b0 100644 --- a/vbahelper/inc/vbahelper/vbashape.hxx +++ b/vbahelper/inc/vbahelper/vbashape.hxx @@ -58,7 +58,7 @@ protected: virtual void addListeners(); virtual void removeShapeListener() throw( css::uno::RuntimeException ); virtual void removeShapesListener() throw( css::uno::RuntimeException ); - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); public: ScVbaShape( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape, const css::uno::Reference< css::drawing::XShapes >& xShapes, const css::uno::Reference< css::frame::XModel >& xModel, sal_Int32 nType ) throw ( css::lang::IllegalArgumentException ); diff --git a/vbahelper/inc/vbahelper/vbashaperange.hxx b/vbahelper/inc/vbahelper/vbashaperange.hxx index 7a580dac5e77..851b7f28cdf1 100644 --- a/vbahelper/inc/vbahelper/vbashaperange.hxx +++ b/vbahelper/inc/vbahelper/vbashaperange.hxx @@ -45,7 +45,7 @@ private: sal_Int32 m_nShapeGroupCount; protected: css::uno::Reference< css::frame::XModel > m_xModel; - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); css::uno::Reference< css::drawing::XShapes > getShapes() throw (css::uno::RuntimeException) ; public: diff --git a/vbahelper/inc/vbahelper/vbashapes.hxx b/vbahelper/inc/vbahelper/vbashapes.hxx index ef35d2c6b827..5c2582829630 100644 --- a/vbahelper/inc/vbahelper/vbashapes.hxx +++ b/vbahelper/inc/vbahelper/vbashapes.hxx @@ -48,7 +48,7 @@ private: void initBaseCollection(); protected: css::uno::Reference< css::frame::XModel > m_xModel; - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); virtual css::uno::Reference< css::container::XIndexAccess > getShapesByArrayIndices( const css::uno::Any& Index ) throw (css::uno::RuntimeException); css::uno::Reference< css::drawing::XShape > createShape( rtl::OUString service ) throw (css::uno::RuntimeException); diff --git a/vbahelper/inc/vbahelper/vbatextframe.hxx b/vbahelper/inc/vbahelper/vbatextframe.hxx index 584e2559315c..e4d0dc98163c 100644 --- a/vbahelper/inc/vbahelper/vbatextframe.hxx +++ b/vbahelper/inc/vbahelper/vbatextframe.hxx @@ -40,7 +40,7 @@ protected: css::uno::Reference< css::drawing::XShape > m_xShape; css::uno::Reference< css::beans::XPropertySet > m_xPropertySet; protected: - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); virtual void setAsMSObehavior(); sal_Int32 getMargin( rtl::OUString sMarginType ); diff --git a/vbahelper/inc/vbahelper/vbawindowbase.hxx b/vbahelper/inc/vbahelper/vbawindowbase.hxx index 40119b4ea7a3..dc6efb04cf49 100644 --- a/vbahelper/inc/vbahelper/vbawindowbase.hxx +++ b/vbahelper/inc/vbahelper/vbawindowbase.hxx @@ -63,7 +63,7 @@ public: virtual void SAL_CALL setWidth( sal_Int32 _width ) throw (css::uno::RuntimeException) ; // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); protected: diff --git a/vbahelper/source/msforms/vbabutton.cxx b/vbahelper/source/msforms/vbabutton.cxx index f7934922302c..9f4ddb918212 100644 --- a/vbahelper/source/msforms/vbabutton.cxx +++ b/vbahelper/source/msforms/vbabutton.cxx @@ -115,11 +115,10 @@ uno::Reference< msforms::XNewFont > SAL_CALL ScVbaButton::getFont() throw (uno:: return new VbaNewFont( this, mxContext, m_xProps ); } -rtl::OUString& +rtl::OUString ScVbaButton::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaButton") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaButton")); } uno::Sequence< rtl::OUString > diff --git a/vbahelper/source/msforms/vbabutton.hxx b/vbahelper/source/msforms/vbabutton.hxx index 48bd0994c6d2..6882d40395bb 100644 --- a/vbahelper/source/msforms/vbabutton.hxx +++ b/vbahelper/source/msforms/vbabutton.hxx @@ -56,7 +56,7 @@ public: virtual void SAL_CALL setLocked( sal_Bool bAutoSize ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::msforms::XNewFont > SAL_CALL getFont() throw (css::uno::RuntimeException); //XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif //SC_VBA_BUTTON_HXX diff --git a/vbahelper/source/msforms/vbacheckbox.cxx b/vbahelper/source/msforms/vbacheckbox.cxx index 3d9194360235..c9e3dffeb53f 100644 --- a/vbahelper/source/msforms/vbacheckbox.cxx +++ b/vbahelper/source/msforms/vbacheckbox.cxx @@ -95,11 +95,10 @@ uno::Reference< msforms::XNewFont > SAL_CALL ScVbaCheckbox::getFont() throw (uno return new VbaNewFont( this, mxContext, m_xProps ); } -rtl::OUString& +rtl::OUString ScVbaCheckbox::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCheckbox") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaCheckbox")); } uno::Sequence< rtl::OUString > diff --git a/vbahelper/source/msforms/vbacheckbox.hxx b/vbahelper/source/msforms/vbacheckbox.hxx index cc6cbee6945c..b665a8554b3e 100644 --- a/vbahelper/source/msforms/vbacheckbox.hxx +++ b/vbahelper/source/msforms/vbacheckbox.hxx @@ -54,7 +54,7 @@ public: // XDefaultProperty rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Value")); } //XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/vbahelper/source/msforms/vbacombobox.cxx b/vbahelper/source/msforms/vbacombobox.cxx index 083b2d34d427..cf3d0ab865f7 100644 --- a/vbahelper/source/msforms/vbacombobox.cxx +++ b/vbahelper/source/msforms/vbacombobox.cxx @@ -272,12 +272,12 @@ uno::Reference< msforms::XNewFont > SAL_CALL ScVbaComboBox::getFont() throw (uno return new VbaNewFont( this, mxContext, m_xProps ); } -rtl::OUString& +rtl::OUString ScVbaComboBox::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaComboBox") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaComboBox")); } + sal_Int32 SAL_CALL ScVbaComboBox::getBackColor() throw (uno::RuntimeException) { return ScVbaControl::getBackColor(); diff --git a/vbahelper/source/msforms/vbacombobox.hxx b/vbahelper/source/msforms/vbacombobox.hxx index 8ab885560384..4bef619c3b44 100644 --- a/vbahelper/source/msforms/vbacombobox.hxx +++ b/vbahelper/source/msforms/vbacombobox.hxx @@ -91,7 +91,7 @@ public: // XDefaultProperty ::rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Value")); } //XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx index 4a0fdf5c6ad8..db04c714ae45 100644 --- a/vbahelper/source/msforms/vbacontrol.cxx +++ b/vbahelper/source/msforms/vbacontrol.cxx @@ -602,11 +602,10 @@ void SAL_CALL ScVbaControl::setTabIndex( sal_Int32 /*nTabIndex*/ ) throw (uno::R throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unsupported control.")), uno::Reference< uno::XInterface >() ); } -rtl::OUString& +rtl::OUString ScVbaControl::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaControl") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaControl")); } uno::Sequence< rtl::OUString > diff --git a/vbahelper/source/msforms/vbacontrol.hxx b/vbahelper/source/msforms/vbacontrol.hxx index 06d61c518b0e..77129807c683 100644 --- a/vbahelper/source/msforms/vbacontrol.hxx +++ b/vbahelper/source/msforms/vbacontrol.hxx @@ -112,7 +112,7 @@ public: virtual ::sal_Int32 SAL_CALL getForeColor() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setForeColor( ::sal_Int32 _forecolor ) throw (::com::sun::star::uno::RuntimeException); //XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); //General helper methods for properties ( may or maynot be relevant for all //controls diff --git a/vbahelper/source/msforms/vbaframe.hxx b/vbahelper/source/msforms/vbaframe.hxx index bb5b198335e2..855c80cf917c 100644 --- a/vbahelper/source/msforms/vbaframe.hxx +++ b/vbahelper/source/msforms/vbaframe.hxx @@ -60,7 +60,7 @@ public: // XFrame methods css::uno::Any SAL_CALL Controls( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException); //XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); private: diff --git a/vbahelper/source/msforms/vbaimage.cxx b/vbahelper/source/msforms/vbaimage.cxx index 7dfc64f1ef44..3135d94c64b4 100644 --- a/vbahelper/source/msforms/vbaimage.cxx +++ b/vbahelper/source/msforms/vbaimage.cxx @@ -37,11 +37,10 @@ ScVbaImage::ScVbaImage( const uno::Reference< XHelperInterface >& xParent, const { } -rtl::OUString& +rtl::OUString ScVbaImage::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaImage") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaImage")); } uno::Sequence< rtl::OUString > diff --git a/vbahelper/source/msforms/vbaimage.hxx b/vbahelper/source/msforms/vbaimage.hxx index 5e81c7ba5395..6ce571aea6d5 100644 --- a/vbahelper/source/msforms/vbaimage.hxx +++ b/vbahelper/source/msforms/vbaimage.hxx @@ -42,7 +42,7 @@ public: virtual sal_Int32 SAL_CALL getBackColor() throw (css::uno::RuntimeException); virtual void SAL_CALL setBackColor( sal_Int32 nBackColor ) throw (css::uno::RuntimeException); //XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif //SC_VBA_IMAGE_HXX diff --git a/vbahelper/source/msforms/vbalabel.cxx b/vbahelper/source/msforms/vbalabel.cxx index 860c09092a83..b2005bb7221c 100644 --- a/vbahelper/source/msforms/vbalabel.cxx +++ b/vbahelper/source/msforms/vbalabel.cxx @@ -84,10 +84,9 @@ uno::Reference< msforms::XNewFont > SAL_CALL ScVbaLabel::getFont() throw (uno::R return new VbaNewFont( this, mxContext, m_xProps ); } -rtl::OUString& ScVbaLabel::getServiceImplName() +rtl::OUString ScVbaLabel::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaLabel") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaLabel")); } sal_Int32 SAL_CALL ScVbaLabel::getBackColor() throw (uno::RuntimeException) diff --git a/vbahelper/source/msforms/vbalabel.hxx b/vbahelper/source/msforms/vbalabel.hxx index f656aaf26c59..07f049ef69ec 100644 --- a/vbahelper/source/msforms/vbalabel.hxx +++ b/vbahelper/source/msforms/vbalabel.hxx @@ -53,7 +53,7 @@ public: virtual sal_Bool SAL_CALL getAutoSize() throw (css::uno::RuntimeException); virtual void SAL_CALL setAutoSize( sal_Bool bAutoSize ) throw (css::uno::RuntimeException); //XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); // XDefaultProperty rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Value")); } diff --git a/vbahelper/source/msforms/vbalistbox.cxx b/vbahelper/source/msforms/vbalistbox.cxx index f008fef9d5e2..394cb4237117 100644 --- a/vbahelper/source/msforms/vbalistbox.cxx +++ b/vbahelper/source/msforms/vbalistbox.cxx @@ -281,11 +281,10 @@ uno::Reference< msforms::XNewFont > SAL_CALL ScVbaListBox::getFont() throw (uno: return new VbaNewFont( this, mxContext, m_xProps ); } -rtl::OUString& +rtl::OUString ScVbaListBox::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaListBox") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaListBox")); } uno::Sequence< rtl::OUString > diff --git a/vbahelper/source/msforms/vbalistbox.hxx b/vbahelper/source/msforms/vbalistbox.hxx index 00c1fc09939e..70327bae4cfa 100644 --- a/vbahelper/source/msforms/vbalistbox.hxx +++ b/vbahelper/source/msforms/vbalistbox.hxx @@ -78,7 +78,7 @@ public: rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Value")); } //XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); //PropListener diff --git a/vbahelper/source/msforms/vbamultipage.cxx b/vbahelper/source/msforms/vbamultipage.cxx index 6064a2891724..f9edcd3be716 100644 --- a/vbahelper/source/msforms/vbamultipage.cxx +++ b/vbahelper/source/msforms/vbamultipage.cxx @@ -98,12 +98,10 @@ ScVbaMultiPage::setValue( const sal_Int32 _value ) throw (::com::sun::star::uno: fireChangeEvent(); } - -rtl::OUString& +rtl::OUString ScVbaMultiPage::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaMultiPage") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaMultiPage")); } uno::Any SAL_CALL diff --git a/vbahelper/source/msforms/vbamultipage.hxx b/vbahelper/source/msforms/vbamultipage.hxx index a12db7ce7c55..8876aa817ad0 100644 --- a/vbahelper/source/msforms/vbamultipage.hxx +++ b/vbahelper/source/msforms/vbamultipage.hxx @@ -54,7 +54,7 @@ public: virtual css::uno::Any SAL_CALL Pages( const css::uno::Any& index ) throw (css::uno::RuntimeException); //XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); // XDefaultProperty rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Value")); } diff --git a/vbahelper/source/msforms/vbapages.cxx b/vbahelper/source/msforms/vbapages.cxx index a32519c41f57..483bbbf6a78b 100644 --- a/vbahelper/source/msforms/vbapages.cxx +++ b/vbahelper/source/msforms/vbapages.cxx @@ -47,11 +47,10 @@ ScVbaPages::createCollectionObject( const css::uno::Any& aSource ) return aSource; } -rtl::OUString& +rtl::OUString ScVbaPages::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaPages") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaPages")); } uno::Reference< container::XEnumeration > SAL_CALL diff --git a/vbahelper/source/msforms/vbapages.hxx b/vbahelper/source/msforms/vbapages.hxx index 63e989891b8e..36fb1124e0f3 100644 --- a/vbahelper/source/msforms/vbapages.hxx +++ b/vbahelper/source/msforms/vbapages.hxx @@ -42,7 +42,7 @@ ov::msforms::XPages > ScVbaPages_BASE; class ScVbaPages : public ScVbaPages_BASE { protected: - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); public: ScVbaPages( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xPages ) throw ( css::lang::IllegalArgumentException ); diff --git a/vbahelper/source/msforms/vbaprogressbar.cxx b/vbahelper/source/msforms/vbaprogressbar.cxx index 5e82443da203..e7f639275b54 100644 --- a/vbahelper/source/msforms/vbaprogressbar.cxx +++ b/vbahelper/source/msforms/vbaprogressbar.cxx @@ -51,11 +51,10 @@ ScVbaProgressBar::setValue( const uno::Any& _value ) throw (::com::sun::star::un m_xProps->setPropertyValue( SVALUE, _value ); } -rtl::OUString& +rtl::OUString ScVbaProgressBar::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaProgressBar") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaProgressBar")); } uno::Sequence< rtl::OUString > diff --git a/vbahelper/source/msforms/vbaprogressbar.hxx b/vbahelper/source/msforms/vbaprogressbar.hxx index 73c1ba776382..f7c61f466148 100644 --- a/vbahelper/source/msforms/vbaprogressbar.hxx +++ b/vbahelper/source/msforms/vbaprogressbar.hxx @@ -44,7 +44,7 @@ public: virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException); virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException); //XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); // XDefaultProperty rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Value")); } diff --git a/vbahelper/source/msforms/vbaradiobutton.cxx b/vbahelper/source/msforms/vbaradiobutton.cxx index 8f349f499597..16efb6b74629 100644 --- a/vbahelper/source/msforms/vbaradiobutton.cxx +++ b/vbahelper/source/msforms/vbaradiobutton.cxx @@ -103,11 +103,10 @@ uno::Reference< msforms::XNewFont > SAL_CALL ScVbaRadioButton::getFont() throw ( return new VbaNewFont( this, mxContext, m_xProps ); } -rtl::OUString& +rtl::OUString ScVbaRadioButton::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaRadioButton") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaRadioButton")); } uno::Sequence< rtl::OUString > diff --git a/vbahelper/source/msforms/vbaradiobutton.hxx b/vbahelper/source/msforms/vbaradiobutton.hxx index b499cbfa8c77..befbcd55c4be 100644 --- a/vbahelper/source/msforms/vbaradiobutton.hxx +++ b/vbahelper/source/msforms/vbaradiobutton.hxx @@ -45,7 +45,7 @@ public: virtual void SAL_CALL setValue(const com::sun::star::uno::Any&) throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::msforms::XNewFont > SAL_CALL getFont() throw (css::uno::RuntimeException); //XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); // XDefaultProperty rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Value")); } diff --git a/vbahelper/source/msforms/vbascrollbar.cxx b/vbahelper/source/msforms/vbascrollbar.cxx index 6b9eefaaf642..3969ac1b3062 100644 --- a/vbahelper/source/msforms/vbascrollbar.cxx +++ b/vbahelper/source/msforms/vbascrollbar.cxx @@ -112,11 +112,10 @@ ScVbaScrollBar::setSmallChange( ::sal_Int32 _smallchange ) throw (uno::RuntimeEx m_xProps->setPropertyValue( SMALLCHANGE, uno::makeAny( _smallchange ) ); } -rtl::OUString& +rtl::OUString ScVbaScrollBar::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaScrollBar") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaScrollBar")); } uno::Sequence< rtl::OUString > diff --git a/vbahelper/source/msforms/vbascrollbar.hxx b/vbahelper/source/msforms/vbascrollbar.hxx index bfb6430c4312..182b982e1ee3 100644 --- a/vbahelper/source/msforms/vbascrollbar.hxx +++ b/vbahelper/source/msforms/vbascrollbar.hxx @@ -53,7 +53,7 @@ public: //XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif //SC_VBA_LABEL_HXX diff --git a/vbahelper/source/msforms/vbaspinbutton.cxx b/vbahelper/source/msforms/vbaspinbutton.cxx index 0e9472e71190..bd4fda3e5a1b 100644 --- a/vbahelper/source/msforms/vbaspinbutton.cxx +++ b/vbahelper/source/msforms/vbaspinbutton.cxx @@ -82,11 +82,10 @@ ScVbaSpinButton::setMin( sal_Int32 nVal ) throw (uno::RuntimeException) m_xProps->setPropertyValue( SPINMIN, uno::makeAny( nVal ) ); } -rtl::OUString& +rtl::OUString ScVbaSpinButton::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaSpinButton") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaSpinButton")); } uno::Sequence< rtl::OUString > diff --git a/vbahelper/source/msforms/vbaspinbutton.hxx b/vbahelper/source/msforms/vbaspinbutton.hxx index 2726b44e5765..769efcbd0e6a 100644 --- a/vbahelper/source/msforms/vbaspinbutton.hxx +++ b/vbahelper/source/msforms/vbaspinbutton.hxx @@ -48,7 +48,7 @@ public: virtual void SAL_CALL setMin( ::sal_Int32 _min ) throw (css::uno::RuntimeException); //XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif //SC_VBA_SPINBUTTON_HXX diff --git a/vbahelper/source/msforms/vbasystemaxcontrol.cxx b/vbahelper/source/msforms/vbasystemaxcontrol.cxx index 1724ad31c154..59fef2918c0f 100644 --- a/vbahelper/source/msforms/vbasystemaxcontrol.cxx +++ b/vbahelper/source/msforms/vbasystemaxcontrol.cxx @@ -80,11 +80,10 @@ uno::Any SAL_CALL VbaSystemAXControl::getValue( const ::rtl::OUString& aProperty } //---------------------------------------------------------- -rtl::OUString& +rtl::OUString VbaSystemAXControl::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM( "VbaSystemAXControl" ) ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VbaSystemAXControl")); } //---------------------------------------------------------- diff --git a/vbahelper/source/msforms/vbasystemaxcontrol.hxx b/vbahelper/source/msforms/vbasystemaxcontrol.hxx index 0ede40b1e979..f239ce8e38ca 100644 --- a/vbahelper/source/msforms/vbasystemaxcontrol.hxx +++ b/vbahelper/source/msforms/vbasystemaxcontrol.hxx @@ -52,7 +52,7 @@ public: virtual ::sal_Bool SAL_CALL hasProperty( const ::rtl::OUString& aName ) throw ( ::com::sun::star::uno::RuntimeException ); //XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/vbahelper/source/msforms/vbatextbox.cxx b/vbahelper/source/msforms/vbatextbox.cxx index 8ba140719f88..16650168f649 100644 --- a/vbahelper/source/msforms/vbatextbox.cxx +++ b/vbahelper/source/msforms/vbatextbox.cxx @@ -182,11 +182,10 @@ void SAL_CALL ScVbaTextBox::setLocked( sal_Bool bLocked ) throw (uno::RuntimeExc ScVbaControl::setLocked( bLocked ); } -rtl::OUString& +rtl::OUString ScVbaTextBox::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaTextBox") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaTextBox")); } uno::Sequence< rtl::OUString > diff --git a/vbahelper/source/msforms/vbatextbox.hxx b/vbahelper/source/msforms/vbatextbox.hxx index a9e21ad15656..d416952fa8b3 100644 --- a/vbahelper/source/msforms/vbatextbox.hxx +++ b/vbahelper/source/msforms/vbatextbox.hxx @@ -64,7 +64,7 @@ public: // XDefaultProperty rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Value")); } //XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif //SC_VBA_TEXTBOX_HXX diff --git a/vbahelper/source/msforms/vbatogglebutton.cxx b/vbahelper/source/msforms/vbatogglebutton.cxx index 0e2b056259b9..4406dbc18862 100644 --- a/vbahelper/source/msforms/vbatogglebutton.cxx +++ b/vbahelper/source/msforms/vbatogglebutton.cxx @@ -159,11 +159,10 @@ void SAL_CALL ScVbaToggleButton::setLocked( sal_Bool bLocked ) throw (uno::Runti ScVbaControl::setLocked( bLocked ); } -rtl::OUString& +rtl::OUString ScVbaToggleButton::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaToggleButton") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaToggleButton")); } uno::Sequence< rtl::OUString > diff --git a/vbahelper/source/msforms/vbatogglebutton.hxx b/vbahelper/source/msforms/vbatogglebutton.hxx index 7394bea6fa25..5cc25c7f3811 100644 --- a/vbahelper/source/msforms/vbatogglebutton.hxx +++ b/vbahelper/source/msforms/vbatogglebutton.hxx @@ -60,7 +60,7 @@ public: virtual void SAL_CALL setLocked( sal_Bool bAutoSize ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::msforms::XNewFont > SAL_CALL getFont() throw (css::uno::RuntimeException); //XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); // XDefaultProperty rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Value")); } diff --git a/vbahelper/source/msforms/vbauserform.cxx b/vbahelper/source/msforms/vbauserform.cxx index fdbecef56334..323ffe41d882 100644 --- a/vbahelper/source/msforms/vbauserform.cxx +++ b/vbahelper/source/msforms/vbauserform.cxx @@ -182,11 +182,10 @@ ScVbaUserForm::UnloadObject( ) throw (uno::RuntimeException) m_xDialog->endExecute(); } -rtl::OUString& +rtl::OUString ScVbaUserForm::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaUserForm") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaUserForm")); } uno::Sequence< rtl::OUString > diff --git a/vbahelper/source/msforms/vbauserform.hxx b/vbahelper/source/msforms/vbauserform.hxx index f66c3f85bb0e..590f2b272841 100644 --- a/vbahelper/source/msforms/vbauserform.hxx +++ b/vbahelper/source/msforms/vbauserform.hxx @@ -73,7 +73,7 @@ public: virtual ::sal_Bool SAL_CALL hasMethod( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException); virtual ::sal_Bool SAL_CALL hasProperty( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException); //XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; #endif diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx b/vbahelper/source/vbahelper/vbaapplicationbase.cxx index 05f2fcf4ddca..4c156710528b 100644 --- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx +++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx @@ -419,17 +419,16 @@ uno::Any SAL_CALL VbaApplicationBase::getVBE() throw (uno::RuntimeException) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.vbide.VBE" ) ), aArgs, mxContext ); return uno::Any( xVBE ); } - catch( uno::Exception& ) + catch( const uno::Exception& ) { } return uno::Any(); } -rtl::OUString& +rtl::OUString VbaApplicationBase::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("VbaApplicationBase") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VbaApplicationBase")); } uno::Sequence<rtl::OUString> diff --git a/vbahelper/source/vbahelper/vbacolorformat.cxx b/vbahelper/source/vbahelper/vbacolorformat.cxx index 1764adae7672..7cd190847890 100644 --- a/vbahelper/source/vbahelper/vbacolorformat.cxx +++ b/vbahelper/source/vbahelper/vbacolorformat.cxx @@ -160,12 +160,10 @@ ScVbaColorFormat::setSchemeColor( sal_Int32 _schemecolor ) throw (uno::RuntimeEx setRGB( nColor ); } - -rtl::OUString& +rtl::OUString ScVbaColorFormat::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaColorFormat") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaColorFormat")); } uno::Sequence< rtl::OUString > diff --git a/vbahelper/source/vbahelper/vbacolorformat.hxx b/vbahelper/source/vbahelper/vbacolorformat.hxx index 351012f88c2a..a66c22db21f5 100644 --- a/vbahelper/source/vbahelper/vbacolorformat.hxx +++ b/vbahelper/source/vbahelper/vbacolorformat.hxx @@ -109,7 +109,7 @@ private: sal_Int16 m_nColorFormatType; sal_Int32 m_nFillFormatBackColor; protected: - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); public: ScVbaColorFormat( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< ov::XHelperInterface > xInternalParent, const css::uno::Reference< css::drawing::XShape > xShape, const sal_Int16 nColorFormatType ); diff --git a/vbahelper/source/vbahelper/vbacommandbar.cxx b/vbahelper/source/vbahelper/vbacommandbar.cxx index 404c63bd0537..259c0752706b 100644 --- a/vbahelper/source/vbahelper/vbacommandbar.cxx +++ b/vbahelper/source/vbahelper/vbacommandbar.cxx @@ -179,12 +179,12 @@ ScVbaCommandBar::FindControl( const uno::Any& /*aType*/, const uno::Any& /*aId*/ return uno::makeAny( uno::Reference< XCommandBarControl > () ); } -rtl::OUString& +rtl::OUString ScVbaCommandBar::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBar") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBar")); } + uno::Sequence<rtl::OUString> ScVbaCommandBar::getServiceNames() { @@ -262,10 +262,9 @@ uno::Any SAL_CALL VbaDummyCommandBar::FindControl( const uno::Any& /*aType*/, co return uno::Any( uno::Reference< XCommandBarControl >() ); } -rtl::OUString& VbaDummyCommandBar::getServiceImplName() +rtl::OUString VbaDummyCommandBar::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("VbaDummyCommandBar") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VbaDummyCommandBar")); } uno::Sequence< rtl::OUString > VbaDummyCommandBar::getServiceNames() diff --git a/vbahelper/source/vbahelper/vbacommandbar.hxx b/vbahelper/source/vbahelper/vbacommandbar.hxx index d9278729c144..f72baa2f8652 100644 --- a/vbahelper/source/vbahelper/vbacommandbar.hxx +++ b/vbahelper/source/vbahelper/vbacommandbar.hxx @@ -70,7 +70,7 @@ public: virtual css::uno::Any SAL_CALL FindControl( const css::uno::Any& aType, const css::uno::Any& aId, const css::uno::Any& aTag, const css::uno::Any& aVisible, const css::uno::Any& aRecursive ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; @@ -99,7 +99,7 @@ public: virtual css::uno::Any SAL_CALL FindControl( const css::uno::Any& aType, const css::uno::Any& aId, const css::uno::Any& aTag, const css::uno::Any& aVisible, const css::uno::Any& aRecursive ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); private: diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx b/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx index 563a35be1ebe..d71511f1036e 100644 --- a/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx +++ b/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx @@ -183,11 +183,10 @@ ScVbaCommandBarControl::Controls( const uno::Any& aIndex ) throw (script::BasicE return uno::makeAny( xCommandBarControls ); } -rtl::OUString& +rtl::OUString ScVbaCommandBarControl::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBarControl") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBarControl")); } uno::Sequence<rtl::OUString> @@ -210,12 +209,12 @@ ScVbaCommandBarPopup::ScVbaCommandBarPopup( const css::uno::Reference< ov::XHelp m_xCurrentSettings->getByIndex( m_nPosition ) >>= m_aPropertyValues; } -rtl::OUString& +rtl::OUString ScVbaCommandBarPopup::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBarPopup") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBarPopup")); } + uno::Sequence<rtl::OUString> ScVbaCommandBarPopup::getServiceNames() { @@ -236,12 +235,12 @@ ScVbaCommandBarButton::ScVbaCommandBarButton( const css::uno::Reference< ov::XHe m_xCurrentSettings->getByIndex( m_nPosition ) >>= m_aPropertyValues; } -rtl::OUString& +rtl::OUString ScVbaCommandBarButton::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBarButton") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBarButton")); } + uno::Sequence<rtl::OUString> ScVbaCommandBarButton::getServiceNames() { diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx b/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx index f66c0c066fb8..ffbd97e46182 100644 --- a/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx +++ b/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx @@ -78,7 +78,7 @@ public: virtual css::uno::Any SAL_CALL Controls( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; @@ -93,7 +93,7 @@ public: return ov::office::MsoControlType::msoControlPopup; } // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; @@ -108,7 +108,7 @@ public: return ov::office::MsoControlType::msoControlButton; } // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx index 55befbe6f086..6cb4b516e253 100644 --- a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx +++ b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx @@ -238,12 +238,12 @@ ScVbaCommandBarControls::Add( const uno::Any& Type, const uno::Any& Id, const un } // XHelperInterface -rtl::OUString& +rtl::OUString ScVbaCommandBarControls::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBarControls") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBarControls")); } + uno::Sequence<rtl::OUString> ScVbaCommandBarControls::getServiceNames() { @@ -312,10 +312,9 @@ uno::Reference< XCommandBarControl > SAL_CALL VbaDummyCommandBarControls::Add( } // XHelperInterface -rtl::OUString& VbaDummyCommandBarControls::getServiceImplName() +rtl::OUString VbaDummyCommandBarControls::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("VbaDummyCommandBarControls") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VbaDummyCommandBarControls")); } uno::Sequence<rtl::OUString> VbaDummyCommandBarControls::getServiceNames() diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrols.hxx b/vbahelper/source/vbahelper/vbacommandbarcontrols.hxx index 4774dd5c8c73..20adc115fb9c 100644 --- a/vbahelper/source/vbahelper/vbacommandbarcontrols.hxx +++ b/vbahelper/source/vbahelper/vbacommandbarcontrols.hxx @@ -66,7 +66,7 @@ public: virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::XCommandBarControl > SAL_CALL Add( const css::uno::Any& Type, const css::uno::Any& Id, const css::uno::Any& Parameter, const css::uno::Any& Before, const css::uno::Any& Temporary ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; @@ -86,7 +86,7 @@ public: virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::XCommandBarControl > SAL_CALL Add( const css::uno::Any& Type, const css::uno::Any& Id, const css::uno::Any& Parameter, const css::uno::Any& Before, const css::uno::Any& Temporary ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/vbahelper/source/vbahelper/vbacommandbars.cxx b/vbahelper/source/vbahelper/vbacommandbars.cxx index ae8be2842ff0..ecd0228f32ef 100644 --- a/vbahelper/source/vbahelper/vbacommandbars.cxx +++ b/vbahelper/source/vbahelper/vbacommandbars.cxx @@ -237,12 +237,12 @@ ScVbaCommandBars::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) th } // XHelperInterface -rtl::OUString& +rtl::OUString ScVbaCommandBars::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBars") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBars")); } + uno::Sequence<rtl::OUString> ScVbaCommandBars::getServiceNames() { diff --git a/vbahelper/source/vbahelper/vbacommandbars.hxx b/vbahelper/source/vbahelper/vbacommandbars.hxx index 3c32b7d4a9b5..377da40215d3 100644 --- a/vbahelper/source/vbahelper/vbacommandbars.hxx +++ b/vbahelper/source/vbahelper/vbacommandbars.hxx @@ -57,7 +57,7 @@ public: virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException); virtual css::uno::Any SAL_CALL Item( const css::uno::Any& aIndex, const css::uno::Any& /*aIndex2*/ ) throw( css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); }; diff --git a/vbahelper/source/vbahelper/vbadocumentbase.cxx b/vbahelper/source/vbahelper/vbadocumentbase.cxx index 79764237d3f5..977f5ead5f4c 100644 --- a/vbahelper/source/vbahelper/vbadocumentbase.cxx +++ b/vbahelper/source/vbahelper/vbadocumentbase.cxx @@ -296,11 +296,10 @@ VbaDocumentBase::getVBProject() throw (uno::RuntimeException) return uno::Any( mxVBProject ); } -rtl::OUString& +rtl::OUString VbaDocumentBase::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("VbaDocumentBase") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VbaDocumentBase")); } uno::Sequence< rtl::OUString > diff --git a/vbahelper/source/vbahelper/vbafillformat.cxx b/vbahelper/source/vbahelper/vbafillformat.cxx index 463860c07aa3..de7f35b5da96 100644 --- a/vbahelper/source/vbahelper/vbafillformat.cxx +++ b/vbahelper/source/vbahelper/vbafillformat.cxx @@ -178,12 +178,10 @@ ScVbaFillFormat::ForeColor() throw (uno::RuntimeException) return m_xColorFormat; } - -rtl::OUString& +rtl::OUString ScVbaFillFormat::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaFillFormat") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaFillFormat")); } uno::Sequence< rtl::OUString > diff --git a/vbahelper/source/vbahelper/vbafillformat.hxx b/vbahelper/source/vbahelper/vbafillformat.hxx index 6cdaf0e0cd17..932b7934281a 100644 --- a/vbahelper/source/vbahelper/vbafillformat.hxx +++ b/vbahelper/source/vbahelper/vbafillformat.hxx @@ -48,7 +48,7 @@ private: private: void setFillStyle( css::drawing::FillStyle nFillStyle ) throw (css::uno::RuntimeException); protected: - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); public: diff --git a/vbahelper/source/vbahelper/vbalineformat.cxx b/vbahelper/source/vbahelper/vbalineformat.cxx index 2366f7705c7e..b0302f34597a 100644 --- a/vbahelper/source/vbahelper/vbalineformat.cxx +++ b/vbahelper/source/vbahelper/vbalineformat.cxx @@ -427,12 +427,10 @@ ScVbaLineFormat::ForeColor() throw (uno::RuntimeException) return uno::Reference< msforms::XColorFormat >( new ScVbaColorFormat( getParent(), mxContext, this, m_xShape, ::ColorFormatType::LINEFORMAT_FORECOLOR ) ); } - -rtl::OUString& +rtl::OUString ScVbaLineFormat::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaLineFormat") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaLineFormat")); } uno::Sequence< rtl::OUString > diff --git a/vbahelper/source/vbahelper/vbalineformat.hxx b/vbahelper/source/vbahelper/vbalineformat.hxx index 330fe8af54fc..cfa8506ff616 100644 --- a/vbahelper/source/vbahelper/vbalineformat.hxx +++ b/vbahelper/source/vbahelper/vbalineformat.hxx @@ -43,7 +43,7 @@ private: sal_Int32 m_nLineDashStyle; double m_nLineWeight; protected: - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); sal_Int32 convertLineStartEndNameToArrowheadStyle( rtl::OUString sLineName ); rtl::OUString convertArrowheadStyleToLineStartEndName( sal_Int32 nArrowheadStyle ) throw (css::uno::RuntimeException); diff --git a/vbahelper/source/vbahelper/vbapictureformat.cxx b/vbahelper/source/vbahelper/vbapictureformat.cxx index 26d4424e427b..ec7ef50042dd 100644 --- a/vbahelper/source/vbahelper/vbapictureformat.cxx +++ b/vbahelper/source/vbahelper/vbapictureformat.cxx @@ -125,12 +125,10 @@ ScVbaPictureFormat::IncrementContrast( double increment ) throw (uno::RuntimeExc setContrast( nContrast ); } - -rtl::OUString& +rtl::OUString ScVbaPictureFormat::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaPictureFormat") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaPictureFormat")); } uno::Sequence< rtl::OUString > diff --git a/vbahelper/source/vbahelper/vbapictureformat.hxx b/vbahelper/source/vbahelper/vbapictureformat.hxx index 56422cc7b623..af1c568d64c6 100644 --- a/vbahelper/source/vbahelper/vbapictureformat.hxx +++ b/vbahelper/source/vbahelper/vbapictureformat.hxx @@ -41,7 +41,7 @@ private: css::uno::Reference< css::drawing::XShape > m_xShape; css::uno::Reference< css::beans::XPropertySet > m_xPropertySet; protected: - virtual rtl::OUString& getServiceImplName(); + virtual rtl::OUString getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); private: void checkParameterRangeInDouble( double nRange, double nMin, double nMax ) throw (css::uno::RuntimeException); diff --git a/vbahelper/source/vbahelper/vbashape.cxx b/vbahelper/source/vbahelper/vbashape.cxx index 732d73cc2556..70b539f748cd 100644 --- a/vbahelper/source/vbahelper/vbashape.cxx +++ b/vbahelper/source/vbahelper/vbashape.cxx @@ -705,12 +705,10 @@ ScVbaShape::WrapFormat() throw (uno::RuntimeException) throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() ); } - -rtl::OUString& +rtl::OUString ScVbaShape::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaShape") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaShape")); } uno::Sequence< rtl::OUString > diff --git a/vbahelper/source/vbahelper/vbashaperange.cxx b/vbahelper/source/vbahelper/vbashaperange.cxx index 417cb1f94751..413c76fc10ad 100644 --- a/vbahelper/source/vbahelper/vbashaperange.cxx +++ b/vbahelper/source/vbahelper/vbashaperange.cxx @@ -391,11 +391,10 @@ ScVbaShapeRange:: createCollectionObject( const css::uno::Any& aSource ) return uno::makeAny( xVbShape ); } -rtl::OUString& +rtl::OUString ScVbaShapeRange::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaShapeRange") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaShapeRange")); } uno::Sequence< rtl::OUString > diff --git a/vbahelper/source/vbahelper/vbashapes.cxx b/vbahelper/source/vbahelper/vbashapes.cxx index 6f4cccc70f40..859d5caa274c 100644 --- a/vbahelper/source/vbahelper/vbashapes.cxx +++ b/vbahelper/source/vbahelper/vbashapes.cxx @@ -116,11 +116,11 @@ ScVbaShapes::getElementType() throw (uno::RuntimeException) { return ooo::vba::msforms::XShape::static_type(0); } -rtl::OUString& + +rtl::OUString ScVbaShapes::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaShapes") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaShapes")); } uno::Sequence< rtl::OUString > diff --git a/vbahelper/source/vbahelper/vbatextframe.cxx b/vbahelper/source/vbahelper/vbatextframe.cxx index 1a98998c8dca..14140fc279ef 100644 --- a/vbahelper/source/vbahelper/vbatextframe.cxx +++ b/vbahelper/source/vbahelper/vbatextframe.cxx @@ -146,11 +146,10 @@ VbaTextFrame::Characters() throw (uno::RuntimeException) throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() ); } -rtl::OUString& +rtl::OUString VbaTextFrame::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("VbaTextFrame") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VbaTextFrame")); } uno::Sequence< rtl::OUString > diff --git a/vbahelper/source/vbahelper/vbawindowbase.cxx b/vbahelper/source/vbahelper/vbawindowbase.cxx index f789595d20ed..c5e3f49e703f 100644 --- a/vbahelper/source/vbahelper/vbawindowbase.cxx +++ b/vbahelper/source/vbahelper/vbawindowbase.cxx @@ -134,11 +134,10 @@ VbaWindowBase::setWidth( sal_Int32 _width ) throw (uno::RuntimeException) setPosSize( getWindow(), _width, css::awt::PosSize::WIDTH ); } -rtl::OUString& +rtl::OUString VbaWindowBase::getServiceImplName() { - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("VbaWindowBase") ); - return sImplName; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VbaWindowBase")); } uno::Sequence< rtl::OUString > |