[Libreoffice-commits] .: 2 commits - basic/inc sw/inc

[Michael Stahl]

 basic/inc/basic/sbxvar.hxx |   22 +++-------------------
 sw/inc/calc.hxx            |   10 ++++++----
 2 files changed, 9 insertions(+), 23 deletions(-)

New commits:
commit c3dc9a3ef3cb9bc28051ef11d8b7fa5afaf819ef
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Jul 5 10:48:19 2012 +0200

    clean up include guards in sbxvar.hxx
    
    Change-Id: I802d142ae93b3e9c7d42ab98d5c757df94a82196

diff --git a/basic/inc/basic/sbxvar.hxx b/basic/inc/basic/sbxvar.hxx
index 2416216..366e61a 100644
--- a/basic/inc/basic/sbxvar.hxx
+++ b/basic/inc/basic/sbxvar.hxx
@@ -26,8 +26,8 @@
  *
  ************************************************************************/
 
-#ifndef _SBXVAR_HXX
-#define _SBXVAR_HXX
+#ifndef SBXVAR_HXX
+#define SBXVAR_HXX
 
 #include <rtl/ustring.hxx>
 #include <tools/string.hxx>
@@ -35,8 +35,6 @@
 #include <basic/sbxcore.hxx>
 #include "basicdllapi.h"
 
-#ifndef __SBX_SBXVALUES_HXX
-#define __SBX_SBXVALUES_HXX
 
 class SbxDecimal;
 
@@ -99,13 +97,6 @@ struct SbxValues
 
 };
 
-#endif
-
-#ifndef __SBX_SBXVALUE
-#define __SBX_SBXVALUE
-
-struct SbxValues;
-
 class BASIC_DLLPUBLIC SbxValue : public SbxBase
 {
     // #55226 Transport additional infos
@@ -285,11 +276,6 @@ inline SbxValue& SbxValue::operator|=( const SbxValue& r )
 inline SbxValue& SbxValue::operator^=( const SbxValue& r )
 { Compute( SbxXOR, r ); return *this; }
 
-#endif
-
-#ifndef __SBX_SBXVARIABLE_HXX
-#define __SBX_SBXVARIABLE_HXX
-
 class SbxArray;
 class SbxInfo;
 
@@ -379,8 +365,6 @@ public:
 SV_DECL_REF(SbxVariable)
 #endif
 
-#endif
-
-#endif  // _SBXVAR_HXX
+#endif  // SBXVAR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 12d08ed2880020bb9ec2dec82dd26bccd63605ff
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Jul 5 10:42:47 2012 +0200

    fix Windows build, include vector
    
    Change-Id: Ia07e12c9fa5430d7f8fa02a2a8ab6cde3aafa41a

diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx
index 191480c..fe9512d 100644
--- a/sw/inc/calc.hxx
+++ b/sw/inc/calc.hxx
@@ -25,14 +25,16 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef _CALC_HXX
-#define _CALC_HXX
+
+#ifndef SW_CALC_HXX
+#define SW_CALC_HXX
+
+#include <vector>
 
 #include <unotools/syslocale.hxx>
 
-#ifndef __SBX_SBXVALUE //autogen
 #include <basic/sbxvar.hxx>
-#endif
+
 #include "swdllapi.h"
 
 class CharClass;