#i107450#: build all other modules with new editeng lib

28 files changed, 81 insertions, 80 deletions

diff --git a/filter/inc/filter/msfilter/svdfppt.hxx b/filter/inc/filter/msfilter/svdfppt.hxx
index 8d9b85c7301f..32bf65120e1b 100644
--- a/filter/inc/filter/msfilter/svdfppt.hxx
+++ b/filter/inc/filter/msfilter/svdfppt.hxx
@@ -39,14 +39,14 @@
 #include <tools/gen.hxx>
 #include <tools/color.hxx>
 #include <svx/svdobj.hxx>
-#include <svx/numitem.hxx>
-#include <svx/editdata.hxx>
+#include <editeng/numitem.hxx>
+#include <editeng/editdata.hxx>
 #include <filter/msfilter/msdffimp.hxx>         //  Escher-Grafikimport
 #include <filter/msfilter/msocximex.hxx>
 #include <filter/msfilter/msfiltertracer.hxx>
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #define ITEMID_FIELD EE_FEATURE_FIELD
-#include <svx/flditem.hxx>
+#include <editeng/flditem.hxx>
 #undef ITEMID_FIELD
 #include "filter/msfilter/msfilterdllapi.h"
 #include <vcl/font.hxx>
diff --git a/filter/source/graphicfilter/eos2met/makefile.mk b/filter/source/graphicfilter/eos2met/makefile.mk
index 05f2f032e342..d288af3e0deb 100644
--- a/filter/source/graphicfilter/eos2met/makefile.mk
+++ b/filter/source/graphicfilter/eos2met/makefile.mk
@@ -31,7 +31,7 @@
 
 PRJ=..$/..$/..
 
-PRJNAME=goodies
+PRJNAME=filter
 TARGET=eos2met
 TARGET2=eme
 DEPTARGET=veos2met
diff --git a/filter/source/graphicfilter/epbm/makefile.mk b/filter/source/graphicfilter/epbm/makefile.mk
index f4411d04e0fd..ad1f71703e19 100644
--- a/filter/source/graphicfilter/epbm/makefile.mk
+++ b/filter/source/graphicfilter/epbm/makefile.mk
@@ -31,7 +31,7 @@
 
 PRJ=..$/..$/..
 
-PRJNAME=goodies
+PRJNAME=filter
 TARGET=epbm
 TARGET2=epb
 DEPTARGET=vepbm
diff --git a/filter/source/graphicfilter/epgm/makefile.mk b/filter/source/graphicfilter/epgm/makefile.mk
index 579ee6858a78..32e923ebffdf 100644
--- a/filter/source/graphicfilter/epgm/makefile.mk
+++ b/filter/source/graphicfilter/epgm/makefile.mk
@@ -31,7 +31,7 @@
 
 PRJ=..$/..$/..
 
-PRJNAME=goodies
+PRJNAME=filter
 TARGET=epgm
 TARGET2=epg
 DEPTARGET=vepgm
diff --git a/filter/source/graphicfilter/epict/makefile.mk b/filter/source/graphicfilter/epict/makefile.mk
index 4aa4bab80ffc..df1656e3ced1 100644
--- a/filter/source/graphicfilter/epict/makefile.mk
+++ b/filter/source/graphicfilter/epict/makefile.mk
@@ -31,7 +31,7 @@
 
 PRJ=..$/..$/..
 
-PRJNAME=goodies
+PRJNAME=filter
 TARGET=epict
 TARGET2=ept
 DEPTARGET=vepict
diff --git a/filter/source/graphicfilter/eppm/makefile.mk b/filter/source/graphicfilter/eppm/makefile.mk
index b40f9d897b8a..c8db97b839e1 100644
--- a/filter/source/graphicfilter/eppm/makefile.mk
+++ b/filter/source/graphicfilter/eppm/makefile.mk
@@ -31,7 +31,7 @@
 
 PRJ=..$/..$/..
 
