removing obsolete layout code

5 files changed, 1 insertions, 58 deletions

diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index 94d8a4a71603..0d4639697d0a 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -49,10 +49,6 @@ $(eval $(call gb_Library_add_api,cui,\
     udkapi \
 ))
 
-# .IF "$(ENABLE_LAYOUT)" == "TRUE"
-# CFLAGS+= -DENABLE_LAYOUT=1 -I../$(PRJ)/layout/inc -I../$(PRJ)/layout/$(INPATH)/inc
-# .ENDIF # ENABLE_LAYOUT == TRUE
-
 $(eval $(call gb_Library_add_linked_libs,cui,\
     avmedia \
     basegfx \
diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx
index 89d0fa9f7483..fbaecd0ec75b 100644
--- a/cui/source/dialogs/zoom.cxx
+++ b/cui/source/dialogs/zoom.cxx
@@ -45,14 +45,6 @@
 #include <dialmgr.hxx>
 #include <svx/zoom_def.hxx>
 #include <svx/dialogs.hrc>  // RID_SVXDLG_ZOOM
-#include <layout/layout-pre.hxx>
-
-#if ENABLE_LAYOUT
-#undef CUI_RES
-#define CUI_RES(x) #x
-#undef SfxModalDialog
-#define SfxModalDialog( parent, id ) Dialog( parent, "zoom.xml", id )
-#endif /* ENABLE_LAYOUT */
 
 // static ----------------------------------------------------------------
 
@@ -178,9 +170,6 @@ SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ) :
     bModified   ( sal_False )
 
 {
-#if ENABLE_LAYOUT
-    SetHelpId (".uno:Zoom");
-#endif /* ENABLE_LAYOUT */
     Link aLink = LINK( this, SvxZoomDialog, UserHdl );
     a100Btn.SetClickHdl( aLink );
     aOptimalBtn.SetClickHdl( aLink );
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index 2e9d51d8d45f..9b5abb4a6709 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -71,7 +71,7 @@ public:
 
 // -----------------------------------------------------------------------
 #include <sfx2/layout.hxx>
-#include <layout/layout-pre.hxx>
+#define LocalizedString String
 
 class SvxNumberFormatTabPage : public SfxTabPage
 {
@@ -80,11 +80,6 @@ class SvxNumberFormatTabPage : public SfxTabPage
 public:
     ~SvxNumberFormatTabPage();
 
-#if ENABLE_LAYOUT
-#  undef SfxTabPage
-#  define SfxTabPage ::SfxTabPage
-#endif
-
     static SfxTabPage*      Create( Window* pParent,
                                     const SfxItemSet& rAttrSet );
     static sal_uInt16*          GetRanges();
@@ -177,8 +172,6 @@ private:
 #endif
 };
 
-#include <layout/layout-post.hxx>
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/zoom.hxx b/cui/source/inc/zoom.hxx
index c25f888f78b1..ee75555859dd 100644
--- a/cui/source/inc/zoom.hxx
+++ b/cui/source/inc/zoom.hxx
@@ -36,8 +36,6 @@
 #include <vcl/field.hxx>
 #include <vcl/fixed.hxx>
 
-#include <layout/layout-pre.hxx>
-
 class SvxZoomDialog : public SfxModalDialog
 {
 private:
@@ -87,8 +85,6 @@ public:
     void                SetLimits( sal_uInt16 nMin, sal_uInt16 nMax );
 };
 
-#include <layout/layout-post.hxx>
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 058aa991c14b..2adfd5c12867 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -215,19 +215,8 @@ void SvxNumberPreviewImpl::DataChanged( const DataChangedEvent& rDCEvt )
 
 #define HDL(hdl) LINK( this, SvxNumberFormatTabPage, hdl )
 
-#include <layout/layout-pre.hxx>
-
-#if ENABLE_LAYOUT
-#undef CUI_RES
-#define CUI_RES(x) #x
-#define CUI_RES_PLAIN(x) ResId (x, CUI_MGR ())
-#define THIS_CUI_RES(x) this, #x
-#undef SfxTabPage
-#define SfxTabPage( parent, id, args ) SfxTabPage( parent, "number-format.xml", id, &args )
-#else /* !ENABLE_LAYOUT */
 #define CUI_RES_PLAIN CUI_RES
 #define THIS_CUI_RES CUI_RES
-#endif /* !ENABLE_LAYOUT */
 
 SvxNumberFormatTabPage::SvxNumberFormatTabPage( Window*             pParent,
                                                 const SfxItemSet&   rCoreAttrs )
@@ -242,11 +231,7 @@ SvxNumberFormatTabPage::SvxNumberFormatTabPage( Window*             pParent,
         aFtLanguage     ( this, CUI_RES( FT_LANGUAGE ) ),
         aLbLanguage     ( this, CUI_RES( LB_LANGUAGE ), sal_False ),
         aCbSourceFormat ( this, CUI_RES( CB_SOURCEFORMAT ) ),
-#if ENABLE_LAYOUT
-        aWndPreview     ( LAYOUT_THIS_WINDOW(this), CUI_RES_PLAIN( WND_NUMBER_PREVIEW ) ),
-#else
         aWndPreview     ( this, CUI_RES_PLAIN( WND_NUMBER_PREVIEW ) ),
-#endif
         aFlOptions      ( this, CUI_RES( FL_OPTIONS ) ),
         aFtDecimals     ( this, CUI_RES( FT_DECIMALS ) ),
         aEdDecimals     ( this, CUI_RES( ED_DECIMALS ) ),
@@ -270,10 +255,6 @@ SvxNumberFormatTabPage::SvxNumberFormatTabPage( Window*             pParent,
         sAutomaticEntry ( THIS_CUI_RES( STR_AUTO_ENTRY)),
         pLastActivWindow( NULL )
 {
-#if ENABLE_LAYOUT
-    aLbFormat.Clear ();
-#endif /* ENABLE_LAYOUT */
-
     Init_Impl();
     SetExchangeSupport(); // diese Page braucht ExchangeSupport
     FreeResource();
@@ -1096,22 +1077,14 @@ void SvxNumberFormatTabPage::UpdateFormatListBox_Impl
             aPos.Y()=nStdFormatY;
             aSize.Height()=nStdFormatHeight;
             aLbFormat.SetPosSizePixel(aPos,aSize);
-#if ENABLE_LAYOUT
-            aLbCurrency.Disable();
-#else /* !ENABLE_LAYOUT */
             aLbCurrency.Hide();
-#endif /* !ENABLE_LAYOUT */
         }
         else
         {
             aPos.Y()=nCurFormatY;
             aSize.Height()=nCurFormatHeight;
             aLbFormat.SetPosSizePixel(aPos,aSize);
-#if ENABLE_LAYOUT
-            aLbCurrency.Enable();
-#else /* !ENABLE_LAYOUT */
             aLbCurrency.Show();
-#endif /* !ENABLE_LAYOUT */
         }
 
         pNumFmtShell->CategoryChanged( nTmpCatPos,nFmtLbSelPos, aEntryList );
@@ -1237,15 +1210,11 @@ IMPL_LINK( SvxNumberFormatTabPage, SelFormatHdl_Impl, void *, pLb )
 
         // Reinit options enable/disable for current selection.
 
-#if ENABLE_LAYOUT
-        if (aLbFormat.GetSelectEntryPos () == LISTBOX_ENTRY_NOTFOUND)
-#else /* !ENABLE_LAYOUT */
         // Current category may be UserDefined with no format entries defined.
         // And yes, aLbFormat is a SvxFontListBox with sal_uLong list positions,
         // implementation returns a LIST_APPEND if empty, comparison with
         // sal_uInt16 LISTBOX_ENTRY_NOTFOUND wouldn't match.
         if ( aLbFormat.GetSelectEntryPos() == LIST_APPEND )
-#endif /* !ENABLE_LAYOUT */
             pLb = &aLbCategory; // continue with the current category selected
         else
             pLb = &aLbFormat;   // continue with the current format selected