removing obsolete layout code

15 files changed, 0 insertions, 201 deletions

diff --git a/sc/source/ui/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg.cxx
index 122c8a57cfe4..7c907179bc6c 100644
--- a/sc/source/ui/attrdlg/attrdlg.cxx
+++ b/sc/source/ui/attrdlg/attrdlg.cxx
@@ -49,10 +49,6 @@
 #include <editeng/flstitem.hxx>
 #include <sfx2/app.hxx>
 
-#if !LAYOUT_SFX_TABDIALOG_BROKEN
-#include <layout/layout-pre.hxx>
-#endif
-
 //==================================================================
 
 ScAttrDlg::ScAttrDlg( SfxViewFrame*     pFrameP,
@@ -69,12 +65,7 @@ ScAttrDlg::ScAttrDlg( SfxViewFrame*     pFrameP,
     OSL_ENSURE(pFact, "Dialogdiet fail!");
 
     OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT ), "GetTabPageCreatorFunc fail!");
-#if LAYOUT_SFX_TABDIALOG_BROKEN
     AddTabPage( TP_NUMBER, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT ), 0 );
-#else
-    String number(RTL_CONSTASCII_USTRINGPARAM("Numbers"));
-    AddTabPage( TP_NUMBER, number, pFact->GetTabPageCreatorFunc (RID_SVXPAGE_NUMBERFORMAT), 0, false, TAB_APPEND);
-#endif
     OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), "GetTabPageCreatorFunc fail!");
     AddTabPage( TP_FONT, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), 0 );
     OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), "GetTabPageCreatorFunc fail!");
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index ee09f61897f8..08760da7e291 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -29,10 +29,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sc.hxx"
 
-#if ! ENABLE_LAYOUT_EXPERIMENTAL
-#undef ENABLE_LAYOUT
-#endif
-
 #undef SC_DLLIMPLEMENTATION
 
 #include "scdlgfact.hxx"
@@ -155,44 +151,6 @@ String AbstractTabDialog_Impl::GetText() const
     return pDlg->GetText();
 }
 
-#if ENABLE_LAYOUT
-namespace layout
-{
-IMPL_ABSTDLG_BASE(AbstractTabDialog_Impl);
-
-// AbstractTabDialog_Impl begin
-void AbstractTabDialog_Impl::SetCurPageId( sal_uInt16 nId )
-{
-    pDlg->SetCurPageId( nId );
-}
-
-const SfxItemSet* AbstractTabDialog_Impl::GetOutputItemSet() const
-{
-    return pDlg->GetOutputItemSet();
-}
-
-const sal_uInt16* AbstractTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem )
-{
-    return pDlg->GetInputRanges( pItem );
-}
-
-void AbstractTabDialog_Impl::SetInputSet( const SfxItemSet* pInSet )
-{
-     pDlg->SetInputSet( pInSet );
-}
-//From class Window.
-void AbstractTabDialog_Impl::SetText( const XubString& rStr )
-{
-    pDlg->SetText( rStr );
-}
-String AbstractTabDialog_Impl::GetText() const
-{
-    return pDlg->GetText();
-}
-}
-#endif /* ENABLE_LAYOUT */
-
-
 // AbstractScImportAsciiDlg_Impl begin
 void AbstractScImportAsciiDlg_Impl::GetOptions( ScAsciiOptions& rOpt )
 {
@@ -1406,11 +1364,6 @@ AbstractScImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScImportOptions
 }
 
 