-PRJNAME=goodies
+PRJNAME=filter
 TARGET=eppm
 TARGET2=epp
 DEPTARGET=veppm
diff --git a/filter/source/graphicfilter/eps/makefile.mk b/filter/source/graphicfilter/eps/makefile.mk
index c5599344725a..9b6c80424c9c 100644
--- a/filter/source/graphicfilter/eps/makefile.mk
+++ b/filter/source/graphicfilter/eps/makefile.mk
@@ -31,7 +31,7 @@
 
 PRJ=..$/..$/..
 
-PRJNAME=goodies
+PRJNAME=filter
 TARGET=eps
 DEPTARGET=veps
 
diff --git a/filter/source/graphicfilter/eras/makefile.mk b/filter/source/graphicfilter/eras/makefile.mk
index e6aeaeefb223..842fc4fe3f98 100644
--- a/filter/source/graphicfilter/eras/makefile.mk
+++ b/filter/source/graphicfilter/eras/makefile.mk
@@ -31,7 +31,7 @@
 
 PRJ=..$/..$/..
 
-PRJNAME=goodies
+PRJNAME=filter
 TARGET=eras
 DEPTARGET=veras
 
diff --git a/filter/source/graphicfilter/etiff/makefile.mk b/filter/source/graphicfilter/etiff/makefile.mk
index 70902012ce23..a99781ba8c7e 100644
--- a/filter/source/graphicfilter/etiff/makefile.mk
+++ b/filter/source/graphicfilter/etiff/makefile.mk
@@ -31,7 +31,7 @@
 
 PRJ=..$/..$/..
 
-PRJNAME=goodies
+PRJNAME=filter
 TARGET=etiff
 DEPTARGET=vetiff
 
diff --git a/filter/source/graphicfilter/expm/makefile.mk b/filter/source/graphicfilter/expm/makefile.mk
index e123220feff8..93ba642ae012 100644
--- a/filter/source/graphicfilter/expm/makefile.mk
+++ b/filter/source/graphicfilter/expm/makefile.mk
@@ -31,7 +31,7 @@
 
 PRJ=..$/..$/..
 
-PRJNAME=goodies
+PRJNAME=filter
 TARGET=expm
 DEPTARGET=vexpm
 
diff --git a/filter/source/graphicfilter/icgm/makefile.mk b/filter/source/graphicfilter/icgm/makefile.mk
index ee62bbfb051c..314b413ef5f5 100644
--- a/filter/source/graphicfilter/icgm/makefile.mk
+++ b/filter/source/graphicfilter/icgm/makefile.mk
@@ -30,7 +30,7 @@
 #*************************************************************************
 
 PRJ=..$/..$/..
-PRJNAME=goodies
+PRJNAME=filter
 TARGET=icgm
 ENABLE_EXCEPTIONS=TRUE
 
diff --git a/filter/source/graphicfilter/idxf/makefile.mk b/filter/source/graphicfilter/idxf/makefile.mk
index 081022cd4e5b..dc19483c254d 100644
--- a/filter/source/graphicfilter/idxf/makefile.mk
+++ b/filter/source/graphicfilter/idxf/makefile.mk
@@ -31,7 +31,7 @@
 
 PRJ=..$/..$/..
 
-PRJNAME=goodies
+PRJNAME=filter
 TARGET=idxf
 DEPTARGET=vidxf
 
diff --git a/filter/source/graphicfilter/ieps/makefile.mk b/filter/source/graphicfilter/ieps/makefile.mk
index 673cce72744c..7d546ecd514b 100644
--- a/filter/source/graphicfilter/ieps/makefile.mk
+++ b/filter/source/graphicfilter/ieps/makefile.mk
@@ -31,7 +31,7 @@
 
 PRJ=..$/..$/..
 
-PRJNAME=goodies
+PRJNAME=filter
 TARGET=ieps
 DEPTARGET=vieps
 
