[Libreoffice-commits] .: basic/inc
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Sep 11 10:25:29 PDT 2012
basic/inc/basic/sbmeth.hxx | 3 --
basic/inc/basic/sbmod.hxx | 10 -------
basic/inc/basic/sbobjmod.hxx | 5 ---
basic/inc/basic/sbprop.hxx | 6 ----
basic/inc/basic/sbstar.hxx | 5 ---
basic/inc/basic/sbx.hxx | 54 -------------------------------------------
basic/inc/basic/sbxcore.hxx | 3 --
basic/inc/basic/sbxdef.hxx | 20 ---------------
basic/inc/basic/sbxobj.hxx | 6 ----
basic/inc/basic/sbxprop.hxx | 8 ------
basic/inc/basic/sbxvar.hxx | 3 --
11 files changed, 123 deletions(-)
New commits:
commit a8a15bd95c4fda67c6785036bfbf50f94a749496
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Tue Sep 11 02:51:39 2012 +0900
Remove unnecessary #ifndef guards
Change-Id: I0b393c97f8781d99bf5d3be4065864379eab004c
Reviewed-on: https://gerrit.libreoffice.org/594
Reviewed-by: Michael Stahl <mstahl at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
diff --git a/basic/inc/basic/sbmeth.hxx b/basic/inc/basic/sbmeth.hxx
index 84b4e85..3335957 100644
--- a/basic/inc/basic/sbmeth.hxx
+++ b/basic/inc/basic/sbmeth.hxx
@@ -69,10 +69,7 @@ public:
virtual void Broadcast( sal_uIntPtr nHintId );
};
-#ifndef __SB_SBMETHODREF_HXX
-#define __SB_SBMETHODREF_HXX
SV_DECL_IMPL_REF(SbMethod)
-#endif
class BASIC_DLLPUBLIC SbIfaceMapperMethod : public SbMethod
{
diff --git a/basic/inc/basic/sbmod.hxx b/basic/inc/basic/sbmod.hxx
index ea9fff5..edb0f8e 100644
--- a/basic/inc/basic/sbmod.hxx
+++ b/basic/inc/basic/sbmod.hxx
@@ -141,13 +141,8 @@ public:
bool createCOMWrapperForIface( ::com::sun::star::uno::Any& o_rRetAny, SbClassModuleObject* pProxyClassModuleObject );
};
-#ifndef __SB_SBMODULEREF_HXX
-#define __SB_SBMODULEREF_HXX
-
SV_DECL_IMPL_REF(SbModule)
-#endif
-
// Object class for instances of class modules
class BASIC_DLLPUBLIC SbClassModuleObject : public SbModule
{
@@ -171,13 +166,8 @@ public:
void triggerTerminateEvent( void );
};
-#ifndef __SB_SBCLASSMODULEREF_HXX
-#define __SB_SBCLASSMODULEREF_HXX
-
SV_DECL_IMPL_REF(SbClassModuleObject);
#endif
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/inc/basic/sbobjmod.hxx b/basic/inc/basic/sbobjmod.hxx
index d1f1c0f..10c8714 100644
--- a/basic/inc/basic/sbobjmod.hxx
+++ b/basic/inc/basic/sbobjmod.hxx
@@ -101,13 +101,8 @@ public:
virtual SbxVariable* Find( const rtl::OUString& rName, SbxClassType t );
};
-
-#ifndef __SB_SBOBJMODULEREF_HXX
-#define __SB_SBOBJMODULEREF_HXX
-
SV_DECL_IMPL_REF(SbObjModule);
#endif
-#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/inc/basic/sbprop.hxx b/basic/inc/basic/sbprop.hxx
index ae840f1..beeaf66 100644
--- a/basic/inc/basic/sbprop.hxx
+++ b/basic/inc/basic/sbprop.hxx
@@ -41,10 +41,7 @@ public:
SbModule* GetModule() { return pMod; }
};
-#ifndef __SB_SBPROPERTYREF_HXX
-#define __SB_SBPROPERTYREF_HXX
SV_DECL_IMPL_REF(SbProperty)
-#endif
class BASIC_DLLPUBLIC SbProcedureProperty : public SbxProperty
{
@@ -65,10 +62,7 @@ public:
{ mbSet = bSet; }
};
-#ifndef __SB_SBPROCEDUREPROPERTYREF_HXX
-#define __SB_SBPROCEDUREPROPERTYREF_HXX
SV_DECL_IMPL_REF(SbProcedureProperty)
-#endif
#endif
diff --git a/basic/inc/basic/sbstar.hxx b/basic/inc/basic/sbstar.hxx
index 451e611..689ee56 100644
--- a/basic/inc/basic/sbstar.hxx
+++ b/basic/inc/basic/sbstar.hxx
@@ -181,13 +181,8 @@ public:
GetModelFromBasic( SbxObject* pBasic );
};
-#ifndef __SB_SBSTARBASICREF_HXX
-#define __SB_SBSTARBASICREF_HXX
-
SV_DECL_IMPL_REF(StarBASIC)
#endif
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/inc/basic/sbx.hxx b/basic/inc/basic/sbx.hxx
index 7544f33..a1eeada 100644
--- a/basic/inc/basic/sbx.hxx
+++ b/basic/inc/basic/sbx.hxx
@@ -46,9 +46,6 @@ class SbxFactory;
class SfxBroadcaster;
-#ifndef __SBX_SBXPARAMINFO
-#define __SBX_SBXPARAMINFO
-
// Parameter information
struct SbxParamInfo
{
@@ -64,11 +61,6 @@ struct SbxParamInfo
typedef boost::ptr_vector<SbxParamInfo> SbxParams;
-#endif
-
-#ifndef __SBX_SBXINFO
-#define __SBX_SBXINFO
-
class BASIC_DLLPUBLIC SbxInfo : public SvRefBase
{
friend class SbxVariable;
@@ -98,11 +90,6 @@ public:
void SetHelpId( sal_uInt32 nId ) { nHelpId = nId; }
};
-#endif
-
-#ifndef __SBX_SBXHINT_HXX
-#define __SBX_SBXHINT_HXX
-
class BASIC_DLLPUBLIC SbxHint : public SfxSimpleHint
{
SbxVariable* pVar;
@@ -112,11 +99,6 @@ public:
SbxVariable* GetVar() const { return pVar; }
};
-#endif
-
-#ifndef __SBX_SBXALIAS_HXX
-#define __SBX_SBXALIAS_HXX
-
// SbxAlias is an alias for a var or object
class BASIC_DLLPUBLIC SbxAlias : public SbxVariable, public SfxListener
{
@@ -130,11 +112,6 @@ public:
SbxAlias& operator=( const SbxAlias& );
};
-#endif
-
-#ifndef __SBX_SBXARRAY
-#define __SBX_SBXARRAY
-
// SbxArray is an unidimensional, dynamic Array
// The variables convert from SbxVariablen. Put()/Insert() into the
// declared datatype, if they are not SbxVARIANT.
@@ -192,11 +169,6 @@ public:
void Remove32( sal_uInt32 );
};
-#endif
-
-#ifndef __SBX_SBXDIMARRAY_HXX
-#define __SBX_SBXDIMARRAY_HXX
-
// SbxDimArray is an array that can dimensioned using BASIC conventions.
struct SbxDim;
@@ -244,11 +216,6 @@ public:
void setHasFixedSize( bool bHasFixedSize ) {mbHasFixedSize = bHasFixedSize; };
};
-#endif
-
-#ifndef __SBX_SBXCOLLECTION_HXX
-#define __SBX_SBXCOLLECTION_HXX
-
class BASIC_DLLPUBLIC SbxCollection : public SbxObject
{
BASIC_DLLPRIVATE void Initialize();
@@ -273,11 +240,6 @@ public:
virtual void Clear();
};
-#endif
-
-#ifndef __SBX_SBXSTDCOLLECTION_HXX
-#define __SBX_SBXSTDCOLLECTION_HXX
-
class BASIC_DLLPUBLIC SbxStdCollection : public SbxCollection
{
protected:
@@ -299,11 +261,6 @@ public:
const String& GetElementClass() const { return aElemClass; }
};
-#endif
-
-#ifndef __SBX_SBXREFS_HXX
-#define __SBX_SBXREFS_HXX
-
SV_IMPL_REF(SbxBase)
SV_IMPL_REF(SbxVariable)
@@ -312,28 +269,17 @@ SV_IMPL_REF(SbxVariable)
#define SBX_ARRAY_DECL_DEFINED
SV_DECL_REF(SbxArray)
#endif
-#ifndef SBX_ARRAY_IMPL_DEFINED
-#define SBX_ARRAY_IMPL_DEFINED
SV_IMPL_REF(SbxArray)
-#endif
#ifndef SBX_INFO_DECL_DEFINED
#define SBX_INFO_DECL_DEFINED
SV_DECL_REF(SbxInfo)
#endif
-#ifndef SBX_INFO_IMPL_DEFINED
-#define SBX_INFO_IMPL_DEFINED
SV_IMPL_REF(SbxInfo)
-#endif
-#ifndef SBX_DIMARRAY_DECL_DEFINED
-#define SBX_DIMARRAY_DECL_DEFINED
SV_DECL_REF(SbxDimArray)
-#endif
SV_IMPL_REF(SbxDimArray)
#endif
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/inc/basic/sbxcore.hxx b/basic/inc/basic/sbxcore.hxx
index 50995d5..e1ff9be 100644
--- a/basic/inc/basic/sbxcore.hxx
+++ b/basic/inc/basic/sbxcore.hxx
@@ -108,10 +108,7 @@ public:
static SbxObject* CreateObject( const rtl::OUString& );
};
-#ifndef SBX_BASE_DECL_DEFINED
-#define SBX_BASE_DECL_DEFINED
SV_DECL_REF(SbxBase)
-#endif
inline void SbxBase::SetFlags( sal_uInt16 n )
{ //DBG_CHKTHIS( SbxBase, 0 );
diff --git a/basic/inc/basic/sbxdef.hxx b/basic/inc/basic/sbxdef.hxx
index 7a36ce1..781a71b 100644
--- a/basic/inc/basic/sbxdef.hxx
+++ b/basic/inc/basic/sbxdef.hxx
@@ -26,9 +26,6 @@
#include <tools/solar.h>
#include "tools/errcode.hxx"
-#ifndef _SBX_CLASS_TYPE
-#define _SBX_CLASS_TYPE
-
enum SbxClassType { // SBX-class-IDs (order is important!)
SbxCLASS_DONTCARE = 1, // don't care (search, not 0 due to StarBASIC)
SbxCLASS_ARRAY, // Array of SbxVariables
@@ -39,11 +36,6 @@ enum SbxClassType { // SBX-class-IDs (order is important!)
SbxCLASS_OBJECT // Object
};
-#endif
-
-#ifndef _SBX_DATA_TYPE
-#define _SBX_DATA_TYPE
-
enum SbxDataType {
SbxEMPTY = 0, // * Uninitialized
SbxNULL = 1, // * Contains no valid data
@@ -107,11 +99,6 @@ const sal_uInt32 SBX_TYPE_DIM_AS_NEW_FLAG = 0x20000;
const sal_uInt32 SBX_FIXED_LEN_STRING_FLAG = 0x10000; // same value as above as no conflict possible
const sal_uInt32 SBX_TYPE_VAR_TO_DIM_FLAG = 0x40000;
-#endif
-
-#ifndef _SBX_OPERATOR
-#define _SBX_OPERATOR
-
enum SbxOperator {
// Arithmetical:
SbxEXP, // this ^ var
@@ -143,11 +130,6 @@ enum SbxOperator {
SbxGE // this >= var
};
-#endif
-
-#ifndef _SBX_NAME_TYPE
-#define _SBX_NAME_TYPE
-
enum SbxNameType { // Type of the questioned name of a variable
SbxNAME_NONE, // plain name
SbxNAME_SHORT, // Name(A,B)
@@ -155,8 +137,6 @@ enum SbxNameType { // Type of the questioned name of a variable
SbxNAME_LONG_TYPES // Name(A As Integer, B As String) As Integer
};
-#endif
-
// from 1996/3/20: New error messages
typedef sal_uIntPtr SbxError; // Preserve old type
diff --git a/basic/inc/basic/sbxobj.hxx b/basic/inc/basic/sbxobj.hxx
index e65f71b..6851cb4 100644
--- a/basic/inc/basic/sbxobj.hxx
+++ b/basic/inc/basic/sbxobj.hxx
@@ -92,15 +92,9 @@ public:
void Dump( SvStream&, sal_Bool bDumpAll=sal_False );
};
-#ifndef __SBX_SBXOBJECTREF_HXX
-
-#ifndef SBX_OBJECT_DECL_DEFINED
-#define SBX_OBJECT_DECL_DEFINED
SV_DECL_REF(SbxObject)
-#endif
SV_IMPL_REF(SbxObject)
-#endif /* __SBX_SBXOBJECTREF_HXX */
#endif /* _SBX_SBXOBJECT_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/inc/basic/sbxprop.hxx b/basic/inc/basic/sbxprop.hxx
index 161821f..8b3bdb9 100644
--- a/basic/inc/basic/sbxprop.hxx
+++ b/basic/inc/basic/sbxprop.hxx
@@ -36,17 +36,9 @@ public:
virtual SbxClassType GetClass() const;
};
-#ifndef __SBX_SBXPROPERTYREF_HXX
-#define __SBX_SBXPROPERTYREF_HXX
-
-#ifndef SBX_PROPERTY_DECL_DEFINED
-#define SBX_PROPERTY_DECL_DEFINED
SV_DECL_REF(SbxProperty)
-#endif
SV_IMPL_REF(SbxProperty)
#endif
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/inc/basic/sbxvar.hxx b/basic/inc/basic/sbxvar.hxx
index d3c47f1..8bbd87b 100644
--- a/basic/inc/basic/sbxvar.hxx
+++ b/basic/inc/basic/sbxvar.hxx
@@ -351,10 +351,7 @@ public:
static sal_uInt16 MakeHashCode( const String& rName );
};
-#ifndef SBX_VARIABLE_DECL_DEFINED
-#define SBX_VARIABLE_DECL_DEFINED
SV_DECL_REF(SbxVariable)
-#endif
#endif // SBXVAR_HXX
More information about the Libreoffice-commits
mailing list