diff options
| author | Felix Zhang <fezhang@suse.com> | 2011-11-15 10:13:52 +0800 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-11-15 14:39:55 +0100 |
| commit | eacfa0f77c3d161f3e0c207120dcf3c2958acee4 (patch) | |
| tree | 20252ab2bbb91255dc5ad35edc76ec21819111b8 | |
| parent | cfc84011b3fb609ac78f35666d9aecda4ca34678 (diff) | |
removing obsolete layout code
49 files changed, 3 insertions, 837 deletions
diff --git a/configure.in b/configure.in index 6ae1fbb64761..19beb9ae6c8b 100644 --- a/configure.in +++ b/configure.in @@ -9353,16 +9353,6 @@ else fi AC_SUBST(ENABLE_STATIC_GTK) -AC_MSG_CHECKING([whether to use layout dialogs]) -if test -n "$enable_layout" && test "$enable_layout" != "no"; then - ENABLE_LAYOUT="TRUE" - AC_MSG_RESULT([yes]) -else - ENABLE_LAYOUT="FALSE" - AC_MSG_RESULT([no]) -fi -AC_SUBST(ENABLE_LAYOUT) - # =================================================================== # De- or increase default verbosity of build process # =================================================================== 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 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 ), diff --git a/scp2/source/layout/makefile.mk b/scp2/source/layout/makefile.mk index 55fddf86e915..f2e759c35ed1 100644 --- a/scp2/source/layout/makefile.mk +++ b/scp2/source/layout/makefile.mk @@ -41,10 +41,6 @@ SCP_PRODUCT_TYPE=osl PARFILES= -.IF "$(ENABLE_LAYOUT)" == "TRUE" -PARFILES+= layout.par -.ENDIF # ENABLE_LAYOUT == TRUE - # --- File --------------------------------------------------------- .INCLUDE : target.mk diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk index 1d6d69450a41..49134a0a3ff0 100644 --- a/scp2/util/makefile.mk +++ b/scp2/util/makefile.mk @@ -218,10 +218,6 @@ SCP1FILES += cairocanvas.par .ENDIF .ENDIF -.IF "$(ENABLE_LAYOUT)" == "TRUE" -SCP1FILES += layout.par -.ENDIF # ENABLE_LAYOUT == TRUE - .IF "$(ENABLE_ONLINE_UPDATE)"!="" SCP1FILES += \ module_onlineupdate.par \ diff --git a/set_soenv.in b/set_soenv.in index 92e2d359ace0..d210d0212085 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -1809,7 +1809,6 @@ ToFile( "ENABLE_FONTCONFIG", "@ENABLE_FONTCONFIG@", "e" ); ToFile( "FONTCONFIG_LIBS", "@FONTCONFIG_LIBS@", "e"); ToFile( "FONTCONFIG_CFLAGS", "@FONTCONFIG_CFLAGS@", "e"); ToFile( "ENABLE_DIRECTX", "@ENABLE_DIRECTX@", "e" ); -ToFile( "ENABLE_LAYOUT", "@ENABLE_LAYOUT@", "e" ); ToFile( "ENABLE_PCH", "@ENABLE_PCH@", "e" ); ToFile( "ENABLE_GRAPHITE", "@ENABLE_GRAPHITE@", "e"); ToFile( "SYSTEM_GRAPHITE", "@SYSTEM_GRAPHITE@", "e"); diff --git a/sfx2/Module_sfx2.mk b/sfx2/Module_sfx2.mk index 4084d3927ead..7aaf257898fc 100644 --- a/sfx2/Module_sfx2.mk +++ b/sfx2/Module_sfx2.mk @@ -53,7 +53,6 @@ endif endif #todo: source/dialog BUILD_VER_STRING -#todo: ENABLE_LAYOUT #todo: clean up quickstarter stuff in both libraries #todo: move standard pool to svl diff --git a/sfx2/Package_inc.mk b/sfx2/Package_inc.mk index e308d1bde626..1c801ac259b5 100644 --- a/sfx2/Package_inc.mk +++ b/sfx2/Package_inc.mk @@ -75,8 +75,6 @@ $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imgmgr.hxx,sfx2/imgmgr.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/ipclient.hxx,sfx2/ipclient.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/itemconnect.hxx,sfx2/itemconnect.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/itemwrapper.hxx,sfx2/itemwrapper.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-post.hxx,sfx2/layout-post.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-pre.hxx,sfx2/layout-pre.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-tabdlg.hxx,sfx2/layout-tabdlg.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout.hxx,sfx2/layout.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/linkmgr.hxx,sfx2/linkmgr.hxx)) 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: */ diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 2390c005f86d..c2ec5d9d5c5c 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -51,19 +51,12 @@ #include "dialog.hrc" #include "helpid.hrc" -#if ENABLE_LAYOUT_SFX_TABDIALOG -#undef TabPage -#undef SfxTabPage -#define SfxTabPage ::SfxTabPage -#undef SfxTabDialog -#endif /* ENABLE_LAYOUT_SFX_TABDIALOG */ - using namespace ::com::sun::star::uno; using namespace ::rtl; #define USERITEM_NAME OUString(RTL_CONSTASCII_USTRINGPARAM("UserItem")) -TYPEINIT1(LAYOUT_NS_SFX_TABDIALOG SfxTabDialogItem,SfxSetItem); +TYPEINIT1(SfxTabDialogItem,SfxSetItem); struct TabPageImpl { @@ -74,8 +67,6 @@ struct TabPageImpl TabPageImpl() : mbStandard( sal_False ) {} }; -NAMESPACE_LAYOUT_SFX_TABDIALOG - struct Data_Impl { sal_uInt16 nId; // The ID @@ -220,8 +211,6 @@ Data_Impl* Find( SfxTabDlgData_Impl& rArr, sal_uInt16 nId, sal_uInt16* pPos ) return 0; } -#if !ENABLE_LAYOUT_SFX_TABDIALOG - void SfxTabPage::SetFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame) { if (pImpl) @@ -271,9 +260,7 @@ SfxTabPage::~SfxTabPage() */ { -#if !ENABLE_LAYOUT delete pImpl; -#endif /* ENABLE_LAYOUT */ } // ----------------------------------------------------------------------- @@ -407,23 +394,6 @@ void SfxTabPage::AddItemConnection( sfx::ItemConnectionBase* pConnection ) pImpl->maItemConn.AddConnection( pConnection ); } -#endif /* !ENABLE_LAYOUT_SFX_TABDIALOG */ - -#if ENABLE_LAYOUT_SFX_TABDIALOG -#undef ResId -#define ResId(id, foo) #id -#undef TabDialog -#define TabDialog(parent, res_id) Dialog (parent, "tab-dialog.xml", "tab-dialog") - -#define aOKBtn(this) aOKBtn (this, "BTN_OK") -#undef PushButton -#define PushButton(this) layout::PushButton (this, "BTN_USER") -#define aCancelBtn(this) aCancelBtn (this, "BTN_CANCEL") -#define aHelpBtn(this) aHelpBtn (this, "BTN_HELP") -#define aResetBtn(this) aResetBtn (this, "BTN_RESET") -#define aBaseFmtBtn(this) aBaseFmtBtn (this, "BTN_BASEFMT") -#endif /* ENABLE_LAYOUT_SFX_TABDIALOG */ - #define INI_LIST(ItemSetPtr) \ aTabCtrl ( this, ResId(ID_TABCONTROL,*rResId.GetResMgr() ) ),\ aOKBtn ( this ),\ @@ -498,24 +468,11 @@ SfxTabDialog::SfxTabDialog // ----------------------------------------------------------------------- -#if ENABLE_LAYOUT_SFX_TABDIALOG -#undef ResId -#undef TabDialog -#undef aOKBtn -#undef PushButton -#undef aCancelBtn -#undef aHelpBtn -#undef aResetBtn -#undef aBaseFmtBtn -#endif /* ENABLE_LAYOUT_SFX_TABDIALOG */ - SfxTabDialog::~SfxTabDialog() { // save settings (screen position and current page) SvtViewOptions aDlgOpt( E_TABDIALOG, String::CreateFromInt32( nResId ) ); -#if !ENABLE_LAYOUT_SFX_TABDIALOG aDlgOpt.SetWindowState(OStringToOUString(GetWindowState(WINDOWSTATE_MASK_POS),RTL_TEXTENCODING_ASCII_US)); -#endif /* !ENABLE_LAYOUT_SFX_TABDIALOG */ aDlgOpt.SetPageID( aTabCtrl.GetCurPageId() ); const sal_uInt16 nCount = pImpl->pData->Count(); @@ -624,11 +581,6 @@ void SfxTabDialog::RemoveResetButton() // ----------------------------------------------------------------------- -#if ENABLE_LAYOUT_SFX_TABDIALOG -#undef TabDialog -#define TabDialog Dialog -#endif /* ENABLE_LAYOUT_SFX_TABDIALOG */ - short SfxTabDialog::Execute() { if ( !aTabCtrl.GetPageCount() ) @@ -641,14 +593,10 @@ short SfxTabDialog::Execute() void SfxTabDialog::StartExecuteModal( const Link& rEndDialogHdl ) { -#if !ENABLE_LAYOUT_SFX_TABDIALOG if ( !aTabCtrl.GetPageCount() ) return; Start_Impl(); TabDialog::StartExecuteModal( rEndDialogHdl ); -#else - rEndDialogHdl.IsSet(); -#endif /* !ENABLE_LAYOUT_SFX_TABDIALOG */ } // ----------------------------------------------------------------------- @@ -695,10 +643,8 @@ void SfxTabDialog::EnableApplyButton(sal_Bool bEnable) if ( bEnable ) { pImpl->pApplyButton = new PushButton( this ); -#if !ENABLE_LAYOUT_SFX_TABDIALOG // in the z-order, the apply button should be behind the ok button, thus appearing at the right side of it pImpl->pApplyButton->SetZOrder(&aOKBtn, WINDOW_ZORDER_BEHIND); -#endif /* ENABLE_LAYOUT_SFX_TABDIALOG */ pImpl->pApplyButton->SetText( String( SfxResId( STR_APPLY ) ) ); pImpl->pApplyButton->Show(); @@ -710,11 +656,9 @@ void SfxTabDialog::EnableApplyButton(sal_Bool bEnable) pImpl->pApplyButton = NULL; } -#if !ENABLE_LAYOUT_SFX_TABDIALOG // adjust the layout if (IsReallyShown()) AdjustLayout(); -#endif /* !ENABLE_LAYOUT_SFX_TABDIALOG */ } // ----------------------------------------------------------------------- @@ -735,9 +679,7 @@ void SfxTabDialog::Start_Impl() SvtViewOptions aDlgOpt( E_TABDIALOG, String::CreateFromInt32( nResId ) ); if ( aDlgOpt.Exists() ) { -#if !ENABLE_LAYOUT_SFX_TABDIALOG SetWindowState(rtl::OUStringToOString(aDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US)); -#endif /* !ENABLE_LAYOUT_SFX_TABDIALOG */ // initial TabPage from Program/Help/config nActPage = (sal_uInt16)aDlgOpt.GetPageID(); @@ -1250,11 +1192,7 @@ IMPL_LINK( SfxTabDialog, BaseFmtHdl, Button *, EMPTYARG ) // ----------------------------------------------------------------------- -#if ENABLE_LAYOUT_SFX_TABDIALOG -#define tabControlWindow pTabCtrl->GetWindow () -#else /* !ENABLE_LAYOUT_SFX_TABDIALOG */ #define tabControlWindow pTabCtrl -#endif /* !ENABLE_LAYOUT_SFX_TABDIALOG */ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl ) @@ -1281,10 +1219,6 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl ) // Create TabPage if possible: if ( !pTabPage ) { -#if ENABLE_LAYOUT_SFX_TABDIALOG - if (dynamic_cast<layout SfxTabPage*> (pTabPage)) - layout::TabPage::global_parent = pTabCtrl->GetWindow (); -#endif const SfxItemSet* pTmpSet = 0; if ( pSet ) @@ -1303,9 +1237,7 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl ) DBG_ASSERT( NULL == pDataObject->pTabPage, "create TabPage more than once" ); pDataObject->pTabPage = pTabPage; -#if !ENABLE_LAYOUT_SFX_TABDIALOG pDataObject->pTabPage->SetTabDialog( this ); -#endif /* ENABLE_LAYOUT_SFX_TABDIALOG */ SvtViewOptions aPageOpt( E_TABPAGE, String::CreateFromInt32( pDataObject->nId ) ); String sUserData; Any aUserItem = aPageOpt.GetUserItem( USERITEM_NAME ); @@ -1315,22 +1247,6 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl ) pTabPage->SetUserData( sUserData ); Size aSiz = pTabPage->GetSizePixel(); -#if ENABLE_LAYOUT - Size optimalSize = pTabPage->GetOptimalSize (WINDOWSIZE_MINIMUM); -#if ENABLE_LAYOUT_SFX_TABDIALOG - if (dynamic_cast<layout SfxTabPage*> (pTabPage)) - { - if (optimalSize.Height () && optimalSize.Width ()) - { - optimalSize.Width () = optimalSize.Width (); - optimalSize.Height () = optimalSize.Height () + 40; - } - } -#endif /* ENABLE_LAYOUT_SFX_TABDIALOG */ - if (optimalSize.Height () > 0 && optimalSize.Width () > 0 ) - aSiz = optimalSize; -#endif /* ENABLE_LAYOUT */ - Size aCtrlSiz = pTabCtrl->GetTabPageSizePixel(); // Only set Size on TabControl when < as TabPage if ( aCtrlSiz.Width() < aSiz.Width() || @@ -1352,10 +1268,6 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl ) pTabPage->Reset( *pSet ); pDataObject->bRefresh = sal_False; -#if ENABLE_LAYOUT_SFX_TABDIALOG - pTabCtrl->GetPagePos (nId); -#endif /* ENABLE_LAYOUT_SFX_TABDIALOG */ - if ( pExampleSet ) pTabPage->ActivatePage( *pExampleSet ); sal_Bool bReadOnly = pTabPage->IsReadOnly(); @@ -1578,6 +1490,4 @@ long SfxTabDialog::Notify( NotifyEvent& rNEvt ) return TabDialog::Notify( rNEvt ); } -END_NAMESPACE_LAYOUT_SFX_TABDIALOG - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/layout/sfxtabdialog.cxx b/sfx2/source/layout/sfxtabdialog.cxx index da2dc738ae4e..2e7d1aa476f3 100644 --- a/sfx2/source/layout/sfxtabdialog.cxx +++ b/sfx2/source/layout/sfxtabdialog.cxx @@ -62,7 +62,6 @@ using namespace ::com::sun::star; } #include <sfx2/layout.hxx> -#include <layout/layout-pre.hxx> #undef TabPage #undef SfxTabPage diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 81676d0f89a3..9c7d1f757820 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -191,26 +191,6 @@ gb_GLOBALDEFS := \ $(gb_CPUDEFS) \ -ifeq ($(strip $(ENABLE_LAYOUT)),TRUE) -gb_GLOBALDEFS += \ - -DENABLE_LAYOUT=1 \ - -else -gb_GLOBALDEFS += \ - -DENABLE_LAYOUT=0 \ - -endif - -ifeq ($(strip $(ENABLE_LAYOUT_EXPERIMENTAL)),TRUE) -gb_GLOBALDEFS += \ - -DENABLE_LAYOUT_EXPERIMENTAL=1 \ - -else -gb_GLOBALDEFS += \ - -DENABLE_LAYOUT_EXPERIMENTAL=0 \ - -endif - ifeq ($(gb_PRODUCT),$(true)) gb_GLOBALDEFS += \ -DPRODUCT \ diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 2a05d2265868..5c6f6cc488aa 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -1160,18 +1160,6 @@ GLOBAL_EXCEPTIONS_FLAGS+=-DEXCEPTIONS_OFF LOCAL_EXCEPTIONS_FLAGS+=$(CFLAGSEXCEPTIONS) LOCAL_EXCEPTIONS_FLAGS+=-DEXCEPTIONS_ON -.IF "$(ENABLE_LAYOUT)" == "TRUE" -CDEFS+=-DENABLE_LAYOUT=1 -.ELSE # ENABLE_LAYOUT != TRUE -CFLAGS+=-DENABLE_LAYOUT=0 -.ENDIF # ENABLE_LAYOUT != TRUE - -.IF "$(ENABLE_LAYOUT_EXPERIMENTAL)" == "TRUE" -CDEFS+=-DENABLE_LAYOUT_EXPERIMENTAL=1 -.ELSE # ENABLE_LAYOUT_EXPERIMENTAL != TRUE -CFLAGS+=-DENABLE_LAYOUT_EXPERIMENTAL=0 -.ENDIF # ENABLE_LAYOUT_EXPERIMENTAL != TRUE - .IF "$(ENABLE_GSTREAMER)" == "TRUE" CDEFS+=-DGSTREAMER .ENDIF 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 diff --git a/sw/source/ui/dialog/wordcountdialog.cxx b/sw/source/ui/dialog/wordcountdialog.cxx index ed34930b7677..c81749def414 100644 --- a/sw/source/ui/dialog/wordcountdialog.cxx +++ b/sw/source/ui/dialog/wordcountdialog.cxx @@ -35,7 +35,6 @@ #include <wordcountdialog.hxx> #include <docstat.hxx> #include <dialog.hrc> -#include <layout/layout-pre.hxx> #include <wordcountdialog.hrc> #include <cmdid.h> #include "vcl/msgbox.hxx" // RET_CANCEL @@ -45,15 +44,6 @@ #include <swwait.hxx> #include <wrtsh.hxx> -#if ENABLE_LAYOUT -#undef SW_RES -#define SW_RES(x) #x -#undef SfxModalDialog -#define SfxModalDialog( parent, id ) Dialog( parent, "wordcount.xml", id ) -#define SW_WORDCOUNTDIALOG_HRC -#include <helpid.h> -#endif /* ENABLE_LAYOUT */ - SwWordCountDialog::SwWordCountDialog(Window* pParent) : #if defined _MSC_VER #pragma warning (disable : 4355) diff --git a/sw/source/ui/dialog/wordcountwrapper.cxx b/sw/source/ui/dialog/wordcountwrapper.cxx index ddecf5a0e96c..5bf98ad2507b 100644 --- a/sw/source/ui/dialog/wordcountwrapper.cxx +++ b/sw/source/ui/dialog/wordcountwrapper.cxx @@ -30,7 +30,6 @@ #include <wordcountdialog.hxx> #include <docstat.hxx> #include <dialog.hrc> -#include <layout/layout-pre.hxx> #include <wordcountdialog.hrc> #include <cmdid.h> diff --git a/sw/source/ui/inc/wordcountdialog.hxx b/sw/source/ui/inc/wordcountdialog.hxx index 14b8be8e8255..4317e0b09cb0 100644 --- a/sw/source/ui/inc/wordcountdialog.hxx +++ b/sw/source/ui/inc/wordcountdialog.hxx @@ -31,7 +31,6 @@ #include <svtools/stdctrl.hxx> #include <vcl/button.hxx> #include <layout/layout.hxx> -#include <layout/layout-pre.hxx> struct SwDocStat; #include <sfx2/childwin.hxx> #include "swabstdlg.hxx" @@ -99,8 +98,6 @@ public: void UpdateCounts(); }; -#include <layout/layout-post.hxx> - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/toolkit/Package_inc.mk b/toolkit/Package_inc.mk index 61feff56d3f1..e6fc3006c2ca 100644 --- a/toolkit/Package_inc.mk +++ b/toolkit/Package_inc.mk @@ -27,8 +27,6 @@ #************************************************************************* $(eval $(call gb_Package_Package,toolkit_inc,$(SRCDIR)/toolkit/inc)) -$(eval $(call gb_Package_add_file,toolkit_inc,inc/layout/layout-post.hxx,layout/layout-post.hxx)) -$(eval $(call gb_Package_add_file,toolkit_inc,inc/layout/layout-pre.hxx,layout/layout-pre.hxx)) $(eval $(call gb_Package_add_file,toolkit_inc,inc/layout/layout.hxx,layout/layout.hxx)) $(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxaccessiblecomponent.hxx,toolkit/awt/vclxaccessiblecomponent.hxx)) $(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxcontainer.hxx,toolkit/awt/vclxcontainer.hxx)) diff --git a/toolkit/inc/layout/layout-post.hxx b/toolkit/inc/layout/layout-post.hxx deleted file mode 100644 index da9a052e1b6b..000000000000 --- a/toolkit/inc/layout/layout-post.hxx +++ /dev/null @@ -1,84 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _LAYOUT_POST_HXX -#define _LAYOUT_POST_HXX - -#if ENABLE_LAYOUT - -/* Allow re-inclusion for cxx file. */ -#undef _LAYOUT_PRE_HXX - - -#undef Box -#undef Button -#undef CancelButton -#undef Container -#undef Control -#undef Dialog -#undef Edit -#undef FixedImage -#undef FixedText -#undef HelpButton -#undef IgnoreButton -#undef ListBox -#undef MessBox -#undef MessageBox -#undef MetricFormatter -#undef NoButton -#undef NumericFormatter -#undef PushButton -#undef RetryButton -#undef SfxTabDialog -#undef SfxTabPage -#undef SvxFontListBox -#undef SvxLanguageBox -#undef SpinField -#undef TabDialog -#undef TabControl -#undef TabPage -#undef Table -#undef YesButton - -#undef SvxFontListBox -#undef SvxLanguageBox - -#undef ModalDialog -#undef ModelessDialog -#undef ScExpandedFixedText -#undef SfxDialog -#undef SfxModalDialog -#undef SfxModelessDialog - -#undef Window - -#endif /* ENABLE_LAYOUT */ - -#endif /* _LAYOUT_POST_HXX */ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/toolkit/inc/layout/layout-pre.hxx b/toolkit/inc/layout/layout-pre.hxx deleted file mode 100644 index 9f6b59e3ab2f..000000000000 --- a/toolkit/inc/layout/layout-pre.hxx +++ /dev/null @@ -1,81 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _LAYOUT_PRE_HXX -#define _LAYOUT_PRE_HXX - -#if ENABLE_LAYOUT - -///* Allow re-inclusion for next hxx file. */ -#undef _LAYOUT_POST_HXX - -#define Box layout::Box -#define Button layout::Button -#define CancelButton layout::CancelButton -#define Container layout::Container -#define Control layout::Control -#define Dialog layout::Dialog -#define Edit layout::Edit -#define FixedImage layout::FixedImage -#define FixedText layout::FixedText -#define HelpButton layout::HelpButton -#define IgnoreButton layout::IgnoreButton -#define ListBox layout::ListBox -#define MessBox layout::MessBox -#define MessageBox layout::MessageBox -#define MetricFormatter layout::MetricFormatter -#define NoButton layout::NoButton -#define NumericFormatter layout::NumericFormatter -#define PushButton layout::PushButton -#define RetryButton layout::RetryButton -#define SfxTabDialog layout::SfxTabDialog -#define SfxTabPage layout::SfxTabPage -#define SvxFontListBox layout::SvxFontListBox -#define SvxLanguageBox layout::SvxLanguageBox -#define TabControl layout::TabControl -#define TabPage layout::TabPage -#define Table layout::Table -#define YesButton layout::YesButton - -#define ModalDialog Dialog -#define ModelessDialog Dialog -#define ScExpandedFixedText FixedText -#define SfxDialog Dialog -#define SfxModalDialog Dialog -#define SfxModelessDialog Dialog -#define TabDialog Dialog - -#define Window ::Window - -#endif /* ENABLE_LAYOUT */ - -#define LocalizedString String - -#endif /* _LAYOUT_PRE_HXX */ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/toolkit/inc/layout/layout.hxx b/toolkit/inc/layout/layout.hxx index 658b34fcdc36..986ae5f10e97 100644 --- a/toolkit/inc/layout/layout.hxx +++ b/toolkit/inc/layout/layout.hxx @@ -490,16 +490,9 @@ class TOOLKIT_DLLPUBLIC InPlug : public Context, public Window } // end namespace layout -#if ENABLE_LAYOUT -#define LAYOUT_NS layout:: -#define LAYOUT_DIALOG_PARENT\ - VCLXWindow::GetImplementation( uno::Reference <awt::XWindow> ( GetPeer(), uno::UNO_QUERY ) )->GetWindow() -#define LAYOUT_THIS_WINDOW( this ) this->GetWindow () -#else /* !ENABLE_LAYOUT */ #define LAYOUT_NS #define LAYOUT_DIALOG_PARENT this #define LAYOUT_THIS_WINDOW( this ) this -#endif /* !ENABLE_LAYOUT */ #endif /* _LAYOUT_HXX */ |