diff options
author | Mathias Bauer <mba@openoffice.org> | 2010-01-13 22:25:07 +0100 |
---|---|---|
committer | Mathias Bauer <mba@openoffice.org> | 2010-01-13 22:25:07 +0100 |
commit | a3dad64d25dfe6ef0297d6d2fbaf72fcef5017fb (patch) | |
tree | 8fb91fed5b66a6b42b74dc8ead13ac23a0573d44 /sw | |
parent | 040e23bd9198d9b992f7acd180027b703bbc0a91 (diff) |
#i107450#: move more code out of svx
Diffstat (limited to 'sw')
47 files changed, 85 insertions, 100 deletions
diff --git a/sw/inc/IDocumentLinksAdministration.hxx b/sw/inc/IDocumentLinksAdministration.hxx index 7dbb6bc60f5a..268fb156bc90 100644 --- a/sw/inc/IDocumentLinksAdministration.hxx +++ b/sw/inc/IDocumentLinksAdministration.hxx @@ -34,11 +34,8 @@ #include <tools/solar.h> class String; -class SvxLinkManager; - namespace com { namespace sun { namespace star { namespace uno { class Any; } } } } - -namespace sfx2 { class SvLinkSource; } +namespace sfx2 { class SvLinkSource; class LinkManager; } /** Document links administration interface */ @@ -55,11 +52,11 @@ namespace sfx2 { class SvLinkSource; } /** */ - virtual SvxLinkManager& GetLinkManager() = 0; + virtual sfx2::LinkManager& GetLinkManager() = 0; /** */ - virtual const SvxLinkManager& GetLinkManager() const = 0; + virtual const sfx2::LinkManager& GetLinkManager() const = 0; /** FME 2005-02-25 #i42634# Moved common code of SwReader::Read() and SwDocShell::UpdateLinks() to new SwDoc::UpdateLinks(): diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 806c54a34c22..7079c353c498 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -114,7 +114,6 @@ class SvNumberFormatter; class SvStringsSort; class SvUShorts; class SvUShortsSort; -class SvxLinkManager; class SvxMacro; class SvxMacroTableDtor; class SvxBorderLine; @@ -238,6 +237,7 @@ namespace container { namespace sfx2 { class SvLinkSource; class IXmlIdRegistry; + class LinkManager; } //PageDescriptor-Schnittstelle, Array hier wegen inlines. @@ -354,7 +354,7 @@ class SW_DLLPUBLIC SwDoc : SfxObjectShellRef* pDocShRef; // fuers Kopieren von OLE-Nodes (wenn keine // DocShell gesetzt ist, muss dieser // Ref-Pointer gesetzt sein!!!!) - SvxLinkManager *pLinkMgr; // Liste von Verknuepften (Grafiken/DDE/OLE) + sfx2::LinkManager *pLinkMgr; // Liste von Verknuepften (Grafiken/DDE/OLE) SwAutoCorrExceptWord *pACEWord; // fuer die automatische Uebernahme von // autokorrigierten Woertern, die "zurueck" @@ -837,8 +837,8 @@ public: */ virtual bool IsVisibleLinks() const; virtual void SetVisibleLinks(bool bFlag); - virtual SvxLinkManager& GetLinkManager(); - virtual const SvxLinkManager& GetLinkManager() const; + virtual sfx2::LinkManager& GetLinkManager(); + virtual const sfx2::LinkManager& GetLinkManager() const; virtual void UpdateLinks(BOOL bUI); virtual bool GetData(const String& rItem, const String& rMimeType, ::com::sun::star::uno::Any& rValue) const; virtual bool SetData(const String& rItem, const String& rMimeType, const ::com::sun::star::uno::Any& rValue); diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index 1db3a0ad8344..be728fb6cbb7 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -58,7 +58,6 @@ class SvUShortsSort; class SvNumberFormatter; class SfxPoolItem; class SfxItemSet; -class SvxLinkManager; class SvxAutoCorrect; class SwField; // fuer Felder @@ -121,7 +120,9 @@ struct SpellPortion; typedef std::vector<SpellPortion> SpellPortions; } - +namespace sfx2{ +class LinkManager; +} #define GETSELTXT_PARABRK_TO_BLANK 0 #define GETSELTXT_PARABRK_KEEP 1 @@ -849,8 +850,8 @@ public: // Optimierung UI void SetNewDoc(BOOL bNew = TRUE); - SvxLinkManager& GetLinkManager(); - inline const SvxLinkManager& GetLinkManager() const; + sfx2::LinkManager& GetLinkManager(); + inline const sfx2::LinkManager& GetLinkManager() const; // linken Rand ueber Objectleiste einstellen (aenhlich dem Stufen von // Numerierungen), optional kann man "um" den Offset stufen oder "auf" @@ -952,7 +953,7 @@ inline void SwEditShell::ApplyViewOptions( const SwViewOption &rOpt ) SwEditShell::EndAction(); } -inline const SvxLinkManager& SwEditShell::GetLinkManager() const +inline const sfx2::LinkManager& SwEditShell::GetLinkManager() const { return ((SwEditShell*)this)->GetLinkManager(); } /* diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx index 0591bc7dd0a1..046390d77c90 100644 --- a/sw/inc/pch/precompiled_sw.hxx +++ b/sw/inc/pch/precompiled_sw.hxx @@ -714,7 +714,7 @@ #include "editeng/UnoForbiddenCharsTable.hxx" #include "editeng/acorrcfg.hxx" #include "svx/anchorid.hxx" -#include "svx/asiancfg.hxx" +#include "svl/asiancfg.hxx" #include "svx/checklbx.hxx" #include "svx/clipboardctl.hxx" #include "svx/clipfmtitem.hxx" @@ -753,7 +753,7 @@ #include "svx/grafctrl.hxx" #include "editeng/hangulhanja.hxx" #include "svx/hdft2.hxx" -#include "svx/htmlcfg.hxx" +#include "svtools/htmlcfg.hxx" #include "svx/htmlmode.hxx" #include "svx/hyperdlg.hxx" #include "svx/hyprlink.hxx" @@ -763,7 +763,7 @@ #include "svx/layctrl.hxx" #include "svx/lboxctrl.hxx" #include "svx/linectrl.hxx" -#include "svx/linkmgr.hxx" +#include "sfx2/linkmgr.hxx" #include "filter/msfilter/mscodec.hxx" #include "filter/msfilter/msdffimp.hxx" #include "filter/msfilter/msfiltertracer.hxx" diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx index 3cdfa7ec03e4..5ccce5188046 100644 --- a/sw/source/core/crsr/bookmrk.cxx +++ b/sw/source/core/crsr/bookmrk.cxx @@ -39,7 +39,7 @@ #include <ndtxt.hxx> #include <pam.hxx> #include <swserv.hxx> -#include <svx/linkmgr.hxx> +#include <sfx2/linkmgr.hxx> #include <swtypes.hxx> #include <undobj.hxx> #include <unoobj.hxx> diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx index 2cf011000142..8eac59dfb792 100644 --- a/sw/source/core/doc/doc.cxx +++ b/sw/source/core/doc/doc.cxx @@ -52,7 +52,7 @@ #include <editeng/keepitem.hxx> #include <editeng/cscoitem.hxx> #include <editeng/brkitem.hxx> -#include <svx/linkmgr.hxx> +#include <sfx2/linkmgr.hxx> #include <editeng/forbiddencharacterstable.hxx> #include <svx/svdmodel.hxx> #include <unotools/charclass.hxx> @@ -1806,12 +1806,12 @@ void SwDoc::SetVisibleLinks(bool bFlag) mbVisibleLinks = bFlag; } -SvxLinkManager& SwDoc::GetLinkManager() +sfx2::LinkManager& SwDoc::GetLinkManager() { return *pLinkMgr; } -const SvxLinkManager& SwDoc::GetLinkManager() const +const sfx2::LinkManager& SwDoc::GetLinkManager() const { return *pLinkMgr; } @@ -1830,7 +1830,7 @@ bool SwDoc::LinksUpdated() const bool SwDoc::EmbedAllLinks() { BOOL bRet = FALSE; - SvxLinkManager& rLnkMgr = GetLinkManager(); + sfx2::LinkManager& rLnkMgr = GetLinkManager(); const ::sfx2::SvBaseLinks& rLnks = rLnkMgr.GetLinks(); if( rLnks.Count() ) { diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx index e1b4f3ee4322..2088c4f1b081 100644 --- a/sw/source/core/doc/docbm.cxx +++ b/sw/source/core/doc/docbm.cxx @@ -57,7 +57,7 @@ #include <rtl/ustring.hxx> #include <sal/types.h> #include <sortedobjs.hxx> -#include <svx/linkmgr.hxx> +#include <sfx2/linkmgr.hxx> #include <swserv.hxx> #include <swundo.hxx> #include <tools/pstm.hxx> diff --git a/sw/source/core/doc/docdde.cxx b/sw/source/core/doc/docdde.cxx index 468ab59146de..1e8275ef3694 100644 --- a/sw/source/core/doc/docdde.cxx +++ b/sw/source/core/doc/docdde.cxx @@ -42,7 +42,7 @@ #define _SVSTDARR_STRINGS #include <svl/svstdarr.hxx> -#include <svx/linkmgr.hxx> // LinkManager +#include <sfx2/linkmgr.hxx> // LinkManager #include <unotools/charclass.hxx> #include <fmtcntnt.hxx> #include <doc.hxx> diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx index ed60d9510546..449b02f4af61 100644 --- a/sw/source/core/doc/docnew.cxx +++ b/sw/source/core/doc/docnew.cxx @@ -50,7 +50,7 @@ #include <svl/macitem.hxx> #include <svx/svxids.hrc> #include <svx/svdogrp.hxx> -#include <svx/linkmgr.hxx> +#include <sfx2/linkmgr.hxx> #include <editeng/forbiddencharacterstable.hxx> #include <svl/zforlist.hxx> #include <unotools/compatibility.hxx> @@ -240,7 +240,7 @@ SwDoc::SwDoc() : pDocStat( new SwDocStat ), pDocShell( 0 ), pDocShRef( 0 ), - pLinkMgr( new SvxLinkManager( 0 ) ), + pLinkMgr( new sfx2::LinkManager( 0 ) ), pACEWord( 0 ), pURLStateChgd( 0 ), pNumberFormatter( 0 ), @@ -1139,7 +1139,7 @@ SwDoc* SwDoc::CreateCopy() const pDocStat( new SwDocStat ), pDocShell( 0 ), pDocShRef( 0 ), - pLinkMgr( new SvxLinkManager( 0 ) ), + pLinkMgr( new sfx2::LinkManager( 0 ) ), pACEWord( 0 ), pURLStateChgd( 0 ), pNumberFormatter( 0 ), diff --git a/sw/source/core/doc/swserv.cxx b/sw/source/core/doc/swserv.cxx index 8e0469fe5d87..eb272238cc58 100644 --- a/sw/source/core/doc/swserv.cxx +++ b/sw/source/core/doc/swserv.cxx @@ -33,7 +33,7 @@ #include <sot/storage.hxx> -#include <svx/linkmgr.hxx> +#include <sfx2/linkmgr.hxx> #include <com/sun/star/uno/Sequence.h> #include <doc.hxx> #include <swtypes.hxx> diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx index 1ab54e18dbec..a1a6b203f66c 100644 --- a/sw/source/core/docnode/ndsect.cxx +++ b/sw/source/core/docnode/ndsect.cxx @@ -33,7 +33,7 @@ #include <hintids.hxx> -#include <svx/linkmgr.hxx> +#include <sfx2/linkmgr.hxx> #include <svl/itemiter.hxx> #include <tools/resid.hxx> #include <fmtcntnt.hxx> diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx index 62e3c893819a..1f954ddd16e5 100644 --- a/sw/source/core/docnode/section.cxx +++ b/sw/source/core/docnode/section.cxx @@ -39,7 +39,7 @@ #include <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> #include <editeng/protitem.hxx> -#include <svx/linkmgr.hxx> +#include <sfx2/linkmgr.hxx> #include <tools/urlobj.hxx> #include <sfx2/sfxsids.hrc> @@ -1276,7 +1276,7 @@ void SwIntrnlSectRefLink::DataChanged( const String& rMimeType, ULONG nDataFormat = SotExchange::GetFormatIdFromMimeType( rMimeType ); if( !pSectNd || !pDoc || pDoc->IsInDtor() || ChkNoDataFlag() || - SvxLinkManager::RegisterStatusInfoId() == nDataFormat ) + sfx2::LinkManager::RegisterStatusInfoId() == nDataFormat ) { // sollten wir schon wieder im Undo stehen? return ; diff --git a/sw/source/core/docnode/swbaslnk.cxx b/sw/source/core/docnode/swbaslnk.cxx index e420e3f2f161..14e8884a0bf2 100644 --- a/sw/source/core/docnode/swbaslnk.cxx +++ b/sw/source/core/docnode/swbaslnk.cxx @@ -49,7 +49,7 @@ #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> // fuer die EventIds #endif -#include <svx/linkmgr.hxx> +#include <sfx2/linkmgr.hxx> #include <svtools/soerr.hxx> #include <fmtfsize.hxx> #include <fmtanchr.hxx> @@ -121,7 +121,7 @@ void SwBaseLink::DataChanged( const String& rMimeType, ULONG nFmt = SotExchange::GetFormatIdFromMimeType( rMimeType ); if( pCntntNode->IsNoTxtNode() && - nFmt == SvxLinkManager::RegisterStatusInfoId() ) + nFmt == sfx2::LinkManager::RegisterStatusInfoId() ) { // nur eine Statusaenderung - Events bedienen ? ::rtl::OUString sState; @@ -130,9 +130,9 @@ void SwBaseLink::DataChanged( const String& rMimeType, USHORT nEvent = 0; switch( sState.toInt32() ) { - case STATE_LOAD_OK: nEvent = SVX_EVENT_IMAGE_LOAD; break; - case STATE_LOAD_ERROR: nEvent = SVX_EVENT_IMAGE_ERROR; break; - case STATE_LOAD_ABORT: nEvent = SVX_EVENT_IMAGE_ABORT; break; + case sfx2::LinkManager::STATE_LOAD_OK: nEvent = SVX_EVENT_IMAGE_LOAD; break; + case sfx2::LinkManager::STATE_LOAD_ERROR: nEvent = SVX_EVENT_IMAGE_ERROR; break; + case sfx2::LinkManager::STATE_LOAD_ABORT: nEvent = SVX_EVENT_IMAGE_ABORT; break; } SwFrmFmt* pFmt; @@ -163,7 +163,7 @@ void SwBaseLink::DataChanged( const String& rMimeType, ((SwGrfNode*)pCntntNode)->SetGrafikArrived( bGraphicArrived ); Graphic aGrf; - if( SvxLinkManager::GetGraphicFromAny( rMimeType, rValue, aGrf ) && + if( sfx2::LinkManager::GetGraphicFromAny( rMimeType, rValue, aGrf ) && ( GRAPHIC_DEFAULT != aGrf.GetType() || GRAPHIC_DEFAULT != rGrfObj.GetType() ) ) { diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx index 3b70c1aa4bd6..6a025b02a548 100644 --- a/sw/source/core/edit/editsh.cxx +++ b/sw/source/core/edit/editsh.cxx @@ -696,7 +696,7 @@ String SwEditShell::Calculate() } -SvxLinkManager& SwEditShell::GetLinkManager() +sfx2::LinkManager& SwEditShell::GetLinkManager() { return pDoc->GetLinkManager(); } diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx index 9f52b96d61cc..02999ca36e5c 100644 --- a/sw/source/core/fields/ddefld.cxx +++ b/sw/source/core/fields/ddefld.cxx @@ -32,7 +32,7 @@ #include "precompiled_sw.hxx" -#include <svx/linkmgr.hxx> +#include <sfx2/linkmgr.hxx> #include <doc.hxx> #include <editsh.hxx> #include <errhdl.hxx> diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index fba51c9d3374..33f44edd2743 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -40,7 +40,7 @@ #include <svtools/imap.hxx> #include <svtools/filter.hxx> #include <sot/storage.hxx> -#include <svx/linkmgr.hxx> +#include <sfx2/linkmgr.hxx> #include <editeng/boxitem.hxx> #include <sot/formats.hxx> #include <fmtfsize.hxx> @@ -678,7 +678,7 @@ void SwGrfNode::SetTwipSize( const Size& rSz ) void SwGrfNode::SetTransferPriority( USHORT nPrio ) { if( refLink.Is() && refLink->GetObj() ) - SvxLinkManager::SetTransferPriority( *refLink, nPrio ); + sfx2::LinkManager::SetTransferPriority( *refLink, nPrio ); } @@ -940,7 +940,7 @@ SwCntntNode* SwGrfNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const aTmpGrf = aGrfObj.GetGraphic(); } - const sfx2::SvLinkManager& rMgr = getIDocumentLinksAdministration()->GetLinkManager(); + const sfx2::LinkManager& rMgr = getIDocumentLinksAdministration()->GetLinkManager(); String sFile, sFilter; if( IsLinkedFile() ) rMgr.GetDisplayNames( refLink, 0, &sFile, 0, &sFilter ); @@ -1040,7 +1040,7 @@ void DelAllGrfCacheEntries( SwDoc* pDoc ) if( pDoc ) { // alle Graphic-Links mit dem Namen aus dem Cache loeschen - const SvxLinkManager& rLnkMgr = pDoc->GetLinkManager(); + const sfx2::LinkManager& rLnkMgr = pDoc->GetLinkManager(); const ::sfx2::SvBaseLinks& rLnks = rLnkMgr.GetLinks(); SwGrfNode* pGrfNd; String sFileNm; diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx index 50abb4e9c7c7..e7b3b0f75caf 100644 --- a/sw/source/core/ole/ndole.cxx +++ b/sw/source/core/ole/ndole.cxx @@ -48,7 +48,7 @@ #include <tools/urlobj.hxx> #include <sfx2/docfile.hxx> #include <sfx2/app.hxx> -#include <svx/linkmgr.hxx> +#include <sfx2/linkmgr.hxx> #include <unotools/configitem.hxx> #ifndef _OUTDEV_HXX //autogen #include <vcl/outdev.hxx> diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index d82b0b655ea2..3fc1ea550b12 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -43,7 +43,7 @@ #include <editeng/shaditem.hxx> #include <editeng/adjitem.hxx> #include <editeng/colritem.hxx> -#include <svx/linkmgr.hxx> +#include <sfx2/linkmgr.hxx> #include <editeng/boxitem.hxx> diff --git a/sw/source/core/undo/unsect.cxx b/sw/source/core/undo/unsect.cxx index e688cb7dea68..0f88d376a2c2 100644 --- a/sw/source/core/undo/unsect.cxx +++ b/sw/source/core/undo/unsect.cxx @@ -32,7 +32,7 @@ #include "precompiled_sw.hxx" -#include <svx/linkmgr.hxx> +#include <sfx2/linkmgr.hxx> #include <fmtcntnt.hxx> #include <doc.hxx> #include <docary.hxx> diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index 0f73c080b78e..c0e50ed709aa 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -43,7 +43,7 @@ #include <unoprnms.hxx> #include <unoobj.hxx> #include <unocoll.hxx> -#include <svx/linkmgr.hxx> +#include <sfx2/linkmgr.hxx> #include <docstat.hxx> #include <editsh.hxx> #include <viewsh.hxx> diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx index 718022d7eeeb..cc05b0432507 100644 --- a/sw/source/filter/html/htmlfly.cxx +++ b/sw/source/filter/html/htmlfly.cxx @@ -44,7 +44,7 @@ #include <svtools/htmlout.hxx> #include <svtools/imap.hxx> #include <svtools/imapobj.hxx> -#include <svx/htmlcfg.hxx> +#include <svtools/htmlcfg.hxx> #include <svx/xoutbmp.hxx> #include <editeng/boxitem.hxx> #include <editeng/lrspitem.hxx> diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 251ea31722e9..c97852235906 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -55,8 +55,8 @@ #include <sfx2/fcontnr.hxx> #include <sfx2/docfile.hxx> -#include <svx/htmlcfg.hxx> -#include <svx/linkmgr.hxx> +#include <svtools/htmlcfg.hxx> +#include <sfx2/linkmgr.hxx> #include <editeng/kernitem.hxx> #include <editeng/boxitem.hxx> #include <editeng/fhgtitem.hxx> diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index 8f10c8ee4803..470a0bb59d1c 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -39,7 +39,7 @@ #include <vcl/wrkwin.hxx> #include <sfx2/linkmgr.hxx> -#include <svx/htmlcfg.hxx> +#include <svtools/htmlcfg.hxx> #include <vcl/svapp.hxx> #include <i18npool/mslangid.hxx> #include <sfx2/frmhtmlw.hxx> 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> |