diff options
Diffstat (limited to 'sw/inc')
-rw-r--r-- | sw/inc/IDocumentLinksAdministration.hxx | 9 | ||||
-rw-r--r-- | sw/inc/PostItMgr.hxx | 2 | ||||
-rw-r--r-- | sw/inc/doc.hxx | 10 | ||||
-rw-r--r-- | sw/inc/editsh.hxx | 13 | ||||
-rw-r--r-- | sw/inc/ftninfo.hxx | 2 | ||||
-rw-r--r-- | sw/inc/hhcwrp.hxx | 4 | ||||
-rw-r--r-- | sw/inc/htmltbl.hxx | 2 | ||||
-rw-r--r-- | sw/inc/lineinfo.hxx | 2 | ||||
-rw-r--r-- | sw/inc/ndgrf.hxx | 2 | ||||
-rw-r--r-- | sw/inc/numrule.hxx | 4 | ||||
-rw-r--r-- | sw/inc/pagedesc.hxx | 2 | ||||
-rw-r--r-- | sw/inc/pch/precompiled_sw.hxx | 51 | ||||
-rw-r--r-- | sw/inc/poolfmt.hxx | 2 | ||||
-rw-r--r-- | sw/inc/postit.hxx | 2 | ||||
-rw-r--r-- | sw/inc/swacorr.hxx | 2 | ||||
-rw-r--r-- | sw/inc/tblafmt.hxx | 26 | ||||
-rw-r--r-- | sw/inc/tox.hxx | 2 | ||||
-rw-r--r-- | sw/inc/txatritr.hxx | 2 | ||||
-rwxr-xr-x | sw/inc/unotxdoc.hxx | 2 |
19 files changed, 69 insertions, 72 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/PostItMgr.hxx b/sw/inc/PostItMgr.hxx index 36e9bdd08639..f7ebebcf8212 100644 --- a/sw/inc/PostItMgr.hxx +++ b/sw/inc/PostItMgr.hxx @@ -33,7 +33,7 @@ #include <list> #include <vector> -#include <svx/outlobj.hxx> +#include <editeng/outlobj.hxx> #include <tools/string.hxx> #include <tools/link.hxx> #include <tools/debug.hxx> diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index ce6a665c5acd..d89af767f10b 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -78,7 +78,7 @@ class SwList; #include <vos/ref.hxx> #include <svx/svdtypes.hxx> #include <svl/style.hxx> -#include <svx/numitem.hxx> +#include <editeng/numitem.hxx> #include "comphelper/implementationreference.hxx" #include <com/sun/star/chart2/data/XDataProvider.hpp> #include <com/sun/star/linguistic2/XProofreadingIterator.hpp> @@ -116,7 +116,6 @@ class SvNumberFormatter; class SvStringsSort; class SvUShorts; class SvUShortsSort; -class SvxLinkManager; class SvxMacro; class SvxMacroTableDtor; class SvxBorderLine; @@ -245,6 +244,7 @@ namespace container { namespace sfx2 { class SvLinkSource; class IXmlIdRegistry; + class LinkManager; } //PageDescriptor-Schnittstelle, Array hier wegen inlines. @@ -361,7 +361,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" @@ -844,8 +844,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 d802eb910cff..be728fb6cbb7 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -35,7 +35,7 @@ #include <tools/string.hxx> #include <svl/svarray.hxx> #include <vcl/font.hxx> -#include <svx/swafopt.hxx> +#include <editeng/swafopt.hxx> #include "swdllapi.h" #include <crsrsh.hxx> // fuer Basisklasse #include <itabenum.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/ftninfo.hxx b/sw/inc/ftninfo.hxx index 6e84f3ead81b..6de716c725d2 100644 --- a/sw/inc/ftninfo.hxx +++ b/sw/inc/ftninfo.hxx @@ -36,7 +36,7 @@ //#include <numrule.hxx> //#endif #include <calbck.hxx> -#include <svx/numitem.hxx> +#include <editeng/numitem.hxx> class SwTxtFmtColl; class SwPageDesc; diff --git a/sw/inc/hhcwrp.hxx b/sw/inc/hhcwrp.hxx index f146513336ff..7b7fb38da52b 100644 --- a/sw/inc/hhcwrp.hxx +++ b/sw/inc/hhcwrp.hxx @@ -30,7 +30,7 @@ #ifndef _HHCWRP_HXX #define _HHCWRP_HXX -#include <svx/hangulhanja.hxx> +#include <editeng/hangulhanja.hxx> #include <pam.hxx> class SwView; @@ -40,7 +40,7 @@ struct SwConversionArgs; ////////////////////////////////////////////////////////////////////// -class SwHHCWrapper : public svx::HangulHanjaConversion +class SwHHCWrapper : public editeng::HangulHanjaConversion { SwView * pView; Window* pWin; diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx index d6fe0765bad0..bcfbca9aa008 100644 --- a/sw/inc/htmltbl.hxx +++ b/sw/inc/htmltbl.hxx @@ -33,7 +33,7 @@ #include <vcl/timer.hxx> -#include <svx/svxenum.hxx> +#include <editeng/svxenum.hxx> #include "swtypes.hxx" #include "node.hxx" // Fuer SwStartNode diff --git a/sw/inc/lineinfo.hxx b/sw/inc/lineinfo.hxx index 5da9c9a1a489..392c4602de19 100644 --- a/sw/inc/lineinfo.hxx +++ b/sw/inc/lineinfo.hxx @@ -34,7 +34,7 @@ //#ifndef _NUMRULE_HXX //#include <numrule.hxx> //#endif -#include <svx/numitem.hxx> +#include <editeng/numitem.hxx> #include "swdllapi.h" class SwCharFmt; diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx index 45ecea30a9c0..333704ec00f2 100644 --- a/sw/inc/ndgrf.hxx +++ b/sw/inc/ndgrf.hxx @@ -30,7 +30,7 @@ #ifndef _NDGRF_HXX #define _NDGRF_HXX #include <sfx2/lnkbase.hxx> -#include <goodies/grfmgr.hxx> +#include <svtools/grfmgr.hxx> #include <ndnotxt.hxx> // --> OD, MAV 2005-08-17 #i53025# #include <com/sun/star/embed/XStorage.hpp> diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx index dfaa5101c01c..bae6cc6ba105 100644 --- a/sw/inc/numrule.hxx +++ b/sw/inc/numrule.hxx @@ -33,8 +33,8 @@ #include <tools/link.hxx> #include <tools/gen.hxx> #include <tools/string.hxx> -#include <svx/svxenum.hxx> -#include <svx/numitem.hxx> +#include <editeng/svxenum.hxx> +#include <editeng/numitem.hxx> #include "swdllapi.h" #include <swtypes.hxx> #include <calbck.hxx> diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx index 40d8874f912d..3997498e2329 100644 --- a/sw/inc/pagedesc.hxx +++ b/sw/inc/pagedesc.hxx @@ -39,7 +39,7 @@ //#ifndef _NUMRULE_HXX //#include <numrule.hxx> //#endif -#include <svx/numitem.hxx> +#include <editeng/numitem.hxx> class SfxPoolItem; class SwTxtFmtColl; diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx index e8aadd472aa6..046390d77c90 100644 --- a/sw/inc/pch/precompiled_sw.hxx +++ b/sw/inc/pch/precompiled_sw.hxx @@ -514,8 +514,8 @@ #include "framework/interaction.hxx" -#include "goodies/grfmgr.hxx" -#include "goodies/mailenum.hxx" +#include "svtools/grfmgr.hxx" +#include "svl/mailenum.hxx" #include "i18npool/lang.h" #include "i18npool/mslangid.hxx" @@ -710,11 +710,11 @@ #include "svx/IAccessibleParent.hxx" #include "svx/IAccessibleViewForwarder.hxx" #include "svx/SpellDialogChildWindow.hxx" -#include "svx/SpellPortions.hxx" -#include "svx/UnoForbiddenCharsTable.hxx" -#include "svx/acorrcfg.hxx" +#include "editeng/SpellPortions.hxx" +#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" @@ -724,18 +724,18 @@ #include "svx/dialmgr.hxx" #include "svx/dialogs.hrc" #include "svx/dlgutil.hxx" -#include "svx/editdata.hxx" -#include "svx/editeng.hxx" -#include "svx/editobj.hxx" -#include "svx/editstat.hxx" -#include "svx/editview.hxx" -#include "svx/eeitem.hxx" +#include "editeng/editdata.hxx" +#include "editeng/editeng.hxx" +#include "editeng/editobj.hxx" +#include "editeng/editstat.hxx" +#include "editeng/editview.hxx" +#include "editeng/eeitem.hxx" #include "filter/msfilter/escherex.hxx" #include "svx/extrusionbar.hxx" #include "svx/extrusioncontrols.hxx" #include "svx/fillctrl.hxx" #include "svx/flagsdef.hxx" -#include "svx/flstitem.hxx" +#include "editeng/flstitem.hxx" #include "svx/fmdmod.hxx" #include "svx/fmglob.hxx" #include "svx/fmobjfac.hxx" @@ -744,42 +744,41 @@ #include "svx/fontwork.hxx" #include "svx/fontworkbar.hxx" #include "svx/fontworkgallery.hxx" -#include "svx/forbiddencharacterstable.hxx" +#include "editeng/forbiddencharacterstable.hxx" #include "svx/formatpaintbrushctrl.hxx" -#include "svx/frmdir.hxx" +#include "editeng/frmdir.hxx" #include "svx/galbrws.hxx" #include "svx/gallery.hxx" #include "svx/globlmn.hrc" #include "svx/grafctrl.hxx" -#include "svx/hangulhanja.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" #include "svx/imapdlg.hxx" -#include "svx/impgrf.hxx" -#include "svx/itemtype.hxx" +#include "editeng/itemtype.hxx" #include "svx/langbox.hxx" #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" #include "filter/msfilter/msocximex.hxx" #include "filter/msfilter/msoleexp.hxx" -#include "svx/numitem.hxx" +#include "editeng/numitem.hxx" #include "svx/numvset.hxx" #include "svx/objfac3d.hxx" #include "svx/ofaitem.hxx" #include "svx/optgenrl.hxx" #include "svx/optgrid.hxx" -#include "svx/outliner.hxx" -#include "svx/outlobj.hxx" +#include "editeng/outliner.hxx" +#include "editeng/outlobj.hxx" #include "svx/pagectrl.hxx" -#include "svx/paperinf.hxx" +#include "editeng/paperinf.hxx" #include "svx/paraprev.hxx" #include "svx/pfiledlg.hxx" #include "svx/prtqry.hxx" @@ -788,7 +787,7 @@ #include "svx/rubydialog.hxx" #include "svx/ruler.hxx" #include "svx/rulritem.hxx" -#include "svx/scripttypeitem.hxx" +#include "editeng/scripttypeitem.hxx" #include "svx/sdgcoitm.hxx" #include "svx/sdggaitm.hxx" #include "svx/sdginitm.hxx" @@ -806,7 +805,7 @@ #include "svx/sdtaitm.hxx" #include "svx/sdtakitm.hxx" #include "svx/simptabl.hxx" -#include "svx/splwrap.hxx" +#include "editeng/splwrap.hxx" #include "svx/srchdlg.hxx" #include "svx/stddlg.hxx" #include "svx/strarray.hxx" diff --git a/sw/inc/poolfmt.hxx b/sw/inc/poolfmt.hxx index 0526732fd00c..b01f3ac87c04 100644 --- a/sw/inc/poolfmt.hxx +++ b/sw/inc/poolfmt.hxx @@ -32,7 +32,7 @@ #include <limits.h> #include <tools/solar.h> -#include <svx/frmdir.hxx> +#include <editeng/frmdir.hxx> // POOLCOLL-IDs: // +----+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ diff --git a/sw/inc/postit.hxx b/sw/inc/postit.hxx index 5ddf9c1458fb..b63091b013bc 100644 --- a/sw/inc/postit.hxx +++ b/sw/inc/postit.hxx @@ -43,7 +43,7 @@ #include <vcl/lineinfo.hxx> #include <basegfx/polygon/b2dpolygon.hxx> -#include <svx/editstat.hxx> +#include <editeng/editstat.hxx> class SwPostItMgr; class SwPostItField; diff --git a/sw/inc/swacorr.hxx b/sw/inc/swacorr.hxx index b4a492436bd3..2921cccfb778 100644 --- a/sw/inc/swacorr.hxx +++ b/sw/inc/swacorr.hxx @@ -30,7 +30,7 @@ #ifndef _SWACORR_HXX #define _SWACORR_HXX -#include <svx/svxacorr.hxx> +#include <editeng/svxacorr.hxx> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/embed/XStorage.hpp> diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx index 3ca914531882..fa9d141eb8c5 100644 --- a/sw/inc/tblafmt.hxx +++ b/sw/inc/tblafmt.hxx @@ -50,23 +50,23 @@ JP 20.07.95: #include <svl/svarray.hxx> #include "hintids.hxx" //_immmer_ vor den solar-items! #include <svx/algitem.hxx> -#include <svx/fontitem.hxx> -#include <svx/fhgtitem.hxx> -#include <svx/wghtitem.hxx> -#include <svx/postitem.hxx> -#include <svx/udlnitem.hxx> -#include <svx/crsditem.hxx> +#include <editeng/fontitem.hxx> +#include <editeng/fhgtitem.hxx> +#include <editeng/wghtitem.hxx> +#include <editeng/postitem.hxx> +#include <editeng/udlnitem.hxx> +#include <editeng/crsditem.hxx> #ifndef _SVX_CNTRTITEM_HXX //autogen -#include <svx/cntritem.hxx> +#include <editeng/cntritem.hxx> #endif -#include <svx/shdditem.hxx> -#include <svx/colritem.hxx> -#include <svx/boxitem.hxx> -#include <svx/brshitem.hxx> -#include <svx/adjitem.hxx> +#include <editeng/shdditem.hxx> +#include <editeng/colritem.hxx> +#include <editeng/boxitem.hxx> +#include <editeng/brshitem.hxx> +#include <editeng/adjitem.hxx> #include <svx/rotmodit.hxx> #include <svl/intitem.hxx> -#include <svx/bolnitem.hxx> +#include <editeng/bolnitem.hxx> #include "swdllapi.h" struct SwAfVersions; diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx index 65a4879485b7..2f03c7f48d6e 100644 --- a/sw/inc/tox.hxx +++ b/sw/inc/tox.hxx @@ -33,7 +33,7 @@ #include <i18npool/lang.h> #include <tools/string.hxx> -#include <svx/svxenum.hxx> +#include <editeng/svxenum.hxx> #include <svl/svarray.hxx> #include <svl/poolitem.hxx> #include "swdllapi.h" diff --git a/sw/inc/txatritr.hxx b/sw/inc/txatritr.hxx index a087ebcb087d..cf56b0b3d709 100644 --- a/sw/inc/txatritr.hxx +++ b/sw/inc/txatritr.hxx @@ -33,7 +33,7 @@ #include <tools/solar.h> #include <sal/types.h> #include <svl/svarray.hxx> -#include <svx/langitem.hxx> +#include <editeng/langitem.hxx> #include <hintids.hxx> class String; diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx index 19f0c625e02f..cc3200c96143 100755 --- a/sw/inc/unotxdoc.hxx +++ b/sw/inc/unotxdoc.hxx @@ -75,7 +75,7 @@ #include <com/sun/star/util/XCloneable.hpp> #include <svl/itemprop.hxx> #include <svx/fmdmod.hxx> -#include <svx/UnoForbiddenCharsTable.hxx> +#include <editeng/UnoForbiddenCharsTable.hxx> #include <cppuhelper/weak.hxx> #include <cppuhelper/implbase2.hxx> // helper for implementations #include <cppuhelper/implbase4.hxx> // helper for implementations |