summaryrefslogtreecommitdiffstats
path: root/sc/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-03-24 14:00:06 +0000
committerCaolán McNamara <caolanm@redhat.com>2012-03-26 12:18:08 +0100
commitd41b5a88bd4fdff79975d0a64a56d6aae2be1f22 (patch)
tree79f755f5f8bdc4d4e9485e6afe2c12fac168413f /sc/source
parentditch collection of static OUStrings (diff)
downloadcore-d41b5a88bd4fdff79975d0a64a56d6aae2be1f22.tar.gz
core-d41b5a88bd4fdff79975d0a64a56d6aae2be1f22.zip
reduce over use of static OUStrings
Diffstat (limited to 'sc/source')
-rw-r--r--sc/source/ui/vba/vbaapplication.cxx5
-rw-r--r--sc/source/ui/vba/vbaapplication.hxx2
-rw-r--r--sc/source/ui/vba/vbaassistant.cxx5
-rw-r--r--sc/source/ui/vba/vbaassistant.hxx2
-rw-r--r--sc/source/ui/vba/vbaaxes.cxx5
-rw-r--r--sc/source/ui/vba/vbaaxes.hxx2
-rw-r--r--sc/source/ui/vba/vbaaxis.cxx5
-rw-r--r--sc/source/ui/vba/vbaaxis.hxx2
-rw-r--r--sc/source/ui/vba/vbaaxistitle.cxx5
-rw-r--r--sc/source/ui/vba/vbaaxistitle.hxx2
-rw-r--r--sc/source/ui/vba/vbaborders.cxx10
-rw-r--r--sc/source/ui/vba/vbaborders.hxx2
-rw-r--r--sc/source/ui/vba/vbacharacters.cxx5
-rw-r--r--sc/source/ui/vba/vbacharacters.hxx2
-rw-r--r--sc/source/ui/vba/vbachart.cxx5
-rw-r--r--sc/source/ui/vba/vbachart.hxx2
-rw-r--r--sc/source/ui/vba/vbachartobject.cxx5
-rw-r--r--sc/source/ui/vba/vbachartobject.hxx2
-rw-r--r--sc/source/ui/vba/vbachartobjects.cxx5
-rw-r--r--sc/source/ui/vba/vbachartobjects.hxx2
-rw-r--r--sc/source/ui/vba/vbacharttitle.cxx5
-rw-r--r--sc/source/ui/vba/vbacharttitle.hxx2
-rw-r--r--sc/source/ui/vba/vbacomment.cxx5
-rw-r--r--sc/source/ui/vba/vbacomment.hxx2
-rw-r--r--sc/source/ui/vba/vbacomments.cxx5
-rw-r--r--sc/source/ui/vba/vbacomments.hxx2
-rw-r--r--sc/source/ui/vba/vbadialog.cxx5
-rw-r--r--sc/source/ui/vba/vbadialog.hxx2
-rw-r--r--sc/source/ui/vba/vbadialogs.cxx5
-rw-r--r--sc/source/ui/vba/vbadialogs.hxx2
-rw-r--r--sc/source/ui/vba/vbafiledialog.cxx5
-rw-r--r--sc/source/ui/vba/vbafiledialog.hxx2
-rw-r--r--sc/source/ui/vba/vbafiledialogselecteditems.cxx7
-rw-r--r--sc/source/ui/vba/vbafiledialogselecteditems.hxx2
-rw-r--r--sc/source/ui/vba/vbafilesearch.cxx5
-rw-r--r--sc/source/ui/vba/vbafilesearch.hxx2
-rw-r--r--sc/source/ui/vba/vbafont.cxx5
-rw-r--r--sc/source/ui/vba/vbafont.hxx2
-rw-r--r--sc/source/ui/vba/vbaformat.cxx5
-rw-r--r--sc/source/ui/vba/vbaformat.hxx2
-rw-r--r--sc/source/ui/vba/vbaformatcondition.cxx5
-rw-r--r--sc/source/ui/vba/vbaformatcondition.hxx2
-rw-r--r--sc/source/ui/vba/vbaformatconditions.cxx5
-rw-r--r--sc/source/ui/vba/vbaformatconditions.hxx2
-rw-r--r--sc/source/ui/vba/vbafoundfiles.cxx5
-rw-r--r--sc/source/ui/vba/vbafoundfiles.hxx2
-rw-r--r--sc/source/ui/vba/vbaglobals.cxx5
-rw-r--r--sc/source/ui/vba/vbaglobals.hxx2
-rw-r--r--sc/source/ui/vba/vbainterior.cxx5
-rw-r--r--sc/source/ui/vba/vbainterior.hxx2
-rw-r--r--sc/source/ui/vba/vbamenu.cxx6
-rw-r--r--sc/source/ui/vba/vbamenu.hxx2
-rw-r--r--sc/source/ui/vba/vbamenubar.cxx6
-rw-r--r--sc/source/ui/vba/vbamenubar.hxx2
-rw-r--r--sc/source/ui/vba/vbamenubars.cxx6
-rw-r--r--sc/source/ui/vba/vbamenubars.hxx2
-rw-r--r--sc/source/ui/vba/vbamenuitem.cxx6
-rw-r--r--sc/source/ui/vba/vbamenuitem.hxx2
-rw-r--r--sc/source/ui/vba/vbamenuitems.cxx6
-rw-r--r--sc/source/ui/vba/vbamenuitems.hxx2
-rw-r--r--sc/source/ui/vba/vbamenus.cxx6
-rw-r--r--sc/source/ui/vba/vbamenus.hxx2
-rw-r--r--sc/source/ui/vba/vbaname.cxx5
-rw-r--r--sc/source/ui/vba/vbaname.hxx2
-rw-r--r--sc/source/ui/vba/vbanames.cxx5
-rw-r--r--sc/source/ui/vba/vbanames.hxx2
-rw-r--r--sc/source/ui/vba/vbaoleobject.cxx6
-rw-r--r--sc/source/ui/vba/vbaoleobject.hxx2
-rw-r--r--sc/source/ui/vba/vbaoleobjects.cxx6
-rw-r--r--sc/source/ui/vba/vbaoleobjects.hxx2
-rw-r--r--sc/source/ui/vba/vbaoutline.cxx5
-rw-r--r--sc/source/ui/vba/vbaoutline.hxx2
-rw-r--r--sc/source/ui/vba/vbapagebreak.cxx15
-rw-r--r--sc/source/ui/vba/vbapagebreak.hxx6
-rw-r--r--sc/source/ui/vba/vbapagebreaks.cxx10
-rw-r--r--sc/source/ui/vba/vbapagebreaks.hxx4
-rw-r--r--sc/source/ui/vba/vbapagesetup.cxx5
-rw-r--r--sc/source/ui/vba/vbapagesetup.hxx2
-rw-r--r--sc/source/ui/vba/vbapivotcache.cxx6
-rw-r--r--sc/source/ui/vba/vbapivotcache.hxx2
-rw-r--r--sc/source/ui/vba/vbapivottable.cxx5
-rw-r--r--sc/source/ui/vba/vbapivottable.hxx2
-rw-r--r--sc/source/ui/vba/vbapivottables.cxx5
-rw-r--r--sc/source/ui/vba/vbapivottables.hxx2
-rw-r--r--sc/source/ui/vba/vbarange.cxx7
-rw-r--r--sc/source/ui/vba/vbarange.hxx2
-rw-r--r--sc/source/ui/vba/vbastyle.cxx6
-rw-r--r--sc/source/ui/vba/vbastyle.hxx2
-rw-r--r--sc/source/ui/vba/vbastyles.cxx5
-rw-r--r--sc/source/ui/vba/vbastyles.hxx2
-rw-r--r--sc/source/ui/vba/vbatextframe.cxx5
-rw-r--r--sc/source/ui/vba/vbatextframe.hxx2
-rw-r--r--sc/source/ui/vba/vbatitle.hxx5
-rw-r--r--sc/source/ui/vba/vbavalidation.cxx5
-rw-r--r--sc/source/ui/vba/vbavalidation.hxx2
-rw-r--r--sc/source/ui/vba/vbawindow.cxx5
-rw-r--r--sc/source/ui/vba/vbawindow.hxx2
-rw-r--r--sc/source/ui/vba/vbawindows.cxx5
-rw-r--r--sc/source/ui/vba/vbawindows.hxx2
-rw-r--r--sc/source/ui/vba/vbaworkbook.cxx5
-rw-r--r--sc/source/ui/vba/vbaworkbook.hxx2
-rw-r--r--sc/source/ui/vba/vbaworkbooks.cxx5
-rw-r--r--sc/source/ui/vba/vbaworkbooks.hxx2
-rw-r--r--sc/source/ui/vba/vbaworksheet.cxx6
-rw-r--r--sc/source/ui/vba/vbaworksheet.hxx2
-rw-r--r--sc/source/ui/vba/vbaworksheets.cxx5
-rw-r--r--sc/source/ui/vba/vbaworksheets.hxx2
-rw-r--r--sc/source/ui/vba/vbawsfunction.cxx5
-rw-r--r--sc/source/ui/vba/vbawsfunction.hxx2
109 files changed, 187 insertions, 237 deletions
diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx
index ddec78ff8b73..8885258f854a 100644
--- a/sc/source/ui/vba/vbaapplication.cxx
+++ b/sc/source/ui/vba/vbaapplication.cxx
@@ -1787,11 +1787,10 @@ double SAL_CALL ScVbaApplication::InchesToPoints( double Inches ) throw (uno::Ru
return MetricField::ConvertDoubleValue( Inches, 0, 0, FUNIT_INCH, FUNIT_POINT );
}
-rtl::OUString&
+rtl::OUString
ScVbaApplication::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaApplication") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaApplication"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbaapplication.hxx b/sc/source/ui/vba/vbaapplication.hxx
index 84816902088d..ad8c83309c38 100644
--- a/sc/source/ui/vba/vbaapplication.hxx
+++ b/sc/source/ui/vba/vbaapplication.hxx
@@ -141,7 +141,7 @@ public:
virtual double SAL_CALL InchesToPoints( double Inches ) throw (css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
#endif /* SC_VBA_APPLICATION_HXX */
diff --git a/sc/source/ui/vba/vbaassistant.cxx b/sc/source/ui/vba/vbaassistant.cxx
index 3c91b9cde00b..80132d6e5b39 100644
--- a/sc/source/ui/vba/vbaassistant.cxx
+++ b/sc/source/ui/vba/vbaassistant.cxx
@@ -113,11 +113,10 @@ ScVbaAssistant::Name( ) throw (css::script::BasicErrorException, css::uno::Runt
return m_sName;
}
-rtl::OUString&
+rtl::OUString
ScVbaAssistant::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaAssistant") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaAssistant"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbaassistant.hxx b/sc/source/ui/vba/vbaassistant.hxx
index 8490927c3240..01662cbc7930 100644
--- a/sc/source/ui/vba/vbaassistant.hxx
+++ b/sc/source/ui/vba/vbaassistant.hxx
@@ -64,7 +64,7 @@ public:
virtual ::rtl::OUString SAL_CALL Name( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
diff --git a/sc/source/ui/vba/vbaaxes.cxx b/sc/source/ui/vba/vbaaxes.cxx
index ae182c8a795e..2ecc2ef9caaa 100644
--- a/sc/source/ui/vba/vbaaxes.cxx
+++ b/sc/source/ui/vba/vbaaxes.cxx
@@ -183,11 +183,10 @@ ScVbaAxes::createCollectionObject(const css::uno::Any& aSource)
return aSource; // pass through ( it's already an XAxis object
}
-rtl::OUString&
+rtl::OUString
ScVbaAxes::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaAxes") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaAxes"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbaaxes.hxx b/sc/source/ui/vba/vbaaxes.hxx
index f135f8e65c71..702c7bea836b 100644
--- a/sc/source/ui/vba/vbaaxes.hxx
+++ b/sc/source/ui/vba/vbaaxes.hxx
@@ -44,7 +44,7 @@ public:
css::uno::Any SAL_CALL Item( const css::uno::Any& aIndex, const css::uno::Any& aIndex2 ) throw (css::uno::RuntimeException);
virtual css::uno::Any createCollectionObject(const css::uno::Any&);
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
static css::uno::Reference< ov::excel::XAxis > createAxis( const css::uno::Reference< ov::excel::XChart >& xChart, const css::uno::Reference< css::uno::XComponentContext >& xContext, sal_Int32 nType, sal_Int32 nAxisGroup ) throw ( css::uno::RuntimeException );
};
diff --git a/sc/source/ui/vba/vbaaxis.cxx b/sc/source/ui/vba/vbaaxis.cxx
index 28dbc8aab1a0..0c3ff43e57fb 100644
--- a/sc/source/ui/vba/vbaaxis.cxx
+++ b/sc/source/ui/vba/vbaaxis.cxx
@@ -647,11 +647,10 @@ void SAL_CALL ScVbaAxis::setLeft( double left ) throw (css::script::BasicErrorEx
oShapeHelper->setLeft( left );
}
-rtl::OUString&
+rtl::OUString
ScVbaAxis::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaAxis") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaAxis"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbaaxis.hxx b/sc/source/ui/vba/vbaaxis.hxx
index f139828319bd..ea03f5e0eda9 100644
--- a/sc/source/ui/vba/vbaaxis.hxx
+++ b/sc/source/ui/vba/vbaaxis.hxx
@@ -94,7 +94,7 @@ public:
virtual void SAL_CALL setLeft( double left ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
diff --git a/sc/source/ui/vba/vbaaxistitle.cxx b/sc/source/ui/vba/vbaaxistitle.cxx
index cc5b0d791b13..f2d9ddeb36c8 100644
--- a/sc/source/ui/vba/vbaaxistitle.cxx
+++ b/sc/source/ui/vba/vbaaxistitle.cxx
@@ -34,11 +34,10 @@ ScVbaAxisTitle::ScVbaAxisTitle( const uno::Reference< XHelperInterface >& xParen
{
}
-rtl::OUString&
+rtl::OUString
ScVbaAxisTitle::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaAxisTitle") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaAxisTitle"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbaaxistitle.hxx b/sc/source/ui/vba/vbaaxistitle.hxx
index 0360e40be4aa..f461fa761e15 100644
--- a/sc/source/ui/vba/vbaaxistitle.hxx
+++ b/sc/source/ui/vba/vbaaxistitle.hxx
@@ -39,7 +39,7 @@ class ScVbaAxisTitle : public AxisTitleBase
public:
ScVbaAxisTitle( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& _xTitleShape );
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
#endif
diff --git a/sc/source/ui/vba/vbaborders.cxx b/sc/source/ui/vba/vbaborders.cxx
index 7fbe157e2bdf..46719890a00c 100644
--- a/sc/source/ui/vba/vbaborders.cxx
+++ b/sc/source/ui/vba/vbaborders.cxx
@@ -152,10 +152,9 @@ private:
}
ScVbaBorder(); // no impl
protected:
- virtual rtl::OUString& getServiceImplName()
+ virtual rtl::OUString getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaBorder") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaBorder"));
}
virtual css::uno::Sequence<rtl::OUString> getServiceNames()
{
@@ -555,11 +554,10 @@ void SAL_CALL ScVbaBorders::setWeight( const uno::Any& _weight ) throw (uno::Run
}
-rtl::OUString&
+rtl::OUString
ScVbaBorders::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaBorders") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaBorders"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbaborders.hxx b/sc/source/ui/vba/vbaborders.hxx
index 0164328a9e83..0dd088dc8b19 100644
--- a/sc/source/ui/vba/vbaborders.hxx
+++ b/sc/source/ui/vba/vbaborders.hxx
@@ -69,7 +69,7 @@ public:
virtual css::uno::Any SAL_CALL getWeight() throw (css::uno::RuntimeException);
virtual void SAL_CALL setWeight( const css::uno::Any& ) throw (css::uno::RuntimeException);
// xxxxBASE
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
diff --git a/sc/source/ui/vba/vbacharacters.cxx b/sc/source/ui/vba/vbacharacters.cxx
index 2b163afc2a74..d5ec10974b39 100644
--- a/sc/source/ui/vba/vbacharacters.cxx
+++ b/sc/source/ui/vba/vbacharacters.cxx
@@ -116,11 +116,10 @@ ScVbaCharacters::Delete( ) throw (css::uno::RuntimeException)
}
-rtl::OUString&
+rtl::OUString
ScVbaCharacters::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCharacters") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaCharacters"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbacharacters.hxx b/sc/source/ui/vba/vbacharacters.hxx
index b9711fcb86df..31dc9b22415d 100644
--- a/sc/source/ui/vba/vbacharacters.hxx
+++ b/sc/source/ui/vba/vbacharacters.hxx
@@ -67,7 +67,7 @@ public:
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
diff --git a/sc/source/ui/vba/vbachart.cxx b/sc/source/ui/vba/vbachart.cxx
index db9d23ea2c6a..f706b3cd66b2 100644
--- a/sc/source/ui/vba/vbachart.cxx
+++ b/sc/source/ui/vba/vbachart.cxx
@@ -1062,11 +1062,10 @@ ScVbaChart::getAxisPropertySet(sal_Int32 _nAxisType, sal_Int32 _nAxisGroup) thro
}
-rtl::OUString&
+rtl::OUString
ScVbaChart::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaChart") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaChart"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbachart.hxx b/sc/source/ui/vba/vbachart.hxx
index e984ecf7bbed..43409be7fe41 100644
--- a/sc/source/ui/vba/vbachart.hxx
+++ b/sc/source/ui/vba/vbachart.hxx
@@ -95,7 +95,7 @@ public:
virtual css::uno::Reference< ov::excel::XChartTitle > SAL_CALL getChartTitle( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL Axes( const css::uno::Any& Type, const css::uno::Any& AxisGroup ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
diff --git a/sc/source/ui/vba/vbachartobject.cxx b/sc/source/ui/vba/vbachartobject.cxx
index 4a02bdabc1c7..da5086ded68d 100644
--- a/sc/source/ui/vba/vbachartobject.cxx
+++ b/sc/source/ui/vba/vbachartobject.cxx
@@ -137,11 +137,10 @@ ScVbaChartObject::getChart() throw (css::uno::RuntimeException)
return new ScVbaChart( this, mxContext, xEmbeddedObjectSupplier->getEmbeddedObject(), xTableChart );
}
-rtl::OUString&
+rtl::OUString
ScVbaChartObject::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaChartObject") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaChartObject"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbachartobject.hxx b/sc/source/ui/vba/vbachartobject.hxx
index 5b54069bc199..24616bd57ab8 100644
--- a/sc/source/ui/vba/vbachartobject.hxx
+++ b/sc/source/ui/vba/vbachartobject.hxx
@@ -64,7 +64,7 @@ public:
virtual void SAL_CALL Delete() throw ( css::script::BasicErrorException );
virtual void Activate() throw ( css::script::BasicErrorException );
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
diff --git a/sc/source/ui/vba/vbachartobjects.cxx b/sc/source/ui/vba/vbachartobjects.cxx
index 869311d678e7..1a790d619b4e 100644
--- a/sc/source/ui/vba/vbachartobjects.cxx
+++ b/sc/source/ui/vba/vbachartobjects.cxx
@@ -174,11 +174,10 @@ ScVbaChartObjects::createCollectionObject( const css::uno::Any& aSource )
return uno::makeAny( uno::Reference< excel::XChartObject > ( new ScVbaChartObject( getParent(), mxContext, xTableChart, xDrawPageSupplier ) ) );
}
-rtl::OUString&
+rtl::OUString
ScVbaChartObjects::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaChartObjects") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaChartObjects"));
}
css::uno::Sequence<rtl::OUString>
diff --git a/sc/source/ui/vba/vbachartobjects.hxx b/sc/source/ui/vba/vbachartobjects.hxx
index ee0b7b13f2cd..832621b57c6d 100644
--- a/sc/source/ui/vba/vbachartobjects.hxx
+++ b/sc/source/ui/vba/vbachartobjects.hxx
@@ -69,7 +69,7 @@ public:
// ScVbaCollectionBaseImpl
virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
// ChartObjects_BASE
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
diff --git a/sc/source/ui/vba/vbacharttitle.cxx b/sc/source/ui/vba/vbacharttitle.cxx
index 09f678704422..ebeb21285f75 100644
--- a/sc/source/ui/vba/vbacharttitle.cxx
+++ b/sc/source/ui/vba/vbacharttitle.cxx
@@ -34,11 +34,10 @@ ScVbaChartTitle::ScVbaChartTitle( const uno::Reference< XHelperInterface >& xPar
{
}
-rtl::OUString&
+rtl::OUString
ScVbaChartTitle::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaChartTitle") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaChartTitle"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbacharttitle.hxx b/sc/source/ui/vba/vbacharttitle.hxx
index db0f3e31529f..c8cc6d3c62fd 100644
--- a/sc/source/ui/vba/vbacharttitle.hxx
+++ b/sc/source/ui/vba/vbacharttitle.hxx
@@ -39,7 +39,7 @@ class ScVbaChartTitle : public ChartTitleBase
public:
ScVbaChartTitle( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& _xTitleShape );
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
#endif
diff --git a/sc/source/ui/vba/vbacomment.cxx b/sc/source/ui/vba/vbacomment.cxx
index bfb5d62f39f2..bce3c19673f5 100644
--- a/sc/source/ui/vba/vbacomment.cxx
+++ b/sc/source/ui/vba/vbacomment.cxx
@@ -229,11 +229,10 @@ ScVbaComment::Text( const uno::Any& aText, const uno::Any& aStart, const uno::An
return sAnnoText;
}
-rtl::OUString&
+rtl::OUString
ScVbaComment::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaComment") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaComment"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbacomment.hxx b/sc/source/ui/vba/vbacomment.hxx
index 81670dca678a..352d782f9edb 100644
--- a/sc/source/ui/vba/vbacomment.hxx
+++ b/sc/source/ui/vba/vbacomment.hxx
@@ -74,7 +74,7 @@ public:
virtual css::uno::Reference< ov::excel::XComment > SAL_CALL Previous() throw (css::uno::RuntimeException);
virtual rtl::OUString SAL_CALL Text( const css::uno::Any& Text, const css::uno::Any& Start, const css::uno::Any& Overwrite ) throw (css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
diff --git a/sc/source/ui/vba/vbacomments.cxx b/sc/source/ui/vba/vbacomments.cxx
index c4c290da3b2a..7557efc32bc0 100644
--- a/sc/source/ui/vba/vbacomments.cxx
+++ b/sc/source/ui/vba/vbacomments.cxx
@@ -97,11 +97,10 @@ ScVbaComments::getElementType() throw (uno::RuntimeException)
return excel::XComment::static_type(0);
}
-rtl::OUString&
+rtl::OUString
ScVbaComments::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaComments") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaComments"));
}
css::uno::Sequence<rtl::OUString>
diff --git a/sc/source/ui/vba/vbacomments.hxx b/sc/source/ui/vba/vbacomments.hxx
index 8b65a3cafc8a..fb578eb3df9a 100644
--- a/sc/source/ui/vba/vbacomments.hxx
+++ b/sc/source/ui/vba/vbacomments.hxx
@@ -55,7 +55,7 @@ public:
// ScVbaComments_BASE
virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
private:
diff --git a/sc/source/ui/vba/vbadialog.cxx b/sc/source/ui/vba/vbadialog.cxx
index 493d6b89db2f..5477dfd3caaa 100644
--- a/sc/source/ui/vba/vbadialog.cxx
+++ b/sc/source/ui/vba/vbadialog.cxx
@@ -85,11 +85,10 @@ ScVbaDialog::mapIndexToName( sal_Int32 nIndex )
return rtl::OUString();
}
-rtl::OUString&
+rtl::OUString
ScVbaDialog::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaDialog") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaDialog"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbadialog.hxx b/sc/source/ui/vba/vbadialog.hxx
index 9a336937a7c1..3bde7a7ff987 100644
--- a/sc/source/ui/vba/vbadialog.hxx
+++ b/sc/source/ui/vba/vbadialog.hxx
@@ -44,7 +44,7 @@ public:
// Methods
virtual rtl::OUString mapIndexToName( sal_Int32 nIndex );
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
static sal_Int32 GetSupportedDialogCount();
diff --git a/sc/source/ui/vba/vbadialogs.cxx b/sc/source/ui/vba/vbadialogs.cxx
index c64babea9069..f196ee2fa90c 100644
--- a/sc/source/ui/vba/vbadialogs.cxx
+++ b/sc/source/ui/vba/vbadialogs.cxx
@@ -46,11 +46,10 @@ ScVbaDialogs::Item( const uno::Any &aItem ) throw (uno::RuntimeException)
return uno::Any( aDialog );
}
-rtl::OUString&
+rtl::OUString
ScVbaDialogs::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaDialogs") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaDialogs"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbadialogs.hxx b/sc/source/ui/vba/vbadialogs.hxx
index 70c818fa0031..cda36dd18424 100644
--- a/sc/source/ui/vba/vbadialogs.hxx
+++ b/sc/source/ui/vba/vbadialogs.hxx
@@ -50,7 +50,7 @@ public:
// XDialogs
virtual void SAL_CALL Dummy() throw (css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
diff --git a/sc/source/ui/vba/vbafiledialog.cxx b/sc/source/ui/vba/vbafiledialog.cxx
index cb4917d4c9c3..7ae0a9eafb7a 100644
--- a/sc/source/ui/vba/vbafiledialog.cxx
+++ b/sc/source/ui/vba/vbafiledialog.cxx
@@ -54,11 +54,10 @@ ScVbaFileDialog::~ScVbaFileDialog()
}
}
-rtl::OUString&
+rtl::OUString
ScVbaFileDialog::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaFileDialog") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaFileDialog"));
}
css::uno::Sequence<rtl::OUString>
diff --git a/sc/source/ui/vba/vbafiledialog.hxx b/sc/source/ui/vba/vbafiledialog.hxx
index ac905f541185..16ed4de39a01 100644
--- a/sc/source/ui/vba/vbafiledialog.hxx
+++ b/sc/source/ui/vba/vbafiledialog.hxx
@@ -46,7 +46,7 @@ public:
virtual ~ScVbaFileDialog() ;
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
//XFileDialog
virtual css::uno::Reference< ov::XFileDialogSelectedItems > SAL_CALL getSelectedItems() throw (css::uno::RuntimeException);
diff --git a/sc/source/ui/vba/vbafiledialogselecteditems.cxx b/sc/source/ui/vba/vbafiledialogselecteditems.cxx
index 547841a2c987..21fa2e75d88c 100644
--- a/sc/source/ui/vba/vbafiledialogselecteditems.cxx
+++ b/sc/source/ui/vba/vbafiledialogselecteditems.cxx
@@ -40,12 +40,11 @@ VbaFileDialogSelectedItems::VbaFileDialogSelectedItems( const css::uno::Referenc
}
-rtl::OUString& VbaFileDialogSelectedItems::getServiceImplName()
+rtl::OUString VbaFileDialogSelectedItems::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("VbaFileDialogSelectedItems") );
- return sImplName;
-
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VbaFileDialogSelectedItems"));
}
+
css::uno::Sequence<rtl::OUString> VbaFileDialogSelectedItems::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
diff --git a/sc/source/ui/vba/vbafiledialogselecteditems.hxx b/sc/source/ui/vba/vbafiledialogselecteditems.hxx
index b43364dff709..030242a9e867 100644
--- a/sc/source/ui/vba/vbafiledialogselecteditems.hxx
+++ b/sc/source/ui/vba/vbafiledialogselecteditems.hxx
@@ -50,7 +50,7 @@ public:
virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
protected:
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
private:
};
diff --git a/sc/source/ui/vba/vbafilesearch.cxx b/sc/source/ui/vba/vbafilesearch.cxx
index 928ed9a0c5c1..f526011c629e 100644
--- a/sc/source/ui/vba/vbafilesearch.cxx
+++ b/sc/source/ui/vba/vbafilesearch.cxx
@@ -225,10 +225,9 @@ Reference< XFoundFiles > SAL_CALL ScVbaFileSearch::getFoundFiles() throw (css::u
return xFoundFiles;
}
-rtl::OUString& ScVbaFileSearch::getServiceImplName()
+rtl::OUString ScVbaFileSearch::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("VbaFileSearch") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VbaFileSearch"));
}
css::uno::Sequence< rtl::OUString > ScVbaFileSearch::getServiceNames()
diff --git a/sc/source/ui/vba/vbafilesearch.hxx b/sc/source/ui/vba/vbafilesearch.hxx
index 33e9caa53ca6..f89fd11577e4 100644
--- a/sc/source/ui/vba/vbafilesearch.hxx
+++ b/sc/source/ui/vba/vbafilesearch.hxx
@@ -71,7 +71,7 @@ public:
virtual void SAL_CALL NewSearch( ) throw (css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence< rtl::OUString > getServiceNames();
};
diff --git a/sc/source/ui/vba/vbafont.cxx b/sc/source/ui/vba/vbafont.cxx
index c3630abb9b06..2be56260987b 100644
--- a/sc/source/ui/vba/vbafont.cxx
+++ b/sc/source/ui/vba/vbafont.cxx
@@ -482,11 +482,10 @@ ScVbaFont::getOutlineFont() throw (uno::RuntimeException)
return mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharContoured" ) ) );
}
-rtl::OUString&
+rtl::OUString
ScVbaFont::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaFont") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaFont"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbafont.hxx b/sc/source/ui/vba/vbafont.hxx
index b87672a1223a..852791927168 100644
--- a/sc/source/ui/vba/vbafont.hxx
+++ b/sc/source/ui/vba/vbafont.hxx
@@ -80,7 +80,7 @@ public:
virtual css::uno::Any SAL_CALL getOutlineFont() throw (css::uno::RuntimeException) ;
virtual void SAL_CALL setOutlineFont( const css::uno::Any& _outlinefont ) throw (css::uno::RuntimeException) ;
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx
index 13bf8f84aac9..5688021719b6 100644
--- a/sc/source/ui/vba/vbaformat.cxx
+++ b/sc/source/ui/vba/vbaformat.cxx
@@ -800,11 +800,10 @@ ScVbaFormat<Ifc1>::getXPropertyState() throw ( uno::RuntimeException )
}
template< typename Ifc1 >
-rtl::OUString&
+rtl::OUString
ScVbaFormat<Ifc1>::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaFormat") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaFormat"));
}
template< typename Ifc1 >
diff --git a/sc/source/ui/vba/vbaformat.hxx b/sc/source/ui/vba/vbaformat.hxx
index 3646665f5b24..d2c0e0908135 100644
--- a/sc/source/ui/vba/vbaformat.hxx
+++ b/sc/source/ui/vba/vbaformat.hxx
@@ -102,7 +102,7 @@ public:
virtual void SAL_CALL setReadingOrder( const css::uno::Any& ReadingOrder ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL getReadingOrder( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
diff --git a/sc/source/ui/vba/vbaformatcondition.cxx b/sc/source/ui/vba/vbaformatcondition.cxx
index 9874a44c2618..7a722439416e 100644
--- a/sc/source/ui/vba/vbaformatcondition.cxx
+++ b/sc/source/ui/vba/vbaformatcondition.cxx
@@ -157,11 +157,10 @@ ScVbaFormatCondition::notifyRange() throw ( script::BasicErrorException )
}
}
-rtl::OUString&
+rtl::OUString
ScVbaFormatCondition::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaFormatCondition") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaFormatCondition"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbaformatcondition.hxx b/sc/source/ui/vba/vbaformatcondition.hxx
index aa1a3e5bb740..fec0b0be4e7d 100644
--- a/sc/source/ui/vba/vbaformatcondition.hxx
+++ b/sc/source/ui/vba/vbaformatcondition.hxx
@@ -65,7 +65,7 @@ public:
virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& Index ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
virtual css::uno::Reference< ::ooo::vba::excel::XFont > SAL_CALL Font( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
#endif
diff --git a/sc/source/ui/vba/vbaformatconditions.cxx b/sc/source/ui/vba/vbaformatconditions.cxx
index ddf8ef4247dd..96f61c7432bc 100644
--- a/sc/source/ui/vba/vbaformatconditions.cxx
+++ b/sc/source/ui/vba/vbaformatconditions.cxx
@@ -269,11 +269,10 @@ ScVbaFormatConditions::removeFormatCondition( const rtl::OUString& _sStyleName,
}
}
-rtl::OUString&
+rtl::OUString
ScVbaFormatConditions::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaFormatConditions") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaFormatConditions"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbaformatconditions.hxx b/sc/source/ui/vba/vbaformatconditions.hxx
index e191e277c2cf..a64b49fe96c6 100644
--- a/sc/source/ui/vba/vbaformatconditions.hxx
+++ b/sc/source/ui/vba/vbaformatconditions.hxx
@@ -71,7 +71,7 @@ public:
virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
virtual css::uno::Any createCollectionObject(const css::uno::Any&);
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
diff --git a/sc/source/ui/vba/vbafoundfiles.cxx b/sc/source/ui/vba/vbafoundfiles.cxx
index efbddd3451b1..b4229bcecec9 100644
--- a/sc/source/ui/vba/vbafoundfiles.cxx
+++ b/sc/source/ui/vba/vbafoundfiles.cxx
@@ -126,10 +126,9 @@ css::uno::Type VbaFoundFiles::getElementType() throw (css::uno::RuntimeException
return ov::XFoundFiles::static_type(0);
}
-rtl::OUString& VbaFoundFiles::getServiceImplName()
+rtl::OUString VbaFoundFiles::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("VbaFoundFiles") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VbaFoundFiles"));
}
css::uno::Sequence< rtl::OUString > VbaFoundFiles::getServiceNames()
diff --git a/sc/source/ui/vba/vbafoundfiles.hxx b/sc/source/ui/vba/vbafoundfiles.hxx
index 7a0a1e7b2a19..79fd52604598 100644
--- a/sc/source/ui/vba/vbafoundfiles.hxx
+++ b/sc/source/ui/vba/vbafoundfiles.hxx
@@ -82,7 +82,7 @@ public:
virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence< rtl::OUString > getServiceNames();
};
diff --git a/sc/source/ui/vba/vbaglobals.cxx b/sc/source/ui/vba/vbaglobals.cxx
index 59b8108858d5..43df5dfe15e7 100644
--- a/sc/source/ui/vba/vbaglobals.cxx
+++ b/sc/source/ui/vba/vbaglobals.cxx
@@ -281,11 +281,10 @@ ScVbaGlobals::getAvailableServiceNames( ) throw (uno::RuntimeException)
return serviceNames;
}
-rtl::OUString&
+rtl::OUString
ScVbaGlobals::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaGlobals") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaGlobals"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbaglobals.hxx b/sc/source/ui/vba/vbaglobals.hxx
index a320ebdf94f6..01d80f4b382e 100644
--- a/sc/source/ui/vba/vbaglobals.hxx
+++ b/sc/source/ui/vba/vbaglobals.hxx
@@ -91,7 +91,7 @@ typedef ::cppu::ImplInheritanceHelper1< VbaGlobalsBase, ov::excel::XGlobals > Sc
// XMultiServiceFactory
virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames( ) throw (css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
#endif //
diff --git a/sc/source/ui/vba/vbainterior.cxx b/sc/source/ui/vba/vbainterior.cxx
index 58675d860a66..b5e4746fe141 100644
--- a/sc/source/ui/vba/vbainterior.cxx
+++ b/sc/source/ui/vba/vbainterior.cxx
@@ -394,11 +394,10 @@ ScVbaInterior::setPatternColorIndex( const uno::Any& _patterncolorindex ) throw
throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Invalid Pattern Color" )), uno::Reference< uno::XInterface >() );
}
-rtl::OUString&
+rtl::OUString
ScVbaInterior::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaInterior") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaInterior"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbainterior.hxx b/sc/source/ui/vba/vbainterior.hxx
index 9dfb14646487..e25a06d48a25 100644
--- a/sc/source/ui/vba/vbainterior.hxx
+++ b/sc/source/ui/vba/vbainterior.hxx
@@ -82,7 +82,7 @@ public:
virtual css::uno::Any SAL_CALL getPatternColorIndex() throw (css::uno::RuntimeException);
virtual void SAL_CALL setPatternColorIndex( const css::uno::Any& _patterncolorindex ) throw (css::uno::RuntimeException);
//XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
#endif
diff --git a/sc/source/ui/vba/vbamenu.cxx b/sc/source/ui/vba/vbamenu.cxx
index ae6d4e4b1223..19c1392eeb0c 100644
--- a/sc/source/ui/vba/vbamenu.cxx
+++ b/sc/source/ui/vba/vbamenu.cxx
@@ -66,12 +66,12 @@ ScVbaMenu::MenuItems( const uno::Any& aIndex ) throw (script::BasicErrorExceptio
return uno::makeAny( xMenuItems );
}
-rtl::OUString&
+rtl::OUString
ScVbaMenu::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaMenu") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaMenu"));
}
+
uno::Sequence<rtl::OUString>
ScVbaMenu::getServiceNames()
{
diff --git a/sc/source/ui/vba/vbamenu.hxx b/sc/source/ui/vba/vbamenu.hxx
index 3141b5718447..392053929a29 100644
--- a/sc/source/ui/vba/vbamenu.hxx
+++ b/sc/source/ui/vba/vbamenu.hxx
@@ -49,7 +49,7 @@ public:
virtual css::uno::Any SAL_CALL MenuItems( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
#endif//SC_VBA_MENU_HXX
diff --git a/sc/source/ui/vba/vbamenubar.cxx b/sc/source/ui/vba/vbamenubar.cxx
index 1ad19a6a3b51..6d9b625326d5 100644
--- a/sc/source/ui/vba/vbamenubar.cxx
+++ b/sc/source/ui/vba/vbamenubar.cxx
@@ -48,12 +48,12 @@ ScVbaMenuBar::Menus( const uno::Any& aIndex ) throw (script::BasicErrorException
return uno::makeAny( xMenus );
}
-rtl::OUString&
+rtl::OUString
ScVbaMenuBar::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaMenuBar") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaMenuBar"));
}
+
uno::Sequence<rtl::OUString>
ScVbaMenuBar::getServiceNames()
{
diff --git a/sc/source/ui/vba/vbamenubar.hxx b/sc/source/ui/vba/vbamenubar.hxx
index 15253d4e73cb..f48956ca1941 100644
--- a/sc/source/ui/vba/vbamenubar.hxx
+++ b/sc/source/ui/vba/vbamenubar.hxx
@@ -45,7 +45,7 @@ public:
virtual css::uno::Any SAL_CALL Menus( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
#endif//SC_VBA_MENUBAR_HXX
diff --git a/sc/source/ui/vba/vbamenubars.cxx b/sc/source/ui/vba/vbamenubars.cxx
index ec1859173101..33d43897657f 100644
--- a/sc/source/ui/vba/vbamenubars.cxx
+++ b/sc/source/ui/vba/vbamenubars.cxx
@@ -116,12 +116,12 @@ ScVbaMenuBars::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) throw
}
// XHelperInterface
-rtl::OUString&
+rtl::OUString
ScVbaMenuBars::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaMenuBars") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaMenuBars"));
}
+
uno::Sequence<rtl::OUString>
ScVbaMenuBars::getServiceNames()
{
diff --git a/sc/source/ui/vba/vbamenubars.hxx b/sc/source/ui/vba/vbamenubars.hxx
index 2579eb74f8aa..cc52aa699b44 100644
--- a/sc/source/ui/vba/vbamenubars.hxx
+++ b/sc/source/ui/vba/vbamenubars.hxx
@@ -55,7 +55,7 @@ public:
virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL Item( const css::uno::Any& aIndex, const css::uno::Any& /*aIndex2*/ ) throw( css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
diff --git a/sc/source/ui/vba/vbamenuitem.cxx b/sc/source/ui/vba/vbamenuitem.cxx
index 8843544f31f0..37a701e8e726 100644
--- a/sc/source/ui/vba/vbamenuitem.cxx
+++ b/sc/source/ui/vba/vbamenuitem.cxx
@@ -64,12 +64,12 @@ ScVbaMenuItem::Delete( ) throw (script::BasicErrorException, uno::RuntimeExcepti
m_xCommandBarControl->Delete();
}
-rtl::OUString&
+rtl::OUString
ScVbaMenuItem::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaMenuItem") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaMenuItem"));
}
+
uno::Sequence<rtl::OUString>
ScVbaMenuItem::getServiceNames()
{
diff --git a/sc/source/ui/vba/vbamenuitem.hxx b/sc/source/ui/vba/vbamenuitem.hxx
index 5c22b3409a28..4ab24307118f 100644
--- a/sc/source/ui/vba/vbamenuitem.hxx
+++ b/sc/source/ui/vba/vbamenuitem.hxx
@@ -50,7 +50,7 @@ public:
virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
#endif//SC_VBA_MENUITEM_HXX
diff --git a/sc/source/ui/vba/vbamenuitems.cxx b/sc/source/ui/vba/vbamenuitems.cxx
index 5722830fce0a..8df35adac119 100644
--- a/sc/source/ui/vba/vbamenuitems.cxx
+++ b/sc/source/ui/vba/vbamenuitems.cxx
@@ -132,12 +132,12 @@ uno::Reference< excel::XMenuItem > SAL_CALL ScVbaMenuItems::Add( const rtl::OUSt
}
// XHelperInterface
-rtl::OUString&
+rtl::OUString
ScVbaMenuItems::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaMenuItems") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaMenuItems"));
}
+
uno::Sequence<rtl::OUString>
ScVbaMenuItems::getServiceNames()
{
diff --git a/sc/source/ui/vba/vbamenuitems.hxx b/sc/source/ui/vba/vbamenuitems.hxx
index 8a8dd6021b2d..49410804b388 100644
--- a/sc/source/ui/vba/vbamenuitems.hxx
+++ b/sc/source/ui/vba/vbamenuitems.hxx
@@ -54,7 +54,7 @@ public:
virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) throw (css::uno::RuntimeException);
virtual css::uno::Reference< ov::excel::XMenuItem > SAL_CALL Add( const rtl::OUString& Caption, const css::uno::Any& OnAction, const css::uno::Any& ShortcutKey, const css::uno::Any& Before, const css::uno::Any& Restore, const css::uno::Any& StatusBar, const css::uno::Any& HelpFile, const css::uno::Any& HelpContextID ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
diff --git a/sc/source/ui/vba/vbamenus.cxx b/sc/source/ui/vba/vbamenus.cxx
index e604d7b59242..b7d50e590a92 100644
--- a/sc/source/ui/vba/vbamenus.cxx
+++ b/sc/source/ui/vba/vbamenus.cxx
@@ -118,12 +118,12 @@ uno::Reference< excel::XMenu > SAL_CALL ScVbaMenus::Add( const rtl::OUString& Ca
}
// XHelperInterface
-rtl::OUString&
+rtl::OUString
ScVbaMenus::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaMenus") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaMenus"));
}
+
uno::Sequence<rtl::OUString>
ScVbaMenus::getServiceNames()
{
diff --git a/sc/source/ui/vba/vbamenus.hxx b/sc/source/ui/vba/vbamenus.hxx
index a85e73bdb394..49180037b375 100644
--- a/sc/source/ui/vba/vbamenus.hxx
+++ b/sc/source/ui/vba/vbamenus.hxx
@@ -54,7 +54,7 @@ public:
virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) throw (css::uno::RuntimeException);
virtual css::uno::Reference< ov::excel::XMenu > SAL_CALL Add( const rtl::OUString& Caption, const css::uno::Any& Before, const css::uno::Any& Restore ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
diff --git a/sc/source/ui/vba/vbaname.cxx b/sc/source/ui/vba/vbaname.cxx
index fab19796ced9..6509f628edc0 100644
--- a/sc/source/ui/vba/vbaname.cxx
+++ b/sc/source/ui/vba/vbaname.cxx
@@ -210,11 +210,10 @@ ScVbaName::Delete() throw (css::uno::RuntimeException)
mxNames->removeByName( mxNamedRange->getName() );
}
-rtl::OUString&
+rtl::OUString
ScVbaName::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaName") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaName"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbaname.hxx b/sc/source/ui/vba/vbaname.hxx
index fc6d210ffa10..16422845b7c5 100644
--- a/sc/source/ui/vba/vbaname.hxx
+++ b/sc/source/ui/vba/vbaname.hxx
@@ -82,7 +82,7 @@ public:
virtual void SAL_CALL Delete() throw (css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
#endif /* SC_VBA_NAME_HXX */
diff --git a/sc/source/ui/vba/vbanames.cxx b/sc/source/ui/vba/vbanames.cxx
index 01910c7e354b..ea06ef21e054 100644
--- a/sc/source/ui/vba/vbanames.cxx
+++ b/sc/source/ui/vba/vbanames.cxx
@@ -239,11 +239,10 @@ ScVbaNames::createCollectionObject( const uno::Any& aSource )
return uno::makeAny( uno::Reference< excel::XName > ( new ScVbaName( getParent(), mxContext, xName, mxNames , mxModel ) ) );
}
-rtl::OUString&
+rtl::OUString
ScVbaNames::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaNames") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaNames"));
}
css::uno::Sequence<rtl::OUString>
diff --git a/sc/source/ui/vba/vbanames.hxx b/sc/source/ui/vba/vbanames.hxx
index a3fddb13286d..b2404e776605 100644
--- a/sc/source/ui/vba/vbanames.hxx
+++ b/sc/source/ui/vba/vbanames.hxx
@@ -75,7 +75,7 @@ public:
virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
// ScVbaNames_BASE
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
diff --git a/sc/source/ui/vba/vbaoleobject.cxx b/sc/source/ui/vba/vbaoleobject.cxx
index 05cc60de33d7..1f26ccf986a3 100644
--- a/sc/source/ui/vba/vbaoleobject.cxx
+++ b/sc/source/ui/vba/vbaoleobject.cxx
@@ -133,11 +133,11 @@ ScVbaOLEObject::setWidth( double _width ) throw (uno::RuntimeException)
{
m_xControl->setWidth( _width );
}
-rtl::OUString&
+
+rtl::OUString
ScVbaOLEObject::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaOLEObject") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaOLEObject"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbaoleobject.hxx b/sc/source/ui/vba/vbaoleobject.hxx
index e329789cd7a4..136f536e0da8 100644
--- a/sc/source/ui/vba/vbaoleobject.hxx
+++ b/sc/source/ui/vba/vbaoleobject.hxx
@@ -41,7 +41,7 @@ class ScVbaOLEObject : public OLEObjectImpl_BASE
{
protected:
css::uno::Reference< css::drawing::XControlShape > m_xControlShape;
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
css::uno::Reference< ov::msforms::XControl> m_xControl;
public:
diff --git a/sc/source/ui/vba/vbaoleobjects.cxx b/sc/source/ui/vba/vbaoleobjects.cxx
index 7cecaff5784b..3d509bda5330 100644
--- a/sc/source/ui/vba/vbaoleobjects.cxx
+++ b/sc/source/ui/vba/vbaoleobjects.cxx
@@ -166,11 +166,11 @@ ScVbaOLEObjects::getElementType() throw (uno::RuntimeException)
{
return ooo::vba::excel::XOLEObject::static_type(0);
}
-rtl::OUString&
+
+rtl::OUString
ScVbaOLEObjects::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaOLEObjects") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaOLEObjects"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbaoleobjects.hxx b/sc/source/ui/vba/vbaoleobjects.hxx
index c949d578422a..890ee56b9ccb 100644
--- a/sc/source/ui/vba/vbaoleobjects.hxx
+++ b/sc/source/ui/vba/vbaoleobjects.hxx
@@ -40,7 +40,7 @@ class ScVbaOLEObjects : public OLEObjectsImpl_BASE
{
protected:
virtual css::uno::Any getItemByStringIndex( const rtl::OUString& sIndex ) throw (css::uno::RuntimeException);
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
public:
ScVbaOLEObjects( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext,
diff --git a/sc/source/ui/vba/vbaoutline.cxx b/sc/source/ui/vba/vbaoutline.cxx
index caf506cdf73b..4b2f8f946010 100644
--- a/sc/source/ui/vba/vbaoutline.cxx
+++ b/sc/source/ui/vba/vbaoutline.cxx
@@ -46,11 +46,10 @@ ScVbaOutline::ShowLevels( const uno::Any& RowLevels, const uno::Any& ColumnLevel
}
}
-rtl::OUString&
+rtl::OUString
ScVbaOutline::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaOutline") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaOutline"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbaoutline.hxx b/sc/source/ui/vba/vbaoutline.hxx
index 4b297a0a9079..ab3a3ce49dd6 100644
--- a/sc/source/ui/vba/vbaoutline.hxx
+++ b/sc/source/ui/vba/vbaoutline.hxx
@@ -47,7 +47,7 @@ public:
virtual void SAL_CALL ShowLevels( const css::uno::Any& RowLevels, const css::uno::Any& ColumnLevels ) throw (css::uno::RuntimeException) ;
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
#endif
diff --git a/sc/source/ui/vba/vbapagebreak.cxx b/sc/source/ui/vba/vbapagebreak.cxx
index 3939c33128cc..3183623cc84b 100644
--- a/sc/source/ui/vba/vbapagebreak.cxx
+++ b/sc/source/ui/vba/vbapagebreak.cxx
@@ -95,11 +95,10 @@ uno::Reference< excel::XRange> ScVbaPageBreak<Ifc1>::Location() throw ( script::
}
template< typename Ifc1 >
-rtl::OUString&
+rtl::OUString
ScVbaPageBreak<Ifc1>::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaPageBreak") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaPageBreak"));
}
template< typename Ifc1 >
@@ -118,11 +117,10 @@ ScVbaPageBreak<Ifc1>::getServiceNames()
template class ScVbaPageBreak< excel::XHPageBreak >;
/* class ScVbaHPageBreak */
-rtl::OUString&
+rtl::OUString
ScVbaHPageBreak::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaHPageBreak") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaHPageBreak"));
}
uno::Sequence< rtl::OUString >
@@ -152,11 +150,10 @@ ScVbaVPageBreak::~ScVbaVPageBreak()
{
}
-rtl::OUString&
+rtl::OUString
ScVbaVPageBreak::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaVPageBreak") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaVPageBreak"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbapagebreak.hxx b/sc/source/ui/vba/vbapagebreak.hxx
index c047a8e3c06a..3093a01a50a7 100644
--- a/sc/source/ui/vba/vbapagebreak.hxx
+++ b/sc/source/ui/vba/vbapagebreak.hxx
@@ -60,7 +60,7 @@ public:
virtual css::uno::Reference< ov::excel::XRange> SAL_CALL Location() throw ( css::script::BasicErrorException, css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
@@ -79,7 +79,7 @@ public:
virtual ~ScVbaHPageBreak(){}
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
@@ -97,7 +97,7 @@ public:
virtual ~ScVbaVPageBreak();
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
diff --git a/sc/source/ui/vba/vbapagebreaks.cxx b/sc/source/ui/vba/vbapagebreaks.cxx
index 18d785924c8c..b4f2d4eeac6e 100644
--- a/sc/source/ui/vba/vbapagebreaks.cxx
+++ b/sc/source/ui/vba/vbapagebreaks.cxx
@@ -238,11 +238,10 @@ ScVbaHPageBreaks::getElementType() throw (uno::RuntimeException)
return excel::XHPageBreak::static_type(0);
}
-rtl::OUString&
+rtl::OUString
ScVbaHPageBreaks::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaHPageBreaks") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaHPageBreaks"));
}
uno::Sequence< rtl::OUString >
@@ -299,11 +298,10 @@ ScVbaVPageBreaks::getElementType() throw ( uno::RuntimeException )
return excel::XVPageBreak::static_type( 0 );
}
-rtl::OUString&
+rtl::OUString
ScVbaVPageBreaks::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM( "ScVbaVPageBreaks" ) );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaVPageBreaks"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbapagebreaks.hxx b/sc/source/ui/vba/vbapagebreaks.hxx
index 5b8feb57c221..2c6671d48acf 100644
--- a/sc/source/ui/vba/vbapagebreaks.hxx
+++ b/sc/source/ui/vba/vbapagebreaks.hxx
@@ -64,7 +64,7 @@ public:
virtual css::uno::Any createCollectionObject(const css::uno::Any&);
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
@@ -91,7 +91,7 @@ public:
virtual css::uno::Any createCollectionObject( const css::uno::Any& );
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
diff --git a/sc/source/ui/vba/vbapagesetup.cxx b/sc/source/ui/vba/vbapagesetup.cxx
index 32be9b883db6..2831df0fcf92 100644
--- a/sc/source/ui/vba/vbapagesetup.cxx
+++ b/sc/source/ui/vba/vbapagesetup.cxx
@@ -611,11 +611,10 @@ void SAL_CALL ScVbaPageSetup::setPrintHeadings( sal_Bool printHeadings) throw (c
}
}
-rtl::OUString&
+rtl::OUString
ScVbaPageSetup::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaPageSetup") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaPageSetup"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbapagesetup.hxx b/sc/source/ui/vba/vbapagesetup.hxx
index 86e92d67f748..fb234200aec1 100644
--- a/sc/source/ui/vba/vbapagesetup.hxx
+++ b/sc/source/ui/vba/vbapagesetup.hxx
@@ -87,7 +87,7 @@ public:
virtual void SAL_CALL setPaperSize( sal_Int32 paperSize ) throw (css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
#endif
diff --git a/sc/source/ui/vba/vbapivotcache.cxx b/sc/source/ui/vba/vbapivotcache.cxx
index 7b2b4c6ddf61..ff50c7a8aeb1 100644
--- a/sc/source/ui/vba/vbapivotcache.cxx
+++ b/sc/source/ui/vba/vbapivotcache.cxx
@@ -51,11 +51,11 @@ ScVbaPivotCache::Refresh() throw (css::uno::RuntimeException)
{
m_xTable->refresh();
}
-rtl::OUString&
+
+rtl::OUString
ScVbaPivotCache::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaPivotCache") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaPivotCache"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbapivotcache.hxx b/sc/source/ui/vba/vbapivotcache.hxx
index da8c7752bd46..44f10459a158 100644
--- a/sc/source/ui/vba/vbapivotcache.hxx
+++ b/sc/source/ui/vba/vbapivotcache.hxx
@@ -47,7 +47,7 @@ public:
virtual void SAL_CALL Refresh() throw (css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
diff --git a/sc/source/ui/vba/vbapivottable.cxx b/sc/source/ui/vba/vbapivottable.cxx
index cffd07eeb5e1..dfb60214fe3e 100644
--- a/sc/source/ui/vba/vbapivottable.cxx
+++ b/sc/source/ui/vba/vbapivottable.cxx
@@ -44,11 +44,10 @@ ScVbaPivotTable::PivotCache() throw (uno::RuntimeException)
return new ScVbaPivotCache( uno::Reference< XHelperInterface >(), mxContext, m_xTable );
}
-rtl::OUString&
+rtl::OUString
ScVbaPivotTable::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaPivotTable") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaPivotTable"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbapivottable.hxx b/sc/source/ui/vba/vbapivottable.hxx
index 5f244a8ef95e..75398d1c2a8a 100644
--- a/sc/source/ui/vba/vbapivottable.hxx
+++ b/sc/source/ui/vba/vbapivottable.hxx
@@ -43,7 +43,7 @@ public:
ScVbaPivotTable( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::sheet::XDataPilotTable >& xTable );
virtual css::uno::Reference< ov::excel::XPivotCache > SAL_CALL PivotCache( ) throw (css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
diff --git a/sc/source/ui/vba/vbapivottables.cxx b/sc/source/ui/vba/vbapivottables.cxx
index b7e090d1a841..d2f5c47813f3 100644
--- a/sc/source/ui/vba/vbapivottables.cxx
+++ b/sc/source/ui/vba/vbapivottables.cxx
@@ -75,11 +75,10 @@ ScVbaPivotTables::getElementType() throw (uno::RuntimeException)
return excel::XPivotTable::static_type(0);
}
-rtl::OUString&
+rtl::OUString
ScVbaPivotTables::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaPivotTables") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaPivotTables"));
}
css::uno::Sequence<rtl::OUString>
diff --git a/sc/source/ui/vba/vbapivottables.hxx b/sc/source/ui/vba/vbapivottables.hxx
index 4928756e179b..69744d06cc81 100644
--- a/sc/source/ui/vba/vbapivottables.hxx
+++ b/sc/source/ui/vba/vbapivottables.hxx
@@ -59,7 +59,7 @@ public:
// ScVbaPivotTables_BASE
virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
};
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 089f5168edcb..2ec55b3378d4 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -389,7 +389,7 @@ public:
virtual uno::Any createCollectionObject( const uno::Any& aSource );
- virtual rtl::OUString& getServiceImplName() { static rtl::OUString sDummy; return sDummy; }
+ virtual rtl::OUString getServiceImplName() { return rtl::OUString(); }
virtual uno::Sequence< rtl::OUString > getServiceNames() { return uno::Sequence< rtl::OUString >(); }
@@ -6259,11 +6259,10 @@ ScVbaRange::PivotTable() throw (uno::RuntimeException)
}
-rtl::OUString&
+rtl::OUString
ScVbaRange::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaRange") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaRange"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx
index 26f639f10b4e..23290c1f6dc8 100644
--- a/sc/source/ui/vba/vbarange.hxx
+++ b/sc/source/ui/vba/vbarange.hxx
@@ -317,7 +317,7 @@ public:
// XErrorQuery
virtual ::sal_Bool SAL_CALL hasError( ) throw (css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
#endif /* SC_VBA_RANGE_HXX */
diff --git a/sc/source/ui/vba/vbastyle.cxx b/sc/source/ui/vba/vbastyle.cxx
index aaf3dfd24f49..670480cad7af 100644
--- a/sc/source/ui/vba/vbastyle.cxx
+++ b/sc/source/ui/vba/vbastyle.cxx
@@ -166,12 +166,10 @@ ScVbaStyle::getMergeCells( ) throw (script::BasicErrorException, uno::RuntimeEx
return uno::Any();
}
-
-rtl::OUString&
+rtl::OUString
ScVbaStyle::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaStyle") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaStyle"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbastyle.hxx b/sc/source/ui/vba/vbastyle.hxx
index 70b23a989287..25fd7bd7a323 100644
--- a/sc/source/ui/vba/vbastyle.hxx
+++ b/sc/source/ui/vba/vbastyle.hxx
@@ -60,7 +60,7 @@ public:
virtual void SAL_CALL setMergeCells( const css::uno::Any& MergeCells ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL getMergeCells( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
diff --git a/sc/source/ui/vba/vbastyles.cxx b/sc/source/ui/vba/vbastyles.cxx
index b07d98e81b80..3a8b8c1a0a7f 100644
--- a/sc/source/ui/vba/vbastyles.cxx
+++ b/sc/source/ui/vba/vbastyles.cxx
@@ -163,11 +163,10 @@ ScVbaStyles::Delete(const rtl::OUString _sStyleName) throw ( script::BasicErrorE
}
}
-rtl::OUString&
+rtl::OUString
ScVbaStyles::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaStyles") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaStyles"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbastyles.hxx b/sc/source/ui/vba/vbastyles.hxx
index 821233f75ea0..e06e395560dd 100644
--- a/sc/source/ui/vba/vbastyles.hxx
+++ b/sc/source/ui/vba/vbastyles.hxx
@@ -51,7 +51,7 @@ public:
virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
virtual css::uno::Any createCollectionObject(const css::uno::Any&);
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
diff --git a/sc/source/ui/vba/vbatextframe.cxx b/sc/source/ui/vba/vbatextframe.cxx
index dffbed8b511f..34fee9e27961 100644
--- a/sc/source/ui/vba/vbatextframe.cxx
+++ b/sc/source/ui/vba/vbatextframe.cxx
@@ -49,11 +49,10 @@ ScVbaTextFrame::Characters() throw (uno::RuntimeException)
return uno::makeAny( uno::Reference< ov::excel::XCharacters >( new ScVbaCharacters( this, mxContext, aPalette, xSimpleText, aStart, aLength, sal_True ) ) );
}
-rtl::OUString&
+rtl::OUString
ScVbaTextFrame::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaTextFrame") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaTextFrame"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbatextframe.hxx b/sc/source/ui/vba/vbatextframe.hxx
index e45af4e1c2be..3292801928b4 100644
--- a/sc/source/ui/vba/vbatextframe.hxx
+++ b/sc/source/ui/vba/vbatextframe.hxx
@@ -42,7 +42,7 @@ public:
// Methods
virtual css::uno::Any SAL_CALL Characters( ) throw (css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
diff --git a/sc/source/ui/vba/vbatitle.hxx b/sc/source/ui/vba/vbatitle.hxx
index 1f955f4ee19a..ef8bd25a1caa 100644
--- a/sc/source/ui/vba/vbatitle.hxx
+++ b/sc/source/ui/vba/vbatitle.hxx
@@ -147,10 +147,9 @@ public:
return static_cast< sal_Int32 >(nSOOrientation / 100) ;
}
// XHelperInterface
- rtl::OUString& getServiceImplName()
+ rtl::OUString getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("TitleImpl") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TitleImpl"));
}
css::uno::Sequence< rtl::OUString > getServiceNames()
{
diff --git a/sc/source/ui/vba/vbavalidation.cxx b/sc/source/ui/vba/vbavalidation.cxx
index 25c8c47d0424..03ce70ab85fd 100644
--- a/sc/source/ui/vba/vbavalidation.cxx
+++ b/sc/source/ui/vba/vbavalidation.cxx
@@ -324,11 +324,10 @@ ScVbaValidation::getFormula2() throw (uno::RuntimeException)
return xCond->getFormula2();
}
-rtl::OUString&
+rtl::OUString
ScVbaValidation::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaValidation") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaValidation"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbavalidation.hxx b/sc/source/ui/vba/vbavalidation.hxx
index 1ac0f3e35858..526ee43c225f 100644
--- a/sc/source/ui/vba/vbavalidation.hxx
+++ b/sc/source/ui/vba/vbavalidation.hxx
@@ -64,7 +64,7 @@ public:
virtual void SAL_CALL Delete( ) throw (css::uno::RuntimeException);
virtual void SAL_CALL Add( const css::uno::Any& Type, const css::uno::Any& AlertStyle, const css::uno::Any& Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2 ) throw (css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx
index 4e03d96cf9b1..f196a5c8fc3a 100644
--- a/sc/source/ui/vba/vbawindow.cxx
+++ b/sc/source/ui/vba/vbawindow.cxx
@@ -851,11 +851,10 @@ ScVbaWindow::PrintPreview( const css::uno::Any& EnableChanges ) throw (css::scri
PrintPreviewHelper( EnableChanges, excel::getBestViewShell( m_xModel ) );
}
-rtl::OUString&
+rtl::OUString
ScVbaWindow::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaWindow") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaWindow"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbawindow.hxx b/sc/source/ui/vba/vbawindow.hxx
index 45685f201fa5..12b460aca441 100644
--- a/sc/source/ui/vba/vbawindow.hxx
+++ b/sc/source/ui/vba/vbawindow.hxx
@@ -127,7 +127,7 @@ public:
virtual void SAL_CALL PrintOut( const css::uno::Any& From, const css::uno::Any&To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
virtual void SAL_CALL PrintPreview( const css::uno::Any& EnableChanges ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
diff --git a/sc/source/ui/vba/vbawindows.cxx b/sc/source/ui/vba/vbawindows.cxx
index e1c950727b95..b15d7539cd6c 100644
--- a/sc/source/ui/vba/vbawindows.cxx
+++ b/sc/source/ui/vba/vbawindows.cxx
@@ -238,11 +238,10 @@ ScVbaWindows::Arrange( ::sal_Int32 /*ArrangeStyle*/, const uno::Any& /*ActiveWor
}
-rtl::OUString&
+rtl::OUString
ScVbaWindows::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaWindows") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaWindows"));
}
css::uno::Sequence<rtl::OUString>
diff --git a/sc/source/ui/vba/vbawindows.hxx b/sc/source/ui/vba/vbawindows.hxx
index f3586d23ccd9..5ddcab785914 100644
--- a/sc/source/ui/vba/vbawindows.hxx
+++ b/sc/source/ui/vba/vbawindows.hxx
@@ -56,7 +56,7 @@ public:
virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
diff --git a/sc/source/ui/vba/vbaworkbook.cxx b/sc/source/ui/vba/vbaworkbook.cxx
index 935d5290d2f6..c282a57d56f7 100644
--- a/sc/source/ui/vba/vbaworkbook.cxx
+++ b/sc/source/ui/vba/vbaworkbook.cxx
@@ -405,11 +405,10 @@ ScVbaWorkbook::Names( const uno::Any& aIndex ) throw (uno::RuntimeException)
return uno::Any( xNames );
}
-rtl::OUString&
+rtl::OUString
ScVbaWorkbook::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaWorkbook") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaWorkbook"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbaworkbook.hxx b/sc/source/ui/vba/vbaworkbook.hxx
index f51ce051d1a7..985b3ed7640a 100644
--- a/sc/source/ui/vba/vbaworkbook.hxx
+++ b/sc/source/ui/vba/vbaworkbook.hxx
@@ -81,7 +81,7 @@ public:
virtual ::rtl::OUString SAL_CALL getCodeName() throw ( css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
virtual css::uno::Reference< css::frame::XModel > getDocModel() { return mxModel; }
diff --git a/sc/source/ui/vba/vbaworkbooks.cxx b/sc/source/ui/vba/vbaworkbooks.cxx
index 267d9451b934..9466200b1b09 100644
--- a/sc/source/ui/vba/vbaworkbooks.cxx
+++ b/sc/source/ui/vba/vbaworkbooks.cxx
@@ -310,11 +310,10 @@ ScVbaWorkbooks::Open( const rtl::OUString& rFileName, const uno::Any& /*UpdateLi
return aRet;
}
-rtl::OUString&
+rtl::OUString
ScVbaWorkbooks::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaWorkbooks") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaWorkbooks"));
}
css::uno::Sequence<rtl::OUString>
diff --git a/sc/source/ui/vba/vbaworkbooks.hxx b/sc/source/ui/vba/vbaworkbooks.hxx
index 51273b180cf1..82886a9d7db8 100644
--- a/sc/source/ui/vba/vbaworkbooks.hxx
+++ b/sc/source/ui/vba/vbaworkbooks.hxx
@@ -57,7 +57,7 @@ public:
// ScVbaWorkbooks_BASE
virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
// XWorkbooks
diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx
index f659da3c486b..f73a81f3b0c1 100644
--- a/sc/source/ui/vba/vbaworksheet.cxx
+++ b/sc/source/ui/vba/vbaworksheet.cxx
@@ -1094,12 +1094,12 @@ ScVbaWorksheet::getControlShape( const ::rtl::OUString& sName )
}
-rtl::OUString&
+rtl::OUString
ScVbaWorksheet::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaWorksheet") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaWorksheet"));
}
+
void SAL_CALL
ScVbaWorksheet::setEnableCalculation( ::sal_Bool bEnableCalculation ) throw ( script::BasicErrorException, uno::RuntimeException)
{
diff --git a/sc/source/ui/vba/vbaworksheet.hxx b/sc/source/ui/vba/vbaworksheet.hxx
index 95c933e0b7c0..d02244439062 100644
--- a/sc/source/ui/vba/vbaworksheet.hxx
+++ b/sc/source/ui/vba/vbaworksheet.hxx
@@ -170,7 +170,7 @@ public:
virtual void SAL_CALL PrintOut( const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName, const css::uno::Any& IgnorePrintAreas ) throw (css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
// XUnoTunnel
virtual ::sal_Int64 SAL_CALL getSomething(const css::uno::Sequence<sal_Int8 >& rId ) throw(css::uno::RuntimeException);
diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx
index 732e07ac79d2..89f169a3e8bf 100644
--- a/sc/source/ui/vba/vbaworksheets.cxx
+++ b/sc/source/ui/vba/vbaworksheets.cxx
@@ -498,11 +498,10 @@ ScVbaWorksheets::getItemByStringIndex( const rtl::OUString& sIndex ) throw (uno:
return ScVbaWorksheets_BASE::getItemByStringIndex( sIndex );
}
-rtl::OUString&
+rtl::OUString
ScVbaWorksheets::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaWorksheets") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaWorksheets"));
}
css::uno::Sequence<rtl::OUString>
diff --git a/sc/source/ui/vba/vbaworksheets.hxx b/sc/source/ui/vba/vbaworksheets.hxx
index c15d713e1230..c34ec0822788 100644
--- a/sc/source/ui/vba/vbaworksheets.hxx
+++ b/sc/source/ui/vba/vbaworksheets.hxx
@@ -76,7 +76,7 @@ public:
// ScVbaWorksheets_BASE
virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& Index2 ) throw
(css::uno::RuntimeException);
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
static bool nameExists( css::uno::Reference <css::sheet::XSpreadsheetDocument>& xSpreadDoc, const ::rtl::OUString & name, SCTAB& nTab ) throw ( css::lang::IllegalArgumentException );
diff --git a/sc/source/ui/vba/vbawsfunction.cxx b/sc/source/ui/vba/vbawsfunction.cxx
index 685377da4324..0692afb21a20 100644
--- a/sc/source/ui/vba/vbawsfunction.cxx
+++ b/sc/source/ui/vba/vbawsfunction.cxx
@@ -300,11 +300,10 @@ ScVbaWSFunction::getExactName( const ::rtl::OUString& aApproximateName ) throw (
return sName;
}
-rtl::OUString&
+rtl::OUString
ScVbaWSFunction::getServiceImplName()
{
- static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaWSFunction") );
- return sImplName;
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ScVbaWSFunction"));
}
uno::Sequence< rtl::OUString >
diff --git a/sc/source/ui/vba/vbawsfunction.hxx b/sc/source/ui/vba/vbawsfunction.hxx
index 2e1c768b9588..5fc1afd337d5 100644
--- a/sc/source/ui/vba/vbawsfunction.hxx
+++ b/sc/source/ui/vba/vbawsfunction.hxx
@@ -51,7 +51,7 @@ public:
virtual sal_Bool SAL_CALL hasProperty(const rtl::OUString& Name) throw(css::uno::RuntimeException);
virtual ::rtl::OUString SAL_CALL getExactName( const ::rtl::OUString& aApproximateName ) throw (css::uno::RuntimeException);
// XHelperInterface
- virtual rtl::OUString& getServiceImplName();
+ virtual rtl::OUString getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
#endif