diff options
Diffstat (limited to 'sw/source/ui')
24 files changed, 35 insertions, 48 deletions
diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx index 7ea94d9fa511..2cb1e55145d3 100644 --- a/sw/source/ui/app/docsh.cxx +++ b/sw/source/ui/app/docsh.cxx @@ -53,7 +53,7 @@ #include <sfx2/evntconf.hxx> #include <sfx2/docfilt.hxx> #include <sfx2/printer.hxx> -#include <svx/linkmgr.hxx> +#include <sfx2/linkmgr.hxx> #include <svl/srchitem.hxx> #include <editeng/flstitem.hxx> #include <svx/htmlmode.hxx> @@ -61,7 +61,6 @@ #include <sot/clsids.hxx> #include <basic/basmgr.hxx> #include <basic/sbmod.hxx> -//#include <basic/sbjsmod.hxx> #include <swevent.hxx> #include <fmtpdsc.hxx> #include <fmtfsize.hxx> @@ -111,7 +110,7 @@ #include <cfgid.h> #include <unotools/moduleoptions.hxx> #include <unotools/fltrcfg.hxx> -#include <svx/htmlcfg.hxx> +#include <svtools/htmlcfg.hxx> #include <sfx2/fcontnr.hxx> #include <sfx2/objface.hxx> #include <comphelper/storagehelper.hxx> diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx index 2479107ae4f8..4fdea2d38106 100644 --- a/sw/source/ui/app/docsh2.cxx +++ b/sw/source/ui/app/docsh2.cxx @@ -79,7 +79,7 @@ #include <editeng/langitem.hxx> #include <svx/fmshell.hxx> -#include <svx/htmlcfg.hxx> +#include <svtools/htmlcfg.hxx> #include <svx/ofaitem.hxx> #include <SwSmartTagMgr.hxx> #include <sfx2/app.hxx> diff --git a/sw/source/ui/app/docshini.cxx b/sw/source/ui/app/docshini.cxx index 2898b915c175..14d28d722b41 100644 --- a/sw/source/ui/app/docshini.cxx +++ b/sw/source/ui/app/docshini.cxx @@ -34,9 +34,7 @@ #include <hintids.hxx> -#ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> -#endif #include <i18npool/mslangid.hxx> #include <sot/storinfo.hxx> #include <sot/storage.hxx> @@ -46,45 +44,33 @@ #include <sfx2/docfile.hxx> #include <sfx2/printer.hxx> #include <sfx2/bindings.hxx> -#include <svx/asiancfg.hxx> +#include <svl/asiancfg.hxx> #include <editeng/unolingu.hxx> #include <sfx2/request.hxx> #include <svl/intitem.hxx> #include <editeng/adjitem.hxx> -#ifndef _SVX_AKRNTEM_HXX #include <editeng/akrnitem.hxx> -#endif #include <linguistic/lngprops.hxx> #include <com/sun/star/document/UpdateDocMode.hpp> #include <com/sun/star/i18n/ScriptType.hpp> #include <rtl/logfile.hxx> #include <sfx2/docfilt.hxx> #include <svx/xtable.hxx> -#ifndef _SVX_DRAWITEM_HXX //autogen - #include <svx/drawitem.hxx> -#endif #include <editeng/fhgtitem.hxx> #include <editeng/fontitem.hxx> #include <editeng/flstitem.hxx> -#ifndef _SVX_TSTPITEM_HXX //autogen #include <editeng/tstpitem.hxx> -#endif #include <editeng/langitem.hxx> #include <editeng/colritem.hxx> #include <editeng/hyznitem.hxx> #include <editeng/svxacorr.hxx> - #include <vcl/svapp.hxx> #include <view.hxx> #include <prtopt.hxx> #include <fmtcol.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif -#ifndef _WDOCSH_HXX #include <wdocsh.hxx> -#endif #include <swmodule.hxx> #include <doc.hxx> #include <docfac.hxx> @@ -92,18 +78,12 @@ #include <shellio.hxx> #include <tox.hxx> #include <swdtflvr.hxx> -#ifndef _DBMGR_HXX #include <dbmgr.hxx> -#endif #include <usrpref.hxx> #include <fontcfg.hxx> #include <poolfmt.hxx> -#ifndef _MODCFG_HXX #include <modcfg.hxx> -#endif -#ifndef _GLOBDOC_HXX #include <globdoc.hxx> -#endif #include <ndole.hxx> #include <mdiexp.hxx> #include <unotxdoc.hxx> @@ -111,10 +91,7 @@ #include <swwait.hxx> #include <wrtsh.hxx> #include <swerror.h> -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif - // #i18732# #include <fmtfollowtextflow.hxx> diff --git a/sw/source/ui/app/docst.cxx b/sw/source/ui/app/docst.cxx index 54f3e0d32f6f..b8cebf13686f 100644 --- a/sw/source/ui/app/docst.cxx +++ b/sw/source/ui/app/docst.cxx @@ -52,7 +52,7 @@ #include <wdocsh.hxx> #include <fmtfsize.hxx> #include <fchrfmt.hxx> -#include <svx/htmlcfg.hxx> +#include <svtools/htmlcfg.hxx> #include <SwStyleNameMapper.hxx> #include <undobj.hxx> #include <swundo.hxx> diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx index 19bed390802a..e953b9da6fe3 100644 --- a/sw/source/ui/chrdlg/pardlg.cxx +++ b/sw/source/ui/chrdlg/pardlg.cxx @@ -40,7 +40,7 @@ #include <svx/htmlmode.hxx> #include <svl/style.hxx> -#include <svx/htmlcfg.hxx> +#include <svtools/htmlcfg.hxx> #ifndef _SVSTDARR_STRINGSSORTDTOR #define _SVSTDARR_STRINGSSORTDTOR diff --git a/sw/source/ui/config/viewopt.cxx b/sw/source/ui/config/viewopt.cxx index 51fe0d156c59..f4405b9172ba 100644 --- a/sw/source/ui/config/viewopt.cxx +++ b/sw/source/ui/config/viewopt.cxx @@ -33,7 +33,7 @@ #include <svx/htmlmode.hxx> -#include <svx/htmlcfg.hxx> +#include <svtools/htmlcfg.hxx> #ifndef _SVX_SVXIDS_HRC //autogen #include <svx/svxids.hrc> diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index 23bd5c82735d..092b7beb92e6 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -116,7 +116,7 @@ #include <comphelper/property.hxx> #include <mailmergehelper.hxx> #include <maildispatcher.hxx> -#include <svx/htmlcfg.hxx> +#include <svtools/htmlcfg.hxx> #include <i18npool/mslangid.hxx> #include <com/sun/star/util/XNumberFormatTypes.hpp> #include <editeng/langitem.hxx> diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx index a7eb0c96b811..cf71cc2b1d8c 100644 --- a/sw/source/ui/dbui/mmoutputpage.cxx +++ b/sw/source/ui/dbui/mmoutputpage.cxx @@ -90,7 +90,7 @@ #include <swunohelper.hxx> #include <vos/mutex.hxx> #include <shellio.hxx> -#include <svx/htmlcfg.hxx> +#include <svtools/htmlcfg.hxx> #include <sfx2/event.hxx> #include <swevent.hxx> #include <mmoutputpage.hrc> diff --git a/sw/source/ui/dialog/regionsw.cxx b/sw/source/ui/dialog/regionsw.cxx index 9241091d5c31..9804c25d5d5d 100644 --- a/sw/source/ui/dialog/regionsw.cxx +++ b/sw/source/ui/dialog/regionsw.cxx @@ -54,7 +54,7 @@ #include <editeng/sizeitem.hxx> #endif -#include <svx/htmlcfg.hxx> +#include <svtools/htmlcfg.hxx> #include <section.hxx> #include <docary.hxx> #include <regionsw.hxx> diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 84dca5427164..c1f98c01c60d 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -50,7 +50,7 @@ #include <sfx2/docinsert.hxx> #include <sfx2/filedlghelper.hxx> #include <editeng/sizeitem.hxx> -#include <svx/htmlcfg.hxx> +#include <svtools/htmlcfg.hxx> #include <comphelper/storagehelper.hxx> #include <uitool.hxx> diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx index 4ddadb6370ae..742241ab84b7 100644 --- a/sw/source/ui/fmtui/tmpdlg.cxx +++ b/sw/source/ui/fmtui/tmpdlg.cxx @@ -47,7 +47,7 @@ #include <svx/hdft2.hxx> #include <editeng/flstitem.hxx> #include <svx/htmlmode.hxx> -#include <svx/htmlcfg.hxx> +#include <svtools/htmlcfg.hxx> #include <svl/cjkoptions.hxx> #include <numpara.hxx> #include <fmtclds.hxx> diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx index 94e64c7493b8..9dfde47be3dc 100644 --- a/sw/source/ui/inc/view.hxx +++ b/sw/source/ui/inc/view.hxx @@ -32,6 +32,7 @@ #include <vcl/timer.hxx> #include <vcl/field.hxx> +#include <svtools/htmlcfg.hxx> #include <sfx2/viewfac.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/objsh.hxx> // SfxObjectShellRef <-> SV_DECL_REF(SfxObjectShell) @@ -197,6 +198,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell static SearchAttrItemList* pReplList; + SvxHtmlOptions aHTMLOpt; Timer aTimer; //Fuer verzoegerte ChgLnks waehrend //einer Aktion String aPageStr; //Statusanzeige, aktuelle Seite @@ -306,6 +308,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SW_DLLPRIVATE DECL_LINK( TimeoutHdl, Timer * ); SW_DLLPRIVATE DECL_LINK( UpdatePercentHdl, GraphicFilter* ); + SW_DLLPRIVATE DECL_LINK( HtmlOptionsHdl, void * ); inline long GetXScroll() const; inline long GetYScroll() const; diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx index 97ffb3c2f569..7b589a2f57c1 100644 --- a/sw/source/ui/shells/basesh.cxx +++ b/sw/source/ui/shells/basesh.cxx @@ -38,7 +38,7 @@ #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif -#include <svx/linkmgr.hxx> +#include <sfx2/linkmgr.hxx> #include <svx/htmlmode.hxx> #include <svx/imapdlg.hxx> #include <sfx2/dispatch.hxx> diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/ui/shells/textfld.cxx index 2e65b5a5ce48..d719306c6bf9 100644 --- a/sw/source/ui/shells/textfld.cxx +++ b/sw/source/ui/shells/textfld.cxx @@ -49,7 +49,7 @@ #include <svx/hlnkitem.hxx> #include <svx/svxdlg.hxx> -#include <svx/linkmgr.hxx> +#include <sfx2/linkmgr.hxx> #include <unotools/localedatawrapper.hxx> #include <sfx2/dispatch.hxx> #include <fmtinfmt.hxx> diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx index d9e32df19110..980b581bfa28 100644 --- a/sw/source/ui/shells/textsh.cxx +++ b/sw/source/ui/shells/textsh.cxx @@ -66,7 +66,7 @@ #include <svtools/filter.hxx> #include <svx/htmlmode.hxx> #include <svx/pfiledlg.hxx> -#include <svx/htmlcfg.hxx> +#include <svtools/htmlcfg.hxx> #include <com/sun/star/i18n/TransliterationModules.hdl> #include <sot/clsids.hxx> diff --git a/sw/source/ui/table/swtablerep.cxx b/sw/source/ui/table/swtablerep.cxx index 7dd6a87bcfcb..4548cbf81014 100644 --- a/sw/source/ui/table/swtablerep.cxx +++ b/sw/source/ui/table/swtablerep.cxx @@ -48,7 +48,7 @@ #include <fmtpdsc.hxx> #include <fmtlsplt.hxx> -#include <svx/htmlcfg.hxx> +#include <svtools/htmlcfg.hxx> #include <fmtrowsplt.hxx> #include <svx/htmlmode.hxx> diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 020752b3a4b5..cd0c97fd91bf 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -52,7 +52,7 @@ #include <fmtpdsc.hxx> #include <fmtlsplt.hxx> -#include <svx/htmlcfg.hxx> +#include <svtools/htmlcfg.hxx> #include <fmtrowsplt.hxx> #include <svx/htmlmode.hxx> diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx index ee905f9ec1b6..cc57017c3923 100644 --- a/sw/source/ui/uiview/srcview.cxx +++ b/sw/source/ui/uiview/srcview.cxx @@ -53,7 +53,7 @@ #include <unotools/saveopt.hxx> #include <svtools/transfer.hxx> #include <svx/svxids.hrc> -#include <svx/htmlcfg.hxx> +#include <svtools/htmlcfg.hxx> #include <sfx2/app.hxx> #include <sfx2/objface.hxx> #include <sfx2/viewfrm.hxx> diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx index 1eacc08c750b..52be2d783862 100644 --- a/sw/source/ui/uiview/view0.cxx +++ b/sw/source/ui/uiview/view0.cxx @@ -48,6 +48,8 @@ #include <svl/whiter.hxx> #include <svx/srchdlg.hxx> #include <sfx2/templdlg.hxx> +#include <sfx2/viewfrm.hxx> +#include <sfx2/bindings.hxx> #include <uivwimp.hxx> #include <avmedia/mediaplayer.hxx> #include <swmodule.hxx> @@ -554,3 +556,9 @@ void SwView::ExecViewOptions(SfxRequest &rReq) rReq.Done(); } +IMPL_LINK( SwView, HtmlOptionsHdl, void*, EMPTYARG ) +{ + // Invalidierung, falls blinkender Text erlaubt/verboten wurde + GetViewFrame()->GetBindings().Invalidate(SID_DRAW_TEXT_MARQUEE); + return 0; +} diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx index 11b9a81a116c..e08e88ba8596 100644 --- a/sw/source/ui/uiview/view2.cxx +++ b/sw/source/ui/uiview/view2.cxx @@ -86,7 +86,7 @@ #include <sfx2/topfrm.hxx> #include <svl/whiter.hxx> #include <svl/ptitem.hxx> -#include <svx/linkmgr.hxx> +#include <sfx2/linkmgr.hxx> #ifndef __RSC //autogen #include <tools/errinf.hxx> #endif diff --git a/sw/source/ui/uiview/viewprt.cxx b/sw/source/ui/uiview/viewprt.cxx index c948a92b5baf..d1fd5fbe0c6b 100644 --- a/sw/source/ui/uiview/viewprt.cxx +++ b/sw/source/ui/uiview/viewprt.cxx @@ -62,7 +62,7 @@ #include <svl/stritem.hxx> #include <svl/intitem.hxx> #include <svl/flagitem.hxx> -#include <svx/linkmgr.hxx> +#include <sfx2/linkmgr.hxx> #include <modcfg.hxx> #include <edtwin.hxx> diff --git a/sw/source/ui/uiview/viewstat.cxx b/sw/source/ui/uiview/viewstat.cxx index 56476b272ce6..fef093bc0fcd 100644 --- a/sw/source/ui/uiview/viewstat.cxx +++ b/sw/source/ui/uiview/viewstat.cxx @@ -42,7 +42,7 @@ #include <svl/imageitm.hxx> #include <svl/languageoptions.hxx> #include <editeng/protitem.hxx> -#include <svx/linkmgr.hxx> +#include <sfx2/linkmgr.hxx> #include <editeng/langitem.hxx> #include <editeng/brshitem.hxx> #include <svx/htmlmode.hxx> diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx index b401a249a0ea..2a97fb80bf1a 100644 --- a/sw/source/ui/uno/unotxdoc.cxx +++ b/sw/source/ui/uno/unotxdoc.cxx @@ -88,7 +88,7 @@ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/script/XInvocation.hpp> #include <com/sun/star/reflection/XIdlClassProvider.hpp> -#include <svx/linkmgr.hxx> +#include <sfx2/linkmgr.hxx> #include <svx/unofill.hxx> #include <editeng/unolingu.hxx> #include <sfx2/progress.hxx> @@ -2384,7 +2384,7 @@ void SwXTextDocument::updateLinks( ) throw(RuntimeException) if(!IsValid()) throw RuntimeException(); SwDoc* pDoc = pDocShell->GetDoc(); - SvxLinkManager& rLnkMan = pDoc->GetLinkManager(); + sfx2::LinkManager& rLnkMan = pDoc->GetLinkManager(); if( rLnkMan.GetLinks().Count() ) { UnoActionContext aAction(pDoc); diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx index 20bb340218b2..398b7e29788e 100644 --- a/sw/source/ui/utlui/glbltree.cxx +++ b/sw/source/ui/utlui/glbltree.cxx @@ -40,7 +40,7 @@ #endif #include <svl/stritem.hxx> #include <sfx2/fcontnr.hxx> -#include <svx/linkmgr.hxx> +#include <sfx2/linkmgr.hxx> #include <sfx2/dispatch.hxx> #include <svl/urihelper.hxx> #include <sfx2/docfile.hxx> |