-#if ENABLE_LAYOUT && !LAYOUT_SFX_TABDIALOG_BROKEN
-#define SfxTabDialog layout::SfxTabDialog
-#define AbstractTabDialog_Impl layout::AbstractTabDialog_Impl
-#endif /* ENABLE_LAYOUT */
-
 SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScAttrDlg( SfxViewFrame*  pFrame,
                                                                         Window*          pParent,
                                                                         const SfxItemSet* pCellAttrs,
@@ -1563,11 +1516,6 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScValidationDlg( Wind
 }
 
 
-#if ENABLE_LAYOUT && !LAYOUT_SFX_TABDIALOG_BROKEN
-#define SfxTabDialog layout::SfxTabDialog
-#define AbstractTabDialog_Impl layout::AbstractTabDialog_Impl
-#endif /* ENABLE_LAYOUT */
-
 SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScSortDlg( Window*            pParent,
                                                     const SfxItemSet* pArgSet,int nId )
 {
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index e55a523f1588..62884ec77d1e 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -381,23 +381,6 @@ class AbstractTabDialog_Impl : public SfxAbstractTabDialog
     virtual void        SetText( const XubString& rStr );
     virtual String      GetText() const;
 };
-#if ENABLE_LAYOUT
-namespace layout
-{
-//add for ScAttrDlg , ScHFEditDlg, ScStyleDlg, ScSubTotalDlg, ScCharDlg, ScParagraphDlg, ScValidationDlg, ScSortDlg
-class AbstractTabDialog_Impl : public SfxAbstractTabDialog
-{
-    DECL_ABSTDLG_BASE( AbstractTabDialog_Impl,SfxTabDialog )
-    virtual void                SetCurPageId( sal_uInt16 nId );
-    virtual const SfxItemSet*   GetOutputItemSet() const;
-    virtual const sal_uInt16*       GetInputRanges( const SfxItemPool& pItem );
-    virtual void                SetInputSet( const SfxItemSet* pInSet );
-        //From class Window.
-    virtual void        SetText( const XubString& rStr );
-    virtual String      GetText() const;
-};
-} // end namespace layout
-#endif /* ENABLE_LAYOUT */
 //------------------------------------------------------------------------
 //AbstractDialogFactory_Impl implementations
 class ScAbstractDialogFactory_Impl : public ScAbstractDialogFactory
diff --git a/sc/source/ui/dbgui/sortdlg.cxx b/sc/source/ui/dbgui/sortdlg.cxx
index 57b75c8e2d7e..24b9e63c86f8 100644
--- a/sc/source/ui/dbgui/sortdlg.cxx
+++ b/sc/source/ui/dbgui/sortdlg.cxx
@@ -38,10 +38,6 @@
 #include "scresid.hxx"
 #include "sortdlg.hrc"
 
-#if !LAYOUT_SFX_TABDIALOG_BROKEN
-#include <layout/layout-pre.hxx>
-#endif
-
 ScSortDlg::ScSortDlg( Window*           pParent,
                       const SfxItemSet* pArgSet ) :
         SfxTabDialog( pParent,
@@ -51,15 +47,8 @@ ScSortDlg::ScSortDlg( Window*           pParent,
         bIsByRows   ( false )
 
 {
-#if LAYOUT_SFX_TABDIALOG_BROKEN
     AddTabPage( TP_FIELDS,  ScTabPageSortFields::Create,  0 );
     AddTabPage( TP_OPTIONS, ScTabPageSortOptions::Create, 0 );
-#else
-    String fields = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("fields"));
-    AddTabPage( TP_FIELDS, fields, ScTabPageSortFields::Create, 0, false, TAB_APPEND);
-    String options = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("options"));
-    AddTabPage( TP_OPTIONS, options, ScTabPageSortOptions::Create, 0, false, TAB_APPEND);
-#endif
     FreeResource();
 }
 
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 12e988551060..e46e4f2cd54a 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -539,18 +539,6 @@ IMPL_LINK( ScTabPageSortFields, SelectHdl, ListBox *, pLb )
 // Sortieroptionen-Tabpage:
 //========================================================================
 
-#if ENABLE_LAYOUT_EXPERIMENTAL
-#include <layout/layout-pre.hxx>
-
-#if ENABLE_LAYOUT
-#undef ScResId
-#define ScResId(x) #x
-#undef SfxTabPage
-#define SfxTabPage( parent, id, args ) SfxTabPage( parent, "sort-options.xml", id, &args )
-#endif /* ENABLE_LAYOUT */
-
-#endif /* ENABLE_LAYOUT_EXPERIMENTAL */
-
 ScTabPageSortOptions::ScTabPageSortOptions( Window*             pParent,
                                             const SfxItemSet&   rArgSet )
 
@@ -575,11 +563,6 @@ ScTabPageSortOptions::ScTabPageSortOptions( Window*             pParent,
         aBtnTopDown     ( this, ScResId( BTN_TOP_DOWN ) ),
         aBtnLeftRight   ( this, ScResId( BTN_LEFT_RIGHT ) ),
         //
-#if ENABLE_LAYOUT_EXPERIMENTAL
-#undef this
-#undef ScResId
-#define ScResId(x) this, #x
-#endif /* ENABLE_LAYOUT_EXPERIMENTAL */
         aStrRowLabel    ( ScResId( STR_ROW_LABEL ) ),
         aStrColLabel    ( ScResId( STR_COL_LABEL ) ),
         aStrUndefined   ( ScResId( SCSTR_UNDEFINED ) ),
@@ -718,9 +701,6 @@ sal_uInt16* ScTabPageSortOptions::GetRanges()
 
 // -----------------------------------------------------------------------
 
-#if ENABLE_LAYOUT_EXPERIMENTAL
-#undef SfxTabPage
-#endif /* ENABLE_LAYOUT_EXPERIMENTAL */
 SfxTabPage* ScTabPageSortOptions::Create(
                                             Window*             pParent,
                                             const SfxItemSet&   rArgSet )
@@ -898,11 +878,9 @@ int ScTabPageSortOptions::DeactivatePage( SfxItemSet* pSetP )
 
         if ( !bPosInputOk )
         {
-#if !ENABLE_LAYOUT_EXPERIMENTAL
             ErrorBox( this, WinBits( WB_OK | WB_DEF_OK ),
                      ScGlobal::GetRscString( STR_INVALID_TABREF )
                     ).Execute();
-#endif /* ENABLE_LAYOUT_EXPERIMENTAL */
             aEdOutPos.GrabFocus();
             aEdOutPos.SetSelection( Selection( 0, SELECTION_MAX ) );
             theOutPos.Set(0,0,0);
diff --git a/sc/source/ui/inc/attrdlg.hxx b/sc/source/ui/inc/attrdlg.hxx
index 8f1bae4260ff..3cd5ad55956c 100644
--- a/sc/source/ui/inc/attrdlg.hxx
+++ b/sc/source/ui/inc/attrdlg.hxx
@@ -35,14 +35,7 @@ class Window;
 class SfxViewFrame;
 class SfxItemSet;
 
-#ifndef LAYOUT_SFX_TABDIALOG_BROKEN
-#define LAYOUT_SFX_TABDIALOG_BROKEN 1
-#endif /* !LAYOUT_SFX_TABDIALOG_BROKEN */
-
-#if !LAYOUT_SFX_TABDIALOG_BROKEN
 #include <sfx2/layout.hxx>
-#include <layout/layout-pre.hxx>
-#endif
 
 //==================================================================
 
@@ -61,10 +54,6 @@ private:
     DECL_LINK( OkHandler, void* ); // fuer DoppelClick-Beenden in TabPages
 };
 
-#if !LAYOUT_SFX_TABDIALOG_BROKEN
-#include <layout/layout-post.hxx>
-#endif
-
 #endif // SC_ATTRDLG_HXX
 
 
diff --git a/sc/source/ui/inc/instbdlg.hxx b/sc/source/ui/inc/instbdlg.hxx
index 718e6d107b9b..cff15f5eb7bf 100644
--- a/sc/source/ui/inc/instbdlg.hxx
+++ b/sc/source/ui/inc/instbdlg.hxx
@@ -43,7 +43,6 @@
 #include "expftext.hxx"
 
 #include <layout/layout.hxx>
-#include <layout/layout-pre.hxx>
 
 class ScViewData;
 class ScDocument;
@@ -119,8 +118,6 @@ private:
 #endif
 };
 
-#include <layout/layout-post.hxx>
-
 #endif // SC_INSTBDLG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/mvtabdlg.hxx b/sc/source/ui/inc/mvtabdlg.hxx
index 50a51ee55e4d..d8047e0e8c20 100644
--- a/sc/source/ui/inc/mvtabdlg.hxx
+++ b/sc/source/ui/inc/mvtabdlg.hxx
@@ -38,7 +38,6 @@
 #include <vcl/edit.hxx>
 
 #include <layout/layout.hxx>
-#include <layout/layout-pre.hxx>
 
 //------------------------------------------------------------------------
 
@@ -101,8 +100,6 @@ private:
     DECL_LINK( CheckNameHdl, Edit * );
 };
 
