[Libreoffice-commits] core.git: include/basic include/formula

Alexandre Vicenzi vicenzi.alexandre at gmail.com
Thu Jan 30 03:31:32 PST 2014


 include/basic/sbxdef.hxx       |    1 -
 include/formula/errorcodes.hxx |    2 --
 include/formula/tokenarray.hxx |    8 ++------
 3 files changed, 2 insertions(+), 9 deletions(-)

New commits:
commit 53ba2eefb0d3d6e6c155302479eace25bcf8b657
Author: Alexandre Vicenzi <vicenzi.alexandre at gmail.com>
Date:   Wed Jan 29 21:57:20 2014 -0200

    fdo#63154 Removed unused solar.h ref. in basic and formula
    
    Change-Id: Ibf30f29653568929e65ebd897cef474a6838d5cc
    Reviewed-on: https://gerrit.libreoffice.org/7735
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/basic/sbxdef.hxx b/include/basic/sbxdef.hxx
index 333d7f2..35ea07f 100644
--- a/include/basic/sbxdef.hxx
+++ b/include/basic/sbxdef.hxx
@@ -23,7 +23,6 @@
 
 
 #ifndef __RSC
-#include <tools/solar.h>
 #include <tools/errcode.hxx>
 
 enum SbxClassType {         // SBX-class-IDs (order is important!)
diff --git a/include/formula/errorcodes.hxx b/include/formula/errorcodes.hxx
index d178aec..cea5787 100644
--- a/include/formula/errorcodes.hxx
+++ b/include/formula/errorcodes.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_FORMULA_ERRORCODES_HXX
 
 #include <rtl/math.hxx>
-#include <tools/solar.h>
 
 namespace ScErrorCodes
 {
@@ -94,7 +93,6 @@ inline double CreateDoubleError( sal_uInt16 nErr )
     return fVal;
 }
 
-
 /** Recreate the error code of a coded double error, if any. */
 inline sal_uInt16 GetDoubleErrorValue( double fVal )
 {
diff --git a/include/formula/tokenarray.hxx b/include/formula/tokenarray.hxx
index 9f8fed0..2dde86d 100644
--- a/include/formula/tokenarray.hxx
+++ b/include/formula/tokenarray.hxx
@@ -20,11 +20,10 @@
 #ifndef INCLUDED_FORMULA_TOKENARRAY_HXX
 #define INCLUDED_FORMULA_TOKENARRAY_HXX
 
-#include <limits.h>
+#include <com/sun/star/sheet/FormulaToken.hpp>
 #include <formula/token.hxx>
 #include <formula/ExternalReferenceHelper.hxx>
-#include <tools/solar.h>
-#include <com/sun/star/sheet/FormulaToken.hpp>
+#include <limits.h>
 
 namespace formula
 {
@@ -279,10 +278,7 @@ public:
 private:
     const FormulaToken* GetNonEndOfPathToken( short nIdx ) const;
 };
-// =============================================================================
 } // formula
-// =============================================================================
-
 
 #endif // INCLUDED_FORMULA_TOKENARRAY_HXX
 


More information about the Libreoffice-commits mailing list