From 3471d7eef30df7e2e1288b8c7708d3f3857c02ae Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Wed, 1 Jun 2011 12:15:11 +0100
Subject: overly static

---
 chart2/source/controller/main/ChartController.cxx | 10 ++--------
 chart2/source/model/template/BubbleChartType.cxx  | 17 ++++++-----------
 chart2/source/model/template/ChartType.cxx        | 16 ++++------------
 chart2/source/model/template/ScatterChartType.cxx | 18 +++++-------------
 chart2/source/tools/UncachedDataSequence.cxx      |  3 +--
 5 files changed, 18 insertions(+), 46 deletions(-)

diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index bd657e85a734..e95d50d0614a 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -1375,14 +1375,8 @@ uno::Sequence< ::rtl::OUString > SAL_CALL
     ChartController::getAvailableServiceNames()
     throw (uno::RuntimeException)
 {
-    static uno::Sequence< ::rtl::OUString > aServiceNames;
-
-    if( aServiceNames.getLength() == 0 )
-    {
-        aServiceNames.realloc(1);
-        aServiceNames[0] = CHART_ACCESSIBLE_TEXT_SERVICE_NAME;
-    }
-
+    uno::Sequence< ::rtl::OUString > aServiceNames(1);
+    aServiceNames[0] = CHART_ACCESSIBLE_TEXT_SERVICE_NAME;
     return aServiceNames;
 }
 
diff --git a/chart2/source/model/template/BubbleChartType.cxx b/chart2/source/model/template/BubbleChartType.cxx
index 2a148068ba70..9be27dd11f0e 100644
--- a/chart2/source/model/template/BubbleChartType.cxx
+++ b/chart2/source/model/template/BubbleChartType.cxx
@@ -178,17 +178,12 @@ Reference< chart2::XCoordinateSystem > SAL_CALL
 uno::Sequence< ::rtl::OUString > SAL_CALL BubbleChartType::getSupportedMandatoryRoles()
     throw (uno::RuntimeException)
 {
-    static uno::Sequence< ::rtl::OUString > aMandRolesSeq;
-
-    if( aMandRolesSeq.getLength() == 0 )
-    {
-        aMandRolesSeq.realloc( 4 );
-        aMandRolesSeq[0] = C2U( "label" );
-        aMandRolesSeq[1] = C2U( "values-x" );
-        aMandRolesSeq[2] = C2U( "values-y" );
-        aMandRolesSeq[3] = C2U( "values-size" );
-    }
-
+    uno::Sequence< ::rtl::OUString > aMandRolesSeq(4);
+    aMandRolesSeq.realloc( 4 );
+    aMandRolesSeq[0] = C2U( "label" );
+    aMandRolesSeq[1] = C2U( "values-x" );
+    aMandRolesSeq[2] = C2U( "values-y" );
+    aMandRolesSeq[3] = C2U( "values-size" );
     return aMandRolesSeq;
 }
 
diff --git a/chart2/source/model/template/ChartType.cxx b/chart2/source/model/template/ChartType.cxx
index 99b3ca9fadaa..53114fc9439a 100644
--- a/chart2/source/model/template/ChartType.cxx
+++ b/chart2/source/model/template/ChartType.cxx
@@ -122,24 +122,16 @@ Reference< chart2::XCoordinateSystem > SAL_CALL
 Sequence< OUString > SAL_CALL ChartType::getSupportedMandatoryRoles()
     throw (uno::RuntimeException)
 {
-    static Sequence< OUString > aDefaultSeq;
-
-    if( aDefaultSeq.getLength() == 0 )
-    {
-        aDefaultSeq.realloc( 2 );
-        aDefaultSeq[0] = C2U( "label" );
-        aDefaultSeq[1] = C2U( "values-y" );
-    }
-
+    Sequence< OUString > aDefaultSeq(2);
+    aDefaultSeq[0] = C2U( "label" );
+    aDefaultSeq[1] = C2U( "values-y" );
     return aDefaultSeq;
 }
 
 Sequence< OUString > SAL_CALL ChartType::getSupportedOptionalRoles()
     throw (uno::RuntimeException)
 {
-    static Sequence< OUString > aDefaultOptRolesSeq;
-
-    return aDefaultOptRolesSeq;
+    return Sequence< OUString >();
 }
 
 OUString SAL_CALL ChartType::getRoleOfSequenceForSeriesLabel()
diff --git a/chart2/source/model/template/ScatterChartType.cxx b/chart2/source/model/template/ScatterChartType.cxx
index f316e05e99d4..d8b50e94ba5f 100644
--- a/chart2/source/model/template/ScatterChartType.cxx
+++ b/chart2/source/model/template/ScatterChartType.cxx
@@ -228,25 +228,17 @@ Reference< chart2::XCoordinateSystem > SAL_CALL
 uno::Sequence< ::rtl::OUString > SAL_CALL ScatterChartType::getSupportedMandatoryRoles()
     throw (uno::RuntimeException)
 {
-    static uno::Sequence< ::rtl::OUString > aMandRolesSeq;
-
-    if( aMandRolesSeq.getLength() == 0 )
-    {
-        aMandRolesSeq.realloc( 3 );
-        aMandRolesSeq[0] = C2U( "label" );
-        aMandRolesSeq[1] = C2U( "values-x" );
-        aMandRolesSeq[2] = C2U( "values-y" );
-    }
-
+    uno::Sequence< ::rtl::OUString > aMandRolesSeq(3);
+    aMandRolesSeq[0] = C2U( "label" );
+    aMandRolesSeq[1] = C2U( "values-x" );
+    aMandRolesSeq[2] = C2U( "values-y" );
     return aMandRolesSeq;
 }
 
 uno::Sequence< ::rtl::OUString > SAL_CALL ScatterChartType::getSupportedOptionalRoles()
     throw (uno::RuntimeException)
 {
-    static uno::Sequence< ::rtl::OUString > aOptRolesSeq;
-
-    return aOptRolesSeq;
+    return uno::Sequence< ::rtl::OUString >();
 }
 
 
diff --git a/chart2/source/tools/UncachedDataSequence.cxx b/chart2/source/tools/UncachedDataSequence.cxx
index 543cdad9b26e..384fdb413449 100644
--- a/chart2/source/tools/UncachedDataSequence.cxx
+++ b/chart2/source/tools/UncachedDataSequence.cxx
@@ -233,8 +233,7 @@ Sequence< OUString > SAL_CALL UncachedDataSequence::generateLabel( chart2::data:
     throw (uno::RuntimeException)
 {
     // auto-generated label is an empty string
-    static const Sequence< OUString > aOneEmptyString( 1 );
-    return aOneEmptyString;
+    return Sequence< OUString >(1);
 }
 
 ::sal_Int32 SAL_CALL UncachedDataSequence::getNumberFormatKeyByIndex( ::sal_Int32 )
-- 
cgit