diff options
Diffstat (limited to 'vbahelper')
66 files changed, 121 insertions, 157 deletions
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 > |