Cleanup few macros and unused headers.

5 files changed, 6 insertions, 6 deletions

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);