[Libreoffice-commits] core.git: sc/inc sc/source

[Jochen Nitschke]

 sc/inc/fmtuno.hxx              |    5 ++---
 sc/source/ui/unoobj/fmtuno.cxx |   13 +++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 71c56d9e74d579471924ec8ecd506743a57fbe2e
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date:   Mon Mar 27 12:41:10 2017 +0200

    change int to enum
    
    plus some includes cleanup
    
    Change-Id: I3b57264ed67fc49ee06b825bbbeb397f596d0bea
    Reviewed-on: https://gerrit.libreoffice.org/35752
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sc/inc/fmtuno.hxx b/sc/inc/fmtuno.hxx
index 045f5d0c69ba..f305493322fa 100644
--- a/sc/inc/fmtuno.hxx
+++ b/sc/inc/fmtuno.hxx
@@ -23,9 +23,9 @@
 #include <vector>
 
 #include <formula/grammar.hxx>
+#include <rtl/ref.hxx>
 #include <svl/itemprop.hxx>
 #include <com/sun/star/sheet/XSheetConditionalEntries.hpp>
-#include <com/sun/star/sheet/XSheetCondition.hpp>
 #include <com/sun/star/sheet/XSheetCondition2.hpp>
 #include <com/sun/star/sheet/XSheetConditionalEntry.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -37,7 +37,6 @@
 #include <com/sun/star/sheet/XMultiFormulaTokens.hpp>
 #include <com/sun/star/sheet/FormulaToken.hpp>
 #include <cppuhelper/implbase.hxx>
-#include <com/sun/star/sheet/ConditionOperator2.hpp>
 
 #include "address.hxx"
 #include "conditio.hxx"
@@ -167,7 +166,7 @@ class ScTableValidationObj : public cppu::WeakImplHelper<
 {
 private:
     SfxItemPropertySet  aPropSet;
-    sal_uInt16          nMode;          // enum ScConditionMode
+    ScConditionMode     nMode;
     OUString            aExpr1;
     OUString            aExpr2;
     OUString            maExprNmsp1;
diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx
index f5b7fcd025fe..e82da5206fee 100644
--- a/sc/source/ui/unoobj/fmtuno.cxx
+++ b/sc/source/ui/unoobj/fmtuno.cxx
@@ -20,6 +20,7 @@
 #include <vcl/svapp.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
+#include <com/sun/star/sheet/ConditionOperator2.hpp>
 #include <com/sun/star/sheet/ValidationAlertStyle.hpp>
 #include <com/sun/star/sheet/ValidationType.hpp>
 #include <com/sun/star/sheet/TableValidationVisibility.hpp>
@@ -586,7 +587,7 @@ ScTableValidationObj::ScTableValidationObj(ScDocument* pDoc, sal_uLong nKey,
         const ScValidationData* pData = pDoc->GetValidationEntry( nKey );
         if (pData)
         {
-            nMode = sal::static_int_cast<sal_uInt16>( pData->GetOperation() );
+            nMode = pData->GetOperation();
             aSrcPos = pData->GetValidSrcPos();  // valid pos for expressions
             aExpr1 = pData->GetExpression( aSrcPos, 0, 0, eGrammar );
             aExpr2 = pData->GetExpression( aSrcPos, 1, 0, eGrammar );
@@ -622,7 +623,7 @@ ScValidationData* ScTableValidationObj::CreateValidationData( ScDocument* pDoc,
     FormulaGrammar::Grammar eGrammar2 = lclResolveGrammar( eGrammar, meGrammar2 );
 
     ScValidationData* pRet = new ScValidationData( (ScValidationMode)nValMode,
-                                                   (ScConditionMode)nMode,
+                                                   nMode,
                                                    aExpr1, aExpr2, pDoc, aSrcPos,
                                                    maExprNmsp1, maExprNmsp2,
                                                    eGrammar1, eGrammar2 );
@@ -687,25 +688,25 @@ ScTableValidationObj::~ScTableValidationObj()
 sheet::ConditionOperator SAL_CALL ScTableValidationObj::getOperator()
 {
     SolarMutexGuard aGuard;
-    return lcl_ConditionModeToOperator( (ScConditionMode)nMode );
+    return lcl_ConditionModeToOperator( nMode );
 }
 
 void SAL_CALL ScTableValidationObj::setOperator( sheet::ConditionOperator nOperator )
 {
     SolarMutexGuard aGuard;
-    nMode = sal::static_int_cast<sal_uInt16>( lcl_ConditionOperatorToMode( nOperator ) );
+    nMode = lcl_ConditionOperatorToMode( nOperator );
 }
 
 sal_Int32 SAL_CALL ScTableValidationObj::getConditionOperator()
 {
     SolarMutexGuard aGuard;
-    return lcl_ConditionModeToOperatorNew( (ScConditionMode)nMode );
+    return lcl_ConditionModeToOperatorNew( nMode );
 }
 
 void SAL_CALL ScTableValidationObj::setConditionOperator( sal_Int32 nOperator )
 {
     SolarMutexGuard aGuard;
-    nMode = sal::static_int_cast<sal_uInt16>( ScConditionEntry::GetModeFromApi( nOperator ) );
+    nMode = ScConditionEntry::GetModeFromApi( nOperator );
 }
 
 OUString SAL_CALL ScTableValidationObj::getFormula1()