summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-07-11 15:59:18 +0300
committerTor Lillqvist <tml@iki.fi>2013-07-11 16:51:08 +0300
commit7450f19f62194f79349fa6d3bdb9733d7110a143 (patch)
tree8cb3f583df2e811a56d1b7fe7a1cdc66f2c75c96
parentbd3aa6983796f9dedf85c446a0ce5e5505583809 (diff)
Bin pointless #ifndef _SFXSH_HXX
Change-Id: I5c08bf9a9db2d1509407589dfbecdde44577ccba
-rw-r--r--include/sfx2/shell.hxx4
1 files changed, 0 insertions, 4 deletions
diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx
index ddeb677e3127..7b8fb55655fc 100644
--- a/include/sfx2/shell.hxx
+++ b/include/sfx2/shell.hxx
@@ -162,12 +162,10 @@ protected:
SfxShell();
SfxShell( SfxViewShell *pViewSh );
-#ifndef _SFXSH_HXX
SAL_DLLPRIVATE void SetViewShell_Impl( SfxViewShell* pView );
SAL_DLLPRIVATE void Invalidate_Impl( SfxBindings& rBindings, sal_uInt16 nId );
SAL_DLLPRIVATE SfxShellObject* GetShellObj_Impl() const;
SAL_DLLPRIVATE void SetShellObj_Impl( SfxShellObject* pObj );
-#endif
public:
TYPEINFO();
@@ -253,11 +251,9 @@ public:
*/
void BroadcastContextForActivation (const bool bIsActivated);
-#ifndef _SFXSH_HXX
SAL_DLLPRIVATE bool CanExecuteSlot_Impl( const SfxSlot &rSlot );
SAL_DLLPRIVATE void DoActivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI);
SAL_DLLPRIVATE void DoDeactivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI);
-#endif
};
//--------------------------------------------------------------------