summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sc/source/ui/inc/attrdlg.hxx2
-rw-r--r--sc/source/ui/miscdlgs/instbdlg.cxx2
-rw-r--r--sfx2/Package_inc.mk1
-rw-r--r--sfx2/inc/sfx2/layout-post.hxx35
-rw-r--r--sfx2/inc/sfx2/layout-pre.hxx35
-rw-r--r--sfx2/inc/sfx2/layout-tabdlg.hxx36
-rw-r--r--svx/source/dialog/srchdlg.cxx11
-rw-r--r--sw/inc/mdiexp.hxx2
-rw-r--r--sw/source/core/crsr/viscrs.cxx2
-rw-r--r--sw/source/ui/docvw/edtwin3.cxx2
-rwxr-xr-xsw/source/ui/inc/view.hxx2
-rw-r--r--sw/source/ui/uiview/viewsrch.cxx4
-rw-r--r--toolkit/inc/layout/layout.hxx4
13 files changed, 12 insertions, 126 deletions
diff --git a/sc/source/ui/inc/attrdlg.hxx b/sc/source/ui/inc/attrdlg.hxx
index 3cd5ad55956c..05d642a036a0 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 06db06f022a1..216754f12582 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 1c801ac259b5..67bb1c45d73c 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 b216e6b464ac..000000000000
--- 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 d3bb7d431ce5..000000000000
--- 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 d41731ce5e5b..000000000000
--- 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 1d05b81b6517..14aba87ecc2a 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 e7af13ecdf54..ca9453593dae 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 8c93ab5d7689..10c422b5ec6d 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 34b4103d7537..4b14572aa6c2 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 6e64655f3bad..063d10798036 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 bbd490f0640b..3a568c1c9933 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 792316d2c43f..d298e0c0a1cf 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: */
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 00:37:34 +0000