fdo#38835 strip out OUString globals

Change-Id: I1a435214af102461e02217f7d95248dac14e5f1a

3 files changed, 6 insertions, 9 deletions

diff --git a/toolkit/source/controls/grid/defaultgriddatamodel.cxx b/toolkit/source/controls/grid/defaultgriddatamodel.cxx
index 883d3e4d1697..aa830e47ec6b 100644
--- a/toolkit/source/controls/grid/defaultgriddatamodel.cxx
+++ b/toolkit/source/controls/grid/defaultgriddatamodel.cxx
@@ -495,8 +495,8 @@ private:
 
     Sequence< OUString > SAL_CALL DefaultGridDataModel::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
     {
-        static const OUString aServiceName("com.sun.star.awt.grid.DefaultGridDataModel");
-        static const Sequence< OUString > aSeq( &aServiceName, 1 );
+        Sequence< OUString > aSeq( 1 );
+        aSeq[0] = "com.sun.star.awt.grid.DefaultGridDataModel";
         return aSeq;
     }
 
diff --git a/toolkit/source/controls/tree/treedatamodel.cxx b/toolkit/source/controls/tree/treedatamodel.cxx
index ee1468ff22ac..3f50b3d081c5 100644
--- a/toolkit/source/controls/tree/treedatamodel.cxx
+++ b/toolkit/source/controls/tree/treedatamodel.cxx
@@ -258,9 +258,8 @@ sal_Bool SAL_CALL MutableTreeDataModel::supportsService( const OUString& Service
 
 Sequence< OUString > SAL_CALL MutableTreeDataModel::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
 {
-    ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-    static const OUString aServiceName( OUString::createFromAscii( szServiceName_MutableTreeDataModel ) );
-    static const Sequence< OUString > aSeq( &aServiceName, 1 );
+    Sequence< OUString > aSeq( 1 );
+    aSeq[0] = "com.sun.star.awt.tree.MutableTreeDataModel";
     return aSeq;
 }
 
@@ -536,9 +535,8 @@ sal_Bool SAL_CALL MutableTreeNode::supportsService( const OUString& ServiceName
 
 Sequence< OUString > SAL_CALL MutableTreeNode::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
 {
-    ::osl::Guard< ::osl::Mutex > aGuard( maMutex );
-    static const OUString aServiceName( "com.sun.star.awt.tree.MutableTreeNode" );
-    static const Sequence< OUString > aSeq( &aServiceName, 1 );
+    Sequence< OUString > aSeq( 1 );
+    aSeq[0] = "com.sun.star.awt.tree.MutableTreeNode";
     return aSeq;
 }
 
diff --git a/toolkit/source/helper/servicenames.cxx b/toolkit/source/helper/servicenames.cxx
index 6d20891a164f..944ac2d79a09 100644
--- a/toolkit/source/helper/servicenames.cxx
+++ b/toolkit/source/helper/servicenames.cxx
@@ -86,7 +86,6 @@ const sal_Char szServiceName_UnoFrameControl[] = "com.sun.star.awt.UnoControlFra
 const sal_Char szServiceName_UnoFrameModel[] = "com.sun.star.awt.UnoFrameModel";
 const sal_Char szServiceName_TreeControl[] = "com.sun.star.awt.tree.TreeControl";
 const sal_Char szServiceName_TreeControlModel[] = "com.sun.star.awt.tree.TreeControlModel";
-const sal_Char szServiceName_MutableTreeDataModel[] = "com.sun.star.awt.tree.MutableTreeDataModel";
 const sal_Char szServiceName_UnoControlFixedHyperlink[] = "com.sun.star.awt.UnoControlFixedHyperlink";
 const sal_Char szServiceName_UnoControlFixedHyperlinkModel[] = "com.sun.star.awt.UnoControlFixedHyperlinkModel";
 const sal_Char szServiceName_GridControl[] = "com.sun.star.awt.grid.UnoControlGrid";