diff --git a/filter/source/graphicfilter/ios2met/makefile.mk b/filter/source/graphicfilter/ios2met/makefile.mk
index c987476316c6..65b103305730 100644
--- a/filter/source/graphicfilter/ios2met/makefile.mk
+++ b/filter/source/graphicfilter/ios2met/makefile.mk
@@ -31,7 +31,7 @@
 
 PRJ=..$/..$/..
 
-PRJNAME=goodies
+PRJNAME=filter
 TARGET=ios2met
 DEPTARGET=vios2met
 
diff --git a/filter/source/graphicfilter/ipbm/makefile.mk b/filter/source/graphicfilter/ipbm/makefile.mk
index 84a9815a4974..99dd423e8c93 100644
--- a/filter/source/graphicfilter/ipbm/makefile.mk
+++ b/filter/source/graphicfilter/ipbm/makefile.mk
@@ -31,7 +31,7 @@
 
 PRJ=..$/..$/..
 
-PRJNAME=goodies
+PRJNAME=filter
 TARGET=ipbm
 DEPTARGET=vipbm
 
diff --git a/filter/source/graphicfilter/ipcd/makefile.mk b/filter/source/graphicfilter/ipcd/makefile.mk
index 7782b7b8e627..9e98b3e747b9 100644
--- a/filter/source/graphicfilter/ipcd/makefile.mk
+++ b/filter/source/graphicfilter/ipcd/makefile.mk
@@ -31,7 +31,7 @@
 
 PRJ=..$/..$/..
 
-PRJNAME=goodies
+PRJNAME=filter
 TARGET=ipcd
 DEPTARGET=vipcd
 
diff --git a/filter/source/graphicfilter/ipcx/makefile.mk b/filter/source/graphicfilter/ipcx/makefile.mk
index 7f0f309ae786..13c181d62f68 100644
--- a/filter/source/graphicfilter/ipcx/makefile.mk
+++ b/filter/source/graphicfilter/ipcx/makefile.mk
@@ -31,7 +31,7 @@
 
 PRJ=..$/..$/..
 
-PRJNAME=goodies
+PRJNAME=filter
 TARGET=ipcx
 DEPTARGET=vipcx
 
diff --git a/filter/source/graphicfilter/ipict/makefile.mk b/filter/source/graphicfilter/ipict/makefile.mk
index 2d84bffe3c36..9c11c1637fc7 100644
--- a/filter/source/graphicfilter/ipict/makefile.mk
+++ b/filter/source/graphicfilter/ipict/makefile.mk
@@ -31,7 +31,7 @@
 
 PRJ=..$/..$/..
 
-PRJNAME=goodies
+PRJNAME=filter
 TARGET=ipict
 DEPTARGET=vipict
 
diff --git a/filter/source/graphicfilter/ipsd/makefile.mk b/filter/source/graphicfilter/ipsd/makefile.mk
index cd29c94f8074..56fc91b79d14 100644
--- a/filter/source/graphicfilter/ipsd/makefile.mk
+++ b/filter/source/graphicfilter/ipsd/makefile.mk
@@ -31,7 +31,7 @@
 
 PRJ=..$/..$/..
 
-PRJNAME=goodies
+PRJNAME=filter
 TARGET=ipsd
 DEPTARGET=vipsd
 
diff --git a/filter/source/graphicfilter/iras/makefile.mk b/filter/source/graphicfilter/iras/makefile.mk
index 28b84c8401ef..dec0ba1975ce 100644
--- a/filter/source/graphicfilter/iras/makefile.mk
+++ b/filter/source/graphicfilter/iras/makefile.mk
@@ -31,7 +31,7 @@
 
 PRJ=..$/..$/..
 
-PRJNAME=goodies
+PRJNAME=filter
 TARGET=iras
 DEPTARGET=viras
 
