summaryrefslogtreecommitdiff
path: root/sw/inc
diff options
context:
space:
mode:
Diffstat (limited to 'sw/inc')
-rw-r--r--sw/inc/IDocumentLinksAdministration.hxx9
-rw-r--r--sw/inc/PostItMgr.hxx2
-rw-r--r--sw/inc/comcore.hrc3
-rw-r--r--sw/inc/doc.hxx10
-rw-r--r--[-rwxr-xr-x]sw/inc/docsh.hxx0
-rw-r--r--sw/inc/editsh.hxx13
-rw-r--r--sw/inc/ftninfo.hxx2
-rw-r--r--sw/inc/hhcwrp.hxx4
-rw-r--r--sw/inc/htmltbl.hxx2
-rw-r--r--sw/inc/lineinfo.hxx2
-rw-r--r--sw/inc/ndgrf.hxx2
-rw-r--r--sw/inc/numrule.hxx4
-rw-r--r--sw/inc/pagedesc.hxx2
-rw-r--r--sw/inc/pch/precompiled_sw.hxx51
-rw-r--r--sw/inc/poolfmt.hxx2
-rw-r--r--sw/inc/postit.hxx2
-rw-r--r--[-rwxr-xr-x]sw/inc/printdata.hxx0
-rw-r--r--sw/inc/swacorr.hxx2
-rw-r--r--sw/inc/tblafmt.hxx26
-rw-r--r--sw/inc/tox.hxx2
-rw-r--r--sw/inc/txatritr.hxx2
-rw-r--r--[-rwxr-xr-x]sw/inc/unotxdoc.hxx2
-rw-r--r--[-rwxr-xr-x]sw/inc/viewopt.hxx0
-rw-r--r--[-rwxr-xr-x]sw/inc/viewsh.hxx0
24 files changed, 71 insertions, 73 deletions
diff --git a/sw/inc/IDocumentLinksAdministration.hxx b/sw/inc/IDocumentLinksAdministration.hxx
index 147ba81259a7..c3e6855f3c81 100644
--- a/sw/inc/IDocumentLinksAdministration.hxx
+++ b/sw/inc/IDocumentLinksAdministration.hxx
@@ -31,11 +31,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
*/
@@ -52,11 +49,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 fdf703842958..e3d46238a286 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -30,7 +30,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/comcore.hrc b/sw/inc/comcore.hrc
index ae25fc2925cc..981c89ef37db 100644
--- a/sw/inc/comcore.hrc
+++ b/sw/inc/comcore.hrc
@@ -112,8 +112,9 @@
#define STR_AUTOFMTREDL_SET_TMPL_HEADLINE 18
#define STR_AUTOFMTREDL_SET_NUMBULET 19
#define STR_AUTOFMTREDL_DEL_MORELINES 20
+#define STR_AUTOFMTREDL_NON_BREAK_SPACE 21
// !!!!!!!!!!!!!!!!!!!!!!!!!! das Ende immer richtig setzen !!!!!!!!!!!!
-#define STR_AUTOFMTREDL_END 21
+#define STR_AUTOFMTREDL_END 22
#endif
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index c3e0fea470dd..ff3d91add396 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -75,7 +75,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>
@@ -113,7 +113,6 @@ class SvNumberFormatter;
class SvStringsSort;
class SvUShorts;
class SvUShortsSort;
-class SvxLinkManager;
class SvxMacro;
class SvxMacroTableDtor;
class SvxBorderLine;
@@ -241,6 +240,7 @@ namespace container {
namespace sfx2 {
class SvLinkSource;
class IXmlIdRegistry;
+ class LinkManager;
}
//PageDescriptor-Schnittstelle, Array hier wegen inlines.
@@ -357,7 +357,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"
@@ -840,8 +840,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/docsh.hxx b/sw/inc/docsh.hxx
index 2ad41e0539f4..2ad41e0539f4 100755..100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index a55de0863d0f..8cb9cbd5f26a 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -32,7 +32,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>
@@ -55,7 +55,6 @@ class SvUShortsSort;
class SvNumberFormatter;
class SfxPoolItem;
class SfxItemSet;
-class SvxLinkManager;
class SvxAutoCorrect;
class SwField; // fuer Felder
@@ -118,7 +117,9 @@ struct SpellPortion;
typedef std::vector<SpellPortion> SpellPortions;
}
-
+namespace sfx2{
+class LinkManager;
+}
#define GETSELTXT_PARABRK_TO_BLANK 0
#define GETSELTXT_PARABRK_KEEP 1
@@ -846,8 +847,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"
@@ -949,7 +950,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 58c7a3aca2e5..c3b9f7c7dc13 100644
--- a/sw/inc/ftninfo.hxx
+++ b/sw/inc/ftninfo.hxx
@@ -33,7 +33,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 389e7b7bb2cd..7f794757aa26 100644
--- a/sw/inc/hhcwrp.hxx
+++ b/sw/inc/hhcwrp.hxx
@@ -27,7 +27,7 @@
#ifndef _HHCWRP_HXX
#define _HHCWRP_HXX
-#include <svx/hangulhanja.hxx>
+#include <editeng/hangulhanja.hxx>
#include <pam.hxx>
class SwView;
@@ -37,7 +37,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 e7410dfdaac7..941e6bc43eb2 100644
--- a/sw/inc/htmltbl.hxx
+++ b/sw/inc/htmltbl.hxx
@@ -30,7 +30,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 0db5ff1c3f18..079fbeee4cf5 100644
--- a/sw/inc/lineinfo.hxx
+++ b/sw/inc/lineinfo.hxx
@@ -31,7 +31,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 3202b31eea73..3e9498f5db32 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -27,7 +27,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 7be4ac26f690..11920c2d6f61 100644
--- a/sw/inc/numrule.hxx
+++ b/sw/inc/numrule.hxx
@@ -30,8 +30,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 e504e72936ba..6df70d20199d 100644
--- a/sw/inc/pagedesc.hxx
+++ b/sw/inc/pagedesc.hxx
@@ -36,7 +36,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 631777a04219..7d9ebb98d56b 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -511,8 +511,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"
@@ -707,11 +707,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"
@@ -721,18 +721,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"
@@ -741,42 +741,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"
@@ -785,7 +784,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"
@@ -803,7 +802,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 d16377639ad9..7c4be27c76a7 100644
--- a/sw/inc/poolfmt.hxx
+++ b/sw/inc/poolfmt.hxx
@@ -29,7 +29,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 8f1307705e40..6a21f8781d6c 100644
--- a/sw/inc/postit.hxx
+++ b/sw/inc/postit.hxx
@@ -39,7 +39,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/printdata.hxx b/sw/inc/printdata.hxx
index ce5cf81a6f00..ce5cf81a6f00 100755..100644
--- a/sw/inc/printdata.hxx
+++ b/sw/inc/printdata.hxx
diff --git a/sw/inc/swacorr.hxx b/sw/inc/swacorr.hxx
index 7e494ebf9b14..aed3597b2478 100644
--- a/sw/inc/swacorr.hxx
+++ b/sw/inc/swacorr.hxx
@@ -27,7 +27,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 aa1d2a5186c0..fe2dd58b477d 100644
--- a/sw/inc/tblafmt.hxx
+++ b/sw/inc/tblafmt.hxx
@@ -47,23 +47,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 d4115ea2e58a..fea15cfafb82 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -32,7 +32,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 06a037b1400d..da63c0c64b5a 100644
--- a/sw/inc/txatritr.hxx
+++ b/sw/inc/txatritr.hxx
@@ -30,7 +30,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 20448b309d7a..fc5ae0fad8a9 100755..100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -72,7 +72,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
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index f0036e7abf35..f0036e7abf35 100755..100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 93ed55d36872..93ed55d36872 100755..100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
generated by cgit (git 2.34.1) at 2025-05-13 19:16:19 +0000