CWS-TOOLING: integrate CWS svxsplit

18 files changed, 61 insertions, 56 deletions

diff --git a/forms/inc/pch/precompiled_forms.hxx b/forms/inc/pch/precompiled_forms.hxx
index 402323630361..a04c6fea88da 100644
--- a/forms/inc/pch/precompiled_forms.hxx
+++ b/forms/inc/pch/precompiled_forms.hxx
@@ -346,18 +346,18 @@
 #include "svl/solar.hrc"
 #include "svtools/transfer.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 "svx/frmdir.hxx"
-#include "svx/scripttypeitem.hxx"
-#include "svx/svxenum.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 "editeng/frmdir.hxx"
+#include "editeng/scripttypeitem.hxx"
+#include "editeng/svxenum.hxx"
 #include "svx/svxids.hrc"
-#include "svx/unoedsrc.hxx"
-#include "svx/unofored.hxx"
+#include "editeng/unoedsrc.hxx"
+#include "editeng/unofored.hxx"
 
 #include "toolkit/helper/emptyfontdescriptor.hxx"
 
diff --git a/forms/source/richtext/attributedispatcher.cxx b/forms/source/richtext/attributedispatcher.cxx
index e7fd029a86bd..9610bf84b10c 100644
--- a/forms/source/richtext/attributedispatcher.cxx
+++ b/forms/source/richtext/attributedispatcher.cxx
@@ -34,7 +34,7 @@
 
 /** === begin UNO includes === **/
 /** === end UNO includes === **/
-#include <svx/editview.hxx>
+#include <editeng/editview.hxx>
 
 //........................................................................
 namespace frm
diff --git a/forms/source/richtext/clipboarddispatcher.cxx b/forms/source/richtext/clipboarddispatcher.cxx
index eca90f30ddc2..3a6199abf013 100644
--- a/forms/source/richtext/clipboarddispatcher.cxx
+++ b/forms/source/richtext/clipboarddispatcher.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_forms.hxx"
 #include "clipboarddispatcher.hxx"
-#include <svx/editview.hxx>
+#include <editeng/editview.hxx>
 
 /** === begin UNO includes === **/
 #include <com/sun/star/lang/DisposedException.hpp>
diff --git a/forms/source/richtext/parametrizedattributedispatcher.cxx b/forms/source/richtext/parametrizedattributedispatcher.cxx
index 9f6c4c15ed68..10309a986fa5 100644
--- a/forms/source/richtext/parametrizedattributedispatcher.cxx
+++ b/forms/source/richtext/parametrizedattributedispatcher.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_forms.hxx"
 #include "parametrizedattributedispatcher.hxx"
-#include <svx/editview.hxx>
+#include <editeng/editview.hxx>
 #include <svl/itemset.hxx>
 #include <svl/itempool.hxx>
 
diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx
index 9150eac63e17..8cb7fb7ba0bf 100644
--- a/forms/source/richtext/richtextcontrol.cxx
+++ b/forms/source/richtext/richtextcontrol.cxx
@@ -52,7 +52,7 @@
 #include <vcl/svapp.hxx>
 
 #include <svx/svxids.hrc>
-#include <svx/editview.hxx>
+#include <editeng/editview.hxx>
 #include <svl/itemset.hxx>
 #include <svl/itempool.hxx>
 #include <sfx2/msgpool.hxx>
diff --git a/forms/source/richtext/richtextengine.cxx b/forms/source/richtext/richtextengine.cxx
index b87d6260b723..d40396c59356 100644
--- a/forms/source/richtext/richtextengine.cxx
+++ b/forms/source/richtext/richtextengine.cxx
@@ -32,14 +32,14 @@
 #include "precompiled_forms.hxx"
 #include "richtextengine.hxx"
 #include <svl/itempool.hxx>
-#include <svx/eeitem.hxx>
-#include <svx/editobj.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/editobj.hxx>
 #define ITEMID_FONTHEIGHT   EE_CHAR_FONTHEIGHT
-#include <svx/fhgtitem.hxx>
+#include <editeng/fhgtitem.hxx>
 #define ITEMID_FONT         EE_CHAR_FONTHEIGHT
-#include <svx/fontitem.hxx>
+#include <editeng/fontitem.hxx>
 #define ITEMID_LANGUAGE     EE_CHAR_LANGUAGE
-#include <svx/langitem.hxx>
+#include <editeng/langitem.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/mapunit.hxx>
 #include <vcl/mapmod.hxx>
diff --git a/forms/source/richtext/richtextengine.hxx b/forms/source/richtext/richtextengine.hxx
index 6e0052a26da7..f7231d663bc4 100644
--- a/forms/source/richtext/richtextengine.hxx
+++ b/forms/source/richtext/richtextengine.hxx
@@ -30,7 +30,7 @@
 #ifndef FORMS_SOURCE_RICHTEXT_RICHTEXTENGINE_HXX
 #define FORMS_SOURCE_RICHTEXT_RICHTEXTENGINE_HXX
 
-#include <svx/editeng.hxx>
+#include <editeng/editeng.hxx>
 #include <tools/link.hxx>
 
 #include <vector>
diff --git a/forms/source/richtext/richtextimplcontrol.cxx b/forms/source/richtext/richtextimplcontrol.cxx
index 259197ac71d1..f2c560e51d50 100644
--- a/forms/source/richtext/richtextimplcontrol.cxx
+++ b/forms/source/richtext/richtextimplcontrol.cxx
@@ -33,16 +33,16 @@
 #include "richtextimplcontrol.hxx"
 #include "textattributelistener.hxx"
 #include "richtextengine.hxx"
-#include <svx/editeng.hxx>
-#include <svx/editview.hxx>
-#include <svx/eeitem.hxx>
-#include <svx/editstat.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/editstat.hxx>
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
-#include <svx/scripttypeitem.hxx>
+#include <editeng/scripttypeitem.hxx>
 
-#include <svx/editobj.hxx>
+#include <editeng/editobj.hxx>
 #include <svl/itempool.hxx>
 #include <svl/itemset.hxx>
 #include <vcl/mapunit.hxx>
diff --git a/forms/source/richtext/richtextimplcontrol.hxx b/forms/source/richtext/richtextimplcontrol.hxx
index 65e138b4f093..c162c977c1b2 100644
--- a/forms/source/richtext/richtextimplcontrol.hxx
+++ b/forms/source/richtext/richtextimplcontrol.hxx
@@ -34,7 +34,7 @@
 #include "richtextviewport.hxx"
 #include "richtextengine.hxx"
 #include <vcl/scrbar.hxx>
-#include <svx/editdata.hxx>
+#include <editeng/editdata.hxx>
 
 #include <map>
 
diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx
index 067512d3c659..35c6ad814f05 100644
--- a/forms/source/richtext/richtextmodel.cxx
+++ b/forms/source/richtext/richtextmodel.cxx
@@ -47,7 +47,7 @@
 #include <comphelper/guarding.hxx>
 #include <toolkit/awt/vclxdevice.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <svx/editstat.hxx>
+#include <editeng/editstat.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/svapp.hxx>
 
diff --git a/forms/source/richtext/richtextunowrapper.cxx b/forms/source/richtext/richtextunowrapper.cxx
index f5a9d178d32c..84eac6ce544c 100644
--- a/forms/source/richtext/richtextunowrapper.cxx
+++ b/forms/source/richtext/richtextunowrapper.cxx
@@ -35,9 +35,12 @@
 /** === begin UNO includes === **/
 #include <com/sun/star/container/XNameContainer.hpp>
 /** === end UNO includes === **/
-#include <svx/unofored.hxx>
-#include <svx/editview.hxx>
-#include <svx/unoipset.hxx>
+#include <editeng/unofored.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/unoipset.hxx>
+#include <svx/svdpool.hxx>
+#include <svx/svdobj.hxx>
+#include <editeng/unoprnms.hxx>
 
 //........................................................................
 namespace frm
@@ -64,7 +67,7 @@ namespace frm
                 { MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType( static_cast< const Reference< XNameContainer >* >( NULL ) ), 0, 0 },
                 { NULL, 0, 0, NULL, 0, 0 }
             };
-            static SvxItemPropertySet aTextEnginePropertySet( aTextEnginePropertyMap );
+            static SvxItemPropertySet aTextEnginePropertySet( aTextEnginePropertyMap, SdrObject::GetGlobalDrawObjectItemPool() );
             return &aTextEnginePropertySet;
         }
     }
diff --git a/forms/source/richtext/richtextunowrapper.hxx b/forms/source/richtext/richtextunowrapper.hxx
index 3a0e1a4aec47..af8ccde76d87 100644
--- a/forms/source/richtext/richtextunowrapper.hxx
+++ b/forms/source/richtext/richtextunowrapper.hxx
@@ -31,8 +31,8 @@
 #ifndef FORMS_SOURCE_RICHTEXT_RICHTEXTUNOWRAPPER_HXX
 #define FORMS_SOURCE_RICHTEXT_RICHTEXTUNOWRAPPER_HXX
 
-#include <svx/unotext.hxx>
-#include <svx/unoedsrc.hxx>
+#include <editeng/unotext.hxx>
+#include <editeng/unoedsrc.hxx>
 
 //........................................................................
 namespace frm
diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx
index 495a85c02162..f1648f08e905 100644
--- a/forms/source/richtext/richtextvclcontrol.cxx
+++ b/forms/source/richtext/richtextvclcontrol.cxx
@@ -53,13 +53,14 @@
     #endif
     #include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
 #endif
-#include <svx/scripttypeitem.hxx>
-#include <svx/editeng.hxx>
-#include <svx/editview.hxx>
-#include <svx/eeitem.hxx>
-#include <svx/fontitem.hxx>
-#include <svx/fhgtitem.hxx>
-
+#include <editeng/scripttypeitem.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/editids.hrc>
+#include <svx/svxids.hrc>
 #include <memory>
 
 //........................................................................
diff --git a/forms/source/richtext/richtextviewport.cxx b/forms/source/richtext/richtextviewport.cxx
index e85a8cf26035..c5e23b2cc607 100644
--- a/forms/source/richtext/richtextviewport.cxx
+++ b/forms/source/richtext/richtextviewport.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_forms.hxx"
 #include "richtextviewport.hxx"
-#include <svx/editview.hxx>
+#include <editeng/editview.hxx>
 
 //........................................................................
 namespace frm
diff --git a/forms/source/richtext/rtattributehandler.cxx b/forms/source/richtext/rtattributehandler.cxx
index d1090b82d914..2ebbbbd6bb4a 100644
--- a/forms/source/richtext/rtattributehandler.cxx
+++ b/forms/source/richtext/rtattributehandler.cxx
@@ -35,7 +35,7 @@
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <svl/itemset.hxx>
 #include <svl/itempool.hxx>
 #include <vcl/mapunit.hxx>
@@ -43,18 +43,18 @@
 #include <vcl/outdev.hxx>
 
 #define ITEMID_ADJUST       EE_PARA_JUST
-#include <svx/adjitem.hxx>
+#include <editeng/adjitem.hxx>
 #define ITEMID_WEIGHT       EE_CHAR_WEIGHT
-#include <svx/wghtitem.hxx>
+#include <editeng/wghtitem.hxx>
 #define ITEMID_ESCAPEMENT   EE_CHAR_ESCAPEMENT
-#include <svx/escpitem.hxx>
+#include <editeng/escpitem.hxx>
 #define ITEMID_LINESPACING  EE_PARA_SBL
-#include <svx/lspcitem.hxx>
+#include <editeng/lspcitem.hxx>
 #define ITEMID_FONTHEIGHT   EE_CHAR_FONTHEIGHT
-#include <svx/fhgtitem.hxx>
+#include <editeng/fhgtitem.hxx>
 #define ITEMID_FRAMEDIR     EE_PARA_WRITINGDIR
-#include <svx/frmdiritem.hxx>
-#include <svx/scripttypeitem.hxx>
+#include <editeng/frmdiritem.hxx>
+#include <editeng/scripttypeitem.hxx>
 
 //........................................................................
 namespace frm
diff --git a/forms/source/richtext/rtattributehandler.hxx b/forms/source/richtext/rtattributehandler.hxx
index cca6723d5f7a..41db86982e4c 100644
--- a/forms/source/richtext/rtattributehandler.hxx
+++ b/forms/source/richtext/rtattributehandler.hxx
@@ -33,8 +33,8 @@
 
 #include "rtattributes.hxx"
 #include <rtl/ref.hxx>
-#include <svx/svxenum.hxx>
-#include <svx/frmdir.hxx>
+#include <editeng/svxenum.hxx>
+#include <editeng/frmdir.hxx>
 
 class SfxItemSet;
 class SfxPoolItem;
diff --git a/forms/source/richtext/specialdispatchers.cxx b/forms/source/richtext/specialdispatchers.cxx
index a9176b8d3350..c9e7be22aea3 100644
--- a/forms/source/richtext/specialdispatchers.cxx
+++ b/forms/source/richtext/specialdispatchers.cxx
@@ -31,13 +31,13 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_forms.hxx"
 #include "specialdispatchers.hxx"
-#include <svx/editeng.hxx>
-#include <svx/editview.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editview.hxx>
 #ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
 #endif
 #define ITEMID_SCRIPTSPACE          SID_ATTR_PARA_SCRIPTSPACE
-#include <svx/scriptspaceitem.hxx>
+#include <editeng/scriptspaceitem.hxx>
 
 //........................................................................
 namespace frm
diff --git a/forms/util/makefile.mk b/forms/util/makefile.mk
index 1c454b1383db..a7a649473aad 100644
--- a/forms/util/makefile.mk
+++ b/forms/util/makefile.mk
@@ -58,6 +58,7 @@ LIB1FILES=\
 SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
 
 SHL1STDLIBS= \
+        $(EDITENGLIB) \
         $(SALLIB) \
         $(CPPULIB) \
         $(CPPUHELPERLIB) \