diff --git a/filter/source/graphicfilter/itga/makefile.mk b/filter/source/graphicfilter/itga/makefile.mk
index a9dfe2e77643..16d6d1894826 100644
--- a/filter/source/graphicfilter/itga/makefile.mk
+++ b/filter/source/graphicfilter/itga/makefile.mk
@@ -31,7 +31,7 @@
 
 PRJ=..$/..$/..
 
-PRJNAME=goodies
+PRJNAME=filter
 TARGET=itga
 DEPTARGET=vitga
 
diff --git a/filter/source/graphicfilter/itiff/makefile.mk b/filter/source/graphicfilter/itiff/makefile.mk
index 78405a563659..9bdb3d512257 100644
--- a/filter/source/graphicfilter/itiff/makefile.mk
+++ b/filter/source/graphicfilter/itiff/makefile.mk
@@ -31,7 +31,7 @@
 
 PRJ=..$/..$/..
 
-PRJNAME=goodies
+PRJNAME=filter
 TARGET=itiff
 DEPTARGET=vitiff
 
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index b312988b5397..6df7910acd12 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -30,7 +30,6 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_filter.hxx"
-#include "svx/impgrf.hxx"
 #include "eschesdo.hxx"
 #include <filter/msfilter/escherex.hxx>
 #include <svx/unoapi.hxx>
