Get rid of some unneccessary formula:: namespace

Change-Id: Icd30167589b507c3f83a31dbb5c0eb473ab6580e

2 files changed, 18 insertions, 18 deletions

diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index 8937e666c865..ea3145b3a5c0 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -2471,7 +2471,7 @@ void ScInterpreter::ScZTest()
     double rValCount = 0.0;
     switch (GetStackType())
     {
-        case formula::svDouble :
+        case svDouble :
         {
             fVal = GetDouble();
             fSum    += fVal;
@@ -2494,7 +2494,7 @@ void ScInterpreter::ScZTest()
         }
         break;
         case svRefList :
-        case formula::svDoubleRef :
+        case svDoubleRef :
         {
             short nParam = 1;
             size_t nRefInList = 0;
@@ -2912,7 +2912,7 @@ void ScInterpreter::ScHarMean()
     {
         switch (GetStackType())
         {
-            case formula::svDouble    :
+            case svDouble    :
             {
                 double x = GetDouble();
                 if (x > 0.0)
@@ -2941,7 +2941,7 @@ void ScInterpreter::ScHarMean()
                 }
                 break;
             }
-            case formula::svDoubleRef :
+            case svDoubleRef :
             case svRefList :
             {
                 FormulaError nErr = FormulaError::NONE;
@@ -3034,7 +3034,7 @@ void ScInterpreter::ScGeoMean()
     {
         switch (GetStackType())
         {
-            case formula::svDouble    :
+            case svDouble    :
             {
                 double x = GetDouble();
                 if (x > 0.0)
@@ -3063,7 +3063,7 @@ void ScInterpreter::ScGeoMean()
                 }
                 break;
             }
-            case formula::svDoubleRef :
+            case svDoubleRef :
             case svRefList :
             {
                 FormulaError nErr = FormulaError::NONE;
@@ -3175,7 +3175,7 @@ bool ScInterpreter::CalculateSkew(double& fSum,double& fCount,double& vSum,std::
     {
         switch (GetStackType())
         {
-            case formula::svDouble :
+            case svDouble :
             {
                 fVal = GetDouble();
                 fSum += fVal;
@@ -3196,7 +3196,7 @@ bool ScInterpreter::CalculateSkew(double& fSum,double& fCount,double& vSum,std::
                 }
             }
             break;
-            case formula::svDoubleRef :
+            case svDoubleRef :
             case svRefList :
             {
                 PopDoubleRef( aRange, nParamCount, nRefInList);
@@ -3663,7 +3663,7 @@ void ScInterpreter::GetNumberSequenceArray( sal_uInt8 nParamCount, vector<double
         const StackVar eStackType = GetStackType();
         switch (eStackType)
         {
-            case formula::svDouble :
+            case svDouble :
                 rArray.push_back( PopDouble());
             break;
             case svSingleRef :
@@ -3674,7 +3674,7 @@ void ScInterpreter::GetNumberSequenceArray( sal_uInt8 nParamCount, vector<double
                     rArray.push_back(GetCellValue(aAdr, aCell));
             }
             break;
-            case formula::svDoubleRef :
+            case svDoubleRef :
             case svRefList :
             {
                 PopDoubleRef( aRange, nParam, nRefInList);
@@ -3946,7 +3946,7 @@ void ScInterpreter::ScAveDev()
     {
         switch (GetStackType())
         {
-            case formula::svDouble :
+            case svDouble :
                 rVal += GetDouble();
                 rValCount++;
                 break;
@@ -3961,7 +3961,7 @@ void ScInterpreter::ScAveDev()
                 }
             }
             break;
-            case formula::svDoubleRef :
+            case svDoubleRef :
             case svRefList :
             {
                 FormulaError nErr = FormulaError::NONE;
@@ -4029,7 +4029,7 @@ void ScInterpreter::ScAveDev()
     {
         switch (GetStackType())
         {
-            case formula::svDouble :
+            case svDouble :
                 rVal += fabs(GetDouble() - nMiddle);
                 break;
             case svSingleRef :
@@ -4040,7 +4040,7 @@ void ScInterpreter::ScAveDev()
                     rVal += fabs(GetCellValue(aAdr, aCell) - nMiddle);
             }
             break;
-            case formula::svDoubleRef :
+            case svDoubleRef :
             case svRefList :
             {
                 FormulaError nErr = FormulaError::NONE;
@@ -4278,7 +4278,7 @@ void ScInterpreter::ScRSQ()
     {
         switch (GetStackType())
         {
-            case formula::svDouble:
+            case svDouble:
                 {
                     double fVal = PopDouble();
                     PushDouble( fVal * fVal);
diff --git a/sc/source/core/tool/interpr6.cxx b/sc/source/core/tool/interpr6.cxx
index c42f0f4545d3..31448ee48f6e 100644
--- a/sc/source/core/tool/interpr6.cxx
+++ b/sc/source/core/tool/interpr6.cxx
@@ -564,7 +564,7 @@ double ScInterpreter::IterateParameters( ScIterFunc eFunc, bool bTextAsZero )
                 StackVar eType = pToken->GetType();
                 if (eFunc == ifCOUNT2)
                 {
-                    if ( eType != formula::svEmptyCell &&
+                    if ( eType != svEmptyCell &&
                          ( ( pToken->GetOpCode() != ocSubTotal &&
                              pToken->GetOpCode() != ocAggregate ) ||
                            ( mnSubTotalFlags & SubtotalFlags::IgnoreNestedStAg ) ) )
@@ -572,7 +572,7 @@ double ScInterpreter::IterateParameters( ScIterFunc eFunc, bool bTextAsZero )
                     if (nGlobalError != FormulaError::NONE)
                         nGlobalError = FormulaError::NONE;
                 }
-                else if (eType == formula::svDouble)
+                else if (eType == svDouble)
                 {
                     nCount++;
                     fVal = pToken->GetDouble();
@@ -602,7 +602,7 @@ double ScInterpreter::IterateParameters( ScIterFunc eFunc, bool bTextAsZero )
                         default: ; // nothing
                     }
                 }
-                else if (bTextAsZero && eType == formula::svString)
+                else if (bTextAsZero && eType == svString)
                 {
                     nCount++;
                     if ( eFunc == ifPRODUCT )