-#include <layout/layout-post.hxx>
-
 #endif // SC_MVTABDLG_HXX
 
 
diff --git a/sc/source/ui/inc/sortdlg.hxx b/sc/source/ui/inc/sortdlg.hxx
index 1d6e01d02b25..2ae6adb5c2c8 100644
--- a/sc/source/ui/inc/sortdlg.hxx
+++ b/sc/source/ui/inc/sortdlg.hxx
@@ -35,15 +35,6 @@
 #include <vcl/fixed.hxx>
 #include "scui_def.hxx"
 
-#ifndef LAYOUT_SFX_TABDIALOG_BROKEN
-#define LAYOUT_SFX_TABDIALOG_BROKEN 1
-#endif /* !LAYOUT_SFX_TABDIALOG_BROKEN */
-
-#if !LAYOUT_SFX_TABDIALOG_BROKEN
-#include <sfx2/layout.hxx>
-#include <layout/layout-pre.hxx>
-#endif
-
 class ScSortDlg : public SfxTabDialog
 {
 public:
@@ -81,10 +72,6 @@ private:
     CancelButton    aBtnCancel;
 };
 
-#if !LAYOUT_SFX_TABDIALOG_BROKEN
-#include <layout/layout-post.hxx>
-#endif
-
 #endif // SC_SORTDLG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/strindlg.hxx b/sc/source/ui/inc/strindlg.hxx
index 3d8c9744e02d..03b11a470b00 100644
--- a/sc/source/ui/inc/strindlg.hxx
+++ b/sc/source/ui/inc/strindlg.hxx
@@ -36,7 +36,6 @@
 #include <vcl/edit.hxx>
 
 #include <layout/layout.hxx>
-#include <layout/layout-pre.hxx>
 
 //------------------------------------------------------------------------
 
@@ -60,8 +59,6 @@ private:
     HelpButton      aBtnHelp;
 };
 
-#include <layout/layout-post.hxx>
-
 #endif // SC_STRINDLG_HXX
 
 
diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx
index fefd0575f3d2..a94dda50311f 100644
--- a/sc/source/ui/inc/tpsort.hxx
+++ b/sc/source/ui/inc/tpsort.hxx
@@ -130,12 +130,7 @@ class ScRangeData;
 class CollatorRessource;
 class CollatorWrapper;
 
-#if ENABLE_LAYOUT_EXPERIMENTAL
-#include <sfx2/layout.hxx>
-#include <layout/layout-pre.hxx>
-#else /* !ENABLE_LAYOUT_EXPERIMENTAL */
 #define LocalizedString String
-#endif /* !ENABLE_LAYOUT_EXPERIMENTAL */
 
 class ScTabPageSortOptions : public SfxTabPage
 {
@@ -215,10 +210,6 @@ private:
 #endif
 };
 
-#if ENABLE_LAYOUT_EXPERIMENTAL
-#include <layout/layout-post.hxx>
-#endif /* ENABLE_LAYOUT_EXPERIMENTAL */
-
 #endif // SC_TPSORT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx
index 718f02702b1b..06db06f022a1 100644
--- a/sc/source/ui/miscdlgs/instbdlg.cxx
+++ b/sc/source/ui/miscdlgs/instbdlg.cxx
@@ -53,17 +53,6 @@
 #define SC_INSTBDLG_CXX
 #include "instbdlg.hxx"
 
-#include <layout/layout-pre.hxx>
-
-#if ENABLE_LAYOUT
-#undef ScResId
-#define ScResId(x) #x
-#undef ModalDialog
-#define ModalDialog( parent, id ) Dialog( parent, "insert-sheet.xml", id )
-#undef ErrorBox
-#define ErrorBox( this, bits, message ) ErrorBox (LAYOUT_THIS_WINDOW (this), bits, message)
-#endif /* ENABLE_LAYOUT */
-
 //==================================================================
 
 ScInsertTableDlg::ScInsertTableDlg( Window* pParent, ScViewData& rData, SCTAB nTabCount, bool bFromFile )
@@ -95,10 +84,6 @@ ScInsertTableDlg::ScInsertTableDlg( Window* pParent, ScViewData& rData, SCTAB nT
         nSelTabIndex    ( 0 ),
         nTableCount     (nTabCount)
 {
-#if ENABLE_LAYOUT
-    SetHelpId (SID_INSERT_TABLE);
-    aFtPath.SetText (EMPTY_STRING);
-#endif /* ENABLE_LAYOUT */
     Init_Impl( bFromFile );
     FreeResource();
     aLbTables.SetAccessibleName(aBtnFromFile.GetText());
@@ -166,11 +151,6 @@ void ScInsertTableDlg::Init_Impl( bool bFromFile )
 
 //------------------------------------------------------------------------
 
-#if ENABLE_LAYOUT
-#undef ModalDialog
-#define ModalDialog Dialog
-#endif /* ENABLE_LAYOUT */
-
 short ScInsertTableDlg::Execute()
 {
     // set Parent of DocumentInserter and Doc-Manager
diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx
index c29cc630db30..9d448d4c3b55 100644
--- a/sc/source/ui/miscdlgs/mvtabdlg.cxx
+++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx
@@ -45,15 +45,6 @@
 #include "scresid.hxx"
 #include "globstr.hrc"
 
-#include <layout/layout-pre.hxx>
-
-#if ENABLE_LAYOUT
-#undef ScResId
-#define ScResId(x) #x
-#undef ModalDialog
-#define ModalDialog( parent, id ) Dialog( parent, "move-copy-sheet.xml", id )
-#endif /* ENABLE_LAYOUT */
-
 //==================================================================
 
 ScMoveTableDlg::ScMoveTableDlg(Window* pParent, const rtl::OUString& rDefault)
@@ -87,10 +78,6 @@ ScMoveTableDlg::ScMoveTableDlg(Window* pParent, const rtl::OUString& rDefault)
         bRenameTable( false ),
         mbEverEdited( false )
 {
-#if ENABLE_LAYOUT
-#undef ScResId
-    SetHelpId (FID_TAB_MOVE);
-#endif /* ENABLE_LAYOUT */
     Init();
     FreeResource();
 }
diff --git a/sc/source/ui/miscdlgs/strindlg.cxx b/sc/source/ui/miscdlgs/strindlg.cxx
index d511b1a72049..063512c2dac0 100644
--- a/sc/source/ui/miscdlgs/strindlg.cxx
+++ b/sc/source/ui/miscdlgs/strindlg.cxx
@@ -39,15 +39,6 @@
 #include "scresid.hxx"
 #include "miscdlgs.hrc"
 
-#include <layout/layout-pre.hxx>
-
-#if ENABLE_LAYOUT
-#undef ScResId
-#define ScResId(x) #x
-#undef ModalDialog
-#define ModalDialog( parent, id ) Dialog( parent, "string-input.xml", id )
-#endif /* ENABLE_LAYOUT */
-
 //==================================================================
 
 ScStringInputDlg::ScStringInputDlg( Window*         pParent,
diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx
index 7a113612cc3d..d239591ed29c 100644
--- a/sc/source/ui/view/tabvwshf.cxx
+++ b/sc/source/ui/view/tabvwshf.cxx
@@ -618,12 +618,6 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
                 {
                     //  wenn's nicht von Basic kommt, nochmal nachfragen:
 
-#if ENABLE_LAYOUT
-// Using layout::QueryBox without client code modification is
-// deprecated, rather add HIG-complient buttons with verbs.
-#define QueryBox( parent, winbits, question ) layout::QueryBox (parent, question, ScGlobal::GetRscString (STR_UNDO_DELETE_TAB))
-#endif /* ENABLE_LAYOUT */
-
                         bDoIt = ( RET_YES ==
                                   QueryBox( GetDialogParent(),
                                             WinBits( WB_YES_NO | WB_DEF_YES ),