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

Caolán McNamara caolanm at redhat.com
Tue Jun 14 09:38:37 UTC 2016


 include/basic/sbx.hxx    |    8 --------
 include/basic/sbxvar.hxx |    6 ------
 2 files changed, 14 deletions(-)

New commits:
commit e8a9eba781368101faa37b3803ee4ffb4c050112
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jun 14 10:32:06 2016 +0100

    drop these typedef header guard
    
    Change-Id: If52f2bba475e7a8a5b7c63d5114f2725c9ce8617

diff --git a/include/basic/sbx.hxx b/include/basic/sbx.hxx
index 91351ac..a75a8d4 100644
--- a/include/basic/sbx.hxx
+++ b/include/basic/sbx.hxx
@@ -252,16 +252,8 @@ public:
     virtual void Insert( SbxVariable* ) override;
 };
 
-#ifndef SBX_ARRAY_DECL_DEFINED
-#define SBX_ARRAY_DECL_DEFINED
 typedef tools::SvRef<SbxArray> SbxArrayRef;
-#endif
-
-#ifndef SBX_INFO_DECL_DEFINED
-#define SBX_INFO_DECL_DEFINED
 typedef tools::SvRef<SbxInfo> SbxInfoRef;
-#endif
-
 typedef tools::SvRef<SbxDimArray> SbxDimArrayRef;
 
 #endif
diff --git a/include/basic/sbxvar.hxx b/include/basic/sbxvar.hxx
index 0f66fcf..3ee3768 100644
--- a/include/basic/sbxvar.hxx
+++ b/include/basic/sbxvar.hxx
@@ -209,15 +209,9 @@ inline SbxValue& SbxValue::operator-=( const SbxValue& r )
 class SbxArray;
 class SbxInfo;
 
-#ifndef SBX_ARRAY_DECL_DEFINED
-#define SBX_ARRAY_DECL_DEFINED
 typedef tools::SvRef<SbxArray> SbxArrayRef;
-#endif
 
-#ifndef SBX_INFO_DECL_DEFINED
-#define SBX_INFO_DECL_DEFINED
 typedef tools::SvRef<SbxInfo> SbxInfoRef;
-#endif
 
 class SfxBroadcaster;
 


More information about the Libreoffice-commits mailing list