removing obsolete layout code

5 files changed, 0 insertions, 79 deletions

diff --git a/sfx2/inc/sfx2/layout-post.hxx b/sfx2/inc/sfx2/layout-post.hxx
index e7eddef08f39..b216e6b464ac 100644
--- a/sfx2/inc/sfx2/layout-post.hxx
+++ b/sfx2/inc/sfx2/layout-post.hxx
@@ -29,14 +29,6 @@
 #ifndef _SFX2_LAYOUT_POST_HXX
 #define _SFX2_LAYOUT_POST_HXX
 
-#include <layout/layout-post.hxx>
-
-#if ENABLE_LAYOUT
-
-/* Allow re-inclusion for cxx file. */
-#undef _SFX2_LAYOUT_PRE_HXX
-
-#endif /* ENABLE_LAYOUT */
 
 #endif /* _SFX2_LAYOUT_POST_HXX */
 
diff --git a/sfx2/inc/sfx2/layout-pre.hxx b/sfx2/inc/sfx2/layout-pre.hxx
index db467fd06da7..d3bb7d431ce5 100644
--- a/sfx2/inc/sfx2/layout-pre.hxx
+++ b/sfx2/inc/sfx2/layout-pre.hxx
@@ -29,23 +29,6 @@
 #ifndef _SFX2_LAYOUT_PRE_HXX
 #define _SFX2_LAYOUT_PRE_HXX
 
-#include <layout/layout-pre.hxx>
-
-#if ENABLE_LAYOUT
-
-///* Allow re-inclusion for next hxx file. */
-#undef _SFX2_LAYOUT_POST_HXX
-
-#undef SfxDialog
-#undef SfxModalDialog
-#undef SfxModelessDialog
-
-#define SfxDialog layout::SfxDialog
-
-#define SfxModalDialog SfxDialog
-#define SfxModelessDialog SfxDialog
-
-#endif /* ENABLE_LAYOUT */
 
 #endif /* _SFX2_LAYOUT_PRE_HXX */
 
diff --git a/sfx2/inc/sfx2/layout-tabdlg.hxx b/sfx2/inc/sfx2/layout-tabdlg.hxx
index 2629b2c7c106..d41731ce5e5b 100644
--- a/sfx2/inc/sfx2/layout-tabdlg.hxx
+++ b/sfx2/inc/sfx2/layout-tabdlg.hxx
@@ -28,18 +28,6 @@
 #ifndef _LAYOUT_SFX_TABDLG_HXX
 #define _LAYOUT_SFX_TABDLG_HXX
 
-#undef ENABLE_LAYOUT_SFX_TABDIALOG
-#define ENABLE_LAYOUT_SFX_TABDIALOG 1
-
-#undef NAMESPACE_LAYOUT_SFX_TABDIALOG
-#define NAMESPACE_LAYOUT_SFX_TABDIALOG namespace layout {
-
-#undef END_NAMESPACE_LAYOUT_SFX_TABDIALOG
-#define END_NAMESPACE_LAYOUT_SFX_TABDIALOG } //end namespace layout
-
-#undef LAYOUT_NS_SFX_TABDIALOG
-#define LAYOUT_NS_SFX_TABDIALOG layout::
-
 #undef _SFXTABDLG_HXX
 #include <sfx2/tabdlg.hxx>
 
diff --git a/sfx2/inc/sfx2/layout.hxx b/sfx2/inc/sfx2/layout.hxx
index 95bd42d39c88..a8540ecbd430 100644
--- a/sfx2/inc/sfx2/layout.hxx
+++ b/sfx2/inc/sfx2/layout.hxx
@@ -31,11 +31,6 @@
 
 #include <layout/layout.hxx>
 #include <sfx2/tabdlg.hxx>
-#if ENABLE_LAYOUT
-#undef ENABLE_LAYOUT_SFX_TABDIALOG
-#define ENABLE_LAYOUT_SFX_TABDIALOG 1
-#include <sfx2/layout-tabdlg.hxx>
-#endif
 
 class SfxChildWindow;
 class SfxBindings;
