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

[Noel Grandin]

 include/sfx2/viewsh.hxx |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit bd43062c98be535b37031b2bdae4af856f392eee
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Fri Nov 24 14:48:28 2017 +0200

    remove bogus ifdef block
    
    since the define in question is defined at the top of the file
    
    Change-Id: Ife67ad02db4a1a3c9ce4569b94ecf681dec5d2bf
    Reviewed-on: https://gerrit.libreoffice.org/45225
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index 7c9929fbbe9e..65975dc8e27d 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -142,11 +142,9 @@ template<class T> bool checkSfxViewShell(const SfxViewShell* pShell)
 
 class SFX2_DLLPUBLIC SfxViewShell: public SfxShell, public SfxListener, public OutlinerViewShell
 {
-#ifdef INCLUDED_SFX2_VIEWSH_HXX
 friend class SfxViewFrame;
 friend class SfxBaseController;
 friend class SfxPrinterController;
-#endif
 
     std::unique_ptr<struct SfxViewShell_Impl>   pImpl;
     SfxViewFrame*               pFrame;