removing obsolete layout code

7 files changed, 1 insertions, 165 deletions

diff --git a/svx/inc/svx/fontlb.hxx b/svx/inc/svx/fontlb.hxx
index dd2ca4e867f7..66745fa1cedc 100644
--- a/svx/inc/svx/fontlb.hxx
+++ b/svx/inc/svx/fontlb.hxx
@@ -110,27 +110,6 @@ protected:
                                     SvLBoxButtonKind eButtonKind );
 };
 
-#if ENABLE_LAYOUT
-
-namespace layout
-{
-class SvxFontListBoxImpl;
-class SVX_DLLPUBLIC SvxFontListBox : public ListBox
-{
-    /*DECL_GET_IMPL( SvxFontListBox );
-    DECL_CONSTRUCTORS( SvxFontListBox, ListBox, WB_BORDER );
-    DECL_GET_WINDOW (SvxFontListBox);*/
-
-public:
-    SvxFontListBox( Context*, const char* );
-    ~SvxFontListBox ();
-    sal_uInt16 InsertFontEntry (String const& entry, Font const& font, Color const* color=0);
-};
-};
-
-#endif
-
-
 // ============================================================================
 
 #endif
diff --git a/svx/inc/svx/langbox.hxx b/svx/inc/svx/langbox.hxx
index 3fad0c4f7979..336ce2250634 100644
--- a/svx/inc/svx/langbox.hxx
+++ b/svx/inc/svx/langbox.hxx
@@ -99,27 +99,6 @@ public:
     sal_Bool            IsLanguageSelected( const LanguageType eLangType ) const;
 };
 
-#if ENABLE_LAYOUT
-namespace layout
-{
-class SvxLanguageBoxImpl;
-class SVX_DLLPUBLIC SvxLanguageBox : public ListBox
-{
-public:
-    SvxLanguageBox( Context*, const char*, sal_Bool bCheck = sal_False );
-    ~SvxLanguageBox ();
-    void SetLanguageList (sal_Int16 list, bool hasLangNone, bool langNoneIsLangAll=false, bool checkSpellAvailable=false);
-
-    sal_uInt16 InsertLanguage (LanguageType const type, sal_uInt16 pos=LISTBOX_APPEND);
-    sal_uInt16 InsertLanguage (LanguageType const type, bool checkEntry, sal_uInt16 pos=LISTBOX_APPEND);
-    void RemoveLanguage (LanguageType const type);
-    void SelectLanguage (LanguageType const type, bool select=true);
-    LanguageType GetSelectLanguage () const;
-    bool IsLanguageSelected( LanguageType const type) const;
-};
-};
-#endif
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/srchdlg.hxx b/svx/inc/svx/srchdlg.hxx
index fc42ce81c067..79e848df26c9 100644
--- a/svx/inc/svx/srchdlg.hxx
+++ b/svx/inc/svx/srchdlg.hxx
@@ -101,7 +101,7 @@ public:
 // class SvxSearchDialogWrapper ------------------------------------------
 
 #include <sfx2/layout.hxx>
-#include <sfx2/layout-pre.hxx>
+#define LocalizedString String
 
 class SvxSearchDialog;
 class SVX_DLLPUBLIC SvxSearchDialogWrapper : public SfxChildWindow
@@ -279,8 +279,6 @@ private:
 #endif
 };
 
-#include <sfx2/layout-post.hxx>
-
 inline sal_Bool SvxSearchDialog::HasSearchAttributes() const
 {
     int bLen = aSearchAttrText.GetText().Len();
diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx
index 4b3db2257ae4..a4a5ec174e60 100644
--- a/svx/source/dialog/fontlb.cxx
+++ b/svx/source/dialog/fontlb.cxx
@@ -157,29 +157,6 @@ void SvxFontListBox::InitEntry(
                                   eButtonKind );
 }
 
-#if ENABLE_LAYOUT
-
-namespace layout
-{
-
-SvxFontListBox::~SvxFontListBox ()
-{
-}
-
-sal_uInt16 SvxFontListBox::InsertFontEntry (String const& entry, Font const&, Color const*)
-{
-    return InsertEntry (entry);
-}
-
-SvxFontListBox::SvxFontListBox( Context* pParent, const char* pFile)
-: ListBox( pParent, pFile )
-{
-}
-
-};
-
-#endif
-
 // ============================================================================
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index 418e9b42ca3f..9c7f58f71ca7 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -473,49 +473,4 @@ sal_Bool SvxLanguageBox::IsLanguageSelected( const LanguageType eLangType ) cons
         return sal_False;
 }
 
-#if ENABLE_LAYOUT
-
-namespace layout
-{
-
-SvxLanguageBox::~SvxLanguageBox ()
-{
-}
-
-SvxLanguageBox::SvxLanguageBox( Context* pParent, const char* pFile, sal_Bool bCheck )
-: ListBox ( pParent, pFile, bCheck )
-{
-}
-
-void SvxLanguageBox::SetLanguageList( sal_Int16/*list*/, bool/*hasLangNone*/, bool /*langNoneIsLangAll*/, bool /*checkSpellAvail*/)
-{
-}
-
-sal_uInt16 SvxLanguageBox::InsertLanguage( const LanguageType/*type*/, sal_uInt16/*pos*/)
-{
-    return 0;
-}
-sal_uInt16 SvxLanguageBox::InsertLanguage( const LanguageType/*type*/, bool/*checkEntry*/, sal_uInt16 /*pos*/)
-{
-    return 0;
-}
-void SvxLanguageBox::RemoveLanguage( const LanguageType/*type*/)
-{
-}
-void SvxLanguageBox::SelectLanguage( const LanguageType/*type*/, bool/*select*/)
-{
-}
-LanguageType SvxLanguageBox::GetSelectLanguage() const
-{
-    return 0;
-}
-bool SvxLanguageBox::IsLanguageSelected( const LanguageType/*type*/) const
-{
-    return true;
-}
-
-};
-
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index e8b79497ae70..023da7f60300 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -75,8 +75,6 @@
 #include <tools/resary.hxx>
 #include <svx/svxdlg.hxx>
 