diff --git a/sfx2/inc/sfx2/tabdlg.hxx b/sfx2/inc/sfx2/tabdlg.hxx
index ce1f84aa0040..8df8018da514 100644
--- a/sfx2/inc/sfx2/tabdlg.hxx
+++ b/sfx2/inc/sfx2/tabdlg.hxx
@@ -39,37 +39,17 @@
 #include <svl/itemset.hxx>
 #include <com/sun/star/frame/XFrame.hpp>
 
-#if ENABLE_LAYOUT
-#include <layout/layout.hxx>
-namespace layout { class SfxTabDialog; class SfxTabDialogController; }
-#endif /* ENABLE_LAYOUT */
-
 class SfxPoolItem;
 class SfxTabDialog;
 class SfxViewFrame;
 class SfxTabPage;
 class SfxBindings;
 
-#ifndef ENABLE_LAYOUT_SFX_TABDIALOG
-#define ENABLE_LAYOUT_SFX_TABDIALOG 0
-#define NAMESPACE_LAYOUT_SFX_TABDIALOG
-#define END_NAMESPACE_LAYOUT_SFX_TABDIALOG
-#define LAYOUT_NS_SFX_TABDIALOG
-#endif /* !ENABLE_LAYOUT_SFX_TABDIALOG*/
-
 typedef SfxTabPage* (*CreateTabPage)(Window *pParent, const SfxItemSet &rAttrSet);
 typedef sal_uInt16*     (*GetTabPageRanges)(); // provides international Which-value
 struct TabPageImpl;
 class SfxUs_Impl;
 
-#if ENABLE_LAYOUT_SFX_TABDIALOG
-#include <layout/layout-pre.hxx>
-#undef SfxTabDialog
-#undef SfxTabPage
-#endif /* ENABLE_LAYOUT_SFX_TABDIALOG */
-
-NAMESPACE_LAYOUT_SFX_TABDIALOG
-
 struct TabDlg_Impl;
 
 #define ID_TABCONTROL   1
@@ -205,11 +185,7 @@ public:
     void                StartExecuteModal( const Link& rEndDialogHdl );
     void                Start( sal_Bool bShow = sal_True );
 
-#if !ENABLE_LAYOUT_SFX_TABDIALOG
     const SfxItemSet*   GetExampleSet() const { return pExampleSet; }
-#else /* ENABLE_LAYOUT_SFX_TABDIALOG */
-    SfxItemSet* GetExampleSet() const { return 0; }
-#endif /* ENABLE_LAYOUT_SFX_TABDIALOG */
     SfxViewFrame*       GetViewFrame() const { return pFrame; }
 
     void                EnableApplyButton(sal_Bool bEnable = sal_True);
@@ -221,22 +197,11 @@ public:
     SAL_DLLPRIVATE sal_Bool OK_Impl() { return PrepareLeaveCurrentPage(); }
 };
 
-END_NAMESPACE_LAYOUT_SFX_TABDIALOG
-
-#if ENABLE_LAYOUT_SFX_TABDIALOG
-#include <layout/layout-post.hxx>
-#endif /* ENABLE_LAYOUT_SFX_TABDIALOG */
-
-#if !ENABLE_LAYOUT_SFX_TABDIALOG
-
 namespace sfx { class ItemConnectionBase; }
 
 class SFX2_DLLPUBLIC SfxTabPage: public TabPage
 {
 friend class SfxTabDialog;
-    #if ENABLE_LAYOUT
-     friend class layout::SfxTabDialog;
-    #endif
 
 private:
     const SfxItemSet*   pSet;
@@ -299,8 +264,6 @@ public:
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > GetFrame();
 };
 
-#endif /* !ENABLE_LAYOUT_SFX_TABDIALOG */
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */