summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--starmath/source/accessibility.hxx2
-rw-r--r--sw/inc/mdiexp.hxx5
-rw-r--r--sw/source/core/crsr/viscrs.cxx2
-rw-r--r--sw/source/ui/dialog/makefile.mk4
-rw-r--r--sw/source/ui/dialog/wordcountdialog.cxx12
-rw-r--r--sw/source/ui/docvw/edtwin3.cxx2
-rw-r--r--sw/source/ui/inc/view.hxx3
-rw-r--r--sw/source/ui/uiview/viewsrch.cxx14
-rw-r--r--sw/uiconfig/layout/layout.mk2
9 files changed, 26 insertions, 20 deletions
diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx
index 39ed6253d5..c2de062bc5 100644
--- a/starmath/source/accessibility.hxx
+++ b/starmath/source/accessibility.hxx
@@ -68,8 +68,6 @@ namespace com { namespace sun { namespace star { namespace accessibility {
struct AccessibleEventObject;
}}}}
-#define css com::sun::star
-
//////////////////////////////////////////////////////////////////////
//
// classes and helper-classes used for accessibility in the graphic-window
diff --git a/sw/inc/mdiexp.hxx b/sw/inc/mdiexp.hxx
index 6a1d1b5847..29c1e3467c 100644
--- a/sw/inc/mdiexp.hxx
+++ b/sw/inc/mdiexp.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -32,6 +32,7 @@
#include <tools/solar.h>
#include <tblenum.hxx>
+#include <layout/layout.hxx>
#include <swdllapi.h>
class UniString;
@@ -63,7 +64,7 @@ void RescheduleProgress( SwDocShell *pDocShell );
void EnableCmdInterface(BOOL bEnable = TRUE);
-Dialog* GetSearchDialog();
+LAYOUT_NS 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 8710559278..7a35758a49 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -996,7 +996,7 @@ SwCursor* SwShellCrsr::Create( SwPaM* pRing ) const
short SwShellCrsr::MaxReplaceArived()
{
short nRet = RET_YES;
- Window* pDlg = ::GetSearchDialog();
+ Window* pDlg = LAYOUT_THIS_WINDOW (::GetSearchDialog());
if( pDlg )
{
// alte Actions beenden; die Tabellen-Frames werden angelegt und
diff --git a/sw/source/ui/dialog/makefile.mk b/sw/source/ui/dialog/makefile.mk
index dbdbdb6e9d..ce90d6a3a6 100644
--- a/sw/source/ui/dialog/makefile.mk
+++ b/sw/source/ui/dialog/makefile.mk
@@ -42,10 +42,6 @@ LIBTARGET=no
.INCLUDE : settings.mk
.INCLUDE : $(PRJ)$/inc$/sw.mk
-.IF "$(ENABLE_LAYOUT)" == "TRUE"
-CFLAGS+= -DENABLE_LAYOUT=1 -I../$(PRJ)/layout/inc -I../$(PRJ)/layout/$(INPATH)/inc
-.ENDIF # ENABLE_LAYOUT == TRUE
-
# --- Files --------------------------------------------------------
SRS1NAME=$(TARGET)
diff --git a/sw/source/ui/dialog/wordcountdialog.cxx b/sw/source/ui/dialog/wordcountdialog.cxx
index 8639a680ad..8ae35e684a 100644
--- a/sw/source/ui/dialog/wordcountdialog.cxx
+++ b/sw/source/ui/dialog/wordcountdialog.cxx
@@ -41,6 +41,15 @@
#include <layout/layout-pre.hxx>
#include <wordcountdialog.hrc>
+#if ENABLE_LAYOUT
+#undef SW_RES
+#define SW_RES(x) #x
+#undef SfxModalDialog
+#define SfxModalDialog( parent, id ) Dialog( parent, "wordcount.xml", id )
+#define SW_WORDCOUNTDIALOG_HRC
+#include <helpid.h>
+#endif /* ENABLE_LAYOUT */
+
/*-- 06.04.2004 16:05:55---------------------------------------------------
-----------------------------------------------------------------------*/
@@ -67,6 +76,9 @@ SwWordCountDialog::SwWordCountDialog(Window* pParent) :
#pragma warning (default : 4355)
#endif
{
+#if ENABLE_LAYOUT
+ SetHelpId (HID_DLG_WORDCOUNT);
+#endif /* ENABLE_LAYOUT */
FreeResource();
}
/*-- 06.04.2004 16:05:56---------------------------------------------------
diff --git a/sw/source/ui/docvw/edtwin3.cxx b/sw/source/ui/docvw/edtwin3.cxx
index 5cd587ba44..ff951764bb 100644
--- a/sw/source/ui/docvw/edtwin3.cxx
+++ b/sw/source/ui/docvw/edtwin3.cxx
@@ -150,7 +150,7 @@ BOOL SwEditWin::RulerMarginDrag( const MouseEvent& rMEvt,
}
// <--
-Dialog* GetSearchDialog()
+LAYOUT_NS Dialog* GetSearchDialog()
{
return SwView::GetSearchDialog();
}
diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx
index 47a8cc416e..459346df23 100644
--- a/sw/source/ui/inc/view.hxx
+++ b/sw/source/ui/inc/view.hxx
@@ -41,6 +41,7 @@
#include "swdllapi.h"
#include <swtypes.hxx>
#include <shellid.hxx>
+#include <layout/layout.hxx>
class SwBaseShell;
class Button;
@@ -490,7 +491,7 @@ public:
void SetVisArea( const Point&, BOOL bUpdateScrollbar = TRUE);
void CheckVisArea();
- static Dialog* GetSearchDialog();
+ static LAYOUT_NS Dialog* GetSearchDialog();
static USHORT GetMoveType();
static void SetMoveType(USHORT nSet);
diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx
index f678b72c04..4329883e6b 100644
--- a/sw/source/ui/uiview/viewsrch.cxx
+++ b/sw/source/ui/uiview/viewsrch.cxx
@@ -106,7 +106,7 @@ inline Window* GetParentWindow( SvxSearchDialog* pSrchDlg )
{
Window* pWin;
if( pSrchDlg && pSrchDlg->IsVisible() )
- pWin = pSrchDlg;
+ pWin = LAYOUT_THIS_WINDOW (pSrchDlg);
else
pWin = 0;
return pWin;
@@ -168,7 +168,7 @@ void SwView::ExecSearch(SfxRequest& rReq, BOOL bNoMessage)
if ( pWrp )
{
- pSrchDlg = (SvxSearchDialog*)(pWrp->GetWindow());
+ pSrchDlg = static_cast <SvxSearchDialog*> (pWrp->getDialog ());
// die Search / Replace -Items merken wir uns
const SearchAttrItemList* pList = pSrchDlg->GetSearchItemList();
if( pList && pList->Count() )
@@ -189,7 +189,7 @@ void SwView::ExecSearch(SfxRequest& rReq, BOOL bNoMessage)
SwView::SetMoveType(NID_SRCH_REP);
if ( pWrp )
{
- pSrchDlg = (SvxSearchDialog*)(pWrp->GetWindow());
+ pSrchDlg = static_cast <SvxSearchDialog*> (pWrp->getDialog ());
}
else
pSrchDlg = 0;
@@ -493,7 +493,7 @@ BOOL SwView::SearchAndWrap(BOOL bApi)
const USHORT nId = SvxSearchDialogWrapper::GetChildWindowId();
SvxSearchDialogWrapper *pWrp = (SvxSearchDialogWrapper*)GetViewFrame()->GetChildWindow(nId);
- pSrchDlg = pWrp ? (SvxSearchDialog*)(pWrp->GetWindow()) : 0;
+ pSrchDlg = pWrp ? static_cast <SvxSearchDialog*> (pWrp->getDialog ()) : 0;
// falls Startposition am Dokumentende / -anfang
if (aOpts.bDontWrap)
@@ -728,19 +728,17 @@ ULONG SwView::FUNC_Search( const SwSearchOptions& rOptions )
return nFound;
}
-
-Dialog* SwView::GetSearchDialog()
+LAYOUT_NS Dialog* SwView::GetSearchDialog()
{
const USHORT nId = SvxSearchDialogWrapper::GetChildWindowId();
SvxSearchDialogWrapper *pWrp = (SvxSearchDialogWrapper*)SfxViewFrame::Current()->GetChildWindow(nId);
if ( pWrp )
- pSrchDlg = (SvxSearchDialog*)(pWrp->GetWindow());
+ pSrchDlg = pWrp->getDialog ();
else
pSrchDlg = 0;
return pSrchDlg;
}
-
void SwView::StateSearch(SfxItemSet &rSet)
{
SfxWhichIter aIter(rSet);
diff --git a/sw/uiconfig/layout/layout.mk b/sw/uiconfig/layout/layout.mk
index f6bea876d8..8daa1c5e8f 100644
--- a/sw/uiconfig/layout/layout.mk
+++ b/sw/uiconfig/layout/layout.mk
@@ -1,7 +1,7 @@
# TODO: move to solenv/inc
# copies: sw/uiconfig/layout svx/uiconfig/layout
-TRALAY=tralay
+TRALAY=$(AUGMENT_LIBRARY_PATH) tralay
XML_DEST=$(DLLDEST)
XML_LANGS=$(alllangiso)
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-24 19:50:56 +0000