-#include <sfx2/layout-pre.hxx>
-
 using namespace com::sun::star::i18n;
 using namespace com::sun::star;
 using namespace comphelper;
@@ -107,11 +105,6 @@ SV_IMPL_VARARR(SrchAttrItemList, SearchAttrItem);
 #define GetCheckBoxValue( rBox )                                \
     rBox.IsEnabled() ? rBox.IsChecked() : sal_False
 
-#if ENABLE_LAYOUT
-#undef SVX_RES
-#define SVX_RES(x) #x
-#endif /* ENABLE_LAYOUT */
-
 struct SearchDlg_Impl
 {
     FixedText   aSearchFormats;
@@ -129,11 +122,7 @@ struct SearchDlg_Impl
     util::URL   aCommand1URL;
     util::URL   aCommand2URL;
 
-#if ENABLE_LAYOUT
-    SearchDlg_Impl( layout::Context* pParent ) :
-#else /* !ENABLE_LAYOUT */
         SearchDlg_Impl( Window* pParent ) :
-#endif /* !ENABLE_LAYOUT */
         aSearchFormats  ( pParent, SVX_RES( FT_SEARCH_FORMATS ) ),
         aReplaceFormats ( pParent, SVX_RES( FT_REPLACE_FORMATS ) ),
         bMultiLineEdit  ( sal_False ),
@@ -286,15 +275,8 @@ void SearchAttrItemList::Remove( sal_uInt16 nPos, sal_uInt16 nLen )
     SrchAttrItemList::Remove( nPos, nLen );
 }
 
-#if ENABLE_LAYOUT
-#undef SfxModelessDialog
-#define SfxModelessDialog(bindings, child, parent, id) SfxDialog (parent, "find-and-replace.xml", id, bindings, child)
-#define SVX_RES_PLAIN(x) ResId (x, DIALOG_MGR ())
-#define THIS_SVX_RES(x) this, #x
-#else /* !ENABLE_LAYOUT */
 #define SVX_RES_PLAIN SVX_RES
 #define THIS_SVX_RES SVX_RES
-#endif /* !ENABLE_LAYOUT */
 
 #undef INI_LIST
 #define INI_LIST() \
@@ -387,10 +369,6 @@ SvxSearchDialog::SvxSearchDialog( Window* pParent, SfxChildWindow* pChildWin, Sf
 }
 
 #undef INI_LIST
-#if ENABLE_LAYOUT
-#undef SVX_RES
-#define SVX_RES(x) ResId (x, DIALOG_MGR ())
-#endif
 
 // -----------------------------------------------------------------------
 
@@ -413,11 +391,6 @@ SvxSearchDialog::~SvxSearchDialog()
     delete pMoreBtn;
 }
 
-#if ENABLE_LAYOUT
-#undef Window
-#define Window layout::Window
-#endif /* ENABLE_LAYOUT */
-
 void lcl_MoveDown( Window& rWindow, sal_Int32 nOffset )
 {
     Point aPos(rWindow.GetPosPixel());
@@ -427,17 +400,11 @@ void lcl_MoveDown( Window& rWindow, sal_Int32 nOffset )
 
 void SvxSearchDialog::Construct_Impl()
 {
-#if ENABLE_LAYOUT
-    SetHelpId (".uno:SearchDialog");
-#endif /* ENABLE_LAYOUT */
-
     // temporary to avoid incompatibility
     pImpl = new SearchDlg_Impl( this );
-#if !ENABLE_LAYOUT
     pImpl->aSelectionTimer.SetTimeout( 500 );
     pImpl->aSelectionTimer.SetTimeoutHdl(
         LINK( this, SvxSearchDialog, TimeoutHdl_Impl ) );
-#endif /* !ENABLE_LAYOUT */
     EnableControls_Impl( 0 );
 
     // Store old Text from aWordBtn
@@ -927,11 +894,6 @@ void SvxSearchDialog::CalculateDelta_Impl()
     pMoreBtn->Enable();
 }
 
-#if ENABLE_LAYOUT
-#undef Window
-#define Window ::Window
-#endif /* ENABLE_LAYOUT */
-
 // -----------------------------------------------------------------------
 
 namespace {
@@ -2538,10 +2500,6 @@ SvxSearchDialogWrapper::SvxSearchDialogWrapper( Window* _pParent, sal_uInt16 nId
 
 SvxSearchDialogWrapper::~SvxSearchDialogWrapper ()
 {
-#if ENABLE_LAYOUT
-    delete dialog;
-    pWindow = 0;
-#endif /* ENABLE_LAYOUT */
 }
 
 SvxSearchDialog *SvxSearchDialogWrapper::getDialog ()
diff --git a/svx/uiconfig/layout/makefile.mk b/svx/uiconfig/layout/makefile.mk
index e75ae5e8d255..876e465779d1 100755
--- a/svx/uiconfig/layout/makefile.mk
+++ b/svx/uiconfig/layout/makefile.mk
@@ -31,16 +31,6 @@ TARGET=layout
 
 .INCLUDE : settings.mk
 
-.IF "$(ENABLE_LAYOUT)" == "TRUE"
-
-all: ALLTAR
-
-XML_FILES=zoom.xml
-
-.INCLUDE : layout.mk
-
-.ELSE # ENABLE_LAYOUT != TRUE
 all .PHONY:
-.ENDIF # ENABLE_LAYOUT != TRUE
 
 .INCLUDE :  target.mk