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

[Tor Lillqvist]

 include/sfx2/shell.hxx |    4 ----
 1 file changed, 4 deletions(-)

New commits:
commit 7450f19f62194f79349fa6d3bdb9733d7110a143
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Jul 11 15:59:18 2013 +0300

    Bin pointless #ifndef _SFXSH_HXX
    
    Change-Id: I5c08bf9a9db2d1509407589dfbecdde44577ccba

diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx
index ddeb677..7b8fb55 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
 };
 
 //--------------------------------------------------------------------