[Libreoffice-commits] core.git: 3 commits - include/sfx2 include/svl include/svx

[Tor Lillqvist]

 include/sfx2/dispatch.hxx |    4 +---
 include/sfx2/viewfrm.hxx  |    4 ----
 include/svl/lstner.hxx    |    2 --
 include/svx/e3ditem.hxx   |    6 ------
 4 files changed, 1 insertion(+), 15 deletions(-)

New commits:
commit 3cf9f47c9483601e22fdb24fd4391c4eb09d990a
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Jun 11 22:56:01 2014 +0300

    Bin obsolete pointless preprocessor trickery
    
    Change-Id: Icff9a0f112c80569a4533d5c0c6e789eec3925ee

diff --git a/include/svx/e3ditem.hxx b/include/svx/e3ditem.hxx
index 8340b3d..6b4c8ff 100644
--- a/include/svx/e3ditem.hxx
+++ b/include/svx/e3ditem.hxx
@@ -24,9 +24,6 @@
 #include <basegfx/vector/b3dvector.hxx>
 #include <svx/svxdllapi.h>
 
-#ifndef _SVXVECT3DITEM_HXX
-#define _SVXVECT3DITEM_HXX
-
 class SvStream;
 
 class SVX_DLLPUBLIC SvxB3DVectorItem : public SfxPoolItem
@@ -59,7 +56,4 @@ public:
 
 #endif
 
-#endif
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 7198d97a2de48ce4cb6d788f48a044b69f2115d9
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Jun 11 22:54:13 2014 +0300

    Bin crack, _NOTIFY_HXX is not defined anywhere anyway
    
    Change-Id: I596ec18deca1a7bd85bc49f637fc1765e43d1278

diff --git a/include/svl/lstner.hxx b/include/svl/lstner.hxx
index 8bf93b9..0bdf6e2 100644
--- a/include/svl/lstner.hxx
+++ b/include/svl/lstner.hxx
@@ -59,9 +59,7 @@ public:
 
     virtual void        Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
 
-#ifndef _NOTIFY_HXX
     void RemoveBroadcaster_Impl( SfxBroadcaster& rBC );
-#endif
 };
 
 #endif
commit b7732167de2486b2c39a78fd7065aea3e0c32222
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Jun 11 22:48:32 2014 +0300

    Bin crack, _SFX_HXX is not defined anywhere anyway
    
    Change-Id: Ib751fe39cca72fe1cfc9789e63f28a00abb9113a

diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx
index ca6996b..2319e8c 100644
--- a/include/sfx2/dispatch.hxx
+++ b/include/sfx2/dispatch.hxx
@@ -78,8 +78,6 @@ private:
     // Search for temporary evaluated Todos
     SAL_DLLPRIVATE bool CheckVirtualStack( const SfxShell& rShell, bool bDeep );
 
-#ifndef _SFX_HXX
-
 friend class SfxApplication;
 friend class SfxViewFrame;
 
@@ -104,7 +102,7 @@ friend class SfxHelp;
     void                _Execute( SfxShell &rShell, const SfxSlot &rSlot,
                                   SfxRequest &rReq,
                                   SfxCallMode eCall = SFX_CALLMODE_STANDARD);
-#endif
+
 protected:
     void FlushImpl();
 
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index af55515..16088cd 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -72,16 +72,12 @@ class SFX2_DLLPUBLIC SfxViewFrame: public SfxShell, public SfxListener
     sal_uInt16                      nAdjustPosPixelLock;
 
 private:
-#ifndef _SFX_HXX
     SAL_DLLPRIVATE void Construct_Impl( SfxObjectShell *pObjSh=NULL );
-#endif
 
 protected:
     virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
 
-#ifndef _SFX_HXX
     SAL_DLLPRIVATE void KillDispatcher_Impl();
-#endif
 
     virtual                 ~SfxViewFrame();