@@ -3791,7 +3790,7 @@ sal_uInt32 EscherGraphicProvider::GetBlibID( SvStream& rPicOutStrm, const ByteSt
                     nErrCode = GraphicConverter::Export( aStream, aGraphic, ( eGraphicType == GRAPHIC_BITMAP ) ? CVT_PNG  : CVT_EMF );
                 else
                 {   // to store a animation, a gif has to be included into the msOG chunk of a png  #I5583#
-                    GraphicFilter*  pFilter = GetGrfFilter();
+                    GraphicFilter*  pFilter = GraphicFilter::GetGraphicFilter();
                     SvMemoryStream  aGIFStream;
                     ByteString      aVersion( "MSOFFICE9.0" );
                     aGIFStream.Write( aVersion.GetBuffer(), aVersion.Len() );
diff --git a/filter/source/msfilter/makefile.mk b/filter/source/msfilter/makefile.mk
index 0f68a6ae742a..9157f77a6993 100644
--- a/filter/source/msfilter/makefile.mk
+++ b/filter/source/msfilter/makefile.mk
@@ -62,6 +62,7 @@ SHL1IMPLIB=	i$(TARGET)
 SHL1OBJS=	$(SLOFILES)
 SHL1USE_EXPORTS=name
 SHL1STDLIBS= \
+             $(EDITENGLIB) \
              $(VBAHELPERLIB) \
              $(SVXCORELIB) \
              $(SFX2LIB) \
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 5d1f115e59d8..76e5e7c31873 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -50,8 +50,8 @@
 #include "viscache.hxx"
 
 // SvxItem-Mapping. Wird benoetigt um die SvxItem-Header erfolgreich zu includen
-#include <svx/eeitem.hxx>
-#include <svx/editdata.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/editdata.hxx>
 #include <svl/urihelper.hxx>
 #include <tools/stream.hxx>
 #include <tools/debug.hxx>
@@ -66,8 +66,8 @@
 #include <com/sun/star/drawing/Direction3D.hpp>
 #include <com/sun/star/drawing/GluePoint2.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
-#include <svx/charscaleitem.hxx>
-#include <svx/kernitem.hxx>
+#include <editeng/charscaleitem.hxx>
+#include <editeng/kernitem.hxx>
 #include <svtools/filter.hxx>
 #include <tools/string.hxx>
 #include <tools/urlobj.hxx>
@@ -81,7 +81,7 @@
 #include <sfx2/module.hxx>
 #include <svx/sdgcpitm.hxx>
 #include <svx/sdgmoitm.hxx>
-#include <svx/tstpitem.hxx>
+#include <editeng/tstpitem.hxx>
 #include <svx/fmmodel.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdobj.hxx>
@@ -96,32 +96,31 @@
 #include <svx/svdoutl.hxx>
 #include <svx/svdoole2.hxx>
 #include <svx/svdopath.hxx>
-#include <svx/frmdir.hxx>
-#include <svx/frmdiritem.hxx>
+#include <editeng/frmdir.hxx>
+#include <editeng/frmdiritem.hxx>
 #include <svx/svdtrans.hxx>
 #include <svx/sxenditm.hxx>
 #include <svx/sdgluitm.hxx>
-#include <svx/fhgtitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/shdditem.hxx>
-#include <svx/fontitem.hxx>
-#include <svx/colritem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/crsditem.hxx>
+#include <editeng/shdditem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/colritem.hxx>
 #include <svx/sxekitm.hxx>
-#include <svx/bulitem.hxx>
+#include <editeng/bulitem.hxx>
 #include <svx/polysc3d.hxx>
 #include <svx/extrud3d.hxx>
 #include "svx/svditer.hxx"
 #include <svx/xpoly.hxx>
 #include "svx/xattr.hxx"
-#include "svx/impgrf.hxx"
 #include <filter/msfilter/msdffimp.hxx> // extern sichtbare Header-Datei
-#include <svx/outliner.hxx>
-#include <svx/outlobj.hxx>
-#include <svx/editobj.hxx>
-#include <svx/editeng.hxx>
+#include <editeng/outliner.hxx>
+#include <editeng/outlobj.hxx>
+#include <editeng/editobj.hxx>
+#include <editeng/editeng.hxx>
 #include "svx/gallery.hxx"
 #include <com/sun/star/drawing/ShadeMode.hpp>
 #include <svl/itempool.hxx>
@@ -4662,7 +4661,7 @@ SdrObject* SvxMSDffManager::ImportGraphic( SvStream& rSt, SfxItemSet& rSet, cons
 
                 if( aURLObj.GetProtocol() != INET_PROT_NOT_VALID )
                 {
-                    GraphicFilter* pGrfFilter = GetGrfFilter();
+                    GraphicFilter* pGrfFilter = GraphicFilter::GetGraphicFilter();
                     aFilterName = pGrfFilter->GetImportFormatName(
                                     pGrfFilter->GetImportFormatNumberForShortName( aURLObj.getExtension() ) );
                 }
@@ -7118,7 +7117,7 @@ BOOL SvxMSDffManager::GetBLIPDirect( SvStream& rBLIPStream, Graphic& rData, Rect
         }
         else
         {   // und unsere feinen Filter darauf loslassen
-            GraphicFilter* pGF = GetGrfFilter();
+            GraphicFilter* pGF = GraphicFilter::GetGraphicFilter();
             String aEmptyStr;
             nRes = pGF->ImportGraphic( rData, aEmptyStr, *pGrStream, GRFILTER_FORMAT_DONTKNOW );
 
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 2d16541aa59a..2fd06797744d 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -34,7 +34,7 @@
 #include <vcl/svapp.hxx>
 #include <unotools/tempfile.hxx>
 #include <math.h>
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <sot/storage.hxx>
 #include <sot/storinfo.hxx>
 #include <sot/stg.hxx>
@@ -59,17 +59,18 @@
 #include <svx/svdocirc.hxx>
 #include <svx/svdocapt.hxx>
 #include <svx/svdotable.hxx>
-#include <svx/outlobj.hxx>
+#include <editeng/outlobj.hxx>
 #include <svx/svdattr.hxx>
 #include "svx/xattr.hxx"
 #include "svx/svditext.hxx"
 #include <svx/svdetc.hxx>
-#include <svx/bulitem.hxx>
+#include <editeng/bulitem.hxx>
 #include <svx/polysc3d.hxx>
 #include <svx/extrud3d.hxx>
 #include <svx/svdoashp.hxx>
-#include <svx/tstpitem.hxx>
-#include <svx/unoprnms.hxx>
+#include <editeng/tstpitem.hxx>
+#include <editeng/unoprnms.hxx>
+#include <editeng/editids.hrc>
 
 #if defined(JOEENV) && defined(JOEDEBUG)
 #include "impinccv.h" // etwas Testkram
@@ -81,34 +82,34 @@
 #endif
 
 #define ITEMVALUE(ItemSet,Id,Cast)  ((const Cast&)(ItemSet).Get(Id)).GetValue()
-#include <svx/adjitem.hxx>
-#include <svx/escpitem.hxx>
-#include <svx/colritem.hxx>
-#include <svx/fhgtitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/shdditem.hxx>
-#include <svx/charreliefitem.hxx>
-#include <svx/fontitem.hxx>
+#include <editeng/adjitem.hxx>
+#include <editeng/escpitem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/crsditem.hxx>
+#include <editeng/shdditem.hxx>
+#include <editeng/charreliefitem.hxx>
+#include <editeng/fontitem.hxx>
 #include <svx/svdoutl.hxx>
-#include <svx/editeng.hxx>
-#include <svx/lspcitem.hxx>
-#include <svx/ulspitem.hxx>
-#include <svx/lrspitem.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/lspcitem.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/lrspitem.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/bmpacc.hxx>
 #include <svx/svditer.hxx>
 #include <svx/svdoedge.hxx>
 #include <svx/sxekitm.hxx>
-#include <svx/flditem.hxx>
+#include <editeng/flditem.hxx>
 #include <svtools/sychconv.hxx>
 #include <tools/zcodec.hxx>
 #include <filter/msfilter/svxmsbas.hxx>
 #include <sfx2/objsh.hxx>
-#include <svx/brshitem.hxx>
-#include <svx/langitem.hxx>
+#include <editeng/brshitem.hxx>
+#include <editeng/langitem.hxx>
 #include <svx/svdoole2.hxx>
 #include <svx/unoapi.hxx>
 #include <toolkit/unohlp.hxx>
@@ -124,13 +125,13 @@
 #include <com/sun/star/awt/Point.hpp>
 #include <com/sun/star/drawing/FillStyle.hpp>
 #include <com/sun/star/drawing/TextVerticalAdjust.hpp>
-#include <svx/writingmodeitem.hxx>
+#include <editeng/writingmodeitem.hxx>
 #include <vcl/print.hxx>
-#include <svx/svxfont.hxx>
-#include <svx/frmdiritem.hxx>
+#include <editeng/svxfont.hxx>
+#include <editeng/frmdiritem.hxx>
 #include <svx/sdtfchim.hxx>
 #include <unotools/ucbstreamhelper.hxx>
-#include <svx/scripttypeitem.hxx>
+#include <editeng/scripttypeitem.hxx>
 #include "com/sun/star/awt/Gradient.hpp"
 #include <com/sun/star/table/XMergeableCellRange.hpp>
 #include <com/sun/star/table/BorderLine.hpp>
diff --git a/filter/source/svg/makefile.mk b/filter/source/svg/makefile.mk
index 72f9a3a23c41..663598a3d0f9 100644
--- a/filter/source/svg/makefile.mk
+++ b/filter/source/svg/makefile.mk
@@ -56,6 +56,7 @@ SLOFILES+=		$(SLO)$/svgimport.obj
 SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
 
 SHL1STDLIBS=\
+    $(EDITENGLIB)			\
     $(SVXCORELIB)			\
     $(XMLOFFLIB)		\
     $(SVTOOLLIB)		\
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index b55a0224daaa..4dee08cf909d 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -40,9 +40,9 @@
 #include <svx/unopage.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdoutl.hxx>
-#include <svx/outliner.hxx>
-#include <svx/flditem.hxx>
-#include <svx/numitem.hxx>
+#include <editeng/outliner.hxx>
+#include <editeng/flditem.hxx>
+#include <editeng/numitem.hxx>
 
 using ::rtl::OUString;