diff options
Diffstat (limited to 'sw/source/ui')
38 files changed, 45 insertions, 58 deletions
diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx index 2d4615bba585..590016fc0af9 100644 --- a/sw/source/ui/app/apphdl.cxx +++ b/sw/source/ui/app/apphdl.cxx @@ -46,7 +46,7 @@ #include <sfx2/event.hxx> #include <sfx2/objitem.hxx> #include <svx/dataaccessdescriptor.hxx> -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <svtools/colorcfg.hxx> #include <svl/eitem.hxx> #include <svl/whiter.hxx> diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx index 8a119ddd5140..daf0d0d5323b 100644 --- a/sw/source/ui/app/docsh.cxx +++ b/sw/source/ui/app/docsh.cxx @@ -54,7 +54,7 @@ #include <sfx2/docfilt.hxx> #include <sfx2/printer.hxx> #include <svx/linkmgr.hxx> -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <svx/flstitem.hxx> #include <svx/htmlmode.hxx> #include <svtools/soerr.hxx> diff --git a/sw/source/ui/config/modcfg.cxx b/sw/source/ui/config/modcfg.cxx index a89684ccee98..74238641262d 100644 --- a/sw/source/ui/config/modcfg.cxx +++ b/sw/source/ui/config/modcfg.cxx @@ -36,7 +36,7 @@ #include <sot/clsids.hxx> #include <tools/stream.hxx> #include <vcl/svapp.hxx> -#include <goodies/mailenum.hxx> +#include <svl/mailenum.hxx> #ifndef _SVX_SVXIDS_HRC //autogen #include <svx/svxids.hrc> #endif diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index 329316dcb21a..5c2d7cb2fef6 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -77,7 +77,7 @@ #include <sfx2/docfile.hxx> #include <sfx2/progress.hxx> #include <sfx2/dispatch.hxx> -#include <goodies/mailenum.hxx> +#include <svl/mailenum.hxx> #include <cmdid.h> #include <swmodule.hxx> #include <view.hxx> diff --git a/sw/source/ui/dbui/mmmergepage.cxx b/sw/source/ui/dbui/mmmergepage.cxx index 74a647f755bd..fb2162a2ddbf 100644 --- a/sw/source/ui/dbui/mmmergepage.cxx +++ b/sw/source/ui/dbui/mmmergepage.cxx @@ -42,7 +42,7 @@ #endif #include <dbui.hrc> #include <mmmergepage.hrc> -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <sfx2/dispatch.hxx> #include <svl/eitem.hxx> #include <swabstdlg.hxx> diff --git a/sw/source/ui/docvw/PostItMgr.cxx b/sw/source/ui/docvw/PostItMgr.cxx index 8b275c0a6447..5a9e6c7841a9 100644 --- a/sw/source/ui/docvw/PostItMgr.cxx +++ b/sw/source/ui/docvw/PostItMgr.cxx @@ -67,7 +67,7 @@ #include <sfx2/request.hxx> #include <sfx2/event.hxx> -#include <sfx2/srchitem.hxx> +#include <svl/srchitem.hxx> #include <svl/languageoptions.hxx> diff --git a/sw/source/ui/docvw/romenu.cxx b/sw/source/ui/docvw/romenu.cxx index 313604be962e..3a3187c5c20d 100644 --- a/sw/source/ui/docvw/romenu.cxx +++ b/sw/source/ui/docvw/romenu.cxx @@ -408,7 +408,7 @@ String SwReadOnlyPopup::SaveGraphic( USHORT nId ) if ( pItem->GetGraphicLink() ) sGrfName = *pItem->GetGraphicLink(); ((SvxBrushItem*)pItem)->SetDoneLink( Link() ); - const Graphic *pGrf = pItem->GetGraphic( rView.GetDocShell() ); + const Graphic *pGrf = pItem->GetGraphic(); if ( pGrf ) { aGraphic = *pGrf; diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index 537a39dad8cf..da494d1d1295 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -40,7 +40,7 @@ #include <tools/urlobj.hxx> #include <svl/urihelper.hxx> #include <unotools/pathoptions.hxx> -#include <goodies/mailenum.hxx> +#include <svl/mailenum.hxx> #include <svx/svxdlg.hxx> #include <svx/dialogs.hrc> #include <helpid.h> diff --git a/sw/source/ui/misc/glshell.cxx b/sw/source/ui/misc/glshell.cxx index 12befeaeb194..3875a24bd3a6 100644 --- a/sw/source/ui/misc/glshell.cxx +++ b/sw/source/ui/misc/glshell.cxx @@ -39,7 +39,7 @@ #include <sfx2/printer.hxx> #include <sfx2/request.hxx> #include <sfx2/sfxsids.hrc> -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <svl/macitem.hxx> #include <gloshdl.hxx> diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx index 9b38981abbb3..0b36134c025d 100644 --- a/sw/source/ui/shells/basesh.cxx +++ b/sw/source/ui/shells/basesh.cxx @@ -63,7 +63,7 @@ #include <svx/colritem.hxx> #include <svx/shaditem.hxx> #include <svx/boxitem.hxx> -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <svx/ulspitem.hxx> #include <svx/lrspitem.hxx> #include <svx/brshitem.hxx> diff --git a/sw/source/ui/shells/beziersh.cxx b/sw/source/ui/shells/beziersh.cxx index 919531e84fb7..fa38c837e5e5 100644 --- a/sw/source/ui/shells/beziersh.cxx +++ b/sw/source/ui/shells/beziersh.cxx @@ -34,7 +34,7 @@ #include "cmdid.h" #include <svx/svdview.hxx> -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <svl/eitem.hxx> #include <svl/whiter.hxx> #include <svx/svdopath.hxx> diff --git a/sw/source/ui/shells/drawsh.cxx b/sw/source/ui/shells/drawsh.cxx index 8e5b20c67dd2..12344a9785e5 100644 --- a/sw/source/ui/shells/drawsh.cxx +++ b/sw/source/ui/shells/drawsh.cxx @@ -41,7 +41,7 @@ #include <sfx2/bindings.hxx> #include <sfx2/objface.hxx> #include <svl/itemiter.hxx> -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <svx/xftsfit.hxx> #include <svx/extrusionbar.hxx> #include <svx/fontworkbar.hxx> diff --git a/sw/source/ui/shells/drformsh.cxx b/sw/source/ui/shells/drformsh.cxx index d15c0b697e12..324e1d03d46e 100644 --- a/sw/source/ui/shells/drformsh.cxx +++ b/sw/source/ui/shells/drformsh.cxx @@ -42,7 +42,7 @@ #include <sfx2/app.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <svx/fmglob.hxx> #include <svx/svdouno.hxx> #include <com/sun/star/form/FormButtonType.hpp> diff --git a/sw/source/ui/shells/drwbassh.cxx b/sw/source/ui/shells/drwbassh.cxx index 3f5bb4fe6d77..81b949c83f0b 100644 --- a/sw/source/ui/shells/drwbassh.cxx +++ b/sw/source/ui/shells/drwbassh.cxx @@ -42,7 +42,7 @@ #include <svl/aeitem.hxx> #include <svx/svdview.hxx> #include <vcl/msgbox.hxx> -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <svl/whiter.hxx> #include <svx/swframevalidation.hxx> #include <svx/anchorid.hxx> diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx index 4bd22a2c5822..bdafc02bd060 100644 --- a/sw/source/ui/shells/frmsh.cxx +++ b/sw/source/ui/shells/frmsh.cxx @@ -35,7 +35,7 @@ #include <hintids.hxx> #include <svl/whiter.hxx> #include <svtools/imapobj.hxx> -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <svtools/imap.hxx> #include <sfx2/viewfrm.hxx> #include <basic/sbstar.hxx> diff --git a/sw/source/ui/shells/grfsh.cxx b/sw/source/ui/shells/grfsh.cxx index 4a34d39588fe..cb4efe1d4b95 100644 --- a/sw/source/ui/shells/grfsh.cxx +++ b/sw/source/ui/shells/grfsh.cxx @@ -50,7 +50,7 @@ #include <svx/sizeitem.hxx> #include <svx/protitem.hxx> #include <sfx2/request.hxx> -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <svx/htmlmode.hxx> #include <svx/sdgluitm.hxx> #include <svx/sdgcoitm.hxx> diff --git a/sw/source/ui/shells/listsh.cxx b/sw/source/ui/shells/listsh.cxx index e0d6bdcc4228..cb93bb2ae5b8 100644 --- a/sw/source/ui/shells/listsh.cxx +++ b/sw/source/ui/shells/listsh.cxx @@ -46,7 +46,7 @@ #include <svl/whiter.hxx> #include <svl/intitem.hxx> #include <tools/shl.hxx> -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> // --> FME 2005-01-04 #i35572# #include <numrule.hxx> diff --git a/sw/source/ui/shells/mediash.cxx b/sw/source/ui/shells/mediash.cxx index d0e3a94c970e..7a04f256e351 100644 --- a/sw/source/ui/shells/mediash.cxx +++ b/sw/source/ui/shells/mediash.cxx @@ -47,7 +47,7 @@ #include <svx/sizeitem.hxx> #include <svx/protitem.hxx> #include <sfx2/request.hxx> -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <svx/htmlmode.hxx> #include <svx/sdgluitm.hxx> #include <svx/sdgcoitm.hxx> diff --git a/sw/source/ui/shells/slotadd.cxx b/sw/source/ui/shells/slotadd.cxx index 94c74122bdec..04fc605b5e9a 100644 --- a/sw/source/ui/shells/slotadd.cxx +++ b/sw/source/ui/shells/slotadd.cxx @@ -51,7 +51,7 @@ #include <svx/SmartTagItem.hxx> #include <svl/ptitem.hxx> #include <svx/pageitem.hxx> -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <sfx2/tplpitem.hxx> #include <svx/wrlmitem.hxx> #include <svx/protitem.hxx> diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx index 20b548efaf91..66b8f3843c34 100644 --- a/sw/source/ui/shells/tabsh.cxx +++ b/sw/source/ui/shells/tabsh.cxx @@ -40,7 +40,7 @@ #include <svl/whiter.hxx> #include <unotools/moduleoptions.hxx> #include <svx/rulritem.hxx> -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <svx/lrspitem.hxx> #include <svx/ulspitem.hxx> #include <svx/brshitem.hxx> diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx index 9dd27b760064..6c6f897b5bc4 100644 --- a/sw/source/ui/shells/textsh.cxx +++ b/sw/source/ui/shells/textsh.cxx @@ -49,7 +49,7 @@ #include <vcl/msgbox.hxx> #include <sfx2/fcontnr.hxx> #include <svx/hlnkitem.hxx> -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/docfile.hxx> #include <svl/urihelper.hxx> diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx index d7cc7936958b..e2c175267a0b 100644 --- a/sw/source/ui/uiview/pview.cxx +++ b/sw/source/ui/uiview/pview.cxx @@ -53,7 +53,7 @@ #include <vcl/msgbox.hxx> #include <svx/stddlg.hxx> #include <svx/paperinf.hxx> -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <svx/svdview.hxx> #include <svx/dlgutil.hxx> #include <svx/zoomslideritem.hxx> diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx index 92467fe455d0..cff0e900cee7 100644 --- a/sw/source/ui/uiview/srcview.cxx +++ b/sw/source/ui/uiview/srcview.cxx @@ -65,7 +65,7 @@ #include <sfx2/docfile.hxx> #include <svx/fhgtitem.hxx> #include <svx/srchdlg.hxx> -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <svx/fontitem.hxx> #include <svx/flstitem.hxx> #include "svx/unolingu.hxx" diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx index 73c401f2bcb6..1eacc08c750b 100644 --- a/sw/source/ui/uiview/view0.cxx +++ b/sw/source/ui/uiview/view0.cxx @@ -36,7 +36,7 @@ #include "hintids.hxx" #include <vcl/graph.hxx> #include <svx/galbrws.hxx> -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <SwSpellDialogChildWindow.hxx> #include <svl/eitem.hxx> #include <unotools/linguprops.hxx> diff --git a/sw/source/ui/uiview/viewling.cxx b/sw/source/ui/uiview/viewling.cxx index 09014ea3afcf..a9de5d048a3a 100644 --- a/sw/source/ui/uiview/viewling.cxx +++ b/sw/source/ui/uiview/viewling.cxx @@ -55,22 +55,16 @@ #include <svx/langitem.hxx> #include <svx/svxerr.hxx> #include <svx/unolingu.hxx> -#include <svx/thesdlg.hxx> +#include <svx/svxdlg.hxx> #include <svx/SpellPortions.hxx> #include <swmodule.hxx> #include <swwait.hxx> #include <initui.hxx> // fuer SpellPointer #include <uitool.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <wrtsh.hxx> -#ifndef _BASESH_HXX #include <basesh.hxx> -#endif -#ifndef _DOCSH_HXX #include <docsh.hxx> // CheckSpellChanges -#endif #include <viewopt.hxx> // Viewoptions #include <swundo.hxx> // fuer Undo-Ids #include <hyp.hxx> // Trennung @@ -80,18 +74,10 @@ #include <crsskip.hxx> #include <ndtxt.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif -#ifndef _COMCORE_HRC #include <comcore.hrc> // STR_MULT_INTERACT_SPELL_WARN -#endif -#ifndef _VIEW_HRC #include <view.hrc> -#endif #include <hhcwrp.hxx> #include <com/sun/star/frame/XStorable.hpp> @@ -112,7 +98,7 @@ #include <cppuhelper/bootstrap.hxx> #include "stmenu.hxx" // PopupMenu for smarttags #include <svx/dialogs.hrc> - +#include <svtools/langtab.hxx> #include <unomid.h> #include <memory> @@ -418,7 +404,7 @@ IMPL_LINK( SwView, SpellError, LanguageType *, pLang ) while( pWrtShell->ActionPend() ); } LanguageType eLang = pLang ? *pLang : LANGUAGE_NONE; - String aErr(::GetLanguageString( eLang ) ); + String aErr(SvtLanguageTable::GetLanguageString( eLang ) ); SwEditWin &rEditWin = GetEditWin(); #if OSL_DEBUG_LEVEL > 1 @@ -614,7 +600,7 @@ void SwView::StartThesaurus() pWrtShell->GetSelTxt() : pWrtShell->GetCurWord(); Reference< XThesaurus > xThes( ::GetThesaurus() ); - SvxThesaurusDialog *pDlg = NULL; + AbstractThesaurusDialog *pDlg = NULL; if ( !xThes.is() || !xThes->hasLocale( SvxCreateLocale( eLang ) ) ) { @@ -625,7 +611,8 @@ void SwView::StartThesaurus() // create dialog { //Scope for SwWait-Object SwWait aWait( *GetDocShell(), sal_True ); - pDlg = new SvxThesaurusDialog( &GetEditWin(), + SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); + pDlg = pFact->CreateThesaurusDialog( &GetEditWin(), xThes, aTmp, eLang ); } @@ -651,12 +638,12 @@ void SwView::StartThesaurus() else aWinTop.Y() = aBtmPos.Y(); - Size aSz = pDlg->GetSizePixel(); + Size aSz = pDlg->GetWindow()->GetSizePixel(); if ( aWinBtm.Y() - aWinTop.Y() > aSz.Height() ) { aWinTop.X() = ( aWinTop.X() + aWinBtm.X() - aSz.Width() ) / 2; aWinTop.Y() = ( aWinTop.Y() + aWinBtm.Y() - aSz.Height() ) / 2; - pDlg->SetPosPixel( aWinTop ); + pDlg->GetWindow()->SetPosPixel( aWinTop ); } } diff --git a/sw/source/ui/uiview/viewmdi.cxx b/sw/source/ui/uiview/viewmdi.cxx index 702c0790012f..103abc58b9a6 100644 --- a/sw/source/ui/uiview/viewmdi.cxx +++ b/sw/source/ui/uiview/viewmdi.cxx @@ -40,7 +40,7 @@ #include <sfx2/dispatch.hxx> #include <svx/ruler.hxx> #include <svx/lrspitem.hxx> -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <sfx2/request.hxx> #include <swmodule.hxx> #ifndef _VIEW_HXX diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx index d55975eaa190..6fae29f1aca1 100644 --- a/sw/source/ui/uiview/viewsrch.cxx +++ b/sw/source/ui/uiview/viewsrch.cxx @@ -46,7 +46,7 @@ #endif #include <svl/itempool.hxx> #include <svl/eitem.hxx> -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <sfx2/request.hxx> #include <svx/srchdlg.hxx> #include <vcl/msgbox.hxx> diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx index 6197bb489d61..c10cec706f83 100644 --- a/sw/source/ui/uno/unotxvw.cxx +++ b/sw/source/ui/uno/unotxvw.cxx @@ -77,7 +77,7 @@ #include <SwStyleNameMapper.hxx> #include <crsskip.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> - +#include <svx/outliner.hxx> #include <svx/editview.hxx> #include <sfx2/docfile.hxx> diff --git a/sw/source/ui/utlui/attrdesc.cxx b/sw/source/ui/utlui/attrdesc.cxx index 076f7aa7bdb8..4e53f7d82d49 100644 --- a/sw/source/ui/utlui/attrdesc.cxx +++ b/sw/source/ui/utlui/attrdesc.cxx @@ -35,7 +35,7 @@ #include <svl/itemiter.hxx> #include <vcl/svapp.hxx> #include <svx/itemtype.hxx> -#include <goodies/grfmgr.hxx> +#include <svtools/grfmgr.hxx> #include <unotools/intlwrapper.hxx> #include <comphelper/processfactory.hxx> #include <fmtanchr.hxx> diff --git a/sw/source/ui/web/wdocsh.cxx b/sw/source/ui/web/wdocsh.cxx index dbfdf87dc94d..434a6a2f15a8 100644 --- a/sw/source/ui/web/wdocsh.cxx +++ b/sw/source/ui/web/wdocsh.cxx @@ -34,7 +34,7 @@ -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <sfx2/app.hxx> #ifndef _SVX_SVXIDS_HRC //autogen #include <svx/svxids.hrc> diff --git a/sw/source/ui/web/wformsh.cxx b/sw/source/ui/web/wformsh.cxx index ed9a84667c79..b8f2c78f3da2 100644 --- a/sw/source/ui/web/wformsh.cxx +++ b/sw/source/ui/web/wformsh.cxx @@ -38,7 +38,7 @@ #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <sfx2/objface.hxx> #include <tools/globname.hxx> #include <sfx2/app.hxx> diff --git a/sw/source/ui/web/wfrmsh.cxx b/sw/source/ui/web/wfrmsh.cxx index ee2f61884000..f53614cdbfef 100644 --- a/sw/source/ui/web/wfrmsh.cxx +++ b/sw/source/ui/web/wfrmsh.cxx @@ -36,7 +36,7 @@ #include "hintids.hxx" #include <sfx2/app.hxx> #include <sfx2/objface.hxx> -#include <svx/srchitem.hxx> //*** +#include <svl/srchitem.hxx> //*** #include "swtypes.hxx" #include "cmdid.h" diff --git a/sw/source/ui/web/wgrfsh.cxx b/sw/source/ui/web/wgrfsh.cxx index 00a21da8e1b7..28cddb381c77 100644 --- a/sw/source/ui/web/wgrfsh.cxx +++ b/sw/source/ui/web/wgrfsh.cxx @@ -33,7 +33,7 @@ #include <sfx2/msg.hxx> -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <sfx2/app.hxx> #include <sfx2/objface.hxx> diff --git a/sw/source/ui/web/wlistsh.cxx b/sw/source/ui/web/wlistsh.cxx index fc3f0635b54d..bb8e72dc2cd1 100644 --- a/sw/source/ui/web/wlistsh.cxx +++ b/sw/source/ui/web/wlistsh.cxx @@ -35,7 +35,7 @@ #include <sfx2/msg.hxx> #include <sfx2/app.hxx> #include <sfx2/objface.hxx> -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <svx/imapdlg.hxx> #include "cmdid.h" diff --git a/sw/source/ui/web/wolesh.cxx b/sw/source/ui/web/wolesh.cxx index 131b6d72da10..ac7144d3ddb4 100644 --- a/sw/source/ui/web/wolesh.cxx +++ b/sw/source/ui/web/wolesh.cxx @@ -35,7 +35,7 @@ #include <sfx2/msg.hxx> #include <sfx2/app.hxx> #include <sfx2/objface.hxx> -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include "wrtsh.hxx" #include "view.hxx" diff --git a/sw/source/ui/web/wtabsh.cxx b/sw/source/ui/web/wtabsh.cxx index c47541214d58..5d3e43e25e48 100644 --- a/sw/source/ui/web/wtabsh.cxx +++ b/sw/source/ui/web/wtabsh.cxx @@ -37,7 +37,7 @@ #include <sfx2/app.hxx> #include <tools/globname.hxx> #include <sfx2/objface.hxx> -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include "cmdid.h" diff --git a/sw/source/ui/web/wtextsh.cxx b/sw/source/ui/web/wtextsh.cxx index abdcee987840..ed0388c5c54f 100644 --- a/sw/source/ui/web/wtextsh.cxx +++ b/sw/source/ui/web/wtextsh.cxx @@ -36,7 +36,7 @@ #include "hintids.hxx" #include <sfx2/objface.hxx> #include <sfx2/app.hxx> -#include <svx/srchitem.hxx> //*** +#include <svl/srchitem.hxx> //*** #include <basic/sbxvar.hxx> #ifndef _SVX_SVXIDS_HRC //autogen #include <svx/svxids.hrc> diff --git a/sw/source/ui/web/wview.cxx b/sw/source/ui/web/wview.cxx index 34ccd8f72378..d0171219a767 100644 --- a/sw/source/ui/web/wview.cxx +++ b/sw/source/ui/web/wview.cxx @@ -33,7 +33,7 @@ #include <sfx2/msg.hxx> -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/templdlg.hxx> #include <svx/srchdlg.hxx> |