summaryrefslogtreecommitdiffstats
path: root/sw/source/ui
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2011-11-15 15:13:00 +0100
committerJan Holesovsky <kendy@suse.cz>2011-11-15 15:13:00 +0100
commit7776ebfa63cec652131e2be61e2dc198648770db (patch)
treeddff706f7b4519e5949c569c51bf8bd477dd46a6 /sw/source/ui
parentremove unused methods from layoutimpl (diff)
downloadcore-7776ebfa63cec652131e2be61e2dc198648770db.tar.gz
core-7776ebfa63cec652131e2be61e2dc198648770db.zip
Cleanup few macros and unused headers.
Diffstat (limited to 'sw/source/ui')
-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
3 files changed, 4 insertions, 4 deletions
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);