removing obsolete layout code

3 files changed, 1 insertions, 45 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();