From b1e1ab577fe7f402a5367a624963338a1dbf6a55 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@collabora.com>
Date: Fri, 17 Jan 2014 21:21:23 +0200
Subject: Follow-up (micro-?)optimisation

Change-Id: Ia49cb02b2374e1c284bb4dee77e333fe6c8839ce
---
 sc/source/core/tool/compiler.cxx | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

(limited to 'sc')

diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 3730d24de83f..ff1cbb1cdcac 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -1631,24 +1631,34 @@ void ScCompiler::SetRefConvention( FormulaGrammar::AddressConvention eConv )
 
 const ScCompiler::Convention* ScCompiler::GetRefConvention( FormulaGrammar::AddressConvention eConv )
 {
-    static const ConventionOOO_A1 ConvOOO_A1;
-    static const ConventionOOO_A1_ODF ConvOOO_A1_ODF;
-    static const ConventionXL_A1 ConvXL_A1;
-    static const ConventionXL_R1C1 ConvXL_R1C1;
-    static const ConventionXL_OOX ConvXL_OOX;
 
     switch (eConv)
     {
         case FormulaGrammar::CONV_OOO:
+        {
+            static const ConventionOOO_A1 ConvOOO_A1;
             return &ConvOOO_A1;
+        }
         case FormulaGrammar::CONV_ODF:
+        {
+            static const ConventionOOO_A1_ODF ConvOOO_A1_ODF;
             return &ConvOOO_A1_ODF;
+        }
         case FormulaGrammar::CONV_XL_A1:
+        {
+            static const ConventionXL_A1 ConvXL_A1;
             return &ConvXL_A1;
+        }
         case FormulaGrammar::CONV_XL_R1C1:
+        {
+            static const ConventionXL_R1C1 ConvXL_R1C1;
             return &ConvXL_R1C1;
+        }
         case FormulaGrammar::CONV_XL_OOX:
+        {
+            static const ConventionXL_OOX ConvXL_OOX;
             return &ConvXL_OOX;
+        }
         case FormulaGrammar::CONV_UNSPECIFIED:
         default:
             ;
-- 
cgit v1.2.3