diff options
Diffstat (limited to 'sw/source/ui')
128 files changed, 212 insertions, 280 deletions
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(); }; |