[Libreoffice-commits] .: 5 commits - configure.in cui/Library_cui.mk cui/source scp2/source scp2/util sc/source set_soenv.in sfx2/inc sfx2/Module_sfx2.mk sfx2/Package_inc.mk sfx2/source solenv/gbuild solenv/inc svx/inc svx/source svx/uiconfig sw/inc sw/source toolkit/inc toolkit/Library_tk.mk toolkit/Package_inc.mk toolkit/source unusedcode.easy
Jan Holesovsky
kendy at kemper.freedesktop.org
Tue Nov 15 06:18:05 PST 2011
configure.in | 10 --
cui/Library_cui.mk | 4
cui/source/dialogs/zoom.cxx | 11 --
cui/source/inc/numfmt.hxx | 10 --
cui/source/inc/zoom.hxx | 4
cui/source/tabpages/numfmt.cxx | 40 ---------
sc/source/ui/attrdlg/attrdlg.cxx | 9 --
sc/source/ui/attrdlg/scdlgfact.cxx | 52 ------------
sc/source/ui/attrdlg/scdlgfact.hxx | 17 ---
sc/source/ui/dbgui/sortdlg.cxx | 11 --
sc/source/ui/dbgui/tpsort.cxx | 22 -----
sc/source/ui/inc/attrdlg.hxx | 13 ---
sc/source/ui/inc/instbdlg.hxx | 3
sc/source/ui/inc/mvtabdlg.hxx | 3
sc/source/ui/inc/sortdlg.hxx | 13 ---
sc/source/ui/inc/strindlg.hxx | 3
sc/source/ui/inc/tpsort.hxx | 17 ---
sc/source/ui/miscdlgs/instbdlg.cxx | 22 -----
sc/source/ui/miscdlgs/mvtabdlg.cxx | 13 ---
sc/source/ui/miscdlgs/strindlg.cxx | 9 --
sc/source/ui/view/tabvwshf.cxx | 6 -
scp2/source/layout/makefile.mk | 4
scp2/util/makefile.mk | 4
set_soenv.in | 1
sfx2/Module_sfx2.mk | 1
sfx2/Package_inc.mk | 3
sfx2/inc/sfx2/layout-post.hxx | 43 ---------
sfx2/inc/sfx2/layout-pre.hxx | 52 ------------
sfx2/inc/sfx2/layout-tabdlg.hxx | 48 -----------
sfx2/inc/sfx2/layout.hxx | 5 -
sfx2/inc/sfx2/tabdlg.hxx | 37 --------
sfx2/source/dialog/tabdlg.cxx | 98 ----------------------
sfx2/source/layout/sfxtabdialog.cxx | 1
solenv/gbuild/gbuild.mk | 20 ----
solenv/inc/settings.mk | 12 --
svx/inc/svx/fontlb.hxx | 21 ----
svx/inc/svx/langbox.hxx | 21 ----
svx/inc/svx/srchdlg.hxx | 5 -
svx/source/dialog/fontlb.cxx | 23 -----
svx/source/dialog/langbox.cxx | 45 ----------
svx/source/dialog/srchdlg.cxx | 58 +------------
svx/uiconfig/layout/makefile.mk | 10 --
sw/inc/mdiexp.hxx | 2
sw/source/core/crsr/viscrs.cxx | 2
sw/source/ui/dialog/wordcountdialog.cxx | 10 --
sw/source/ui/dialog/wordcountwrapper.cxx | 1
sw/source/ui/docvw/edtwin3.cxx | 2
sw/source/ui/inc/view.hxx | 2
sw/source/ui/inc/wordcountdialog.hxx | 3
sw/source/ui/uiview/viewsrch.cxx | 4
toolkit/Library_tk.mk | 1
toolkit/Package_inc.mk | 2
toolkit/inc/layout/layout-post.hxx | 84 -------------------
toolkit/inc/layout/layout-pre.hxx | 81 ------------------
toolkit/inc/layout/layout.hxx | 101 -----------------------
toolkit/source/awt/vclxplugin.cxx | 5 -
toolkit/source/awt/vclxplugin.hxx | 2
toolkit/source/awt/vclxtabcontrol.cxx | 13 ---
toolkit/source/awt/vclxtabcontrol.hxx | 2
toolkit/source/layout/core/helper.cxx | 43 ---------
toolkit/source/layout/core/helper.hxx | 7 -
toolkit/source/layout/core/proplist.cxx | 12 --
toolkit/source/layout/core/proplist.hxx | 4
toolkit/source/layout/core/root.cxx | 7 -
toolkit/source/layout/core/root.hxx | 3
toolkit/source/layout/vcl/wbutton.cxx | 9 --
toolkit/source/layout/vcl/wcontainer.cxx | 134 -------------------------------
toolkit/source/layout/vcl/wfield.cxx | 98 ----------------------
toolkit/source/layout/vcl/wrapper.cxx | 73 ----------------
toolkit/source/layout/vcl/wrapper.hxx | 3
unusedcode.easy | 38 --------
71 files changed, 26 insertions(+), 1526 deletions(-)
New commits:
commit 7776ebfa63cec652131e2be61e2dc198648770db
Author: Jan Holesovsky <kendy at suse.cz>
Date: Tue Nov 15 15:13:00 2011 +0100
Cleanup few macros and unused headers.
diff --git a/sc/source/ui/inc/attrdlg.hxx b/sc/source/ui/inc/attrdlg.hxx
index 3cd5ad5..05d642a 100644
--- a/sc/source/ui/inc/attrdlg.hxx
+++ b/sc/source/ui/inc/attrdlg.hxx
@@ -35,8 +35,6 @@ class Window;
class SfxViewFrame;
class SfxItemSet;
-#include <sfx2/layout.hxx>
-
//==================================================================
class ScAttrDlg : public SfxTabDialog
diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx
index 06db06f..216754f 100644
--- a/sc/source/ui/miscdlgs/instbdlg.cxx
+++ b/sc/source/ui/miscdlgs/instbdlg.cxx
@@ -155,7 +155,7 @@ short ScInsertTableDlg::Execute()
{
// set Parent of DocumentInserter and Doc-Manager
Window* pOldDefParent = Application::GetDefDialogParent();
- Application::SetDefDialogParent( LAYOUT_THIS_WINDOW (this) );
+ Application::SetDefDialogParent( this );
if ( aBtnFromFile.IsChecked() )
aBrowseTimer.Start();
diff --git a/sfx2/Package_inc.mk b/sfx2/Package_inc.mk
index 1c801ac..67bb1c4 100644
--- a/sfx2/Package_inc.mk
+++ b/sfx2/Package_inc.mk
@@ -75,7 +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-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))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/linksrc.hxx,sfx2/linksrc.hxx))
diff --git a/sfx2/inc/sfx2/layout-post.hxx b/sfx2/inc/sfx2/layout-post.hxx
deleted file mode 100644
index b216e6b..0000000
--- a/sfx2/inc/sfx2/layout-post.hxx
+++ /dev/null
@@ -1,35 +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 _SFX2_LAYOUT_POST_HXX
-#define _SFX2_LAYOUT_POST_HXX
-
-
-#endif /* _SFX2_LAYOUT_POST_HXX */
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/layout-pre.hxx b/sfx2/inc/sfx2/layout-pre.hxx
deleted file mode 100644
index d3bb7d4..0000000
--- a/sfx2/inc/sfx2/layout-pre.hxx
+++ /dev/null
@@ -1,35 +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 _SFX2_LAYOUT_PRE_HXX
-#define _SFX2_LAYOUT_PRE_HXX
-
-
-#endif /* _SFX2_LAYOUT_PRE_HXX */
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/layout-tabdlg.hxx b/sfx2/inc/sfx2/layout-tabdlg.hxx
deleted file mode 100644
index d41731c..0000000
--- a/sfx2/inc/sfx2/layout-tabdlg.hxx
+++ /dev/null
@@ -1,36 +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_SFX_TABDLG_HXX
-#define _LAYOUT_SFX_TABDLG_HXX
-
-#undef _SFXTABDLG_HXX
-#include <sfx2/tabdlg.hxx>
-
-#endif /* _LAYOUT_SFX_TABDLG_HXX */
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 1d05b81..14aba87 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -1519,7 +1519,7 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn )
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- AbstractSvxSearchSimilarityDialog* pDlg = pFact->CreateSvxSearchSimilarityDialog( LAYOUT_THIS_WINDOW (this),
+ AbstractSvxSearchSimilarityDialog* pDlg = pFact->CreateSvxSearchSimilarityDialog( this,
pSearchItem->IsLEVRelaxed(),
pSearchItem->GetLEVOther(),
pSearchItem->GetLEVShorter(),
@@ -1543,7 +1543,7 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn )
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- AbstractSvxJSearchOptionsDialog* aDlg = pFact->CreateSvxJSearchOptionsDialog( LAYOUT_THIS_WINDOW (this), aSet,
+ AbstractSvxJSearchOptionsDialog* aDlg = pFact->CreateSvxJSearchOptionsDialog( this, aSet,
pSearchItem->GetTransliterationFlags() );
DBG_ASSERT(aDlg, "Dialogdiet fail!");
int nRet = aDlg->Execute();
@@ -1563,7 +1563,7 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn )
pArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SearchString"));
pArgs[0].Value <<= ::rtl::OUString(aSearchLB.GetText());
pArgs[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentWindow"));
- pArgs[1].Value <<= VCLUnoHelper::GetInterface( LAYOUT_THIS_WINDOW (this) );
+ pArgs[1].Value <<= VCLUnoHelper::GetInterface( this );
if(pBtn == &aSearchComponent1PB)
{
if ( pImpl->xCommand1Dispatch.is() )
@@ -2145,7 +2145,7 @@ IMPL_LINK( SvxSearchDialog, FormatHdl_Impl, Button *, EMPTYARG )
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- SfxAbstractTabDialog* pDlg = pFact->CreateTabItemDialog( LAYOUT_THIS_WINDOW (this), aSet, RID_SVXDLG_SEARCHFORMAT );
+ SfxAbstractTabDialog* pDlg = pFact->CreateTabItemDialog( this, aSet, RID_SVXDLG_SEARCHFORMAT );
DBG_ASSERT(pDlg, "Dialogdiet fail!");
aTxt.Insert( pDlg->GetText(), 0 );
pDlg->SetText( aTxt );
@@ -2221,7 +2221,7 @@ IMPL_LINK( SvxSearchDialog, AttributeHdl_Impl, Button *, EMPTYARG )
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- VclAbstractDialog* pDlg = pFact->CreateSvxSearchAttributeDialog( LAYOUT_THIS_WINDOW (this), *pSearchList, pImpl->pRanges );
+ VclAbstractDialog* pDlg = pFact->CreateSvxSearchAttributeDialog( this, *pSearchList, pImpl->pRanges );
DBG_ASSERT(pDlg, "Dialogdiet fail!");
pDlg->Execute();
delete pDlg;
@@ -2484,7 +2484,6 @@ SvxSearchDialogWrapper::SvxSearchDialogWrapper( Window* _pParent, sal_uInt16 nId
: SfxChildWindow( _pParent, nId )
, dialog (new SvxSearchDialog (_pParent, this, *pBindings))
{
- pWindow = LAYOUT_THIS_WINDOW (dialog);
dialog->Initialize( pInfo );
pBindings->Update( SID_SEARCH_ITEM );
diff --git a/sw/inc/mdiexp.hxx b/sw/inc/mdiexp.hxx
index e7af13e..ca94535 100644
--- a/sw/inc/mdiexp.hxx
+++ b/sw/inc/mdiexp.hxx
@@ -62,7 +62,7 @@ void RescheduleProgress( SwDocShell *pDocShell );
void EnableCmdInterface(sal_Bool bEnable = sal_True);
-LAYOUT_NS Dialog* GetSearchDialog();
+Dialog* GetSearchDialog();
void RepaintPagePreview( ViewShell* pVwSh, const SwRect& rRect );
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index 8c93ab5..10c422b 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -550,7 +550,7 @@ SwCursor* SwShellCrsr::Create( SwPaM* pRing ) const
short SwShellCrsr::MaxReplaceArived()
{
short nRet = RET_YES;
- Window* pDlg = LAYOUT_THIS_WINDOW (::GetSearchDialog());
+ Window* pDlg = ::GetSearchDialog();
if( pDlg )
{
// Terminate old actions. The table-frames get constructed and
diff --git a/sw/source/ui/docvw/edtwin3.cxx b/sw/source/ui/docvw/edtwin3.cxx
index 34b4103..4b14572 100644
--- a/sw/source/ui/docvw/edtwin3.cxx
+++ b/sw/source/ui/docvw/edtwin3.cxx
@@ -145,7 +145,7 @@ sal_Bool SwEditWin::RulerMarginDrag( const MouseEvent& rMEvt,
return !rRuler.StartDocDrag( rMEvt, RULER_TYPE_INDENT);
}
-LAYOUT_NS Dialog* GetSearchDialog()
+Dialog* GetSearchDialog()
{
return SwView::GetSearchDialog();
}
diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx
index 6e64655..063d107 100755
--- a/sw/source/ui/inc/view.hxx
+++ b/sw/source/ui/inc/view.hxx
@@ -497,7 +497,7 @@ public:
void CheckVisArea();
void RecheckBrowseMode();
- static LAYOUT_NS Dialog* GetSearchDialog();
+ static Dialog* GetSearchDialog();
static sal_uInt16 GetMoveType();
static void SetMoveType(sal_uInt16 nSet);
diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx
index bbd490f..3a568c1 100644
--- a/sw/source/ui/uiview/viewsrch.cxx
+++ b/sw/source/ui/uiview/viewsrch.cxx
@@ -91,7 +91,7 @@ inline Window* GetParentWindow( SvxSearchDialog* pSrchDlg )
{
Window* pWin;
if( pSrchDlg && pSrchDlg->IsVisible() )
- pWin = LAYOUT_THIS_WINDOW (pSrchDlg);
+ pWin = pSrchDlg;
else
pWin = 0;
return pWin;
@@ -763,7 +763,7 @@ sal_uLong SwView::FUNC_Search( const SwSearchOptions& rOptions )
return nFound;
}
-LAYOUT_NS Dialog* SwView::GetSearchDialog()
+Dialog* SwView::GetSearchDialog()
{
const sal_uInt16 nId = SvxSearchDialogWrapper::GetChildWindowId();
SvxSearchDialogWrapper *pWrp = (SvxSearchDialogWrapper*)SfxViewFrame::Current()->GetChildWindow(nId);
diff --git a/toolkit/inc/layout/layout.hxx b/toolkit/inc/layout/layout.hxx
index 792316d..d298e0c 100644
--- a/toolkit/inc/layout/layout.hxx
+++ b/toolkit/inc/layout/layout.hxx
@@ -400,10 +400,6 @@ class TOOLKIT_DLLPUBLIC InPlug : public Context, public Window
} // end namespace layout
-#define LAYOUT_NS
-#define LAYOUT_DIALOG_PARENT this
-#define LAYOUT_THIS_WINDOW( this ) this
-
#endif /* _LAYOUT_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 30d646fb884570ac34d40b0d2300eaf54453cfc4
Author: Felix Zhang <fezhang at suse.com>
Date: Tue Nov 15 18:14:01 2011 +0800
remove unused methods from layoutimpl
diff --git a/toolkit/source/awt/vclxplugin.cxx b/toolkit/source/awt/vclxplugin.cxx
index 93b1a9d..de37378 100644
--- a/toolkit/source/awt/vclxplugin.cxx
+++ b/toolkit/source/awt/vclxplugin.cxx
@@ -65,11 +65,6 @@ void SAL_CALL VCLXPlugin::dispose() throw(uno::RuntimeException)
VCLXWindow::dispose();
}
-void VCLXPlugin::SetPlugin( ::Control *p )
-{
- mpPlugin = p;
-}
-
awt::Size SAL_CALL VCLXPlugin::getMinimumSize()
throw(::com::sun::star::uno::RuntimeException)
{
diff --git a/toolkit/source/awt/vclxplugin.hxx b/toolkit/source/awt/vclxplugin.hxx
index 458fef3..1b838a2 100644
--- a/toolkit/source/awt/vclxplugin.hxx
+++ b/toolkit/source/awt/vclxplugin.hxx
@@ -47,8 +47,6 @@ public:
VCLXPlugin( Window *p, WinBits b );
- void SetPlugin( ::Control *p );
-
protected:
~VCLXPlugin();
diff --git a/toolkit/source/awt/vclxtabcontrol.cxx b/toolkit/source/awt/vclxtabcontrol.cxx
index cc3940c..221cbe9 100644
--- a/toolkit/source/awt/vclxtabcontrol.cxx
+++ b/toolkit/source/awt/vclxtabcontrol.cxx
@@ -240,19 +240,6 @@ void SAL_CALL VCLXTabControl::draw( sal_Int32 nX, sal_Int32 nY ) throw(uno::Runt
VCLXWindow::draw( nX, nY );
}
-void VCLXTabControl::AddChild (uno::Reference< awt::XLayoutConstrains > const& xChild)
-
-{
-#ifndef __SUNPRO_CC
- OSL_TRACE ("%s: children: %d", __PRETTY_FUNCTION__, maChildren.size ());
-#endif
- mIdMap[ xChild ] = mTabId++;
- Box_Base::AddChild( xChild );
-#ifndef __SUNPRO_CC
- OSL_TRACE ("%s: children: %d", __PRETTY_FUNCTION__, maChildren.size ());
-#endif
-}
-
void SAL_CALL VCLXTabControl::addChild(
const uno::Reference< awt::XLayoutConstrains > &xChild )
throw (uno::RuntimeException, awt::MaxChildrenException)
diff --git a/toolkit/source/awt/vclxtabcontrol.hxx b/toolkit/source/awt/vclxtabcontrol.hxx
index e5d391b..9b20182 100644
--- a/toolkit/source/awt/vclxtabcontrol.hxx
+++ b/toolkit/source/awt/vclxtabcontrol.hxx
@@ -53,8 +53,6 @@ class VCLXTabControl :public VCLXWindow
public:
VCLXTabControl();
- void AddChild (css::uno::Reference <css::awt::XLayoutConstrains> const &);
-
protected:
~VCLXTabControl();
diff --git a/toolkit/source/layout/core/helper.cxx b/toolkit/source/layout/core/helper.cxx
index f915d19..eff0838 100644
--- a/toolkit/source/layout/core/helper.cxx
+++ b/toolkit/source/layout/core/helper.cxx
@@ -43,24 +43,6 @@ namespace layoutimpl
using namespace com::sun::star;
using rtl::OUString;
-uno::Reference< awt::XWindowPeer >
-getParent( uno::Reference< uno::XInterface > xRef )
-{
- do
- {
- uno::Reference< awt::XWindowPeer > xPeer( xRef, uno::UNO_QUERY );
- if ( xPeer.is() )
- return xPeer;
-
- uno::Reference< awt::XLayoutContainer > xCont( xRef, uno::UNO_QUERY );
- if ( xCont.is() )
- xRef = xCont->getParent();
- }
- while ( xRef.is() );
-
- return uno::Reference< awt::XWindowPeer >();
-}
-
}
#include "bin.hxx"
@@ -329,7 +311,7 @@ uno::Reference <awt::XLayoutConstrains> WidgetFactory::implCreateWidget (uno::Re
parent = parentComponent->GetWindow ();
VCLXWindow* component = 0;
- Window* window = 0; //sfx2CreateWindow (&component, parent, name, attributes);
+ Window* window = 0;
if (!window)
window = layoutCreateWindow (&component, parent, name, attributes);
@@ -348,29 +330,6 @@ uno::Reference <awt::XLayoutConstrains> WidgetFactory::implCreateWidget (uno::Re
return reference;
}
-extern "C" { static void SAL_CALL thisModule() {} }
-
-Window* WidgetFactory::sfx2CreateWindow (VCLXWindow** component, Window* parent, OUString const& name, long& attributes)
-{
- OSL_TRACE("Asking sfx2: %s", OUSTRING_CSTR (name));
-
- if (!mSfx2Library)
- {
- OUString libraryName = ::vcl::unohelper::CreateLibraryName ("sfx", sal_True);
- mSfx2Library = osl_loadModuleRelative (&thisModule, libraryName.pData, SAL_LOADMODULE_DEFAULT);
- if (mSfx2Library)
- {
- OUString functionName (RTL_CONSTASCII_USTRINGPARAM ("CreateWindow"));
- mSfx2CreateWidget = (WindowCreator) osl_getFunctionSymbol (mSfx2Library, functionName.pData);
- }
- }
-
- if (mSfx2CreateWidget)
- return mSfx2CreateWidget (component, name, parent, attributes);
-
- return 0;
-}
-
Window* WidgetFactory::layoutCreateWindow (VCLXWindow** component, Window *parent, OUString const& name, long& attributes)
{
Window* window = 0;
diff --git a/toolkit/source/layout/core/helper.hxx b/toolkit/source/layout/core/helper.hxx
index cd91a19..87ef7b6 100644
--- a/toolkit/source/layout/core/helper.hxx
+++ b/toolkit/source/layout/core/helper.hxx
@@ -121,12 +121,6 @@ protected:
css::uno::Any anyFromString (const rtl::OUString &value, const css::uno::Type &type);
-// The native widgets wrapper hierarchy may not reflect that of the layout
-// hierarchy as some containers don't have an associated native widget.
-// Use this function to get the native parent of the given peer.
-css::uno::Reference< css::awt::XWindowPeer >
-getParent( css::uno::Reference< css::uno::XInterface > xPeer );
-
class TOOLKIT_DLLPUBLIC WidgetFactory
{
public:
@@ -138,7 +132,6 @@ public:
static css::uno::Reference< css::awt::XLayoutConstrains > createWidget( css::uno::Reference <css::awt::XToolkit > xToolkit, css::uno::Reference< css::uno::XInterface > xParent, rtl::OUString const &name, long properties);
static css::uno::Reference <css::awt::XLayoutContainer> createContainer (rtl::OUString const& name);
static css::uno::Reference <css::awt::XLayoutConstrains> implCreateWidget (css::uno::Reference <css::uno::XInterface> xParent, rtl::OUString name, long attributes);
- static Window* sfx2CreateWindow (VCLXWindow** component, Window* parent, rtl::OUString const& name, long& attributes);
static Window* layoutCreateWindow (VCLXWindow** component, Window *parent, rtl::OUString const& name, long& attributes);
};
diff --git a/toolkit/source/layout/core/proplist.cxx b/toolkit/source/layout/core/proplist.cxx
index 893b518..88ba18b 100644
--- a/toolkit/source/layout/core/proplist.cxx
+++ b/toolkit/source/layout/core/proplist.cxx
@@ -88,18 +88,6 @@ setProperty( const uno::Reference< uno::XInterface > &xPeer,
}
}
-uno::Any TOOLKIT_DLLPUBLIC
-getProperty( const uno::Reference< uno::XInterface > &xPeer,
- const OUString &rName )
-{
- uno::Reference< awt::XVclWindowPeer> xVclPeer( xPeer, uno::UNO_QUERY );
- if ( xVclPeer.is() )
- return xVclPeer->getProperty( rName );
-
- uno::Reference< beans::XPropertySet > xPropSet( xPeer, uno::UNO_QUERY );
- return xPropSet->getPropertyValue( rName );
-}
-
} // namespace prophlp
diff --git a/toolkit/source/layout/core/proplist.hxx b/toolkit/source/layout/core/proplist.hxx
index fafd450..bddd24b 100644
--- a/toolkit/source/layout/core/proplist.hxx
+++ b/toolkit/source/layout/core/proplist.hxx
@@ -64,12 +64,10 @@ bool TOOLKIT_DLLPUBLIC canHandleProps( const css::uno::Reference< css::uno::XInt
// if so which properties ?
css::uno::Reference< css::beans::XPropertySetInfo > TOOLKIT_DLLPUBLIC queryPropertyInfo(
const css::uno::Reference< css::uno::XInterface > &xRef );
-// set / get ...
+// set ...
void TOOLKIT_DLLPUBLIC setProperty( const css::uno::Reference< css::uno::XInterface > &xRef,
const rtl::OUString &rName,
css::uno::Any aValue );
-css::uno::Any TOOLKIT_DLLPUBLIC getProperty( const css::uno::Reference< css::uno::XInterface > &xRef,
- const rtl::OUString &rName );
} // namespace prophlp
} // namespace layoutimpl
diff --git a/toolkit/source/layout/core/root.cxx b/toolkit/source/layout/core/root.cxx
index e108572..408b7ef 100644
--- a/toolkit/source/layout/core/root.cxx
+++ b/toolkit/source/layout/core/root.cxx
@@ -202,13 +202,6 @@ uno::Reference< awt::XLayoutContainer > LayoutRoot::getLayoutContainer() throw (
return uno::Reference< awt::XLayoutContainer >();
}
-// local helper ...
-void LayoutRoot::addItem( const OUString &rName,
- const uno::Reference< awt::XLayoutConstrains > &xRef )
-{
- maItems[ rName ] = xRef;
-}
-
// XNameAccess
uno::Any SAL_CALL LayoutRoot::getByName( const OUString &rName )
throw ( container::NoSuchElementException,
diff --git a/toolkit/source/layout/core/root.hxx b/toolkit/source/layout/core/root.hxx
index 8254f1b..8110529 100644
--- a/toolkit/source/layout/core/root.hxx
+++ b/toolkit/source/layout/core/root.hxx
@@ -95,9 +95,6 @@ public:
LayoutRoot( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory );
virtual ~LayoutRoot();
- void addItem( const rtl::OUString &rName,
- const css::uno::Reference< css::awt::XLayoutConstrains > &xRef );
-
void setWindow( css::uno::Reference< css::awt::XLayoutConstrains > xPeer )
{
mxWindow = css::uno::Reference< css::awt::XWindow >( xPeer, css::uno::UNO_QUERY );
diff --git a/unusedcode.easy b/unusedcode.easy
index c2d3481..08b9060 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1994,12 +1994,6 @@ graphite2::TtfUtil::GlyfLookup(unsigned short, void const*, void const*, unsigne
jfw_plugin::VendorBase::createInstance()
jfw_plugin::VendorBase::getJavaExePaths(int*)
jvmaccess::ClassPath::doLoadClass(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, void*, rtl::OUString const&, rtl::OUString const&)
-layoutimpl::LayoutRoot::addItem(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::awt::XLayoutConstrains> const&)
-layoutimpl::VCLXPlugin::SetPlugin(Control*)
-layoutimpl::VCLXTabControl::AddChild(com::sun::star::uno::Reference<com::sun::star::awt::XLayoutConstrains> const&)
-layoutimpl::WidgetFactory::sfx2CreateWindow(VCLXWindow**, Window*, rtl::OUString const&, long&)
-layoutimpl::getParent(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>)
-layoutimpl::prophlp::getProperty(com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&, rtl::OUString const&)
libcmis::SessionFactory::getRepositories(std::__debug::map<int, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<int>, std::allocator<std::pair<int const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >)
libvisio::VisioDocument::generateSVG(WPXInputStream*, WPXString&)
libwpg::WPGraphics::generateSVG(unsigned char const*, unsigned long, WPXString&, libwpg::WPGFileFormat)
commit d52f57837e302a9ef483e042b58da8b54d266597
Author: Felix Zhang <fezhang at suse.com>
Date: Tue Nov 15 16:57:53 2011 +0800
remove obsolete layout macros
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index 9b5abb4..2d20de4 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -71,7 +71,6 @@ public:
// -----------------------------------------------------------------------
#include <sfx2/layout.hxx>
-#define LocalizedString String
class SvxNumberFormatTabPage : public SfxTabPage
{
@@ -142,7 +141,7 @@ private:
long nCurFormatHeight;
long nStdFormatY;
long nStdFormatHeight;
- LocalizedString sAutomaticEntry;
+ String sAutomaticEntry;
Window* pLastActivWindow;
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 2adfd5c..8c9ec83 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -215,9 +215,6 @@ void SvxNumberPreviewImpl::DataChanged( const DataChangedEvent& rDCEvt )
#define HDL(hdl) LINK( this, SvxNumberFormatTabPage, hdl )
-#define CUI_RES_PLAIN CUI_RES
-#define THIS_CUI_RES CUI_RES
-
SvxNumberFormatTabPage::SvxNumberFormatTabPage( Window* pParent,
const SfxItemSet& rCoreAttrs )
@@ -231,7 +228,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 ) ),
- aWndPreview ( this, CUI_RES_PLAIN( WND_NUMBER_PREVIEW ) ),
+ aWndPreview ( this, CUI_RES( WND_NUMBER_PREVIEW ) ),
aFlOptions ( this, CUI_RES( FL_OPTIONS ) ),
aFtDecimals ( this, CUI_RES( FT_DECIMALS ) ),
aEdDecimals ( this, CUI_RES( ED_DECIMALS ) ),
@@ -252,7 +249,7 @@ SvxNumberFormatTabPage::SvxNumberFormatTabPage( Window* pParent,
pNumFmtShell ( NULL ),
nInitFormat ( ULONG_MAX ),
- sAutomaticEntry ( THIS_CUI_RES( STR_AUTO_ENTRY)),
+ sAutomaticEntry ( CUI_RES( STR_AUTO_ENTRY)),
pLastActivWindow( NULL )
{
Init_Impl();
@@ -269,7 +266,7 @@ SvxNumberFormatTabPage::~SvxNumberFormatTabPage()
void SvxNumberFormatTabPage::Init_Impl()
{
- ImageList aIconList( CUI_RES_PLAIN ( IL_ICON ) );
+ ImageList aIconList( CUI_RES ( IL_ICON ) );
bNumItemFlag=sal_True;
bOneAreaFlag=sal_False;
diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx
index a94dda5..059a5f4 100644
--- a/sc/source/ui/inc/tpsort.hxx
+++ b/sc/source/ui/inc/tpsort.hxx
@@ -130,8 +130,6 @@ class ScRangeData;
class CollatorRessource;
class CollatorWrapper;
-#define LocalizedString String
-
class ScTabPageSortOptions : public SfxTabPage
{
public:
@@ -180,9 +178,9 @@ private:
// FixedText aFtAreaLabel;
// FixedInfo aFtArea;
- LocalizedString aStrRowLabel;
- LocalizedString aStrColLabel;
- LocalizedString aStrUndefined;
+ String aStrRowLabel;
+ String aStrColLabel;
+ String aStrUndefined;
String aStrAreaLabel;
const sal_uInt16 nWhichSort;
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index c2ec5d9..0c9511f 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -1192,8 +1192,6 @@ IMPL_LINK( SfxTabDialog, BaseFmtHdl, Button *, EMPTYARG )
// -----------------------------------------------------------------------
-#define tabControlWindow pTabCtrl
-
IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl )
/* [Description]
@@ -1230,10 +1228,10 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl )
}
if ( pTmpSet && !pDataObject->bOnDemand )
- pTabPage = (pDataObject->fnCreatePage)( tabControlWindow, *pTmpSet );
+ pTabPage = (pDataObject->fnCreatePage)( pTabCtrl, *pTmpSet );
else
pTabPage = (pDataObject->fnCreatePage)
- ( tabControlWindow, *CreateInputItemSet( nId ) );
+ ( pTabCtrl, *CreateInputItemSet( nId ) );
DBG_ASSERT( NULL == pDataObject->pTabPage, "create TabPage more than once" );
pDataObject->pTabPage = pTabPage;
diff --git a/svx/inc/svx/srchdlg.hxx b/svx/inc/svx/srchdlg.hxx
index 79e848d..b7f19a8 100644
--- a/svx/inc/svx/srchdlg.hxx
+++ b/svx/inc/svx/srchdlg.hxx
@@ -101,7 +101,6 @@ public:
// class SvxSearchDialogWrapper ------------------------------------------
#include <sfx2/layout.hxx>
-#define LocalizedString String
class SvxSearchDialog;
class SVX_DLLPUBLIC SvxSearchDialogWrapper : public SfxChildWindow
@@ -227,7 +226,7 @@ private:
sal_uIntPtr nModifyFlag;
String aStylesStr;
String aLayoutStr;
- LocalizedString aCalcStr;
+ String aCalcStr;
SvStringsDtor aSearchStrings;
SvStringsDtor aReplaceStrings;
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 023da7f..1d05b81 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -275,9 +275,6 @@ void SearchAttrItemList::Remove( sal_uInt16 nPos, sal_uInt16 nLen )
SrchAttrItemList::Remove( nPos, nLen );
}
-#define SVX_RES_PLAIN SVX_RES
-#define THIS_SVX_RES SVX_RES
-
#undef INI_LIST
#define INI_LIST() \
aSearchText ( this, SVX_RES( FT_SEARCH ) ), \
@@ -332,7 +329,7 @@ void SearchAttrItemList::Remove( sal_uInt16 nPos, sal_uInt16 nLen )
bReadOnly ( sal_False ), \
bConstruct ( sal_True ), \
nModifyFlag ( 0 ), \
- aCalcStr ( THIS_SVX_RES( STR_WORDCALC ) ), \
+ aCalcStr ( SVX_RES( STR_WORDCALC ) ), \
pImpl ( NULL ), \
pSearchList ( NULL ), \
pReplaceList ( new SearchAttrItemList ), \
commit d11a82acfd1f529eb399780a1ec2d7a8edb2a40d
Author: Felix Zhang <fezhang at suse.com>
Date: Tue Nov 15 10:15:49 2011 +0800
remove unused methods from layout
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk
index ca599fe..7411f7d 100644
--- a/toolkit/Library_tk.mk
+++ b/toolkit/Library_tk.mk
@@ -157,7 +157,6 @@ $(eval $(call gb_Library_add_exception_objects,tk,\
toolkit/source/layout/core/translate \
toolkit/source/layout/core/vcl \
toolkit/source/layout/vcl/wbutton \
- toolkit/source/layout/vcl/wcontainer \
toolkit/source/layout/vcl/wfield \
toolkit/source/layout/vcl/wrapper \
))
diff --git a/toolkit/inc/layout/layout.hxx b/toolkit/inc/layout/layout.hxx
index 986ae5f..792316d 100644
--- a/toolkit/inc/layout/layout.hxx
+++ b/toolkit/inc/layout/layout.hxx
@@ -116,8 +116,6 @@ class TOOLKIT_DLLPUBLIC Window
protected:
friend class WindowImpl;
WindowImpl *mpImpl;
- static PeerHandle CreatePeer( Window *parent, WinBits nStyle,
- char const* pName);
virtual void setRes (ResId const& res);
@@ -127,7 +125,6 @@ public:
virtual ~Window();
PeerHandle GetPeer() const;
- Context *getContext();
void Show( bool bVisible = true );
inline void Hide() { Show( false ); }
@@ -223,7 +220,6 @@ class TOOLKIT_DLLPUBLIC Button : public Control
{
DECL_GET_IMPL( Button );
DECL_CONSTRUCTORS( Button, Control, 0 );
- DECL_GET_WINDOW (Button);
public:
~Button ();
@@ -237,14 +233,12 @@ class PushButtonImpl;
class TOOLKIT_DLLPUBLIC PushButton : public Button
{
DECL_GET_IMPL( PushButton );
- DECL_GET_WINDOW (PushButton);
protected:
explicit PushButton( WindowImpl *pImpl ) : Button( pImpl ) {}
public:
~PushButton ();
- void Check( bool bCheck=true );
void SetToggleHdl( Link const& rLink );
};
@@ -285,38 +279,12 @@ class TOOLKIT_DLLPUBLIC Edit : public Control
{
DECL_GET_IMPL( Edit );
DECL_CONSTRUCTORS( Edit, Control, WB_BORDER );
- DECL_GET_WINDOW (Edit);
public:
~Edit ();
void SetModifyHdl( Link const& rLink );
};
-class FormatterBaseImpl;
-class TOOLKIT_DLLPUBLIC FormatterBase
-{
-protected:
- FormatterBaseImpl *mpFormatImpl;
- FormatterBase( FormatterBaseImpl *pFormatImpl );
-};
-
-class NumericFormatterImpl;
-class TOOLKIT_DLLPUBLIC NumericFormatter : public FormatterBase
-{
-protected:
- explicit NumericFormatter( FormatterBaseImpl *pImpl );
- NumericFormatterImpl &getFormatImpl() const;
-};
-
-class MetricFormatterImpl;
-// Different inheritance to save code
-class TOOLKIT_DLLPUBLIC MetricFormatter : public FormatterBase
-{
- protected:
- explicit MetricFormatter( FormatterBaseImpl *pImpl );
- MetricFormatterImpl &getFormatImpl() const;
-};
-
class ListBoxImpl;
class TOOLKIT_DLLPUBLIC ListBox : public Control
{
@@ -327,21 +295,12 @@ class TOOLKIT_DLLPUBLIC ListBox : public Control
public:
~ListBox ();
- sal_uInt16 GetEntryPos( String const& rStr ) const;
- String GetEntry( sal_uInt16 nPos ) const;
-
- void SelectEntryPos( sal_uInt16 nPos, bool bSelect=true );
-
- sal_uInt16 GetSelectEntryPos( sal_uInt16 nSelIndex=0 ) const;
-
virtual void SetNoSelection ();
};
class DialogImpl;
class TOOLKIT_DLLPUBLIC Dialog : public Context, public Window
{
- DECL_GET_WINDOW (Dialog);
-
public:
DECL_GET_IMPL (Dialog);
Dialog( ::Window *parent, char const* xml_file, char const* id, sal_uInt32 nId=0 );
@@ -397,19 +356,6 @@ protected:
void init (char const* message, char const* yes, char const* no, const rtl::OString& help_id);
};
-#define CLASS_MESSAGE_BOX(Name)\
- class TOOLKIT_DLLPUBLIC Name##Box : public MessageBox\
- {\
- DECL_MESSAGE_BOX_CTORS (Name);\
- }
-
-//CLASS_MESSAGE_BOX (Mess);
-typedef MessageBox MessBox;
-CLASS_MESSAGE_BOX (Error);
-CLASS_MESSAGE_BOX (Info);
-
-#undef CLASS_MESSAGE_BOX
-
#undef TAB_APPEND
class TabControlImpl;
@@ -424,7 +370,6 @@ class TOOLKIT_DLLPUBLIC TabControl : public Control
public:
~TabControl ();
- void SetCurPageId (sal_uInt16 id);
void SetActivatePageHdl (Link const& link);
void SetDeactivatePageHdl (Link const& link);
};
@@ -447,41 +392,6 @@ public:
// layout container / helper wrappers
// -----------------------------------------------------------------
-class TOOLKIT_DLLPUBLIC Container
-{
-protected:
- css::uno::Reference< css::awt::XLayoutContainer > mxContainer;
- Container( rtl::OUString const& rName, sal_Int32 nBorder );
-public:
- Container( Context const* context, char const* id );
-
- // we can't really do a GetChildren() as they don't have a common class,
- // besides we would need to keep track of children, uh
-
- void ShowAll( bool bVisible );
-
- css::uno::Reference< css::awt::XLayoutContainer > getImpl()
- { return mxContainer; }
-};
-
-class TOOLKIT_DLLPUBLIC Table : public Container
-{
- void setProps( css::uno::Reference< css::awt::XLayoutConstrains > xChild,
- bool bXExpand, bool bYExpand, sal_Int32 nXSpan, sal_Int32 nYSpan );
-};
-
-class TOOLKIT_DLLPUBLIC Box : public Container
-{
-protected:
- Box( rtl::OUString const& rName, sal_Int32 nBorder, bool bHomogeneous );
-public:
- Box( Context const* context, char const* id );
-
-private:
- void setProps( css::uno::Reference< css::awt::XLayoutConstrains > xChild,
- bool bXExpand, bool bYExpand, sal_Int32 nPadding );
-};
-
class InPlugImpl;
class TOOLKIT_DLLPUBLIC InPlug : public Context, public Window
{
diff --git a/toolkit/source/layout/vcl/wbutton.cxx b/toolkit/source/layout/vcl/wbutton.cxx
index f3272dc..0cb8551 100644
--- a/toolkit/source/layout/vcl/wbutton.cxx
+++ b/toolkit/source/layout/vcl/wbutton.cxx
@@ -143,7 +143,6 @@ void Button::Click()
}
IMPL_GET_IMPL( Button );
-IMPL_GET_WINDOW (Button);
class PushButtonImpl : public ButtonImpl
, public ::cppu::WeakImplHelper1< awt::XItemListener >
@@ -193,13 +192,6 @@ PushButton::~PushButton ()
SetToggleHdl (Link ());
}
-void PushButton::Check( bool bCheck )
-{
- getImpl().setProperty( "State", uno::Any( (sal_Int16) !!bCheck ) );
- // XButton doesn't have explicit toggle event
- getImpl().fireToggle();
-}
-
void PushButton::SetToggleHdl( const Link& link )
{
if (&getImpl () && getImpl().mxButton.is ())
@@ -207,7 +199,6 @@ void PushButton::SetToggleHdl( const Link& link )
}
IMPL_GET_IMPL( PushButton );
-IMPL_GET_WINDOW (PushButton);
#define BUTTON_IMPL(t, parent, response) \
class t##Impl : public parent##Impl \
diff --git a/toolkit/source/layout/vcl/wcontainer.cxx b/toolkit/source/layout/vcl/wcontainer.cxx
deleted file mode 100644
index 868915b..0000000
--- a/toolkit/source/layout/vcl/wcontainer.cxx
+++ /dev/null
@@ -1,134 +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.
- *
- ************************************************************************/
-
-#include "wrapper.hxx"
-
-#include <com/sun/star/awt/XLayoutRoot.hpp>
-#include <com/sun/star/awt/XLayoutContainer.hpp>
-#include <comphelper/processfactory.hxx>
-#include <layout/core/helper.hxx>
-#include <tools/debug.hxx>
-
-using namespace ::com::sun::star;
-
-namespace layout
-{
-
-Container::Container( Context const* context, char const* pId )
- : mxContainer( context->GetPeerHandle( pId ), uno::UNO_QUERY )
-{
- if ( !mxContainer.is() )
- {
- OSL_TRACE( "Error: failed to associate container with '%s'", pId );
- }
-}
-
-Container::Container( rtl::OUString const& rName, sal_Int32 nBorder )
-{
- mxContainer = layoutimpl::WidgetFactory::createContainer( rName );
-
- uno::Reference< beans::XPropertySet > xProps( mxContainer, uno::UNO_QUERY_THROW );
- xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Border" ) ),
- uno::Any( nBorder ) );
-}
-
-void Container::ShowAll( bool bShow )
-{
- struct inner
- {
- static void setChildrenVisible( uno::Reference < awt::XLayoutContainer > xCont,
- bool bVisible ) /* auxiliary */
- {
- if ( xCont.is() )
- {
- uno::Sequence< uno::Reference < awt::XLayoutConstrains > > aChildren;
- aChildren = xCont->getChildren();
- for (int i = 0; i < aChildren.getLength(); i++)
- {
- uno::Reference < awt::XLayoutConstrains > xChild( aChildren[ i ] );
-
- uno::Reference< awt::XWindow > xWin( xChild, uno::UNO_QUERY);
- if ( xWin.is() )
- xWin->setVisible( bVisible );
-
- uno::Reference < awt::XLayoutContainer > xChildCont(
- xChild, uno::UNO_QUERY );
- setChildrenVisible( xChildCont, bVisible );
- }
- }
- }
- };
-
- inner::setChildrenVisible( mxContainer, bShow );
-}
-
-void Table::setProps( uno::Reference< awt::XLayoutConstrains > xChild,
- bool bXExpand, bool bYExpand, sal_Int32 nXSpan, sal_Int32 nYSpan )
-{
- uno::Reference< beans::XPropertySet > xProps
- ( mxContainer->getChildProperties( xChild ), uno::UNO_QUERY_THROW );
- xProps->setPropertyValue( rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM( "XExpand" ) ),
- uno::Any( bXExpand ) );
- xProps->setPropertyValue( rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM( "YExpand" ) ),
- uno::Any( bYExpand ) );
- xProps->setPropertyValue( rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM( "ColSpan" ) ),
- uno::Any( nXSpan ) );
- xProps->setPropertyValue( rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM( "RowSpan" ) ),
- uno::Any( nYSpan ) );
-}
-
-Box::Box( rtl::OUString const& rName, sal_Int32 nBorder, bool bHomogeneous )
- : Container( rName, nBorder )
-{
- uno::Reference< beans::XPropertySet > xProps( mxContainer, uno::UNO_QUERY_THROW );
- xProps->setPropertyValue( rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM( "Homogeneous" ) ),
- uno::Any( bHomogeneous ) );
-}
-
-void Box::setProps( uno::Reference< awt::XLayoutConstrains > xChild,
- bool bExpand, bool bFill, sal_Int32 nPadding )
-{
- uno::Reference< beans::XPropertySet > xProps
- ( mxContainer->getChildProperties( xChild ), uno::UNO_QUERY_THROW );
-
- xProps->setPropertyValue( rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM( "Expand" ) ),
- uno::Any( bExpand ) );
- xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Fill" ) ),
- uno::Any( bFill ) );
- xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Padding" ) ),
- uno::Any( nPadding ) );
-}
-
-Box::Box( Context const* context, char const* pId )
- : Container( context, pId )
-{
-}
-
-} // namespace layout
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/source/layout/vcl/wfield.cxx b/toolkit/source/layout/vcl/wfield.cxx
index 04b0757..78b4484 100644
--- a/toolkit/source/layout/vcl/wfield.cxx
+++ b/toolkit/source/layout/vcl/wfield.cxx
@@ -109,80 +109,6 @@ void Edit::SetModifyHdl( const Link& link )
}
IMPL_GET_IMPL( Edit );
-IMPL_GET_WINDOW (Edit);
-
-class FormatterBaseImpl
-{
- protected:
- PeerHandle mpeer;
- public:
- explicit FormatterBaseImpl( const PeerHandle &peer )
- : mpeer( peer )
- {
- };
-};
-
-FormatterBase::FormatterBase( FormatterBaseImpl *pFormatImpl )
- : mpFormatImpl( pFormatImpl )
-{
-}
-
-class NumericFormatterImpl : public FormatterBaseImpl
-{
- public:
- uno::Reference< awt::XNumericField > mxField;
- explicit NumericFormatterImpl( const PeerHandle &peer )
- : FormatterBaseImpl( peer )
- , mxField( peer, uno::UNO_QUERY )
- {
- }
-
- // FIXME: burn that CPU ! cut/paste from vclxwindows.cxx
- double valueToDouble( sal_Int64 nValue )
- {
- sal_Int16 nDigits = mxField->getDecimalDigits();
- double n = (double)nValue;
- for ( sal_uInt16 d = 0; d < nDigits; d++ )
- n /= 10;
- return n;
- } // FIXME: burn that CPU ! cut/paste from vclxwindows.cxx
- sal_Int64 doubleToValue( double nValue )
- {
- sal_Int16 nDigits = mxField->getDecimalDigits();
- double n = nValue;
- for ( sal_uInt16 d = 0; d < nDigits; d++ )
- n *= 10;
- return (sal_Int64) n;
- }
-};
-
-class MetricFormatterImpl : public FormatterBaseImpl
-{
- public:
- uno::Reference< awt::XMetricField > mxField;
- explicit MetricFormatterImpl( const PeerHandle &peer )
- : FormatterBaseImpl( peer )
- , mxField( peer, uno::UNO_QUERY )
- {
- }
-};
-
-NumericFormatter::NumericFormatter( FormatterBaseImpl *pImpl )
- : FormatterBase( pImpl )
-{
-}
-
-NumericFormatterImpl& NumericFormatter::getFormatImpl() const
-{
- return *( static_cast<NumericFormatterImpl *>( mpFormatImpl ) );
-}
-
-MetricFormatter::MetricFormatter( FormatterBaseImpl *pImpl )
- : FormatterBase( pImpl )
-{
-}
-MetricFormatterImpl& MetricFormatter::getFormatImpl() const
-{ return *( static_cast<MetricFormatterImpl *>( mpFormatImpl ) ); }
class ListBoxImpl : public ControlImpl
, public ::cppu::WeakImplHelper1< awt::XActionListener >
@@ -351,30 +277,6 @@ ListBox::~ListBox ()
{
}
-sal_uInt16 ListBox::GetEntryPos( String const& rStr ) const
-{
- return getImpl().GetEntryPos( rStr );
-}
-
-String ListBox::GetEntry( sal_uInt16 nPos ) const
-{
- return getImpl().GetEntry( nPos );
-}
-
-void ListBox::SelectEntryPos( sal_uInt16 nPos, bool bSelect )
-{
-#if LAYOUT_API_CALLS_HANDLER
- getImpl().SelectEntryPos( nPos, bSelect );
-#else /* !LAYOUT_API_CALLS_HANDLER */
- GetListBox ()->SelectEntryPos (nPos, bSelect);
-#endif /* !LAYOUT_API_CALLS_HANDLER */
-}
-
-sal_uInt16 ListBox::GetSelectEntryPos( sal_uInt16 nSelIndex ) const
-{
- return getImpl().GetSelectEntryPos( nSelIndex );
-}
-
void ListBox::SetNoSelection ()
{
GetListBox ()->SetNoSelection ();
diff --git a/toolkit/source/layout/vcl/wrapper.cxx b/toolkit/source/layout/vcl/wrapper.cxx
index b175ea2..8e437bc 100644
--- a/toolkit/source/layout/vcl/wrapper.cxx
+++ b/toolkit/source/layout/vcl/wrapper.cxx
@@ -191,14 +191,6 @@ void SAL_CALL WindowImpl::disposing (lang::EventObject const&)
mxWindow.clear ();
}
-uno::Any WindowImpl::getProperty (char const* name)
-{
- if ( !this || !mxVclPeer.is() )
- return css::uno::Any();
- return mxVclPeer->getProperty
- ( rtl::OUString( name, strlen( name ), RTL_TEXTENCODING_ASCII_US ) );
-}
-
void WindowImpl::setProperty (char const *name, uno::Any any)
{
if ( !this || !mxVclPeer.is() )
@@ -321,11 +313,6 @@ void Window::ParentSet (Window *window)
window->SetParent (GetWindow ());
}
-Context *Window::getContext()
-{
- return this && mpImpl ? mpImpl->mpCtx : NULL;
-}
-
PeerHandle Window::GetPeer() const
{
if ( !mpImpl )
@@ -447,16 +434,6 @@ uno::Reference< awt::XToolkit > getToolkit()
return xToolkit;
}
-PeerHandle Window::CreatePeer( Window *parent, WinBits nStyle, const char *pName)
-{
- long nWinAttrbs = 0;
- for (int i = 0; i < toolkitVclPropsMapLen; i++)
- if ( nStyle & toolkitVclPropsMap[ i ].vclStyle )
- nWinAttrbs |= toolkitVclPropsMap[ i ].initAttr;
-
- return layoutimpl::WidgetFactory::createWidget (getToolkit(), parent->GetPeer(), OUString::createFromAscii( pName ), nWinAttrbs);
-}
-
void Window::Show( bool bVisible )
{
if ( !getImpl().mxWindow.is() )
@@ -496,11 +473,6 @@ void ControlImpl::SetGetFocusHdl (Link const& link)
mGetFocusHdl = link;
}
-Link& ControlImpl::GetGetFocusHdl ()
-{
- return mGetFocusHdl;
-}
-
void ControlImpl::SetLoseFocusHdl (Link const& link)
{
if (!mGetFocusHdl || !link)
@@ -508,11 +480,6 @@ void ControlImpl::SetLoseFocusHdl (Link const& link)
mLoseFocusHdl = link;
}
-Link& ControlImpl::GetLoseFocusHdl ()
-{
- return mGetFocusHdl;
-}
-
void ControlImpl::UpdateListening (Link const& link)
{
if (!link && (!!mGetFocusHdl || !!mLoseFocusHdl)
@@ -577,7 +544,6 @@ Dialog::~Dialog ()
{
}
-IMPL_GET_WINDOW (Dialog);
IMPL_GET_IMPL (Dialog);
#define MX_DIALOG if (getImpl ().mxDialog.is ()) getImpl ().mxDialog
@@ -719,40 +685,6 @@ void MessageBox::init (OUString const& message, OUString const& yes, OUString co
helpButton.Hide ();
}
-#undef MESSAGE_BOX_IMPL
-#define MESSAGE_BOX_IMPL(Name)\
- Name##Box::Name##Box (::Window *parent, char const* message,\
- char const* yes, char const* no, const rtl::OString& help_id,\
- char const* xml_file, char const* id)\
- : MessageBox (parent, message, yes, no, help_id, xml_file, id)\
- {\
- image##Name.Show ();\
- }\
- Name##Box::Name##Box (::Window *parent, OUString const& message,\
- OUString yes, OUString no, const rtl::OString& help_id,\
- char const* xml_file, char const* id)\
- : MessageBox (parent, message, yes, no, help_id, xml_file, id)\
- {\
- image##Name.Show ();\
- }\
- Name##Box::Name##Box (::Window *parent, WinBits bits, char const* message,\
- char const* yes, char const* no, const rtl::OString& help_id,\
- char const* xml_file, char const* id)\
- : MessageBox (parent, bits, message, yes, no, help_id, xml_file, id)\
- {\
- image##Name.Show ();\
- }\
- Name##Box::Name##Box (::Window *parent, WinBits bits, OUString const& message,\
- OUString yes, OUString no, const rtl::OString& help_id,\
- char const* xml_file, char const* id)\
- : MessageBox (parent, bits, message, yes, no, help_id, xml_file, id)\
- {\
- image##Name.Show ();\
- }
-
-MESSAGE_BOX_IMPL (Error);
-MESSAGE_BOX_IMPL (Info);
-
class TabControlImpl
: public ControlImpl
, public ::cppu::WeakImplHelper1 <awt::XTabListener>
@@ -836,11 +768,6 @@ TabControl::~TabControl ()
SetDeactivatePageHdl (Link ());
}
-void TabControl::SetCurPageId (sal_uInt16 id)
-{
- getImpl ().redraw ();
- GetTabControl ()->SetCurPageId (id);
-}
void TabControl::SetActivatePageHdl (Link const& link)
{
if (&getImpl () && getImpl().mxTabControl.is ())
diff --git a/toolkit/source/layout/vcl/wrapper.hxx b/toolkit/source/layout/vcl/wrapper.hxx
index 8a88be6..3ac8946 100644
--- a/toolkit/source/layout/vcl/wrapper.hxx
+++ b/toolkit/source/layout/vcl/wrapper.hxx
@@ -58,7 +58,6 @@ public:
virtual ~WindowImpl ();
void wrapperGone();
- css::uno::Any getProperty (char const *name);
void setProperty (char const *name, css::uno::Any any);
void redraw (bool resize=false);
@@ -77,9 +76,7 @@ public:
~ControlImpl ();
virtual void SetGetFocusHdl (Link const& link);
- Link& GetGetFocusHdl ();
virtual void SetLoseFocusHdl (Link const& link);
- Link& GetLoseFocusHdl ();
virtual void UpdateListening (Link const& link);
// XFocusListener
diff --git a/unusedcode.easy b/unusedcode.easy
index ba23ba9..c2d3481 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1994,38 +1994,6 @@ graphite2::TtfUtil::GlyfLookup(unsigned short, void const*, void const*, unsigne
jfw_plugin::VendorBase::createInstance()
jfw_plugin::VendorBase::getJavaExePaths(int*)
jvmaccess::ClassPath::doLoadClass(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, void*, rtl::OUString const&, rtl::OUString const&)
-layout::Box::Box(layout::Context const*, char const*)
-layout::Box::Box(rtl::OUString const&, int, bool)
-layout::Box::setProps(com::sun::star::uno::Reference<com::sun::star::awt::XLayoutConstrains>, bool, bool, int)
-layout::Button::GetButton() const
-layout::Container::ShowAll(bool)
-layout::ControlImpl::GetGetFocusHdl()
-layout::ControlImpl::GetLoseFocusHdl()
-layout::Dialog::GetDialog() const
-layout::Edit::GetEdit() const
-layout::ErrorBox::ErrorBox(Window*, char const*, char const*, char const*, rtl::OString const&, char const*, char const*)
-layout::ErrorBox::ErrorBox(Window*, long, char const*, char const*, char const*, rtl::OString const&, char const*, char const*)
-layout::ErrorBox::ErrorBox(Window*, long, rtl::OUString const&, rtl::OUString, rtl::OUString, rtl::OString const&, char const*, char const*)
-layout::ErrorBox::ErrorBox(Window*, rtl::OUString const&, rtl::OUString, rtl::OUString, rtl::OString const&, char const*, char const*)
-layout::InfoBox::InfoBox(Window*, char const*, char const*, char const*, rtl::OString const&, char const*, char const*)
-layout::InfoBox::InfoBox(Window*, long, char const*, char const*, char const*, rtl::OString const&, char const*, char const*)
-layout::InfoBox::InfoBox(Window*, long, rtl::OUString const&, rtl::OUString, rtl::OUString, rtl::OString const&, char const*, char const*)
-layout::InfoBox::InfoBox(Window*, rtl::OUString const&, rtl::OUString, rtl::OUString, rtl::OString const&, char const*, char const*)
-layout::ListBox::GetEntry(unsigned short) const
-layout::ListBox::GetEntryPos(String const&) const
-layout::ListBox::GetSelectEntryPos(unsigned short) const
-layout::ListBox::SelectEntryPos(unsigned short, bool)
-layout::MetricFormatter::MetricFormatter(layout::FormatterBaseImpl*)
-layout::MetricFormatter::getFormatImpl() const
-layout::NumericFormatter::NumericFormatter(layout::FormatterBaseImpl*)
-layout::NumericFormatter::getFormatImpl() const
-layout::PushButton::Check(bool)
-layout::PushButton::GetPushButton() const
-layout::TabControl::SetCurPageId(unsigned short)
-layout::Table::setProps(com::sun::star::uno::Reference<com::sun::star::awt::XLayoutConstrains>, bool, bool, int, int)
-layout::Window::CreatePeer(layout::Window*, long, char const*)
-layout::Window::getContext()
-layout::WindowImpl::getProperty(char const*)
layoutimpl::LayoutRoot::addItem(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::awt::XLayoutConstrains> const&)
layoutimpl::VCLXPlugin::SetPlugin(Control*)
layoutimpl::VCLXTabControl::AddChild(com::sun::star::uno::Reference<com::sun::star::awt::XLayoutConstrains> const&)
commit eacfa0f77c3d161f3e0c207120dcf3c2958acee4
Author: Felix Zhang <fezhang at suse.com>
Date: Tue Nov 15 10:13:52 2011 +0800
removing obsolete layout code
diff --git a/configure.in b/configure.in
index 6ae1fbb..19beb9a 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 94d8a4a..0d46396 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 89d0fa9..fbaecd0 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 2e9d51d..9b5abb4 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 c25f888..ee75555 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 058aa99..2adfd5c 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 122c8a5..7c90717 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 ee09f61..08760da 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 e55a523..62884ec 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 57b75c8..24b9e63 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 12e9885..e46e4f2 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 8f1bae4..3cd5ad5 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 718e6d1..cff15f5 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 50a51ee..d8047e0 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 1d6e01d..2ae6adb 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 3d8c974..03b11a4 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 fefd057..a94dda5 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 718f027..06db06f 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 c29cc63..9d448d4 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 d511b1a..063512c 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 7a11361..d239591 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 55fddf8..f2e759c 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 1d6d694..49134a0 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 92e2d35..d210d02 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 4084d39..7aaf257 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 e308d1b..1c801ac 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 e7eddef..b216e6b 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 db467fd..d3bb7d4 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 2629b2c..d41731c 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 95bd42d..a8540ec 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 ce1f84a..8df8018 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 2390c00..c2ec5d9 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 da2dc73..2e7d1aa 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 81676d0..9c7d1f7 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 2a05d22..5c6f6cc 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 dd2ca4e..66745fa 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 3fad0c4..336ce22 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 fc42ce8..79e848d 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 4b3db22..a4a5ec1 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 418e9b4..9c7f58f 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 e8b7949..023da7f 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
{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list