summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-06-11 22:48:32 +0300
committerTor Lillqvist <tml@collabora.com>2014-06-12 00:01:53 +0300
commitb7732167de2486b2c39a78fd7065aea3e0c32222 (patch)
tree23d66e2e2c1745b19f6b3d38257167275e44394d /include
parenta26b74cc498bf95a5ae4076daafed9e88b9898d2 (diff)
Bin crack, _SFX_HXX is not defined anywhere anyway
Change-Id: Ib751fe39cca72fe1cfc9789e63f28a00abb9113a
Diffstat (limited to 'include')
-rw-r--r--include/sfx2/dispatch.hxx4
-rw-r--r--include/sfx2/viewfrm.hxx4
2 files changed, 1 insertions, 7 deletions
diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx
index ca6996b1cc1d..2319e8c99e02 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 af555152bf98..16088cd67e3d 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();