summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dbaccess/inc/pch/precompiled_dbaccess.hxx2
-rw-r--r--dbaccess/source/ui/inc/FieldDescriptions.hxx2
-rw-r--r--dbaccess/source/ui/inc/HtmlReader.hxx2
-rw-r--r--dbaccess/source/ui/inc/UITools.hxx2
-rw-r--r--reportdesign/source/core/api/ReportComponent.cxx2
-rw-r--r--reportdesign/source/core/api/ReportDefinition.cxx2
-rw-r--r--reportdesign/source/ui/dlg/dlgpage.cxx2
-rw-r--r--reportdesign/source/ui/inspection/GeometryHandler.cxx2
-rw-r--r--reportdesign/source/ui/misc/UITools.cxx50
-rw-r--r--reportdesign/source/ui/misc/toolboxcontroller.cxx6
-rw-r--r--reportdesign/source/ui/report/ReportController.cxx12
-rw-r--r--reportdesign/source/ui/report/ReportSection.cxx4
-rw-r--r--reportdesign/source/ui/report/dlgedfunc.cxx6
-rw-r--r--reportdesign/util/makefile.mk3
14 files changed, 50 insertions, 47 deletions
diff --git a/dbaccess/inc/pch/precompiled_dbaccess.hxx b/dbaccess/inc/pch/precompiled_dbaccess.hxx
index 28e749191284..004bb0b3adf9 100644
--- a/dbaccess/inc/pch/precompiled_dbaccess.hxx
+++ b/dbaccess/inc/pch/precompiled_dbaccess.hxx
@@ -476,7 +476,7 @@
#include "svx/dbexch.hrc"
#include "svx/dialogs.hrc"
#include "svx/globlmn.hrc"
-#include "svx/svxenum.hxx"
+#include "editeng/svxenum.hxx"
#include "svx/svxids.hrc"
diff --git a/dbaccess/source/ui/inc/FieldDescriptions.hxx b/dbaccess/source/ui/inc/FieldDescriptions.hxx
index ee473b032853..6ef99652908d 100644
--- a/dbaccess/source/ui/inc/FieldDescriptions.hxx
+++ b/dbaccess/source/ui/inc/FieldDescriptions.hxx
@@ -34,7 +34,7 @@
#include "QEnumTypes.hxx"
#endif
#ifndef _SVX_SVXENUM_HXX
-#include <svx/svxenum.hxx>
+#include <editeng/svxenum.hxx>
#endif
#ifndef DBAUI_TYPEINFO_HXX
#include "TypeInfo.hxx"
diff --git a/dbaccess/source/ui/inc/HtmlReader.hxx b/dbaccess/source/ui/inc/HtmlReader.hxx
index 07f774e76aa1..a55fff20589f 100644
--- a/dbaccess/source/ui/inc/HtmlReader.hxx
+++ b/dbaccess/source/ui/inc/HtmlReader.hxx
@@ -37,7 +37,7 @@
#include <svtools/parhtml.hxx>
#endif
#ifndef _SVX_SVXENUM_HXX
-#include <svx/svxenum.hxx>
+#include <editeng/svxenum.hxx>
#endif
#ifndef _STREAM_HXX
#include <tools/stream.hxx>
diff --git a/dbaccess/source/ui/inc/UITools.hxx b/dbaccess/source/ui/inc/UITools.hxx
index 51722ee431cb..bba83b147cd5 100644
--- a/dbaccess/source/ui/inc/UITools.hxx
+++ b/dbaccess/source/ui/inc/UITools.hxx
@@ -40,7 +40,7 @@
#include "TypeInfo.hxx"
#endif
#ifndef _SVX_SVXENUM_HXX
-#include <svx/svxenum.hxx>
+#include <editeng/svxenum.hxx>
#endif
#ifndef _SV_TASKPANELIST_HXX
#include <vcl/taskpanelist.hxx>
diff --git a/reportdesign/source/core/api/ReportComponent.cxx b/reportdesign/source/core/api/ReportComponent.cxx
index 6255bcdf8433..1f8565110595 100644
--- a/reportdesign/source/core/api/ReportComponent.cxx
+++ b/reportdesign/source/core/api/ReportComponent.cxx
@@ -43,7 +43,7 @@
#include <com/sun/star/text/ParagraphVertAlign.hpp>
#include <com/sun/star/style/ParagraphAdjust.hpp>
#include <com/sun/star/i18n/ScriptType.hpp>
-#include <svx/unolingu.hxx>
+#include <editeng/unolingu.hxx>
#include <unotools/syslocale.hxx>
#include <unotools/lingucfg.hxx>
#include <i18npool/mslangid.hxx>
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index 754f97bf0b4a..60a497842636 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -114,7 +114,7 @@
#include <unotools/moduleoptions.hxx>
#include <osl/thread.hxx>
-#include <svx/paperinf.hxx>
+#include <editeng/paperinf.hxx>
#include <svx/svdlayer.hxx>
#include <svx/xmleohlp.hxx>
#include <svx/xmlgrhlp.hxx>
diff --git a/reportdesign/source/ui/dlg/dlgpage.cxx b/reportdesign/source/ui/dlg/dlgpage.cxx
index 7661413c4fab..5416ee6c6b90 100644
--- a/reportdesign/source/ui/dlg/dlgpage.cxx
+++ b/reportdesign/source/ui/dlg/dlgpage.cxx
@@ -34,7 +34,7 @@
#include <svx/tabarea.hxx>
#include <svx/flagsdef.hxx>
#include <svx/svxdlg.hxx>
-#include <svx/svxenum.hxx>
+#include <editeng/svxenum.hxx>
#include "dlgpage.hxx"
#include "ModuleHelper.hxx"
#include "RptResId.hrc"
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index 77a78965a0c0..fcc4c49ddfd3 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -111,7 +111,7 @@
#define ITEMID_LINEEND_LIST SID_LINEEND_LIST
#include <svx/drawitem.hxx>
#define ITEMID_BRUSH SID_ATTR_BRUSH
-#include <svx/brshitem.hxx>
+#include <editeng/brshitem.hxx>
#include <sfx2/docfilt.hxx>
#include "dlgpage.hxx"
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx
index 3b72ac263a54..d226365cd88c 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -48,35 +48,35 @@
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <svx/svdpool.hxx>
-#include <svx/charscaleitem.hxx>
+#include <editeng/charscaleitem.hxx>
#include <svx/algitem.hxx>
#include <svx/svdpagv.hxx>
#include <svx/xtable.hxx> // XColorTable
-#include <svx/brshitem.hxx>
-#include <svx/fontitem.hxx>
-#include <svx/emphitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/cntritem.hxx>
-#include <svx/langitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/fhgtitem.hxx>
-#include <svx/shdditem.hxx>
-#include <svx/escpitem.hxx>
-#include <svx/prszitem.hxx>
-#include <svx/wrlmitem.hxx>
-#include <svx/cmapitem.hxx>
-#include <svx/kernitem.hxx>
-#include <svx/blnkitem.hxx>
-#include <svx/flstitem.hxx>
-#include <svx/akrnitem.hxx>
-#include <svx/colritem.hxx>
+#include <editeng/brshitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/emphitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/crsditem.hxx>
+#include <editeng/cntritem.hxx>
+#include <editeng/langitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/shdditem.hxx>
+#include <editeng/escpitem.hxx>
+#include <editeng/prszitem.hxx>
+#include <editeng/wrlmitem.hxx>
+#include <editeng/cmapitem.hxx>
+#include <editeng/kernitem.hxx>
+#include <editeng/blnkitem.hxx>
+#include <editeng/flstitem.hxx>
+#include <editeng/akrnitem.hxx>
+#include <editeng/colritem.hxx>
#include <svx/drawitem.hxx>
-#include <svx/twolinesitem.hxx>
-#include <svx/charreliefitem.hxx>
-#include <svx/charrotateitem.hxx>
-#include <svx/charhiddenitem.hxx>
+#include <editeng/twolinesitem.hxx>
+#include <editeng/charreliefitem.hxx>
+#include <editeng/charrotateitem.hxx>
+#include <editeng/charhiddenitem.hxx>
#include <svx/xgrscit.hxx>
#include <svx/svditer.hxx>
#include <svx/xtable.hxx>
diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx
index 55a1bb3776e9..d1e5e924eda0 100644
--- a/reportdesign/source/ui/misc/toolboxcontroller.cxx
+++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx
@@ -51,10 +51,10 @@
#define ITEMID_BRUSH 2
#define ITEMID_FONT 3
#define ITEMID_FONTHEIGHT 4
-#include <svx/fontitem.hxx>
-#include <svx/fhgtitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/fhgtitem.hxx>
#include <svx/tbcontrl.hxx>
-#include <svx/colritem.hxx>
+#include <editeng/colritem.hxx>
#include <svx/tbxcustomshapes.hxx>
#include <comphelper/sequence.hxx>
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 9d5c6352ef0b..630287832cbf 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -108,18 +108,18 @@
#include <vcl/waitobj.hxx>
#include <svx/fmview.hxx>
-#include <svx/paperinf.hxx>
+#include <editeng/paperinf.hxx>
#include <svx/svxids.hrc>
#include <svx/svdobj.hxx>
#include <svx/dataaccessdescriptor.hxx>
-#include <svx/svxenum.hxx>
+#include <editeng/svxenum.hxx>
#include <svx/pageitem.hxx>
-#include <svx/lrspitem.hxx>
-#include <svx/ulspitem.hxx>
-#include <svx/sizeitem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/sizeitem.hxx>
#include <svx/zoomitem.hxx>
#include <svx/zoomslideritem.hxx>
-#include <svx/brshitem.hxx>
+#include <editeng/brshitem.hxx>
#include <svx/flagsdef.hxx> //CHINA001
#include <svx/svdpagv.hxx>
#include <svx/svxdlg.hxx>
diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx
index 8cb729540990..48e9d78db17a 100644
--- a/reportdesign/source/ui/report/ReportSection.cxx
+++ b/reportdesign/source/ui/report/ReportSection.cxx
@@ -41,8 +41,8 @@
#include "ViewsWindow.hxx"
#include <svx/svdpagv.hxx>
-#include <svx/eeitemid.hxx>
-#include <svx/adjitem.hxx>
+#include <editeng/eeitemid.hxx>
+#include <editeng/adjitem.hxx>
#include <svx/sdrpaintwindow.hxx>
#include <svx/unoshape.hxx>
#include <svx/gallery.hxx>
diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx
index 2f460f37b638..b9530a3eb81b 100644
--- a/reportdesign/source/ui/report/dlgedfunc.cxx
+++ b/reportdesign/source/ui/report/dlgedfunc.cxx
@@ -37,10 +37,10 @@
#include <svx/svdview.hxx>
#include <svx/svdpagv.hxx>
-#include <svx/outlobj.hxx>
-#include <svx/unolingu.hxx>
+#include <editeng/outlobj.hxx>
+#include <editeng/unolingu.hxx>
#include <svx/svdetc.hxx>
-#include <svx/editstat.hxx>
+#include <editeng/editstat.hxx>
#include <svx/svdoutl.hxx>
#include <svx/svddrgmt.hxx>
#include <svx/svdoashp.hxx>
diff --git a/reportdesign/util/makefile.mk b/reportdesign/util/makefile.mk
index 82f22e30ede7..06fa51e2eee8 100644
--- a/reportdesign/util/makefile.mk
+++ b/reportdesign/util/makefile.mk
@@ -56,6 +56,7 @@ LIB1FILES=\
SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
SHL1STDLIBS= \
+ $(EDITENGLIB) \
$(SVXCORELIB) \
$(SVXLIB) \
$(FWELIB) \
@@ -115,6 +116,7 @@ LIB2FILES=\
SHL2TARGET=$(TARGET2)$(DLLPOSTFIX)
SHL2STDLIBS= \
+ $(EDITENGLIB) \
$(SVXCORELIB) \
$(SVXLIB) \
$(SFXLIB) \
@@ -190,6 +192,7 @@ LIB3FILES=\
SHL3TARGET=$(TARGET3)$(DLLPOSTFIX)
SHL3STDLIBS=\
+ $(EDITENGLIB) \
$(SVXCORELIB) \
$(XMLOFFLIB) \
$(VCLLIB) \
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-24 08:58:12 +0000