#i107450#: move code from svx to new module editeng

277 files changed, 6023 insertions, 4684 deletions

diff --git a/svx/source/editeng/editeng.hrc b/editeng/inc/editeng.hrc
index f023ad546d..9b8593e6f7 100644
--- a/svx/source/editeng/editeng.hrc
+++ b/editeng/inc/editeng.hrc
@@ -48,6 +48,9 @@
 #define RID_STR_PARAGRAPH			( RID_EDIT_START + 11 )
 #define RID_STR_WORD				( RID_EDIT_START + 12 )
 
+#define RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION	(RID_EDIT_START + 13)
+#define RID_SVXSTR_A11Y_IMAGEBULLET_NAME		(RID_EDIT_START + 14)
+
 #define MN_SPELLING         1
 #define MN_INSERT           2
 #define MN_IGNORE           3
diff --git a/svx/inc/svx/AccessibleComponentBase.hxx b/editeng/inc/editeng/AccessibleComponentBase.hxx
index 1b39f3c7f6..4c21936c0f 100644
--- a/svx/inc/svx/AccessibleComponentBase.hxx
+++ b/editeng/inc/editeng/AccessibleComponentBase.hxx
@@ -36,7 +36,7 @@
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.hpp>
 #include <com/sun/star/awt/XFocusListener.hpp>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 namespace accessibility {
 
@@ -49,7 +49,7 @@ namespace accessibility {
         <type>XAccessibleContext</type>, <type>XInterface</type>,
         <type>XServiceInfo</type>, and <type>XTypeProvider</type>.
 */
-class SVX_DLLPUBLIC AccessibleComponentBase
+class EDITENG_DLLPUBLIC AccessibleComponentBase
     :   public ::com::sun::star::accessibility::XAccessibleExtendedComponent 
 {
 public:
diff --git a/svx/inc/svx/AccessibleContextBase.hxx b/editeng/inc/editeng/AccessibleContextBase.hxx
index 552942f7bc..49a351951b 100644
--- a/svx/inc/svx/AccessibleContextBase.hxx
+++ b/editeng/inc/editeng/AccessibleContextBase.hxx
@@ -31,7 +31,7 @@
 #ifndef _SVX_ACCESSIBILITY_ACCESSIBLE_CONTEXT_BASE_HXX
 #define _SVX_ACCESSIBILITY_ACCESSIBLE_CONTEXT_BASE_HXX
 
-#include <svx/ChildrenManager.hxx>
+//#include <editeng/ChildrenManager.hxx>
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/accessibility/XAccessibleContext.hpp>
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
@@ -39,9 +39,7 @@
 #include <com/sun/star/accessibility/XAccessibleRelationSet.hpp>
 #include <com/sun/star/accessibility/AccessibleEventObject.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_IllegalAccessibleComponentStateException_HPP_
 #include <com/sun/star/accessibility/IllegalAccessibleComponentStateException.hpp>
-#endif
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <cppuhelper/weak.hxx>
@@ -51,7 +49,7 @@
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <osl/mutex.hxx>
 #include <cppuhelper/compbase4.hxx>
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 
 namespace accessibility {
@@ -64,7 +62,7 @@ struct MutexOwner {mutable ::osl::Mutex maMutex;};
         <type>XXAccessible<type> and <type>XAccessibleContextContext</type>
         interfaces it supports the <type>XServiceInfo</type> interface.
 */
-class SVX_DLLPUBLIC AccessibleContextBase
+class EDITENG_DLLPUBLIC AccessibleContextBase
     :	public MutexOwner,
         public cppu::WeakComponentImplHelper4<
         ::com::sun::star::accessibility::XAccessible,
diff --git a/svx/inc/AccessibleSelectionBase.hxx b/editeng/inc/editeng/AccessibleSelectionBase.hxx
index f2b06e1a57..e5de8bdec6 100644
--- a/svx/inc/AccessibleSelectionBase.hxx
+++ b/editeng/inc/editeng/AccessibleSelectionBase.hxx
@@ -32,7 +32,7 @@
 #define _SVX_ACCESSIBILITY_ACCESSIBLE_SELECTION_BASE_HXX
 
 #include <comphelper/accessibleselectionhelper.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 namespace accessibility
 {
@@ -47,7 +47,7 @@ namespace accessibility
         <method>implIsSelected</method>,
         <method>implSelect</method>,
 */
-    class SVX_DLLPUBLIC AccessibleSelectionBase : public ::comphelper::OCommonAccessibleSelection,
+    class EDITENG_DLLPUBLIC AccessibleSelectionBase : public ::comphelper::OCommonAccessibleSelection,
                                     public ::com::sun::star::accessibility::XAccessibleSelection
     {
     protected:
diff --git a/svx/inc/AccessibleStaticTextBase.hxx b/editeng/inc/editeng/AccessibleStaticTextBase.hxx
index 2a9fdab114..34928b5539 100644
--- a/svx/inc/AccessibleStaticTextBase.hxx
+++ b/editeng/inc/editeng/AccessibleStaticTextBase.hxx
@@ -40,7 +40,7 @@
 #include <com/sun/star/accessibility/XAccessibleText.hpp>
 #include <com/sun/star/accessibility/XAccessibleTextAttributes.hpp>
 #include <com/sun/star/accessibility/TextSegment.hpp>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 
 class SvxEditSource;
@@ -98,7 +98,7 @@ namespace accessibility
         edit source. Every interface method will then properly throw
         an exception.
     */
-    class SVX_DLLPUBLIC AccessibleStaticTextBase : public AccessibleStaticTextBase_BASE
+    class EDITENG_DLLPUBLIC AccessibleStaticTextBase : public AccessibleStaticTextBase_BASE
     {
 
     public:
@@ -118,9 +118,9 @@ namespace accessibility
     private:
 
         // declared, but not defined
-        SVX_DLLPRIVATE AccessibleStaticTextBase( const AccessibleStaticTextBase& );
+        EDITENG_DLLPRIVATE AccessibleStaticTextBase( const AccessibleStaticTextBase& );
         // declared, but not defined
-        SVX_DLLPRIVATE AccessibleStaticTextBase& operator= ( const AccessibleStaticTextBase& );
+        EDITENG_DLLPRIVATE AccessibleStaticTextBase& operator= ( const AccessibleStaticTextBase& );
 
     public:
         /** Query the current edit source
@@ -323,7 +323,7 @@ namespace accessibility
 #include <com/sun/star/accessibility/XAccessibleText.hpp>
 #include <com/sun/star/accessibility/XAccessibleTextAttributes.hpp>
 #include <com/sun/star/accessibility/TextSegment.hpp>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 
 class SvxEditSource;
@@ -380,7 +380,7 @@ namespace accessibility
         edit source. Every interface method will then properly throw
         an exception.
     */
-    class SVX_DLLPUBLIC AccessibleStaticTextBase : public AccessibleStaticTextBase_BASE
+    class EDITENG_DLLPUBLIC AccessibleStaticTextBase : public AccessibleStaticTextBase_BASE
     {
 
     public:
@@ -400,9 +400,9 @@ namespace accessibility
     private:
 
         // declared, but not defined
-        SVX_DLLPRIVATE AccessibleStaticTextBase( const AccessibleStaticTextBase& );
+        EDITENG_DLLPRIVATE AccessibleStaticTextBase( const AccessibleStaticTextBase& );
         // declared, but not defined
-        SVX_DLLPRIVATE AccessibleStaticTextBase& operator= ( const AccessibleStaticTextBase& );
+        EDITENG_DLLPRIVATE AccessibleStaticTextBase& operator= ( const AccessibleStaticTextBase& );
 
     public:
         /** Query the current edit source
diff --git a/svx/source/inc/AccessibleStringWrap.hxx b/editeng/inc/editeng/AccessibleStringWrap.hxx
index 0d4e5c42e9..e6065314f2 100644
--- a/svx/source/inc/AccessibleStringWrap.hxx
+++ b/editeng/inc/editeng/AccessibleStringWrap.hxx
@@ -34,7 +34,7 @@
 #include <sal/types.h>
 #include <tools/string.hxx>
 
-#include <svx/svxdllapi.h>
+#include <editeng/editengdllapi.h>
 
 class OutputDevice;
 class SvxFont;
@@ -51,10 +51,10 @@ class AccessibleStringWrap
 {
 public:
 
-    SVX_DLLPUBLIC AccessibleStringWrap( OutputDevice& rDev, SvxFont& rFont, const String& rText );
+    EDITENG_DLLPUBLIC AccessibleStringWrap( OutputDevice& rDev, SvxFont& rFont, const String& rText );
 
-    SVX_DLLPUBLIC sal_Bool GetCharacterBounds( sal_Int32 nIndex, Rectangle& rRect );
-    SVX_DLLPUBLIC sal_Int32 GetIndexAtPoint( const Point& rPoint );
+    EDITENG_DLLPUBLIC sal_Bool GetCharacterBounds( sal_Int32 nIndex, Rectangle& rRect );
+    EDITENG_DLLPUBLIC sal_Int32 GetIndexAtPoint( const Point& rPoint );
 
 private:
     
diff --git a/svx/inc/svx/SpellPortions.hxx b/editeng/inc/editeng/SpellPortions.hxx
index c7644ae7a0..c7644ae7a0 100644
--- a/svx/inc/svx/SpellPortions.hxx
+++ b/editeng/inc/editeng/SpellPortions.hxx
diff --git a/svx/inc/UnoForbiddenCharsTable.hxx b/editeng/inc/editeng/UnoForbiddenCharsTable.hxx
index 1fae284ecc..cd9ca2e3f2 100644
--- a/svx/inc/UnoForbiddenCharsTable.hxx
+++ b/editeng/inc/editeng/UnoForbiddenCharsTable.hxx
@@ -36,11 +36,11 @@
 #include <vos/ref.hxx>
 
 #include <cppuhelper/implbase2.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 class SvxForbiddenCharactersTable;
 
-class SVX_DLLPUBLIC SvxUnoForbiddenCharsTable : public cppu::WeakImplHelper2<
+class EDITENG_DLLPUBLIC SvxUnoForbiddenCharsTable : public cppu::WeakImplHelper2<
                                         com::sun::star::i18n::XForbiddenCharacters,
                                         com::sun::star::linguistic2::XSupportedLocales>
 {
diff --git a/svx/inc/acorrcfg.hxx b/editeng/inc/editeng/acorrcfg.hxx
index 2c34f0ed12..4a76b7ab28 100644
--- a/svx/inc/acorrcfg.hxx
+++ b/editeng/inc/editeng/acorrcfg.hxx
@@ -32,14 +32,14 @@
 
 // include ---------------------------------------------------------------
 
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 #include <unotools/configitem.hxx>
 /* -----------------------------12.10.00 11:40--------------------------------
 
  ---------------------------------------------------------------------------*/
 class SvxAutoCorrect;
 class SvxAutoCorrCfg;
-class SVX_DLLPUBLIC SvxBaseAutoCorrCfg : public utl::ConfigItem
+class EDITENG_DLLPUBLIC SvxBaseAutoCorrCfg : public utl::ConfigItem
 {
     SvxAutoCorrCfg& rParent;
     com::sun::star::uno::Sequence<rtl::OUString>    GetPropertyNames();
@@ -56,7 +56,7 @@ public:
 /* -----------------------------12.10.00 11:40--------------------------------
 
  ---------------------------------------------------------------------------*/
-class SVX_DLLPUBLIC SvxSwAutoCorrCfg : public utl::ConfigItem
+class EDITENG_DLLPUBLIC SvxSwAutoCorrCfg : public utl::ConfigItem
 {
     SvxAutoCorrCfg& rParent;
     com::sun::star::uno::Sequence<rtl::OUString>    GetPropertyNames();
@@ -73,7 +73,7 @@ public:
 /*--------------------------------------------------------------------
     Beschreibung:   Konfiguration fuer Auto Correction
  --------------------------------------------------------------------*/
-class SVX_DLLPUBLIC SvxAutoCorrCfg
+class EDITENG_DLLPUBLIC SvxAutoCorrCfg
 {
     friend class SvxBaseAutoCorrCfg;
     friend class SvxSwAutoCorrCfg;
diff --git a/svx/inc/svx/adjitem.hxx b/editeng/inc/editeng/adjitem.hxx
index f82c492c46..ae47c2cc3c 100644
--- a/svx/inc/svx/adjitem.hxx
+++ b/editeng/inc/editeng/adjitem.hxx
@@ -33,13 +33,9 @@
 // include ---------------------------------------------------------------
 
 #include <svl/eitem.hxx>
-#include <svx/svxenum.hxx>
-
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include <svx/eeitem.hxx>
-#include "svx/svxdllapi.h"
+#include <editeng/svxenum.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/editengdllapi.h>
 
 class SvXMLUnitConverter;
 namespace rtl
@@ -55,7 +51,7 @@ Dieses Item beschreibt die Zeilenausrichtung.
 */
 #define	ADJUST_LASTBLOCK_VERSION		((USHORT)0x0001)
 
-class SVX_DLLPUBLIC SvxAdjustItem : public SfxEnumItemInterface
+class EDITENG_DLLPUBLIC SvxAdjustItem : public SfxEnumItemInterface
 {
     BOOL    bLeft      : 1;
     BOOL    bRight     : 1;
diff --git a/svx/inc/svx/akrnitem.hxx b/editeng/inc/editeng/akrnitem.hxx
index 059f301efe..f15885b19c 100644
--- a/svx/inc/svx/akrnitem.hxx
+++ b/editeng/inc/editeng/akrnitem.hxx
@@ -33,10 +33,7 @@
 // include ---------------------------------------------------------------
 
 #include <svl/eitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 class SvXMLUnitConverter;
 namespace rtl
@@ -51,7 +48,7 @@ namespace rtl
     Attribut fuer Pair-Kerning.
 */
 
-class SVX_DLLPUBLIC SvxAutoKernItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxAutoKernItem : public SfxBoolItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/blnkitem.hxx b/editeng/inc/editeng/blnkitem.hxx
index 7f5d7bb7f5..6e84ab016d 100644
--- a/svx/inc/svx/blnkitem.hxx
+++ b/editeng/inc/editeng/blnkitem.hxx
@@ -34,10 +34,7 @@
 
 #include <svl/poolitem.hxx>
 #include <svl/eitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 class SvXMLUnitConverter;
 namespace rtl
@@ -52,7 +49,7 @@ namespace rtl
     Dieses Item beschreibt, ob geblinkt werden soll.
 */
 
-class SVX_DLLPUBLIC SvxBlinkItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxBlinkItem : public SfxBoolItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/bolnitem.hxx b/editeng/inc/editeng/bolnitem.hxx
index 117b0d24a4..45d42c2f99 100644
--- a/svx/inc/bolnitem.hxx
+++ b/editeng/inc/editeng/bolnitem.hxx
@@ -35,7 +35,7 @@
 
 
 #include <svl/poolitem.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 
 
@@ -49,7 +49,7 @@ Dieses Item transportiert eine SvxBorderLine.
 
 class SvxBorderLine;
 
-class SVX_DLLPUBLIC SvxLineItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxLineItem : public SfxPoolItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/borderline.hxx b/editeng/inc/editeng/borderline.hxx
index 1e117d040f..09aabf45ed 100644
--- a/svx/inc/svx/borderline.hxx
+++ b/editeng/inc/editeng/borderline.hxx
@@ -33,7 +33,7 @@
 
 #include <tools/color.hxx>
 #include <svl/poolitem.hxx>
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 // Line defaults in twips (former Writer defaults):
 
@@ -93,7 +93,7 @@
 
 // ============================================================================
 
-class SVX_DLLPUBLIC SvxBorderLine
+class EDITENG_DLLPUBLIC SvxBorderLine
 {
 protected:
     Color  aColor;
diff --git a/svx/inc/svx/boxitem.hxx b/editeng/inc/editeng/boxitem.hxx
index a4ad27dc6f..c4c9504265 100644
--- a/svx/inc/svx/boxitem.hxx
+++ b/editeng/inc/editeng/boxitem.hxx
@@ -31,11 +31,8 @@
 #define _SVX_BOXITEM_HXX
 
 #include <svl/poolitem.hxx>
-#include <svx/borderline.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/borderline.hxx>
+#include <editeng/editengdllapi.h>
 
 namespace rtl { class OUString; }
 
@@ -54,7 +51,7 @@ Abstand nach innen.
 
 #define BOX_4DISTS_VERSION ((USHORT)1)
 
-class SVX_DLLPUBLIC SvxBoxItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxBoxItem : public SfxPoolItem
 {
     SvxBorderLine  *pTop,
                    *pBottom,
@@ -141,7 +138,7 @@ horizontalen und vertikalen innerern Linien transportiert.
 #define VALID_DISTANCE		0x40
 #define VALID_DISABLE		0x80
 
-class SVX_DLLPUBLIC SvxBoxInfoItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxBoxInfoItem : public SfxPoolItem
 {
     SvxBorderLine* pHori;   //innere horizontale Linie
     SvxBorderLine* pVert;   //innere vertikale Linie
diff --git a/svx/inc/svx/brkitem.hxx b/editeng/inc/editeng/brkitem.hxx
index eaa800a899..82759895c0 100644
--- a/svx/inc/svx/brkitem.hxx
+++ b/editeng/inc/editeng/brkitem.hxx
@@ -33,11 +33,8 @@
 // include ---------------------------------------------------------------
 
 #include <svl/eitem.hxx>
-#include <svx/svxenum.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/svxenum.hxx>
+#include <editeng/editengdllapi.h>
 
 namespace rtl
 {
@@ -53,7 +50,7 @@ namespace rtl
 */
 #define	FMTBREAK_NOAUTO	((USHORT)0x0001)
 
-class SVX_DLLPUBLIC SvxFmtBreakItem : public SfxEnumItem
+class EDITENG_DLLPUBLIC SvxFmtBreakItem : public SfxEnumItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/brshitem.hxx b/editeng/inc/editeng/brshitem.hxx
index 6da9f87ea8..c2b32c85d8 100644
--- a/svx/inc/svx/brshitem.hxx
+++ b/editeng/inc/editeng/brshitem.hxx
@@ -33,10 +33,9 @@
 // include ---------------------------------------------------------------
 
 #include <svl/poolitem.hxx>
-#include <svx/svxids.hrc>
 #include <vcl/wall.hxx>
 #include <tools/link.hxx>
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 // class SvxBrushItem ----------------------------------------------------
 
@@ -63,7 +62,7 @@ enum SvxGraphicPosition
 #define PARA_DEST_CHAR  1
 
 class SvxBrushItem_Impl;
-class SVX_DLLPUBLIC SvxBrushItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxBrushItem : public SfxPoolItem
 {
     Color 				aColor;
     SvxBrushItem_Impl*  pImpl;
diff --git a/svx/inc/bulitem.hxx b/editeng/inc/editeng/bulitem.hxx
index dc65e37e51..baa1f78f44 100644
--- a/svx/inc/bulitem.hxx
+++ b/editeng/inc/editeng/bulitem.hxx
@@ -32,7 +32,7 @@
 
 // include ---------------------------------------------------------------
 
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 
 // define ----------------------------------------------------------------
@@ -72,7 +72,7 @@
 
 // class SvxBulletItem ---------------------------------------------------
 
-class SVX_DLLPUBLIC SvxBulletItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxBulletItem : public SfxPoolItem
 {
     Font            aFont;
     GraphicObject*  pGraphicObject;
diff --git a/svx/inc/charhiddenitem.hxx b/editeng/inc/editeng/charhiddenitem.hxx
index 739bde77eb..bdc950f9fe 100644
--- a/svx/inc/charhiddenitem.hxx
+++ b/editeng/inc/editeng/charhiddenitem.hxx
@@ -34,7 +34,7 @@
 
 #include <svl/poolitem.hxx>
 #include <svl/eitem.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 // class SvxCharHiddenItem -------------------------------------------------
 /*
@@ -42,7 +42,7 @@
     This item marks text as hidden
 */
 
-class SVX_DLLPUBLIC SvxCharHiddenItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxCharHiddenItem : public SfxBoolItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/charreliefitem.hxx b/editeng/inc/editeng/charreliefitem.hxx
index 0d5a901f7e..00a13872d5 100644
--- a/svx/inc/svx/charreliefitem.hxx
+++ b/editeng/inc/editeng/charreliefitem.hxx
@@ -34,10 +34,7 @@
 
 #include <svl/eitem.hxx>
 #include <vcl/fntstyle.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 // class SvxCharRotateItem ----------------------------------------------
 
@@ -48,7 +45,7 @@
 
 */
 
-class SVX_DLLPUBLIC SvxCharReliefItem : public SfxEnumItem
+class EDITENG_DLLPUBLIC SvxCharReliefItem : public SfxEnumItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/charrotateitem.hxx b/editeng/inc/editeng/charrotateitem.hxx
index 67933f26b2..7ec67c24fb 100644
--- a/svx/inc/svx/charrotateitem.hxx
+++ b/editeng/inc/editeng/charrotateitem.hxx
@@ -33,10 +33,7 @@
 // include ---------------------------------------------------------------
 
 #include <svl/intitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 // class SvxCharRotateItem ----------------------------------------------
 
@@ -49,7 +46,7 @@
 
 */
 
-class SVX_DLLPUBLIC SvxCharRotateItem : public SfxUInt16Item
+class EDITENG_DLLPUBLIC SvxCharRotateItem : public SfxUInt16Item
 {
     sal_Bool bFitToLine;
 public:
diff --git a/svx/inc/svx/charscaleitem.hxx b/editeng/inc/editeng/charscaleitem.hxx
index 36a7f38f7b..a6098f7f9d 100644
--- a/svx/inc/svx/charscaleitem.hxx
+++ b/editeng/inc/editeng/charscaleitem.hxx
@@ -32,13 +32,8 @@
 
 // include ---------------------------------------------------------------
 
-#ifndef _SFXENUMITEM_HXX
 #include <svl/intitem.hxx>
-#endif
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 // class SvxCharScaleItem ----------------------------------------------
 
@@ -50,7 +45,7 @@
 
 */
 
-class SVX_DLLPUBLIC SvxCharScaleWidthItem : public SfxUInt16Item
+class EDITENG_DLLPUBLIC SvxCharScaleWidthItem : public SfxUInt16Item
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/cmapitem.hxx b/editeng/inc/editeng/cmapitem.hxx
index 625ec28ca5..2cca9496f3 100644
--- a/svx/inc/svx/cmapitem.hxx
+++ b/editeng/inc/editeng/cmapitem.hxx
@@ -33,11 +33,8 @@
 // include ---------------------------------------------------------------
 
 #include <svl/eitem.hxx>
-#include <svx/svxenum.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/svxenum.hxx>
+#include <editeng/editengdllapi.h>
 
 class SvXMLUnitConverter;
 namespace rtl
@@ -52,7 +49,7 @@ namespace rtl
     Dieses Item beschreibt die Schrift-Ausrichtung (Versalien, Kapitaelchen,...).
 */
 
-class SVX_DLLPUBLIC SvxCaseMapItem : public SfxEnumItem
+class EDITENG_DLLPUBLIC SvxCaseMapItem : public SfxEnumItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/cntritem.hxx b/editeng/inc/editeng/cntritem.hxx
index fa9bc7da76..4b1d00d3c1 100644
--- a/svx/inc/svx/cntritem.hxx
+++ b/editeng/inc/editeng/cntritem.hxx
@@ -33,10 +33,7 @@
 // include ---------------------------------------------------------------
 
 #include <svl/eitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 // class SvxContourItem --------------------------------------------------
 
@@ -45,7 +42,7 @@
     Dieses Item beschreibt, ob Konturschrift eingestellt ist.
 */
 
-class SVX_DLLPUBLIC SvxContourItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxContourItem : public SfxBoolItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/colritem.hxx b/editeng/inc/editeng/colritem.hxx
index da04d2120f..017d4d0908 100644
--- a/svx/inc/svx/colritem.hxx
+++ b/editeng/inc/editeng/colritem.hxx
@@ -33,13 +33,8 @@
 // include ---------------------------------------------------------------
 
 #include <svl/poolitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#ifndef _SV_COLOR_HXX //autogen
 #include <tools/color.hxx>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 class SvXMLUnitConverter;
 namespace rtl
@@ -56,7 +51,7 @@ namespace rtl
 
 #define VERSION_USEAUTOCOLOR	1
 
-class SVX_DLLPUBLIC SvxColorItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxColorItem : public SfxPoolItem
 {
 private:
     Color					mColor;
diff --git a/svx/inc/svx/crsditem.hxx b/editeng/inc/editeng/crsditem.hxx
index caa835b89a..b728e3af75 100644
--- a/svx/inc/svx/crsditem.hxx
+++ b/editeng/inc/editeng/crsditem.hxx
@@ -34,10 +34,7 @@
 
 #include <vcl/vclenum.hxx>
 #include <svl/eitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 class SvXMLUnitConverter;
 namespace rtl
@@ -52,7 +49,7 @@ namespace rtl
     Dieses Item beschreibt, ob und wie durchstrichen ist.
 */
 
-class SVX_DLLPUBLIC SvxCrossedOutItem : public SfxEnumItem
+class EDITENG_DLLPUBLIC SvxCrossedOutItem : public SfxEnumItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/cscoitem.hxx b/editeng/inc/editeng/cscoitem.hxx
index 6c6d5c5f4d..ac90cf4de6 100644
--- a/svx/inc/svx/cscoitem.hxx
+++ b/editeng/inc/editeng/cscoitem.hxx
@@ -33,8 +33,8 @@
 // include ---------------------------------------------------------------
 
 #include <tools/string.hxx>
-#include <svx/colritem.hxx>
-#include "svx/svxdllapi.h"
+#include <editeng/colritem.hxx>
+#include <editeng/editengdllapi.h>
 
 // class SvxCharSetColorItem ---------------------------------------------
 
@@ -43,7 +43,7 @@
     PB: wird nur intern im Reader des Writers benoetigt
 */
 
-class SVX_DLLPUBLIC SvxCharSetColorItem : public SvxColorItem
+class EDITENG_DLLPUBLIC SvxCharSetColorItem : public SvxColorItem
 {
     rtl_TextEncoding eFrom;
 public:
diff --git a/svx/inc/svx/editdata.hxx b/editeng/inc/editeng/editdata.hxx
index de8af1ee9b..bed0c6cc86 100644
--- a/svx/inc/svx/editdata.hxx
+++ b/editeng/inc/editeng/editdata.hxx
@@ -33,7 +33,7 @@
 #define _MyEDITDATA_HXX
 
 #include <tools/string.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 #include <svl/svarray.hxx>
 
@@ -220,7 +220,7 @@ inline void ESelection::Adjust()
     }
 }
 
-struct SVX_DLLPUBLIC EFieldInfo
+struct EDITENG_DLLPUBLIC EFieldInfo
 {
     SvxFieldItem*   pFieldItem;
     String          aCurrentText;
@@ -307,7 +307,7 @@ struct EECharAttrib
     xub_StrLen			nEnd;
 };
 
-SV_DECL_VARARR_VISIBILITY( EECharAttribArray, EECharAttrib, 0, 4, SVX_DLLPUBLIC )
+SV_DECL_VARARR_VISIBILITY( EECharAttribArray, EECharAttrib, 0, 4, EDITENG_DLLPUBLIC )
 
 struct MoveParagraphsInfo
 {
diff --git a/svx/inc/svx/editeng.hxx b/editeng/inc/editeng/editeng.hxx
index 0624143334..6a8fd1e288 100644
--- a/svx/inc/svx/editeng.hxx
+++ b/editeng/inc/editeng/editeng.hxx
@@ -90,14 +90,14 @@ typedef std::vector<SpellPortion> SpellPortions;
 namespace basegfx { class B2DPolyPolygon; }
 #include <rsc/rscsfx.hxx>
 #ifndef _EDITDATA_HXX
-#include <svx/editdata.hxx>
+#include <editeng/editdata.hxx>
 #endif
 #include <i18npool/lang.h>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 #include <tools/rtti.hxx>	// wegen typedef TypeId
 
-#include <svx/eedata.hxx>
+#include <editeng/eedata.hxx>
 class SvxFieldData;
 
 //////////////////////////////////////////////////////////////////////////////
@@ -113,7 +113,7 @@ const sal_uInt8 EditEngineAttribs_OnlyHard = 2;		/// returns only attributes har
 #define GETATTRIBS_CHARATTRIBS  (sal_uInt8)0x04
 #define GETATTRIBS_ALL          (sal_uInt8)0xFF
 
-class SVX_DLLPUBLIC EditEngine
+class EDITENG_DLLPUBLIC EditEngine
 {
     friend class EditView;
     friend class ImpEditView;
@@ -123,11 +123,11 @@ class SVX_DLLPUBLIC EditEngine
 private:
     ImpEditEngine* 	pImpEditEngine;
 
-                    SVX_DLLPRIVATE EditEngine( const EditEngine& );
-    SVX_DLLPRIVATE EditEngine&		operator=( const EditEngine& );
+                    EDITENG_DLLPRIVATE EditEngine( const EditEngine& );
+    EDITENG_DLLPRIVATE EditEngine&		operator=( const EditEngine& );
 
 //#if 0 // _SOLAR__PRIVATE
-    SVX_DLLPRIVATE BOOL				PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pView );
+    EDITENG_DLLPRIVATE BOOL				PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pView );
 //#endif
 
 protected:
diff --git a/svx/source/dialog/impgrf.hrc b/editeng/inc/editeng/editengdllapi.h
index 91ab0e4ff6..a2fca4f87a 100644
--- a/svx/source/dialog/impgrf.hrc
+++ b/editeng/inc/editeng/editengdllapi.h
@@ -6,8 +6,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: impgrf.hrc,v $
- * $Revision: 1.3 $
+ * $RCSfile: editengdllapi.h,v $
+ * $Revision: 1.4 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -27,33 +27,17 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef _SVX_IMPGRF_HRC
-#define _SVX_IMPGRF_HRC
 
-// define -------------------------------------------------------------------
-
-#define STR_IMPORT_ALL				1
-#define STR_UNKNOWN_FORMAT			2
-#define STR_FLT_BMP					3
-#define	STR_FLT_SGF					4
-#define	STR_FLT_SGV					5
-#define	STR_FLT_SVM					6
-#define STR_PATH_NOT_FOUND1			7
-#define STR_PATH_NOT_FOUND2			8
-#define STR_GRFILTER_OPENERROR		9
-#define STR_GRFILTER_IOERROR		10
-#define STR_GRFILTER_FORMATERROR	11
-#define STR_GRFILTER_VERSIONERROR	12
-#define STR_GRFILTER_FILTERERROR	13
-#define STR_GRFILTER_TOOBIG			14
-#define STR_PROPERTIES				15
-#define STR_HOME					16
-#define STR_LINK			 		17
-#define STR_PREVIEW					18
-#define STR_FILTER					19
-#define STR_IMPORTGRAPHIC_COUNT		19
+#ifndef INCLUDED_EDITENGDLLAPI_H
+#define INCLUDED_EDITENGDLLAPI_H
 
+#include "sal/types.h"
 
+#if defined(EDITENG_DLLIMPLEMENTATION)
+#define EDITENG_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT
+#else
+#define EDITENG_DLLPUBLIC  SAL_DLLPUBLIC_IMPORT
 #endif
+#define EDITENG_DLLPRIVATE SAL_DLLPRIVATE
 
-
+#endif
diff --git a/editeng/inc/editeng/editids.hrc b/editeng/inc/editeng/editids.hrc
new file mode 100644
index 0000000000..33f04bc868
--- /dev/null
+++ b/editeng/inc/editeng/editids.hrc
@@ -0,0 +1,1151 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: svxids.hrc,v $
+ * $Revision: 1.10.132.2 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef _EDIT_SVXIDS_HRC
+#define _EDIT_SVXIDS_HRC
+
+// include ------------------------------------------------------------------
+
+#include <svl/memberid.hrc>
+#include <svl/solar.hrc>
+#include <tools/errcode.hxx>
+
+#define ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS    (2UL | ERRCODE_AREA_SVX)
+
+#define ERRCODE_SVX_GRAPHIC_WRONG_FILEFORMAT   (8UL | ERRCODE_AREA_SVX | \
+                                                ERRCODE_CLASS_READ )
+
+#define SID_PARA_VERTALIGN                              ( SID_SVX_START + 925 )
+#define SID_ATTR_BORDER_OUTER                           ( SID_SVX_START + 24 )
+#define SID_ATTR_BORDER_SHADOW                          ( SID_SVX_START + 25 )
+#define SID_ATTR_BRUSH                                  ( SID_SVX_START + 1 )
+#define SID_ATTR_BRUSH_CHAR                             ( SID_SVX_START + 591 )
+#define SID_ATTR_NUMBERING_RULE                         ( SID_SVX_START + 855 )
+#define SID_ATTR_TABSTOP                                ( SID_SVX_START + 2 )
+#define SID_FIELD                                       ( SID_SVX_START + 363 )
+#define SID_ATTR_FRAMEDIRECTION                         ( SID_SVX_START + 944 )
+#define SID_ATTR_PARA                                   ( SID_SVX_START + 26 )
+#define SID_ATTR_PARA_ADJUST                            ( SID_SVX_START + 27 )
+#define SID_ATTR_PARA_ADJUST_LEFT                       ( SID_SVX_START + 28 )
+#define SID_ATTR_PARA_BULLET                            ( SID_SVX_START + 250 )
+#define SID_ATTR_PARA_OUTLLEVEL                         ( SID_SVX_START + 300 )
+#define SID_ATTR_PARA_REGISTER                          ( SID_SVX_START + 413 )
+#define SID_ATTR_PARA_PAGENUM                           ( SID_SVX_START + 457 )
+#define SID_ATTR_PARA_NUMRULE                           ( SID_SVX_START + 587 )
+#define SID_ATTR_PARA_SCRIPTSPACE                       ( SID_SVX_START + 901 )
+#define SID_ATTR_PARA_HANGPUNCTUATION                   ( SID_SVX_START + 902 )
+#define SID_ATTR_PARA_FORBIDDEN_RULES                   ( SID_SVX_START + 903 )
+#define SID_ATTR_PARA_SNAPTOGRID                        ( SID_SVX_START + 945 )
+#define SID_ATTR_PARA_LRSPACE_VERTICAL                  ( SID_SVX_START + 947 )
+#define SID_ATTR_PARA_LEFT_TO_RIGHT                     ( SID_SVX_START + 950 )
+#define SID_ATTR_PARA_RIGHT_TO_LEFT                     ( SID_SVX_START + 951 )
+#define SID_ATTR_PARA_OUTLINE_LEVEL                     (SID_SVX_START+1092)
+#define SID_ATTR_PARA_ADJUST_RIGHT                      ( SID_SVX_START + 29 )
+#define SID_ATTR_PARA_ADJUST_CENTER                     ( SID_SVX_START + 30 )
+#define SID_ATTR_PARA_ADJUST_BLOCK                      ( SID_SVX_START + 31 )
+#define SID_ATTR_PARA_ADJUST_BLOCKLINE                  ( SID_SVX_START + 32 )
+#define SID_ATTR_PARA_LINESPACE                         ( SID_SVX_START + 33 )
+#define SID_ATTR_PARA_LINESPACE_10                      ( SID_SVX_START + 34 )
+#define SID_ATTR_PARA_LINESPACE_15                      ( SID_SVX_START + 35 )
+#define SID_ATTR_PARA_LINESPACE_20                      ( SID_SVX_START + 36 )
+#define SID_ATTR_PARA_PAGEBREAK                         ( SID_SVX_START + 37 )
+#define SID_ATTR_PARA_HYPHENZONE                        ( SID_SVX_START + 38 )
+#define SID_ATTR_PARA_SPLIT                             ( SID_SVX_START + 39 )
+#define SID_ATTR_PARA_ORPHANS                           ( SID_SVX_START + 40 )
+#define SID_ATTR_PARA_WIDOWS                            ( SID_SVX_START + 41 )
+#define SID_ATTR_PARA_ULSPACE                           ( SID_SVX_START + 42 )
+#define SID_ATTR_PARA_LRSPACE                           ( SID_SVX_START + 43 )
+#define SID_ATTR_PARA_MODEL                             ( SID_SVX_START + 65 )
+#define SID_ATTR_PARA_KEEP                              ( SID_SVX_START + 66 )
+#define SID_ATTR_NUMBERING_RULE                         ( SID_SVX_START + 855 )
+#define SID_ATTR_LRSPACE                                ( SID_SVX_START + 48 )
+#define SID_ATTR_ULSPACE                                ( SID_SVX_START + 49 )
+#define SID_ATTR_TABSTOP                                ( SID_SVX_START + 2 )
+#define SID_ATTR_TABSTOP_DEFAULTS                       ( SID_SVX_START + 3 )
+#define SID_ATTR_TABSTOP_POS                            ( SID_SVX_START + 4 )
+#define SID_ATTR_TABSTOP_OFFSET                         ( SID_SVX_START + 5 )
+#define SID_ATTR_CHAR                       (SID_SVX_START +   6)
+#define SID_ATTR_CHAR_FONT                  (SID_SVX_START +   7)
+#define SID_ATTR_CHAR_POSTURE               (SID_SVX_START +   8)
+#define SID_ATTR_CHAR_WEIGHT                (SID_SVX_START +   9)
+#define SID_ATTR_CHAR_SHADOWED              (SID_SVX_START +  10)
+#define SID_ATTR_CHAR_WORDLINEMODE          (SID_SVX_START +  11)
+#define SID_ATTR_CHAR_CONTOUR               (SID_SVX_START +  12)
+#define SID_ATTR_CHAR_STRIKEOUT             (SID_SVX_START +  13)
+#define SID_ATTR_CHAR_UNDERLINE             (SID_SVX_START +  14)
+#define SID_ATTR_CHAR_FONTHEIGHT            (SID_SVX_START +  15)
+#define SID_ATTR_CHAR_PROPSIZE              (SID_SVX_START +  16)
+#define SID_ATTR_CHAR_COLOR                 (SID_SVX_START +  17)
+#define SID_ATTR_CHAR_KERNING               (SID_SVX_START +  18)
+#define SID_ATTR_CHAR_CASEMAP               (SID_SVX_START +  19)
+#define SID_ATTR_CHAR_LANGUAGE              (SID_SVX_START +  20)
+#define SID_ATTR_CHAR_ESCAPEMENT            (SID_SVX_START +  21)
+#define SID_ATTR_CHAR_FONTLIST              (SID_SVX_START +  22)
+#define SID_ATTR_CHAR_MAPTYPE               (SID_SVX_START +  64)
+#define SID_ATTR_CHAR_AUTOKERN              (SID_SVX_START +  67)
+#define SID_ATTR_CHAR_OVERLINE              (SID_SVX_START +  68)
+#define SID_ATTR_CHAR_CHARSETCOLOR                      ( SID_SVX_START + 877 )
+#define SID_ATTR_CHAR_CJK_FONT                          ( SID_SVX_START + 887 )
+#define SID_ATTR_CHAR_CJK_FONTHEIGHT                    ( SID_SVX_START + 888 )
+#define SID_ATTR_CHAR_CJK_LANGUAGE                      ( SID_SVX_START + 889 )
+#define SID_ATTR_CHAR_CJK_POSTURE                       ( SID_SVX_START + 890 )
+#define SID_ATTR_CHAR_CJK_WEIGHT                        ( SID_SVX_START + 891 )
+#define SID_ATTR_CHAR_CTL_FONT                          ( SID_SVX_START + 892 )
+#define SID_ATTR_CHAR_CTL_FONTHEIGHT                    ( SID_SVX_START + 893 )
+#define SID_ATTR_CHAR_CTL_LANGUAGE                      ( SID_SVX_START + 894 )
+#define SID_ATTR_CHAR_CTL_POSTURE                       ( SID_SVX_START + 895 )
+#define SID_ATTR_CHAR_CTL_WEIGHT                        ( SID_SVX_START + 896 )
+#define SID_ATTR_CHAR_TWO_LINES                         ( SID_SVX_START + 897 )
+#define SID_ATTR_CHAR_CJK_RUBY                          ( SID_SVX_START + 898 )
+#define SID_ATTR_CHAR_EMPHASISMARK                      ( SID_SVX_START + 899 )
+#define SID_ATTR_CHAR_SCRIPTTYPE                        ( SID_SVX_START + 900 )
+#define SID_ATTR_CHAR_VERTICAL                          ( SID_SVX_START + 905 )    
+
+#define SID_ATTR_CHAR_ROTATED                           ( SID_SVX_START + 910 )
+#define SID_ATTR_CHAR_SCALEWIDTH                        ( SID_SVX_START + 911 )
+#define SID_ATTR_CHAR_WIDTH_FIT_TO_LINE                 ( SID_SVX_START + 919 )
+#define SID_ATTR_CHAR_RELIEF                            ( SID_SVX_START + 920 )
+#define SID_ATTR_CHAR_HIDDEN                            ( SID_SVX_START + 989 )
+#define SID_ATTR_CHAR_LATIN_FONT                        ( SID_SVX_START + 994 )
+#define SID_ATTR_CHAR_LATIN_FONTHEIGHT                  ( SID_SVX_START + 995 )
+#define SID_ATTR_CHAR_LATIN_LANGUAGE                    ( SID_SVX_START + 996 )
+#define SID_ATTR_CHAR_LATIN_POSTURE                     ( SID_SVX_START + 997 )
+#define SID_ATTR_CHAR_LATIN_WEIGHT                      ( SID_SVX_START + 998 )
+#define SID_TEXT_ALIGNLEFT                                  SID_ATTR_PARA_ADJUST_LEFT
+#define SID_TEXT_ALIGNRIGHT                                 SID_ATTR_PARA_ADJUST_RIGHT
+#define SID_TEXT_ALIGNCENTER                                SID_ATTR_PARA_ADJUST_CENTER
+#define SID_TEXT_ALIGNBLOCK                                 SID_ATTR_PARA_ADJUST_BLOCK
+
+
+#if 0
+// --------------------------------------------------------------------------
+// Member-Id's
+// --------------------------------------------------------------------------
+
+#define MID_APPFLAG             0x20
+#define MID_AUTOBREAK           0x21
+#define MID_BG_COLOR            0x22
+#define MID_BREAKxxx            0x22
+#define MID_BRUSHSTYLE          0x23
+#define MID_CELLTYPE            0x24
+#define MID_CHARSET             0x25
+#define MID_COMMAND             0x26
+#define MID_CONTENT             0x27
+#define MID_DESCNAMExxx         0x28
+#define MID_DISTANCE            0x29
+#define MID_ESCAPEMENT          0x2a
+#define MID_FAMILY              0x2b
+#define MID_FG_COLOR            0x2c
+#define MID_FIRSTLINE_OFFSET    0x2d
+#define MID_FLAGS               0x2e
+#define MID_FONTFAMILY          0x2f
+#define MID_FONTFAMILYNAME      0x30
+#define MID_FONTPITCH           0x31
+#define MID_FONTSTYLE           0x32
+#define MID_PERCENT             0x33
+#define MID_HYPHEN              0x34
+#define MID_INNER_WIDTH         0x35
+#define MID_INTER_LINESPACE     0x36
+#define MID_INTER_SPACE         0x37
+#define MID_LANDSCAPE           0x38
+
+#define MID_LEFT_MARGIN         0x3a
+#define MID_LINESPACE           0x3b
+#define MID_LOCATION            0x3c
+#define MID_LOWER               0x3d
+#define MID_MAXHYPHENS          0x3e
+#define MID_MINLEAD             0x3f
+#define MID_MINTRAIL            0x40
+#define MID_NUMTYPExxx          0x41
+#define MID_OUTER_WIDTH         0x41
+#define MID_PAGEEND             0x42
+#define MID_POS                 0x43
+#define MID_PROPORTIONAL        0x44
+#define MID_REPLACE_STRING      0x45
+#define MID_RIGHT               0x46
+#define MID_RIGHT_MARGIN        0x47
+#define MID_ROW_DIRECTION       0x48
+#define MID_SIZE                0x4a
+#define MID_TRANSPARENT         0x4b
+#define MID_TYPE                0x4c
+#define MID_UPPER               0x4d
+#define MID_USExxx              0x4e
+#define MID_VALUESET            0x4f
+
+#define MID_ADR_CITY            0x50
+#define MID_ADR_COMPANY         0x51
+#define MID_ADR_COUNTRY         0x52
+#define MID_ADR_EMAIL           0x53
+#define MID_ADR_FAX             0x54
+#define MID_ADR_FIRSTNAME       0x55
+#define MID_ADR_ID              0x56
+#define MID_ADR_LASTNAME        0x57
+#define MID_ADR_PHONE           0x58
+#define MID_ADR_PHONEPRIVATE    0x59
+#define MID_ADR_POSITION        0x5a
+#define MID_ADR_STREET          0x5b
+#define MID_ADR_TITLE           0x5c
+#define MID_ADR_ZIPCODE         0x5d
+#define MID_ADR_STATE           0x5e
+
+#define MID_FILENAME            0x6c
+#define MID_FILTERNAME          0x6d
+#define MID_POSITION            0x6e
+
+#define MID_HLINK_NAME          0x6f
+#define MID_HLINK_URL           0x70
+#define MID_HLINK_TARGET        0x71
+#define MID_HLINK_TYPE          0x72
+#define MID_HLINK_TEXT          0x73
+
+#define MID_COUNT               0x74
+#define MID_READONLY            0x76
+
+#define MID_VIEWLAYOUT_COLUMNS  0x77
+#define MID_VIEWLAYOUT_BOOKMODE 0x78
+
+#define MID_ZOOMSLIDER_CURRENTZOOM      0x79
+#define MID_ZOOMSLIDER_SNAPPINGPOINTS   0x7a
+#define MID_ZOOMSLIDER_MINZOOM          0x7b
+#define MID_ZOOMSLIDER_MAXZOOM          0x7c
+
+#define MID_ADR_FATHERSNAME     0x80
+#define MID_ADR_APARTMENT       0x81
+
+
+// --------------------------------------------------------------------------
+// Svx-Id's
+// --------------------------------------------------------------------------
+
+#define SID_ATTR_ZOOM                                   ( SID_SVX_START + 0 )
+#define SID_ATTR_BRUSH                                  ( SID_SVX_START + 1 )
+#define SID_ATTR_BORDER_INNER                           ( SID_SVX_START + 23 )
+#define SID_ATTR_BORDER_OUTER                           ( SID_SVX_START + 24 )
+#define SID_ATTR_BORDER_SHADOW                          ( SID_SVX_START + 25 )
+#define SID_ATTR_POSTIT_AUTHOR                          ( SID_SVX_START + 44 )
+#define SID_ATTR_POSTIT_DATE                            ( SID_SVX_START + 45 )
+#define SID_ATTR_POSTIT_TEXT                            ( SID_SVX_START + 46 )
+#define SID_ATTR_SEARCH                                 ( SID_SVX_START + 47 )
+#define SID_ATTR_PAGE                                   ( SID_SVX_START + 50 )
+#define SID_ATTR_PAGE_SIZE                              ( SID_SVX_START + 51 )
+#define SID_ATTR_PAGE_MAXSIZE                           ( SID_SVX_START + 52 )
+#define SID_ATTR_PAGE_PAPERBIN                          ( SID_SVX_START + 54 )
+#define SID_ATTR_PAGE_APP                               ( SID_SVX_START + 55 )
+#define SID_ATTR_PAGE_EXT1                              ( SID_SVX_START + 56 )
+#define SID_ATTR_PAGE_EXT2                              ( SID_SVX_START + 57 )
+#define SID_ATTR_PAGE_HEADERSET                         ( SID_SVX_START + 58 )
+#define SID_ATTR_PAGE_FOOTERSET                         ( SID_SVX_START + 59 )
+#define SID_ATTR_PAGE_ON                                ( SID_SVX_START + 60 )
+#define SID_ATTR_PAGE_DYNAMIC                           ( SID_SVX_START + 61 )
+#define SID_ATTR_PAGE_SHARED                            ( SID_SVX_START + 62 )
+#define SID_ATTR_PAGE_BSP                               ( SID_SVX_START + 63 )
+#define SID_ATTR_DBSESS_SERVERTYPE                      ( SID_SVX_START + 70 )
+#define SID_ATTR_DBSESS_SERVEROPTS                      ( SID_SVX_START + 71 )
+#define SID_ATTR_DBSESS_USERNAME                        ( SID_SVX_START + 72 )
+#define SID_ATTR_DBSESS_PASSWORD                        ( SID_SVX_START + 73 )
+#define SID_ATTR_DBSESS_SAVESESS                        ( SID_SVX_START + 74 )
+#define SID_ATTR_DBSESS_SAVEUSER                        ( SID_SVX_START + 75 )
+#define SID_ATTR_DBSESS_SERVERNAME                      ( SID_SVX_START + 76 )
+#define SID_ATTR_DBSESS_ENABLETYPE                      ( SID_SVX_START + 77 )
+#define SID_ATTR_NUMBERFORMAT_VALUE                     ( SID_SVX_START + 85 )
+#define SID_ATTR_NUMBERFORMAT_INFO                      ( SID_SVX_START + 86 )
+#define SID_ATTR_TRANSFORM                              ( SID_SVX_START + 87 )
+#define SID_ATTR_TRANSFORM_POS_X                        ( SID_SVX_START + 88 )
+#define SID_ATTR_TRANSFORM_POS_Y                        ( SID_SVX_START + 89 )
+#define SID_ATTR_TRANSFORM_WIDTH                        ( SID_SVX_START + 90 )
+#define SID_ATTR_TRANSFORM_HEIGHT                       ( SID_SVX_START + 91 )
+#define SID_ATTR_TRANSFORM_SIZE_POINT                   ( SID_SVX_START + 92 )
+#define SID_ATTR_TRANSFORM_ROT_X                        ( SID_SVX_START + 93 )
+#define SID_ATTR_TRANSFORM_ROT_Y                        ( SID_SVX_START + 94 )
+#define SID_ATTR_TRANSFORM_ANGLE                        ( SID_SVX_START + 95 )
+#define SID_RULER_NULL_OFFSET                           ( SID_SVX_START + 79 )
+#define SID_RULER_BORDERS                               ( SID_SVX_START + 80 )
+#define SID_RULER_OBJECT                                ( SID_SVX_START + 81 )
+#define SID_RULER_PAGE_POS                              ( SID_SVX_START + 82 )
+#define SID_RULER_ACT_LINE_ONLY                         ( SID_SVX_START + 83 )
+#define SID_RULER_LR_MIN_MAX                            ( SID_SVX_START + 84 )
+//#define SID_ZOOM_TOOLBOX                                ( SID_SVX_START + 96 )    -> sfxsids.hrc
+//#define SID_ZOOM_OUT                                    ( SID_SVX_START + 97 )    -> sfxsids.hrc
+//#define SID_ZOOM_IN                                     ( SID_SVX_START + 98 )    -> sfxsids.hrc
+//#define SID_SIZE_REAL                                   ( SID_SVX_START + 99 )    -> sfxsids.hrc
+//#define SID_SIZE_PAGE                                   ( SID_SVX_START + 100 )   -> sfxsids.hrc
+#define SID_SIZE_ALL                                    ( SID_SVX_START + 101 )
+#define SID_DRAW_LINE                                   ( SID_SVX_START + 102 )
+#define SID_DRAW_XLINE                                  ( SID_SVX_START + 103 )
+#define SID_DRAW_RECT                                   ( SID_SVX_START + 104 )
+#define SID_DRAW_RECT_ROUND                             ( SID_SVX_START + 105 )
+#define SID_DRAW_RECT_MOREROUND                         ( SID_SVX_START + 106 )
+#define SID_DRAW_FULLRECT                               ( SID_SVX_START + 107 )
+#define SID_DRAW_FULLRECT_ROUND                         ( SID_SVX_START + 108 )
+#define SID_DRAW_FULLRECT_MOREROUND                     ( SID_SVX_START + 109 )
+#define SID_DRAW_ELLIPSE                                ( SID_SVX_START + 110 )
+#define SID_DRAW_FULLELLIPSE                            ( SID_SVX_START + 111 )
+#define SID_DRAW_PIE                                    ( SID_SVX_START + 112 )
+#define SID_DRAW_FULLPIE                                ( SID_SVX_START + 113 )
+#define SID_DRAW_ARC                                    ( SID_SVX_START + 114 )
+#define SID_DRAW_CIRCLECUT                              ( SID_SVX_START + 115 )
+#define SID_DRAW_FULLCIRCLECUT                          ( SID_SVX_START + 116 )
+#define SID_DRAW_POLYGON                                ( SID_SVX_START + 117 )
+#define SID_DRAW_BEZIER_FILL                            ( SID_SVX_START + 118 )
+#define SID_BEZIER_INSERT                               ( SID_SVX_START + 119 )
+#define SID_BEZIER_DELETE                               ( SID_SVX_START + 120 )
+#define SID_BEZIER_MOVE                                 ( SID_SVX_START + 121 )
+#define SID_BEZIER_CLOSE                                ( SID_SVX_START + 122 )
+#define SID_BEZIER_SMOOTH                               ( SID_SVX_START + 123 )
+#define SID_BEZIER_APPEND                               ( SID_SVX_START + 124 )
+#define SID_BEZIER_OPEN                                 ( SID_SVX_START + 125 )
+#define SID_BEZIER_EDIT                                 ( SID_SVX_START + 126 )
+#define SID_BEZIER_CUTLINE                              ( SID_SVX_START + 127 )
+#define SID_OBJECT_SELECT                               ( SID_SVX_START + 128 )
+#define SID_OBJECT_ROTATE                               ( SID_SVX_START + 129 )
+#define SID_OBJECT_ALIGN                                ( SID_SVX_START + 130 )
+#define SID_OBJECT_ALIGN_LEFT                           ( SID_SVX_START + 131 )
+#define SID_OBJECT_ALIGN_CENTER                         ( SID_SVX_START + 132 )
+#define SID_OBJECT_ALIGN_RIGHT                          ( SID_SVX_START + 133 )
+#define SID_OBJECT_ALIGN_UP                             ( SID_SVX_START + 134 )
+#define SID_OBJECT_ALIGN_MIDDLE                         ( SID_SVX_START + 135 )
+#define SID_OBJECT_ALIGN_DOWN                           ( SID_SVX_START + 136 )
+#define SID_COPY_FORMAT                                 ( SID_SVX_START + 137 )
+#define SID_PASTE_FORMAT                                ( SID_SVX_START + 138 )
+#define SID_INSERT_ORGANIGRAM                           ( SID_SVX_START + 139 )
+#define SID_INSERT_DIAGRAM                              ( SID_SVX_START + 140 )
+#define SID_DRAW_CHART                                      SID_INSERT_DIAGRAM
+#define SID_INSERT_TABLE                                ( SID_SVX_START + 141 )
+#define SID_ATTRIBUTES_AREA                             ( SID_SVX_START + 142 )
+#define SID_ATTRIBUTES_LINE                             ( SID_SVX_START + 143 )
+#define SID_CHOOSE_CONTROLS                             ( SID_SVX_START + 144 )
+#define SID_ACTIVATE_CONTROLS                           ( SID_SVX_START + 145 )
+#define SID_INSERT_PUSHBUTTON                           ( SID_SVX_START + 146 )
+#define SID_INSERT_RADIOBUTTON                          ( SID_SVX_START + 147 )
+#define SID_INSERT_CHECKBOX                             ( SID_SVX_START + 148 )
+#define SID_OUTLINE                                     ( SID_SVX_START + 149 )
+#define SID_OUTLINE_UP                                  ( SID_SVX_START + 150 )
+#define SID_OUTLINE_DOWN                                ( SID_SVX_START + 151 )
+#define SID_OUTLINE_LEFT                                ( SID_SVX_START + 152 )
+#define SID_OUTLINE_RIGHT                               ( SID_SVX_START + 153 )
+#define SID_OUTLINE_FORMAT                              ( SID_SVX_START + 154 )
+#define SID_OUTLINE_COLLAPSE_ALL                        ( SID_SVX_START + 155 )
+#define SID_OUTLINE_BULLET                              ( SID_SVX_START + 156 )
+#define SID_PRESENTATION                                ( SID_SVX_START + 157 )
+#define SID_TIMER                                       ( SID_SVX_START + 158 )
+#define SID_REHEARSE_TIMINGS                            ( SID_SVX_START + 159 )
+#define SID_DIA                                         ( SID_SVX_START + 160 )
+#define SID_HIDE_SLIDE                                  ( SID_SVX_START + 161 )
+#define SID_CHOOSE_POLYGON                              ( SID_SVX_START + 162 )
+//#define SID_SHOW_BROWSER                                ( SID_SVX_START + 163 )   -> sfxsids.hrc
+#define SID_ATTR_FILL_STYLE                             ( SID_SVX_START + 164 )
+#define SID_ATTR_FILL_COLOR                             ( SID_SVX_START + 165 )
+#define SID_ATTR_FILL_GRADIENT                          ( SID_SVX_START + 166 )
+#define SID_ATTR_FILL_HATCH                             ( SID_SVX_START + 167 )
+#define SID_ATTR_FILL_BITMAP                            ( SID_SVX_START + 168 )
+#define SID_ATTR_LINE_STYLE                             ( SID_SVX_START + 169 )
+#define SID_ATTR_LINE_DASH                              ( SID_SVX_START + 170 )
+#define SID_ATTR_LINE_WIDTH                             ( SID_SVX_START + 171 )
+#define SID_ATTR_LINE_COLOR                             ( SID_SVX_START + 172 )
+#define SID_ATTR_LINE_START                             ( SID_SVX_START + 173 )
+#define SID_ATTR_LINE_END                               ( SID_SVX_START + 174 )
+#define SID_ATTR_LINE_STARTWIDTH                        ( SID_SVX_START + 175 )
+#define SID_ATTR_LINE_ENDWIDTH                          ( SID_SVX_START + 176 )
+#define SID_ATTR_LINE_STARTCENTER                       ( SID_SVX_START + 177 )
+#define SID_ATTR_LINE_ENDCENTER                         ( SID_SVX_START + 178 )
+#define SID_COLOR_TABLE                                 ( SID_SVX_START + 179 )
+#define SID_GRADIENT_LIST                               ( SID_SVX_START + 180 )
+#define SID_HATCH_LIST                                  ( SID_SVX_START + 181 )
+#define SID_BITMAP_LIST                                 ( SID_SVX_START + 182 )
+#define SID_DASH_LIST                                   ( SID_SVX_START + 183 )
+#define SID_LINEEND_LIST                                ( SID_SVX_START + 184 )
+#define SID_BACKGROUND_COLOR                            ( SID_SVX_START + 185 )
+#define SID_BACKGROUND_PATTERN                          ( SID_SVX_START + 186 )
+#define SID_ATTR_BORDER                                 ( SID_SVX_START + 187 )
+#define SID_INSERT_FIXEDTEXT                            ( SID_SVX_START + 188 )
+#define SID_INSERT_GROUPBOX                             ( SID_SVX_START + 189 )
+#define SID_INSERT_EDIT                                 ( SID_SVX_START + 190 )
+#define SID_INSERT_LISTBOX                              ( SID_SVX_START + 191 )
+#define SID_INSERT_COMBOBOX                             ( SID_SVX_START + 192 )
+#define SID_INSERT_SPINBUTTON                           ( SID_SVX_START + 193 )
+#define SID_INSERT_HSCROLLBAR                           ( SID_SVX_START + 194 )
+#define SID_INSERT_VSCROLLBAR                           ( SID_SVX_START + 195 )
+#define SID_INSERT_PREVIEW                              ( SID_SVX_START + 196 )
+#define SID_INSERT_URLBUTTON                            ( SID_SVX_START + 197 )
+#define SID_INSERT_SELECT                               ( SID_SVX_START + 198 )
+#define SID_DIALOG_TESTMODE                             ( SID_SVX_START + 199 )
+#define SID_FRAME_LINESTYLE                             ( SID_SVX_START + 200 )
+#define SID_FRAME_LINECOLOR                             ( SID_SVX_START + 201 )
+#define SID_ATTR_GRID_USE                               ( SID_SVX_START + 202 )
+#define SID_ATTR_GRID_VISIBLE                           ( SID_SVX_START + 203 )
+#define SID_ATTR_GRID_DRAW_X                            ( SID_SVX_START + 204 )
+#define SID_ATTR_GRID_DRAW_Y                            ( SID_SVX_START + 205 )
+#define SID_ATTR_GRID_DIVISION_X                        ( SID_SVX_START + 206 )
+#define SID_ATTR_GRID_DIVISION_Y                        ( SID_SVX_START + 207 )
+#define SID_ATTR_GRID_SNAP_X                            ( SID_SVX_START + 208 )
+#define SID_ATTR_GRID_SNAP_Y                            ( SID_SVX_START + 209 )
+#define SID_ATTR_GRID_ORIGIN_X                          ( SID_SVX_START + 210 )
+#define SID_ATTR_GRID_ORIGIN_Y                          ( SID_SVX_START + 211 )
+#define SID_IMPORT_GRAPH_PREVIEW                        ( SID_SVX_START + 212 )
+#define SID_IMPORT_GRAPH_LASTPATH                       ( SID_SVX_START + 213 )
+#define SID_IMPORT_GRAPH_LASTFILTER                     ( SID_SVX_START + 214 )
+#define SID_SEARCHDLG_SEARCHSTRINGS                     ( SID_SVX_START + 215 )
+#define SID_SEARCHDLG_REPLACESTRINGS                    ( SID_SVX_START + 216 )
+#define SID_ATTR_TABLE                                  ( SID_SVX_START + 217 )
+#define SID_ATTR_TABLE_COLUMN                           ( SID_SVX_START + 218 )
+#define SID_ATTR_TABLE_ROW                              ( SID_SVX_START + 219 )
+#define SID_ATTR_COLUMNS                                ( SID_SVX_START + 220 )
+#define SID_ATTR_INSERT                                 ( SID_SVX_START + 221 )
+#define SID_ATTR_ZOOM_USER                              ( SID_SVX_START + 222 )
+#define SID_ATTR_POSITION                               ( SID_SVX_START + 223 )
+#define SID_ATTR_SIZE                                   ( SID_SVX_START + 224 )
+#define SID_TABLE_CELL                                  ( SID_SVX_START + 225 )
+#define SID_ATTR_ALIGN_HOR_JUSTIFY                      ( SID_SVX_START + 226 )
+#define SID_ATTR_ALIGN_VER_JUSTIFY                      ( SID_SVX_START + 227 )
+#define SID_ATTR_ALIGN_MARGIN                           ( SID_SVX_START + 228 )
+#define SID_ATTR_ALIGN_STACKED                          ( SID_SVX_START + 229 )
+#define SID_ATTR_ALIGN_LINEBREAK                        ( SID_SVX_START + 230 )
+#define SID_OUTLINE_COLLAPSE                            ( SID_SVX_START + 231 )
+#define SID_OUTLINE_EXPAND_ALL                          ( SID_SVX_START + 232 )
+#define SID_OUTLINE_EXPAND                              ( SID_SVX_START + 233 )
+#define SID_OUTLINE_DELETEALL                           ( SID_SVX_START + 234 )
+#define SID_ATTR_TRANSFORM_PROTECT_POS                  ( SID_SVX_START + 236 )
+#define SID_ATTR_TRANSFORM_PROTECT_SIZE                 ( SID_SVX_START + 237 )
+#define SID_ATTR_TRANSFORM_AUTOSIZE                     ( SID_SVX_START + 238 ) // !!!
+#define SID_ATTR_TRANSFORM_INTERN                       ( SID_SVX_START + 239 )
+#define SID_INSERT_FRAME                                ( SID_SVX_START + 240 )
+#define SID_INSERT_GRAPHIC                              ( SID_SVX_START + 241 )
+#define SID_AUTOFORMAT                                  ( SID_SVX_START + 242 )
+#define SID_SPELL_DIALOG                                 ( SID_SVX_START + 243 )
+#define SID_INSERT_DRAW                                 ( SID_SVX_START + 244 )
+#define SID_THESAURUS                                   ( SID_SVX_START + 245 )
+#define SID_AUTOCOMPLETEWORD                            ( SID_SVX_START + 251 )
+#define SID_DRAW_TEXT                                   ( SID_SVX_START + 253 )
+#define SID_DRAW_CAPTION                                ( SID_SVX_START + 254 )
+#define SID_INSERT_LEGEND                                   SID_DRAW_CAPTION
+#define SID_DRAW_SELECT                                 ( SID_SVX_START + 255 )
+#define SID_FONTWORK                                    ( SID_SVX_START + 256 )
+#define SID_FORMTEXT_STYLE                              ( SID_SVX_START + 257 )
+#define SID_FORMTEXT_ADJUST                             ( SID_SVX_START + 258 )
+#define SID_FORMTEXT_DISTANCE                           ( SID_SVX_START + 259 )
+#define SID_FORMTEXT_START                              ( SID_SVX_START + 260 )
+#define SID_FORMTEXT_MIRROR                             ( SID_SVX_START + 261 )
+#define SID_FORMTEXT_OUTLINE                            ( SID_SVX_START + 262 )
+#define SID_FORMTEXT_SHADOW                             ( SID_SVX_START + 263 )
+#define SID_FORMTEXT_SHDWCOLOR                          ( SID_SVX_START + 264 )
+#define SID_FORMTEXT_SHDWXVAL                           ( SID_SVX_START + 265 )
+#define SID_FORMTEXT_SHDWYVAL                           ( SID_SVX_START + 266 )
+#define SID_FORMTEXT_STDFORM                            ( SID_SVX_START + 267 )
+#define SID_FORMTEXT_HIDEFORM                           ( SID_SVX_START + 268 )
+#define SID_FORMTEXT_RESERVED1                          ( SID_SVX_START + 269 )
+#define SID_FORMTEXT_RESERVED2                          ( SID_SVX_START + 270 )
+#define SID_FORMTEXT_RESERVED3                          ( SID_SVX_START + 271 )
+#define SID_FORMTEXT_RESERVED4                          ( SID_SVX_START + 272 )
+#define SID_FORMTEXT_RESERVED5                          ( SID_SVX_START + 273 )
+#define SID_FORMTEXT_RESERVED_LAST                      ( SID_SVX_START + 274 )
+#define SID_GALLERY_ENABLE_ADDCOPY                      ( SID_SVX_START + 276 )
+#define SID_GALLERY_IMPORTTHEME                         ( SID_SVX_START + 277 )
+#define SID_GALLERY_BG_POS                              ( SID_SVX_START + 278 )
+//#define SID_GALLERY_BG_BRUSH                            ( SID_SVX_START + 279 )   -> sfxsids.hrc
+#define SID_GALLERY_FORMATS                             ( SID_SVX_START + 280 )
+//#define SID_SEARCH_OPTIONS                              ( SID_SVX_START + 281 )   -> sfxsids.hrc
+#define SID_OBJECT_HELL                                 ( SID_SVX_START + 282 )
+#define SID_OBJECT_HEAVEN                               ( SID_SVX_START + 283 )
+#define SID_ATTR_LONG_ULSPACE                           ( SID_SVX_START + 284 )
+#define SID_ATTR_LONG_LRSPACE                           ( SID_SVX_START + 285 )
+#define SID_FRAME_TO_TOP                                ( SID_SVX_START + 286 )
+#define SID_FRAME_TO_BOTTOM                             ( SID_SVX_START + 287 )
+#define SID_POSTIT                                      ( SID_SVX_START + 288 )
+//#define SID_ZOOM                                        ( SID_SVX_START + 289 )   -> sfxsids.hrc
+#define SID_GRID                                        ( SID_SVX_START + 290 )
+//#define SID_SEARCH_ITEM                                 ( SID_SVX_START + 291 )   -> sfxsids.hrc
+#define SID_SEARCH_SEARCHSET                            ( SID_SVX_START + 292 )
+#define SID_SEARCH_REPLACESET                           ( SID_SVX_START + 293 )
+#define SID_SET_SUPER_SCRIPT                            ( SID_SVX_START + 294 )
+#define SID_SET_SUB_SCRIPT                              ( SID_SVX_START + 295 )
+#define SID_CHAR_DLG                                    ( SID_SVX_START + 296 )
+#define SID_PARA_DLG                                    ( SID_SVX_START + 297 )
+#define SID_ATTR_GRID_OPTIONS                           ( SID_SVX_START + 298 )
+#define SID_ATTR_FILL_SHADOW                            ( SID_SVX_START + 299 )
+#define SID_ATTR_LINEEND_STYLE                          ( SID_SVX_START + 301 )
+#define SID_ATTR_TRANSFORM_SLANT                        ( SID_SVX_START + 302 ) // !!!
+#define SID_ATTR_TRANSFORM_SHEAR                        ( SID_SVX_START + 304 )
+#define SID_ATTR_TRANSFORM_SHEAR_X                      ( SID_SVX_START + 305 )
+#define SID_ATTR_TRANSFORM_SHEAR_Y                      ( SID_SVX_START + 306 )
+#define SID_ATTR_TRANSFORM_SHEAR_VERTICAL               ( SID_SVX_START + 307 )
+#define SID_ATTR_TRANSFORM_RESIZE_REF_X                 ( SID_SVX_START + 308 )
+#define SID_ATTR_TRANSFORM_RESIZE_REF_Y                 ( SID_SVX_START + 309 )
+#define SID_ATTR_TRANSFORM_AUTOWIDTH                    ( SID_SVX_START + 310 )
+#define SID_ATTR_TRANSFORM_AUTOHEIGHT                   ( SID_SVX_START + 311 )
+#define SID_ATTR_TRANSFORM_HORI_RELATION                ( SID_SVX_START + 312 )
+#define SID_ATTR_TRANSFORM_VERT_RELATION                ( SID_SVX_START + 313 )
+#define SID_ATTR_TRANSFORM_HORI_ORIENT                  ( SID_SVX_START + 314 )
+#define SID_ATTR_TRANSFORM_IN_VERTICAL_TEXT             ( SID_SVX_START + 315 )
+#define SID_ATTR_TRANSFORM_IN_RTL_TEXT                  ( SID_SVX_START + 316 )
+#define SID_ATTR_TRANSFORM_HORI_MIRROR                  ( SID_SVX_START + 317 )
+#define SID_ATTR_TRANSFORM_ANCHOR                       ( SID_SVX_START + 318 )
+#define SID_ATTR_TRANSFORM_VERT_ORIENT                  ( SID_SVX_START + 319 )
+#define SID_TAB_INSERT                                  ( SID_SVX_START + 320 )
+#define SID_TAB_COUNT                                   ( SID_SVX_START + 321 )
+#define SID_TAB_POSITION                                ( SID_SVX_START + 322 )
+#define SID_TAB_ADJUST                                  ( SID_SVX_START + 323 )
+#define SID_TAB_DECIMAL                                 ( SID_SVX_START + 324 )
+#define SID_TAB_FILLCHAR                                ( SID_SVX_START + 325 )
+#define SID_SCAN                                        ( SID_SVX_START + 330 )
+#define SID_TWAIN_SELECT                                ( SID_SVX_START + 331 )
+#define SID_TWAIN_TRANSFER                              ( SID_SVX_START + 332 )
+#define SID_CONTOUR_DLG                                 ( SID_SVX_START + 334 )
+#define SID_CONTOUR_EXEC                                ( SID_SVX_START + 335 )
+#define SID_BORDER_OBJECT                               ( SID_SVX_START + 340 )
+#define SID_BORDER_LEFTLINE                             ( SID_SVX_START + 341 )
+#define SID_BORDER_RIGHTLINE                            ( SID_SVX_START + 342 )
+#define SID_BORDER_TOPLINE                              ( SID_SVX_START + 343 )
+#define SID_BORDER_BOTTOMLINE                           ( SID_SVX_START + 344 )
+#define SID_BORDER_HORIZONTALLINE                       ( SID_SVX_START + 345 )
+#define SID_BORDER_VERTICALLINE                         ( SID_SVX_START + 346 )
+#define SID_BORDER_DISTANCE                             ( SID_SVX_START + 347 )
+#define SID_SB_CONNECTIONPOOLING                        ( SID_SVX_START + 348 )
+#define SID_SB_DBREGISTEROPTIONS                        ( SID_SVX_START + 349 )
+#define SID_BMPMASK                                     ( SID_SVX_START + 350 )
+#define SID_BMPMASK_PIPETTE                             ( SID_SVX_START + 351 )
+#define SID_BMPMASK_BMPSELECT                           ( SID_SVX_START + 352 )
+#define SID_BMPMASK_EXEC                                ( SID_SVX_START + 353 )
+//#define SID_HYPERLINK_INSERT                            ( SID_SVX_START + 360 )   -> sfxsids.hrc
+//#define SID_HYPERLINK_GETLINK                           ( SID_SVX_START + 361 )   -> sfxsids.hrc
+//#define SID_HYPERLINK_SETLINK                           ( SID_SVX_START + 362 )   -> sfxsids.hrc
+#define SID_NO_GRAPHICS                                 ( SID_SVX_START + 364 )
+#define SID_IMPORT_GRAPH_LASTURL                        ( SID_SVX_START + 365 )
+//#define SID_NAVIGATOR                                   ( SID_SVX_START + 366 )   -> sfxsids.hrc
+#define SID_ATTR_TEXT_FITTOSIZE                         ( SID_SVX_START + 367 )
+#define SID_ATTR_BRUSH_ROW                              ( SID_SVX_START + 368 )
+#define SID_OPTFILTER_MSOFFICE                          ( SID_SVX_START + 369 )
+#define SID_IMAP                                        ( SID_SVX_START + 371 )
+#define SID_IMAP_DLG                                    ( SID_SVX_START + 372 )
+#define SID_IMAP_SELECT                                 ( SID_SVX_START + 373 )
+#define SID_IMAP_EXEC                                   ( SID_SVX_START + 374 )
+#define SID_SHOW_HIDDEN                                 ( SID_SVX_START + 375 )
+#define SID_SHOW_FORMS                                  ( SID_SVX_START + 376 )
+#define SID_DRAW_RECT_NOFILL                            ( SID_SVX_START + 378 )
+#define SID_DRAW_RECT_ROUND_NOFILL                      ( SID_SVX_START + 379 )
+#define SID_DRAW_SQUARE                                 ( SID_SVX_START + 380 )
+#define SID_DRAW_SQUARE_ROUND                           ( SID_SVX_START + 381 )
+#define SID_DRAW_SQUARE_NOFILL                          ( SID_SVX_START + 382 )
+#define SID_DRAW_SQUARE_ROUND_NOFILL                    ( SID_SVX_START + 383 )
+#define SID_DRAW_ELLIPSE_NOFILL                         ( SID_SVX_START + 384 )
+#define SID_DRAW_CIRCLE                                 ( SID_SVX_START + 385 )
+#define SID_DRAW_CIRCLE_NOFILL                          ( SID_SVX_START + 386 )
+#define SID_DRAW_PIE_NOFILL                             ( SID_SVX_START + 387 )
+#define SID_DRAW_CIRCLEPIE                              ( SID_SVX_START + 388 )
+#define SID_DRAW_CIRCLEPIE_NOFILL                       ( SID_SVX_START + 389 )
+#define SID_DRAW_CIRCLEARC                              ( SID_SVX_START + 390 )
+#define SID_DRAW_CIRCLECUT_NOFILL                       ( SID_SVX_START + 391 )
+#define SID_DRAW_ELLIPSECUT                             ( SID_SVX_START + 392 )
+#define SID_DRAW_ELLIPSECUT_NOFILL                      ( SID_SVX_START + 393 )
+#define SID_DRAW_XPOLYGON                               ( SID_SVX_START + 394 )
+#define SID_DRAW_POLYGON_NOFILL                         ( SID_SVX_START + 395 )
+#define SID_DRAW_XPOLYGON_NOFILL                        ( SID_SVX_START + 396 )
+#define SID_DRAW_BEZIER_NOFILL                          ( SID_SVX_START + 397 )
+#define SID_DRAWTBX_TEXT                                ( SID_SVX_START + 398 )
+#define SID_DRAWTBX_RECTANGLES                          ( SID_SVX_START + 399 )
+#define SID_DRAWTBX_ELLIPSES                            ( SID_SVX_START + 400 )
+#define SID_DRAWTBX_LINES                               ( SID_SVX_START + 401 )
+//#define SID_ZOOM_NEXT                                   ( SID_SVX_START + 402 )   -> sfxsids.hrc
+//#define SID_ZOOM_PREV                                   ( SID_SVX_START + 403 )   -> sfxsids.hrc
+#define SID_BACKGRND_DESTINATION                        ( SID_SVX_START + 404 )
+#define SID_ATTR_FLASH                                  ( SID_SVX_START + 406 )
+#define SID_ATTR_3D_LIGHT                               ( SID_SVX_START + 407 ) /* --> Slots mit --> koennen demnaechst entfallen ( heute 12.03.1998 ) */
+#define SID_ATTR_3D_START                                   SID_ATTR_3D_LIGHT
+#define SID_ATTR_3D_LIGHTINTENSITY                      ( SID_SVX_START + 408 ) /* --> Slots mit --> koennen demnaechst entfallen ( heute 12.03.1998 ) */
+#define SID_ATTR_3D_LIGHTCOLOR                          ( SID_SVX_START + 409 ) /* --> Slots mit --> koennen demnaechst entfallen ( heute 12.03.1998 ) */
+#define SID_ATTR_3D_AMBIENTINTENSITY                    ( SID_SVX_START + 410 ) /* --> Slots mit --> koennen demnaechst entfallen ( heute 12.03.1998 ) */
+#define SID_ATTR_3D_AMBIENTCOLOR                        ( SID_SVX_START + 411 )
+#define SID_IMPORT_GRAPH_LINK                           ( SID_SVX_START + 412 )
+#define SID_HTML_MODE                                   ( SID_SVX_START + 414 )
+#define SID_RULER_PROTECT                               ( SID_SVX_START + 415 )
+//#define SID_INET_DLG                                    ( SID_SVX_START + 416 )   -> sfxsids.hrc
+#define SID_COLOR_CONTROL                               ( SID_SVX_START + 417 )
+#define SID_ATTR_3D_PERSPECTIVE                         ( SID_SVX_START + 418 )
+#define SID_ATTR_3D_DEPTH                               ( SID_SVX_START + 419 )
+#define SID_ATTR_3D_DISTANCE                            ( SID_SVX_START + 420 )
+#define SID_ATTR_3D_FOCAL_LENGTH                        ( SID_SVX_START + 421 )
+#define SID_ATTR_3D_INTERN                              ( SID_SVX_START + 422 )
+#define SID_PSZ_FUNCTION                                ( SID_SVX_START + 423 )
+//#define SID_AUTO_CORRECT_DLG                            ( SID_SVX_START + 424 )   -> sfxsids.hrc
+#define SID_OFASLOTS_START                              ( SID_SVX_START + 425 )
+//#define SID_SD_AUTOPILOT                                ( SID_SVX_START + 425 )   -> sfxsids.hrc
+#define SID_AUTOPILOT                                       SID_SD_AUTOPILOT
+
+#define SID_TABLE_INSERT_COL_DLG						( SID_SVX_START + 426 )
+#define SID_TABLE_INSERT_ROW_DLG						( SID_SVX_START + 427 )
+#define SID_TABLE_PARAM_INSERT_AFTER					( SID_SVX_START + 428 )
+
+#define SID_TABLEDESIGN									( SID_SVX_START + 429 )
+#define SID_MN_AUTOPILOT                                ( SID_SVX_START + 430 )
+#define SID_GENERAL_OPTIONS                             ( SID_SVX_START + 432 )
+#define SID_SW_EDITOPTIONS                              ( SID_SVX_START + 433 )
+#define SID_SD_EDITOPTIONS                              ( SID_SVX_START + 434 )
+#define SID_SC_EDITOPTIONS                              ( SID_SVX_START + 435 )
+#define SID_SM_EDITOPTIONS                              ( SID_SVX_START + 436 )
+#define SID_SCH_EDITOPTIONS                             ( SID_SVX_START + 437 )
+#define SID_SIM_EDITOPTIONS                             ( SID_SVX_START + 438 )
+#define SID_SW_ONLINEOPTIONS                            ( SID_SVX_START + 439 )
+#define SID_MN_OPTIONS                                  ( SID_SVX_START + 440 )
+#define SID_GET_COLORTABLE                              ( SID_SVX_START + 441 )
+#define SID_MN_INSERT_OBJECT_DLGS                       ( SID_SVX_START + 442 )
+#define SID_OUTLINE_TO_IMPRESS                          ( SID_SVX_START + 443 )
+#define SID_SIM_TP_COLOR                                ( SID_SVX_START + 444 )
+#define SID_SIM_TP_EFFECTS                              ( SID_SVX_START + 445 )
+#define SID_SPELLCHECKER_CHANGED                        ( SID_SVX_START + 446 )
+#define SID_SD_GRAPHIC_OPTIONS                          ( SID_SVX_START + 447 )
+#define SID_SM_TP_PRINTOPTIONS                          ( SID_SVX_START + 448 )
+#define SID_OFASLOTS_END                                ( SID_SVX_START + 449 )
+#define SID_SB_STARBASEOPTIONS                          ( SID_SVX_START + 450 )
+#define SID_SWREGISTER_COLLECTION                       ( SID_SVX_START + 451 )
+#define SID_FILTER_DLG                                  ( SID_SVX_START + 452 )
+#define SID_ATTR_BRUSH_TABLE                            ( SID_SVX_START + 453 )
+#define SID_GROUP                                       ( SID_SVX_START + 454 )
+#define SID_UNGROUP                                     ( SID_SVX_START + 455 )
+#define SID_SET_DEFAULT                                 ( SID_SVX_START + 456 )
+#define SID_BEZIER                                      ( SID_SVX_START + 458 )
+#define SID_ATTR_3D_DOUBLE_SIDED                        ( SID_SVX_START + 459 )
+#define SID_ATTR_ALIGN_INDENT                           ( SID_SVX_START + 460 )
+#define SID_DEC_INDENT                                  ( SID_SVX_START + 461 )
+#define SID_INC_INDENT                                  ( SID_SVX_START + 462 )
+#define SID_DRAW_FREELINE                               ( SID_SVX_START + 463 )
+#define SID_DRAW_FREELINE_NOFILL                        ( SID_SVX_START + 464 )
+#define SID_DRAW_TEXT_MARQUEE                           ( SID_SVX_START + 465 )
+#define SID_SCH_TP_DEFCOLORS                            ( SID_SVX_START + 466 )
+#define SID_SWREGISTER_MODE                             ( SID_SVX_START + 467 )
+#define SID_OPTBASE_DATABASENAMES                       ( SID_SVX_START + 468 )
+#define SID_GRFFILTER                                   ( SID_SVX_START + 469 )
+#define SID_GRFFILTER_INVERT                            ( SID_SVX_START + 470 )
+#define SID_GRFFILTER_SMOOTH                            ( SID_SVX_START + 471 )
+#define SID_GRFFILTER_SHARPEN                           ( SID_SVX_START + 472 )
+#define SID_GRFFILTER_REMOVENOISE                       ( SID_SVX_START + 473 )
+#define SID_GRFFILTER_SOBEL                             ( SID_SVX_START + 474 )
+#define SID_GRFFILTER_MOSAIC                            ( SID_SVX_START + 475 )
+#define SID_GRFFILTER_EMBOSS                            ( SID_SVX_START + 476 )
+#define SID_GRFFILTER_POSTER                            ( SID_SVX_START + 477 )
+#define SID_GRFFILTER_POPART                            ( SID_SVX_START + 478 )
+#define SID_GRFFILTER_SEPIA                             ( SID_SVX_START + 479 )
+#define SID_GRFFILTER_SOLARIZE                          ( SID_SVX_START + 480 )
+#define SID_COLL_CLEAR                                  ( SID_SVX_START + 536 )
+#define SID_SHOW_ADDRESS                                ( SID_SVX_START + 538 )
+#define SID_APP_ENTERWAIT                               ( SID_SVX_START + 550 )
+#define SID_APP_LEAVEWAIT                               ( SID_SVX_START + 551 )
+#define SID_APP_ISWAIT                                  ( SID_SVX_START + 552 )
+#define SID_OFA_TBL_DESIGNVIEW                          ( SID_SVX_START + 554 )
+#define SID_OFA_TBL_ADRESSBOOK                          ( SID_SVX_START + 555 )
+#define SID_OFA_QRY_DESIGNVIEW                          ( SID_SVX_START + 556 )
+#define SID_OFA_QRY_SQLVIEW                             ( SID_SVX_START + 557 )
+#define SID_OFA_FRM_DESIGNVIEW                          ( SID_SVX_START + 558 )
+#define SID_OFA_RPT_DESIGNVIEW                          ( SID_SVX_START + 559 )
+#define SID_OFA_TBL_CREATE                              ( SID_SVX_START + 560 )
+#define SID_OFA_QRY_CREATE                              ( SID_SVX_START + 561 )
+#define SID_OFA_FRM_CREATE                              ( SID_SVX_START + 562 )
+#define SID_OFA_RPT_CREATE                              ( SID_SVX_START + 563 )
+#define SID_FIELD_GRABFOCUS                             ( SID_SVX_START + 567 )
+#define SID_ATTR_3D_HORZ_SEGS                           ( SID_SVX_START + 568 )
+#define SID_ATTR_3D_VERT_SEGS                           ( SID_SVX_START + 569 )
+#define SID_ATTR_3D_DUMMY_1                             ( SID_SVX_START + 570 )
+#define SID_ATTR_3D_DUMMY_2                             ( SID_SVX_START + 571 )
+#define SID_BROWSER_DLG                                 ( SID_SVX_START + 572 )
+#define SID_OFA_TBL_COMPRESS                            ( SID_SVX_START + 576 )
+#define SID_ATTR_ALIGN_DEGREES                          ( SID_SVX_START + 577 )
+#define SID_ATTR_ALIGN_LOCKPOS                          ( SID_SVX_START + 578 )
+#define SID_ATTR_LINEEND_WIDTH_DEFAULT                  ( SID_SVX_START + 579 )
+#define SID_ATTR_NUMBERFORMAT_ONE_AREA                  ( SID_SVX_START + 580 )
+#define SID_FUNCTION_CONTROL                            ( SID_SVX_START + 581 )
+#define SID_TAB_REMOVE                                  ( SID_SVX_START + 582 )
+#define SID_TAB_REMOVE_ALL                              ( SID_SVX_START + 583 )
+#define SID_TAB_REMOVE_BY_INDEX                         ( SID_SVX_START + 584 )
+#define SID_OFA_VW_CREATE                               ( SID_SVX_START + 585 )
+#define SID_OFA_REL_DESIGNVIEW                          ( SID_SVX_START + 588 )
+#define SID_OFA_MANUAL_SQL                              ( SID_SVX_START + 589 )
+#define SID_PARA_BACKGRND_DESTINATION                   ( SID_SVX_START + 590 )
+#define SID_ATTR_BRUSH_CHAR                             ( SID_SVX_START + 591 )
+#define SID_FMSLOTS_START                               ( SID_SVX_START + 592 )
+#define SID_FM_CONFIG                                   ( SID_SVX_START + 593 )
+#define SID_FM_PUSHBUTTON                               ( SID_SVX_START + 594 )
+#define SID_FM_RADIOBUTTON                              ( SID_SVX_START + 595 )
+#define SID_FM_CHECKBOX                                 ( SID_SVX_START + 596 )
+#define SID_FM_FIXEDTEXT                                ( SID_SVX_START + 597 )
+#define SID_FM_GROUPBOX                                 ( SID_SVX_START + 598 )
+#define SID_FM_EDIT                                     ( SID_SVX_START + 599 )
+#define SID_FM_LISTBOX                                  ( SID_SVX_START + 600 )
+#define SID_FM_COMBOBOX                                 ( SID_SVX_START + 601 )
+#define SID_FM_DBGRID                                   ( SID_SVX_START + 603 )
+#define SID_FM_IMAGEBUTTON                              ( SID_SVX_START + 604 )
+#define SID_FM_FILECONTROL                              ( SID_SVX_START + 605 )
+#define SID_FM_CHANGECOL                                ( SID_SVX_START + 606 )
+#define SID_FM_NAVIGATIONBAR                            ( SID_SVX_START + 607 )
+#define SID_FM_NEW_HIDDEN                               ( SID_SVX_START + 608 )
+#define SID_FM_RENAME_OBJECT                            ( SID_SVX_START + 609 )
+#define SID_FM_DELETEROWS                               ( SID_SVX_START + 610 )
+#define SID_FM_INSERTCOL                                ( SID_SVX_START + 611 )
+#define SID_FM_DELETECOL                                ( SID_SVX_START + 612 )
+#define SID_FM_CTL_PROPERTIES                           ( SID_SVX_START + 613 )
+#define SID_FM_PROPERTIES                               ( SID_SVX_START + 614 )
+#define SID_FM_TAB_DIALOG                               ( SID_SVX_START + 615 )
+#define SID_FM_RECORD_FIRST                             ( SID_SVX_START + 616 )
+#define SID_FM_RECORD_NEXT                              ( SID_SVX_START + 617 )
+#define SID_FM_RECORD_PREV                              ( SID_SVX_START + 618 )
+#define SID_FM_RECORD_LAST                              ( SID_SVX_START + 619 )
+#define SID_FM_RECORD_NEW                               ( SID_SVX_START + 620 )
+#define SID_FM_RECORD_DELETE                            ( SID_SVX_START + 621 )
+#define SID_FM_RECORD_ABSOLUTE                          ( SID_SVX_START + 622 )
+#define SID_FM_ADD_FIELD                                ( SID_SVX_START + 623 )
+#define SID_FM_RECORD_TEXT                              ( SID_SVX_START + 624 )
+#define SID_FM_RECORD_FROM_TEXT                         ( SID_SVX_START + 625 )
+#define SID_FM_RECORD_TOTAL                             ( SID_SVX_START + 626 )
+#define SID_FM_RECORD_SAVE                              ( SID_SVX_START + 627 )
+#define SID_FM_CREATE_CONTROL                           ( SID_SVX_START + 628 )
+#define SID_FM_DESIGN_MODE                              ( SID_SVX_START + 629 )
+#define SID_FM_RECORD_UNDO                              ( SID_SVX_START + 630 )
+#define SID_FM_CONTROL_IDENTIFIER                       ( SID_SVX_START + 631 )
+#define SID_FM_CONTROL_INVENTOR                         ( SID_SVX_START + 632 )
+#define SID_FM_SHOW_FMEXPLORER                          ( SID_SVX_START + 633 )
+#define SID_FM_FIELDS_CONTROL                           ( SID_SVX_START + 634 )
+#define SID_FM_SHOW_PROPERTIES                          ( SID_SVX_START + 635 )
+#define SID_FM_PROPERTY_CONTROL                         ( SID_SVX_START + 636 )
+#define SID_FM_FMEXPLORER_CONTROL                       ( SID_SVX_START + 637 )
+#define SID_FM_NEW                                      ( SID_SVX_START + 638 )
+#define SID_FM_DELETE                                   ( SID_SVX_START + 639 )
+#define SID_FM_NEW_FORM                                 ( SID_SVX_START + 640 )
+#define SID_FMSLOTS_END                                 ( SID_SVX_START + 641 )
+#define SID_REDLIN_FILTER_PAGE                          ( SID_SVX_START + 642 )
+#define SID_REDLIN_VIEW_PAGE                            ( SID_SVX_START + 643 )
+#define SID_3D_WIN                                      ( SID_SVX_START + 644 )
+#define SID_3D_STATE                                    ( SID_SVX_START + 645 )
+#define SID_3D_INIT                                     ( SID_SVX_START + 646 )
+#define SID_3D_ASSIGN                                   ( SID_SVX_START + 647 )
+#define SID_CONVERT_TO_3D                               ( SID_SVX_START + 648 )
+#define SID_CONVERT_TO_3D_LATHE_FAST                    ( SID_SVX_START + 649 )
+#define SID_ATTR_3D_PERCENT_DIAGONAL                    ( SID_SVX_START + 650 )
+#define SID_ATTR_3D_BACKSCALE                           ( SID_SVX_START + 651 )
+#define SID_ATTR_3D_END_ANGLE                           ( SID_SVX_START + 652 )
+#define SID_ATTR_3D_NORMALS_KIND                        ( SID_SVX_START + 653 )
+#define SID_ATTR_3D_NORMALS_INVERT                      ( SID_SVX_START + 654 )
+#define SID_ATTR_3D_TWO_SIDED_LIGHTING                  ( SID_SVX_START + 655 )
+#define SID_ATTR_3D_TEXTURE_KIND                        ( SID_SVX_START + 656 )
+#define SID_ATTR_3D_TEXTURE_MODE                        ( SID_SVX_START + 657 )
+#define SID_ATTR_3D_TEXTURE_PROJ_X                      ( SID_SVX_START + 658 )
+#define SID_ATTR_3D_TEXTURE_PROJ_Y                      ( SID_SVX_START + 659 )
+#define SID_ATTR_3D_TEXTURE_FILTER                      ( SID_SVX_START + 660 )
+#define SID_ATTR_3D_MAT_COLOR                           ( SID_SVX_START + 661 )
+#define SID_ATTR_3D_MAT_EMISSION                        ( SID_SVX_START + 662 )
+#define SID_ATTR_3D_MAT_SPECULAR                        ( SID_SVX_START + 663 )
+#define SID_ATTR_3D_MAT_SPECULAR_INTENSITY              ( SID_SVX_START + 664 )
+#define SID_ATTR_3D_SHADE_MODE                          ( SID_SVX_START + 665 )
+#define SID_ATTR_3D_SHADOW_3D                           ( SID_SVX_START + 666 )
+#define SID_ATTR_3D_SHADOW_SLANT                        ( SID_SVX_START + 667 )
+#define SID_ATTR_3D_LIGHTCOLOR_1                        ( SID_SVX_START + 668 )
+#define SID_ATTR_3D_LIGHTCOLOR_2                        ( SID_SVX_START + 669 )
+#define SID_ATTR_3D_LIGHTCOLOR_3                        ( SID_SVX_START + 670 )
+#define SID_ATTR_3D_LIGHTCOLOR_4                        ( SID_SVX_START + 671 )
+#define SID_ATTR_3D_LIGHTCOLOR_5                        ( SID_SVX_START + 672 )
+#define SID_ATTR_3D_LIGHTCOLOR_6                        ( SID_SVX_START + 673 )
+#define SID_ATTR_3D_LIGHTCOLOR_7                        ( SID_SVX_START + 674 )
+#define SID_ATTR_3D_LIGHTCOLOR_8                        ( SID_SVX_START + 675 )
+#define SID_ATTR_3D_LIGHTON_1                           ( SID_SVX_START + 676 )
+#define SID_ATTR_3D_LIGHTON_2                           ( SID_SVX_START + 677 )
+#define SID_ATTR_3D_LIGHTON_3                           ( SID_SVX_START + 678 )
+#define SID_ATTR_3D_LIGHTON_4                           ( SID_SVX_START + 679 )
+#define SID_ATTR_3D_LIGHTON_5                           ( SID_SVX_START + 680 )
+#define SID_ATTR_3D_LIGHTON_6                           ( SID_SVX_START + 681 )
+#define SID_ATTR_3D_LIGHTON_7                           ( SID_SVX_START + 682 )
+#define SID_ATTR_3D_LIGHTON_8                           ( SID_SVX_START + 683 )
+#define SID_ATTR_3D_LIGHTDIRECTION_1                    ( SID_SVX_START + 684 )
+#define SID_ATTR_3D_LIGHTDIRECTION_2                    ( SID_SVX_START + 685 )
+#define SID_ATTR_3D_LIGHTDIRECTION_3                    ( SID_SVX_START + 686 )
+#define SID_ATTR_3D_LIGHTDIRECTION_4                    ( SID_SVX_START + 687 )
+#define SID_ATTR_3D_LIGHTDIRECTION_5                    ( SID_SVX_START + 688 )
+#define SID_ATTR_3D_LIGHTDIRECTION_6                    ( SID_SVX_START + 689 )
+#define SID_ATTR_3D_LIGHTDIRECTION_7                    ( SID_SVX_START + 690 )
+#define SID_ATTR_3D_LIGHTDIRECTION_8                    ( SID_SVX_START + 691 )
+#define SID_ATTR_3D_END                                     SID_ATTR_3D_LIGHTDIRECTION_8
+#define SID_ATTR_3D_DUMMY_3                             ( SID_SVX_START + 692 )
+#define SID_ATTR_3D_DUMMY_4                             ( SID_SVX_START + 693 )
+#define SID_ATTR_3D_DUMMY_5                             ( SID_SVX_START + 694 )
+#define SID_ATTR_3D_DUMMY_6                             ( SID_SVX_START + 695 )
+#define SID_ATTR_3D_DUMMY_7                             ( SID_SVX_START + 696 )
+#define SID_ATTR_3D_DUMMY_8                             ( SID_SVX_START + 697 )
+#define SID_ATTR_3D_DUMMY_9                             ( SID_SVX_START + 698 )
+#define SID_ATTR_3D_DUMMY_10                            ( SID_SVX_START + 699 )
+#define SID_ATTR_NUMBERFORMAT_NOLANGUAGE                ( SID_SVX_START + 700 )
+#define SID_MN_GROUP                                    ( SID_SVX_START + 701 )
+#define SID_FM_AUTO_ORDER                               ( SID_SVX_START + 702 )
+
+#define SID_MORE_FMSLOTS_START                          ( SID_SVX_START + 702 )
+#define SID_FM_SHOW_PROPERTY_BROWSER                    ( SID_SVX_START + 703 )
+#define SID_FM_DATEFIELD                                ( SID_SVX_START + 704 )
+#define SID_FM_TIMEFIELD                                ( SID_SVX_START + 705 )
+#define SID_FM_NUMERICFIELD                             ( SID_SVX_START + 706 )
+#define SID_FM_CURRENCYFIELD                            ( SID_SVX_START + 707 )
+#define SID_FM_PATTERNFIELD                             ( SID_SVX_START + 708 )
+#define SID_FM_OPEN_READONLY                            ( SID_SVX_START + 709 )
+#define SID_FM_IMAGECONTROL                             ( SID_SVX_START + 710 )
+#define SID_FM_REMOVE_FILTER_SORT                       ( SID_SVX_START + 711 )
+#define SID_FM_SORTUP                                   ( SID_SVX_START + 712 )
+#define SID_FM_SORTDOWN                                 ( SID_SVX_START + 713 )
+#define SID_FM_ORDERCRIT                                ( SID_SVX_START + 714 )
+#define SID_FM_FILTERCRIT                               ( SID_SVX_START + 715 )
+#define SID_FM_AUTOFILTER                               ( SID_SVX_START + 716 )
+#define SID_FM_COUNTALL                                 ( SID_SVX_START + 717 )
+#define SID_FM_NATIVESQL                                ( SID_SVX_START + 720 )
+#define SID_FM_EXECUTE                                  ( SID_SVX_START + 721 )
+#define SID_SBA_QRY_EXECUTE                                 SID_FM_EXECUTE
+#define SID_FM_ADDTABLE                                 ( SID_SVX_START + 722 )
+#define SID_FM_FORM_FILTERED                            ( SID_SVX_START + 723 )
+#define SID_FM_REFRESH                                  ( SID_SVX_START + 724 )
+#define SID_FM_SEARCH                                   ( SID_SVX_START + 725 )
+#define SID_FM_LEAVE_CREATE                             ( SID_SVX_START + 726 ) // Formcontroller-Button rauspoppen
+#define SID_FM_USE_WIZARDS                              ( SID_SVX_START + 727 )
+#define SID_FM_FORMATTEDFIELD                           ( SID_SVX_START + 728 )
+#define SID_FM_FILTER_START                             ( SID_SVX_START + 729 )
+#define SID_FM_FILTER_EXIT                              ( SID_SVX_START + 730 )
+#define SID_FM_FILTER_EXECUTE                           ( SID_SVX_START + 731 )
+#define SID_FM_FILTER_NAVIGATOR                         ( SID_SVX_START + 732 )
+#define SID_FM_CHANGECONTROLTYPE                        ( SID_SVX_START + 733 )
+#define SID_FM_CONVERTTO_EDIT                           ( SID_SVX_START + 734 )
+#define SID_FM_CONVERTTO_BUTTON                         ( SID_SVX_START + 735 )
+#define SID_FM_CONVERTTO_FIXEDTEXT                      ( SID_SVX_START + 736 )
+#define SID_FM_CONVERTTO_LISTBOX                        ( SID_SVX_START + 737 )
+#define SID_FM_CONVERTTO_CHECKBOX                       ( SID_SVX_START + 738 )
+#define SID_FM_CONVERTTO_RADIOBUTTON                    ( SID_SVX_START + 739 )
+#define SID_FM_CONVERTTO_GROUPBOX                       ( SID_SVX_START + 740 )
+#define SID_FM_CONVERTTO_COMBOBOX                       ( SID_SVX_START + 741 )
+#define SID_FM_CONVERTTO_IMAGEBUTTON                    ( SID_SVX_START + 743 )
+#define SID_FM_CONVERTTO_FILECONTROL                    ( SID_SVX_START + 744 )
+#define SID_FM_CONVERTTO_DATE                           ( SID_SVX_START + 745 )
+#define SID_FM_CONVERTTO_TIME                           ( SID_SVX_START + 746 )
+#define SID_FM_CONVERTTO_NUMERIC                        ( SID_SVX_START + 747 )
+#define SID_FM_CONVERTTO_CURRENCY                       ( SID_SVX_START + 748 )
+#define SID_FM_CONVERTTO_PATTERN                        ( SID_SVX_START + 749 )
+#define SID_FM_CONVERTTO_IMAGECONTROL                   ( SID_SVX_START + 750 )
+#define SID_FM_CONVERTTO_FORMATTED                      ( SID_SVX_START + 751 )
+#define SID_FM_FILTER_NAVIGATOR_CONTROL                 ( SID_SVX_START + 752 )
+#define SID_FM_HIDECOL                                  ( SID_SVX_START + 753 )
+#define SID_FM_SHOWCOLS                                 ( SID_SVX_START + 754 )
+#define SID_FM_SHOWCOLS_MORE                            ( SID_SVX_START + 755 )
+#define SID_FM_SHOWALLCOLS                              ( SID_SVX_START + 756 )
+#define SID_FM_TWOFIELDS_DATE_N_TIME                    ( SID_SVX_START + 757 )
+#define SID_FM_FILTER_EDIT                              ( SID_SVX_START + 758 )
+#define SID_FM_FILTER_IS_NULL                           ( SID_SVX_START + 759 )
+#define SID_FM_FILTER_IS_NOT_NULL                       ( SID_SVX_START + 760 )
+#define SID_FM_VIEW_AS_GRID                             ( SID_SVX_START + 761 )
+#define SID_FM_FILTER_REMOVE                            ( SID_SVX_START + 762 )
+#define SID_FM_AUTOCONTROLFOCUS                         ( SID_SVX_START + 763 )
+#define SID_DSBROWSER_EXPLORER                          ( SID_SVX_START + 764 )
+#define SID_FM_CREATE_FIELDCONTROL                      ( SID_SVX_START + 765 )
+#define SID_FM_DATACCESS_DESCRIPTOR                     ( SID_SVX_START + 766 )
+#define SID_FM_GRABCONTROLFOCUS                         ( SID_SVX_START + 767 )
+#define SID_FM_SCROLLBAR                                ( SID_SVX_START + 768 )
+#define SID_FM_SPINBUTTON                               ( SID_SVX_START + 769 )
+#define SID_FM_CONVERTTO_SCROLLBAR                      ( SID_SVX_START + 770 )
+#define SID_FM_CONVERTTO_SPINBUTTON                     ( SID_SVX_START + 771 )
+#define SID_FM_CONVERTTO_NAVIGATIONBAR                  ( SID_SVX_START + 772 )
+#define SID_FM_SHOW_DATANAVIGATOR			            ( SID_SVX_START + 773 )
+#define SID_FM_DATANAVIGATOR_CONTROL		            ( SID_SVX_START + 774 )
+#define SID_FM_REFRESH_FORM_CONTROL                     ( SID_SVX_START + 775 )
+#define SID_MORE_FMSLOTS_END                            ( SID_SVX_START + 850 )
+
+#define SID_HLINKBAR_LINK                               ( SID_SVX_START + 851 )
+#define SID_HLINKBAR_BOOKMARK                           ( SID_SVX_START + 852 )
+#define SID_HLINKBAR_SEARCH                             ( SID_SVX_START + 853 )
+#define SID_HLINKBAR_TARGET                             ( SID_SVX_START + 854 )
+#define SID_PARAM_NUM_PRESET                            ( SID_SVX_START + 856 )
+#define SID_PARAM_CUR_NUMBER                            ( SID_SVX_START + 857 )
+#define SID_PARAM_CHILD_LEVELS                          ( SID_SVX_START + 858 )
+#define SID_PARAM_CUR_NUM_LEVEL                         ( SID_SVX_START + 859 )
+#define SID_CREATE_SW_DRAWVIEW                          ( SID_SVX_START + 860 )
+#define SID_ATTR_GRAF_LUMINANCE                         ( SID_SVX_START + 863 )
+#define SID_ATTR_GRAF_CONTRAST                          ( SID_SVX_START + 864 )
+#define SID_ATTR_GRAF_RED                               ( SID_SVX_START + 865 )
+#define SID_ATTR_GRAF_GREEN                             ( SID_SVX_START + 866 )
+#define SID_ATTR_GRAF_BLUE                              ( SID_SVX_START + 867 )
+#define SID_ATTR_GRAF_GAMMA                             ( SID_SVX_START + 868 )
+#define SID_ATTR_GRAF_TRANSPARENCE                      ( SID_SVX_START + 869 )
+#define SID_ATTR_GRAF_INVERT                            ( SID_SVX_START + 870 )
+#define SID_ATTR_GRAF_MODE                              ( SID_SVX_START + 871 )
+#define SID_ATTR_GRAF_RESERVE2                          ( SID_SVX_START + 872 )
+#define SID_ATTR_GRAF_RESERVE3                          ( SID_SVX_START + 873 )
+#define SID_ATTR_GRAF_RESERVE4                          ( SID_SVX_START + 874 )
+#define SID_ATTR_GRAF_RESERVE5                          ( SID_SVX_START + 875 )
+//#define SID_COMP_BIBLIOGRAPHY                           ( SID_SVX_START + 880 )   -> sfxsids.hrc
+#define SID_ATTR_GRAF_KEEP_ZOOM                         ( SID_SVX_START + 882 )
+#define SID_ATTR_GRAF_CROP                              ( SID_SVX_START + 883 )
+#define SID_ATTR_GRAF_FRMSIZE                           ( SID_SVX_START + 884 )
+#define SID_ATTR_GRAF_FRMSIZE_PERCENT                   ( SID_SVX_START + 885 )
+#define SID_ATTR_GRAF_GRAPHIC                           ( SID_SVX_START + 886 )
+#define SID_ASIAN_DLG                                   ( SID_SVX_START + 904 )
+#define SID_DRAW_TEXT_VERTICAL                          SID_ATTR_CHAR_VERTICAL
+#define SID_DRAW_CAPTION_VERTICAL                       ( SID_SVX_START + 906 )
+#define SID_TEXTDIRECTION_LEFT_TO_RIGHT                 ( SID_SVX_START + 907 )
+#define SID_TEXTDIRECTION_TOP_TO_BOTTOM                 ( SID_SVX_START + 908 )
+#define SID_TRANSLITERATE_UPPER                         ( SID_SVX_START + 912 )
+#define SID_TRANSLITERATE_LOWER                         ( SID_SVX_START + 913 )
+#define SID_TRANSLITERATE_HALFWIDTH                     ( SID_SVX_START + 914 )
+#define SID_TRANSLITERATE_FULLWIDTH                     ( SID_SVX_START + 915 )
+#define SID_TRANSLITERATE_HIRAGANA                      ( SID_SVX_START + 916 )
+#define SID_TRANSLITERATE_KATAGANA                      ( SID_SVX_START + 917 )
+#define SID_MN_SUB_TRANSLITERATE                        ( SID_SVX_START + 918 )
+#define SID_LANGUAGE_OPTIONS                            ( SID_SVX_START + 921 )
+#define SID_GETUNDOSTRINGS                              ( SID_SVX_START + 923 )
+#define SID_GETREDOSTRINGS                              ( SID_SVX_START + 924 )
+#define SID_PARA_VERTALIGN                              ( SID_SVX_START + 925 )
+#define SID_INSERT_IMAGECONTROL                         ( SID_SVX_START + 926 )
+#define SID_INSERT_PROGRESSBAR                          ( SID_SVX_START + 927 )
+#define SID_INSERT_HFIXEDLINE                           ( SID_SVX_START + 928 )
+#define SID_INSERT_VFIXEDLINE                           ( SID_SVX_START + 929 )
+#define SID_READONLY_MODE                               ( SID_SVX_START + 930 )
+#define SID_ATTR_ALIGN_HYPHENATION                      ( SID_SVX_START + 931 )
+#define SID_ATTR_NUMBERFORMAT_SOURCE                    ( SID_SVX_START + 932 )
+#define SID_ATTR_AUTO_COLOR_INVALID                     ( SID_SVX_START + 933 )
+//#define SID_ADDRESS_DATA_SOURCE                         ( SID_SVX_START + 934 )   -> sfxsids.hrc
+#define SID_RULER_BORDER_DISTANCE                       ( SID_SVX_START + 935 )
+#define SID_INSERT_DATEFIELD                            ( SID_SVX_START + 936 )
+#define SID_INSERT_TIMEFIELD                            ( SID_SVX_START + 937 )
+#define SID_INSERT_NUMERICFIELD                         ( SID_SVX_START + 938 )
+#define SID_INSERT_CURRENCYFIELD                        ( SID_SVX_START + 939 )
+#define SID_INSERT_FORMATTEDFIELD                       ( SID_SVX_START + 940 )
+#define SID_INSERT_PATTERNFIELD                         ( SID_SVX_START + 941 )
+#define SID_INSERT_FILECONTROL                          ( SID_SVX_START + 942 )
+#define SID_SHOW_PROPERTYBROWSER                        ( SID_SVX_START + 943 )
+#define SID_ATTR_TABSTOP_VERTICAL                       ( SID_SVX_START + 946 )
+#define SID_RULER_BORDERS_VERTICAL                      ( SID_SVX_START + 948 )
+#define SID_ATTR_ALIGN_ASIANVERTICAL                    ( SID_SVX_START + 949 )
+#define SID_RULER_TEXT_RIGHT_TO_LEFT                    ( SID_SVX_START + 952 )
+#define SID_ATTR_HDFT_DYNAMIC_SPACING                   ( SID_SVX_START + 953 )
+#define SID_ATTR_NUMBERFORMAT_ADD_AUTO                  ( SID_SVX_START + 954 )
+#define SID_OPEN_HYPERLINK                              ( SID_SVX_START + 955 )
+#define SID_CTLFONT_STATE                               ( SID_SVX_START + 956 )
+#define SID_VERTICALTEXT_STATE                          ( SID_SVX_START + 957 )
+#define SID_OPEN_XML_FILTERSETTINGS                     ( SID_SVX_START + 958 )
+#define SID_HANGUL_HANJA_CONVERSION                     ( SID_SVX_START + 959 )
+#define SID_EXTRUSION_TOOGLE                            ( SID_SVX_START + 960 )
+#define SID_EXTRUSION_TILT_DOWN                         ( SID_SVX_START + 961 )
+#define SID_EXTRUSION_TILT_UP                           ( SID_SVX_START + 962 )
+#define SID_EXTRUSION_TILT_LEFT                         ( SID_SVX_START + 963 )
+#define SID_EXTRUSION_TILT_RIGHT                        ( SID_SVX_START + 964 )
+#define SID_EXTRUSION_DEPTH_FLOATER                     ( SID_SVX_START + 965 )
+#define SID_EXTRUSION_DIRECTION_FLOATER                 ( SID_SVX_START + 966 )
+#define SID_EXTRUSION_LIGHTING_FLOATER                  ( SID_SVX_START + 967 )
+#define SID_EXTRUSION_SURFACE_FLOATER                   ( SID_SVX_START + 968 )
+#define SID_EXTRUSION_3D_COLOR                          ( SID_SVX_START + 969 )
+#define SID_EXTRUSION_DEPTH                             ( SID_SVX_START + 970 )
+#define SID_EXTRUSION_DIRECTION                         ( SID_SVX_START + 971 )
+#define SID_EXTRUSION_PROJECTION                        ( SID_SVX_START + 972 )
+#define SID_EXTRUSION_LIGHTING_DIRECTION                ( SID_SVX_START + 973 )
+#define SID_EXTRUSION_LIGHTING_INTENSITY                ( SID_SVX_START + 974 )
+#define SID_EXTRUSION_SURFACE                           ( SID_SVX_START + 975 )
+#define SID_EXTRUSION_DEPTH_DIALOG                      ( SID_SVX_START + 976 )
+#define SID_FONTWORK_GALLERY_FLOATER                    ( SID_SVX_START + 977 )
+// free													( SID_SVX_START + 978 )
+#define SID_FONTWORK_SHAPE_TYPE							( SID_SVX_START + 979 )
+#define SID_FONTWORK_SAME_LETTER_HEIGHTS                ( SID_SVX_START + 980 )
+#define SID_FONTWORK_ALIGNMENT_FLOATER                  ( SID_SVX_START + 981 )
+#define SID_FONTWORK_CHARACTER_SPACING_FLOATER          ( SID_SVX_START + 982 )
+#define SID_FONTWORK_SHAPE                              ( SID_SVX_START + 983 )
+#define SID_FONTWORK_ALIGNMENT                          ( SID_SVX_START + 984 )
+#define SID_FONTWORK_CHARACTER_SPACING                  ( SID_SVX_START + 985 )
+#define SID_FONTWORK_KERN_CHARACTER_PAIRS               ( SID_SVX_START + 986 )
+#define SID_DRAW_FONTWORK                               ( SID_SVX_START + 987 )
+#define SID_DRAW_FONTWORK_VERTICAL                      ( SID_SVX_START + 988 )
+#define SID_ATTR_BORDER_CONNECT                         ( SID_SVX_START + 990 )
+#define SID_SW_FOLLOW_TEXT_FLOW                         ( SID_SVX_START + 991 ) /* #i18732# - slot-id for new option IsFollowingTextFlow' */
+#define SID_RULER_ROWS                                  ( SID_SVX_START + 992 )
+#define SID_RULER_ROWS_VERTICAL                         ( SID_SVX_START + 993 )
+#define SID_ATTR_TRANSFORM_HORI_POSITION                ( SID_SVX_START + 999 )
+#define SID_ATTR_TRANSFORM_VERT_POSITION                ( SID_SVX_START + 1000 )
+#define SID_SHOW_ITEMBROWSER                            ( SID_SVX_START + 1001 )
+#define SID_ALIGN_ANY_LEFT                              ( SID_SVX_START + 1002 )
+#define SID_ALIGN_ANY_HCENTER                           ( SID_SVX_START + 1003 )
+#define SID_ALIGN_ANY_RIGHT                             ( SID_SVX_START + 1004 )
+#define SID_ALIGN_ANY_JUSTIFIED                         ( SID_SVX_START + 1005 )
+#define SID_ALIGN_ANY_TOP                               ( SID_SVX_START + 1006 )
+#define SID_ALIGN_ANY_VCENTER                           ( SID_SVX_START + 1007 )
+#define SID_ALIGN_ANY_BOTTOM                            ( SID_SVX_START + 1008 )
+#define SID_ALIGN_ANY_HDEFAULT                          ( SID_SVX_START + 1009 )
+#define SID_ALIGN_ANY_VDEFAULT                          ( SID_SVX_START + 1010 )
+#define SID_SW_COLLAPSING_BORDERS                       ( SID_SVX_START + 1011 )
+#define SID_SW_WRAP_INFLUENCE_ON_OBJPOS                 ( SID_SVX_START + 1012 ) /* #i28701# - slot-id for new attribute WrapInfluenceOnObjPos' */
+#define SID_ATTR_BORDER_DIAG_TLBR                       ( SID_SVX_START + 1013 )
+#define SID_ATTR_BORDER_DIAG_BLTR                       ( SID_SVX_START + 1014 )
+#define SID_ATTR_ALIGN_SHRINKTOFIT                      ( SID_SVX_START + 1015 )
+#define SID_CHINESE_CONVERSION                          ( SID_SVX_START + 1016 )
+#define SID_PAGE_TYPE                                   ( SID_SVX_START + 1017 )
+#define SID_DLG_TYPE                                    ( SID_SVX_START + 1018 )
+#define SID_TABPAGE_POS                                 ( SID_SVX_START + 1019 )
+#define SID_GRAPHIC                                     ( SID_SVX_START + 1020 )
+#define SID_OBJECT_LIST                                 ( SID_SVX_START + 1021 )
+#define SID_ATTR_SET                                    ( SID_SVX_START + 1022 )
+#define SID_CHAR_FMT_LIST_BOX                           ( SID_SVX_START + 1023 )
+#define SID_METRIC_ITEM                                 ( SID_SVX_START + 1024 )
+#define SID_NUM_CHAR_FMT                                ( SID_SVX_START + 1025 )
+#define SID_BULLET_CHAR_FMT                             ( SID_SVX_START + 1026 )
+#define SID_DISABLE_SVXEXTPARAGRAPHTABPAGE_PAGEBREAK    ( SID_SVX_START + 1027 )
+#define SID_SVXPARAALIGNTABPAGE_ENABLEJUSTIFYEXT        ( SID_SVX_START + 1028 )
+#define SID_SVXSTDPARAGRAPHTABPAGE_PAGEWIDTH            ( SID_SVX_START + 1029 )
+#define SID_SVXSTDPARAGRAPHTABPAGE_FLAGSET              ( SID_SVX_START + 1030 )
+#define SID_SVXSTDPARAGRAPHTABPAGE_ABSLINEDIST          ( SID_SVX_START + 1031 )
+#define SID_SVXTABULATORTABPAGE_CONTROLFLAGS            ( SID_SVX_START + 1032 )
+#define SID_SVXTEXTATTRPAGE_VIEW                        ( SID_SVX_START + 1033 )
+#define SID_FLAG_TYPE                                   ( SID_SVX_START + 1034 )
+#define SID_SWMODE_TYPE                                 ( SID_SVX_START + 1035 )
+#define SID_DISABLE_CTL                                 ( SID_SVX_START + 1036 )
+#define SID_LINK_TYPE                                   ( SID_SVX_START + 1037 )
+#define SID_ENUM_PAGE_MODE                              ( SID_SVX_START + 1038 )
+#define SID_PAPER_START                                 ( SID_SVX_START + 1039 )
+#define SID_PAPER_END                                   ( SID_SVX_START + 1040 )
+#define SID_COLLECT_LIST                                ( SID_SVX_START + 1041 )
+#define SID_GROW_FONT_SIZE								( SID_SVX_START + 1042 )
+#define SID_SHRINK_FONT_SIZE							( SID_SVX_START + 1043 )
+// color subtoolbar on graphictoolbar
+#define SID_COLOR_SETTINGS                              ( SID_SVX_START + 1044 )
+#define SID_FM_MORE_CONTROLS                            ( SID_SVX_START + 1045 )
+#define SID_FM_FORM_DESIGN_TOOLS                        ( SID_SVX_START + 1046 )
+#define SID_DRAWTBX_CS_BASIC							( SID_SVX_START + 1047 )
+#define SID_DRAWTBX_CS_SYMBOL							( SID_SVX_START + 1048 )
+#define SID_DRAWTBX_CS_ARROW							( SID_SVX_START + 1049 )
+#define SID_DRAWTBX_CS_FLOWCHART						( SID_SVX_START + 1050 )
+#define SID_DRAWTBX_CS_CALLOUT							( SID_SVX_START + 1051 )
+#define SID_DRAWTBX_CS_STAR								( SID_SVX_START + 1052 )
+#define SID_DRAW_CS_ID									( SID_SVX_START + 1053 )
+#define SID_FONTWORK_CHARACTER_SPACING_DIALOG			( SID_SVX_START + 1054 )
+#define SID_BORDER_REDUCED_MODE                         ( SID_SVX_START + 1055 )
+#define SID_INSERT_RLM                                  ( SID_SVX_START + 1056 )   /* insert RLM - right to left mark */
+#define SID_INSERT_LRM                                  ( SID_SVX_START + 1057 )   /* insert LRM - left to right mark */
+#define SID_INSERT_ZWSP                                 ( SID_SVX_START + 1058 )   /* insert ZWJ - invisible space, keep words together*/
+#define SID_INSERT_ZWNBSP                               ( SID_SVX_START + 1059 )   /* insert ZWNJ - invisible space, forces linebreak*/
+#define SID_OPTIONS_DATABASES                           ( SID_SVX_START + 1060 )
+#define SID_OPEN_SMARTTAGMENU                           ( SID_SVX_START + 1061 )
+#define SID_OPEN_SMARTTAGOPTIONS                        ( SID_SVX_START + 1062 )
+#define SID_INSERT_TREECONTROL                          ( SID_SVX_START + 1063 )
+#define SID_ATTR_VIEWLAYOUT                             ( SID_SVX_START + 1064 )
+#define SID_ATTR_ZOOMSLIDER                             ( SID_SVX_START + 1065 )
+#define SID_FONTNAMELIST                                ( SID_SVX_START + 1066 )
+#define SID_LANGUAGE_STATUS                             ( SID_SVX_START + 1067 )
+#define SID_CHAR_DLG_FOR_PARAGRAPH                      ( SID_SVX_START + 1068 )
+#define SID_SET_DOCUMENT_LANGUAGE                       ( SID_SVX_START + 1069 )
+
+#define SID_TABLE_MERGE_CELLS							(SID_SVX_START+1070)
+#define SID_TABLE_SPLIT_CELLS							(SID_SVX_START+1071)
+#define SID_OPTIMIZE_TABLE								(SID_SVX_START+1072)
+#define SID_TABLE_VERT_BOTTOM							(SID_SVX_START+1073)
+#define SID_TABLE_VERT_CENTER							(SID_SVX_START+1074)
+#define SID_TABLE_VERT_NONE								(SID_SVX_START+1075)
+#define SID_TABLE_INSERT_ROW							(SID_SVX_START+1076)
+#define SID_TABLE_INSERT_COL							(SID_SVX_START+1077)
+#define SID_TABLE_DELETE_ROW							(SID_SVX_START+1078)
+#define SID_TABLE_DELETE_COL							(SID_SVX_START+1079)
+#define SID_TABLE_SELECT_ALL							(SID_SVX_START+1080)
+#define SID_TABLE_SELECT_COL							(SID_SVX_START+1081)
+#define SID_TABLE_SELECT_ROW							(SID_SVX_START+1082)
+#define SID_FORMAT_TABLE_DLG							(SID_SVX_START+1083)
+#define SID_TABLE_SORT_DIALOG							(SID_SVX_START+1084)
+#define SID_TABLE_AUTOSUM								(SID_SVX_START+1085)
+#define SID_TABLE_DISTRIBUTE_COLUMNS					(SID_SVX_START+1086)
+#define SID_TABLE_DISTRIBUTE_ROWS						(SID_SVX_START+1087)
+#define SID_TABLE_STYLE									(SID_SVX_START+1088)
+#define SID_TABLE_STYLE_SETTINGS						(SID_SVX_START+1089)
+#define SID_CHAR_DLG_PREVIEW_STRING                     (SID_SVX_START+1090)
+#define SID_RECHECK_DOCUMENT                            (SID_SVX_START+1091)
+#define SID_OBJECT_MIRROR                               (SID_SVX_START+1093)
+
+#define SID_DELETE_POSTIT								(SID_SVX_START+1094)
+#define SID_NEXT_POSTIT									(SID_SVX_START+1095)
+#define SID_PREVIOUS_POSTIT								(SID_SVX_START+1096)
+#define SID_DELETEALL_POSTIT							(SID_SVX_START+1097)
+#define SID_SHOW_POSTIT									(SID_SVX_START+1098)
+#define SID_REPLYTO_POSTIT								(SID_SVX_START+1099)
+#define SID_DELETEALLBYAUTHOR_POSTIT					(SID_SVX_START+1100)
+#define SID_INSERT_POSTIT							    (SID_SVX_START+1101)
+
+// IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id
+#define SID_SVX_FIRSTFREE								SID_INSERT_POSTIT + 1
+
+// --------------------------------------------------------------------------
+// Overflow check for slot IDs
+// --------------------------------------------------------------------------
+
+#if SID_SVX_FIRSTFREE > SID_SVX_END
+#error Resource-Ueberlauf in #line, #file
+#endif
+
+// --------------------------------------------------------------------------
+// Ranges, um ItemSets fuer bestimmte 3D-Objekte erstellen zu koennen
+// --------------------------------------------------------------------------
+
+//
+// SceneObject:
+#define SID_ATTR_3D_RANGE_SCENE \
+SID_ATTR_3D_AMBIENTCOLOR, SID_ATTR_3D_PERSPECTIVE, \
+SID_ATTR_3D_DISTANCE, SID_ATTR_3D_FOCAL_LENGTH, \
+SID_ATTR_3D_TWO_SIDED_LIGHTING, SID_ATTR_3D_TWO_SIDED_LIGHTING, \
+SID_ATTR_3D_SHADE_MODE, SID_ATTR_3D_SHADE_MODE, \
+SID_ATTR_3D_SHADOW_SLANT, SID_ATTR_3D_LIGHTDIRECTION_8 \
+
+//
+// CompoundObject:
+#define SID_ATTR_3D_RANGE_COMPOUND \
+SID_ATTR_3D_DOUBLE_SIDED, SID_ATTR_3D_DOUBLE_SIDED, \
+SID_ATTR_3D_NORMALS_KIND, SID_ATTR_3D_NORMALS_INVERT, \
+SID_ATTR_3D_TEXTURE_KIND, SID_ATTR_3D_MAT_SPECULAR_INTENSITY, \
+SID_ATTR_3D_SHADOW_3D, SID_ATTR_3D_SHADOW_3D \
+
+//
+// ExtrudeObject:
+#define SID_ATTR_3D_RANGE_EXTRUDE \
+SID_ATTR_3D_RANGE_COMPOUND, \
+SID_ATTR_3D_DEPTH, SID_ATTR_3D_DEPTH, \
+SID_ATTR_3D_PERCENT_DIAGONAL, SID_ATTR_3D_BACKSCALE \
+
+//
+// LatheObject:
+#define SID_ATTR_3D_RANGE_LATHE \
+SID_ATTR_3D_RANGE_COMPOUND, \
+SID_ATTR_3D_HORZ_SEGS, SID_ATTR_3D_VERT_SEGS, \
+SID_ATTR_3D_PERCENT_DIAGONAL, SID_ATTR_3D_END_ANGLE \
+
+//
+// SphereObject:
+#define SID_ATTR_3D_RANGE_SPHERE \
+SID_ATTR_3D_RANGE_COMPOUND, \
+SID_ATTR_3D_HORZ_SEGS, SID_ATTR_3D_VERT_SEGS \
+
+//
+// Spezieller Range fuer alle 3D-Objekte
+#define SID_ATTR_3D_RANGE_OBJECT \
+SID_ATTR_3D_RANGE_COMPOUND, \
+SID_ATTR_3D_DEPTH, SID_ATTR_3D_DEPTH, \
+SID_ATTR_3D_HORZ_SEGS, SID_ATTR_3D_VERT_SEGS, \
+SID_ATTR_3D_PERCENT_DIAGONAL, SID_ATTR_3D_END_ANGLE \
+
+#endif
+
+#endif // #ifndef _SVX_SVXIDS_HRC
+
+// ******************************************************************* EOF
+
diff --git a/svx/inc/svx/editobj.hxx b/editeng/inc/editeng/editobj.hxx
index f2b1aaabdf..682dd84cfa 100644
--- a/svx/inc/svx/editobj.hxx
+++ b/editeng/inc/editeng/editobj.hxx
@@ -35,8 +35,8 @@
 #include <tools/debug.hxx>
 #include <rsc/rscsfx.hxx>
 #include <svl/itemset.hxx>
-#include <svx/eeitem.hxx>
-#include "svx/svxdllapi.h"
+#include <editeng/eeitem.hxx>
+#include "editeng/editengdllapi.h"
 
 DBG_NAMEEX( EE_EditTextObject )
 
@@ -48,11 +48,11 @@ class EECharAttribArray;
 #define EDTOBJ_SETTINGS_ULITEMSUMMATION		0x00000001
 #define EDTOBJ_SETTINGS_ULITEMFIRSTPARA		0x00000002
 
-class SVX_DLLPUBLIC EditTextObject
+class EDITENG_DLLPUBLIC EditTextObject
 {
 private:
     USHORT				nWhich;
-    SVX_DLLPRIVATE EditTextObject&		operator=( const EditTextObject& );
+    EDITENG_DLLPRIVATE EditTextObject&		operator=( const EditTextObject& );
 
 protected:
                         EditTextObject( USHORT nWhich );
diff --git a/editeng/inc/editeng/editrids.hrc b/editeng/inc/editeng/editrids.hrc
new file mode 100644
index 0000000000..869d2253bf
--- /dev/null
+++ b/editeng/inc/editeng/editrids.hrc
@@ -0,0 +1,420 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: svxids.hrc,v $
+ * $Revision: 1.10.132.2 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef _EDIT_RIDS_HRC
+#define _EDIT_RIDS_HRC
+
+// include ------------------------------------------------------------------
+
+#include <svl/solar.hrc>
+
+// strings also used in cui
+#define RID_SVXSTR_PAPERBIN_SETTINGS		(RID_SVX_START + 149)
+#define RID_SVXSTR_PAPERBIN                 (RID_SVX_START + 145)
+
+// outliner
+#ifndef RID_OUTL_START
+#define RID_OUTL_START				( RID_EDIT_END + 100 )
+#endif
+
+#define RID_OUTLUNDO_DEPTH			( RID_OUTL_START + 0 )
+#define RID_OUTLUNDO_HEIGHT			( RID_OUTL_START + 1 )
+#define RID_OUTLUNDO_EXPAND			( RID_OUTL_START + 2 )
+#define RID_OUTLUNDO_COLLAPSE 		( RID_OUTL_START + 3 )
+#define RID_OUTLUNDO_ATTR 			( RID_OUTL_START + 4 )
+#define RID_OUTLUNDO_INSERT 		( RID_OUTL_START + 5 )
+
+
+// strings for items
+
+#define RID_SVXITEMS_TRUE					(RID_SVXITEMS_START +  0)
+#define RID_SVXITEMS_FALSE					(RID_SVXITEMS_START +  1)
+
+#define RID_SVXITEMS_FRMDIR_BEGIN				(RID_EDITITEMS_START + 570)
+#define RID_SVXITEMS_FRMDIR_HORI_LEFT_TOP		(RID_EDITITEMS_START + 570)
+#define RID_SVXITEMS_FRMDIR_HORI_RIGHT_TOP		(RID_EDITITEMS_START + 571)
+#define RID_SVXITEMS_FRMDIR_VERT_TOP_RIGHT		(RID_EDITITEMS_START + 572)
+#define RID_SVXITEMS_FRMDIR_VERT_TOP_LEFT		(RID_EDITITEMS_START + 573)
+#define RID_SVXITEMS_FRMDIR_ENVIRONMENT			(RID_EDITITEMS_START + 574)
+#define RID_SVXITEMS_FRMDIR_END					(RID_EDITITEMS_START + 574)
+
+#define RID_SVXITEMS_BORDER_COMPLETE		(RID_SVXITEMS_START + 490)
+#define RID_SVXITEMS_BORDER_TOP				(RID_SVXITEMS_START + 491)
+#define RID_SVXITEMS_BORDER_BOTTOM			(RID_SVXITEMS_START + 492)
+#define RID_SVXITEMS_BORDER_LEFT			(RID_SVXITEMS_START + 493)
+#define RID_SVXITEMS_BORDER_RIGHT			(RID_SVXITEMS_START + 494)
+#define RID_SVXITEMS_BORDER_DISTANCE		(RID_SVXITEMS_START + 495)
+#define RID_SVXITEMS_BORDER_NONE			(RID_SVXITEMS_START + 528)
+
+#define RID_SVXITEMS_TRANSPARENT_TRUE		(RID_SVXITEMS_START + 441)
+#define RID_SVXITEMS_TRANSPARENT_FALSE		(RID_SVXITEMS_START + 442)
+
+#define RID_SVXITEMS_OPAQUE_TRUE			(RID_SVXITEMS_START + 429)
+#define RID_SVXITEMS_OPAQUE_FALSE			(RID_SVXITEMS_START + 430)
+
+#define RID_SVXITEMS_SHADOW_COMPLETE		(RID_SVXITEMS_START + 489)
+#define RID_SVXITEMS_GRAPHIC				(RID_SVXITEMS_START + 526)
+#define RID_SVXITEMS_LINES					(RID_SVXITEMS_START + 511)
+#define RID_SVXITEMS_ORPHANS_COMPLETE		(RID_SVXITEMS_START + 513)
+#define RID_SVXITEMS_WIDOWS_COMPLETE		(RID_SVXITEMS_START + 512)
+#define RID_SVXITEMS_PAGEMODEL_COMPLETE		(RID_SVXITEMS_START + 517)
+
+#define RID_SVXITEMS_SHADOWED_TRUE			(RID_SVXITEMS_START + 415)
+#define RID_SVXITEMS_SHADOWED_FALSE			(RID_SVXITEMS_START + 416)
+#define RID_SVXITEMS_AUTOKERN_TRUE			(RID_SVXITEMS_START + 417)
+#define RID_SVXITEMS_AUTOKERN_FALSE			(RID_SVXITEMS_START + 418)
+#define RID_SVXITEMS_WORDLINE_TRUE			(RID_SVXITEMS_START + 419)
+#define RID_SVXITEMS_WORDLINE_FALSE			(RID_SVXITEMS_START + 420)
+#define RID_SVXITEMS_CONTOUR_TRUE			(RID_SVXITEMS_START + 421)
+#define RID_SVXITEMS_CONTOUR_FALSE			(RID_SVXITEMS_START + 422)
+#define RID_SVXITEMS_NOLINEBREAK_TRUE		(RID_SVXITEMS_START + 423)
+#define RID_SVXITEMS_NOLINEBREAK_FALSE		(RID_SVXITEMS_START + 424)
+#define RID_SVXITEMS_NOHYPHEN_TRUE			(RID_SVXITEMS_START + 425)
+#define RID_SVXITEMS_NOHYPHEN_FALSE			(RID_SVXITEMS_START + 426)
+#define RID_SVXITEMS_FMTKEEP_TRUE			(RID_SVXITEMS_START + 431)
+#define RID_SVXITEMS_FMTKEEP_FALSE			(RID_SVXITEMS_START + 432)
+#define RID_SVXITEMS_FMTSPLIT_TRUE			(RID_SVXITEMS_START + 433)
+#define RID_SVXITEMS_FMTSPLIT_FALSE			(RID_SVXITEMS_START + 434)
+
+#define RID_SVXITEMS_PRINT_TRUE				(RID_SVXITEMS_START + 427)
+#define RID_SVXITEMS_PRINT_FALSE			(RID_SVXITEMS_START + 428)
+#define RID_SVXITEMS_PROT_POS_TRUE			(RID_SVXITEMS_START + 439)
+#define RID_SVXITEMS_PROT_POS_FALSE			(RID_SVXITEMS_START + 440)
+#define RID_SVXITEMS_PROT_SIZE_TRUE			(RID_SVXITEMS_START + 437)
+#define RID_SVXITEMS_PROT_SIZE_FALSE		(RID_SVXITEMS_START + 438)
+#define RID_SVXITEMS_PROT_CONTENT_TRUE		(RID_SVXITEMS_START + 435)
+#define RID_SVXITEMS_PROT_CONTENT_FALSE		(RID_SVXITEMS_START + 436)
+#define RID_SVXITEMS_ULSPACE_UPPER			(RID_SVXITEMS_START + 496)
+#define RID_SVXITEMS_ULSPACE_LOWER			(RID_SVXITEMS_START + 497)
+#define RID_SVXITEMS_LRSPACE_LEFT			(RID_SVXITEMS_START + 486)
+#define RID_SVXITEMS_LRSPACE_FLINE			(RID_SVXITEMS_START + 487)
+#define RID_SVXITEMS_LRSPACE_RIGHT			(RID_SVXITEMS_START + 488)
+#define RID_SVXITEMS_SIZE_WIDTH				(RID_SVXITEMS_START + 484)
+#define RID_SVXITEMS_SIZE_HEIGHT			(RID_SVXITEMS_START + 485)
+#define RID_SVXITEMS_PAGE_END_TRUE			(RID_SVXITEMS_START + 451)
+#define RID_SVXITEMS_PAGE_END_FALSE			(RID_SVXITEMS_START + 452)
+#define RID_SVXITEMS_HYPHEN_TRUE			(RID_SVXITEMS_START + 449)
+#define RID_SVXITEMS_HYPHEN_FALSE			(RID_SVXITEMS_START + 450)
+#define RID_SVXITEMS_HYPHEN_MINLEAD			(RID_SVXITEMS_START + 514)
+#define RID_SVXITEMS_HYPHEN_MINTRAIL		(RID_SVXITEMS_START + 515)
+#define RID_SVXITEMS_HYPHEN_MAX				(RID_SVXITEMS_START + 516)
+#define RID_SVXITEMS_HNGPNCT_OFF			(RID_SVXITEMS_START + 552)
+#define RID_SVXITEMS_HNGPNCT_ON				(RID_SVXITEMS_START + 553)
+#define RID_SVXITEMS_FORBIDDEN_RULE_OFF 	(RID_SVXITEMS_START + 554)
+#define RID_SVXITEMS_FORBIDDEN_RULE_ON 	    (RID_SVXITEMS_START + 555)
+#define RID_SVXITEMS_SCRPTSPC_OFF			(RID_SVXITEMS_START + 550)
+#define RID_SVXITEMS_SCRPTSPC_ON			(RID_SVXITEMS_START + 551)
+#define RID_SVXITEMS_CHARSCALE_OFF			(RID_SVXITEMS_START + 559)
+#define RID_SVXITEMS_CHARSCALE				(RID_SVXITEMS_START + 560)
+#define RID_SVXITEMS_CHARROTATE_OFF			(RID_SVXITEMS_START + 556)
+#define RID_SVXITEMS_CHARROTATE				(RID_SVXITEMS_START + 557)
+#define RID_SVXITEMS_CHARROTATE_FITLINE		(RID_SVXITEMS_START + 558)
+
+#define RID_SVXITEMS_RELIEF_BEGIN			(RID_SVXITEMS_START + 561)
+#define RID_SVXITEMS_RELIEF_NONE			(RID_SVXITEMS_START + 561)
+#define RID_SVXITEMS_RELIEF_EMBOSSED		(RID_SVXITEMS_START + 562)
+#define RID_SVXITEMS_RELIEF_ENGRAVED		(RID_SVXITEMS_START + 563)
+#define RID_SVXITEMS_RELIEF_END				(RID_SVXITEMS_START + 564)
+
+#define RID_ATTR_CHAR_EMPHASISMARK          (RID_ATTR_BEGIN + 899)
+
+// enum FontEmphasisMark ---------------------------------------------------
+#define RID_SVXITEMS_EMPHASIS_BEGIN_STYLE	(RID_SVXITEMS_START + 530)
+#define RID_SVXITEMS_EMPHASIS_NONE_STYLE	(RID_SVXITEMS_START + 530)
+#define RID_SVXITEMS_EMPHASIS_DOT_STYLE		(RID_SVXITEMS_START + 531)
+#define RID_SVXITEMS_EMPHASIS_CIRCLE_STYLE	(RID_SVXITEMS_START + 532)
+#define RID_SVXITEMS_EMPHASIS_DISC_STYLE	(RID_SVXITEMS_START + 533)
+#define RID_SVXITEMS_EMPHASIS_ACCENT_STYLE	(RID_SVXITEMS_START + 534)
+
+#define RID_SVXITEMS_EMPHASIS_ABOVE_POS		(RID_SVXITEMS_START + 540)
+#define RID_SVXITEMS_EMPHASIS_BELOW_POS		(RID_SVXITEMS_START + 541)
+
+// enum ESCAPEMENT -------------------------------------------------------
+#define RID_SVXITEMS_ESCAPEMENT_BEGIN		(RID_SVXITEMS_START + 166)
+#define RID_SVXITEMS_ESCAPEMENT_OFF			(RID_SVXITEMS_START + 166)
+#define RID_SVXITEMS_ESCAPEMENT_SUPER		(RID_SVXITEMS_START + 167)
+#define RID_SVXITEMS_ESCAPEMENT_SUB			(RID_SVXITEMS_START + 168)
+#define RID_SVXITEMS_ESCAPEMENT_AUTO		(RID_SVXITEMS_START + 169)
+
+// enum CASEMAP ----------------------------------------------------------
+#define RID_SVXITEMS_CASEMAP_BEGIN			(RID_SVXITEMS_START + 160)
+#define RID_SVXITEMS_CASEMAP_NONE			(RID_SVXITEMS_START + 160)
+#define RID_SVXITEMS_CASEMAP_VERSALIEN		(RID_SVXITEMS_START + 161)
+#define RID_SVXITEMS_CASEMAP_GEMEINE		(RID_SVXITEMS_START + 162)
+#define RID_SVXITEMS_CASEMAP_TITEL			(RID_SVXITEMS_START + 163)
+#define RID_SVXITEMS_CASEMAP_KAPITAELCHEN	(RID_SVXITEMS_START + 164)
+
+#define RID_SVXITEMS_KERNING_COMPLETE		(RID_SVXITEMS_START + 518)
+#define RID_SVXITEMS_KERNING_EXPANDED		(RID_SVXITEMS_START + 519)
+#define RID_SVXITEMS_KERNING_CONDENSED		(RID_SVXITEMS_START + 520)
+
+#define RID_SVXITEMS_BLINK_TRUE				(RID_SVXITEMS_START + 453)
+#define RID_SVXITEMS_BLINK_FALSE			(RID_SVXITEMS_START + 454)
+
+#define RID_SVXITEMS_TWOLINES_OFF			(RID_SVXITEMS_START + 545)
+#define RID_SVXITEMS_TWOLINES				(RID_SVXITEMS_START + 546)
+
+// enum FontStrikeout ----------------------------------------------------
+#define RID_SVXITEMS_STRIKEOUT_BEGIN		(RID_SVXITEMS_START + 135)
+#define RID_SVXITEMS_STRIKEOUT_NONE			(RID_SVXITEMS_START + 135)
+#define RID_SVXITEMS_STRIKEOUT_SINGLE		(RID_SVXITEMS_START + 136)
+#define RID_SVXITEMS_STRIKEOUT_DOUBLE		(RID_SVXITEMS_START + 137)
+#define RID_SVXITEMS_STRIKEOUT_DONTKNOW		(RID_SVXITEMS_START + 138)
+#define RID_SVXITEMS_STRIKEOUT_BOLD			(RID_SVXITEMS_START + 139)
+#define RID_SVXITEMS_STRIKEOUT_SLASH		(RID_SVXITEMS_START + 140)
+#define RID_SVXITEMS_STRIKEOUT_X			(RID_SVXITEMS_START + 141)
+
+// enum FontUnderline - used for overline --------------------------------
+#define RID_SVXITEMS_OL_BEGIN				(RID_SVXITEMS_START + 200)
+#define RID_SVXITEMS_OL_NONE				(RID_SVXITEMS_START + 200)
+#define RID_SVXITEMS_OL_SINGLE				(RID_SVXITEMS_START + 201)
+#define RID_SVXITEMS_OL_DOUBLE				(RID_SVXITEMS_START + 202)
+#define RID_SVXITEMS_OL_DOTTED				(RID_SVXITEMS_START + 203)
+#define RID_SVXITEMS_OL_DONTKNOW			(RID_SVXITEMS_START + 204)
+#define RID_SVXITEMS_OL_DASH				(RID_SVXITEMS_START + 205)
+#define RID_SVXITEMS_OL_LONGDASH			(RID_SVXITEMS_START + 206)
+#define RID_SVXITEMS_OL_DASHDOT				(RID_SVXITEMS_START + 207)
+#define RID_SVXITEMS_OL_DASHDOTDOT			(RID_SVXITEMS_START + 208)
+#define RID_SVXITEMS_OL_SMALLWAVE			(RID_SVXITEMS_START + 209)
+#define RID_SVXITEMS_OL_WAVE				(RID_SVXITEMS_START + 210)
+#define RID_SVXITEMS_OL_DOUBLEWAVE			(RID_SVXITEMS_START + 211)
+#define RID_SVXITEMS_OL_BOLD				(RID_SVXITEMS_START + 212)
+#define RID_SVXITEMS_OL_BOLDDOTTED			(RID_SVXITEMS_START + 213)
+#define RID_SVXITEMS_OL_BOLDDASH			(RID_SVXITEMS_START + 214)
+#define RID_SVXITEMS_OL_BOLDLONGDASH		(RID_SVXITEMS_START + 215)
+#define RID_SVXITEMS_OL_BOLDDASHDOT			(RID_SVXITEMS_START + 216)
+#define RID_SVXITEMS_OL_BOLDDASHDOTDOT		(RID_SVXITEMS_START + 217)
+#define RID_SVXITEMS_OL_BOLDWAVE			(RID_SVXITEMS_START + 218)
+
+// enum FontUnderline - used for underline -------------------------------
+#define RID_SVXITEMS_UL_BEGIN				(RID_SVXITEMS_START + 170)
+#define RID_SVXITEMS_UL_NONE				(RID_SVXITEMS_START + 170)
+#define RID_SVXITEMS_UL_SINGLE				(RID_SVXITEMS_START + 171)
+#define RID_SVXITEMS_UL_DOUBLE				(RID_SVXITEMS_START + 172)
+#define RID_SVXITEMS_UL_DOTTED				(RID_SVXITEMS_START + 173)
+#define RID_SVXITEMS_UL_DONTKNOW			(RID_SVXITEMS_START + 174)
+#define RID_SVXITEMS_UL_DASH				(RID_SVXITEMS_START + 175)
+#define RID_SVXITEMS_UL_LONGDASH			(RID_SVXITEMS_START + 176)
+#define RID_SVXITEMS_UL_DASHDOT				(RID_SVXITEMS_START + 177)
+#define RID_SVXITEMS_UL_DASHDOTDOT			(RID_SVXITEMS_START + 178)
+#define RID_SVXITEMS_UL_SMALLWAVE			(RID_SVXITEMS_START + 179)
+#define RID_SVXITEMS_UL_WAVE				(RID_SVXITEMS_START + 180)
+#define RID_SVXITEMS_UL_DOUBLEWAVE			(RID_SVXITEMS_START + 181)
+#define RID_SVXITEMS_UL_BOLD				(RID_SVXITEMS_START + 182)
+#define RID_SVXITEMS_UL_BOLDDOTTED			(RID_SVXITEMS_START + 183)
+#define RID_SVXITEMS_UL_BOLDDASH			(RID_SVXITEMS_START + 184)
+#define RID_SVXITEMS_UL_BOLDLONGDASH		(RID_SVXITEMS_START + 185)
+#define RID_SVXITEMS_UL_BOLDDASHDOT			(RID_SVXITEMS_START + 186)
+#define RID_SVXITEMS_UL_BOLDDASHDOTDOT		(RID_SVXITEMS_START + 187)
+#define RID_SVXITEMS_UL_BOLDWAVE			(RID_SVXITEMS_START + 188)
+
+// enum FontWeight -------------------------------------------------------
+#define RID_SVXITEMS_WEIGHT_BEGIN			(RID_SVXITEMS_START + 120)
+#define RID_SVXITEMS_WEIGHT_DONTKNOW		(RID_SVXITEMS_START + 120)
+#define RID_SVXITEMS_WEIGHT_THIN			(RID_SVXITEMS_START + 121)
+#define RID_SVXITEMS_WEIGHT_ULTRALIGHT		(RID_SVXITEMS_START + 122)
+#define RID_SVXITEMS_WEIGHT_LIGHT			(RID_SVXITEMS_START + 123)
+#define RID_SVXITEMS_WEIGHT_SEMILIGHT		(RID_SVXITEMS_START + 124)
+#define RID_SVXITEMS_WEIGHT_NORMAL			(RID_SVXITEMS_START + 125)
+#define RID_SVXITEMS_WEIGHT_MEDIUM			(RID_SVXITEMS_START + 126)
+#define RID_SVXITEMS_WEIGHT_SEMIBOLD		(RID_SVXITEMS_START + 127)
+#define RID_SVXITEMS_WEIGHT_BOLD			(RID_SVXITEMS_START + 128)
+#define RID_SVXITEMS_WEIGHT_ULTRABOLD		(RID_SVXITEMS_START + 129)
+#define RID_SVXITEMS_WEIGHT_BLACK			(RID_SVXITEMS_START + 130)
+
+// paper formats
+#define RID_SVXSTR_PAPER_A0                 (RID_SVX_START + 100)
+#define RID_SVXSTR_PAPER_A1                 (RID_SVX_START + 101)	
+#define RID_SVXSTR_PAPER_A2                 (RID_SVX_START + 102)	
+#define RID_SVXSTR_PAPER_A3                 (RID_SVX_START + 103)	
+#define RID_SVXSTR_PAPER_A4                 (RID_SVX_START + 104)	
+#define RID_SVXSTR_PAPER_A5                 (RID_SVX_START + 105)	
+#define RID_SVXSTR_PAPER_B4_ISO             (RID_SVX_START + 106)	
+#define RID_SVXSTR_PAPER_B5_ISO             (RID_SVX_START + 107)	
+#define RID_SVXSTR_PAPER_LETTER             (RID_SVX_START + 108)	
+#define RID_SVXSTR_PAPER_LEGAL              (RID_SVX_START + 109)	
+#define RID_SVXSTR_PAPER_TABLOID            (RID_SVX_START + 110)	
+#define RID_SVXSTR_PAPER_USER               (RID_SVX_START + 111)	
+#define RID_SVXSTR_PAPER_B6_ISO             (RID_SVX_START + 112)	
+#define RID_SVXSTR_PAPER_C4                 (RID_SVX_START + 113)	
+#define RID_SVXSTR_PAPER_C5                 (RID_SVX_START + 114)	
+#define RID_SVXSTR_PAPER_C6                 (RID_SVX_START + 115)	
+#define RID_SVXSTR_PAPER_C65                (RID_SVX_START + 116)	
+#define RID_SVXSTR_PAPER_DL                 (RID_SVX_START + 117)	
+#define RID_SVXSTR_PAPER_DIA                (RID_SVX_START + 118)	
+#define RID_SVXSTR_PAPER_SCREEN             (RID_SVX_START + 119)	
+#define RID_SVXSTR_PAPER_C                  (RID_SVX_START + 120)	
+#define RID_SVXSTR_PAPER_D                  (RID_SVX_START + 121)	
+#define RID_SVXSTR_PAPER_E                  (RID_SVX_START + 122)	
+#define RID_SVXSTR_PAPER_EXECUTIVE          (RID_SVX_START + 123)	
+#define RID_SVXSTR_PAPER_LEGAL2				(RID_SVX_START + 124)	
+#define RID_SVXSTR_PAPER_MONARCH			(RID_SVX_START + 125)	
+#define RID_SVXSTR_PAPER_COM675				(RID_SVX_START + 126)	
+#define RID_SVXSTR_PAPER_COM9				(RID_SVX_START + 127)	
+#define RID_SVXSTR_PAPER_COM10				(RID_SVX_START + 128)	
+#define RID_SVXSTR_PAPER_COM11				(RID_SVX_START + 129)	
+#define RID_SVXSTR_PAPER_COM12				(RID_SVX_START + 130)	
+#define RID_SVXSTR_PAPER_KAI16				(RID_SVX_START + 131)	
+#define RID_SVXSTR_PAPER_KAI32				(RID_SVX_START + 132)	
+#define RID_SVXSTR_PAPER_KAI32BIG			(RID_SVX_START + 133)	
+#define RID_SVXSTR_PAPER_B4_JIS             (RID_SVX_START + 134)	
+#define RID_SVXSTR_PAPER_B5_JIS             (RID_SVX_START + 135)	
+#define RID_SVXSTR_PAPER_B6_JIS             (RID_SVX_START + 136)	
+
+// enum FontItalic -------------------------------------------------------
+#define RID_SVXITEMS_ITALIC_BEGIN			(RID_SVXITEMS_START + 115)
+#define RID_SVXITEMS_ITALIC_NONE			(RID_SVXITEMS_START + 115)
+#define RID_SVXITEMS_ITALIC_OBLIQUE			(RID_SVXITEMS_START + 116)
+#define RID_SVXITEMS_ITALIC_NORMAL			(RID_SVXITEMS_START + 117)
+
+// enum SvxAdjust -----------------------------------------------------------
+#define RID_SVXITEMS_ADJUST_BEGIN			(RID_SVXITEMS_START + 230)
+#define RID_SVXITEMS_ADJUST_LEFT			(RID_SVXITEMS_START + 230)
+#define RID_SVXITEMS_ADJUST_RIGHT			(RID_SVXITEMS_START + 231)
+#define RID_SVXITEMS_ADJUST_BLOCK			(RID_SVXITEMS_START + 232)
+#define RID_SVXITEMS_ADJUST_CENTER			(RID_SVXITEMS_START + 233)
+#define RID_SVXITEMS_ADJUST_BLOCKLINE		(RID_SVXITEMS_START + 234)
+
+#define RID_SVXITEMS_TAB_DECIMAL_CHAR		(RID_SVXITEMS_START + 243)
+#define RID_SVXITEMS_TAB_FILL_CHAR			(RID_SVXITEMS_START + 244)
+#define RID_SVXITEMS_TAB_ADJUST_BEGIN		(RID_SVXITEMS_START + 245)
+#define RID_SVXITEMS_TAB_ADJUST_LEFT		(RID_SVXITEMS_START + 245)
+#define RID_SVXITEMS_TAB_ADJUST_RIGHT		(RID_SVXITEMS_START + 246)
+#define RID_SVXITEMS_TAB_ADJUST_DECIMAL		(RID_SVXITEMS_START + 247)
+#define RID_SVXITEMS_TAB_ADJUST_CENTER		(RID_SVXITEMS_START + 248)
+#define RID_SVXITEMS_TAB_ADJUST_DEFAULT		(RID_SVXITEMS_START + 249)
+
+// enum SvxBreak ------------------------------------------------------------
+#define RID_SVXITEMS_BREAK_BEGIN			(RID_SVXITEMS_START + 30)
+#define RID_SVXITEMS_BREAK_NONE				(RID_SVXITEMS_START + 30)
+#define RID_SVXITEMS_BREAK_COLUMN_BEFORE	(RID_SVXITEMS_START + 31)
+#define RID_SVXITEMS_BREAK_COLUMN_AFTER		(RID_SVXITEMS_START + 32)
+#define RID_SVXITEMS_BREAK_COLUMN_BOTH		(RID_SVXITEMS_START + 33)
+#define RID_SVXITEMS_BREAK_PAGE_BEFORE		(RID_SVXITEMS_START + 34)
+#define RID_SVXITEMS_BREAK_PAGE_AFTER		(RID_SVXITEMS_START + 35)
+#define RID_SVXITEMS_BREAK_PAGE_BOTH		(RID_SVXITEMS_START + 36)
+
+// enum SvxShadowLocation ---------------------------------------------------
+#define RID_SVXITEMS_SHADOW_BEGIN			(RID_SVXITEMS_START + 40)
+#define RID_SVXITEMS_SHADOW_NONE			(RID_SVXITEMS_START + 40)
+#define RID_SVXITEMS_SHADOW_TOPLEFT			(RID_SVXITEMS_START + 41)
+#define RID_SVXITEMS_SHADOW_TOPRIGHT		(RID_SVXITEMS_START + 42)
+#define RID_SVXITEMS_SHADOW_BOTTOMLEFT		(RID_SVXITEMS_START + 43)
+#define RID_SVXITEMS_SHADOW_BOTTOMRIGHT		(RID_SVXITEMS_START + 44)
+
+// Umrandungslinien
+#define RID_SINGLE_LINE0					(RID_SVXITEMS_START + 360)
+#define RID_SINGLE_LINE1					(RID_SVXITEMS_START + 361)
+#define RID_SINGLE_LINE2					(RID_SVXITEMS_START + 362)
+#define RID_SINGLE_LINE3					(RID_SVXITEMS_START + 363)
+#define RID_SINGLE_LINE4					(RID_SVXITEMS_START + 364)
+#define RID_DOUBLE_LINE0					(RID_SVXITEMS_START + 365)
+#define RID_DOUBLE_LINE1					(RID_SVXITEMS_START + 366)
+#define RID_DOUBLE_LINE2					(RID_SVXITEMS_START + 367)
+#define RID_DOUBLE_LINE3					(RID_SVXITEMS_START + 368)
+#define RID_DOUBLE_LINE4					(RID_SVXITEMS_START + 369)
+#define RID_DOUBLE_LINE5					(RID_SVXITEMS_START + 370)
+#define RID_DOUBLE_LINE6					(RID_SVXITEMS_START + 371)
+#define RID_DOUBLE_LINE7					(RID_SVXITEMS_START + 372)
+#define RID_DOUBLE_LINE8					(RID_SVXITEMS_START + 373)
+#define RID_DOUBLE_LINE9					(RID_SVXITEMS_START + 374)
+#define RID_DOUBLE_LINE10					(RID_SVXITEMS_START + 375)
+
+// Metric-Texte
+#define RID_SVXITEMS_METRIC_MM				(RID_SVXITEMS_START + 380)
+#define RID_SVXITEMS_METRIC_CM				(RID_SVXITEMS_START + 381)
+#define RID_SVXITEMS_METRIC_INCH			(RID_SVXITEMS_START + 382)
+#define RID_SVXITEMS_METRIC_POINT			(RID_SVXITEMS_START + 383)
+#define RID_SVXITEMS_METRIC_TWIP			(RID_SVXITEMS_START + 384)
+#define RID_SVXITEMS_METRIC_PIXEL			(RID_SVXITEMS_START + 385)
+
+// enum ColorName -----------------------------------------------------------
+#define RID_SVXITEMS_COLOR_BEGIN			(RID_SVXITEMS_START + 60)
+#define RID_SVXITEMS_COLOR					(RID_SVXITEMS_START + 60)
+#define RID_SVXITEMS_COLOR_BLACK			(RID_SVXITEMS_START + 61)
+#define RID_SVXITEMS_COLOR_BLUE				(RID_SVXITEMS_START + 62)
+#define RID_SVXITEMS_COLOR_GREEN			(RID_SVXITEMS_START + 63)
+#define RID_SVXITEMS_COLOR_CYAN				(RID_SVXITEMS_START + 64)
+#define RID_SVXITEMS_COLOR_RED				(RID_SVXITEMS_START + 65)
+#define RID_SVXITEMS_COLOR_MAGENTA			(RID_SVXITEMS_START + 66)
+#define RID_SVXITEMS_COLOR_BROWN			(RID_SVXITEMS_START + 67)
+#define RID_SVXITEMS_COLOR_GRAY				(RID_SVXITEMS_START + 68)
+#define RID_SVXITEMS_COLOR_LIGHTGRAY		(RID_SVXITEMS_START + 69)
+#define RID_SVXITEMS_COLOR_LIGHTBLUE		(RID_SVXITEMS_START + 70)
+#define RID_SVXITEMS_COLOR_LIGHTGREEN		(RID_SVXITEMS_START + 71)
+#define RID_SVXITEMS_COLOR_LIGHTCYAN		(RID_SVXITEMS_START + 72)
+#define RID_SVXITEMS_COLOR_LIGHTRED			(RID_SVXITEMS_START + 73)
+#define RID_SVXITEMS_COLOR_LIGHTMAGENTA		(RID_SVXITEMS_START + 74)
+#define RID_SVXITEMS_COLOR_YELLOW			(RID_SVXITEMS_START + 75)
+#define RID_SVXITEMS_COLOR_WHITE			(RID_SVXITEMS_START + 76)
+#define RID_SVXITEMS_COLOR_MENUBAR			(RID_SVXITEMS_START + 77)
+#define RID_SVXITEMS_COLOR_MENUBARTEXT		(RID_SVXITEMS_START + 78)
+#define RID_SVXITEMS_COLOR_POPUPMENU		(RID_SVXITEMS_START + 79)
+#define RID_SVXITEMS_COLOR_POPUPMENUTEXT	(RID_SVXITEMS_START + 80)
+#define RID_SVXITEMS_COLOR_WINDOWTEXT		(RID_SVXITEMS_START + 81)
+#define RID_SVXITEMS_COLOR_WINDOWWORKSPACE	(RID_SVXITEMS_START + 82)
+#define RID_SVXITEMS_COLOR_HIGHLIGHT		(RID_SVXITEMS_START + 83)
+#define RID_SVXITEMS_COLOR_HIGHLIGHTTEXT	(RID_SVXITEMS_START + 84)
+#define RID_SVXITEMS_COLOR_3DTEXT			(RID_SVXITEMS_START + 85)
+#define RID_SVXITEMS_COLOR_3DFACE			(RID_SVXITEMS_START + 86)
+#define RID_SVXITEMS_COLOR_3DLIGHT			(RID_SVXITEMS_START + 87)
+#define RID_SVXITEMS_COLOR_3DSHADOW			(RID_SVXITEMS_START + 88)
+#define RID_SVXITEMS_COLOR_SCROLLBAR		(RID_SVXITEMS_START + 89)
+#define RID_SVXITEMS_COLOR_FIELD			(RID_SVXITEMS_START + 90)
+#define RID_SVXITEMS_COLOR_FIELDTEXT		(RID_SVXITEMS_START + 91)
+
+
+#define RID_SVXITEMS_PARASNAPTOGRID_ON                     (RID_SVXITEMS_START + 575)
+#define RID_SVXITEMS_PARASNAPTOGRID_OFF                    (RID_SVXITEMS_START + 576)
+
+#define RID_SVXITEMS_PARAVERTALIGN_AUTO			(RID_SVXITEMS_START + 565)
+#define RID_SVXITEMS_PARAVERTALIGN_BASELINE		(RID_SVXITEMS_START + 566)
+#define RID_SVXITEMS_PARAVERTALIGN_TOP	 		(RID_SVXITEMS_START + 567)
+#define RID_SVXITEMS_PARAVERTALIGN_CENTER		(RID_SVXITEMS_START + 568)
+#define RID_SVXITEMS_PARAVERTALIGN_BOTTOM		(RID_SVXITEMS_START + 569)
+
+#define RID_SVXITEMS_CHARHIDDEN_FALSE           (RID_SVXITEMS_START + 577)
+#define RID_SVXITEMS_CHARHIDDEN_TRUE            (RID_SVXITEMS_START + 578)
+
+// strings for error messsages in dictionary updates
+#define RID_SVXSTR_DIC_ERR_UNKNOWN			(RID_SVX_START +  810)
+#define RID_SVXSTR_DIC_ERR_FULL				(RID_SVX_START +  811)
+#define RID_SVXSTR_DIC_ERR_READONLY			(RID_SVX_START +  812)
+
+// HM_ERR
+#define RID_SVXSTR_HMERR_THESAURUS          (RID_SVX_START + 150)
+
+// ResIds fuer HM-QueryBoxen und Error-Strings
+#define RID_SVXQB_BW_CONTINUE               (RID_SVX_START +  39)
+#define RID_SVXQB_CONTINUE                  (RID_SVX_START +  34)
+
+#endif
+
+// ******************************************************************* EOF
+
diff --git a/svx/inc/editstat.hxx b/editeng/inc/editeng/editstat.hxx
index a658509aad..a658509aad 100644
--- a/svx/inc/editstat.hxx
+++ b/editeng/inc/editeng/editstat.hxx
diff --git a/svx/inc/editund2.hxx b/editeng/inc/editeng/editund2.hxx
index df48708e34..befea58698 100644
--- a/svx/inc/editund2.hxx
+++ b/editeng/inc/editeng/editund2.hxx
@@ -31,12 +31,12 @@
 #ifndef _EDITUND2_HXX
 #define _EDITUND2_HXX
 
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 #include <svl/undo.hxx>
 
 class ImpEditEngine;
 
-class SVX_DLLPUBLIC EditUndoManager : public SfxUndoManager
+class EDITENG_DLLPUBLIC EditUndoManager : public SfxUndoManager
 {
     using SfxUndoManager::Undo;
     using SfxUndoManager::Redo;
@@ -53,7 +53,7 @@ public:
 // -----------------------------------------------------------------------
 // EditUndo
 // ------------------------------------------------------------------------
-class SVX_DLLPUBLIC EditUndo : public SfxUndoAction
+class EDITENG_DLLPUBLIC EditUndo : public SfxUndoAction
 {
 private:
     USHORT 			nId;
diff --git a/svx/inc/svx/editview.hxx b/editeng/inc/editeng/editview.hxx
index f0b47412ed..f24455985f 100644
--- a/svx/inc/svx/editview.hxx
+++ b/editeng/inc/editeng/editview.hxx
@@ -60,10 +60,10 @@ class Font;
 class FontList;
 
 #ifndef _EDITDATA_HXX
-#include <svx/editdata.hxx>
+#include <editeng/editdata.hxx>
 #endif
 #include <com/sun/star/uno/Reference.h>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 namespace com {
 namespace sun {
@@ -72,7 +72,7 @@ namespace datatransfer {
     class XTransferable;
 }}}}
 
-class SVX_DLLPUBLIC EditView
+class EDITENG_DLLPUBLIC EditView
 {
     friend class EditEngine;
     friend class ImpEditEngine;
@@ -85,8 +85,8 @@ public:	// brauche ich fuer Undo
 private:
     ImpEditView*	pImpEditView;
 
-                    SVX_DLLPRIVATE EditView( const EditView& );
-    SVX_DLLPRIVATE EditView&		operator=( const EditView& );
+                    EDITENG_DLLPRIVATE EditView( const EditView& );
+    EDITENG_DLLPRIVATE EditView&		operator=( const EditView& );
 
 public:
                     EditView( EditEngine* pEng, Window* pWindow );
diff --git a/editeng/inc/editeng/edtdlg.hxx b/editeng/inc/editeng/edtdlg.hxx
new file mode 100644
index 0000000000..5f54989deb
--- /dev/null
+++ b/editeng/inc/editeng/edtdlg.hxx
@@ -0,0 +1,113 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: abstdlg.hxx,v $
+ * $Revision: 1.5 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef _EDT_ABSTDLG_HXX
+#define _EDT_ABSTDLG_HXX
+
+// include ---------------------------------------------------------------
+
+#include <tools/solar.h>
+#include <tools/string.hxx>
+#include <editeng/editengdllapi.h>
+#include <i18npool/lang.h>
+#include <com/sun/star/uno/Reference.hxx>
+#include <vcl/abstdlg.hxx>
+#include <editeng/hangulhanja.hxx> 
+
+namespace com { namespace sun { namespace star { namespace linguistic2 
+{
+    class XThesaurus;
+    class XHyphenator;
+} } } }
+
+class Window;
+class ResId;
+class Link;
+class SvxSpellWrapper;
+
+class AbstractThesaurusDialog : public VclAbstractDialog
+{
+public:
+    virtual String		GetWord() = 0;
+    virtual sal_uInt16	GetLanguage() const = 0;
+    virtual Window*		GetWindow() = 0;
+};
+
+class AbstractHyphenWordDialog : public VclAbstractDialog
+{
+public:
+    virtual void	SelLeft() = 0;
+    virtual void	SelRight() = 0;
+    virtual Window*	GetWindow() = 0;
+};
+
+class AbstractHangulHanjaConversionDialog : public VclAbstractTerminatedDialog
+{
+ public:
+    virtual void EnableRubySupport( sal_Bool _bVal ) = 0;
+     virtual void SetByCharacter( sal_Bool _bByCharacter ) = 0;
+    virtual	void SetConversionDirectionState( sal_Bool _bTryBothDirections, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection ) = 0;
+     virtual void SetConversionFormat( editeng::HangulHanjaConversion::ConversionFormat _eType ) = 0;
+    virtual void	SetOptionsChangedHdl( const Link& _rHdl ) = 0;
+     virtual void	SetIgnoreHdl( const Link& _rHdl ) = 0;
+     virtual void	SetIgnoreAllHdl( const Link& _rHdl ) = 0;
+     virtual void	SetChangeHdl( const Link& _rHdl ) = 0;
+     virtual void	SetChangeAllHdl( const Link& _rHdl ) = 0;
+    virtual void	SetClickByCharacterHdl( const Link& _rHdl ) = 0;
+     virtual void	SetConversionFormatChangedHdl( const Link& _rHdl ) = 0;
+     virtual void	SetFindHdl( const Link& _rHdl ) = 0;
+    virtual sal_Bool		GetUseBothDirections( ) const= 0;
+    virtual editeng::HangulHanjaConversion::ConversionDirection    GetDirection( editeng::HangulHanjaConversion::ConversionDirection _eDefaultDirection ) const = 0;
+    virtual void	SetCurrentString(
+                    const String& _rNewString,
+                    const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rSuggestions,
+                    bool _bOriginatesFromDocument = true )=0;
+    virtual String	GetCurrentString( ) const =0;
+    virtual editeng::HangulHanjaConversion::ConversionFormat    GetConversionFormat( ) const =0;
+    virtual void	FocusSuggestion( )= 0;
+    virtual String	GetCurrentSuggestion( ) const =0;
+};
+
+class EDITENG_DLLPUBLIC EditAbstractDialogFactory
+{
+public:
+    static EditAbstractDialogFactory*	Create();
+    virtual AbstractThesaurusDialog*		CreateThesaurusDialog( Window*, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XThesaurus >  xThesaurus,
+                                                const String &rWord, sal_Int16 nLanguage ) = 0;
+
+    virtual AbstractHyphenWordDialog*		CreateHyphenWordDialog( Window*, 
+                                                const String &rWord, LanguageType nLang,
+                                                ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenator >  &xHyphen,
+                                                SvxSpellWrapper* pWrapper ) = 0;
+    virtual AbstractHangulHanjaConversionDialog * CreateHangulHanjaConversionDialog( Window* _pParent,
+                                            editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection ) = 0;
+};
+
+#endif
+
diff --git a/svx/inc/svx/eedata.hxx b/editeng/inc/editeng/eedata.hxx
index 32634f95fe..32634f95fe 100644
--- a/svx/inc/svx/eedata.hxx
+++ b/editeng/inc/editeng/eedata.hxx
diff --git a/svx/inc/svx/eeitem.hxx b/editeng/inc/editeng/eeitem.hxx
index e828c91d08..e828c91d08 100644
--- a/svx/inc/svx/eeitem.hxx
+++ b/editeng/inc/editeng/eeitem.hxx
diff --git a/svx/inc/svx/eeitemid.hxx b/editeng/inc/editeng/eeitemid.hxx
index b66675eeb3..3d9db90255 100644
--- a/svx/inc/svx/eeitemid.hxx
+++ b/editeng/inc/editeng/eeitemid.hxx
@@ -31,7 +31,7 @@
 #ifndef _EEITEMID_HXX
 #define _EEITEMID_HXX
 
-#include <svx/eeitem.hxx>
+#include <editing/eeitem.hxx>
 
 #ifdef ITEMID_FONT
 #undef ITEMID_FONT
diff --git a/svx/inc/eerdll.hxx b/editeng/inc/editeng/eerdll.hxx
index 511b7111fa..162d3aead7 100644
--- a/svx/inc/eerdll.hxx
+++ b/editeng/inc/editeng/eerdll.hxx
@@ -58,4 +58,6 @@ public:
 
 #define EE_DLL() EditDLL::Get()
 
+#define EE_RESSTR(x) String( EditResId(x) )
+
 #endif //_EERDLL_HXX
diff --git a/svx/inc/svx/emphitem.hxx b/editeng/inc/editeng/emphitem.hxx
index 8d5c18b302..1f5b5b8a07 100644
--- a/svx/inc/svx/emphitem.hxx
+++ b/editeng/inc/editeng/emphitem.hxx
@@ -34,10 +34,7 @@
 
 #include <vcl/vclenum.hxx>
 #include <svl/intitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 class SvXMLUnitConverter;
 namespace rtl
@@ -52,7 +49,7 @@ namespace rtl
     Dieses Item beschreibt die Font-Betonung.
 */
 
-class SVX_DLLPUBLIC SvxEmphasisMarkItem : public SfxUInt16Item
+class EDITENG_DLLPUBLIC SvxEmphasisMarkItem : public SfxUInt16Item
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/escpitem.hxx b/editeng/inc/editeng/escpitem.hxx
index a75e157ef3..32cec4f4cb 100644
--- a/svx/inc/svx/escpitem.hxx
+++ b/editeng/inc/editeng/escpitem.hxx
@@ -34,10 +34,7 @@
 
 #include <svl/eitem.hxx>
 #include <svx/svxenum.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <svx/svxdllapi.h>
 
 class SvXMLUnitConverter;
 namespace rtl
diff --git a/svx/inc/svx/fhgtitem.hxx b/editeng/inc/editeng/fhgtitem.hxx
index cc98e695ce..cc2777b984 100644
--- a/svx/inc/svx/fhgtitem.hxx
+++ b/editeng/inc/editeng/fhgtitem.hxx
@@ -33,10 +33,7 @@
 // include ---------------------------------------------------------------
 
 #include <svl/poolitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 class SvXMLUnitConverter;
 namespace rtl
@@ -56,7 +53,7 @@ namespace rtl
 #define	FONTHEIGHT_16_VERSION	((USHORT)0x0001)
 #define	FONTHEIGHT_UNIT_VERSION	((USHORT)0x0002)
 
-class SVX_DLLPUBLIC SvxFontHeightItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxFontHeightItem : public SfxPoolItem
 {
     UINT32	nHeight;
     USHORT	nProp;				// default 100%
diff --git a/svx/inc/svx/flditem.hxx b/editeng/inc/editeng/flditem.hxx
index 4e1f301aea..8c95b49f51 100644
--- a/svx/inc/svx/flditem.hxx
+++ b/editeng/inc/editeng/flditem.hxx
@@ -35,7 +35,7 @@
 #include <tools/date.hxx>
 #include <svl/poolitem.hxx>
 #include <tools/pstm.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 class SvNumberFormatter;
 class MetaAction;
@@ -44,7 +44,7 @@ class MetaAction;
 
 
 
-class SVX_DLLPUBLIC SvxFieldData : public SvPersistBase
+class EDITENG_DLLPUBLIC SvxFieldData : public SvPersistBase
 {
 public:
                             SV_DECL_PERSIST1( SvxFieldData, SvPersistBase, 1 )
@@ -66,12 +66,12 @@ Das Feld gehoert dem Item.
 Das Feld selbst wird durch eine Ableitung von SvxFieldData bestimmt. (RTTI)
 */
 
-class SVX_DLLPUBLIC SvxFieldItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxFieldItem : public SfxPoolItem
 {
 private:
     SvxFieldData*			pField;
 
-                    SVX_DLLPRIVATE SvxFieldItem( SvxFieldData* pField, const USHORT nId );
+                    EDITENG_DLLPRIVATE SvxFieldItem( SvxFieldData* pField, const USHORT nId );
 
 public:
             TYPEINFO();
@@ -123,7 +123,7 @@ enum SvxDateFormat {	SVXDATEFORMAT_APPDEFAULT, 	// Wie in App eingestellt
                         SVXDATEFORMAT_F		// Dienstag, 13.Februar 1996
                     };
 
-class SVX_DLLPUBLIC SvxDateField : public SvxFieldData
+class EDITENG_DLLPUBLIC SvxDateField : public SvxFieldData
 {
     sal_uInt32				nFixDate;
     SvxDateType				eType;
@@ -166,7 +166,7 @@ enum SvxURLFormat	{	SVXURLFORMAT_APPDEFAULT, 	// Wie in App eingestellt
                         SVXURLFORMAT_REPR			// Repraesentation darstellen
                     };
 
-class SVX_DLLPUBLIC SvxURLField : public SvxFieldData
+class EDITENG_DLLPUBLIC SvxURLField : public SvxFieldData
 {
 private:
     SvxURLFormat			eFormat;
@@ -198,7 +198,7 @@ public:
     virtual MetaAction* createBeginComment() const;
 };
 
-class SVX_DLLPUBLIC SvxPageField : public SvxFieldData
+class EDITENG_DLLPUBLIC SvxPageField : public SvxFieldData
 {
 public:
                             SV_DECL_PERSIST1( SvxPageField, SvxFieldData, SVX_PAGEFIELD )
@@ -209,7 +209,7 @@ public:
     virtual MetaAction* createBeginComment() const;
 };
 
-class SVX_DLLPUBLIC SvxPagesField : public SvxFieldData
+class EDITENG_DLLPUBLIC SvxPagesField : public SvxFieldData
 {
 public:
                             SV_DECL_PERSIST1( SvxPagesField, SvxFieldData, SVX_PAGESFIELD )
@@ -218,7 +218,7 @@ public:
     virtual int 			operator==( const SvxFieldData& ) const;
 };
 
-class SVX_DLLPUBLIC SvxTimeField : public SvxFieldData
+class EDITENG_DLLPUBLIC SvxTimeField : public SvxFieldData
 {
 public:
                             SV_DECL_PERSIST1( SvxTimeField, SvxFieldData, SVX_TIMEFIELD )
@@ -229,7 +229,7 @@ public:
     virtual MetaAction* createBeginComment() const;
 };
 
-class SVX_DLLPUBLIC SvxFileField : public SvxFieldData
+class EDITENG_DLLPUBLIC SvxFileField : public SvxFieldData
 {
 public:
                             SV_DECL_PERSIST1( SvxFileField, SvxFieldData, SVX_FILEFIELD )
@@ -238,7 +238,7 @@ public:
     virtual int 			operator==( const SvxFieldData& ) const;
 };
 
-class SVX_DLLPUBLIC SvxTableField : public SvxFieldData
+class EDITENG_DLLPUBLIC SvxTableField : public SvxFieldData
 {
 public:
                             SV_DECL_PERSIST1( SvxTableField, SvxFieldData, SVX_TABLEFIELD )
@@ -263,7 +263,7 @@ enum SvxTimeFormat {	SVXTIMEFORMAT_APPDEFAULT, 	// Wie in App eingestellt
                         SVXTIMEFORMAT_AM_HMSH	// 01:49:38.78 PM
                     };
 
-class SVX_DLLPUBLIC SvxExtTimeField : public SvxFieldData
+class EDITENG_DLLPUBLIC SvxExtTimeField : public SvxFieldData
 {
 private:
     sal_uInt32				nFixTime;
@@ -310,7 +310,7 @@ enum SvxFileFormat {	SVXFILEFORMAT_NAME_EXT,	// Dateiname mit Extension
 
 
 
-class SVX_DLLPUBLIC SvxExtFileField : public SvxFieldData
+class EDITENG_DLLPUBLIC SvxExtFileField : public SvxFieldData
 {
 private:
     XubString  				aFile;
@@ -347,7 +347,7 @@ enum SvxAuthorFormat {	SVXAUTHORFORMAT_FULLNAME,	// vollst„ndiger Name
                         SVXAUTHORFORMAT_SHORTNAME	// Initialen
                     };
 
-class SVX_DLLPUBLIC SvxAuthorField : public SvxFieldData
+class EDITENG_DLLPUBLIC SvxAuthorField : public SvxFieldData
 {
 private:
     XubString		aName;
@@ -389,7 +389,7 @@ public:
 
 /** this field is used as a placeholder for a header&footer in impress. The actual
     value is stored at the page */
-class SVX_DLLPUBLIC SvxHeaderField : public SvxFieldData
+class EDITENG_DLLPUBLIC SvxHeaderField : public SvxFieldData
 {
 public:
                             SV_DECL_PERSIST1( SvxHeaderField, SvxFieldData, SVX_HEADERFIELD )
@@ -400,7 +400,7 @@ public:
 
 /** this field is used as a placeholder for a header&footer in impress. The actual
     value is stored at the page */
-class SVX_DLLPUBLIC SvxFooterField : public SvxFieldData
+class EDITENG_DLLPUBLIC SvxFooterField : public SvxFieldData
 {
 public:
                             SV_DECL_PERSIST1( SvxFooterField, SvxFieldData, SVX_FOOTERFIELD )
@@ -411,7 +411,7 @@ public:
 
 /** this field is used as a placeholder for a header&footer in impress. The actual
     value is stored at the page */
-class SVX_DLLPUBLIC SvxDateTimeField : public SvxFieldData
+class EDITENG_DLLPUBLIC SvxDateTimeField : public SvxFieldData
 {
 public:
                             SV_DECL_PERSIST1( SvxDateTimeField, SvxFieldData, SVX_DATEFIMEFIELD )
diff --git a/svx/inc/flstitem.hxx b/editeng/inc/editeng/flstitem.hxx
index fccbc48fb5..a6bdabe3f8 100644
--- a/svx/inc/flstitem.hxx
+++ b/editeng/inc/editeng/flstitem.hxx
@@ -35,7 +35,7 @@
 #include <svl/poolitem.hxx>
 #include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Sequence.h>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 // class SvxFontListItem -------------------------------------------------
 
@@ -48,7 +48,7 @@ class FontList;
     Die Fontliste wird nicht kopiert und nicht geloescht!
 */
 
-class SVX_DLLPUBLIC SvxFontListItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxFontListItem : public SfxPoolItem
 {
 private:
     const FontList*                                 pFontList;
diff --git a/svx/inc/fontitem.hxx b/editeng/inc/editeng/fontitem.hxx
index b83f593bb9..aa709ff01c 100644
--- a/svx/inc/fontitem.hxx
+++ b/editeng/inc/editeng/fontitem.hxx
@@ -34,10 +34,8 @@
 
 #include <svl/poolitem.hxx>
 #include <tools/string.hxx>
-#ifndef _FONT_HXX //autogen
 #include <vcl/font.hxx>
-#endif
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 class SvXMLUnitConverter;
 namespace rtl
@@ -52,7 +50,7 @@ namespace rtl
     Dieses Item beschreibt einen Font.
 */
 
-class SVX_DLLPUBLIC SvxFontItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxFontItem : public SfxPoolItem
 {
     String  aFamilyName;
     String  aStyleName;
@@ -115,7 +113,7 @@ public:
 
 };
 
-SVX_DLLPUBLIC void GetDefaultFonts( SvxFontItem& rLatin, SvxFontItem& rAsian,
+EDITENG_DLLPUBLIC void GetDefaultFonts( SvxFontItem& rLatin, SvxFontItem& rAsian,
                         SvxFontItem& rComplex );
 
 #endif // #ifndef _SVX_FONTITEM_HXX
diff --git a/svx/inc/forbiddencharacterstable.hxx b/editeng/inc/editeng/forbiddencharacterstable.hxx
index f6b80e1401..b495a96afb 100644
--- a/svx/inc/forbiddencharacterstable.hxx
+++ b/editeng/inc/editeng/forbiddencharacterstable.hxx
@@ -38,7 +38,7 @@
 #include <vos/refernce.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/i18n/ForbiddenCharacters.hpp>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 namespace com {
 namespace sun {
@@ -55,7 +55,7 @@ struct ForbiddenCharactersInfo
 
 DECLARE_TABLE( SvxForbiddenCharactersTableImpl, ForbiddenCharactersInfo* )
 
-class SVX_DLLPUBLIC SvxForbiddenCharactersTable : public SvxForbiddenCharactersTableImpl, public vos::OReference
+class EDITENG_DLLPUBLIC SvxForbiddenCharactersTable : public SvxForbiddenCharactersTableImpl, public vos::OReference
 {
 private:	
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMSF;
diff --git a/svx/inc/svx/forbiddenruleitem.hxx b/editeng/inc/editeng/forbiddenruleitem.hxx
index e50298f551..a4d9aac501 100644
--- a/svx/inc/svx/forbiddenruleitem.hxx
+++ b/editeng/inc/editeng/forbiddenruleitem.hxx
@@ -33,10 +33,7 @@
 // include ---------------------------------------------------------------
 
 #include <svl/eitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 // class SvxForbiddenRuleItem -----------------------------------------
 
@@ -45,7 +42,7 @@
     This item describe how to handle the last character of a line.
 */
 
-class SVX_DLLPUBLIC SvxForbiddenRuleItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxForbiddenRuleItem : public SfxBoolItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/frmdir.hxx b/editeng/inc/editeng/frmdir.hxx
index 81c7a130a0..81c7a130a0 100644
--- a/svx/inc/svx/frmdir.hxx
+++ b/editeng/inc/editeng/frmdir.hxx
diff --git a/svx/inc/svx/frmdiritem.hxx b/editeng/inc/editeng/frmdiritem.hxx
index 70df9f75d5..676dad88d7 100644
--- a/svx/inc/svx/frmdiritem.hxx
+++ b/editeng/inc/editeng/frmdiritem.hxx
@@ -33,11 +33,8 @@
 // include ---------------------------------------------------------------
 
 #include <svl/intitem.hxx>
-#include <svx/frmdir.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/frmdir.hxx>
+#include <editeng/editengdllapi.h>
 
 // class SvxFrameDirectionItem ----------------------------------------------
 
@@ -48,7 +45,7 @@
     layout text for Western, CJK and CTL languages.
 */
 
-class SVX_DLLPUBLIC SvxFrameDirectionItem : public SfxUInt16Item
+class EDITENG_DLLPUBLIC SvxFrameDirectionItem : public SfxUInt16Item
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/fwdtitem.hxx b/editeng/inc/editeng/fwdtitem.hxx
index 12a4662222..12a4662222 100644
--- a/svx/inc/fwdtitem.hxx
+++ b/editeng/inc/editeng/fwdtitem.hxx
diff --git a/svx/inc/svx/hangulhanja.hxx b/editeng/inc/editeng/hangulhanja.hxx
index 6029907a81..2090c00b86 100644
--- a/svx/inc/svx/hangulhanja.hxx
+++ b/editeng/inc/editeng/hangulhanja.hxx
@@ -35,10 +35,10 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 //.............................................................................
-namespace svx
+namespace editeng
 {
 //.............................................................................
 
@@ -60,7 +60,7 @@ namespace svx
             single Hangul syllabills when "replace by character" is enabled.
         </p>
     */
-    class SVX_DLLPUBLIC HangulHanjaConversion
+    class EDITENG_DLLPUBLIC HangulHanjaConversion
     {
         friend class HangulHanjaConversion_Impl;
 
diff --git a/svx/inc/svx/hngpnctitem.hxx b/editeng/inc/editeng/hngpnctitem.hxx
index 770fafb8a1..f1921c223a 100644
--- a/svx/inc/svx/hngpnctitem.hxx
+++ b/editeng/inc/editeng/hngpnctitem.hxx
@@ -33,10 +33,7 @@
 // include ---------------------------------------------------------------
 
 #include <svl/eitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 // class SvxHangingPunctuationItem -----------------------------------------
 
@@ -45,7 +42,7 @@
     This item describe how to handle the last character of a line.
 */
 
-class SVX_DLLPUBLIC SvxHangingPunctuationItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxHangingPunctuationItem : public SfxBoolItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/hyznitem.hxx b/editeng/inc/editeng/hyznitem.hxx
index 97fffef06e..da5a587384 100644
--- a/svx/inc/svx/hyznitem.hxx
+++ b/editeng/inc/editeng/hyznitem.hxx
@@ -33,10 +33,7 @@
 // include ---------------------------------------------------------------
 
 #include <svl/poolitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 class SvXMLUnitConverter;
 namespace rtl
@@ -52,7 +49,7 @@ Dieses Item beschreibt ein Silbentrennungsattribut (Automatisch?, Anzahl der
 Zeichen am Zeilenende und -anfang).
 */
 
-class SVX_DLLPUBLIC SvxHyphenZoneItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxHyphenZoneItem : public SfxPoolItem
 {
     BOOL bHyphen:  1;
     BOOL bPageEnd: 1;
diff --git a/svx/inc/svx/itemtype.hxx b/editeng/inc/editeng/itemtype.hxx
index 321e53fdbe..63819ec759 100644
--- a/svx/inc/svx/itemtype.hxx
+++ b/editeng/inc/editeng/itemtype.hxx
@@ -32,18 +32,16 @@
 
 // include ---------------------------------------------------------------
 
-#ifndef _SVXITEMS_HRC
-#include <svx/svxitems.hrc>
-#endif
+#include <editeng/editrids.hrc>
+#include <editeng/eerdll.hxx>
 
 // forward ---------------------------------------------------------------
 #include <tools/string.hxx>
 #include <tools/resid.hxx>
 #include <tools/bigint.hxx>
-#include <svx/dialmgr.hxx>
 #include <svl/poolitem.hxx>
 #include <tools/shl.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 class Color;
 class XColorTable;
@@ -53,19 +51,16 @@ class IntlWrapper;
 static const sal_Unicode cDelim = ',';
 static const sal_Unicode cpDelim[] = { ',' , ' ', '\0' };
 
-SVX_DLLPUBLIC String GetSvxString( USHORT nId );
-SVX_DLLPUBLIC String GetMetricText( long nVal, SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit, const IntlWrapper * pIntl );
-#ifndef SVX_LIGHT
+EDITENG_DLLPUBLIC String GetSvxString( USHORT nId );
+EDITENG_DLLPUBLIC String GetMetricText( long nVal, SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit, const IntlWrapper * pIntl );
 String GetColorString( const Color& rCol );
-#endif
-SVX_DLLPUBLIC USHORT GetMetricId( SfxMapUnit eUnit );
+EDITENG_DLLPUBLIC USHORT GetMetricId( SfxMapUnit eUnit );
 
 // -----------------------------------------------------------------------
 
 inline String GetBoolString( BOOL bVal )
 {
-    return String( ResId( bVal ? RID_SVXITEMS_TRUE
-                               : RID_SVXITEMS_FALSE, DIALOG_MGR() ) );
+    return String( EditResId( bVal ? RID_SVXITEMS_TRUE : RID_SVXITEMS_FALSE ) );
 }
 
 // -----------------------------------------------------------------------
diff --git a/svx/inc/svx/keepitem.hxx b/editeng/inc/editeng/keepitem.hxx
index 19f6b17f9a..deb1d1b0dd 100644
--- a/svx/inc/svx/keepitem.hxx
+++ b/editeng/inc/editeng/keepitem.hxx
@@ -33,10 +33,7 @@
 // include ---------------------------------------------------------------
 
 #include <svl/eitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 namespace rtl
 {
@@ -50,7 +47,7 @@ namespace rtl
 Dieses Item beschreibt eine logische Variable "Absaetze zusammenhalten?".
 */
 
-class SVX_DLLPUBLIC SvxFmtKeepItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxFmtKeepItem : public SfxBoolItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/kernitem.hxx b/editeng/inc/editeng/kernitem.hxx
index dc4d43c9f0..bdc480a8b2 100644
--- a/svx/inc/svx/kernitem.hxx
+++ b/editeng/inc/editeng/kernitem.hxx
@@ -33,10 +33,7 @@
 // include ---------------------------------------------------------------
 
 #include <svl/intitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 class SvXMLUnitConverter;
 namespace rtl
@@ -54,7 +51,7 @@ namespace rtl
     Dieses Item beschreibt die Schrift-Laufweite.
 */
 
-class SVX_DLLPUBLIC SvxKerningItem : public SfxInt16Item
+class EDITENG_DLLPUBLIC SvxKerningItem : public SfxInt16Item
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/langitem.hxx b/editeng/inc/editeng/langitem.hxx
index 1513c15e2b..7379b66bc1 100644
--- a/svx/inc/svx/langitem.hxx
+++ b/editeng/inc/editeng/langitem.hxx
@@ -34,10 +34,7 @@
 
 #include <svl/eitem.hxx>
 #include <i18npool/lang.h>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 class SvXMLUnitConverter;
 namespace rtl
@@ -52,7 +49,7 @@ namespace rtl
     Dieses Item beschreibt eine Sprache.
 */
 
-class SVX_DLLPUBLIC SvxLanguageItem : public SfxEnumItem
+class EDITENG_DLLPUBLIC SvxLanguageItem : public SfxEnumItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/lcolitem.hxx b/editeng/inc/editeng/lcolitem.hxx
index 1530e2a133..bb24ff8c17 100644
--- a/svx/inc/svx/lcolitem.hxx
+++ b/editeng/inc/editeng/lcolitem.hxx
@@ -32,16 +32,15 @@
 
 // include ---------------------------------------------------------------
 
-#include <svx/colritem.hxx>
-#include <svx/svxids.hrc>
-#include "svx/svxdllapi.h"
+#include <editeng/colritem.hxx>
+#include <editeng/editengdllapi.h>
 
 /*
  * dummy-Item fuer ToolBox-Controller:
  *
  */
 
-class SVX_DLLPUBLIC SvxLineColorItem : public SvxColorItem
+class EDITENG_DLLPUBLIC SvxLineColorItem : public SvxColorItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/lrspitem.hxx b/editeng/inc/editeng/lrspitem.hxx
index 57ee9cb29c..99f109f1a2 100644
--- a/svx/inc/svx/lrspitem.hxx
+++ b/editeng/inc/editeng/lrspitem.hxx
@@ -33,10 +33,7 @@
 // include ---------------------------------------------------------------
 
 #include <svl/poolitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 namespace rtl
 {
@@ -69,7 +66,7 @@ SetTxtLeft SetTxtFirst GetLeft  GetTxtLeft  GetTxtFirst  (Was?)
 #define	LRSPACE_AUTOFIRST_VERSION ((USHORT)0x0003)
 #define	LRSPACE_NEGATIVE_VERSION ((USHORT)0x0004)
 
-class SVX_DLLPUBLIC SvxLRSpaceItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxLRSpaceItem : public SfxPoolItem
 {
     short	nFirstLineOfst;     // Erstzeileneinzug _immer_ relativ zu nTxtLeft
     long	nTxtLeft;           // wir spendieren einen USHORT
diff --git a/svx/inc/svx/lspcitem.hxx b/editeng/inc/editeng/lspcitem.hxx
index 5723dd113e..d99d123987 100644
--- a/svx/inc/svx/lspcitem.hxx
+++ b/editeng/inc/editeng/lspcitem.hxx
@@ -33,12 +33,8 @@
 // include ---------------------------------------------------------------
 
 #include <svl/eitem.hxx>
-#include <svx/svxenum.hxx>
-
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/svxenum.hxx>
+#include <editeng/editengdllapi.h>
 
 class SvXMLUnitConverter;
 namespace rtl
@@ -54,7 +50,7 @@ Dieses Item beschreibt den Abstand zwischen den Zeilen.
 */
 
 #define LINE_SPACE_DEFAULT_HEIGHT 200
-class SVX_DLLPUBLIC SvxLineSpacingItem : public SfxEnumItemInterface
+class EDITENG_DLLPUBLIC SvxLineSpacingItem : public SfxEnumItemInterface
 {
     friend SvStream& operator<<( SvStream&, SvxLineSpacingItem& ); //$ ostream
 
diff --git a/editeng/inc/editeng/memberids.hrc b/editeng/inc/editeng/memberids.hrc
new file mode 100644
index 0000000000..48444b3575
--- /dev/null
+++ b/editeng/inc/editeng/memberids.hrc
@@ -0,0 +1,199 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: unomid.hxx,v $
+ * $Revision: 1.3.212.1 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef _EDT_UNOMID_HXX
+#define _EDT_UNOMID_HXX
+
+#define MID_LOCATION            0x3c
+#define MID_TRANSPARENT         0x4b
+#define MID_BG_COLOR            0x22
+#define MID_FLAGS               0x2e
+#define MID_DISTANCE            0x29
+#define MID_FG_COLOR            0x2c
+#define MID_OUTER_WIDTH         0x41
+#define MID_INNER_WIDTH         0x35
+#define MID_LINESPACE           0x3b
+
+//NameOrIndex
+#define MID_NAME				16
+#define MID_GRAFURL				32
+
+// SvxPageModelItem
+#define MID_AUTO                1
+
+// SvxTabStop
+#define MID_TABSTOPS            0
+#define MID_STD_TAB             1
+
+//SvxHyphenZoneItem
+#define MID_IS_HYPHEN	      	0
+#define MID_HYPHEN_MIN_LEAD     1
+#define MID_HYPHEN_MIN_TRAIL    2
+#define MID_HYPHEN_MAX_HYPHENS  3
+
+// SvxSizeItem
+#define MID_SIZE_SIZE       0
+#define MID_SIZE_WIDTH      1
+#define MID_SIZE_HEIGHT     2
+
+// SvxBoxInfoItem
+#define MID_HORIZONTAL          1
+#define MID_VERTICAL            2
+#define MID_VALIDFLAGS          4
+
+//AdjustItem
+#define MID_PARA_ADJUST			0
+#define MID_LAST_LINE_ADJUST    1
+#define MID_EXPAND_SINGLE       2
+
+//SvxFontItem
+// Don't use 0 as it used for the whole struct
+#define MID_FONT_FAMILY_NAME 	1
+#define MID_FONT_STYLE_NAME     2
+#define MID_FONT_FAMILY         3
+#define MID_FONT_CHAR_SET       4
+#define MID_FONT_PITCH          5
+
+// SvxCharReliefItem
+#define MID_RELIEF				0
+
+//SvxCharRotateItem
+#define MID_ROTATE				0
+#define MID_FITTOLINE			1
+
+//SvxExcapementItem
+#define MID_ESC			 0
+#define MID_ESC_HEIGHT   1
+#define MID_AUTO_ESC     2
+
+//SvxFontWidthItem
+#define MID_FONTWIDTH     	0
+#define MID_FONTWIDTH_PROP  1
+
+//SvxFontHeightItem
+#define MID_FONTHEIGHT     	1
+#define MID_FONTHEIGHT_PROP 2
+#define MID_FONTHEIGHT_DIFF 3
+
+//SvxTextLineItem
+#define MID_TEXTLINED		0
+#define MID_TL_STYLE		1
+#define MID_TL_COLOR		2
+#define MID_TL_HASCOLOR		3
+
+//SvxCrossedOutItem
+#define MID_CROSSED_OUT		0
+#define MID_CROSS_OUT       1
+
+//SvxPostureItem
+#define MID_ITALIC          0
+#define MID_POSTURE         1
+
+//SvxBoolItem
+#define MID_BOLD			0
+#define MID_WEIGHT          1
+
+//SvxLanguageItem
+#define MID_LANG_INT			0
+#define MID_LANG_LOCALE			1
+
+//SvxEmphasisMarkItem
+#define MID_EMPHASIS			0
+
+//SvxTwoLinesItem
+#define MID_TWOLINES			0
+#define MID_START_BRACKET 		1
+#define MID_END_BRACKET 		2
+
+//ULSpaceItem
+#define MID_UL_MARGIN		1
+#define MID_UL_REL_MARGIN	2
+#define MID_UP_MARGIN		3
+#define MID_LO_MARGIN		4
+#define MID_UP_REL_MARGIN	5
+#define MID_LO_REL_MARGIN	6
+
+//LRSpaceItem
+#define MID_LR_MARGIN		0
+#define MID_LRP_MARGIN  	1
+#define MID_LR_REL_MARGIN	2
+#define MID_LRP_REL_MARGIN  3
+#define MID_L_MARGIN		4
+#define MID_R_MARGIN		5
+#define MID_L_REL_MARGIN	6
+#define MID_R_REL_MARGIN	7
+#define MID_FIRST_LINE_INDENT	 	8
+#define MID_FIRST_LINE_REL_INDENT   9
+#define MID_FIRST_AUTO				10
+#define MID_TXT_LMARGIN 			11
+
+//ProtectItem
+#define MID_PROTECT_CONTENT		0
+#define MID_PROTECT_SIZE        1
+#define MID_PROTECT_POSITION    2
+
+//SvxBoxItem
+#define LEFT_BORDER  			1
+#define RIGHT_BORDER            2
+#define TOP_BORDER              3
+#define BOTTOM_BORDER           4
+#define BORDER_DISTANCE         5
+#define LEFT_BORDER_DISTANCE    6
+#define RIGHT_BORDER_DISTANCE   7
+#define TOP_BORDER_DISTANCE     8
+#define BOTTOM_BORDER_DISTANCE  9
+#define MID_LEFT_BORDER             10
+#define MID_RIGHT_BORDER            11
+#define MID_TOP_BORDER              12
+#define MID_BOTTOM_BORDER           13
+
+//BrushItem
+#define MID_BACK_COLOR			0
+#define MID_GRAPHIC_POSITION    1
+#define MID_GRAPHIC_LINK        2
+#define MID_GRAPHIC             3
+#define MID_GRAPHIC_TRANSPARENT 4
+#define MID_GRAPHIC_URL        	5
+#define MID_GRAPHIC_FILTER     	6
+#define MID_GRAPHIC_REPEAT     	7
+#define MID_GRAPHIC_TRANSPARENCY 8
+#define MID_BACK_COLOR_R_G_B    9
+#define MID_BACK_COLOR_TRANSPARENCY 10
+
+//SvxFmtBreakItem
+#define MID_BREAK_BEFORE		0
+#define MID_BREAK_AFTER			1
+
+//SvxCaseMapItem
+#define MID_CASEMAP_VARIANT		0
+#define MID_CASEMAP_TRANS		1
+
+
+
+#endif
diff --git a/svx/inc/svx/mutxhelp.hxx b/editeng/inc/editeng/mutxhelp.hxx
index c3a169f17b..c3a169f17b 100644
--- a/svx/inc/svx/mutxhelp.hxx
+++ b/editeng/inc/editeng/mutxhelp.hxx
diff --git a/svx/inc/svx/nhypitem.hxx b/editeng/inc/editeng/nhypitem.hxx
index 6d97d9cab8..51f87fe11b 100644
--- a/svx/inc/svx/nhypitem.hxx
+++ b/editeng/inc/editeng/nhypitem.hxx
@@ -33,10 +33,7 @@
 // include ---------------------------------------------------------------
 
 #include <svl/eitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 // class SvxNoHyphenItem -------------------------------------------------
 
@@ -45,7 +42,7 @@
     PB: ???
 */
 
-class SVX_DLLPUBLIC SvxNoHyphenItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxNoHyphenItem : public SfxBoolItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/nlbkitem.hxx b/editeng/inc/editeng/nlbkitem.hxx
index 3b01a4c374..b9e706f103 100644
--- a/svx/inc/nlbkitem.hxx
+++ b/editeng/inc/editeng/nlbkitem.hxx
@@ -34,7 +34,7 @@
 
 
 #include <svl/eitem.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 // class SvxNoLinebreakItem ----------------------------------------------
 
@@ -44,7 +44,7 @@
     PB: ???
 */
 
-class SVX_DLLPUBLIC SvxNoLinebreakItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxNoLinebreakItem : public SfxBoolItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/numdef.hxx b/editeng/inc/editeng/numdef.hxx
index 5807940d18..5807940d18 100644
--- a/svx/inc/svx/numdef.hxx
+++ b/editeng/inc/editeng/numdef.hxx
diff --git a/svx/inc/svx/numitem.hxx b/editeng/inc/editeng/numitem.hxx
index 89be46dea9..b887fac4de 100644
--- a/svx/inc/svx/numitem.hxx
+++ b/editeng/inc/editeng/numitem.hxx
@@ -35,20 +35,16 @@
 #include <tools/link.hxx>
 #include <tools/string.hxx>
 #include <svl/poolitem.hxx>
-#include <svx/svxenum.hxx>
+#include <editeng/svxenum.hxx>
 #include <tools/gen.hxx>
-#ifndef _SVX_NUMDEF_HXX //autogen
-#include <svx/numdef.hxx>
-#endif
-#ifndef _SV_COLOR_HXX //autogen
+#include <editeng/numdef.hxx>
 #include <tools/color.hxx>
-#endif
 #include <cppuhelper/weakref.hxx>
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/style/NumberingType.hpp>
 #include <unotools/fontcvt.hxx>
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 class SvxBrushItem;
 class Font;
@@ -77,7 +73,7 @@ namespace com{namespace sun{ namespace star{
 #define SVX_NO_NUMLEVEL         0x20
 
 #define LINK_TOKEN 	0x80 //indicate linked bitmaps - for use in dialog only
-class SVX_DLLPUBLIC SvxNumberType
+class EDITENG_DLLPUBLIC SvxNumberType
 {
     static sal_Int32 nRefCount;
     static com::sun::star::uno::Reference<com::sun::star::text::XNumberingFormatter> xFormatter;
@@ -107,7 +103,7 @@ public:
                     }
 };
 
-class SVX_DLLPUBLIC SvxNumberFormat : public SvxNumberType
+class EDITENG_DLLPUBLIC SvxNumberFormat : public SvxNumberType
 {
 public:
     // --> OD 2008-01-08 #newlistlevelattrs#
@@ -271,7 +267,7 @@ enum SvxNumRuleType
     SVX_RULETYPE_END
 };
 
-class SVX_DLLPUBLIC SvxNumRule
+class EDITENG_DLLPUBLIC SvxNumRule
 {
     USHORT 				nLevelCount;            // Anzahl der unterstuetzten Levels
     ULONG 				nFeatureFlags;          // was wird unterstuetzt?
@@ -330,7 +326,7 @@ public:
 /* -----------------27.10.98 13:04-------------------
  *
  * --------------------------------------------------*/
-class SVX_DLLPUBLIC SvxNumBulletItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxNumBulletItem : public SfxPoolItem
 {
     SvxNumRule* 			pNumRule;
 public:
diff --git a/svx/inc/opaqitem.hxx b/editeng/inc/editeng/opaqitem.hxx
index 2d8241db3b..980f07d8cb 100644
--- a/svx/inc/opaqitem.hxx
+++ b/editeng/inc/editeng/opaqitem.hxx
@@ -33,7 +33,7 @@
 // include ---------------------------------------------------------------
 
 #include <svl/eitem.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 class SvXMLUnitConverter;
 namespace rtl
@@ -49,7 +49,7 @@ namespace rtl
 Dieses Item beschreibt eine logische Variable "Undurchsichtig ja oder nein".
 */
 
-class SVX_DLLPUBLIC SvxOpaqueItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxOpaqueItem : public SfxBoolItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/orphitem.hxx b/editeng/inc/editeng/orphitem.hxx
index b3a284f068..d3cf661972 100644
--- a/svx/inc/svx/orphitem.hxx
+++ b/editeng/inc/editeng/orphitem.hxx
@@ -33,16 +33,13 @@
 // include ---------------------------------------------------------------
 
 #include <svl/intitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
+#include <editeng/editengdllapi.h>
 
 class SvXMLUnitConverter;
 namespace rtl
 {
     class OUString;
 }
-#include "svx/svxdllapi.h"
 
 // class SvxOrphansItem --------------------------------------------------
 
@@ -51,7 +48,7 @@ namespace rtl
 Dieses Item beschreibt die Anzahl der Zeilen fuer die Schusterjungenregelung.
 */
 
-class SVX_DLLPUBLIC SvxOrphansItem: public SfxByteItem
+class EDITENG_DLLPUBLIC SvxOrphansItem: public SfxByteItem
 {
     friend SvStream & operator<<( SvStream & aS, SvxOrphansItem & );
 public:
diff --git a/svx/inc/svx/outliner.hxx b/editeng/inc/editeng/outliner.hxx
index 8e2fcef8c2..0128bce090 100644
--- a/svx/inc/svx/outliner.hxx
+++ b/editeng/inc/editeng/outliner.hxx
@@ -36,14 +36,14 @@
 
 #include <svl/brdcst.hxx>
 
-#include <svx/editdata.hxx>
+#include <editeng/editdata.hxx>
 #include <i18npool/lang.h>
 #include <tools/color.hxx>
 #include <vcl/graph.hxx>
 #include <tools/list.hxx>
 #include <tools/link.hxx>
 #include <rsc/rscsfx.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 #include <svtools/grfmgr.hxx>
 
@@ -84,9 +84,9 @@ class SvxForbiddenCharactersTable;
 #include <com/sun/star/uno/Reference.h>
 
 #include <vos/ref.hxx>
-#include <svx/svxfont.hxx>
-#include <svx/eedata.hxx>
-#include <svx/paragraphdata.hxx>
+#include <editeng/svxfont.hxx>
+#include <editeng/eedata.hxx>
+#include <editeng/paragraphdata.hxx>
 
 class SvxFieldData;
 //////////////////////////////////////////////////////////////////////////////
@@ -186,7 +186,7 @@ inline void ParaRange::Adjust()
 
 #define OL_ROOTPARENT (Paragraph*)NULL
 
-class SVX_DLLPUBLIC OutlinerView
+class EDITENG_DLLPUBLIC OutlinerView
 {
     friend class Outliner;
 
@@ -228,28 +228,28 @@ private:
 
 #ifdef _OUTLINER_CXX
 
-    SVX_DLLPRIVATE void 		ImplExpandOrCollaps( USHORT nStartPara, USHORT nEndPara, BOOL bExpand );
-
-    SVX_DLLPRIVATE ULONG       ImpCheckMousePos( const Point& rPosPixel, MouseTarget& reTarget);
-    SVX_DLLPRIVATE void        ImpToggleExpand( Paragraph* pParentPara );
-    SVX_DLLPRIVATE ParaRange	ImpGetSelectedParagraphs( BOOL bIncludeHiddenChilds );
-    SVX_DLLPRIVATE void        ImpHideDDCursor();
-    SVX_DLLPRIVATE void        ImpShowDDCursor();
-    SVX_DLLPRIVATE void        ImpPaintDDCursor();
-
-    SVX_DLLPRIVATE void        ImpDragScroll( const Point& rPosPix );
-    SVX_DLLPRIVATE void        ImpScrollLeft();
-    SVX_DLLPRIVATE void        ImpScrollRight();
-    SVX_DLLPRIVATE void        ImpScrollUp();
-    SVX_DLLPRIVATE void        ImpScrollDown();
-
-    SVX_DLLPRIVATE ULONG       ImpGetInsertionPara( const Point& rPosPixel );
-    SVX_DLLPRIVATE Point       ImpGetDocPos( const Point& rPosPixel );
-    SVX_DLLPRIVATE Pointer     ImpGetMousePointer( MouseTarget eTarget );
-    SVX_DLLPRIVATE USHORT      ImpInitPaste( ULONG& rStart );
-    SVX_DLLPRIVATE void        ImpPasted( ULONG nStart, ULONG nPrevParaCount, USHORT nSize);
-    SVX_DLLPRIVATE USHORT      ImpCalcSelectedPages( BOOL bIncludeFirstSelected );
-    SVX_DLLPRIVATE BOOL        ImpIsIndentingPages();
+    EDITENG_DLLPRIVATE void 		ImplExpandOrCollaps( USHORT nStartPara, USHORT nEndPara, BOOL bExpand );
+
+    EDITENG_DLLPRIVATE ULONG       ImpCheckMousePos( const Point& rPosPixel, MouseTarget& reTarget);
+    EDITENG_DLLPRIVATE void        ImpToggleExpand( Paragraph* pParentPara );
+    EDITENG_DLLPRIVATE ParaRange	ImpGetSelectedParagraphs( BOOL bIncludeHiddenChilds );
+    EDITENG_DLLPRIVATE void        ImpHideDDCursor();
+    EDITENG_DLLPRIVATE void        ImpShowDDCursor();
+    EDITENG_DLLPRIVATE void        ImpPaintDDCursor();
+
+    EDITENG_DLLPRIVATE void        ImpDragScroll( const Point& rPosPix );
+    EDITENG_DLLPRIVATE void        ImpScrollLeft();
+    EDITENG_DLLPRIVATE void        ImpScrollRight();
+    EDITENG_DLLPRIVATE void        ImpScrollUp();
+    EDITENG_DLLPRIVATE void        ImpScrollDown();
+
+    EDITENG_DLLPRIVATE ULONG       ImpGetInsertionPara( const Point& rPosPixel );
+    EDITENG_DLLPRIVATE Point       ImpGetDocPos( const Point& rPosPixel );
+    EDITENG_DLLPRIVATE Pointer     ImpGetMousePointer( MouseTarget eTarget );
+    EDITENG_DLLPRIVATE USHORT      ImpInitPaste( ULONG& rStart );
+    EDITENG_DLLPRIVATE void        ImpPasted( ULONG nStart, ULONG nPrevParaCount, USHORT nSize);
+    EDITENG_DLLPRIVATE USHORT      ImpCalcSelectedPages( BOOL bIncludeFirstSelected );
+    EDITENG_DLLPRIVATE BOOL        ImpIsIndentingPages();
 
 #endif
 
@@ -398,7 +398,7 @@ DECLARE_LIST(ViewList,OutlinerView*)
 //typedef List ViewList;
 //#endif
 
-class SVX_DLLPUBLIC DrawPortionInfo
+class EDITENG_DLLPUBLIC DrawPortionInfo
 {
 public:
     const Point&        mrStartPos;
@@ -465,7 +465,7 @@ public:
     {}
 };
 
-class SVX_DLLPUBLIC DrawBulletInfo
+class EDITENG_DLLPUBLIC DrawBulletInfo
 {
 public:
     const GraphicObject maBulletGraphicObject;
@@ -482,7 +482,7 @@ public:
     {}
 };
 
-struct SVX_DLLPUBLIC PaintFirstLineInfo
+struct EDITENG_DLLPUBLIC PaintFirstLineInfo
 {
     USHORT mnPara;
     const Point& mrStartPos;
@@ -585,7 +585,7 @@ struct EBulletInfo
 #define OUTLINERMODE_SUBTITLE		(0x0100|OUTLINERMODE_TEXTOBJECT)
 #define OUTLINERMODE_NOTE			(0x0200|OUTLINERMODE_TEXTOBJECT)
 
-class SVX_DLLPUBLIC Outliner : public SfxBroadcaster
+class EDITENG_DLLPUBLIC Outliner : public SfxBroadcaster
 {
     friend class OutlinerView;
     friend class OutlinerEditEng;
diff --git a/svx/inc/svx/outlobj.hxx b/editeng/inc/editeng/outlobj.hxx
index 470f173d41..3c3d2e212a 100644
--- a/svx/inc/svx/outlobj.hxx
+++ b/editeng/inc/editeng/outlobj.hxx
@@ -36,15 +36,15 @@
 #include <tools/solar.h>
 #include <tools/string.hxx>
 #include <rsc/rscsfx.hxx>
-#include <svx/paragraphdata.hxx>
-#include "svx/svxdllapi.h"
+#include <editeng/paragraphdata.hxx>
+#include "editeng/editengdllapi.h"
 
 class EditTextObject;
 class ImplOutlinerParaObject;
 
 //////////////////////////////////////////////////////////////////////////////
 
-class SVX_DLLPUBLIC OutlinerParaObject
+class EDITENG_DLLPUBLIC OutlinerParaObject
 {
 private:
     ImplOutlinerParaObject*        mpImplOutlinerParaObject;
diff --git a/svx/inc/svx/paperinf.hxx b/editeng/inc/editeng/paperinf.hxx
index f875fb5e62..552cfe66ac 100644
--- a/svx/inc/svx/paperinf.hxx
+++ b/editeng/inc/editeng/paperinf.hxx
@@ -34,8 +34,8 @@
 
 #include <vcl/print.hxx>
 #include <vcl/mapmod.hxx>
-#include <svx/svxenum.hxx>
-#include "svx/svxdllapi.h"
+#include <editeng/svxenum.hxx>
+#include "editeng/editengdllapi.h"
 
 // forward ---------------------------------------------------------------
 
@@ -45,7 +45,7 @@ class String;
 
 // class SvxPaperInfo -----------------------------------------------------
 
-class SVX_DLLPUBLIC SvxPaperInfo
+class EDITENG_DLLPUBLIC SvxPaperInfo
 {
 public:
     static Size     GetDefaultPaperSize( MapUnit eUnit = MAP_TWIP );
diff --git a/svx/inc/svx/paragraphdata.hxx b/editeng/inc/editeng/paragraphdata.hxx
index c998cc6291..c998cc6291 100644
--- a/svx/inc/svx/paragraphdata.hxx
+++ b/editeng/inc/editeng/paragraphdata.hxx
diff --git a/svx/inc/svx/paravertalignitem.hxx b/editeng/inc/editeng/paravertalignitem.hxx
index a8455819e2..cbcf20d0ff 100644
--- a/svx/inc/svx/paravertalignitem.hxx
+++ b/editeng/inc/editeng/paravertalignitem.hxx
@@ -33,10 +33,7 @@
 // include ---------------------------------------------------------------
 
 #include <svl/intitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 // class SvxParaVertAlignItem ----------------------------------------------
 
@@ -47,7 +44,7 @@
 
 */
 
-class SVX_DLLPUBLIC SvxParaVertAlignItem : public SfxUInt16Item
+class EDITENG_DLLPUBLIC SvxParaVertAlignItem : public SfxUInt16Item
 {
 public:
     enum { AUTOMATIC, BASELINE, TOP, CENTER, BOTTOM };
diff --git a/svx/inc/svx/pbinitem.hxx b/editeng/inc/editeng/pbinitem.hxx
index f9b1caa8da..8cdf10599c 100644
--- a/svx/inc/svx/pbinitem.hxx
+++ b/editeng/inc/editeng/pbinitem.hxx
@@ -33,10 +33,7 @@
 // include ---------------------------------------------------------------
 
 #include <svl/intitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 // define ----------------------------------------------------------------
 
@@ -49,7 +46,7 @@
     Dieses Item beschreibt die Auswahl eines Papierschachts des Drucker.
 */
 
-class SVX_DLLPUBLIC SvxPaperBinItem : public SfxByteItem
+class EDITENG_DLLPUBLIC SvxPaperBinItem : public SfxByteItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/pgrditem.hxx b/editeng/inc/editeng/pgrditem.hxx
index c6871a7e16..7ec71a8928 100644
--- a/svx/inc/pgrditem.hxx
+++ b/editeng/inc/editeng/pgrditem.hxx
@@ -33,7 +33,7 @@
 // include ---------------------------------------------------------------
 
 #include <svl/eitem.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 // class SvxParaGridItem -------------------------------------------------
 
@@ -43,7 +43,7 @@
     Paragraph snap to grid
 */
 
-class SVX_DLLPUBLIC SvxParaGridItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxParaGridItem : public SfxBoolItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/pmdlitem.hxx b/editeng/inc/editeng/pmdlitem.hxx
index b05cf29646..7fc3c8d10c 100644
--- a/svx/inc/svx/pmdlitem.hxx
+++ b/editeng/inc/editeng/pmdlitem.hxx
@@ -33,10 +33,7 @@
 // include ---------------------------------------------------------------
 
 #include <svl/stritem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 // class SvxPageModelItem ------------------------------------------------
 
@@ -45,7 +42,7 @@
 Dieses Item enthaelt einen Namen einer Seitenvorlage.
 */
 
-class SVX_DLLPUBLIC SvxPageModelItem : public SfxStringItem
+class EDITENG_DLLPUBLIC SvxPageModelItem : public SfxStringItem
 {
 private:
     BOOL bAuto;
diff --git a/svx/inc/svx/postitem.hxx b/editeng/inc/editeng/postitem.hxx
index d5ccefd748..788a9f580e 100644
--- a/svx/inc/svx/postitem.hxx
+++ b/editeng/inc/editeng/postitem.hxx
@@ -34,10 +34,7 @@
 
 #include <vcl/vclenum.hxx>
 #include <svl/eitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 class SvXMLUnitConverter;
 namespace rtl
@@ -52,7 +49,7 @@ namespace rtl
     Dieses Item beschreibt die Font-Stellung (Italic)
 */
 
-class SVX_DLLPUBLIC SvxPostureItem : public SfxEnumItem
+class EDITENG_DLLPUBLIC SvxPostureItem : public SfxEnumItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/prntitem.hxx b/editeng/inc/editeng/prntitem.hxx
index ab94837ffe..3794bc14b6 100644
--- a/svx/inc/prntitem.hxx
+++ b/editeng/inc/editeng/prntitem.hxx
@@ -33,7 +33,7 @@
 // include ---------------------------------------------------------------
 
 #include <svl/eitem.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 
 
@@ -46,7 +46,7 @@ Dieses Item beschreibt eine logische Variable "Drucken ja oder nein".
 */
 
 
-class SVX_DLLPUBLIC SvxPrintItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxPrintItem : public SfxBoolItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/protitem.hxx b/editeng/inc/editeng/protitem.hxx
index 4a9b3e3765..dbf0339766 100644
--- a/svx/inc/protitem.hxx
+++ b/editeng/inc/editeng/protitem.hxx
@@ -34,7 +34,7 @@
 
 
 #include <svl/poolitem.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 class SvXMLUnitConverter;
 namespace rtl
@@ -51,7 +51,7 @@ Dieses Item beschreibt, ob Inhalt, Groesse oder Position geschuetzt werden
 sollen.
 */
 
-class SVX_DLLPUBLIC SvxProtectItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxProtectItem : public SfxPoolItem
 {
     BOOL bCntnt :1;     //Inhalt geschuetzt
     BOOL bSize  :1;     //Groesse geschuetzt
diff --git a/svx/inc/svx/prszitem.hxx b/editeng/inc/editeng/prszitem.hxx
index 6e6acff2a9..50323e9cfe 100644
--- a/svx/inc/svx/prszitem.hxx
+++ b/editeng/inc/editeng/prszitem.hxx
@@ -33,10 +33,7 @@
 // include ---------------------------------------------------------------
 
 #include <svl/intitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 // class SvxPropSizeItem -------------------------------------------------
 
@@ -45,7 +42,7 @@
     Dieses Item beschreibt die relative Schriftgroesse.
 */
 
-class SVX_DLLPUBLIC SvxPropSizeItem : public SfxUInt16Item
+class EDITENG_DLLPUBLIC SvxPropSizeItem : public SfxUInt16Item
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/scriptspaceitem.hxx b/editeng/inc/editeng/scriptspaceitem.hxx
index a6966ed089..d7b7205831 100644
--- a/svx/inc/svx/scriptspaceitem.hxx
+++ b/editeng/inc/editeng/scriptspaceitem.hxx
@@ -33,10 +33,7 @@
 // include ---------------------------------------------------------------
 
 #include <svl/eitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 // class SvxScriptSpaceItem ----------------------------------------------
 
@@ -46,7 +43,7 @@
     used for the user interface.
 */
 
-class SVX_DLLPUBLIC SvxScriptSpaceItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxScriptSpaceItem : public SfxBoolItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/scripttypeitem.hxx b/editeng/inc/editeng/scripttypeitem.hxx
index 58c7f8a943..4badeaeb15 100644
--- a/svx/inc/svx/scripttypeitem.hxx
+++ b/editeng/inc/editeng/scripttypeitem.hxx
@@ -33,11 +33,8 @@
 // include ---------------------------------------------------------------
 
 #include <svl/intitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
 #include <svl/languageoptions.hxx>
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 // class SvxScriptTypeItem ----------------------------------------------
 
@@ -47,7 +44,7 @@
     used for the user interface.
 */
 
-SVX_DLLPUBLIC USHORT GetI18NScriptTypeOfLanguage( USHORT nLang );
+EDITENG_DLLPUBLIC USHORT GetI18NScriptTypeOfLanguage( USHORT nLang );
 USHORT GetItemScriptType( short nI18NType );
 short  GetI18NScriptType( USHORT nItemType );
 
@@ -61,7 +58,7 @@ public:
 
 };
 
-class SVX_DLLPUBLIC SvxScriptSetItem : public SfxSetItem
+class EDITENG_DLLPUBLIC SvxScriptSetItem : public SfxSetItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/shaditem.hxx b/editeng/inc/editeng/shaditem.hxx
index 323e4a06fc..48ef895d52 100644
--- a/svx/inc/svx/shaditem.hxx
+++ b/editeng/inc/editeng/shaditem.hxx
@@ -34,11 +34,8 @@
 
 #include <tools/color.hxx>
 #include <svl/eitem.hxx>
-#include <svx/svxenum.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/svxenum.hxx>
+#include <editeng/editengdllapi.h>
 
 namespace rtl
 {
@@ -57,7 +54,7 @@ namespace rtl
 #define SHADOW_LEFT		((USHORT)2)
 #define SHADOW_RIGHT	((USHORT)3)
 
-class SVX_DLLPUBLIC SvxShadowItem : public SfxEnumItemInterface
+class EDITENG_DLLPUBLIC SvxShadowItem : public SfxEnumItemInterface
 {
     Color 				aShadowColor;
     USHORT 				nWidth;
diff --git a/svx/inc/svx/shdditem.hxx b/editeng/inc/editeng/shdditem.hxx
index 9f6fa35af3..b660d39e4f 100644
--- a/svx/inc/svx/shdditem.hxx
+++ b/editeng/inc/editeng/shdditem.hxx
@@ -33,10 +33,7 @@
 // include ---------------------------------------------------------------
 
 #include <svl/eitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 class SvXMLUnitConverter;
 namespace rtl
@@ -51,7 +48,7 @@ namespace rtl
     Dieses Item beschreibt, ob und wie schattiert ist.
 */
 
-class SVX_DLLPUBLIC SvxShadowedItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxShadowedItem : public SfxBoolItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/sizeitem.hxx b/editeng/inc/editeng/sizeitem.hxx
index ca255a6128..c0befa88d7 100644
--- a/svx/inc/svx/sizeitem.hxx
+++ b/editeng/inc/editeng/sizeitem.hxx
@@ -34,10 +34,7 @@
 
 #include <tools/gen.hxx>
 #include <svl/poolitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 // class SvxSizeItem -----------------------------------------------------
 
@@ -46,7 +43,7 @@
 Dieses Item beschreibt eine zweidimensionale Groesse (Size).
 */
 
-class SVX_DLLPUBLIC SvxSizeItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxSizeItem : public SfxPoolItem
 {
 
     Size aSize;
diff --git a/svx/inc/svx/spltitem.hxx b/editeng/inc/editeng/spltitem.hxx
index 4a12a22dcf..bc050516fb 100644
--- a/svx/inc/svx/spltitem.hxx
+++ b/editeng/inc/editeng/spltitem.hxx
@@ -33,10 +33,7 @@
 // include ---------------------------------------------------------------
 
 #include <svl/eitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 class SvXMLUnitConverter;
 namespace rtl
@@ -51,7 +48,7 @@ namespace rtl
 Dieses Item beschreibt eine logische Variable "Absatz trennen ja oder nein".
 */
 
-class SVX_DLLPUBLIC SvxFmtSplitItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxFmtSplitItem : public SfxBoolItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/splwrap.hxx b/editeng/inc/editeng/splwrap.hxx
index 51b3cf8177..fc8a08c44c 100644
--- a/svx/inc/svx/splwrap.hxx
+++ b/editeng/inc/editeng/splwrap.hxx
@@ -32,10 +32,10 @@
 
 // include ---------------------------------------------------------------
 
-#include <svx/svxenum.hxx>
+#include <editeng/svxenum.hxx>
 #include <tools/string.hxx>
 #include <com/sun/star/uno/Reference.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 // forward ---------------------------------------------------------------
 
@@ -49,13 +49,13 @@ class Window;
 
 // misc functions ---------------------------------------------------------------
 
-void SVX_DLLPUBLIC SvxPrepareAutoCorrect( String &rOldText, String &rNewText );
+void EDITENG_DLLPUBLIC SvxPrepareAutoCorrect( String &rOldText, String &rNewText );
 
 /*--------------------------------------------------------------------
      Beschreibung: Der SpellWrapper
  --------------------------------------------------------------------*/
 
-class SVX_DLLPUBLIC SvxSpellWrapper {
+class EDITENG_DLLPUBLIC SvxSpellWrapper {
 private:
     friend class SvxSpellCheckDialog;
     friend class SvxHyphenWordDialog;
@@ -80,7 +80,7 @@ private:
     sal_Bool	bAllRight	: 1; // falsche Woerter in geignetes Woerterbuch
                              // aufnehmen und nicht den Dialog starten.
 
-    SVX_DLLPRIVATE sal_Bool 	SpellNext();   		// naechsten Bereich anwaehlen
+    EDITENG_DLLPRIVATE sal_Bool 	SpellNext();   		// naechsten Bereich anwaehlen
     sal_Bool	FindSpellError(); 	// Suche nach Fehlern ( ueber Bereiche hinweg )
 
 public:
diff --git a/svx/inc/svx/svdfield.hxx b/editeng/inc/editeng/svdfield.hxx
index 1efe0111ff..5d45f5999f 100644
--- a/svx/inc/svx/svdfield.hxx
+++ b/editeng/inc/editeng/svdfield.hxx
@@ -31,22 +31,22 @@
 #ifndef _SVDFIELD_HXX
 #define _SVDFIELD_HXX
 
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
 #ifndef _FLDITEM_HXX
 #ifndef ITEMID_FIELD
 #ifndef _EDITDATA_HXX
-#include <svx/editdata.hxx>  /* das include wird wg. EE_FEATURE_FIELD benoetigt */
+#include <editeng/editdata.hxx>  /* das include wird wg. EE_FEATURE_FIELD benoetigt */
 #endif
-#define ITEMID_FIELD EE_FEATURE_FIELD  /* wird fuer #include <svx/flditem.hxx> benoetigt */
+#define ITEMID_FIELD EE_FEATURE_FIELD  /* wird fuer #include <editeng/flditem.hxx> benoetigt */
 #endif
-#include <svx/flditem.hxx>
+#include <editeng/flditem.hxx>
 #endif
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // Do not remove this, it is still used in src536a!
-void SVX_DLLPUBLIC SdrRegisterFieldClasses();
+void EDITENG_DLLPUBLIC SdrRegisterFieldClasses();
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 #define SDR_MEASUREFIELD 50
@@ -55,7 +55,7 @@ class SdrMeasureObj;
 
 enum SdrMeasureFieldKind {SDRMEASUREFIELD_VALUE,SDRMEASUREFIELD_UNIT,SDRMEASUREFIELD_ROTA90BLANCS};
 
-class SVX_DLLPUBLIC SdrMeasureField: public SvxFieldData {
+class EDITENG_DLLPUBLIC SdrMeasureField: public SvxFieldData {
     SdrMeasureFieldKind eMeasureFieldKind;
 public:
     SV_DECL_PERSIST1(SdrMeasureField,SvxFieldData,SDR_MEASUREFIELD)
diff --git a/svx/inc/svx/svxacorr.hxx b/editeng/inc/editeng/svxacorr.hxx
index 26d34abb10..9b925f483b 100644
--- a/svx/inc/svx/svxacorr.hxx
+++ b/editeng/inc/editeng/svxacorr.hxx
@@ -38,8 +38,8 @@
 #include <tools/time.hxx>
 #include <tools/date.hxx>
 #include <tools/string.hxx>
-#include <svx/swafopt.hxx>
-#include "svx/svxdllapi.h"
+#include <editeng/swafopt.hxx>
+#include "editeng/editengdllapi.h"
 
 class CharClass;
 class SfxPoolItem;
@@ -73,7 +73,7 @@ const long WrdSttLstLoad	= 0x80000000;	// Exceptionlist fuer WordStart geladen
 // TODO: handle unicodes > U+FFFF and check users of this class
 
 // nur eine Mappingklasse
-class SVX_DLLPUBLIC SvxAutoCorrDoc
+class EDITENG_DLLPUBLIC SvxAutoCorrDoc
 {
 public:
     SvxAutoCorrDoc() {}
@@ -114,7 +114,7 @@ public:
 };
 
 
-class SVX_DLLPUBLIC SvxAutocorrWord
+class EDITENG_DLLPUBLIC SvxAutocorrWord
 {
     String sShort, sLong;
     BOOL bIsTxtOnly;				// ist reiner ASCII - Text
@@ -129,9 +129,9 @@ public:
 };
 
 typedef SvxAutocorrWord* SvxAutocorrWordPtr;
-SV_DECL_PTRARR_SORT_DEL_VISIBILITY( SvxAutocorrWordList, SvxAutocorrWordPtr, 10, 10 , SVX_DLLPUBLIC)
+SV_DECL_PTRARR_SORT_DEL_VISIBILITY( SvxAutocorrWordList, SvxAutocorrWordPtr, 10, 10 , EDITENG_DLLPUBLIC)
 
-class SVX_DLLPUBLIC SvxAutoCorrectLanguageLists
+class EDITENG_DLLPUBLIC SvxAutoCorrectLanguageLists
 {
     String sShareAutoCorrFile, sUserAutoCorrFile;
     // falls die AutoCorr Datei neuer ist
@@ -199,7 +199,7 @@ public:
 };
 
 
-class SVX_DLLPUBLIC SvxAutoCorrect
+class EDITENG_DLLPUBLIC SvxAutoCorrect
 {
     friend class SvxAutoCorrectLanguageLists;
 
diff --git a/svx/inc/svx/svxenum.hxx b/editeng/inc/editeng/svxenum.hxx
index d2f2530f27..d2f2530f27 100644
--- a/svx/inc/svx/svxenum.hxx
+++ b/editeng/inc/editeng/svxenum.hxx
diff --git a/svx/inc/svx/svxfont.hxx b/editeng/inc/editeng/svxfont.hxx
index a710c64097..ef95770d27 100644
--- a/svx/inc/svx/svxfont.hxx
+++ b/editeng/inc/editeng/svxfont.hxx
@@ -31,16 +31,16 @@
 #define	_SVX_SVXFONT_HXX
 
 #include <limits.h>		// USHRT_MAX
-#include <svx/svxenum.hxx>
+#include <editeng/svxenum.hxx>
 #include <i18npool/lang.h>
 #include <vcl/font.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 class SvxDoCapitals;
 class OutputDevice;
 class Printer;
 
-class SVX_DLLPUBLIC SvxFont : public Font
+class EDITENG_DLLPUBLIC SvxFont : public Font
 {
     LanguageType eLang;         // Language
     SvxCaseMap	 eCaseMap;      // Textauszeichnung
diff --git a/svx/inc/svxrtf.hxx b/editeng/inc/editeng/svxrtf.hxx
index fffb5e3a36..897457b8a2 100644
--- a/svx/inc/svxrtf.hxx
+++ b/editeng/inc/editeng/svxrtf.hxx
@@ -31,17 +31,14 @@
 #ifndef _SVXRTF_HXX
 #define _SVXRTF_HXX
 
-#ifndef _TABLE_HXX //autogen
 #include <tools/table.hxx>
-#endif
 #include <tools/string.hxx>
 #include <svl/itemset.hxx>
 #include <svtools/parrtf.hxx>
 
 #define _SVSTDARR_USHORTS
 #include <svl/svstdarr.hxx>
-#include "svx/svxdllapi.h"
-
+#include <editeng/editengdllapi.h>
 
 class Font;
 class Color;
@@ -111,7 +108,7 @@ struct SvxRTFStyleType
 
 // Bitmap - Mode
 
-struct SVX_DLLPUBLIC SvxRTFPictureType
+struct EDITENG_DLLPUBLIC SvxRTFPictureType
 {
     // Format der Bitmap
     enum RTF_BMPSTYLE
@@ -221,7 +218,7 @@ struct RTFPardAttrMapIds
 // -----------------------------------------------------------------------
 
 
-class SVX_DLLPUBLIC SvxRTFParser : public SvRTFParser
+class EDITENG_DLLPUBLIC SvxRTFParser : public SvRTFParser
 {
     SvStream &rStrm;
     SvxRTFColorTbl	aColorTbl;
@@ -410,7 +407,7 @@ public:
 
 // der Stack fuer die Attribute:
 // diese Klasse darf nur vom SvxRTFParser benutzt werden!
-class SVX_DLLPUBLIC SvxRTFItemStackType
+class EDITENG_DLLPUBLIC SvxRTFItemStackType
 {
     friend class SvxRTFParser;
     friend class SvxRTFItemStackList;
diff --git a/svx/inc/svx/swafopt.hxx b/editeng/inc/editeng/swafopt.hxx
index 18ae7e0114..9d347f2e91 100644
--- a/svx/inc/svx/swafopt.hxx
+++ b/editeng/inc/editeng/swafopt.hxx
@@ -31,13 +31,13 @@
 #define _SVXSWAFOPT_HXX
 
 #include <vcl/font.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 class SvStringsISortDtor;
 class SmartTagMgr;
 
 // Klasse fuer Optionen vom Autoformat
-struct SVX_DLLPUBLIC SvxSwAutoFmtFlags
+struct EDITENG_DLLPUBLIC SvxSwAutoFmtFlags
 {
     Font aBulletFont;
     Font aByInputBulletFont;
diff --git a/svx/inc/svx/tstpitem.hxx b/editeng/inc/editeng/tstpitem.hxx
index edd17a9ac6..40a9ac4ec1 100644
--- a/svx/inc/svx/tstpitem.hxx
+++ b/editeng/inc/editeng/tstpitem.hxx
@@ -33,11 +33,8 @@
 // include ---------------------------------------------------------------
 
 #include <svl/poolitem.hxx>
-#include <svx/svxenum.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/svxenum.hxx>
+#include <editeng/editengdllapi.h>
 
 // class SvxTabStop ------------------------------------------------------
 
@@ -47,7 +44,7 @@
 #define cDfltDecimalChar    (sal_Unicode(0x00)) // aus IntlWrapper besorgen
 #define cDfltFillChar       (sal_Unicode(' '))
 
-class SVX_DLLPUBLIC SvxTabStop
+class EDITENG_DLLPUBLIC SvxTabStop
 {
 private:
     long            nTabPos;
@@ -56,7 +53,7 @@ private:
     mutable sal_Unicode		m_cDecimal;
     sal_Unicode		cFill;
 
-    SVX_DLLPRIVATE friend SvStream& operator<<( SvStream&, SvxTabStop& );
+    EDITENG_DLLPRIVATE friend SvStream& operator<<( SvStream&, SvxTabStop& );
 
     void fillDecimal() const;
 
@@ -115,14 +112,14 @@ public:
 
 // class SvxTabStopItem --------------------------------------------------
 
-SV_DECL_VARARR_SORT_VISIBILITY( SvxTabStopArr, SvxTabStop, SVX_TAB_DEFCOUNT, 1, SVX_DLLPUBLIC )
+SV_DECL_VARARR_SORT_VISIBILITY( SvxTabStopArr, SvxTabStop, SVX_TAB_DEFCOUNT, 1, EDITENG_DLLPUBLIC )
 
 /*
 [Beschreibung]
 Dieses Item beschreibt eine Liste von TabStops.
 */
 
-class SVX_DLLPUBLIC SvxTabStopItem : public SfxPoolItem, private SvxTabStopArr
+class EDITENG_DLLPUBLIC SvxTabStopItem : public SfxPoolItem, private SvxTabStopArr
 {
 //friend class SvxTabStopObject_Impl;
 
diff --git a/svx/inc/svx/twolinesitem.hxx b/editeng/inc/editeng/twolinesitem.hxx
index 67417ac88c..22fcb5c701 100644
--- a/svx/inc/svx/twolinesitem.hxx
+++ b/editeng/inc/editeng/twolinesitem.hxx
@@ -32,10 +32,7 @@
 
 #include <sal/types.h>
 #include <svl/poolitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 class SvXMLUnitConverter;
 namespace rtl
@@ -43,7 +40,7 @@ namespace rtl
     class OUString;
 }
 
-class SVX_DLLPUBLIC SvxTwoLinesItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxTwoLinesItem : public SfxPoolItem
 {
     sal_Unicode	cStartBracket, cEndBracket;
     sal_Bool bOn;
diff --git a/svx/inc/txtrange.hxx b/editeng/inc/editeng/txtrange.hxx
index 3427999306..1bfe408729 100644
--- a/svx/inc/txtrange.hxx
+++ b/editeng/inc/editeng/txtrange.hxx
@@ -36,7 +36,7 @@
 #define _SVSTDARR_LONGS
 #include <svl/svstdarr.hxx>
 #endif
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 class PolyPolygon;
 class Range;
@@ -57,7 +57,7 @@ typedef SvLongs* SvLongsPtr;
 |*    Letzte Aenderung AMA 20.01.97
 |*
 *************************************************************************/
-class SVX_DLLPUBLIC TextRanger
+class EDITENG_DLLPUBLIC TextRanger
 {
     Range *pRangeArr;
     SvLongsPtr *pCache;
diff --git a/svx/inc/svx/udlnitem.hxx b/editeng/inc/editeng/udlnitem.hxx
index d5b328361a..81b5ed5104 100644
--- a/svx/inc/svx/udlnitem.hxx
+++ b/editeng/inc/editeng/udlnitem.hxx
@@ -33,12 +33,9 @@
 // include ---------------------------------------------------------------
 
 #include <svl/eitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
 #include <vcl/vclenum.hxx>
 #include <tools/color.hxx>
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 class SvXMLUnitConverter;
 namespace rtl
@@ -50,7 +47,7 @@ namespace rtl
 
 /* Value container for underline and overline font effects */
 
-class SVX_DLLPUBLIC SvxTextLineItem : public SfxEnumItem
+class EDITENG_DLLPUBLIC SvxTextLineItem : public SfxEnumItem
 {
     Color mColor;
 public:
@@ -106,7 +103,7 @@ public:
 
 /* Value container for underline font effects */
 
-class SVX_DLLPUBLIC SvxUnderlineItem : public SvxTextLineItem
+class EDITENG_DLLPUBLIC SvxUnderlineItem : public SvxTextLineItem
 {
 public:
     TYPEINFO();
@@ -123,7 +120,7 @@ public:
 
 /* Value container for overline font effects */
 
-class SVX_DLLPUBLIC SvxOverlineItem : public SvxTextLineItem
+class EDITENG_DLLPUBLIC SvxOverlineItem : public SvxTextLineItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/ulspitem.hxx b/editeng/inc/editeng/ulspitem.hxx
index 87d2262b76..25357cd2ff 100644
--- a/svx/inc/svx/ulspitem.hxx
+++ b/editeng/inc/editeng/ulspitem.hxx
@@ -33,10 +33,7 @@
 // include ---------------------------------------------------------------
 
 #include <svl/poolitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 namespace rtl
 {
@@ -52,7 +49,7 @@ Dieses Item beschreibt den oberen und unteren Rand einer Seite oder Absatz.
 
 #define	ULSPACE_16_VERSION	((USHORT)0x0001)
 
-class SVX_DLLPUBLIC SvxULSpaceItem : public SfxPoolItem
+class EDITENG_DLLPUBLIC SvxULSpaceItem : public SfxPoolItem
 {
     USHORT nUpper;  //Oberer Rand
     USHORT nLower;  //Unterer Rand
diff --git a/svx/inc/unoedhlp.hxx b/editeng/inc/editeng/unoedhlp.hxx
index e46a91634a..59ae477e5d 100644
--- a/svx/inc/unoedhlp.hxx
+++ b/editeng/inc/editeng/unoedhlp.hxx
@@ -36,7 +36,7 @@
 #include <svtools/textdata.hxx>
 #include <svl/hint.hxx>
 #include <tools/gen.hxx> 
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 struct EENotify;
 class EditEngine;
@@ -49,7 +49,7 @@ class EditEngine;
     case denotes the destination position, the two parameters the
     start and the end of the moved paragraph range.
  */
-class SVX_DLLPUBLIC SvxEditSourceHint : public TextHint
+class EDITENG_DLLPUBLIC SvxEditSourceHint : public TextHint
 {
 private:
     ULONG 	mnStart;
@@ -70,7 +70,7 @@ public:
 
 /** Helper class for common functionality in edit sources
  */
-class SVX_DLLPUBLIC SvxEditSourceHelper
+class EDITENG_DLLPUBLIC SvxEditSourceHelper
 {
 public:
 
diff --git a/svx/inc/svx/unoedsrc.hxx b/editeng/inc/editeng/unoedsrc.hxx
index b60ec2d586..45c7141eb6 100644
--- a/svx/inc/svx/unoedsrc.hxx
+++ b/editeng/inc/editeng/unoedsrc.hxx
@@ -44,7 +44,7 @@
 #endif
 #include <svl/poolitem.hxx>
 #include <svl/itempool.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 #include <list>
 
@@ -71,7 +71,7 @@ typedef std::list< SvxUnoTextRangeBase* > SvxUnoTextRangeBaseList;
     contain an EditEngine/Outliner. Is used e.g. for filling an
     EditEngine with the content of a cell, note page or page template.
 */
-class SVX_DLLPUBLIC SvxEditSource
+class EDITENG_DLLPUBLIC SvxEditSource
 {
 public:
     virtual					~SvxEditSource();
@@ -151,7 +151,7 @@ public:
     SvxEditSource::UpdateData(). This copies back the data to the model's
     EditTextObject/OutlinerParaObject.
  */
-class SVX_DLLPUBLIC SvxTextForwarder
+class EDITENG_DLLPUBLIC SvxTextForwarder
 {
 public:
     virtual				~SvxTextForwarder();
@@ -457,7 +457,7 @@ public:
     This one has to be different from the SvxEditViewForwarder, since
     the latter is only valid in edit mode.
  */
-class SVX_DLLPUBLIC SvxViewForwarder
+class EDITENG_DLLPUBLIC SvxViewForwarder
 {
 public:
     virtual				~SvxViewForwarder();
diff --git a/svx/inc/unofdesc.hxx b/editeng/inc/editeng/unofdesc.hxx
index 64c7aab92a..d437e724df 100644
--- a/svx/inc/unofdesc.hxx
+++ b/editeng/inc/editeng/unofdesc.hxx
@@ -35,9 +35,9 @@
 #include <com/sun/star/beans/PropertyState.hpp>
 #include <svl/itemset.hxx>
 #include <vcl/font.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
-class SVX_DLLPUBLIC SvxUnoFontDescriptor
+class EDITENG_DLLPUBLIC SvxUnoFontDescriptor
 {
 public:
     static void ConvertToFont( const ::com::sun::star::awt::FontDescriptor& rDesc, Font& rFont );
diff --git a/svx/inc/svx/unofield.hxx b/editeng/inc/editeng/unofield.hxx
index 3132902f31..1ec3a11ca9 100644
--- a/svx/inc/svx/unofield.hxx
+++ b/editeng/inc/editeng/unofield.hxx
@@ -37,11 +37,11 @@
 #include <com/sun/star/text/XTextField.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <cppuhelper/component.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 #include <comphelper/servicehelper.hxx>
 
-#include <svx/mutxhelp.hxx>
+#include <editeng/mutxhelp.hxx>
 
 // ids usable for the constructor
 #define ID_DATEFIELD		0
@@ -68,7 +68,7 @@ class SvxFieldData;
 com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL SvxUnoTextCreateTextField( 
     const ::rtl::OUString& ServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
 
-class SVX_DLLPUBLIC SvxUnoTextField : public SvxMutexHelper,
+class EDITENG_DLLPUBLIC SvxUnoTextField : public SvxMutexHelper,
                         public ::cppu::OComponentHelper,
                         public ::com::sun::star::text::XTextField,
                         public ::com::sun::star::beans::XPropertySet,
diff --git a/svx/inc/svx/unofored.hxx b/editeng/inc/editeng/unofored.hxx
index 6aa4a18fb0..79eb40b97c 100644
--- a/svx/inc/svx/unofored.hxx
+++ b/editeng/inc/editeng/unofored.hxx
@@ -31,13 +31,13 @@
 #ifndef _SVX_UNOFORED_HXX
 #define _SVX_UNOFORED_HXX
 
-#include <svx/editeng.hxx>
-#include <svx/unoedsrc.hxx>
-#include "svx/svxdllapi.h"
+#include <editeng/editeng.hxx>
+#include <editeng/unoedsrc.hxx>
+#include "editeng/editengdllapi.h"
 
 //	SvxEditEngineForwarder - SvxTextForwarder fuer EditEngine
 
-class SVX_DLLPUBLIC SvxEditEngineForwarder : public SvxTextForwarder
+class EDITENG_DLLPUBLIC SvxEditEngineForwarder : public SvxTextForwarder
 {
 private:
     EditEngine&			rEditEngine;
diff --git a/svx/inc/svx/unoforou.hxx b/editeng/inc/editeng/unoforou.hxx
index 82fa3108e7..274c1e1163 100644
--- a/svx/inc/svx/unoforou.hxx
+++ b/editeng/inc/editeng/unoforou.hxx
@@ -31,16 +31,16 @@
 #ifndef _SVX_UNOFOROU_HXX
 #define _SVX_UNOFOROU_HXX
 
-#include <svx/unoedsrc.hxx>
-#include "svx/svxdllapi.h"
+#include <editeng/unoedsrc.hxx>
+#include "editeng/editengdllapi.h"
 
-#include <svx/editdata.hxx>
+#include <editeng/editdata.hxx>
 
 class Outliner;
 
 //	SvxOutlinerForwarder - SvxTextForwarder fuer Outliner
 
-class SVX_DLLPUBLIC SvxOutlinerForwarder : public SvxTextForwarder
+class EDITENG_DLLPUBLIC SvxOutlinerForwarder : public SvxTextForwarder
 {
 private:
     Outliner&			rOutliner;
diff --git a/svx/inc/svx/unoipset.hxx b/editeng/inc/editeng/unoipset.hxx
index b1e342cb86..eeac3fbc9e 100644
--- a/svx/inc/svx/unoipset.hxx
+++ b/editeng/inc/editeng/unoipset.hxx
@@ -33,7 +33,7 @@
 
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 #include <svl/itemprop.hxx>
 
 class SvxIDPropertyCombineList;
@@ -43,7 +43,7 @@ class SvxShape;
 
 #define SFX_METRIC_ITEM                         (0x40)
 
-class SVX_DLLPUBLIC SvxItemPropertySet
+class EDITENG_DLLPUBLIC SvxItemPropertySet
 {
     SfxItemPropertyMap          m_aPropertyMap;
     mutable com::sun::star::uno::Reference<com::sun::star::beans::XPropertySetInfo> m_xInfo;
@@ -57,15 +57,13 @@ public:
     ~SvxItemPropertySet();
 
     // Methoden, die direkt mit dem ItemSet arbeiten
-    ::com::sun::star::uno::Any getPropertyValue( const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet ) const;
-    void setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const ::com::sun::star::uno::Any& rVal, SfxItemSet& rSet ) const;
+    ::com::sun::star::uno::Any getPropertyValue( const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet, bool bSearchInParent, bool bConvert ) const;
+    void setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const ::com::sun::star::uno::Any& rVal, SfxItemSet& rSet, bool bConvert ) const;
 
     // Methoden, die stattdessen Any benutzen
     ::com::sun::star::uno::Any getPropertyValue( const SfxItemPropertySimpleEntry* pMap ) const;
     void setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const ::com::sun::star::uno::Any& rVal ) const;
 
-    // Properties von einem anderen Set uebernehmen
-    void ObtainSettingsFromPropertySet(const SvxItemPropertySet& rPropSet,  SfxItemSet& rSet, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xSet )const;
     sal_Bool AreThereOwnUsrAnys() const { return (pCombiList ? sal_True : sal_False); }
     ::com::sun::star::uno::Any* GetUsrAnyForID(sal_uInt16 nWID) const;
     void AddUsrAnyForID(const ::com::sun::star::uno::Any& rAny, sal_uInt16 nWID);
@@ -80,10 +78,10 @@ public:
 };
 
 /** converts the given any with a metric to 100th/mm if needed */
-SVX_DLLPUBLIC void SvxUnoConvertToMM( const SfxMapUnit eSourceMapUnit, com::sun::star::uno::Any & rMetric ) throw();
+EDITENG_DLLPUBLIC void SvxUnoConvertToMM( const SfxMapUnit eSourceMapUnit, com::sun::star::uno::Any & rMetric ) throw();
 
 /** converts the given any with a metric from 100th/mm to the given metric if needed */
-SVX_DLLPUBLIC void SvxUnoConvertFromMM( const SfxMapUnit eDestinationMapUnit, com::sun::star::uno::Any & rMetric ) throw();
+EDITENG_DLLPUBLIC void SvxUnoConvertFromMM( const SfxMapUnit eDestinationMapUnit, com::sun::star::uno::Any & rMetric ) throw();
 
 #endif // _SVX_UNOIPSET_HXX_
 
diff --git a/svx/inc/unolingu.hxx b/editeng/inc/editeng/unolingu.hxx
index 574906459d..57cddbff36 100644
--- a/svx/inc/unolingu.hxx
+++ b/editeng/inc/editeng/unolingu.hxx
@@ -42,7 +42,7 @@
 #include <com/sun/star/linguistic2/XThesaurus.hpp>
 #include <com/sun/star/linguistic2/XDictionaryList.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 class LinguMgrExitLstnr;
 
@@ -67,13 +67,13 @@ class SvxLinguConfigUpdate
 
 public:
 
-    SVX_DLLPUBLIC static void UpdateAll( sal_Bool bForceCheck = sal_False );
+    EDITENG_DLLPUBLIC static void UpdateAll( sal_Bool bForceCheck = sal_False );
     static BOOL IsNeedUpdateAll( sal_Bool bForceCheck = sal_False );
 };
 
 ///////////////////////////////////////////////////////////////////////////
 
-class SVX_DLLPUBLIC LinguMgr
+class EDITENG_DLLPUBLIC LinguMgr
 {
     friend class LinguMgrExitLstnr;
 
@@ -173,22 +173,22 @@ inline SvxAlternativeSpelling::SvxAlternativeSpelling() :
 }
 
 
-SVX_DLLPUBLIC SvxAlternativeSpelling SvxGetAltSpelling( 
+EDITENG_DLLPUBLIC SvxAlternativeSpelling SvxGetAltSpelling( 
         const ::com::sun::star::uno::Reference< 
             ::com::sun::star::linguistic2::XHyphenatedWord > & rHyphWord );
 
 
 ///////////////////////////////////////////////////////////////////////////
 
-class SVX_DLLPUBLIC SvxDicListChgClamp
+class EDITENG_DLLPUBLIC SvxDicListChgClamp
 {
 private:
     ::com::sun::star::uno::Reference< 
         ::com::sun::star::linguistic2::XDictionaryList > 	xDicList;
 
     // disallow access to copy-constructor and assignment-operator
-    SVX_DLLPRIVATE SvxDicListChgClamp(const SvxDicListChgClamp &);
-    SVX_DLLPRIVATE SvxDicListChgClamp & operator = (const SvxDicListChgClamp &);
+    EDITENG_DLLPRIVATE SvxDicListChgClamp(const SvxDicListChgClamp &);
+    EDITENG_DLLPRIVATE SvxDicListChgClamp & operator = (const SvxDicListChgClamp &);
 
 public:
     SvxDicListChgClamp( ::com::sun::star::uno::Reference< 
@@ -199,38 +199,38 @@ public:
 ///////////////////////////////////////////////////////////////////////////
 
 //TL:TODO: remove those functions or make them inline
-SVX_DLLPUBLIC ::com::sun::star::uno::Reference< 
+EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< 
     ::com::sun::star::linguistic2::XSpellChecker1 >	SvxGetSpellChecker();
-SVX_DLLPUBLIC ::com::sun::star::uno::Reference< 
+EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< 
     ::com::sun::star::linguistic2::XHyphenator >  	SvxGetHyphenator();
-SVX_DLLPUBLIC ::com::sun::star::uno::Reference< 
+EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< 
     ::com::sun::star::linguistic2::XThesaurus >  	SvxGetThesaurus();
-SVX_DLLPUBLIC ::com::sun::star::uno::Reference< 
+EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< 
     ::com::sun::star::linguistic2::XDictionaryList > SvxGetDictionaryList();
-SVX_DLLPUBLIC ::com::sun::star::uno::Reference< 
+EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< 
     ::com::sun::star::beans::XPropertySet > 		SvxGetLinguPropertySet();
 //TL:TODO: remove argument or provide SvxGetIgnoreAllList with the same one
-SVX_DLLPUBLIC ::com::sun::star::uno::Reference< 
+EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< 
     ::com::sun::star::linguistic2::XDictionary >  	SvxGetOrCreatePosDic( 
             ::com::sun::star::uno::Reference< 
                 ::com::sun::star::linguistic2::XDictionaryList >  xDicList );
-SVX_DLLPUBLIC ::com::sun::star::uno::Reference< 
+EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< 
     ::com::sun::star::linguistic2::XDictionary >  	SvxGetIgnoreAllList();
-SVX_DLLPUBLIC ::com::sun::star::uno::Reference< 
+EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< 
     ::com::sun::star::linguistic2::XDictionary >  	SvxGetChangeAllList();
 
 ///////////////////////////////////////////////////////////////////////////
 // misc functions
 //
 
-SVX_DLLPUBLIC LanguageType 						SvxLocaleToLanguage( 
+EDITENG_DLLPUBLIC LanguageType 						SvxLocaleToLanguage( 
         const ::com::sun::star::lang::Locale& rLocale );
-SVX_DLLPUBLIC ::com::sun::star::lang::Locale& 	SvxLanguageToLocale( 
+EDITENG_DLLPUBLIC ::com::sun::star::lang::Locale& 	SvxLanguageToLocale( 
         ::com::sun::star::lang::Locale& rLocale, LanguageType eLang );
-SVX_DLLPUBLIC ::com::sun::star::lang::Locale    SvxCreateLocale( LanguageType eLang );
+EDITENG_DLLPUBLIC ::com::sun::star::lang::Locale    SvxCreateLocale( LanguageType eLang );
 
 
-SVX_DLLPUBLIC short	SvxDicError( Window *pParent, sal_Int16 nError );
+EDITENG_DLLPUBLIC short	SvxDicError( Window *pParent, sal_Int16 nError );
 
 
 #endif
diff --git a/svx/inc/unonrule.hxx b/editeng/inc/editeng/unonrule.hxx
index 002997d657..900e72be82 100644
--- a/svx/inc/unonrule.hxx
+++ b/editeng/inc/editeng/unonrule.hxx
@@ -33,20 +33,20 @@
 
 #include <com/sun/star/container/XIndexReplace.hpp>
 #include <com/sun/star/ucb/XAnyCompare.hpp>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 #include <cppuhelper/implbase5.hxx>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/util/XCloneable.hpp>
-#include <svx/numitem.hxx>
+#include <editeng/numitem.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 
-SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > SvxCreateNumRule( const SvxNumRule* pRule ) throw();
-SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > SvxCreateNumRule() throw();
+EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > SvxCreateNumRule( const SvxNumRule* pRule ) throw();
+EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > SvxCreateNumRule() throw();
 const SvxNumRule& SvxGetNumRule( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > xRule ) throw( ::com::sun::star::lang::IllegalArgumentException );
 bool SvxGetNumRule( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > xRule, SvxNumRule& rNumRule );
-SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompare > SvxCreateNumRuleCompare() throw();
+EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompare > SvxCreateNumRuleCompare() throw();
 
 class SvxUnoNumberingRules : public ::cppu::WeakAggImplHelper5< com::sun::star::container::XIndexReplace, com::sun::star::ucb::XAnyCompare, 
     com::sun::star::lang::XUnoTunnel, com::sun::star::util::XCloneable, com::sun::star::lang::XServiceInfo >
diff --git a/svx/source/inc/unopracc.hxx b/editeng/inc/editeng/unopracc.hxx
index 234bf99b77..1da057e994 100644
--- a/svx/source/inc/unopracc.hxx
+++ b/editeng/inc/editeng/unopracc.hxx
@@ -31,7 +31,7 @@
 #ifndef _SVX_UNOPRACC_HXX
 #define _SVX_UNOPRACC_HXX
 
-#include <svx/unotext.hxx>
+#include <editeng/unotext.hxx>
 
 
 class SvxEditSource;
diff --git a/svx/inc/svx/unoprnms.hxx b/editeng/inc/editeng/unoprnms.hxx
index 541c2f5577..541c2f5577 100644
--- a/svx/inc/svx/unoprnms.hxx
+++ b/editeng/inc/editeng/unoprnms.hxx
diff --git a/svx/inc/svx/unotext.hxx b/editeng/inc/editeng/unotext.hxx
index c3471ec8a3..ff9ae349c8 100644
--- a/svx/inc/svx/unotext.hxx
+++ b/editeng/inc/editeng/unotext.hxx
@@ -64,12 +64,12 @@
 #include <svl/itemprop.hxx>
 #include <svl/itemset.hxx>
 #include <svl/itempool.hxx>
-
-#include <svx/editdata.hxx>
-#include <svx/unoedsrc.hxx>
-#include <svx/eeitem.hxx>
-#include <svx/svxdllapi.h>
-#include <svx/unomid.hxx>
+#include <svl/solar.hrc>
+#include <editeng/editdata.hxx>
+#include <editeng/unoedsrc.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/editengdllapi.h>
+#include <editeng/memberids.hrc>
 
 class SvxItemPropertySet;
 
@@ -81,11 +81,11 @@ class SvxItemPropertySet;
  #endif
 #endif
 
-#define WID_FONTDESC		        3900
-#define WID_NUMLEVEL		        3901
-#define WID_PORTIONTYPE		        3903
-#define WID_NUMBERINGSTARTVALUE     3904
-#define WID_PARAISNUMBERINGRESTART  3905
+#define WID_FONTDESC		        OWN_ATTR_VALUE_START
+#define WID_NUMLEVEL		        OWN_ATTR_VALUE_START+1
+#define WID_PORTIONTYPE		        OWN_ATTR_VALUE_START+2
+#define WID_NUMBERINGSTARTVALUE     OWN_ATTR_VALUE_START+3
+#define WID_PARAISNUMBERINGRESTART  OWN_ATTR_VALUE_START+4
 
 #define SVX_UNOEDIT_NUMBERING_PROPERTIE \
     {MAP_CHAR_LEN(UNO_NAME_NUMBERING_RULES),		EE_PARA_NUMBULLET,	&::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace>*)0), 0, 0 }, \
@@ -171,8 +171,8 @@ class SvxTextEditSource;
 class SvxFieldData;
 struct ESelection;
 
-SVX_DLLPUBLIC void GetSelection( struct ESelection& rSel, SvxTextForwarder* pForwarder ) throw();
-SVX_DLLPUBLIC void CheckSelection( struct ESelection& rSel, SvxTextForwarder* pForwarder ) throw();
+EDITENG_DLLPUBLIC void GetSelection( struct ESelection& rSel, SvxTextForwarder* pForwarder ) throw();
+EDITENG_DLLPUBLIC void CheckSelection( struct ESelection& rSel, SvxTextForwarder* pForwarder ) throw();
 
 // ====================================================================
 // Diese Klasse implementiert eine SvxEditSource und einen SvxTextForwarder
@@ -249,7 +249,7 @@ namespace accessibility
 }
 
 // ====================================================================
-class SVX_DLLPUBLIC SvxUnoTextRangeBase : public ::com::sun::star::text::XTextRange,
+class EDITENG_DLLPUBLIC SvxUnoTextRangeBase : public ::com::sun::star::text::XTextRange,
                             public ::com::sun::star::beans::XPropertySet,
                             public ::com::sun::star::beans::XMultiPropertySet,
                             public ::com::sun::star::beans::XMultiPropertyStates,
@@ -362,7 +362,7 @@ public:
 // ====================================================================
 
 class SvxUnoTextBase;
-class SVX_DLLPUBLIC SvxUnoTextRange : public SvxUnoTextRangeBase,
+class EDITENG_DLLPUBLIC SvxUnoTextRange : public SvxUnoTextRangeBase,
                         public ::com::sun::star::lang::XTypeProvider,
                         public ::cppu::OWeakAggObject
 {
@@ -395,7 +395,7 @@ public:
     virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(::com::sun::star::uno::RuntimeException);
 };
 
-class SVX_DLLPUBLIC SvxUnoTextBase  : public SvxUnoTextRangeBase,
+class EDITENG_DLLPUBLIC SvxUnoTextBase  : public SvxUnoTextRangeBase,
                         public ::com::sun::star::text::XTextAppend,
                         public ::com::sun::star::text::XTextCopy,
                         public ::com::sun::star::container::XEnumerationAccess,
@@ -472,7 +472,7 @@ public:
 };
 
 // ====================================================================
-class SVX_DLLPUBLIC SvxUnoText  : public SvxUnoTextBase,
+class EDITENG_DLLPUBLIC SvxUnoText  : public SvxUnoTextBase,
                     public ::cppu::OWeakAggObject
 {
 public:
@@ -620,7 +620,7 @@ public:
 
 // ====================================================================
 
-class SVX_DLLPUBLIC SvxUnoTextCursor : public SvxUnoTextRangeBase,
+class EDITENG_DLLPUBLIC SvxUnoTextCursor : public SvxUnoTextRangeBase,
                          public ::com::sun::star::text::XTextCursor,
                          public ::com::sun::star::lang::XTypeProvider,
                          public ::cppu::OWeakAggObject
@@ -670,9 +670,9 @@ public:
 
 };
 
-SVX_DLLPUBLIC const SvxItemPropertySet* ImplGetSvxUnoOutlinerTextCursorSvxPropertySet();
-SVX_DLLPUBLIC const SfxItemPropertyMapEntry* ImplGetSvxUnoOutlinerTextCursorPropertyMap();
-SVX_DLLPUBLIC const SvxItemPropertySet* ImplGetSvxTextPortionSvxPropertySet();
-SVX_DLLPUBLIC const SfxItemPropertyMapEntry* ImplGetSvxTextPortionPropertyMap();
+EDITENG_DLLPUBLIC const SvxItemPropertySet* ImplGetSvxUnoOutlinerTextCursorSvxPropertySet();
+EDITENG_DLLPUBLIC const SfxItemPropertyMapEntry* ImplGetSvxUnoOutlinerTextCursorPropertyMap();
+EDITENG_DLLPUBLIC const SvxItemPropertySet* ImplGetSvxTextPortionSvxPropertySet();
+EDITENG_DLLPUBLIC const SfxItemPropertyMapEntry* ImplGetSvxTextPortionPropertyMap();
 
 #endif
diff --git a/svx/inc/svx/unoviwed.hxx b/editeng/inc/editeng/unoviwed.hxx
index 7ac53846da..b9dfea083a 100644
--- a/svx/inc/svx/unoviwed.hxx
+++ b/editeng/inc/editeng/unoviwed.hxx
@@ -31,9 +31,9 @@
 #ifndef _SVX_UNOVIWED_HXX
 #define _SVX_UNOVIWED_HXX
 
-#include <svx/unoedsrc.hxx>
+#include <editeng/unoedsrc.hxx>
 
-#include <svx/editdata.hxx>
+#include <editeng/editdata.hxx>
 
 class EditView;
 
diff --git a/svx/inc/svx/unoviwou.hxx b/editeng/inc/editeng/unoviwou.hxx
index 0f20c15d6d..269ae3e44d 100644
--- a/svx/inc/svx/unoviwou.hxx
+++ b/editeng/inc/editeng/unoviwou.hxx
@@ -32,18 +32,18 @@
 #define _SVX_UNOVIWOU_HXX
 
 #include <svx/unoedsrc.hxx>
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 class OutlinerView;
 
 /// Specialization for Draw/Impress
-class SVX_DLLPUBLIC SvxDrawOutlinerViewForwarder : public SvxEditViewForwarder
+class EDITENG_DLLPUBLIC SvxDrawOutlinerViewForwarder : public SvxEditViewForwarder
 {
 private:
     OutlinerView&		mrOutlinerView;
     Point				maTextShapeTopLeft;
 
-    SVX_DLLPRIVATE Point				GetTextOffset() const;
+    EDITENG_DLLPRIVATE Point				GetTextOffset() const;
 
 public:
     explicit			SvxDrawOutlinerViewForwarder( OutlinerView& rOutl );
diff --git a/svx/inc/svx/wghtitem.hxx b/editeng/inc/editeng/wghtitem.hxx
index 513a56822f..72c1cc4f69 100644
--- a/svx/inc/svx/wghtitem.hxx
+++ b/editeng/inc/editeng/wghtitem.hxx
@@ -34,10 +34,7 @@
 
 #include <vcl/vclenum.hxx>
 #include <svl/eitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 class SvXMLUnitConverter;
 namespace rtl
@@ -52,7 +49,7 @@ namespace rtl
     Dieses Item beschreibt die Font-Staerke.
 */
 
-class SVX_DLLPUBLIC SvxWeightItem : public SfxEnumItem
+class EDITENG_DLLPUBLIC SvxWeightItem : public SfxEnumItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/widwitem.hxx b/editeng/inc/editeng/widwitem.hxx
index f63cfbc48c..fc2ce1fc38 100644
--- a/svx/inc/svx/widwitem.hxx
+++ b/editeng/inc/editeng/widwitem.hxx
@@ -33,11 +33,7 @@
 // include ---------------------------------------------------------------
 
 #include <svl/intitem.hxx>
-
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 class SvXMLUnitConverter;
 namespace rtl
@@ -52,7 +48,7 @@ namespace rtl
 Dieses Item beschreibt die Anzahl der Zeilen fuer die Hurenkinderregelung.
 */
 
-class SVX_DLLPUBLIC SvxWidowsItem: public SfxByteItem
+class EDITENG_DLLPUBLIC SvxWidowsItem: public SfxByteItem
 {
     friend SvStream & operator<<( SvStream & aS, SvxWidowsItem & );
 public:
diff --git a/svx/inc/svx/writingmodeitem.hxx b/editeng/inc/editeng/writingmodeitem.hxx
index 27885c61ad..f554f8e60b 100644
--- a/svx/inc/svx/writingmodeitem.hxx
+++ b/editeng/inc/editeng/writingmodeitem.hxx
@@ -34,12 +34,11 @@
 
 #include <com/sun/star/text/WritingMode.hpp>
 #include <svl/intitem.hxx>
-#include <svx/svddef.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 // class SvxWritingModeItem ----------------------------------------------
 
-class SVX_DLLPUBLIC SvxWritingModeItem : public SfxUInt16Item
+class EDITENG_DLLPUBLIC SvxWritingModeItem : public SfxUInt16Item
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/wrlmitem.hxx b/editeng/inc/editeng/wrlmitem.hxx
index 6807b47999..812d3c61b4 100644
--- a/svx/inc/svx/wrlmitem.hxx
+++ b/editeng/inc/editeng/wrlmitem.hxx
@@ -33,10 +33,7 @@
 // include ---------------------------------------------------------------
 
 #include <svl/eitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 class SvXMLUnitConverter;
 namespace rtl
@@ -52,7 +49,7 @@ namespace rtl
     Wortgrenzen beschraenkt ist.
 */
 
-class SVX_DLLPUBLIC SvxWordLineModeItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxWordLineModeItem : public SfxBoolItem
 {
 public:
     TYPEINFO();
diff --git a/svx/inc/xmlcnitm.hxx b/editeng/inc/editeng/xmlcnitm.hxx
index c75bb76833..50d0a5e2b1 100644
--- a/svx/inc/xmlcnitm.hxx
+++ b/editeng/inc/editeng/xmlcnitm.hxx
@@ -32,7 +32,7 @@
 #define _SVX_XMLCNITM_HXX
 
 #include <svl/poolitem.hxx>
-#include "svx/svxdllapi.h"
+#include "editeng/editengdllapi.h"
 
 class SvXMLNamespaceMap;
 namespace rtl { class OUString; }
@@ -41,7 +41,7 @@ namespace rtl { class OUString; }
 
 class SvXMLAttrContainerData;
 
-class SVX_DLLPUBLIC SvXMLAttrContainerItem: public SfxPoolItem
+class EDITENG_DLLPUBLIC SvXMLAttrContainerItem: public SfxPoolItem
 {
     SvXMLAttrContainerData	*pImpl;
 
diff --git a/svx/source/inc/editxml.hxx b/editeng/inc/editxml.hxx
index 0c02aa6e95..0c02aa6e95 100644
--- a/svx/source/inc/editxml.hxx
+++ b/editeng/inc/editxml.hxx
diff --git a/editeng/inc/helpid.hrc b/editeng/inc/helpid.hrc
new file mode 100644
index 0000000000..eefc01970b
--- /dev/null
+++ b/editeng/inc/helpid.hrc
@@ -0,0 +1,60 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: helpid.hrc,v $
+ * $Revision: 1.78 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef _EDITENG_HELPID_HRC
+#define _EDITENG_HELPID_HRC
+
+// include ---------------------------------------------------------------
+
+#include <svl/solar.hrc>
+
+// Help-Ids --------------------------------------------------------------
+#define HID_EDITENG_SPELLER_WORDLANGUAGE                            (HID_SVX_START +  36)
+#define HID_EDITENG_SPELLER_PARALANGUAGE                            (HID_SVX_START +  34)
+#define HID_EDITENG_SPELLER_ADDWORD                                 (HID_SVX_START +  31)
+#define HID_EDITENG_SPELLER_AUTOCORRECT                             (HID_SVX_START +  32)
+#define HID_EDITENG_SPELLER_IGNORE                                  (HID_SVX_START +  33)
+#define HID_EDITENG_SPELLER_START                                   (HID_SVX_START +  35)
+
+#define HID_AUTOCORR_HELP_END                                       (HID_SVX_START +   2)
+#define HID_AUTOCORR_HELP_START                                     (HID_SVX_START +   3)
+
+// please adjust ACT_SVX_HID_END2 below if you add entries here!
+
+// -----------------------------------------------------------------------
+// Overrun check ---------------------------------------------------------
+// -----------------------------------------------------------------------
+
+#define ACT_SVX_HID_END		(HID_SVX_START+247)
+#if ACT_SVX_HID_END > HID_SVX_END
+#error Resource-Ueberlauf in #line, #file
+#endif
+
+#endif
+
diff --git a/editeng/inc/makefile.mk b/editeng/inc/makefile.mk
new file mode 100644
index 0000000000..6ecb444e03
--- /dev/null
+++ b/editeng/inc/makefile.mk
@@ -0,0 +1,52 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.5 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..
+
+PRJNAME=editeng
+TARGET=inc
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :  settings.mk
+.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+
+# --- Files --------------------------------------------------------
+
+.INCLUDE :  target.mk
+
+.IF "$(ENABLE_PCH)"!=""
+ALLTAR : \
+    $(SLO)$/precompiled.pch \
+    $(SLO)$/precompiled_ex.pch
+    
+.ENDIF			# "$(ENABLE_PCH)"!=""
+
diff --git a/svx/source/outliner/outliner.hrc b/editeng/inc/pch/precompiled_editeng.cxx
index 1b60bf32f5..888d78efa1 100644
--- a/svx/source/outliner/outliner.hrc
+++ b/editeng/inc/pch/precompiled_editeng.cxx
@@ -6,7 +6,7 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: outliner.hrc,v $
+ * $RCSfile: precompiled_svx.cxx,v $
  * $Revision: 1.3 $
  *
  * This file is part of OpenOffice.org.
@@ -27,22 +27,6 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef _OUTLINER_HRC
-#define _OUTLINER_HRC
 
-#ifndef _SOLAR_HRC
-#include <svl/solar.hrc>
-#endif
+#include "precompiled_editeng.hxx"
 
-#ifndef RID_OUTL_START
-#define RID_OUTL_START				( RID_EDIT_END + 100 )
-#endif
-
-#define RID_OUTLUNDO_DEPTH			( RID_OUTL_START + 0 )
-#define RID_OUTLUNDO_HEIGHT			( RID_OUTL_START + 1 )
-#define RID_OUTLUNDO_EXPAND			( RID_OUTL_START + 2 )
-#define RID_OUTLUNDO_COLLAPSE 		( RID_OUTL_START + 3 )
-#define RID_OUTLUNDO_ATTR 			( RID_OUTL_START + 4 )
-#define RID_OUTLUNDO_INSERT 		( RID_OUTL_START + 5 )
-
-#endif	// _OUTLINER_HRC
diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx
new file mode 100644
index 0000000000..d82ecc6cb6
--- /dev/null
+++ b/editeng/inc/pch/precompiled_editeng.hxx
@@ -0,0 +1,897 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: precompiled_svx.hxx,v $
+ * $Revision: 1.5 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): Generated on 2006-09-01 17:50:08.279739
+
+#ifdef PRECOMPILED_HEADERS
+//---MARKER---
+#include "sal/config.h"
+#include "com/sun/star/accessibility/AccessibleEventId.hpp"
+#include "com/sun/star/accessibility/AccessibleEventObject.hpp"
+#include "com/sun/star/accessibility/AccessibleRelationType.hpp"
+#include "com/sun/star/accessibility/AccessibleRole.hpp"
+#include "com/sun/star/accessibility/AccessibleStateType.hpp"
+#include "com/sun/star/accessibility/AccessibleTextType.hpp"
+#include "com/sun/star/accessibility/IllegalAccessibleComponentStateException.hpp"
+#include "com/sun/star/accessibility/TextSegment.hpp"
+#include "com/sun/star/accessibility/XAccessible.hpp"
+#include "com/sun/star/accessibility/XAccessibleAction.hpp"
+#include "com/sun/star/accessibility/XAccessibleContext.hpp"
+#include "com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp"
+#include "com/sun/star/accessibility/XAccessibleEventListener.hpp"
+#include "com/sun/star/accessibility/XAccessibleImage.hpp"
+#include "com/sun/star/accessibility/XAccessibleRelationSet.hpp"
+#include "com/sun/star/accessibility/XAccessibleSelection.hpp"
+#include "com/sun/star/accessibility/XAccessibleStateSet.hpp"
+#include "com/sun/star/accessibility/XAccessibleTable.hpp"
+#include "com/sun/star/accessibility/XAccessibleTextAttributes.hpp"
+#include "com/sun/star/accessibility/XAccessibleValue.hpp"
+#include "com/sun/star/awt/CharSet.hpp"
+#include "com/sun/star/awt/FocusChangeReason.hpp"
+#include "com/sun/star/awt/FontDescriptor.hpp"
+#include "com/sun/star/awt/FontFamily.hpp"
+#include "com/sun/star/awt/FontPitch.hpp"
+#include "com/sun/star/awt/FontSlant.hpp"
+#include "com/sun/star/awt/FontType.hpp"
+#include "com/sun/star/awt/FontWeight.hpp"
+#include "com/sun/star/awt/FontWidth.hpp"
+#include "com/sun/star/awt/Gradient.hpp"
+#include "com/sun/star/awt/GradientStyle.hpp"
+#include "com/sun/star/awt/Key.hpp"
+#include "com/sun/star/awt/KeyEvent.hpp"
+#include "com/sun/star/awt/KeyModifier.hpp"
+#include "com/sun/star/awt/LineEndFormat.hpp"
+#include "com/sun/star/awt/PosSize.hpp"
+#include "com/sun/star/awt/RasterOperation.hpp"
+#include "com/sun/star/awt/Rectangle.hpp"
+#include "com/sun/star/awt/ScrollBarOrientation.hpp"
+#include "com/sun/star/awt/SimpleFontMetric.hpp"
+#include "com/sun/star/awt/Size.hpp"
+#include "com/sun/star/awt/TextAlign.hpp"
+#include "com/sun/star/awt/VisualEffect.hpp"
+#include "com/sun/star/awt/WindowAttribute.hpp"
+#include "com/sun/star/awt/WindowDescriptor.hpp"
+#include "com/sun/star/awt/XBitmap.hpp"
+#include "com/sun/star/awt/XCheckBox.hpp"
+#include "com/sun/star/awt/XComboBox.hpp"
+#include "com/sun/star/awt/XControl.hpp"
+#include "com/sun/star/awt/XControlContainer.hpp"
+#include "com/sun/star/awt/XControlModel.hpp"
+#include "com/sun/star/awt/XDevice.hpp"
+#include "com/sun/star/awt/XFocusListener.hpp"
+#include "com/sun/star/awt/XFont.hpp"
+#include "com/sun/star/awt/XGraphics.hpp"
+#include "com/sun/star/awt/XImageConsumer.hpp"
+#include "com/sun/star/awt/XItemListener.hpp"
+#include "com/sun/star/awt/XLayoutConstrains.hpp"
+#include "com/sun/star/awt/XListBox.hpp"
+#include "com/sun/star/awt/XMouseListener.hpp"
+#include "com/sun/star/awt/XProgressMonitor.hpp"
+#include "com/sun/star/awt/XTabController.hpp"
+#include "com/sun/star/awt/XTabControllerModel.hpp"
+#include "com/sun/star/awt/XTextListener.hpp"
+#include "com/sun/star/awt/XToolkit.hpp"
+#include "com/sun/star/awt/XVclWindowPeer.hpp"
+#include "com/sun/star/awt/XWindow.hpp"
+#include "com/sun/star/awt/XWindowListener.hpp"
+#include "com/sun/star/awt/XWindowPeer.hpp"
+#include "com/sun/star/beans/NamedValue.hpp"
+#include "com/sun/star/beans/PropertyAttribute.hpp"
+#include "com/sun/star/beans/PropertyChangeEvent.hpp"
+#include "com/sun/star/beans/PropertyState.hpp"
+#include "com/sun/star/beans/PropertyValue.hpp"
+#include "com/sun/star/beans/PropertyValues.hdl"
+#include "com/sun/star/beans/PropertyValues.hpp"
+#include "com/sun/star/beans/XFastPropertySet.hpp"
+#include "com/sun/star/beans/XIntrospection.hpp"
+#include "com/sun/star/beans/XMultiPropertySet.hpp"
+#include "com/sun/star/beans/XMultiPropertyStates.hpp"
+#include "com/sun/star/beans/XPropertyChangeListener.hpp"
+#include "com/sun/star/beans/XPropertySet.hpp"
+#include "com/sun/star/beans/XPropertySetInfo.hpp"
+#include "com/sun/star/beans/XPropertyState.hpp"
+#include "com/sun/star/chart/ChartAxisArrangeOrderType.hpp"
+#include "com/sun/star/container/ContainerEvent.hpp"
+#include "com/sun/star/container/NoSuchElementException.hpp"
+#include "com/sun/star/container/XChild.hpp"
+#include "com/sun/star/container/XContainer.hpp"
+#include "com/sun/star/container/XContainerListener.hpp"
+#include "com/sun/star/container/XContainerQuery.hpp"
+#include "com/sun/star/container/XContentEnumerationAccess.hpp"
+#include "com/sun/star/container/XEnumeration.hpp"
+#include "com/sun/star/container/XEnumerationAccess.hpp"
+#include "com/sun/star/container/XHierarchicalNameAccess.hpp"
+#include "com/sun/star/container/XIdentifierContainer.hpp"
+#include "com/sun/star/container/XIndexAccess.hpp"
+#include "com/sun/star/container/XIndexContainer.hpp"
+#include "com/sun/star/container/XIndexReplace.hpp"
+#include "com/sun/star/container/XNameAccess.hpp"
+#include "com/sun/star/container/XNameContainer.hpp"
+#include "com/sun/star/container/XNameReplace.hpp"
+#include "com/sun/star/container/XNamed.hpp"
+#include "com/sun/star/container/XSet.hpp"
+#include "com/sun/star/datatransfer/DataFlavor.hpp"
+#include "com/sun/star/datatransfer/XTransferable.hpp"
+#include "com/sun/star/datatransfer/clipboard/XClipboard.hpp"
+#include "com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp"
+#include "com/sun/star/datatransfer/dnd/DNDConstants.hpp"
+#include "com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp"
+#include "com/sun/star/datatransfer/dnd/XDropTarget.hpp"
+#include "com/sun/star/document/EventObject.hpp"
+#include "com/sun/star/document/UpdateDocMode.hpp"
+#include "com/sun/star/document/XActionLockable.hpp"
+#include "com/sun/star/document/XBinaryStreamResolver.hpp"
+#include "com/sun/star/document/XDocumentInfoSupplier.hpp"
+#include "com/sun/star/document/XEmbeddedObjectResolver.hpp"
+#include "com/sun/star/document/XEventBroadcaster.hpp"
+#include "com/sun/star/document/XEventListener.hpp"
+#include "com/sun/star/document/XEventsSupplier.hpp"
+#include "com/sun/star/document/XExporter.hpp"
+#include "com/sun/star/document/XFilter.hpp"
+#include "com/sun/star/document/XGraphicObjectResolver.hpp"
+#include "com/sun/star/document/XImporter.hpp"
+#include "com/sun/star/document/XLinkTargetSupplier.hpp"
+#include "com/sun/star/document/XMimeTypeInfo.hpp"
+#include "com/sun/star/drawing/BitmapMode.hpp"
+#include "com/sun/star/drawing/CameraGeometry.hpp"
+#include "com/sun/star/drawing/CircleKind.hpp"
+#include "com/sun/star/drawing/ColorMode.hpp"
+#include "com/sun/star/drawing/ConnectionType.hpp"
+#include "com/sun/star/drawing/ConnectorType.hpp"
+#include "com/sun/star/drawing/DashStyle.hpp"
+#include "com/sun/star/drawing/Direction3D.hpp"
+#include "com/sun/star/drawing/DoubleSequence.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeGluePointType.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeParameter.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeParameterType.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeSegment.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeTextFrame.hpp"
+#include "com/sun/star/drawing/EnhancedCustomShapeTextPathMode.hpp"
+#include "com/sun/star/drawing/FillStyle.hpp"
+#include "com/sun/star/drawing/FlagSequence.hpp"
+#include "com/sun/star/drawing/Hatch.hpp"
+#include "com/sun/star/drawing/HomogenMatrix.hpp"
+#include "com/sun/star/drawing/HomogenMatrix3.hpp"
+#include "com/sun/star/drawing/LineDash.hpp"
+#include "com/sun/star/drawing/LineJoint.hpp"
+#include "com/sun/star/drawing/LineStyle.hpp"
+#include "com/sun/star/drawing/MeasureKind.hpp"
+#include "com/sun/star/drawing/MeasureTextHorzPos.hpp"
+#include "com/sun/star/drawing/MeasureTextVertPos.hpp"
+#include "com/sun/star/drawing/NormalsKind.hpp"
+#include "com/sun/star/drawing/PolyPolygonShape3D.hpp"
+#include "com/sun/star/drawing/PolygonFlags.hpp"
+#include "com/sun/star/drawing/PolygonKind.hpp"
+#include "com/sun/star/drawing/Position3D.hpp"
+#include "com/sun/star/drawing/ProjectionMode.hpp"
+#include "com/sun/star/drawing/RectanglePoint.hpp"
+#include "com/sun/star/drawing/ShadeMode.hpp"
+#include "com/sun/star/drawing/TextAdjust.hpp"
+#include "com/sun/star/drawing/TextAnimationDirection.hpp"
+#include "com/sun/star/drawing/TextAnimationKind.hpp"
+#include "com/sun/star/drawing/TextFitToSizeType.hpp"
+#include "com/sun/star/drawing/TextHorizontalAdjust.hpp"
+#include "com/sun/star/drawing/TextVerticalAdjust.hpp"
+#include "com/sun/star/drawing/TextureKind.hpp"
+#include "com/sun/star/drawing/TextureMode.hpp"
+#include "com/sun/star/drawing/TextureProjectionMode.hpp"
+#include "com/sun/star/drawing/XGluePointsSupplier.hpp"
+#include "com/sun/star/drawing/XShapeDescriptor.hpp"
+#include "com/sun/star/embed/Aspects.hpp"
+#include "com/sun/star/embed/ElementModes.hpp"
+#include "com/sun/star/embed/EmbedMisc.hpp"
+#include "com/sun/star/embed/EmbedStates.hpp"
+#include "com/sun/star/embed/EntryInitModes.hpp"
+#include "com/sun/star/embed/NoVisualAreaSizeException.hpp"
+#include "com/sun/star/embed/XEmbedObjectCreator.hpp"
+#include "com/sun/star/embed/XEmbedObjectFactory.hpp"
+#include "com/sun/star/embed/XEmbedPersist.hpp"
+#include "com/sun/star/embed/XEmbeddedObject.hpp"
+#include "com/sun/star/embed/XInsertObjectDialog.hpp"
+#include "com/sun/star/embed/XLinkageSupport.hpp"
+#include "com/sun/star/embed/XStorage.hpp"
+#include "com/sun/star/embed/XTransactedObject.hpp"
+#include "com/sun/star/form/DatabaseDeleteEvent.hpp"
+#include "com/sun/star/form/DatabaseParameterEvent.hpp"
+#include "com/sun/star/form/ErrorEvent.hpp"
+#include "com/sun/star/form/FormButtonType.hpp"
+#include "com/sun/star/form/FormComponentType.hpp"
+#include "com/sun/star/form/ListSourceType.hpp"
+#include "com/sun/star/form/NavigationBarMode.hpp"
+#include "com/sun/star/form/TabulatorCycle.hpp"
+#include "com/sun/star/form/XBoundComponent.hpp"
+#include "com/sun/star/form/XBoundControl.hpp"
+#include "com/sun/star/form/XConfirmDeleteBroadcaster.hpp"
+#include "com/sun/star/form/XConfirmDeleteListener.hpp"
+#include "com/sun/star/form/XDatabaseParameterBroadcaster2.hpp"
+#include "com/sun/star/form/XDatabaseParameterListener.hpp"
+#include "com/sun/star/form/XForm.hpp"
+#include "com/sun/star/form/XFormComponent.hpp"
+#include "com/sun/star/form/XFormController.hpp"
+#include "com/sun/star/form/XFormControllerListener.hpp"
+#include "com/sun/star/form/XFormsSupplier.hpp"
+#include "com/sun/star/form/XFormsSupplier2.hpp"
+#include "com/sun/star/form/XGrid.hpp"
+#include "com/sun/star/form/XGridColumnFactory.hpp"
+#include "com/sun/star/form/XGridFieldDataSupplier.hpp"
+#include "com/sun/star/form/XGridPeer.hpp"
+#include "com/sun/star/form/XImageProducerSupplier.hpp"
+#include "com/sun/star/form/XLoadListener.hpp"
+#include "com/sun/star/form/XLoadable.hpp"
+#include "com/sun/star/form/XReset.hpp"
+#include "com/sun/star/form/XResetListener.hpp"
+#include "com/sun/star/form/binding/XBindableValue.hpp"
+#include "com/sun/star/form/binding/XListEntrySink.hpp"
+#include "com/sun/star/form/binding/XValueBinding.hpp"
+#include "com/sun/star/form/submission/XSubmissionSupplier.hpp"
+#include "com/sun/star/form/validation/XFormComponentValidityListener.hpp"
+#include "com/sun/star/form/validation/XValidatableFormComponent.hpp"
+#include "com/sun/star/frame/DispatchDescriptor.hpp"
+#include "com/sun/star/frame/DispatchInformation.hpp"
+#include "com/sun/star/frame/FeatureStateEvent.hpp"
+#include "com/sun/star/frame/FrameSearchFlag.hpp"
+#include "com/sun/star/frame/XComponentLoader.hpp"
+#include "com/sun/star/frame/XController.hpp"
+#include "com/sun/star/frame/XDesktop.hpp"
+#include "com/sun/star/frame/XDispatch.hpp"
+#include "com/sun/star/frame/XDispatchInformationProvider.hpp"
+#include "com/sun/star/frame/XDispatchProvider.hpp"
+#include "com/sun/star/frame/XDispatchProviderInterception.hpp"
+#include "com/sun/star/frame/XDispatchProviderInterceptor.hpp"
+#include "com/sun/star/frame/XFrame.hpp"
+#include "com/sun/star/frame/XFrameActionListener.hpp"
+#include "com/sun/star/frame/XFrames.hpp"
+#include "com/sun/star/frame/XFramesSupplier.hpp"
+#include "com/sun/star/frame/XInterceptorInfo.hpp"
+#include "com/sun/star/frame/XModel.hpp"
+#include "com/sun/star/frame/XModuleManager.hpp"
+#include "com/sun/star/frame/XStatusListener.hpp"
+#include "com/sun/star/frame/XStorable.hpp"
+#include "com/sun/star/frame/XSynchronousDispatch.hpp"
+#include "com/sun/star/frame/status/ClipboardFormats.hpp"
+#include "com/sun/star/frame/status/FontHeight.hpp"
+#include "com/sun/star/frame/status/ItemStatus.hpp"
+#include "com/sun/star/frame/status/LeftRightMargin.hpp"
+#include "com/sun/star/frame/status/UpperLowerMargin.hpp"
+#include "com/sun/star/frame/status/UpperLowerMarginScale.hpp"
+#include "com/sun/star/gallery/GalleryItemType.hpp"
+#include "com/sun/star/gallery/XGalleryItem.hpp"
+#include "com/sun/star/gallery/XGalleryTheme.hpp"
+#include "com/sun/star/gallery/XGalleryThemeProvider.hpp"
+#include "com/sun/star/graphic/XGraphic.hpp"
+#include "com/sun/star/graphic/XGraphicProvider.hpp"
+#include "com/sun/star/graphic/XGraphicRenderer.hpp"
+#include "com/sun/star/i18n/CharacterIteratorMode.hdl"
+#include "com/sun/star/i18n/CharacterIteratorMode.hpp"
+#include "com/sun/star/i18n/CollatorOptions.hpp"
+#include "com/sun/star/i18n/ForbiddenCharacters.hpp"
+#include "com/sun/star/i18n/InputSequenceCheckMode.hpp"
+#include "com/sun/star/i18n/KCharacterType.hpp"
+#include "com/sun/star/i18n/ScriptType.hdl"
+#include "com/sun/star/i18n/ScriptType.hpp"
+#include "com/sun/star/i18n/TextConversionOption.hdl"
+#include "com/sun/star/i18n/TextConversionOption.hpp"
+#include "com/sun/star/i18n/TextConversionType.hpp"
+#include "com/sun/star/i18n/TransliterationModules.hpp"
+#include "com/sun/star/i18n/UnicodeScript.hpp"
+#include "com/sun/star/i18n/UnicodeType.hdl"
+#include "com/sun/star/i18n/WordType.hpp"
+#include "com/sun/star/i18n/XBreakIterator.hpp"
+#include "com/sun/star/i18n/XExtendedInputSequenceChecker.hpp"
+#include "com/sun/star/i18n/XExtendedTextConversion.hpp"
+#include "com/sun/star/i18n/XForbiddenCharacters.hpp"
+#include "com/sun/star/i18n/XTextConversion.hpp"
+#include "com/sun/star/inspection/XObjectInspector.hpp"
+#include "com/sun/star/inspection/XObjectInspectorModel.hpp"
+#include "com/sun/star/io/IOException.hpp"
+#include "com/sun/star/io/XActiveDataControl.hpp"
+#include "com/sun/star/io/XActiveDataSink.hpp"
+#include "com/sun/star/io/XActiveDataSource.hpp"
+#include "com/sun/star/io/XInputStream.hpp"
+#include "com/sun/star/io/XInputStreamProvider.hpp"
+#include "com/sun/star/io/XMarkableStream.hpp"
+#include "com/sun/star/io/XObjectInputStream.hpp"
+#include "com/sun/star/io/XObjectOutputStream.hpp"
+#include "com/sun/star/io/XOutputStream.hpp"
+#include "com/sun/star/io/XPersistObject.hpp"
+#include "com/sun/star/io/XSeekable.hdl"
+#include "com/sun/star/io/XStream.hpp"
+#include "com/sun/star/lang/DisposedException.hpp"
+#include "com/sun/star/lang/EventObject.hpp"
+#include "com/sun/star/lang/IllegalArgumentException.hpp"
+#include "com/sun/star/lang/IndexOutOfBoundsException.hpp"
+#include "com/sun/star/lang/Locale.hpp"
+#include "com/sun/star/lang/NoSupportException.hpp"
+#include "com/sun/star/lang/ServiceNotRegisteredException.hpp"
+#include "com/sun/star/lang/XComponent.hpp"
+#include "com/sun/star/lang/XEventListener.hpp"
+#include "com/sun/star/lang/XInitialization.hpp"
+#include "com/sun/star/lang/XMultiComponentFactory.hpp"
+#include "com/sun/star/lang/XMultiServiceFactory.hpp"
+#include "com/sun/star/lang/XServiceDisplayName.hpp"
+#include "com/sun/star/lang/XServiceInfo.hpp"
+#include "com/sun/star/lang/XServiceName.hpp"
+#include "com/sun/star/lang/XSingleComponentFactory.hpp"
+#include "com/sun/star/lang/XTypeProvider.hpp"
+#include "com/sun/star/lang/XUnoTunnel.hpp"
+#include "com/sun/star/linguistic2/ConversionDictionaryType.hpp"
+#include "com/sun/star/linguistic2/ConversionDirection.hdl"
+#include "com/sun/star/linguistic2/ConversionPropertyType.hpp"
+#include "com/sun/star/linguistic2/DictionaryEvent.hpp"
+#include "com/sun/star/linguistic2/DictionaryEventFlags.hpp"
+#include "com/sun/star/linguistic2/DictionaryListEvent.hpp"
+#include "com/sun/star/linguistic2/DictionaryListEventFlags.hpp"
+#include "com/sun/star/linguistic2/DictionaryType.hpp"
+#include "com/sun/star/linguistic2/SpellFailure.hpp"
+#include "com/sun/star/linguistic2/XAvailableLocales.hpp"
+#include "com/sun/star/linguistic2/XConversionDictionary.hpp"
+#include "com/sun/star/linguistic2/XConversionDictionaryList.hpp"
+#include "com/sun/star/linguistic2/XConversionPropertyType.hpp"
+#include "com/sun/star/linguistic2/XDictionary.hpp"
+#include "com/sun/star/linguistic2/XDictionary1.hpp"
+#include "com/sun/star/linguistic2/XDictionaryEntry.hpp"
+#include "com/sun/star/linguistic2/XDictionaryEventListener.hpp"
+#include "com/sun/star/linguistic2/XDictionaryList.hpp"
+#include "com/sun/star/linguistic2/XDictionaryListEventListener.hpp"
+#include "com/sun/star/linguistic2/XHyphenatedWord.hpp"
+#include "com/sun/star/linguistic2/XHyphenator.hpp"
+#include "com/sun/star/linguistic2/XLinguServiceManager.hdl"
+#include "com/sun/star/linguistic2/XLinguServiceManager.hpp"
+#include "com/sun/star/linguistic2/XMeaning.hpp"
+#include "com/sun/star/linguistic2/XPossibleHyphens.hpp"
+#include "com/sun/star/linguistic2/XSpellAlternatives.hpp"
+#include "com/sun/star/linguistic2/XSpellChecker.hpp"
+#include "com/sun/star/linguistic2/XSpellChecker1.hpp"
+#include "com/sun/star/linguistic2/XSupportedLocales.hpp"
+#include "com/sun/star/linguistic2/XThesaurus.hpp"
+#include "com/sun/star/media/XPlayer.hpp"
+#include "com/sun/star/media/ZoomLevel.hpp"
+#include "com/sun/star/plugin/PluginDescription.hpp"
+#include "com/sun/star/plugin/XPluginManager.hpp"
+#include "com/sun/star/reflection/XIdlClass.hpp"
+#include "com/sun/star/reflection/XIdlMethod.hpp"
+#include "com/sun/star/reflection/XInterfaceMethodTypeDescription.hpp"
+#include "com/sun/star/reflection/XProxyFactory.hpp"
+#include "com/sun/star/registry/XRegistryKey.hpp"
+#include "com/sun/star/registry/XSimpleRegistry.hpp"
+#include "com/sun/star/script/ScriptEvent.hpp"
+#include "com/sun/star/script/ScriptEventDescriptor.hpp"
+#include "com/sun/star/script/XEventAttacherManager.hpp"
+#include "com/sun/star/script/XInvocation.hpp"
+#include "com/sun/star/script/XLibraryContainer.hpp"
+#include "com/sun/star/script/XScriptListener.hpp"
+#include "com/sun/star/script/XTypeConverter.hpp"
+#include "com/sun/star/script/browse/BrowseNodeFactoryViewTypes.hpp"
+#include "com/sun/star/script/browse/BrowseNodeTypes.hpp"
+#include "com/sun/star/script/browse/XBrowseNode.hpp"
+#include "com/sun/star/script/browse/XBrowseNodeFactory.hpp"
+#include "com/sun/star/script/provider/ScriptErrorRaisedException.hpp"
+#include "com/sun/star/script/provider/ScriptExceptionRaisedException.hpp"
+#include "com/sun/star/script/provider/ScriptFrameworkErrorType.hpp"
+#include "com/sun/star/script/provider/XScriptProvider.hpp"
+#include "com/sun/star/script/provider/XScriptProviderSupplier.hpp"
+#include "com/sun/star/sdb/CommandType.hpp"
+#include "com/sun/star/sdb/ParametersRequest.hpp"
+#include "com/sun/star/sdb/RowChangeAction.hpp"
+#include "com/sun/star/sdb/RowChangeEvent.hpp"
+#include "com/sun/star/sdb/SQLContext.hpp"
+#include "com/sun/star/sdb/SQLErrorEvent.hpp"
+#include "com/sun/star/sdb/XColumn.hpp"
+#include "com/sun/star/sdb/XColumnUpdate.hpp"
+#include "com/sun/star/sdb/XCompletedConnection.hpp"
+#include "com/sun/star/sdb/XInteractionSupplyParameters.hpp"
+#include "com/sun/star/sdb/XQueriesSupplier.hpp"
+#include "com/sun/star/sdb/XResultSetAccess.hpp"
+#include "com/sun/star/sdb/XRowSetApproveBroadcaster.hpp"
+#include "com/sun/star/sdb/XRowSetApproveListener.hpp"
+#include "com/sun/star/sdb/XRowSetSupplier.hpp"
+#include "com/sun/star/sdb/XSQLErrorBroadcaster.hpp"
+#include "com/sun/star/sdb/XSQLErrorListener.hpp"
+#include "com/sun/star/sdb/XSQLQueryComposer.hpp"
+#include "com/sun/star/sdb/XSQLQueryComposerFactory.hpp"
+#include "com/sun/star/sdb/XSingleSelectQueryComposer.hpp"
+#include "com/sun/star/sdbc/ColumnValue.hpp"
+#include "com/sun/star/sdbc/DataType.hpp"
+#include "com/sun/star/sdbc/ResultSetConcurrency.hpp"
+#include "com/sun/star/sdbc/ResultSetType.hpp"
+#include "com/sun/star/sdbc/XConnection.hpp"
+#include "com/sun/star/sdbc/XDataSource.hpp"
+#include "com/sun/star/sdbc/XDatabaseMetaData.hpp"
+#include "com/sun/star/sdbc/XPreparedStatement.hpp"
+#include "com/sun/star/sdbc/XResultSet.hpp"
+#include "com/sun/star/sdbc/XResultSetUpdate.hpp"
+#include "com/sun/star/sdbc/XRow.hpp"
+#include "com/sun/star/sdbc/XRowSet.hpp"
+#include "com/sun/star/sdbc/XRowSetListener.hpp"
+#include "com/sun/star/sdbc/XStatement.hpp"
+#include "com/sun/star/sdbcx/Privilege.hpp"
+#include "com/sun/star/sdbcx/XColumnsSupplier.hpp"
+#include "com/sun/star/sdbcx/XDataDescriptorFactory.hpp"
+#include "com/sun/star/sdbcx/XDeleteRows.hpp"
+#include "com/sun/star/sdbcx/XRowLocate.hpp"
+#include "com/sun/star/sdbcx/XTablesSupplier.hpp"
+#include "com/sun/star/security/XDocumentDigitalSignatures.hpp"
+#include "com/sun/star/style/BreakType.hpp"
+#include "com/sun/star/style/CaseMap.hpp"
+#include "com/sun/star/style/GraphicLocation.hpp"
+#include "com/sun/star/style/LineSpacing.hpp"
+#include "com/sun/star/style/LineSpacingMode.hpp"
+#include "com/sun/star/style/NumberingType.hpp"
+#include "com/sun/star/style/PageStyleLayout.hpp"
+#include "com/sun/star/style/ParagraphAdjust.hpp"
+#include "com/sun/star/style/TabStop.hpp"
+#include "com/sun/star/style/VerticalAlignment.hpp"
+#include "com/sun/star/style/XStyle.hpp"
+#include "com/sun/star/style/XStyleFamiliesSupplier.hpp"
+#include "com/sun/star/table/BorderLine.hpp"
+#include "com/sun/star/table/CellAddress.hpp"
+#include "com/sun/star/table/CellContentType.hpp"
+#include "com/sun/star/table/CellHoriJustify.hpp"
+#include "com/sun/star/table/CellOrientation.hpp"
+#include "com/sun/star/table/CellRangeAddress.hpp"
+#include "com/sun/star/table/CellVertJustify.hpp"
+#include "com/sun/star/table/ShadowFormat.hpp"
+#include "com/sun/star/table/ShadowLocation.hpp"
+#include "com/sun/star/table/TableBorder.hpp"
+#include "com/sun/star/table/TableOrientation.hpp"
+#include "com/sun/star/task/XInteractionHandler.hpp"
+#include "com/sun/star/task/XStatusIndicator.hpp"
+#include "com/sun/star/task/XStatusIndicatorFactory.hpp"
+#include "com/sun/star/text/CharacterCompressionType.hpp"
+#include "com/sun/star/text/ControlCharacter.hpp"
+#include "com/sun/star/text/FilenameDisplayFormat.hpp"
+#include "com/sun/star/text/FontEmphasis.hpp"
+#include "com/sun/star/text/GraphicCrop.hpp"
+#include "com/sun/star/text/HoriOrientation.hpp"
+#include "com/sun/star/text/RelOrientation.hpp"
+#include "com/sun/star/text/RubyAdjust.hpp"
+#include "com/sun/star/text/TextContentAnchorType.hpp"
+#include "com/sun/star/text/VertOrientation.hpp"
+#include "com/sun/star/text/WrapTextMode.hpp"
+#include "com/sun/star/text/WritingMode.hpp"
+#include "com/sun/star/text/WritingMode2.hpp"
+#include "com/sun/star/text/XDefaultNumberingProvider.hpp"
+#include "com/sun/star/text/XNumberingFormatter.hpp"
+#include "com/sun/star/text/XNumberingTypeInfo.hpp"
+#include "com/sun/star/text/XRubySelection.hpp"
+#include "com/sun/star/text/XSimpleText.hpp"
+#include "com/sun/star/text/XText.hpp"
+#include "com/sun/star/text/XTextContent.hpp"
+#include "com/sun/star/text/XTextCursor.hpp"
+#include "com/sun/star/text/XTextField.hdl"
+#include "com/sun/star/text/XTextField.hpp"
+#include "com/sun/star/text/XTextRange.hpp"
+#include "com/sun/star/text/XTextRangeCompare.hpp"
+#include "com/sun/star/text/XTextRangeMover.hpp"
+#include "com/sun/star/ucb/CommandAbortedException.hpp"
+#include "com/sun/star/ucb/NameClash.hpp"
+#include "com/sun/star/ucb/NumberedSortingInfo.hpp"
+#include "com/sun/star/ucb/TransferInfo.hpp"
+#include "com/sun/star/ucb/XAnyCompare.hpp"
+#include "com/sun/star/ucb/XAnyCompareFactory.hpp"
+#include "com/sun/star/ucb/XCommandEnvironment.hpp"
+#include "com/sun/star/ucb/XContent.hpp"
+#include "com/sun/star/ucb/XContentAccess.hpp"
+#include "com/sun/star/ucb/XContentProvider.hpp"
+#include "com/sun/star/ucb/XSimpleFileAccess.hpp"
+#include "com/sun/star/ucb/XSortedDynamicResultSetFactory.hpp"
+#include "com/sun/star/ui/ImageType.hpp"
+#include "com/sun/star/ui/ItemStyle.hpp"
+#include "com/sun/star/ui/ItemType.hpp"
+#include "com/sun/star/ui/UIElementType.hpp"
+#include "com/sun/star/ui/XImageManager.hpp"
+#include "com/sun/star/ui/XModuleUIConfigurationManager.hpp"
+#include "com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp"
+#include "com/sun/star/ui/XUIConfiguration.hpp"
+#include "com/sun/star/ui/XUIConfigurationListener.hpp"
+#include "com/sun/star/ui/XUIConfigurationManager.hpp"
+#include "com/sun/star/ui/XUIConfigurationManagerSupplier.hpp"
+#include "com/sun/star/ui/XUIConfigurationPersistence.hpp"
+#include "com/sun/star/ui/XUIConfigurationStorage.hpp"
+#include "com/sun/star/ui/XUIElement.hpp"
+#include "com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp"
+#include "com/sun/star/ui/dialogs/ExecutableDialogResults.hpp"
+#include "com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp"
+#include "com/sun/star/ui/dialogs/FilePreviewImageFormats.hpp"
+#include "com/sun/star/ui/dialogs/ListboxControlActions.hpp"
+#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
+#include "com/sun/star/ui/dialogs/XExecutableDialog.hpp"
+#include "com/sun/star/ui/dialogs/XFilePicker.hpp"
+#include "com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp"
+#include "com/sun/star/ui/dialogs/XFilePickerListener.hpp"
+#include "com/sun/star/ui/dialogs/XFilePickerNotifier.hpp"
+#include "com/sun/star/ui/dialogs/XFilePreview.hpp"
+#include "com/sun/star/ui/dialogs/XFilterManager.hpp"
+#include "com/sun/star/ui/dialogs/XFolderPicker.hpp"
+#include "com/sun/star/uno/Any.h"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/Reference.h"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/Sequence.h"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/Type.h"
+#include "com/sun/star/uno/XAggregation.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/XNamingService.hpp"
+#include "com/sun/star/util/Date.hpp"
+#include "com/sun/star/util/DateTime.hpp"
+#include "com/sun/star/util/Language.hpp"
+#include "com/sun/star/util/MeasureUnit.hpp"
+#include "com/sun/star/util/NumberFormat.hpp"
+#include "com/sun/star/util/SearchAlgorithms.hpp"
+#include "com/sun/star/util/SearchFlags.hpp"
+#include "com/sun/star/util/SearchOptions.hpp"
+#include "com/sun/star/util/SearchResult.hpp"
+#include "com/sun/star/util/SortField.hpp"
+#include "com/sun/star/util/SortFieldType.hpp"
+#include "com/sun/star/util/URL.hpp"
+#include "com/sun/star/util/XCancellable.hpp"
+#include "com/sun/star/util/XChangesBatch.hpp"
+#include "com/sun/star/util/XCloneable.hpp"
+#include "com/sun/star/util/XCloseable.hpp"
+#include "com/sun/star/util/XFlushable.hpp"
+#include "com/sun/star/util/XLocalizedAliases.hpp"
+#include "com/sun/star/util/XModeChangeBroadcaster.hpp"
+#include "com/sun/star/util/XModeChangeListener.hpp"
+#include "com/sun/star/util/XModeSelector.hpp"
+#include "com/sun/star/util/XModifiable.hpp"
+#include "com/sun/star/util/XModifyBroadcaster.hpp"
+#include "com/sun/star/util/XModifyListener.hpp"
+#include "com/sun/star/util/XNumberFormatTypes.hpp"
+#include "com/sun/star/util/XNumberFormats.hpp"
+#include "com/sun/star/util/XNumberFormatsSupplier.hpp"
+#include "com/sun/star/util/XNumberFormatter.hpp"
+#include "com/sun/star/util/XTextSearch.hpp"
+#include "com/sun/star/util/XURLTransformer.hpp"
+#include "com/sun/star/util/logging/LogLevel.hpp"
+#include "com/sun/star/util/logging/XLogger.hpp"
+#include "com/sun/star/view/XSelectionChangeListener.hpp"
+#include "com/sun/star/view/XSelectionSupplier.hpp"
+#include "com/sun/star/xforms/XFormsSupplier.hpp"
+#include "com/sun/star/xforms/XFormsUIHelper1.hpp"
+#include "com/sun/star/xforms/XModel.hpp"
+#include "com/sun/star/xforms/XSubmission.hpp"
+#include "com/sun/star/xml/AttributeData.hpp"
+#include "com/sun/star/xml/dom/DOMException.hpp"
+#include "com/sun/star/xml/dom/XDocument.hpp"
+#include "com/sun/star/xml/dom/XNode.hpp"
+#include "com/sun/star/xml/dom/events/XEventListener.hpp"
+#include "com/sun/star/xml/dom/events/XEventTarget.hpp"
+#include "com/sun/star/xml/sax/InputSource.hpp"
+#include "com/sun/star/xml/sax/SAXParseException.hpp"
+#include "com/sun/star/xml/sax/XAttributeList.hpp"
+#include "com/sun/star/xml/sax/XDocumentHandler.hpp"
+#include "com/sun/star/xml/sax/XParser.hpp"
+#include "comphelper/accessibleeventnotifier.hxx"
+#include "comphelper/anytostring.hxx"
+#include "comphelper/broadcasthelper.hxx"
+#include "comphelper/componentcontext.hxx"
+#include "comphelper/configurationhelper.hxx"
+#include "comphelper/container.hxx"
+#include "comphelper/embeddedobjectcontainer.hxx"
+#include "comphelper/enumhelper.hxx"
+#include "comphelper/implementationreference.hxx"
+#include "comphelper/interaction.hxx"
+#include "comphelper/numbers.hxx"
+#include "comphelper/processfactory.hxx"
+#include "comphelper/propertycontainer.hxx"
+#include "comphelper/propertysethelper.hxx"
+#include "comphelper/regpathhelper.hxx"
+#include "comphelper/scopeguard.hxx"
+#include "comphelper/seqstream.hxx"
+#include "comphelper/sequence.hxx"
+#include "comphelper/sequenceashashmap.hxx"
+#include "comphelper/sequenceasvector.hxx"
+#include "comphelper/servicehelper.hxx"
+#include "comphelper/storagehelper.hxx"
+#include "comphelper/types.hxx"
+#include "comphelper/uno3.hxx"
+#include "cppuhelper/bootstrap.hxx"
+#include "cppuhelper/compbase12.hxx"
+#include "cppuhelper/compbase2.hxx"
+#include "cppuhelper/compbase3.hxx"
+#include "cppuhelper/compbase4.hxx"
+#include "cppuhelper/compbase6.hxx"
+#include "cppuhelper/compbase7.hxx"
+#include "cppuhelper/component.hxx"
+#include "cppuhelper/component_context.hxx"
+#include "cppuhelper/exc_hlp.hxx"
+#include "cppuhelper/factory.hxx"
+#include "cppuhelper/implbase1.hxx"
+#include "cppuhelper/implbase11.hxx"
+#include "cppuhelper/implbase12.hxx"
+#include "cppuhelper/implbase2.hxx"
+#include "cppuhelper/implbase3.hxx"
+#include "cppuhelper/implbase4.hxx"
+#include "cppuhelper/implbase5.hxx"
+#include "cppuhelper/implbase6.hxx"
+#include "cppuhelper/implbase8.hxx"
+#include "cppuhelper/implementationentry.hxx"
+#include "cppuhelper/interfacecontainer.h"
+#include "cppuhelper/interfacecontainer.hxx"
+#include "cppuhelper/propshlp.hxx"
+#include "cppuhelper/queryinterface.hxx"
+#include "cppuhelper/servicefactory.hxx"
+#include "cppuhelper/typeprovider.hxx"
+#include "cppuhelper/weak.hxx"
+#include "cppuhelper/weakagg.hxx"
+#include "cppuhelper/weakref.hxx"
+#include "i18npool/lang.h"
+#include "i18npool/mslangid.hxx"
+#include "linguistic/lngprops.hxx"
+#include "osl/diagnose.h"
+#include "osl/endian.h"
+#include "osl/file.hxx"
+#include "osl/interlck.h"
+#include "osl/module.h"
+#include "osl/module.hxx"
+#include "osl/mutex.hxx"
+#include "osl/nlsupport.h"
+#include "osl/process.h"
+#include "osl/security.hxx"
+#include "rsc/rscsfx.hxx"
+#include "rtl/bootstrap.hxx"
+#include "rtl/cipher.h"
+#include "rtl/crc.h"
+#include "rtl/digest.h"
+#include "rtl/locale.h"
+#include "rtl/logfile.hxx"
+#include "rtl/math.hxx"
+#include "rtl/memory.h"
+#include "rtl/tencinfo.h"
+#include "rtl/textenc.h"
+#include "rtl/ustrbuf.hxx"
+#include "rtl/ustring.hxx"
+#include "rtl/uuid.h"
+#include "sal/config.h"
+#include "sal/main.h"
+#include "sal/types.h"
+#include "svl/srchdefs.hxx"
+#include "sot/clsids.hxx"
+#include "sot/exchange.hxx"
+#include "sot/factory.hxx"
+#include "sot/formats.hxx"
+#include <map>
+#include <set>
+#include <slist>
+#include <vector>
+#include "svtools/FilterConfigItem.hxx"
+#include "svtools/accessibilityoptions.hxx"
+#include "svl/adrparse.hxx"
+#include "svtools/apearcfg.hxx"
+#include "svl/brdcst.hxx"
+#include "unotools/cacheoptions.hxx"
+#include "svl/cancel.hxx"
+#include "svl/cjkoptions.hxx"
+#include "unotools/cmdoptions.hxx"
+#include "svl/cntwall.hxx"
+#include "svtools/colorcfg.hxx"
+#include "svl/ctloptions.hxx"
+#include "unotools/defaultoptions.hxx"
+#include "unotools/dynamicmenuoptions.hxx"
+#include "svtools/ehdl.hxx"
+#include "svl/eitem.hxx"
+#include "unotools/eventcfg.hxx"
+#include "unotools/extendedsecurityoptions.hxx"
+#include "svl/filenotation.hxx"
+#include "svl/flagitem.hxx"
+#include "unotools/fltrcfg.hxx"
+#include "unotools/fontoptions.hxx"
+#include "svtools/fontsubstconfig.hxx"
+#include "svtools/helpopt.hxx"
+#include "svl/hint.hxx"
+#include "svtools/htmlkywd.hxx"
+#include "svtools/htmltokn.h"
+#include "svl/intitem.hxx"
+#include "svl/isethint.hxx"
+#include "svl/itemiter.hxx"
+#include "svl/itempool.hxx"
+#include "svl/itemprop.hxx"
+#include "svl/itemset.hxx"
+#include "unotools/javaoptions.hxx"
+#include "svl/languageoptions.hxx"
+#include "unotools/lingucfg.hxx"
+#include "unotools/linguprops.hxx"
+#include "svl/lngmisc.hxx"
+#include "svtools/localresaccess.hxx"
+#include "svl/lstner.hxx"
+#include "svl/macitem.hxx"
+#include "svtools/menuoptions.hxx"
+#include "svl/metitem.hxx"
+#include "unotools/misccfg.hxx"
+#include "svtools/miscopt.hxx"
+#include "unotools/moduleoptions.hxx"
+#include "svl/numuno.hxx"
+#include "unotools/optionsdlg.hxx"
+#include "svtools/parhtml.hxx"
+#include "svtools/parrtf.hxx"
+#include "unotools/pathoptions.hxx"
+#include "svl/pickerhelper.hxx"
+#include "svl/poolitem.hxx"
+#include "unotools/printwarningoptions.hxx"
+#include "svl/ptitem.hxx"
+#include "svl/rectitem.hxx"
+#include "svl/rngitem.hxx"
+#include "svtools/rtfkeywd.hxx"
+#include "svtools/rtfout.hxx"
+#include "svtools/rtftoken.h"
+#include "unotools/saveopt.hxx"
+#include "unotools/searchopt.hxx"
+#include "unotools/securityoptions.hxx"
+#include "svl/sfontitm.hxx"
+#include "svl/slstitm.hxx"
+#include "svl/smplhint.hxx"
+#include "svtools/soerr.hxx"
+#include "unotools/sourceviewconfig.hxx"
+#include "unotools/startoptions.hxx"
+#include "svtools/stdmenu.hxx"
+#include "svtools/stringtransfer.hxx"
+#include "svl/stritem.hxx"
+#include "svl/style.hxx"
+#include "svl/svarray.hxx"
+#include "svl/svstdarr.hxx"
+#include "unotools/syslocaleoptions.hxx"
+#include "svl/szitem.hxx"
+#include "svtools/textdata.hxx"
+#include "svtools/transfer.hxx"
+#include "svtools/txtcmp.hxx"
+#include "svl/undo.hxx"
+#include "unotools/undoopt.hxx"
+#include "svtools/unoevent.hxx"
+#include "svtools/unoimap.hxx"
+#include "svl/urihelper.hxx"
+#include "svl/urlbmk.hxx"
+#include "unotools/useroptions.hxx"
+#include "unotools/viewoptions.hxx"
+#include "svl/visitem.hxx"
+#include "svl/whiter.hxx"
+#include "sys/stat.h"
+#include "sys/types.h"
+#include "toolkit/awt/vclxdevice.hxx"
+#include "toolkit/controls/unocontrol.hxx"
+#include "tools/bigint.hxx"
+#include "tools/color.hxx"
+#include "tools/config.hxx"
+#include "tools/contnr.hxx"
+#include "tools/debug.hxx"
+#include "tools/diagnose_ex.h"
+#include "tools/dynary.hxx"
+#include "tools/errcode.hxx"
+#include "tools/errinf.hxx"
+#include "tools/fract.hxx"
+#include "tools/gen.hxx"
+#include "tools/globname.hxx"
+#include "tools/inetdef.hxx"
+#include "tools/line.hxx"
+#include "tools/link.hxx"
+#include "tools/list.hxx"
+#include "tools/multisel.hxx"
+#include "tools/poly.hxx"
+#include "tools/rc.h"
+#include "tools/rc.hxx"
+#include "tools/rcid.h"
+#include "tools/ref.hxx"
+#include "tools/resary.hxx"
+#include "tools/resid.hxx"
+#include "tools/resmgr.hxx"
+#include "tools/rtti.hxx"
+#include "tools/shl.hxx"
+#include "tools/solar.h"
+#include "tools/stack.hxx"
+#include "tools/string.hxx"
+#include "tools/table.hxx"
+#include "tools/tenccvt.hxx"
+#include "tools/urlobj.hxx"
+#include "tools/vcompat.hxx"
+#include "tools/vector2d.hxx"
+#include "tools/weakbase.hxx"
+#include "tools/wldcrd.hxx"
+#include "tools/zcodec.hxx"
+#include "ucbhelper/commandenvironment.hxx"
+#include "ucbhelper/configurationkeys.hxx"
+#include "ucbhelper/content.hxx"
+#include "ucbhelper/contentbroker.hxx"
+#include "unicode/ubidi.h"
+#include "uno/lbnames.h"
+#include "uno/mapping.hxx"
+#include "unotools/accessiblerelationsethelper.hxx"
+#include "unotools/accessiblestatesethelper.hxx"
+#include "unotools/bootstrap.hxx"
+#include "unotools/charclass.hxx"
+#include "unotools/collatorwrapper.hxx"
+#include "unotools/configitem.hxx"
+#include "unotools/configmgr.hxx"
+#include "unotools/confignode.hxx"
+#include "unotools/configpathes.hxx"
+#include "unotools/configvaluecontainer.hxx"
+#include "unotools/localfilehelper.hxx"
+#include "unotools/processfactory.hxx"
+#include "comphelper/servicehelper.hxx"
+#include "unotools/streamwrap.hxx"
+#include "unotools/textsearch.hxx"
+#include "unotools/transliterationwrapper.hxx"
+#include "unotools/ucbhelper.hxx"
+#include "vcl/abstdlg.hxx"
+#include "vcl/animate.hxx"
+#include "vcl/bitmap.hxx"
+#include "vcl/bitmapex.hxx"
+#include "vcl/bmpacc.hxx"
+#include "vcl/cmdevt.h"
+#include "vcl/configsettings.hxx"
+#include "vcl/controllayout.hxx"
+#include "vcl/cursor.hxx"
+#include "vcl/decoview.hxx"
+#include "vcl/dndhelp.hxx"
+#include "vcl/fldunit.hxx"
+#include "vcl/fntstyle.hxx"
+#include "unotools/fontcvt.hxx"
+#include "vcl/gdimtf.hxx"
+#include "vcl/help.hxx"
+#include "vcl/image.hxx"
+#include "vcl/jobset.hxx"
+#include "vcl/keycodes.hxx"
+#include "vcl/mapmod.hxx"
+#include "vcl/menu.hxx"
+#include "vcl/mnemonic.hxx"
+#include "vcl/pointr.hxx"
+#include "vcl/region.hxx"
+#include "vcl/salbtype.hxx"
+#include "vcl/stdtext.hxx"
+#include "vcl/timer.hxx"
+#include "vcl/unohelp.hxx"
+#include "vcl/unohelp2.hxx"
+#include "vcl/wall.hxx"
+#include "vcl/wintypes.hxx"
+#include "vos/mutex.hxx"
+#include "vos/ref.hxx"
+#include "vos/refernce.hxx"
+#include "vos/thread.hxx"
+#include "vos/xception.hxx"
+#include "xmloff/DashStyle.hxx"
+#include "xmloff/GradientStyle.hxx"
+#include "xmloff/HatchStyle.hxx"
+#include "xmloff/ImageStyle.hxx"
+#include "xmloff/MarkerStyle.hxx"
+#include "xmloff/attrlist.hxx"
+#include "xmloff/nmspmap.hxx"
+#include "xmloff/xmlcnimp.hxx"
+#include "xmloff/xmlictxt.hxx"
+#include "xmloff/xmlnmspe.hxx"
+#include "xmloff/xmlstyle.hxx"
+#include "xmloff/xmltoken.hxx"
+//---MARKER---
+#endif
+
diff --git a/svx/source/inc/unoedprx.hxx b/editeng/inc/unoedprx.hxx
index 9235e212ba..55f47d35c3 100644
--- a/svx/source/inc/unoedprx.hxx
+++ b/editeng/inc/unoedprx.hxx
@@ -33,9 +33,9 @@
 
 #include <memory>
 #include <svl/brdcst.hxx>
-#include <svx/unoedsrc.hxx>
+#include <editeng/unoedsrc.hxx>
 
-#include <svx/editdata.hxx>
+#include <editeng/editdata.hxx>
 
 
 class SvxAccessibleTextAdapter : public SvxTextForwarder
diff --git a/editeng/prj/build.lst b/editeng/prj/build.lst
new file mode 100644
index 0000000000..551a21bc37
--- /dev/null
+++ b/editeng/prj/build.lst
@@ -0,0 +1,13 @@
+ed	editeng	:	l10n svtools xmloff linguistic NULL
+ed	editeng										usr1	-	all	ed_mkout NULL
+ed	editeng\inc									nmake	-	all	ed_inc NULL
+ed	editeng\source\items						nmake	-	all	ed_items ed_inc NULL
+ed	editeng\source\editeng						nmake	-	all	ed_eeng ed_inc NULL
+ed	editeng\source\misc							nmake	-	all	ed_misc ed_inc NULL
+ed	editeng\source\outliner						nmake	-	all	ed_outl ed_inc NULL
+ed	editeng\source\rtf							nmake	-	all	ed_rtf ed_inc NULL
+ed	editeng\source\uno							nmake	-	all	ed_uno ed_inc NULL
+ed	editeng\source\xml							nmake	-	all	ed_xml ed_inc NULL
+ed	editeng\source\accessibility				nmake	-	all	ed_accessibility ed_inc NULL
+ed  editeng\util                                nmake   -   all ed_util ed_rtf ed_eeng ed_items ed_outl ed_uno ed_xml ed_accessibility ed_misc NULL
+
diff --git a/editeng/prj/d.lst b/editeng/prj/d.lst
new file mode 100644
index 0000000000..e8af22d9de
--- /dev/null
+++ b/editeng/prj/d.lst
@@ -0,0 +1,14 @@
+mkdir: %COMMON_DEST%\bin%_EXT%\hid
+mkdir: %COMMON_DEST%\res%_EXT%
+
+..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
+..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.*
+..\%__SRC%\lib\iedt*.lib %_DEST%\lib%_EXT%\iedt*.lib
+..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
+..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
+
+mkdir: %_DEST%\inc%_EXT%\svx
+..\inc\editeng\*.h %_DEST%\inc%_EXT%\editeng\*.h
+..\inc\editeng\*.hrc %_DEST%\inc%_EXT%\editeng\*.hrc
+..\inc\editeng\*.hxx %_DEST%\inc%_EXT%\editeng\*.hxx
+
diff --git a/svx/source/accessibility/AccessibleComponentBase.cxx b/editeng/source/accessibility/AccessibleComponentBase.cxx
index d115b390e2..7d6d5205e0 100644
--- a/svx/source/accessibility/AccessibleComponentBase.cxx
+++ b/editeng/source/accessibility/AccessibleComponentBase.cxx
@@ -29,10 +29,10 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 
-#include <svx/AccessibleComponentBase.hxx>
+#include <editeng/AccessibleComponentBase.hxx>
 
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
diff --git a/svx/source/accessibility/AccessibleContextBase.cxx b/editeng/source/accessibility/AccessibleContextBase.cxx
index 3facf4d62f..d3671624f4 100644
--- a/svx/source/accessibility/AccessibleContextBase.cxx
+++ b/editeng/source/accessibility/AccessibleContextBase.cxx
@@ -29,10 +29,10 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 
-#include <svx/AccessibleContextBase.hxx>
+#include <editeng/AccessibleContextBase.hxx>
 
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/beans/PropertyChangeEvent.hpp>
diff --git a/svx/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index 9d04de2e39..7b32e6fe58 100644
--- a/svx/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 //------------------------------------------------------------------------
 //
@@ -61,10 +61,10 @@
 #include <com/sun/star/accessibility/AccessibleRelationType.hpp>
 // <--
 #include <vcl/unohelp.hxx>
-#include <svx/editeng.hxx>
-#include <svx/unoprnms.hxx>
-#include <svx/unoipset.hxx>
-#include <svx/outliner.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/unoprnms.hxx>
+#include <editeng/unoipset.hxx>
+#include <editeng/outliner.hxx>
 
 //------------------------------------------------------------------------
 //
@@ -73,12 +73,9 @@
 //------------------------------------------------------------------------
 
 #include <com/sun/star/beans/PropertyState.hpp>
-#include "unolingu.hxx"
-#include "unopracc.hxx"
+#include <editeng/unolingu.hxx>
+#include <editeng/unopracc.hxx>
 #include "AccessibleEditableTextPara.hxx"
-#include <svx/dialmgr.hxx>
-
-#include "accessibility.hrc"
 #include <svtools/colorcfg.hxx>
 
 
diff --git a/svx/source/accessibility/AccessibleEditableTextPara.hxx b/editeng/source/accessibility/AccessibleEditableTextPara.hxx
index f78cbd4ad4..f78cbd4ad4 100644
--- a/svx/source/accessibility/AccessibleEditableTextPara.hxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.hxx
diff --git a/svx/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx
index 9212b9dd40..064f196049 100644
--- a/svx/source/accessibility/AccessibleImageBullet.cxx
+++ b/editeng/source/accessibility/AccessibleImageBullet.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 #include <tools/gen.hxx>
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
@@ -43,15 +43,15 @@
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <comphelper/accessibleeventnotifier.hxx>
 #include <unotools/accessiblestatesethelper.hxx>
-#include "unolingu.hxx"
+#include <editeng/unolingu.hxx>
 #include "AccessibleEditableTextPara.hxx"
 #include "AccessibleImageBullet.hxx"
-#include <svx/dialmgr.hxx>
+#include <editeng/eerdll.hxx>
 
-#include <svx/editdata.hxx>
-#include <svx/editeng.hxx>
-#include <svx/outliner.hxx>
-#include "accessibility.hrc"
+#include <editeng/editdata.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/outliner.hxx>
+#include "editeng.hrc"
 #include <svtools/colorcfg.hxx>
 
 
@@ -173,7 +173,7 @@ namespace accessibility
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         // Get the string from the resource for the specified id.
-        return ::rtl::OUString( SVX_RESSTR (RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION) );
+        return ::rtl::OUString( String( EditResId (RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION) ) );
     }
 
     ::rtl::OUString SAL_CALL  AccessibleImageBullet::getAccessibleName() throw (uno::RuntimeException)
@@ -183,7 +183,7 @@ namespace accessibility
         ::vos::OGuard aGuard( Application::GetSolarMutex() );
 
         // Get the string from the resource for the specified id.
-        return ::rtl::OUString( SVX_RESSTR (RID_SVXSTR_A11Y_IMAGEBULLET_NAME) );
+        return ::rtl::OUString( String ( EditResId (RID_SVXSTR_A11Y_IMAGEBULLET_NAME) ) );
     }
 
     uno::Reference< XAccessibleRelationSet > SAL_CALL AccessibleImageBullet::getAccessibleRelationSet() throw (uno::RuntimeException)
diff --git a/svx/source/accessibility/AccessibleImageBullet.hxx b/editeng/source/accessibility/AccessibleImageBullet.hxx
index faaf811315..b1dc462021 100644
--- a/svx/source/accessibility/AccessibleImageBullet.hxx
+++ b/editeng/source/accessibility/AccessibleImageBullet.hxx
@@ -45,7 +45,7 @@
 #include <com/sun/star/accessibility/XAccessibleComponent.hpp>
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
 #include "AccessibleParaManager.hxx"
-#include <svx/unoedsrc.hxx>
+#include <editeng/unoedsrc.hxx>
 
 namespace accessibility
 {
diff --git a/svx/source/accessibility/AccessibleParaManager.cxx b/editeng/source/accessibility/AccessibleParaManager.cxx
index 970443c686..0d8e75020c 100644
--- a/svx/source/accessibility/AccessibleParaManager.cxx
+++ b/editeng/source/accessibility/AccessibleParaManager.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 //------------------------------------------------------------------------
 //
@@ -48,9 +48,9 @@
 //
 //------------------------------------------------------------------------
 
-#include "unoedhlp.hxx"
-#include "unopracc.hxx"
-#include <svx/unoedsrc.hxx>
+#include <editeng/unoedhlp.hxx>
+#include <editeng/unopracc.hxx>
+#include <editeng/unoedsrc.hxx>
 #include "AccessibleParaManager.hxx"
 #include "AccessibleEditableTextPara.hxx"
 
diff --git a/svx/source/accessibility/AccessibleParaManager.hxx b/editeng/source/accessibility/AccessibleParaManager.hxx
index 17644c2b7a..17644c2b7a 100644
--- a/svx/source/accessibility/AccessibleParaManager.hxx
+++ b/editeng/source/accessibility/AccessibleParaManager.hxx
diff --git a/svx/source/accessibility/AccessibleSelectionBase.cxx b/editeng/source/accessibility/AccessibleSelectionBase.cxx
index 37b769c44f..56054da0a8 100644
--- a/svx/source/accessibility/AccessibleSelectionBase.cxx
+++ b/editeng/source/accessibility/AccessibleSelectionBase.cxx
@@ -29,9 +29,9 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
-#include "AccessibleSelectionBase.hxx"
+#include <editeng/AccessibleSelectionBase.hxx>
 
 using namespace ::rtl;
 using namespace ::com::sun::star;
diff --git a/svx/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
index c0227e63cb..1caa0e7392 100644
--- a/svx/source/accessibility/AccessibleStaticTextBase.cxx
+++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 //------------------------------------------------------------------------
 //
@@ -57,10 +57,10 @@
 //
 //------------------------------------------------------------------------
 
-#include <svx/editdata.hxx>
-#include "unopracc.hxx"
+#include <editeng/editdata.hxx>
+#include <editeng/unopracc.hxx>
 #include "unoedprx.hxx"
-#include "AccessibleStaticTextBase.hxx"
+#include <editeng/AccessibleStaticTextBase.hxx>
 #include "AccessibleEditableTextPara.hxx"
 
 
diff --git a/svx/source/accessibility/AccessibleStringWrap.cxx b/editeng/source/accessibility/AccessibleStringWrap.cxx
index 6a38e254ff..22cd0e1cf4 100644
--- a/svx/source/accessibility/AccessibleStringWrap.cxx
+++ b/editeng/source/accessibility/AccessibleStringWrap.cxx
@@ -29,15 +29,14 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 #include <algorithm>
 #include <tools/debug.hxx>
 #include <vcl/outdev.hxx>
 
-#include <svx/svxfont.hxx>
-#include "AccessibleStringWrap.hxx"
-
+#include <editeng/svxfont.hxx>
+#include <editeng/AccessibleStringWrap.hxx>
 
 //------------------------------------------------------------------------
 //
diff --git a/editeng/source/accessibility/accessibility.src b/editeng/source/accessibility/accessibility.src
new file mode 100644
index 0000000000..51d2a49e6e
--- /dev/null
+++ b/editeng/source/accessibility/accessibility.src
@@ -0,0 +1,43 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: accessibility.src,v $
+ * $Revision: 1.34 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "editeng.hrc"
+
+String RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION
+{
+    Text [ en-US ] = "Image bullet in paragraph" ;
+};
+
+String RID_SVXSTR_A11Y_IMAGEBULLET_NAME
+{
+    Text [ en-US ] = "Image bullet" ;
+};
+
+
diff --git a/editeng/source/accessibility/makefile.mk b/editeng/source/accessibility/makefile.mk
new file mode 100755
index 0000000000..e29b6477f6
--- /dev/null
+++ b/editeng/source/accessibility/makefile.mk
@@ -0,0 +1,58 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.25 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..
+
+PRJNAME=editeng
+TARGET=accessibility
+ENABLE_EXCEPTIONS=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :  settings.mk
+.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+
+# --- Files --------------------------------------------------------
+
+SLOFILES = \
+    $(SLO)$/AccessibleStringWrap.obj			\
+    $(SLO)$/AccessibleContextBase.obj			\
+    $(SLO)$/AccessibleComponentBase.obj			\
+    $(SLO)$/AccessibleSelectionBase.obj			\
+    $(SLO)$/AccessibleStaticTextBase.obj		\
+    $(SLO)$/AccessibleParaManager.obj			\
+    $(SLO)$/AccessibleEditableTextPara.obj		\
+    $(SLO)$/AccessibleImageBullet.obj			
+    
+# --- Tagets -------------------------------------------------------
+
+.INCLUDE :  target.mk
+
diff --git a/svx/source/editeng/editattr.cxx b/editeng/source/editeng/editattr.cxx
index 1ac66fb300..12b91d8f2d 100644
--- a/svx/source/editeng/editattr.cxx
+++ b/editeng/source/editeng/editattr.cxx
@@ -29,33 +29,36 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#include <eeng_pch.hxx>
-
-#include <svx/svxfont.hxx>
-#include <svx/flditem.hxx>
-#include <fontitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/cntritem.hxx>
-#include <svx/shdditem.hxx>
-#include <svx/escpitem.hxx>
-#include <svx/colritem.hxx>
-#include <svx/wrlmitem.hxx>
-#include <svx/fhgtitem.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/cscoitem.hxx>
-#include <svx/kernitem.hxx>
-#include <svx/akrnitem.hxx>
-#include <svx/langitem.hxx>
-#include <svx/emphitem.hxx>
-#include <svx/charscaleitem.hxx>
-#include <svx/charreliefitem.hxx>
-
-
-#include <editattr.hxx>
+#include "precompiled_editeng.hxx"
+
+//#include <eeng_pch.hxx>
+#include <vcl/wrkwin.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/svapp.hxx>
+
+#include <editeng/svxfont.hxx>
+#include <editeng/flditem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/cntritem.hxx>
+#include <editeng/shdditem.hxx>
+#include <editeng/escpitem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/wrlmitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/crsditem.hxx>
+#include <editeng/cscoitem.hxx>
+#include <editeng/kernitem.hxx>
+#include <editeng/akrnitem.hxx>
+#include <editeng/langitem.hxx>
+#include <editeng/emphitem.hxx>
+#include <editeng/charscaleitem.hxx>
+#include <editeng/charreliefitem.hxx>
+
+#include "editattr.hxx"
 
 DBG_NAME( EE_EditAttrib )
 
diff --git a/svx/source/editeng/editattr.hxx b/editeng/source/editeng/editattr.hxx
index 818ae1f710..4d1673653c 100644
--- a/svx/source/editeng/editattr.hxx
+++ b/editeng/source/editeng/editattr.hxx
@@ -31,7 +31,7 @@
 #ifndef _EDITATTR_HXX
 #define	_EDITATTR_HXX
 
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
 class SvxFont;
 class SvxFontItem;
diff --git a/svx/source/editeng/editdbg.cxx b/editeng/source/editeng/editdbg.cxx
index c93e7bc63f..bb29ef46ee 100644
--- a/svx/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -29,43 +29,41 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
-#include <eeng_pch.hxx>
-
-#ifndef _MSGBOX_HXX //autogen
+#include <vcl/wrkwin.hxx>
+#include <vcl/dialog.hxx>
 #include <vcl/msgbox.hxx>
-#endif
-
-#include <svx/lspcitem.hxx>
-
-#include <svx/lrspitem.hxx>
-#include <svx/ulspitem.hxx>
-#include <svx/cntritem.hxx>
-#include <svx/colritem.hxx>
-#include <svx/fhgtitem.hxx>
-#include <fontitem.hxx>
-#include <svx/adjitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/shdditem.hxx>
-#include <svx/escpitem.hxx>
-#include <svx/kernitem.hxx>
-#include <svx/wrlmitem.hxx>
-#include <svx/akrnitem.hxx>
-#include <svx/langitem.hxx>
-#include <svx/emphitem.hxx>
-#include <svx/numitem.hxx>
-#include <svx/tstpitem.hxx>
-#include <svx/charscaleitem.hxx>
-#include <svx/charreliefitem.hxx>
-#include <svx/frmdiritem.hxx>
+#include <vcl/svapp.hxx>
+
+#include <editeng/lspcitem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/cntritem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/adjitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/crsditem.hxx>
+#include <editeng/shdditem.hxx>
+#include <editeng/escpitem.hxx>
+#include <editeng/kernitem.hxx>
+#include <editeng/wrlmitem.hxx>
+#include <editeng/akrnitem.hxx>
+#include <editeng/langitem.hxx>
+#include <editeng/emphitem.hxx>
+#include <editeng/numitem.hxx>
+#include <editeng/tstpitem.hxx>
+#include <editeng/charscaleitem.hxx>
+#include <editeng/charreliefitem.hxx>
+#include <editeng/frmdiritem.hxx>
 
 #include <impedit.hxx>
-#include <svx/editeng.hxx>
-#include <svx/editview.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editview.hxx>
 #include <editdoc.hxx>
 #include <editdbg.hxx>
 
diff --git a/svx/source/editeng/editdbg.hxx b/editeng/source/editeng/editdbg.hxx
index 78764a0c9a..ceb0bad2b0 100644
--- a/svx/source/editeng/editdbg.hxx
+++ b/editeng/source/editeng/editdbg.hxx
@@ -46,7 +46,7 @@ class SfxPoolItem;
 ByteString 	DbgOutItem( const SfxItemPool& rPool, const SfxPoolItem& rItem );
 void 		DbgOutItemSet( FILE* fp, const SfxItemSet& rSet, BOOL bSearchInParent, BOOL bShowALL );
 
-class SVX_DLLPUBLIC EditDbg
+class EditDbg
 {
 public:
     static void			ShowEditEngineData( EditEngine* pEditEngine, BOOL bInfoBox = TRUE );
diff --git a/svx/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index d5f9ee16ee..a5d58b9c6b 100644
--- a/svx/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -29,45 +29,44 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#include <eeng_pch.hxx>
-
-#include <svx/tstpitem.hxx>
-#include <svx/colritem.hxx>
-#include <fontitem.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/fhgtitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/kernitem.hxx>
-#include <svx/wrlmitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/cntritem.hxx>
-#include <svx/escpitem.hxx>
-#include <svx/shdditem.hxx>
-#include <svx/akrnitem.hxx>
-#include <svx/cscoitem.hxx>
-#include <svx/langitem.hxx>
-#include <svx/emphitem.hxx>
-#include <svx/charscaleitem.hxx>
-#include <svx/charreliefitem.hxx>
-#include <xmlcnitm.hxx>
+#include "precompiled_editeng.hxx"
+
+#include <vcl/wrkwin.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/svapp.hxx>
+
+#include <editeng/tstpitem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/crsditem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/kernitem.hxx>
+#include <editeng/wrlmitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/cntritem.hxx>
+#include <editeng/escpitem.hxx>
+#include <editeng/shdditem.hxx>
+#include <editeng/akrnitem.hxx>
+#include <editeng/cscoitem.hxx>
+#include <editeng/langitem.hxx>
+#include <editeng/emphitem.hxx>
+#include <editeng/charscaleitem.hxx>
+#include <editeng/charreliefitem.hxx>
+#include <editeng/xmlcnitm.hxx>
+#include <editeng/editids.hrc>
 
 #include <editdoc.hxx>
 #include <editdbg.hxx>
-#include <eerdll.hxx>
+#include <editeng/eerdll.hxx>
 #include <eerdll2.hxx>
 #include <tools/stream.hxx>
-
 #include <tools/debug.hxx>
 #include <tools/shl.hxx>
 #include <vcl/svapp.hxx>
-
-#ifndef _COM_SUN_STAR_TEXT_SCRIPTTYPE_HPP_
 #include <com/sun/star/i18n/ScriptType.hpp>
-#endif
-
 #include <stdlib.h>	// qsort
 
 using namespace ::com::sun::star;
diff --git a/svx/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx
index 0828f9dc4e..e95e08063e 100644
--- a/svx/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -37,7 +37,7 @@
 
 #include <editattr.hxx>
 #include <edtspell.hxx>
-#include <svx/svxfont.hxx>
+#include <editeng/svxfont.hxx>
 #include <svl/itemset.hxx>
 #include <svl/style.hxx>
 #include <svl/itempool.hxx>
diff --git a/svx/source/editeng/editdoc2.cxx b/editeng/source/editeng/editdoc2.cxx
index 4aba92347e..00fe509a19 100644
--- a/svx/source/editeng/editdoc2.cxx
+++ b/editeng/source/editeng/editdoc2.cxx
@@ -29,37 +29,41 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
-#include <eeng_pch.hxx>
+#include <vcl/wrkwin.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/svapp.hxx>
 #include <svl/smplhint.hxx>
+
 #include <tools/rtti.hxx>
-#include <svx/lspcitem.hxx>
-#include <svx/adjitem.hxx>
-#include <svx/tstpitem.hxx>
+#include <editeng/lspcitem.hxx>
+#include <editeng/adjitem.hxx>
+#include <editeng/tstpitem.hxx>
 
 #include <editdoc.hxx>
 #include <impedit.hxx>
 #include <editdbg.hxx>
 
-#include <svx/numitem.hxx>
-
-#include <svx/akrnitem.hxx>
-#include <svx/cntritem.hxx>
-#include <svx/colritem.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/escpitem.hxx>
-#include <svx/fhgtitem.hxx>
-#include "fontitem.hxx"
-#include <svx/kernitem.hxx>
-#include <svx/lrspitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/shdditem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/ulspitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/wrlmitem.hxx>
-#include <svx/charscaleitem.hxx>
+#include <editeng/numitem.hxx>
+
+#include <editeng/akrnitem.hxx>
+#include <editeng/cntritem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/crsditem.hxx>
+#include <editeng/escpitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/kernitem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/shdditem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/wrlmitem.hxx>
+#include <editeng/charscaleitem.hxx>
 
 #include <vcl/svapp.hxx>	// Fuer AppWindow...
 
diff --git a/svx/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 477d513a7f..9efdc6b2fe 100644
--- a/svx/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -29,10 +29,13 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-#include <eeng_pch.hxx>
+#include "precompiled_editeng.hxx"
+
+#include <vcl/wrkwin.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/svapp.hxx>
 
-// #define _SOLAR__PRIVATE 1
 #define USE_SVXFONT
 
 #define _SVSTDARR_USHORTS
@@ -40,46 +43,46 @@
 #include <svl/ctloptions.hxx>
 #include <svtools/ctrltool.hxx>
 
-#include <svx/svxfont.hxx>
+#include <editeng/svxfont.hxx>
 #include <impedit.hxx>
-#include <svx/editeng.hxx>
-#include <svx/editview.hxx>
-#include <editstat.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/editstat.hxx>
 #include <editdbg.hxx>
 #include <eerdll2.hxx>
-#include <eerdll.hxx>
+#include <editeng/eerdll.hxx>
 #include <editeng.hrc>
-#include <svx/flditem.hxx>
-#include <txtrange.hxx>
+#include <editeng/flditem.hxx>
+#include <editeng/txtrange.hxx>
 #include <vcl/graph.hxx>
 
-#include <svx/akrnitem.hxx>
-#include <svx/cntritem.hxx>
-#include <svx/colritem.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/escpitem.hxx>
-#include <svx/fhgtitem.hxx>
-#include "fontitem.hxx"
-#include <svx/kernitem.hxx>
-#include <svx/lrspitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/shdditem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/wrlmitem.hxx>
-#include <svx/brshitem.hxx>
-#include <svx/cscoitem.hxx>
-#include <svx/langitem.hxx>
-#include <svx/emphitem.hxx>
-#include <svx/charscaleitem.hxx>
-#include <svx/charreliefitem.hxx>
+#include <editeng/akrnitem.hxx>
+#include <editeng/cntritem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/crsditem.hxx>
+#include <editeng/escpitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/kernitem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/shdditem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/wrlmitem.hxx>
+#include <editeng/brshitem.hxx>
+#include <editeng/cscoitem.hxx>
+#include <editeng/langitem.hxx>
+#include <editeng/emphitem.hxx>
+#include <editeng/charscaleitem.hxx>
+#include <editeng/charreliefitem.hxx>
 
 #include <sot/exchange.hxx>
 #include <sot/formats.hxx>
 
-#include <svx/numitem.hxx>
-#include <bulitem.hxx>
-#include <unolingu.hxx>
+#include <editeng/numitem.hxx>
+#include <editeng/bulitem.hxx>
+#include <editeng/unolingu.hxx>
 #include <linguistic/lngprops.hxx>
 #include <i18npool/mslangid.hxx>
 #include <vcl/help.hxx>
@@ -89,7 +92,7 @@
 #include <svl/srchdefs.hxx>
 
 #if OSL_DEBUG_LEVEL > 1
-#include <svx/frmdiritem.hxx>
+#include <editeng/frmdiritem.hxx>
 #endif
 #include <basegfx/polygon/b2dpolygon.hxx>
 
diff --git a/svx/source/editeng/editeng.src b/editeng/source/editeng/editeng.src
index 1204ba1661..1204ba1661 100644
--- a/svx/source/editeng/editeng.src
+++ b/editeng/source/editeng/editeng.src
diff --git a/svx/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index 496106efb0..c224410ca0 100644
--- a/svx/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -29,26 +29,28 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
-
-#include <eeng_pch.hxx>
+#include <vcl/wrkwin.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/svapp.hxx>
 
 #define ENABLE_STRING_STREAM_OPERATORS
 #include <tools/stream.hxx>
 
 #include <editobj2.hxx>
-#include <svx/editdata.hxx>
+#include <editeng/editdata.hxx>
 #include <editattr.hxx>
-#include <svx/editeng.hxx>
-#include <fontitem.hxx>
-#include <svx/cscoitem.hxx>
-#include <svx/flditem.hxx>
-#include <svx/lrspitem.hxx>
-#include <svx/tstpitem.hxx>
-#include <bulitem.hxx>
-#include <svx/numitem.hxx>
-#include <svx/brshitem.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/cscoitem.hxx>
+#include <editeng/flditem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/tstpitem.hxx>
+#include <editeng/bulitem.hxx>
+#include <editeng/numitem.hxx>
+#include <editeng/brshitem.hxx>
 #include <vcl/graph.hxx>
 #include <svl/intitem.hxx>
 #include <unotools/fontcvt.hxx>
diff --git a/svx/source/editeng/editobj2.hxx b/editeng/source/editeng/editobj2.hxx
index ab8d1c9347..4ba6b8b8d9 100644
--- a/svx/source/editeng/editobj2.hxx
+++ b/editeng/source/editeng/editobj2.hxx
@@ -31,7 +31,7 @@
 #ifndef _EDITOBJ2_HXX
 #define _EDITOBJ2_HXX
 
-#include <svx/editobj.hxx>
+#include <editeng/editobj.hxx>
 #include <editdoc.hxx>
 
 #include <unotools/fontcvt.hxx>
diff --git a/svx/source/editeng/editsel.cxx b/editeng/source/editeng/editsel.cxx
index 90e1ea91d2..603b12ef87 100644
--- a/svx/source/editeng/editsel.cxx
+++ b/editeng/source/editeng/editsel.cxx
@@ -29,13 +29,13 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 #include <eeng_pch.hxx>
 
 #include <editsel.hxx>
 #include <impedit.hxx>
-#include <svx/editview.hxx>
+#include <editeng/editview.hxx>
 
 //	----------------------------------------------------------------------
 //	class EditSelFunctionSet
diff --git a/svx/source/editeng/editsel.hxx b/editeng/source/editeng/editsel.hxx
index bc4b78bb1d..bc4b78bb1d 100644
--- a/svx/source/editeng/editsel.hxx
+++ b/editeng/source/editeng/editsel.hxx
diff --git a/svx/source/editeng/editstt2.hxx b/editeng/source/editeng/editstt2.hxx
index 896c1768d9..ac70d4e2ec 100644
--- a/svx/source/editeng/editstt2.hxx
+++ b/editeng/source/editeng/editstt2.hxx
@@ -31,7 +31,7 @@
 #ifndef _EDITSTT2_HXX
 #define _EDITSTT2_HXX
 
-#include <editstat.hxx>
+#include <editeng/editstat.hxx>
 
 class InternalEditStatus : public EditStatus
 {
diff --git a/svx/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx
index be57d52112..8eb74bf9f0 100644
--- a/svx/source/editeng/editundo.cxx
+++ b/editeng/source/editeng/editundo.cxx
@@ -29,14 +29,14 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 #include <eeng_pch.hxx>
 
 #include <impedit.hxx>
 #include <editundo.hxx>
-#include <svx/editview.hxx>
-#include <svx/editeng.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/editeng.hxx>
 
 DBG_NAME( EditUndo )
 
diff --git a/svx/source/editeng/editundo.hxx b/editeng/source/editeng/editundo.hxx
index 1def47b7e9..571e873adc 100644
--- a/svx/source/editeng/editundo.hxx
+++ b/editeng/source/editeng/editundo.hxx
@@ -32,8 +32,8 @@
 #define _EDITUNDO_HXX
 
 #include <editdoc.hxx>
-#include <editund2.hxx>
-#include <svx/editdata.hxx>
+#include <editeng/editund2.hxx>
+#include <editeng/editdata.hxx>
 
 #define UNDO_NOACTION			0
 #define UNDO_NEWUNDO			1
diff --git a/svx/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index 24fab93783..1fe7fc5c38 100644
--- a/svx/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -29,14 +29,16 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-#include <eeng_pch.hxx>
+#include "precompiled_editeng.hxx"
+
+#include <vcl/wrkwin.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/svapp.hxx>
 
 #include <com/sun/star/i18n/WordType.hpp>
 #include <vcl/metric.hxx>
 
-#define _SOLAR__PRIVATE 1
-
 #include <i18npool/mslangid.hxx>
 #include <svl/languageoptions.hxx>
 #include <svtools/ctrltool.hxx>
@@ -48,33 +50,30 @@
 #include <svl/svstdarr.hxx>
 
 #include <impedit.hxx>
-#include <svx/editeng.hxx>
-#include <svx/editview.hxx>
-#include <svx/flditem.hxx>
-#include <svx/svxacorr.hxx>
-#include <svx/langitem.hxx>
-#include <svx/fhgtitem.hxx>
-#include <eerdll.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/flditem.hxx>
+#include <editeng/svxacorr.hxx>
+#include <editeng/langitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/eerdll.hxx>
 #include <eerdll2.hxx>
 #include <editeng.hrc>
 #include <helpid.hrc>
 #include <i18npool/lang.h>
 #include <vcl/menu.hxx>
-#include <acorrcfg.hxx>
-#include <unolingu.hxx>
-#include <fontitem.hxx>
+#include <editeng/acorrcfg.hxx>
+#include <editeng/unolingu.hxx>
+#include <editeng/fontitem.hxx>
 
 #include <com/sun/star/frame/XStorable.hpp>
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUES_HDL_
 #include <com/sun/star/beans/PropertyValues.hdl>
-#endif
 #include <com/sun/star/lang/Locale.hpp>
 #include <linguistic/lngprops.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <unotools/lingucfg.hxx>
 
-
 using ::rtl::OUString;
 using namespace com::sun::star;
 using namespace com::sun::star::uno;
diff --git a/svx/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx
index 09768f67bf..9578f523ab 100644
--- a/svx/source/editeng/edtspell.cxx
+++ b/editeng/source/editeng/edtspell.cxx
@@ -29,19 +29,22 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
-#include <eeng_pch.hxx>
+#include <vcl/wrkwin.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/svapp.hxx>
 
 #include <impedit.hxx>
-#include <svx/editview.hxx>
-#include <svx/editeng.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/editeng.hxx>
 #include <edtspell.hxx>
-#include <svx/flditem.hxx>
-#include <fontitem.hxx>
+#include <editeng/flditem.hxx>
+#include <editeng/fontitem.hxx>
 #include <svl/intitem.hxx>
 #include <svl/eitem.hxx>
-#include <unolingu.hxx>
+#include <editeng/unolingu.hxx>
 #include <linguistic/lngprops.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 
diff --git a/svx/inc/edtspell.hxx b/editeng/source/editeng/edtspell.hxx
index f2d0717e39..b2b6072e2f 100644
--- a/svx/inc/edtspell.hxx
+++ b/editeng/source/editeng/edtspell.hxx
@@ -31,12 +31,12 @@
 #ifndef _EDTSPELL_HXX
 #define _EDTSPELL_HXX
 
-#include <svx/svxbox.hxx>
-#include <svx/svxenum.hxx>
-#include <svx/splwrap.hxx>
-#include <svx/svxacorr.hxx>
+#include <svtools/svxbox.hxx>
+#include <editeng/svxenum.hxx>
+#include <editeng/splwrap.hxx>
+#include <editeng/svxacorr.hxx>
 #include <com/sun/star/uno/Reference.h>
-#include "svx/svxdllapi.h"
+#include <editeng/editengdllapi.h>
 
 namespace com { namespace sun { namespace star { namespace linguistic2 {
     class XSpellChecker1;
@@ -148,7 +148,7 @@ inline void WrongList::InsertWrong( const WrongRange& rWrong, USHORT nPos )
 
 
 
-class SVX_DLLPUBLIC EdtAutoCorrDoc : public SvxAutoCorrDoc
+class EdtAutoCorrDoc : public SvxAutoCorrDoc
 {
     ImpEditEngine* 	pImpEE;
     ContentNode*	pCurNode;
diff --git a/svx/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx
index 45082fdd08..2edfda4381 100644
--- a/svx/source/editeng/eehtml.cxx
+++ b/editeng/source/editeng/eehtml.cxx
@@ -29,19 +29,21 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#include <eeng_pch.hxx>
+#include "precompiled_editeng.hxx"
 
+#include <vcl/wrkwin.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/svapp.hxx>
 #include <eehtml.hxx>
 #include <impedit.hxx>
-#include <svx/adjitem.hxx>
-#include <svx/flditem.hxx>
+#include <editeng/adjitem.hxx>
+#include <editeng/flditem.hxx>
 #include <tools/urlobj.hxx>
-#include <svx/fhgtitem.hxx>
-#include "fontitem.hxx"
-#include <svx/ulspitem.hxx>
-#include <svx/wghtitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/wghtitem.hxx>
 #include <svtools/htmltokn.h>
 #include <svtools/htmlkywd.hxx>
 
diff --git a/svx/source/editeng/eehtml.hxx b/editeng/source/editeng/eehtml.hxx
index f6c7bd6247..f6c7bd6247 100644
--- a/svx/source/editeng/eehtml.hxx
+++ b/editeng/source/editeng/eehtml.hxx
diff --git a/svx/source/editeng/eeng_pch.cxx b/editeng/source/editeng/eeng_pch.cxx
index d9afbde59b..9bd54072fb 100644
--- a/svx/source/editeng/eeng_pch.cxx
+++ b/editeng/source/editeng/eeng_pch.cxx
@@ -29,5 +29,5 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 #include <eeng_pch.hxx>
diff --git a/svx/source/editeng/eeng_pch.hxx b/editeng/source/editeng/eeng_pch.hxx
index e486c5ff79..355085cc98 100644
--- a/svx/source/editeng/eeng_pch.hxx
+++ b/editeng/source/editeng/eeng_pch.hxx
@@ -34,6 +34,4 @@
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
 
-#include <svx/svxids.hrc>
-#include <svx/dialogs.hrc>
 
diff --git a/svx/source/editeng/eeobj.cxx b/editeng/source/editeng/eeobj.cxx
index 8ab5389ee1..2b0b403fe0 100644
--- a/svx/source/editeng/eeobj.cxx
+++ b/editeng/source/editeng/eeobj.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 
 #include <eeng_pch.hxx>
@@ -37,7 +37,7 @@
 #include <eeobj.hxx>
 #include <sot/exchange.hxx>
 #include <sot/formats.hxx>
-#include <svx/editeng.hxx>
+#include <editeng/editeng.hxx>
 #include <svl/itempool.hxx>
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
diff --git a/svx/source/editeng/eeobj.hxx b/editeng/source/editeng/eeobj.hxx
index c013d040b3..c013d040b3 100644
--- a/svx/source/editeng/eeobj.hxx
+++ b/editeng/source/editeng/eeobj.hxx
diff --git a/svx/source/editeng/eerdll.cxx b/editeng/source/editeng/eerdll.cxx
index 0951d2c6e4..6cde40721e 100644
--- a/svx/source/editeng/eerdll.cxx
+++ b/editeng/source/editeng/eerdll.cxx
@@ -29,52 +29,53 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
-#include <eeng_pch.hxx>
+#include <vcl/wrkwin.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/svapp.hxx>
 #include <com/sun/star/linguistic2/XLanguageGuessing.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <comphelper/processfactory.hxx>
 
 #include <svl/solar.hrc>
-#include <eerdll.hxx>
+#include <editeng/eerdll.hxx>
 #include <eerdll2.hxx>
-#include <svx/lspcitem.hxx>
-#include <svx/adjitem.hxx>
-#include <svx/tstpitem.hxx>
-#include <bulitem.hxx>
-#include <svx/flditem.hxx>
-#include <svx/emphitem.hxx>
-#include <svx/scriptspaceitem.hxx>
+#include <editeng/lspcitem.hxx>
+#include <editeng/adjitem.hxx>
+#include <editeng/tstpitem.hxx>
+#include <editeng/bulitem.hxx>
+#include <editeng/flditem.hxx>
+#include <editeng/emphitem.hxx>
+#include <editeng/scriptspaceitem.hxx>
 #include <svl/itempool.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/svapp.hxx>
 
-#include <svx/akrnitem.hxx>
-#include <svx/cntritem.hxx>
-#include <svx/colritem.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/cscoitem.hxx>
-#include <svx/escpitem.hxx>
-#include <svx/fhgtitem.hxx>
-#include <fontitem.hxx>
-#include <svx/kernitem.hxx>
-#include <svx/lrspitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/shdditem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/ulspitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/wrlmitem.hxx>
-#include <svx/numitem.hxx>
-#include <svx/langitem.hxx>
-#include <svx/charscaleitem.hxx>
-#include <svx/charreliefitem.hxx>
-#include <svx/frmdiritem.hxx>
-#include <xmlcnitm.hxx>
-
-#include <forbiddencharacterstable.hxx>
-
+#include <editeng/akrnitem.hxx>
+#include <editeng/cntritem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/crsditem.hxx>
+#include <editeng/cscoitem.hxx>
+#include <editeng/escpitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/kernitem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/shdditem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/wrlmitem.hxx>
+#include <editeng/numitem.hxx>
+#include <editeng/langitem.hxx>
+#include <editeng/charscaleitem.hxx>
+#include <editeng/charreliefitem.hxx>
+#include <editeng/frmdiritem.hxx>
+#include <editeng/xmlcnitm.hxx>
+#include <editeng/forbiddencharacterstable.hxx>
 #include <comphelper/processfactory.hxx>
 
 static EditDLL* pDLL=0;
diff --git a/svx/source/editeng/eerdll2.hxx b/editeng/source/editeng/eerdll2.hxx
index 8b8a584545..eb9af0cad1 100644
--- a/svx/source/editeng/eerdll2.hxx
+++ b/editeng/source/editeng/eerdll2.hxx
@@ -32,8 +32,7 @@
 #define _EERDLL2_HXX
 
 #include <com/sun/star/linguistic2/XLanguageGuessing.hpp>
-
-#include <forbiddencharacterstable.hxx>
+#include <editeng/forbiddencharacterstable.hxx>
 #include <vos/ref.hxx>
 
 class SfxPoolItem;
diff --git a/svx/source/editeng/eertfpar.cxx b/editeng/source/editeng/eertfpar.cxx
index 39100e88ab..45bc347057 100644
--- a/svx/source/editeng/eertfpar.cxx
+++ b/editeng/source/editeng/eertfpar.cxx
@@ -29,17 +29,20 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
-#include <eeng_pch.hxx>
+#include <vcl/wrkwin.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/svapp.hxx>
 
 #include <eertfpar.hxx>
 #include <impedit.hxx>
 #include <svl/intitem.hxx>
-#include <svx/escpitem.hxx>
-#include <svx/fhgtitem.hxx>
-#include "fontitem.hxx"
-#include <svx/flditem.hxx>
+#include <editeng/escpitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/flditem.hxx>
 
 #include <svtools/rtftoken.h>
 
diff --git a/svx/source/editeng/eertfpar.hxx b/editeng/source/editeng/eertfpar.hxx
index 6969fa62fe..5e1341a39f 100644
--- a/svx/source/editeng/eertfpar.hxx
+++ b/editeng/source/editeng/eertfpar.hxx
@@ -30,7 +30,7 @@
 #ifndef _EERTFPAR_HXX
 #define _EERTFPAR_HXX
 
-#include <svxrtf.hxx>
+#include <editeng/svxrtf.hxx>
 
 #include <editdoc.hxx>
 #include <impedit.hxx>
diff --git a/svx/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index 305cd29f6e..648c582c3c 100644
--- a/svx/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -29,15 +29,15 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 #include <eeng_pch.hxx>
 
 #include <impedit.hxx>
-#include <svx/editeng.hxx>
-#include <svx/editview.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editview.hxx>
 #include <tools/poly.hxx>
-#include <unolingu.hxx>
+#include <editeng/unolingu.hxx>
 #include <com/sun/star/linguistic2/XDictionaryEntry.hpp>
 #include <com/sun/star/linguistic2/DictionaryType.hpp>
 #include <com/sun/star/linguistic2/DictionaryEvent.hpp>
@@ -50,7 +50,7 @@
 #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
 #include <com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp>
 #include <vos/mutex.hxx>
-#include <svx/flditem.hxx>
+#include <editeng/flditem.hxx>
 #include <svl/intitem.hxx>
 #include <svtools/transfer.hxx>
 #include <sot/exchange.hxx>
diff --git a/svx/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index 39cbb85a8e..1dfd4690c0 100644
--- a/svx/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -35,8 +35,8 @@
 #include <editundo.hxx>
 #include <editobj2.hxx>
 #include <editstt2.hxx>
-#include <svx/editdata.hxx>
-#include <svx/svxacorr.hxx>
+#include <editeng/editdata.hxx>
+#include <editeng/svxacorr.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/cursor.hxx>
@@ -52,17 +52,10 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/i18n/XBreakIterator.hpp>
 #include <com/sun/star/i18n/CharacterIteratorMode.hpp>
-
-#ifndef _COM_SUN_STAR_TEXT_WORDTYPE_HPP_
 #include <com/sun/star/i18n/WordType.hpp>
-#endif
-
-#ifndef _COM_SUN_STAR_I18N_XEXTENDEDINPUTSEQUENCECHECKER_HDL_
 #include <com/sun/star/i18n/XExtendedInputSequenceChecker.hpp>
-#endif
 
 #include <i18npool/lang.h>
-
 #include <vos/ref.hxx>
 
 DBG_NAMEEX( EditView )
@@ -101,9 +94,9 @@ class TextRanger;
 class SvKeyValueIterator;
 class SvxForbiddenCharactersTable;
 class SvtCTLOptions;
-#include <svx/SpellPortions.hxx>
+#include <editeng/SpellPortions.hxx>
 
-#include <svx/eedata.hxx>
+#include <editeng/eedata.hxx>
 
 class SvUShorts;
 class SvxNumberFormat;
diff --git a/svx/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index eaea39623e..d6f8a54876 100644
--- a/svx/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -29,36 +29,38 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
-#include <eeng_pch.hxx>
+#include <vcl/wrkwin.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/svapp.hxx>
 
-#include <svx/lspcitem.hxx>
-#include <svx/flditem.hxx>
+#include <editeng/lspcitem.hxx>
+#include <editeng/flditem.hxx>
 #include <impedit.hxx>
-#include <svx/editeng.hxx>
-#include <svx/editview.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editview.hxx>
 #include <editdbg.hxx>
 #include <eerdll2.hxx>
-#include <eerdll.hxx>
+#include <editeng/eerdll.hxx>
 #include <edtspell.hxx>
 #include <eeobj.hxx>
-#include <txtrange.hxx>
+#include <editeng/txtrange.hxx>
 #include <svl/urlbmk.hxx>
 #include <svtools/colorcfg.hxx>
 #include <svl/ctloptions.hxx>
-#include <acorrcfg.hxx>
-
-#include <svx/fhgtitem.hxx>
-#include <svx/lrspitem.hxx>
-#include <svx/ulspitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/adjitem.hxx>
-#include <svx/scripttypeitem.hxx>
-#include <svx/frmdiritem.hxx>
-#include <fontitem.hxx>
+#include <editeng/acorrcfg.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/adjitem.hxx>
+#include <editeng/scripttypeitem.hxx>
+#include <editeng/frmdiritem.hxx>
+#include <editeng/fontitem.hxx>
 #include <vcl/cmdevt.h>
 
 #include <com/sun/star/i18n/CharacterIteratorMode.hpp>
diff --git a/svx/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index d34d8c14b3..ab3bbc0fc2 100644
--- a/svx/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -29,9 +29,12 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
-#include <eeng_pch.hxx>
+#include <vcl/wrkwin.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/svapp.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/gdimtf.hxx>
 
@@ -39,37 +42,37 @@
 #include <svl/svstdarr.hxx>
 
 #include <vcl/wrkwin.hxx>
-#include <svx/adjitem.hxx>
-#include <svx/tstpitem.hxx>
-#include <svx/lspcitem.hxx>
-#include <svx/flditem.hxx>
+#include <editeng/adjitem.hxx>
+#include <editeng/tstpitem.hxx>
+#include <editeng/lspcitem.hxx>
+#include <editeng/flditem.hxx>
 #include <impedit.hxx>
-#include <svx/editeng.hxx>
-#include <svx/editview.hxx>
-#include <txtrange.hxx>
-#include <svx/cscoitem.hxx>
-#include <svx/colritem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/fhgtitem.hxx>
-#include <svx/kernitem.hxx>
-#include <svx/lrspitem.hxx>
-#include <svx/ulspitem.hxx>
-#include <fontitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/langitem.hxx>
-#include <svx/scriptspaceitem.hxx>
-#include <svx/charscaleitem.hxx>
-#include <svx/numitem.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/txtrange.hxx>
+#include <editeng/cscoitem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/kernitem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/langitem.hxx>
+#include <editeng/scriptspaceitem.hxx>
+#include <editeng/charscaleitem.hxx>
+#include <editeng/numitem.hxx>
 
 #include <svtools/colorcfg.hxx>
 #include <svl/ctloptions.hxx>
 
-#include <forbiddencharacterstable.hxx>
+#include <editeng/forbiddencharacterstable.hxx>
 
 #include <unotools/localedatawrapper.hxx>
 
-#include <unolingu.hxx>
+#include <editeng/unolingu.hxx>
 
 #include <math.h>
 #include <vcl/svapp.hxx>
diff --git a/svx/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index f8b89900ce..1280fecdfd 100644
--- a/svx/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -29,53 +29,52 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#include <eeng_pch.hxx>
+#include "precompiled_editeng.hxx"
 
+#include <vcl/wrkwin.hxx>
+#include <vcl/dialog.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
+
 #include <svl/srchitem.hxx>
-#include <svx/lspcitem.hxx>
-#include <svx/adjitem.hxx>
-#include <svx/tstpitem.hxx>
+#include <editeng/lspcitem.hxx>
+#include <editeng/adjitem.hxx>
+#include <editeng/tstpitem.hxx>
 
 #include <eertfpar.hxx>
-#include <svx/editeng.hxx>
+#include <editeng/editeng.hxx>
 #include <impedit.hxx>
-#include <svx/editview.hxx>
+#include <editeng/editview.hxx>
 #include <eehtml.hxx>
 #include <editobj2.hxx>
 #include <i18npool/lang.h>
 
-#include <editxml.hxx>
-
-
-#include <svx/akrnitem.hxx>
-#include <svx/cntritem.hxx>
-#include <svx/colritem.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/escpitem.hxx>
-#include <svx/fhgtitem.hxx>
-#include "fontitem.hxx"
-#include <svx/kernitem.hxx>
-#include <svx/lrspitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/shdditem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/ulspitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/langitem.hxx>
-#include <svx/charreliefitem.hxx>
-#include <svx/frmdiritem.hxx>
-#include <svx/emphitem.hxx>
+#include "editxml.hxx"
+
+#include <editeng/akrnitem.hxx>
+#include <editeng/cntritem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/crsditem.hxx>
+#include <editeng/escpitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/kernitem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/shdditem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/langitem.hxx>
+#include <editeng/charreliefitem.hxx>
+#include <editeng/frmdiritem.hxx>
+#include <editeng/emphitem.hxx>
 #include <textconv.hxx>
-#include <svx/svxdlg.hxx>
 #include <rtl/tencinfo.h>
 #include <svtools/rtfout.hxx>
 #include <edtspell.hxx>
-#include <svx/scripttypeitem.hxx>
-#include <unolingu.hxx>
+#include <editeng/scripttypeitem.hxx>
+#include <editeng/unolingu.hxx>
 #include <linguistic/lngprops.hxx>
 #include <com/sun/star/linguistic2/XThesaurus.hpp>
 #include <com/sun/star/linguistic2/XMeaning.hpp>
@@ -85,6 +84,7 @@
 #include <comphelper/processfactory.hxx>
 #include <vcl/help.hxx>
 #include <svtools/rtfkeywd.hxx>
+#include <editeng/edtdlg.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -1538,8 +1538,8 @@ sal_Bool ImpEditEngine::HasConvertibleTextPortion( LanguageType nSrcLang )
             lang::Locale aLocale( SvxCreateLocale( nLangFound ) );
 #endif
             bHasConvTxt =   (nSrcLang == nLangFound) ||
-                            (svx::HangulHanjaConversion::IsChinese( nLangFound ) &&
-                             svx::HangulHanjaConversion::IsChinese( nSrcLang ));
+                            (editeng::HangulHanjaConversion::IsChinese( nLangFound ) &&
+                             editeng::HangulHanjaConversion::IsChinese( nSrcLang ));
             if (bHasConvTxt)
                 return bHasConvTxt;
        }
@@ -1588,7 +1588,7 @@ void ImpEditEngine::Convert( EditView* pEditView,
         // not work. Thus since chinese conversion is not interactive we start
         // at the begin of the paragraph to solve the problem, i.e. have the
         // TextConversion service get those characters together in the same call.
-        USHORT nStartIdx = ( svx::HangulHanjaConversion::IsChinese( nSrcLang ) ) ?
+        USHORT nStartIdx = ( editeng::HangulHanjaConversion::IsChinese( nSrcLang ) ) ?
                                 0 : aWordStartPaM.GetIndex();
         pConvInfo->aConvStart.nIndex = nStartIdx;
     }
@@ -1752,8 +1752,8 @@ void ImpEditEngine::ImpConvert( rtl::OUString &rConvTxt, LanguageType &rConvTxtL
             lang::Locale aLocale( SvxCreateLocale( nLangFound ) );
 #endif
             sal_Bool bLangOk =  (nLangFound == nSrcLang) ||
-                                (svx::HangulHanjaConversion::IsChinese( nLangFound ) &&
-                                 svx::HangulHanjaConversion::IsChinese( nSrcLang ));
+                                (editeng::HangulHanjaConversion::IsChinese( nLangFound ) &&
+                                 editeng::HangulHanjaConversion::IsChinese( nSrcLang ));
 
             if (nAttribEnd != USHRT_MAX) // start already found?
             {
@@ -2551,7 +2551,7 @@ EESpellState ImpEditEngine::StartThesaurus( EditView* pEditView )
     if (!xThes.is())
         return EE_SPELL_ERRORFOUND;
 
-    SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
+    EditAbstractDialogFactory* pFact = EditAbstractDialogFactory::Create();
     AbstractThesaurusDialog* pDlg = pFact->CreateThesaurusDialog( pEditView->GetWindow(), xThes, aWord, GetLanguage( aCurSel.Max() ) );
     if ( pDlg->Execute() == RET_OK )
     {
diff --git a/svx/source/editeng/impedit5.cxx b/editeng/source/editeng/impedit5.cxx
index 02535744fe..9f9700d891 100644
--- a/svx/source/editeng/impedit5.cxx
+++ b/editeng/source/editeng/impedit5.cxx
@@ -29,18 +29,18 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 #include <eeng_pch.hxx>
 
 #include <impedit.hxx>
-#include <svx/editeng.hxx>
+#include <editeng/editeng.hxx>
 #include <editdbg.hxx>
 
 #include <svl/smplhint.hxx>
 
 
-#include <svx/lrspitem.hxx>
+#include <editeng/lrspitem.hxx>
 
 void ImpEditEngine::SetStyleSheetPool( SfxStyleSheetPool* pSPool )
 {
diff --git a/svx/source/editeng/makefile.mk b/editeng/source/editeng/makefile.mk
index 6df91a78f8..2a4fce319d 100644
--- a/svx/source/editeng/makefile.mk
+++ b/editeng/source/editeng/makefile.mk
@@ -34,9 +34,9 @@ PRJNAME=svx
 TARGET=editeng
 AUTOSEG=true
 
-PROJECTPCH4DLL=TRUE
-PROJECTPCH=eeng_pch
-PROJECTPCHSOURCE=eeng_pch
+#PROJECTPCH4DLL=TRUE
+#PROJECTPCH=eeng_pch
+#PROJECTPCHSOURCE=eeng_pch
 
 ENABLE_EXCEPTIONS=TRUE
 
@@ -53,13 +53,7 @@ CDEFS+=-DEDITDEBUG
 .ENDIF
 
 SLOFILES =	\
-            $(SLO)$/svxacorr.obj \
-            $(SLO)$/acorrcfg.obj \
-            $(SLO)$/txtrange.obj \
-            $(SLO)$/SvXMLAutoCorrectImport.obj \
-            $(SLO)$/SvXMLAutoCorrectExport.obj \
-            $(SLO)$/forbiddencharacterstable.obj \
-            $(SLO)$/swafopt.obj \
+            $(SLO)$/textconv.obj \
             $(SLO)$/editattr.obj \
             $(SLO)$/editdbg.obj	\
             $(SLO)$/editdoc.obj	\
@@ -78,9 +72,7 @@ SLOFILES =	\
             $(SLO)$/impedit2.obj \
             $(SLO)$/impedit3.obj \
             $(SLO)$/impedit4.obj \
-            $(SLO)$/impedit5.obj \
-            $(SLO)$/textconv.obj \
-            $(SLO)$/unolingu.obj
+            $(SLO)$/impedit5.obj
 
 SRS1NAME=$(TARGET)
 SRC1FILES=	editeng.src
diff --git a/svx/source/editeng/textconv.cxx b/editeng/source/editeng/textconv.cxx
index 4975b0cf7f..b02e5681ff 100644
--- a/svx/source/editeng/textconv.cxx
+++ b/editeng/source/editeng/textconv.cxx
@@ -29,18 +29,22 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-#include <eeng_pch.hxx>
+#include "precompiled_editeng.hxx"
+
+#include <vcl/wrkwin.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/msgbox.hxx>
+#include <vcl/svapp.hxx>
 
 #include <impedit.hxx>
-#include <svx/editview.hxx>
-#include <svx/editeng.hxx>
-#include <unolingu.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/unolingu.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/Locale.hpp>
-#include <svx/langitem.hxx>
-#include <fontitem.hxx>
-#include "textconv.hxx"
+#include <editeng/langitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <textconv.hxx>
 
 
 using ::rtl::OUString;
diff --git a/svx/inc/textconv.hxx b/editeng/source/editeng/textconv.hxx
index 01af93edfa..080f575399 100644
--- a/svx/inc/textconv.hxx
+++ b/editeng/source/editeng/textconv.hxx
@@ -30,17 +30,17 @@
 #ifndef _TEXTCONV_HXX
 #define _TEXTCONV_HXX
 
-#include <svx/splwrap.hxx>
-#include <svx/svxacorr.hxx>
+#include <editeng/splwrap.hxx>
+#include <editeng/svxacorr.hxx>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <svx/hangulhanja.hxx>
+#include <editeng/hangulhanja.hxx>
 
 class EditView;
 class ImpEditEngine;
 class ContentNode;
 
-class TextConvWrapper : public svx::HangulHanjaConversion 
+class TextConvWrapper : public editeng::HangulHanjaConversion 
 {
     rtl::OUString   aConvText;      // convertible text part found last time
     LanguageType    nConvTextLang;  // language of aConvText
diff --git a/svx/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx
index 36ca6126a0..e0fed4238b 100644
--- a/svx/source/items/bulitem.cxx
+++ b/editeng/source/items/bulitem.cxx
@@ -29,17 +29,16 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 // include ---------------------------------------------------------------
 #include <tools/stream.hxx>
-
 #include <vcl/outdev.hxx>
 
 #define _SVX_BULITEM_CXX
 
-#include "bulitem.hxx"
-#include "svxerr.hxx"
+#include <editeng/bulitem.hxx>
+#include <editeng/editrids.hrc>
 
 // #90477#
 #include <tools/tenccvt.hxx>
diff --git a/svx/source/items/charhiddenitem.cxx b/editeng/source/items/charhiddenitem.cxx
index 0ae65385d2..b40f55b262 100644
--- a/svx/source/items/charhiddenitem.cxx
+++ b/editeng/source/items/charhiddenitem.cxx
@@ -29,12 +29,12 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 
-#include <charhiddenitem.hxx>
-#include <svx/svxitems.hrc>
-#include <svx/dialmgr.hxx>
+#include <editeng/charhiddenitem.hxx>
+#include <editeng/editrids.hrc>
+#include <editeng/eerdll.hxx>
 
 TYPEINIT1_FACTORY(SvxCharHiddenItem, SfxBoolItem, new SvxCharHiddenItem(sal_False, 0));
 
@@ -75,7 +75,7 @@ SfxItemPresentation SvxCharHiddenItem::GetPresentation
 
             if ( GetValue() )
                 nId = RID_SVXITEMS_CHARHIDDEN_TRUE;
-            rText = SVX_RESSTR(nId);
+            rText = EE_RESSTR(nId);
             return ePres;
         }
         default: ; //prevent warning
diff --git a/svx/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index 486debf4b2..af356a50a0 100644
--- a/svx/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 #include <vcl/metaact.hxx>
 #include <svl/zforlist.hxx>
 #include <tools/urlobj.hxx>
@@ -37,9 +37,9 @@
 #define _SVX_FLDITEM_CXX
 #include <unotools/localfilehelper.hxx>
 
-#include <svx/flditem.hxx>
+#include <editeng/flditem.hxx>
 
-#include <svx/svdfield.hxx>
+#include <editeng/svdfield.hxx>
 
 // #90477#
 #include <tools/tenccvt.hxx>
diff --git a/svx/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 029f77f8ee..7ccb6860ab 100644
--- a/svx/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 // include ---------------------------------------------------------------
 #include <com/sun/star/uno/Any.hxx>
@@ -68,34 +68,32 @@
 #include <svl/cntwall.hxx>
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <svtools/filter.hxx>
 
 #define GLOBALOVERFLOW3
 
 #define _SVX_FRMITEMS_CXX
 
-#include <svx/impgrf.hxx>
-#include <svx/svxids.hrc>
-#include <svx/svxitems.hrc>
-#include <svx/dialogs.hrc>
-#include <svx/pbinitem.hxx>
-#include <svx/sizeitem.hxx>
-#include <svx/lrspitem.hxx>
-#include <svx/ulspitem.hxx>
-#include "prntitem.hxx"
-#include "opaqitem.hxx"
-#include "protitem.hxx"
-#include <svx/shaditem.hxx>
-#include <svx/boxitem.hxx>
-#include <svx/brkitem.hxx>
-#include <svx/keepitem.hxx>
-#include "bolnitem.hxx"
-#include <svx/brshitem.hxx>
-#include <svx/frmdiritem.hxx>
-#include <svx/itemtype.hxx>
-#include <svx/dialmgr.hxx>
-#include "svxerr.hxx"
-#include <svx/unoprnms.hxx>
-#include <svx/unomid.hxx>
+#include <editeng/editids.hrc>
+#include <editeng/editrids.hrc>
+#include <editeng/pbinitem.hxx>
+#include <editeng/sizeitem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/prntitem.hxx>
+#include <editeng/opaqitem.hxx>
+#include <editeng/protitem.hxx>
+#include <editeng/shaditem.hxx>
+#include <editeng/boxitem.hxx>
+#include <editeng/brkitem.hxx>
+#include <editeng/keepitem.hxx>
+#include <editeng/bolnitem.hxx>
+#include <editeng/brshitem.hxx>
+#include <editeng/frmdiritem.hxx>
+#include <editeng/itemtype.hxx>
+#include <editeng/eerdll.hxx>
+#include <editeng/unoprnms.hxx>
+#include <editeng/memberids.hrc>
 
 using namespace ::rtl;
 using namespace ::com::sun::star;
@@ -196,10 +194,10 @@ SfxItemPresentation SvxPaperBinItem::GetPresentation
             BYTE nValue = GetValue();
 
             if ( PAPERBIN_PRINTER_SETTINGS == nValue )
-                rText = SVX_RESSTR(RID_SVXSTR_PAPERBIN_SETTINGS);
+                rText = EE_RESSTR(RID_SVXSTR_PAPERBIN_SETTINGS);
             else
             {
-                rText = SVX_RESSTR(RID_SVXSTR_PAPERBIN);
+                rText = EE_RESSTR(RID_SVXSTR_PAPERBIN);
                 rText += sal_Unicode(' ');
                 rText += String::CreateFromInt32( nValue );
             }
@@ -343,13 +341,13 @@ SfxItemPresentation SvxSizeItem::GetPresentation
             return SFX_ITEM_PRESENTATION_NAMELESS;
 
         case SFX_ITEM_PRESENTATION_COMPLETE:
-            rText = SVX_RESSTR(RID_SVXITEMS_SIZE_WIDTH);
+            rText = EE_RESSTR(RID_SVXITEMS_SIZE_WIDTH);
             rText += GetMetricText( aSize.Width(), eCoreUnit, ePresUnit, pIntl );
-            rText += SVX_RESSTR(GetMetricId(ePresUnit));
+            rText += EE_RESSTR(GetMetricId(ePresUnit));
             rText += cpDelim;
-            rText += SVX_RESSTR(RID_SVXITEMS_SIZE_HEIGHT);
+            rText += EE_RESSTR(RID_SVXITEMS_SIZE_HEIGHT);
             rText += GetMetricText( aSize.Height(), eCoreUnit, ePresUnit, pIntl );
-            rText += SVX_RESSTR(GetMetricId(ePresUnit));
+            rText += EE_RESSTR(GetMetricId(ePresUnit));
             return SFX_ITEM_PRESENTATION_COMPLETE;
         //no break necessary
         default: ;//prevent warning
@@ -611,19 +609,19 @@ SfxItemPresentation SvxLRSpaceItem::GetPresentation
         }
         case SFX_ITEM_PRESENTATION_COMPLETE:
         {
-            rText = SVX_RESSTR(RID_SVXITEMS_LRSPACE_LEFT);
+            rText = EE_RESSTR(RID_SVXITEMS_LRSPACE_LEFT);
             if ( 100 != nPropLeftMargin )
                 ( rText += String::CreateFromInt32( nPropLeftMargin )) += sal_Unicode('%');
             else
             {
                 rText += GetMetricText( (long)nLeftMargin,
                                        eCoreUnit, ePresUnit, pIntl );
-                rText += SVX_RESSTR(GetMetricId(ePresUnit));
+                rText += EE_RESSTR(GetMetricId(ePresUnit));
             }
             rText += cpDelim;
             if ( 100 != nPropFirstLineOfst || nFirstLineOfst )
             {
-                rText += SVX_RESSTR(RID_SVXITEMS_LRSPACE_FLINE);
+                rText += EE_RESSTR(RID_SVXITEMS_LRSPACE_FLINE);
                 if ( 100 != nPropFirstLineOfst )
                     ( rText += String::CreateFromInt32( nPropFirstLineOfst ))
                             += sal_Unicode('%');
@@ -631,18 +629,18 @@ SfxItemPresentation SvxLRSpaceItem::GetPresentation
                 {
                     rText += GetMetricText( (long)nFirstLineOfst,
                                             eCoreUnit, ePresUnit, pIntl );
-                    rText += SVX_RESSTR(GetMetricId(ePresUnit));
+                    rText += EE_RESSTR(GetMetricId(ePresUnit));
                 }
                 rText += cpDelim;
             }
-            rText += SVX_RESSTR(RID_SVXITEMS_LRSPACE_RIGHT);
+            rText += EE_RESSTR(RID_SVXITEMS_LRSPACE_RIGHT);
             if ( 100 != nPropRightMargin )
                 ( rText += String::CreateFromInt32( nPropRightMargin )) += sal_Unicode('%');
             else
             {
                 rText += GetMetricText( (long)nRightMargin,
                                         eCoreUnit, ePresUnit, pIntl );
-                rText += SVX_RESSTR(GetMetricId(ePresUnit));
+                rText += EE_RESSTR(GetMetricId(ePresUnit));
             }
             return SFX_ITEM_PRESENTATION_COMPLETE;
         }
@@ -961,22 +959,22 @@ SfxItemPresentation SvxULSpaceItem::GetPresentation
         }
         case SFX_ITEM_PRESENTATION_COMPLETE:
         {
-            rText = SVX_RESSTR(RID_SVXITEMS_ULSPACE_UPPER);
+            rText = EE_RESSTR(RID_SVXITEMS_ULSPACE_UPPER);
             if ( 100 != nPropUpper )
                 ( rText += String::CreateFromInt32( nPropUpper )) += sal_Unicode('%');
             else
             {
                 rText += GetMetricText( (long)nUpper, eCoreUnit, ePresUnit, pIntl );
-                rText += SVX_RESSTR(GetMetricId(ePresUnit));
+                rText += EE_RESSTR(GetMetricId(ePresUnit));
             }
             rText += cpDelim;
-            rText += SVX_RESSTR(RID_SVXITEMS_ULSPACE_LOWER);
+            rText += EE_RESSTR(RID_SVXITEMS_ULSPACE_LOWER);
             if ( 100 != nPropLower )
                 ( rText += String::CreateFromInt32( nPropLower )) += sal_Unicode('%');
             else
             {
                 rText += GetMetricText( (long)nLower, eCoreUnit, ePresUnit, pIntl );
-                rText += SVX_RESSTR(GetMetricId(ePresUnit));
+                rText += EE_RESSTR(GetMetricId(ePresUnit));
             }
             return SFX_ITEM_PRESENTATION_COMPLETE;
         }
@@ -1093,7 +1091,7 @@ SfxItemPresentation SvxPrintItem::GetPresentation
 
             if ( GetValue() )
                 nId = RID_SVXITEMS_PRINT_TRUE;
-            rText = SVX_RESSTR(nId);
+            rText = EE_RESSTR(nId);
             return ePres;
         }
         default: ;//prevent warning
@@ -1150,7 +1148,7 @@ SfxItemPresentation SvxOpaqueItem::GetPresentation
 
             if ( GetValue() )
                 nId = RID_SVXITEMS_OPAQUE_TRUE;
-            rText = SVX_RESSTR(nId);
+            rText = EE_RESSTR(nId);
             return ePres;
         }
         default: ;//prevent warning
@@ -1241,19 +1239,19 @@ SfxItemPresentation SvxProtectItem::GetPresentation
 
             if ( bCntnt )
                 nId = RID_SVXITEMS_PROT_CONTENT_TRUE;
-            rText = SVX_RESSTR(nId);
+            rText = EE_RESSTR(nId);
             rText += cpDelim;
             nId = RID_SVXITEMS_PROT_SIZE_FALSE;
 
             if ( bSize )
                 nId = RID_SVXITEMS_PROT_SIZE_TRUE;
-            rText += SVX_RESSTR(nId);
+            rText += EE_RESSTR(nId);
             rText += cpDelim;
             nId = RID_SVXITEMS_PROT_POS_FALSE;
 
             if ( bPos )
                 nId = RID_SVXITEMS_PROT_POS_TRUE;
-            rText += SVX_RESSTR(nId);
+            rText += EE_RESSTR(nId);
             return ePres;
         }
         default: ;//prevent warning
@@ -1467,28 +1465,28 @@ SfxItemPresentation SvxShadowItem::GetPresentation
 
             if ( aShadowColor.GetTransparency() )
                 nId = RID_SVXITEMS_TRANSPARENT_TRUE;
-            rText += SVX_RESSTR(nId);
+            rText += EE_RESSTR(nId);
             rText += cpDelim;
             rText += GetMetricText( (long)nWidth, eCoreUnit, ePresUnit, pIntl );
             rText += cpDelim;
-            rText += SVX_RESSTR(RID_SVXITEMS_SHADOW_BEGIN + eLocation);
+            rText += EE_RESSTR(RID_SVXITEMS_SHADOW_BEGIN + eLocation);
             return ePres;
         }
         case SFX_ITEM_PRESENTATION_COMPLETE:
         {
-            rText = SVX_RESSTR(RID_SVXITEMS_SHADOW_COMPLETE);
+            rText = EE_RESSTR(RID_SVXITEMS_SHADOW_COMPLETE);
             rText += ::GetColorString( aShadowColor );
             rText += cpDelim;
 
             sal_uInt16 nId = RID_SVXITEMS_TRANSPARENT_FALSE;
             if ( aShadowColor.GetTransparency() )
                 nId = RID_SVXITEMS_TRANSPARENT_TRUE;
-            rText += SVX_RESSTR(nId);
+            rText += EE_RESSTR(nId);
             rText += cpDelim;
             rText += GetMetricText( (long)nWidth, eCoreUnit, ePresUnit, pIntl );
-            rText += SVX_RESSTR(GetMetricId(ePresUnit));
+            rText += EE_RESSTR(GetMetricId(ePresUnit));
             rText += cpDelim;
-            rText += SVX_RESSTR(RID_SVXITEMS_SHADOW_BEGIN + eLocation);
+            rText += EE_RESSTR(RID_SVXITEMS_SHADOW_BEGIN + eLocation);
             return ePres;
         }
         default: ;//prevent warning
@@ -1553,7 +1551,7 @@ sal_uInt16 SvxShadowItem::GetValueCount() const
 XubString SvxShadowItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
     DBG_ASSERT( nPos < SVX_SHADOW_END, "enum overflow!" );
-    return XubString( SVX_RES( RID_SVXITEMS_SHADOW_BEGIN + nPos ) );
+    return XubString( EditResId( RID_SVXITEMS_SHADOW_BEGIN + nPos ) );
 }
 
 // -----------------------------------------------------------------------
@@ -1687,10 +1685,10 @@ XubString SvxBorderLine::GetValueString( SfxMapUnit eSrcUnit,
     aStr += cpDelim;
 
     if ( nResId )
-        aStr += SVX_RESSTR(nResId);
+        aStr += EE_RESSTR(nResId);
     else
     {
-        String sMetric = SVX_RESSTR(GetMetricId( eDestUnit ));
+        String sMetric = EE_RESSTR(GetMetricId( eDestUnit ));
         aStr += GetMetricText( (long)nInWidth, eSrcUnit, eDestUnit, pIntl );
         if ( bMetricStr )
             aStr += sMetric;
@@ -2181,12 +2179,12 @@ SfxItemPresentation SvxBoxItem::GetPresentation
         {
             if( !(pTop || pBottom || pLeft || pRight) )
             {
-                rText = SVX_RESSTR(RID_SVXITEMS_BORDER_NONE);
+                rText = EE_RESSTR(RID_SVXITEMS_BORDER_NONE);
                 rText += cpDelim;
             }
             else
             {
-                rText = SVX_RESSTR(RID_SVXITEMS_BORDER_COMPLETE);
+                rText = EE_RESSTR(RID_SVXITEMS_BORDER_COMPLETE);
                 if( pTop && pBottom && pLeft && pRight &&
                     *pTop == *pBottom && *pTop == *pLeft && *pTop == *pRight )
                 {
@@ -2197,60 +2195,60 @@ SfxItemPresentation SvxBoxItem::GetPresentation
                 {
                     if ( pTop )
                     {
-                        rText += SVX_RESSTR(RID_SVXITEMS_BORDER_TOP);
+                        rText += EE_RESSTR(RID_SVXITEMS_BORDER_TOP);
                         rText += pTop->GetValueString( eCoreUnit, ePresUnit, pIntl, sal_True );
                         rText += cpDelim;
                     }
                     if ( pBottom )
                     {
-                        rText += SVX_RESSTR(RID_SVXITEMS_BORDER_BOTTOM);
+                        rText += EE_RESSTR(RID_SVXITEMS_BORDER_BOTTOM);
                         rText += pBottom->GetValueString( eCoreUnit, ePresUnit, pIntl, sal_True );
                         rText += cpDelim;
                     }
                     if ( pLeft )
                     {
-                        rText += SVX_RESSTR(RID_SVXITEMS_BORDER_LEFT);
+                        rText += EE_RESSTR(RID_SVXITEMS_BORDER_LEFT);
                         rText += pLeft->GetValueString( eCoreUnit, ePresUnit, pIntl, sal_True );
                         rText += cpDelim;
                     }
                     if ( pRight )
                     {
-                        rText += SVX_RESSTR(RID_SVXITEMS_BORDER_RIGHT);
+                        rText += EE_RESSTR(RID_SVXITEMS_BORDER_RIGHT);
                         rText += pRight->GetValueString( eCoreUnit, ePresUnit, pIntl, sal_True );
                         rText += cpDelim;
                     }
                 }
             }
 
-            rText += SVX_RESSTR(RID_SVXITEMS_BORDER_DISTANCE);
+            rText += EE_RESSTR(RID_SVXITEMS_BORDER_DISTANCE);
             if( nTopDist == nBottomDist && nTopDist == nLeftDist &&
                 nTopDist == nRightDist )
             {
                 rText += GetMetricText( (long)nTopDist, eCoreUnit,
                                             ePresUnit, pIntl );
-                rText += SVX_RESSTR(GetMetricId(ePresUnit));
+                rText += EE_RESSTR(GetMetricId(ePresUnit));
             }
             else
             {
-                (((rText += SVX_RESSTR(RID_SVXITEMS_BORDER_TOP))
+                (((rText += EE_RESSTR(RID_SVXITEMS_BORDER_TOP))
                       += GetMetricText( (long)nTopDist, eCoreUnit,
                                         ePresUnit, pIntl ))
-                      += SVX_RESSTR(GetMetricId(ePresUnit)))
+                      += EE_RESSTR(GetMetricId(ePresUnit)))
                       += cpDelim;
-                (((rText += SVX_RESSTR(RID_SVXITEMS_BORDER_BOTTOM))
+                (((rText += EE_RESSTR(RID_SVXITEMS_BORDER_BOTTOM))
                       += GetMetricText( (long)nBottomDist, eCoreUnit,
                                         ePresUnit, pIntl ))
-                      += SVX_RESSTR(GetMetricId(ePresUnit)))
+                      += EE_RESSTR(GetMetricId(ePresUnit)))
                       += cpDelim;
-                (((rText += SVX_RESSTR(RID_SVXITEMS_BORDER_LEFT))
+                (((rText += EE_RESSTR(RID_SVXITEMS_BORDER_LEFT))
                       += GetMetricText( (long)nLeftDist, eCoreUnit,
                                         ePresUnit, pIntl ))
-                      += SVX_RESSTR(GetMetricId(ePresUnit)))
+                      += EE_RESSTR(GetMetricId(ePresUnit)))
                       += cpDelim;
-                ((rText += SVX_RESSTR(RID_SVXITEMS_BORDER_RIGHT))
+                ((rText += EE_RESSTR(RID_SVXITEMS_BORDER_RIGHT))
                       += GetMetricText( (long)nRightDist, eCoreUnit,
                                         ePresUnit, pIntl ))
-                      += SVX_RESSTR(GetMetricId(ePresUnit));
+                      += EE_RESSTR(GetMetricId(ePresUnit));
             }
             return SFX_ITEM_PRESENTATION_COMPLETE;
         }
@@ -3064,7 +3062,7 @@ SfxItemPresentation SvxFmtBreakItem::GetPresentation
 XubString SvxFmtBreakItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
     DBG_ASSERT( nPos < SVX_BREAK_END, "enum overflow!" );
-    XubString aStr( SVX_RES( RID_SVXITEMS_BREAK_BEGIN + nPos ) );
+    XubString aStr( EditResId( RID_SVXITEMS_BREAK_BEGIN + nPos ) );
     return aStr;
 }
 
@@ -3210,7 +3208,7 @@ SfxItemPresentation SvxFmtKeepItem::GetPresentation
 
             if ( GetValue() )
                 nId = RID_SVXITEMS_FMTKEEP_TRUE;
-            rText = SVX_RESSTR(nId);
+            rText = EE_RESSTR(nId);
             return ePres;
         }
         default: ;//prevent warning
@@ -3909,11 +3907,11 @@ SfxItemPresentation SvxBrushItem::GetPresentation
 
                 if ( aColor.GetTransparency() )
                     nId = RID_SVXITEMS_TRANSPARENT_TRUE;
-                rText += SVX_RESSTR(nId);
+                rText += EE_RESSTR(nId);
             }
             else
             {
-                rText = SVX_RESSTR(RID_SVXITEMS_GRAPHIC);
+                rText = EE_RESSTR(RID_SVXITEMS_GRAPHIC);
             }
 
             return ePres;
@@ -4064,8 +4062,6 @@ void SvxBrushItem::PurgeMedium() const
 }
 
 // -----------------------------------------------------------------------
-GraphicFilter* GetGrfFilter();
-
 const GraphicObject* SvxBrushItem::GetGraphicObject() const
 {
     if ( bLoadAgain && pStrLink && !pImpl->pGraphicObject )
@@ -4095,7 +4091,7 @@ const GraphicObject* SvxBrushItem::GetGraphicObject() const
                 Graphic aGraphic;
                 int	nRes;
                 pImpl->pStream->Seek( STREAM_SEEK_TO_BEGIN );
-                nRes = GetGrfFilter()->
+                nRes = GraphicFilter::GetGraphicFilter()->
                     ImportGraphic( aGraphic, *pStrLink, *pImpl->pStream,
                                    GRFILTER_FORMAT_DONTKNOW, NULL, GRFILTER_I_FLAGS_DONT_SET_LOGSIZE_FOR_JPEG );
 
@@ -4392,7 +4388,7 @@ SfxItemPresentation SvxFrameDirectionItem::GetPresentation(
 
     case SFX_ITEM_PRESENTATION_NAMELESS:
     case SFX_ITEM_PRESENTATION_COMPLETE:
-        rText = SVX_RESSTR( RID_SVXITEMS_FRMDIR_BEGIN + GetValue() );
+        rText = EE_RESSTR( RID_SVXITEMS_FRMDIR_BEGIN + GetValue() );
         break;
 
     default:
diff --git a/svx/source/items/itemtype.cxx b/editeng/source/items/itemtype.cxx
index 1137a880eb..321961f402 100644
--- a/svx/source/items/itemtype.cxx
+++ b/editeng/source/items/itemtype.cxx
@@ -29,15 +29,16 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 // include ---------------------------------------------------------------
 #include <tools/list.hxx>
 #include <vcl/outdev.hxx>
-#include <svx/svxids.hrc>
+#include <editeng/editrids.hrc>
 #include <unotools/intlwrapper.hxx>
 #include <unotools/localedatawrapper.hxx>
-#include <svx/itemtype.hxx>
+#include <editeng/itemtype.hxx>
+#include <editeng/eerdll.hxx>
 
 // -----------------------------------------------------------------------
 
@@ -146,7 +147,7 @@ XubString GetMetricText( long nVal, SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit, c
 
 XubString GetSvxString( sal_uInt16 nId )
 {
-    return SVX_RESSTR( nId );
+    return EE_RESSTR( nId );
 }
 
 #ifndef SVX_LIGHT
@@ -177,7 +178,7 @@ XubString GetColorString( const Color& rCol )
     }
 
     if ( nColor < nColCount )
-        sStr = SVX_RESSTR( RID_SVXITEMS_COLOR_BEGIN + nColor + 1 );
+        sStr = EE_RESSTR( RID_SVXITEMS_COLOR_BEGIN + nColor + 1 );
 
     if ( !sStr.Len() )
     {
diff --git a/editeng/source/items/makefile.mk b/editeng/source/items/makefile.mk
new file mode 100644
index 0000000000..3b7412f213
--- /dev/null
+++ b/editeng/source/items/makefile.mk
@@ -0,0 +1,78 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.19 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..
+
+#PROJECTPCH4DLL=TRUE
+#PROJECTPCH=svxpch
+#PROJECTPCHSOURCE=$(PRJ)$/util$/svxpch
+#ENABLE_EXCEPTIONS=TRUE
+
+PRJNAME=editeng
+TARGET=items
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+
+# --- Files --------------------------------------------------------
+
+SRS1NAME=items
+SRC1FILES =  \
+        page.src \
+        svxitems.src
+
+SLOFILES= \
+        $(SLO)$/svdfield.obj \
+        $(SLO)$/writingmodeitem.obj \
+        $(SLO)$/frmitems.obj \
+        $(SLO)$/paraitem.obj \
+        $(SLO)$/textitem.obj \
+        $(SLO)$/flditem.obj \
+        $(SLO)$/svxfont.obj \
+        $(SLO)$/paperinf.obj    \
+        $(SLO)$/itemtype.obj	\
+        $(SLO)$/bulitem.obj \
+        $(SLO)$/numitem.obj \
+        $(SLO)$/xmlcnitm.obj \
+        $(SLO)$/charhiddenitem.obj
+
+EXCEPTIONSFILES= \
+        $(SLO)$/svdfield.obj \
+        $(SLO)$/paraitem.obj \
+        $(SLO)$/frmitems.obj \
+        $(SLO)$/numitem.obj\
+        $(SLO)$/xmlcnitm.obj\
+        $(SLO)$/flditem.obj
+
+.INCLUDE :	target.mk
+
diff --git a/svx/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index a77a49c5ed..0a35e0d6d8 100644
--- a/svx/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -29,25 +29,22 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
-#include <svx/numitem.hxx>
+#include <editeng/numitem.hxx>
 
 #include <com/sun/star/text/HoriOrientation.hpp>
 #include <com/sun/star/text/VertOrientation.hpp>
 #include <com/sun/star/text/RelOrientation.hpp>
-#include <svx/brshitem.hxx>
+#include <editeng/brshitem.hxx>
 #include <vcl/font.hxx>
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-#ifndef _SVX_NUMDEF_HXX
-#include <svx/numdef.hxx>
-#endif
+#include <editeng/editids.hrc>
+#include <editeng/editrids.hrc>
+#include <editeng/numdef.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/window.hxx>
 #include <vcl/svapp.hxx>
-#include <unolingu.hxx>
+#include <editeng/unolingu.hxx>
 #include <com/sun/star/text/XNumberingFormatter.hpp>
 #include <com/sun/star/text/XDefaultNumberingProvider.hpp>
 #include <com/sun/star/style/NumberingType.hpp>
@@ -55,7 +52,7 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <comphelper/processfactory.hxx>
 
-#include "unonrule.hxx"
+#include <editeng/unonrule.hxx>
 
 #define MM100_TO_TWIP(MM100)	((MM100*72L+63L)/127L)
 
diff --git a/svx/source/items/page.src b/editeng/source/items/page.src
index 966d5e66e3..2e0b86f5d8 100644
--- a/svx/source/items/page.src
+++ b/editeng/source/items/page.src
@@ -30,7 +30,7 @@
 
  // include ---------------------------------------------------------------
 
-#include <svx/dialogs.hrc>
+#include <editeng/editrids.hrc>
 
 String RID_SVXSTR_PAPER_A0
 {
diff --git a/svx/source/items/paperinf.cxx b/editeng/source/items/paperinf.cxx
index 7a67a0009f..4992a25a9b 100644
--- a/svx/source/items/paperinf.cxx
+++ b/editeng/source/items/paperinf.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 // include ---------------------------------------------------------------
 
@@ -37,12 +37,9 @@
 #include <tools/shl.hxx>
 #include <tools/debug.hxx>
 #include <vcl/svapp.hxx>
-
-#ifndef _SVX_DIALOGS_HRC
-#include <svx/dialogs.hrc>
-#endif
-#include <svx/paperinf.hxx>
-#include <svx/dialmgr.hxx>
+#include <editeng/editrids.hrc>
+#include <editeng/paperinf.hxx>
+#include <editeng/eerdll.hxx>
 
 /*--------------------------------------------------------------------
     Beschreibung:	Ist der Printer gueltig
@@ -185,7 +182,7 @@ String SvxPaperInfo::GetName( Paper ePaper )
         default: DBG_ERRORFILE( "unknown papersize" );
     }
 
-    return ( nResId > 0 ) ? String( SVX_RES( nResId ) ) : String();
+    return ( nResId > 0 ) ? String( EditResId( nResId ) ) : String();
 }
 
 
diff --git a/svx/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index 5fc1e51908..1f62a43fae 100644
--- a/svx/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -29,18 +29,15 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 // include ---------------------------------------------------------------
 #include <com/sun/star/style/TabStop.hpp>
 #include <com/sun/star/style/LineSpacing.hpp>
 #include <com/sun/star/style/LineSpacingMode.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX
 #include <comphelper/processfactory.hxx>
-#endif
 #include <unotools/syslocale.hxx>
-
 #include <comphelper/types.hxx>
 
 using namespace ::rtl;
@@ -54,32 +51,28 @@ using namespace ::com::sun::star;
 #include <svl/itempool.hxx>
 
 #include <svl/memberid.hrc>
-#include <svx/svxitems.hrc>
-
-#include <svx/lspcitem.hxx>
-#include <svx/adjitem.hxx>
-#include <svx/orphitem.hxx>
-#include <svx/widwitem.hxx>
-#include <svx/tstpitem.hxx>
-#include <svx/pmdlitem.hxx>
-#include <svx/spltitem.hxx>
-#include <svx/hyznitem.hxx>
-#include <svx/scriptspaceitem.hxx>
-#include <svx/hngpnctitem.hxx>
-#include <svx/forbiddenruleitem.hxx>
-#include <svx/paravertalignitem.hxx>
-#include "pgrditem.hxx"
-
-
+#include <editeng/editrids.hrc>
+
+#include <editeng/lspcitem.hxx>
+#include <editeng/adjitem.hxx>
+#include <editeng/orphitem.hxx>
+#include <editeng/widwitem.hxx>
+#include <editeng/tstpitem.hxx>
+#include <editeng/pmdlitem.hxx>
+#include <editeng/spltitem.hxx>
+#include <editeng/hyznitem.hxx>
+#include <editeng/scriptspaceitem.hxx>
+#include <editeng/hngpnctitem.hxx>
+#include <editeng/forbiddenruleitem.hxx>
+#include <editeng/paravertalignitem.hxx>
+#include <editeng/pgrditem.hxx>
 #include <rtl/ustring.hxx>
-
-#include <svx/unomid.hxx>
-
-#include <svx/itemtype.hxx>
-#include <svx/dialmgr.hxx>
-#include <svx/paperinf.hxx>
+#include <editeng/memberids.hrc>
+#include <editeng/editids.hrc>
+#include <editeng/itemtype.hxx>
+#include <editeng/eerdll.hxx>
+#include <editeng/paperinf.hxx>
 #include <vcl/svapp.hxx>
-
 #include <algorithm>
 
 using namespace ::rtl;
@@ -502,7 +495,7 @@ sal_uInt16 SvxAdjustItem::GetValueCount() const
 XubString SvxAdjustItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
     DBG_ASSERT( nPos <= (sal_uInt16)SVX_ADJUST_BLOCKLINE, "enum overflow!" );
-    return SVX_RESSTR(RID_SVXITEMS_ADJUST_BEGIN + nPos);
+    return EE_RESSTR(RID_SVXITEMS_ADJUST_BEGIN + nPos);
 }
 
 // -----------------------------------------------------------------------
@@ -615,15 +608,15 @@ SfxItemPresentation SvxWidowsItem::GetPresentation
 
         case SFX_ITEM_PRESENTATION_NAMELESS:
         {
-            rText = SVX_RESSTR(RID_SVXITEMS_LINES);
+            rText = EE_RESSTR(RID_SVXITEMS_LINES);
             break;
         }
 
         case SFX_ITEM_PRESENTATION_COMPLETE:
         {
-            rText = SVX_RESSTR(RID_SVXITEMS_WIDOWS_COMPLETE);
+            rText = EE_RESSTR(RID_SVXITEMS_WIDOWS_COMPLETE);
             rText += ' ';
-            rText += SVX_RESSTR(RID_SVXITEMS_LINES);
+            rText += EE_RESSTR(RID_SVXITEMS_LINES);
         }
         
         default:
@@ -687,15 +680,15 @@ SfxItemPresentation SvxOrphansItem::GetPresentation
 
         case SFX_ITEM_PRESENTATION_NAMELESS:
         {
-            rText = SVX_RESSTR(RID_SVXITEMS_LINES);
+            rText = EE_RESSTR(RID_SVXITEMS_LINES);
             break;
         }
 
         case SFX_ITEM_PRESENTATION_COMPLETE:
         {
-            rText = SVX_RESSTR(RID_SVXITEMS_ORPHANS_COMPLETE);
+            rText = EE_RESSTR(RID_SVXITEMS_ORPHANS_COMPLETE);
             rText += ' ';
-            rText += SVX_RESSTR(RID_SVXITEMS_LINES);
+            rText += EE_RESSTR(RID_SVXITEMS_LINES);
         }
         
         default:
@@ -811,13 +804,13 @@ SfxItemPresentation SvxHyphenZoneItem::GetPresentation
 
             if ( bHyphen )
                 nId = RID_SVXITEMS_HYPHEN_TRUE;
-            rText = SVX_RESSTR(nId);
+            rText = EE_RESSTR(nId);
             rText += cpDelim;
             nId = RID_SVXITEMS_PAGE_END_FALSE;
 
             if ( bPageEnd )
                 nId = RID_SVXITEMS_PAGE_END_TRUE;
-            rText += SVX_RESSTR(nId);
+            rText += EE_RESSTR(nId);
             rText += cpDelim;
             rText += String::CreateFromInt32( nMinLead );
             rText += cpDelim;
@@ -832,22 +825,22 @@ SfxItemPresentation SvxHyphenZoneItem::GetPresentation
 
             if ( bHyphen )
                 nId = RID_SVXITEMS_HYPHEN_TRUE;
-            rText = SVX_RESSTR(nId);
+            rText = EE_RESSTR(nId);
             rText += cpDelim;
             nId = RID_SVXITEMS_PAGE_END_FALSE;
 
             if ( bPageEnd )
                 nId = RID_SVXITEMS_PAGE_END_TRUE;
-            rText += SVX_RESSTR(nId);
+            rText += EE_RESSTR(nId);
             rText += cpDelim;
             rText += String::CreateFromInt32(nMinLead);
-            rText += SVX_RESSTR(RID_SVXITEMS_HYPHEN_MINLEAD);
+            rText += EE_RESSTR(RID_SVXITEMS_HYPHEN_MINLEAD);
             rText += cpDelim;
             rText += String::CreateFromInt32(nMinTrail);
-            rText += SVX_RESSTR(RID_SVXITEMS_HYPHEN_MINTRAIL);
+            rText += EE_RESSTR(RID_SVXITEMS_HYPHEN_MINTRAIL);
             rText += cpDelim;
             rText += String::CreateFromInt32(nMaxHyphens);
-            rText += SVX_RESSTR(RID_SVXITEMS_HYPHEN_MAX);
+            rText += EE_RESSTR(RID_SVXITEMS_HYPHEN_MAX);
             return SFX_ITEM_PRESENTATION_COMPLETE;
         }
         default: ;//prevent warning
@@ -918,17 +911,17 @@ XubString SvxTabStop::GetValueString() const
     aStr += sal_Unicode( '(' );
     aStr += UniString::CreateFromInt32(nTabPos);
     aStr += cpDelim;
-    aStr += XubString( ResId( RID_SVXITEMS_TAB_ADJUST_BEGIN + (sal_uInt16)eAdjustment, DIALOG_MGR() ) );
+    aStr += XubString( EditResId( RID_SVXITEMS_TAB_ADJUST_BEGIN + (sal_uInt16)eAdjustment ) );
 
     aStr += cpDelim;
     aStr += sal_Unicode('[');
-    aStr += XubString( ResId( RID_SVXITEMS_TAB_DECIMAL_CHAR, DIALOG_MGR() ) );
+    aStr += XubString( EditResId( RID_SVXITEMS_TAB_DECIMAL_CHAR ) );
     aStr += GetDecimal();
     aStr += sal_Unicode(']');
     aStr += cpDelim;
     aStr += cpDelim;
     aStr += sal_Unicode('[');
-    aStr += XubString( ResId( RID_SVXITEMS_TAB_FILL_CHAR, DIALOG_MGR() ) );
+    aStr += XubString( EditResId( RID_SVXITEMS_TAB_FILL_CHAR ) );
     aStr += cFill;
     aStr += sal_Unicode(']');
     aStr += sal_Unicode(')');
@@ -1211,7 +1204,7 @@ SfxItemPresentation SvxTabStopItem::GetPresentation
                 rText += GetMetricText(
                     (long)((*this)[i]).GetTabPos(), eCoreUnit, ePresUnit, pIntl );
                 if ( SFX_ITEM_PRESENTATION_COMPLETE == ePres )
-                    rText += SVX_RESSTR(GetMetricId(ePresUnit));
+                    rText += EE_RESSTR(GetMetricId(ePresUnit));
                 bComma = sal_True;
             }
         }
@@ -1374,7 +1367,7 @@ SfxItemPresentation SvxFmtSplitItem::GetPresentation
 
             if ( GetValue() )
                 nId = RID_SVXITEMS_FMTSPLIT_TRUE;
-            rText = SVX_RESSTR(nId);
+            rText = EE_RESSTR(nId);
             return ePres;
         }
         default: ;//prevent warning
@@ -1446,7 +1439,7 @@ SfxItemPresentation SvxPageModelItem::GetPresentation
         case SFX_ITEM_PRESENTATION_COMPLETE:
             if ( bSet )
             {
-                rText = SVX_RESSTR(RID_SVXITEMS_PAGEMODEL_COMPLETE);
+                rText = EE_RESSTR(RID_SVXITEMS_PAGEMODEL_COMPLETE);
                 rText += GetValue();
             }
             return SFX_ITEM_PRESENTATION_COMPLETE;
@@ -1497,7 +1490,7 @@ SfxItemPresentation SvxScriptSpaceItem::GetPresentation(
     case SFX_ITEM_PRESENTATION_NAMELESS:
     case SFX_ITEM_PRESENTATION_COMPLETE:
         {
-            rText = SVX_RESSTR( !GetValue()
+            rText = EE_RESSTR( !GetValue()
                                     ? RID_SVXITEMS_SCRPTSPC_OFF
                                     : RID_SVXITEMS_SCRPTSPC_ON );
             return ePres;
@@ -1550,7 +1543,7 @@ SfxItemPresentation SvxHangingPunctuationItem::GetPresentation(
         case SFX_ITEM_PRESENTATION_NAMELESS:
         case SFX_ITEM_PRESENTATION_COMPLETE:
             {
-                rText = SVX_RESSTR( !GetValue()
+                rText = EE_RESSTR( !GetValue()
                                         ? RID_SVXITEMS_HNGPNCT_OFF
                                         : RID_SVXITEMS_HNGPNCT_ON );
                 return ePres;
@@ -1611,7 +1604,7 @@ SfxItemPresentation SvxForbiddenRuleItem::GetPresentation(
         case SFX_ITEM_PRESENTATION_NAMELESS:
         case SFX_ITEM_PRESENTATION_COMPLETE:
             {
-                rText = SVX_RESSTR( !GetValue()
+                rText = EE_RESSTR( !GetValue()
                                         ? RID_SVXITEMS_FORBIDDEN_RULE_OFF
                                         : RID_SVXITEMS_FORBIDDEN_RULE_ON );
                 return ePres;
@@ -1677,7 +1670,7 @@ SfxItemPresentation SvxParaVertAlignItem::GetPresentation(
                     case BOTTOM:    nTmp = RID_SVXITEMS_PARAVERTALIGN_BOTTOM; break;
                     default:    nTmp = RID_SVXITEMS_PARAVERTALIGN_BASELINE; break;
                 }
-                rText = SVX_RESSTR( nTmp );
+                rText = EE_RESSTR( nTmp );
                 return ePres;
             }
         default: ;//prevent warning
@@ -1754,8 +1747,8 @@ SfxItemPresentation SvxParaGridItem::GetPresentation(
         case SFX_ITEM_PRESENTATION_COMPLETE:
             {
                 rText = GetValue() ?
-                        SVX_RESSTR( RID_SVXITEMS_PARASNAPTOGRID_ON ) :
-                        SVX_RESSTR( RID_SVXITEMS_PARASNAPTOGRID_OFF );
+                        EE_RESSTR( RID_SVXITEMS_PARASNAPTOGRID_ON ) :
+                        EE_RESSTR( RID_SVXITEMS_PARASNAPTOGRID_OFF );
 
                 return ePres;
             }
diff --git a/svx/source/svdraw/svdfield.cxx b/editeng/source/items/svdfield.cxx
index 617b80dbef..1244e012d3 100644
--- a/svx/source/svdraw/svdfield.cxx
+++ b/editeng/source/items/svdfield.cxx
@@ -29,9 +29,9 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
-#include <svx/svdfield.hxx>
+#include <editeng/svdfield.hxx>
 
 SV_IMPL_PERSIST1(SdrMeasureField,SvxFieldData);
 
diff --git a/svx/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx
index 98c911c8a8..ea25be1c48 100644
--- a/svx/source/items/svxfont.cxx
+++ b/editeng/source/items/svxfont.cxx
@@ -29,25 +29,21 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 // include ----------------------------------------------------------------
 
-#ifndef _OUTDEV_HXX //autogen
 #include <vcl/outdev.hxx>
-#endif
-#ifndef _PRINT_HXX //autogen
 #include <vcl/print.hxx>
-#endif
 #include <tools/poly.hxx>
 #include <unotools/charclass.hxx>
-#include <unolingu.hxx>
+#include <editeng/unolingu.hxx>
 #include <com/sun/star/i18n/KCharacterType.hpp>
 
 #define _SVX_SVXFONT_CXX
 
-#include <svx/svxfont.hxx>
-#include <svx/escpitem.hxx>
+#include <editeng/svxfont.hxx>
+#include <editeng/escpitem.hxx>
 
 // Minimum: Prozentwert fuers kernen
 #define MINKERNPERCENT 5
diff --git a/editeng/source/items/svxitems.src b/editeng/source/items/svxitems.src
new file mode 100644
index 0000000000..3b50d35d5d
--- /dev/null
+++ b/editeng/source/items/svxitems.src
@@ -0,0 +1,1027 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: svxitems.src,v $
+ * $Revision: 1.83.212.1 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+ // include ------------------------------------------------------------------
+#include <editeng/editrids.hrc>
+ // pragma -------------------------------------------------------------------
+
+ // Value-Strings ------------------------------------------------------------
+String RID_SVXITEMS_TRUE
+{
+    Text [ en-US ] = "True" ;
+};
+String RID_SVXITEMS_FALSE
+{
+    Text [ en-US ] = "False" ;
+};
+ // enum SvxBreak ------------------------------------------------------------
+String RID_SVXITEMS_BREAK_NONE
+{
+    Text [ en-US ] = "No break" ;
+};
+String RID_SVXITEMS_BREAK_COLUMN_BEFORE
+{
+    Text [ en-US ] = "Break before new column" ;
+};
+String RID_SVXITEMS_BREAK_COLUMN_AFTER
+{
+    Text [ en-US ] = "Break after new column" ;
+};
+String RID_SVXITEMS_BREAK_COLUMN_BOTH
+{
+    Text [ en-US ] = "Break before and after new column" ;
+};
+String RID_SVXITEMS_BREAK_PAGE_BEFORE
+{
+    Text [ en-US ] = "Break before new page" ;
+};
+String RID_SVXITEMS_BREAK_PAGE_AFTER
+{
+    Text [ en-US ] = "Break after new page" ;
+};
+String RID_SVXITEMS_BREAK_PAGE_BOTH
+{
+    Text [ en-US ] = "Break before and after new page" ;
+};
+ // enum SvxShadowLocation ---------------------------------------------------
+String RID_SVXITEMS_SHADOW_NONE
+{
+    Text [ en-US ] = "No Shadow" ;
+};
+String RID_SVXITEMS_SHADOW_TOPLEFT
+{
+    Text [ en-US ] = "Shadow top left" ;
+};
+String RID_SVXITEMS_SHADOW_TOPRIGHT
+{
+    Text [ en-US ] = "Shadow top right" ;
+};
+String RID_SVXITEMS_SHADOW_BOTTOMLEFT
+{
+    Text [ en-US ] = "Shadow bottom left" ;
+};
+String RID_SVXITEMS_SHADOW_BOTTOMRIGHT
+{
+    Text [ en-US ] = "Shadow bottom right" ;
+};
+ // enum ColorName -----------------------------------------------------------
+String RID_SVXITEMS_COLOR
+{
+    Text [ en-US ] = "Color " ;
+};
+String RID_SVXITEMS_COLOR_BLACK
+{
+    Text [ en-US ] = "Black" ;
+};
+String RID_SVXITEMS_COLOR_BLUE
+{
+    Text [ en-US ] = "Blue" ;
+};
+String RID_SVXITEMS_COLOR_GREEN
+{
+    Text [ en-US ] = "Green" ;
+};
+String RID_SVXITEMS_COLOR_CYAN
+{
+    Text [ en-US ] = "Cyan" ;
+};
+String RID_SVXITEMS_COLOR_RED
+{
+    Text [ en-US ] = "Red" ;
+};
+String RID_SVXITEMS_COLOR_MAGENTA
+{
+    Text [ en-US ] = "Magenta" ;
+};
+String RID_SVXITEMS_COLOR_BROWN
+{
+    Text [ en-US ] = "Brown" ;
+};
+String RID_SVXITEMS_COLOR_GRAY
+{
+    Text [ en-US ] = "Gray" ;
+};
+String RID_SVXITEMS_COLOR_LIGHTGRAY
+{
+    Text [ en-US ] = "Light Gray" ;
+};
+String RID_SVXITEMS_COLOR_LIGHTBLUE
+{
+    Text [ en-US ] = "Light Blue" ;
+};
+String RID_SVXITEMS_COLOR_LIGHTGREEN
+{
+    Text [ en-US ] = "Light Green" ;
+};
+String RID_SVXITEMS_COLOR_LIGHTCYAN
+{
+    Text [ en-US ] = "Light Cyan" ;
+};
+String RID_SVXITEMS_COLOR_LIGHTRED
+{
+    Text [ en-US ] = "Light Red" ;
+};
+String RID_SVXITEMS_COLOR_LIGHTMAGENTA
+{
+    Text [ en-US ] = "Light Magenta" ;
+};
+String RID_SVXITEMS_COLOR_YELLOW
+{
+    Text [ en-US ] = "Yellow" ;
+};
+String RID_SVXITEMS_COLOR_WHITE
+{
+    Text [ en-US ] = "White" ;
+};
+String RID_SVXITEMS_COLOR_MENUBAR
+{
+    Text = "?" ;
+};
+String RID_SVXITEMS_COLOR_MENUBARTEXT
+{
+    Text = "?" ;
+};
+String RID_SVXITEMS_COLOR_POPUPMENU
+{
+    Text = "?" ;
+};
+String RID_SVXITEMS_COLOR_POPUPMENUTEXT
+{
+    Text = "?" ;
+};
+String RID_SVXITEMS_COLOR_WINDOWTEXT
+{
+    Text = "?" ;
+};
+String RID_SVXITEMS_COLOR_WINDOWWORKSPACE
+{
+    Text = "?" ;
+};
+String RID_SVXITEMS_COLOR_HIGHLIGHT
+{
+    Text = "?" ;
+};
+String RID_SVXITEMS_COLOR_HIGHLIGHTTEXT
+{
+    Text = "?" ;
+};
+String RID_SVXITEMS_COLOR_3DTEXT
+{
+    Text = "?" ;
+};
+String RID_SVXITEMS_COLOR_3DFACE
+{
+    Text = "?" ;
+};
+String RID_SVXITEMS_COLOR_3DLIGHT
+{
+    Text = "?" ;
+};
+String RID_SVXITEMS_COLOR_3DSHADOW
+{
+    Text = "?" ;
+};
+String RID_SVXITEMS_COLOR_SCROLLBAR
+{
+    Text = "?" ;
+};
+String RID_SVXITEMS_COLOR_FIELD
+{
+    Text = "?" ;
+};
+String RID_SVXITEMS_COLOR_FIELDTEXT
+{
+    Text = "?" ;
+};
+ // enum FontItalic -------------------------------------------------------
+String RID_SVXITEMS_ITALIC_NONE
+{
+    Text [ en-US ] = "Not Italic" ;
+};
+String RID_SVXITEMS_ITALIC_OBLIQUE
+{
+    Text [ en-US ] = "Oblique italic" ;
+};
+String RID_SVXITEMS_ITALIC_NORMAL
+{
+    Text [ en-US ] = "Italic" ;
+};
+ // enum FontWeight -------------------------------------------------------
+String RID_SVXITEMS_WEIGHT_DONTKNOW
+{
+    Text = "?" ;
+};
+String RID_SVXITEMS_WEIGHT_THIN
+{
+    Text [ en-US ] = "thin" ;
+};
+String RID_SVXITEMS_WEIGHT_ULTRALIGHT
+{
+    Text [ en-US ] = "ultra thin" ;
+};
+String RID_SVXITEMS_WEIGHT_LIGHT
+{
+    Text [ en-US ] = "light" ;
+};
+String RID_SVXITEMS_WEIGHT_SEMILIGHT
+{
+    Text [ en-US ] = "semi light" ;
+};
+String RID_SVXITEMS_WEIGHT_NORMAL
+{
+    Text [ en-US ] = "normal" ;
+};
+String RID_SVXITEMS_WEIGHT_MEDIUM
+{
+    Text [ en-US ] = "medium" ;
+};
+String RID_SVXITEMS_WEIGHT_SEMIBOLD
+{
+    Text [ en-US ] = "semi bold" ;
+};
+String RID_SVXITEMS_WEIGHT_BOLD
+{
+    Text [ en-US ] = "bold" ;
+};
+String RID_SVXITEMS_WEIGHT_ULTRABOLD
+{
+    Text [ en-US ] = "ultra bold" ;
+};
+String RID_SVXITEMS_WEIGHT_BLACK
+{
+    Text [ en-US ] = "black" ;
+};
+ // enum FontUnderline - used for underline ------------------------------
+String RID_SVXITEMS_UL_NONE
+{
+    Text [ en-US ] = "No underline" ;
+};
+String RID_SVXITEMS_UL_SINGLE
+{
+    Text [ en-US ] = "Single underline" ;
+};
+String RID_SVXITEMS_UL_DOUBLE
+{
+    Text [ en-US ] = "Double underline" ;
+};
+String RID_SVXITEMS_UL_DOTTED
+{
+    Text [ en-US ] = "Dotted underline" ;
+};
+String RID_SVXITEMS_UL_DONTKNOW
+{
+    Text [ en-US ] = "Underline";
+};
+String RID_SVXITEMS_UL_DASH
+{
+    Text [ en-US ] = "Underline (dashes)";
+};
+String RID_SVXITEMS_UL_LONGDASH
+{
+    Text [ en-US ] = "Underline (long dashes)";
+};
+String RID_SVXITEMS_UL_DASHDOT
+{
+    Text [ en-US ] = "Underline (dot dash)";
+};
+String RID_SVXITEMS_UL_DASHDOTDOT
+{
+    Text [ en-US ] = "Underline (dot dot dash)";
+};
+String RID_SVXITEMS_UL_SMALLWAVE
+{
+    Text [ en-US ] = "Underline (small wave)";
+};
+String RID_SVXITEMS_UL_WAVE
+{
+    Text [ en-US ] = "Underline (Wave)";
+};
+String RID_SVXITEMS_UL_DOUBLEWAVE
+{
+    Text [ en-US ] = "Underline (Double wave)";
+};
+String RID_SVXITEMS_UL_BOLD
+{
+    Text [ en-US ] = "Underlined (Bold)";
+};
+String RID_SVXITEMS_UL_BOLDDOTTED
+{
+    Text [ en-US ] = "Dotted underline (Bold)";
+};
+String RID_SVXITEMS_UL_BOLDDASH
+{
+    Text [ en-US ] = "Underline (Dash bold)";
+};
+String RID_SVXITEMS_UL_BOLDLONGDASH
+{
+    Text [ en-US ] = "Underline (long dash, bold)";
+};
+String RID_SVXITEMS_UL_BOLDDASHDOT
+{
+    Text [ en-US ] = "Underline (dot dash, bold)";
+};
+String RID_SVXITEMS_UL_BOLDDASHDOTDOT
+{
+    Text [ en-US ] = "Underline (dot dot dash, bold)";
+};
+String RID_SVXITEMS_UL_BOLDWAVE
+{
+    Text [ en-US ] = "Underline (wave, bold)";
+};
+ // enum FontUnderline - used for overline -------------------------------
+String RID_SVXITEMS_OL_NONE
+{
+    Text [ en-US ] = "No overline" ;
+};
+String RID_SVXITEMS_OL_SINGLE
+{
+    Text [ en-US ] = "Single overline" ;
+};
+String RID_SVXITEMS_OL_DOUBLE
+{
+    Text [ en-US ] = "Double overline" ;
+};
+String RID_SVXITEMS_OL_DOTTED
+{
+    Text [ en-US ] = "Dotted overline" ;
+};
+String RID_SVXITEMS_OL_DONTKNOW
+{
+    Text [ en-US ] = "Overline";
+};
+String RID_SVXITEMS_OL_DASH
+{
+    Text [ en-US ] = "Overline (dashes)";
+};
+String RID_SVXITEMS_OL_LONGDASH
+{
+    Text [ en-US ] = "Overline (long dashes)";
+};
+String RID_SVXITEMS_OL_DASHDOT
+{
+    Text [ en-US ] = "Overline (dot dash)";
+};
+String RID_SVXITEMS_OL_DASHDOTDOT
+{
+    Text [ en-US ] = "Overline (dot dot dash)";
+};
+String RID_SVXITEMS_OL_SMALLWAVE
+{
+    Text [ en-US ] = "Overline (small wave)";
+};
+String RID_SVXITEMS_OL_WAVE
+{
+    Text [ en-US ] = "Overline (Wave)";
+};
+String RID_SVXITEMS_OL_DOUBLEWAVE
+{
+    Text [ en-US ] = "Overline (Double wave)";
+};
+String RID_SVXITEMS_OL_BOLD
+{
+    Text [ en-US ] = "Overlined (Bold)";
+};
+String RID_SVXITEMS_OL_BOLDDOTTED
+{
+    Text [ en-US ] = "Dotted overline (Bold)";
+};
+String RID_SVXITEMS_OL_BOLDDASH
+{
+    Text [ en-US ] = "Overline (Dash bold)";
+};
+String RID_SVXITEMS_OL_BOLDLONGDASH
+{
+    Text [ en-US ] = "Overline (long dash, bold)";
+};
+String RID_SVXITEMS_OL_BOLDDASHDOT
+{
+    Text [ en-US ] = "Overline (dot dash, bold)";
+};
+String RID_SVXITEMS_OL_BOLDDASHDOTDOT
+{
+    Text [ en-US ] = "Overline (dot dot dash, bold)";
+};
+String RID_SVXITEMS_OL_BOLDWAVE
+{
+    Text [ en-US ] = "Overline (wave, bold)";
+};
+ // enum FontStrikeout ----------------------------------------------------
+String RID_SVXITEMS_STRIKEOUT_NONE
+{
+    Text [ en-US ] = "No strikethrough" ;
+};
+String RID_SVXITEMS_STRIKEOUT_SINGLE
+{
+    Text [ en-US ] = "Single strikethrough" ;
+};
+String RID_SVXITEMS_STRIKEOUT_DOUBLE
+{
+    Text [ en-US ] = "Double strikethrough" ;
+};
+String RID_SVXITEMS_STRIKEOUT_BOLD
+{
+    Text [ en-US ] = "Bold strikethrough";
+};
+String RID_SVXITEMS_STRIKEOUT_SLASH
+{
+    Text [ en-US ] = "Strike through with slash";
+};
+String RID_SVXITEMS_STRIKEOUT_X
+{
+    Text [ en-US ] = "Strike through with Xes";
+};
+ // enum CASEMAP ----------------------------------------------------------
+String RID_SVXITEMS_CASEMAP_NONE
+{
+    Text [ en-US ] = "None" ;
+};
+String RID_SVXITEMS_CASEMAP_VERSALIEN
+{
+    Text [ en-US ] = "Caps" ;
+};
+String RID_SVXITEMS_CASEMAP_GEMEINE
+{
+    Text [ en-US ] = "Lowercase" ;
+};
+String RID_SVXITEMS_CASEMAP_TITEL
+{
+    Text [ en-US ] = "Title" ;
+};
+String RID_SVXITEMS_CASEMAP_KAPITAELCHEN
+{
+    Text [ en-US ] = "Small caps" ;
+};
+ // enum ESCAPEMENT -------------------------------------------------------
+String RID_SVXITEMS_ESCAPEMENT_OFF
+{
+    Text [ en-US ] = "Normal position" ;
+};
+String RID_SVXITEMS_ESCAPEMENT_SUPER
+{
+    Text [ en-US ] = "Superscript " ;
+};
+String RID_SVXITEMS_ESCAPEMENT_SUB
+{
+    Text [ en-US ] = "Subscript " ;
+};
+String RID_SVXITEMS_ESCAPEMENT_AUTO
+{
+    Text [ en-US ] = "automatic" ;
+};
+ // enum SvxAdjust -----------------------------------------------------------
+String RID_SVXITEMS_ADJUST_LEFT
+{
+    Text [ en-US ] = "Align left" ;
+};
+String RID_SVXITEMS_ADJUST_RIGHT
+{
+    Text [ en-US ] = "Align right" ;
+};
+String RID_SVXITEMS_ADJUST_BLOCK
+{
+    Text [ en-US ] = "Justify" ;
+};
+String RID_SVXITEMS_ADJUST_CENTER
+{
+    Text [ en-US ] = "Centered" ;
+};
+String RID_SVXITEMS_ADJUST_BLOCKLINE
+{
+    Text [ en-US ] = "Justify" ;
+};
+ // enum SvxTabAdjust --------------------------------------------------------
+String RID_SVXITEMS_TAB_DECIMAL_CHAR
+{
+    Text [ en-US ] = "Decimal Symbol:" ;
+};
+String RID_SVXITEMS_TAB_FILL_CHAR
+{
+    Text [ en-US ] = "Fill character:" ;
+};
+String RID_SVXITEMS_TAB_ADJUST_LEFT
+{
+    Text [ en-US ] = "Left" ;
+};
+String RID_SVXITEMS_TAB_ADJUST_RIGHT
+{
+    Text [ en-US ] = "Right" ;
+};
+String RID_SVXITEMS_TAB_ADJUST_DECIMAL
+{
+    Text [ en-US ] = "Decimal" ;
+};
+String RID_SVXITEMS_TAB_ADJUST_CENTER
+{
+    Text [ en-US ] = "Centered" ;
+};
+String RID_SVXITEMS_TAB_ADJUST_DEFAULT
+{
+    Text [ en-US ] = "Default" ;
+};
+String RID_SINGLE_LINE0
+{
+    Text [ en-US ] = "Single, fine lines" ;
+};
+String RID_SINGLE_LINE1
+{
+    Text [ en-US ] = "Single, thin" ;
+};
+String RID_SINGLE_LINE2
+{
+    Text [ en-US ] = "Single, thick" ;
+};
+String RID_SINGLE_LINE3
+{
+    Text [ en-US ] = "Single, very thick" ;
+};
+String RID_SINGLE_LINE4
+{
+    Text [ en-US ] = "Single, bold" ;
+};
+String RID_DOUBLE_LINE0
+{
+    Text [ en-US ] = "Double, fine lines, spacing: small" ;
+};
+String RID_DOUBLE_LINE1
+{
+    Text [ en-US ] = "Double, fine line, spacing: large" ;
+};
+String RID_DOUBLE_LINE2
+{
+    Text [ en-US ] = "Double, thin, spacing: small" ;
+};
+String RID_DOUBLE_LINE3
+{
+    Text [ en-US ] = "Double, thick, spacing: large" ;
+};
+String RID_DOUBLE_LINE4
+{
+    Text [ en-US ] = "Double, inside: fine lines, outside: thin, spacing: large" ;
+};
+String RID_DOUBLE_LINE5
+{
+    Text [ en-US ] = "Double, inside: fine lines, outside: thick, spacing: large" ;
+};
+String RID_DOUBLE_LINE6
+{
+    Text [ en-US ] = "Double, inside: fine lines, outside: very thick, spacing: large" ;
+};
+String RID_DOUBLE_LINE7
+{
+    Text [ en-US ] = "Double, inside: thin, outside: thick, spacing: large" ;
+};
+String RID_DOUBLE_LINE8
+{
+    Text [ en-US ] = "Double, inside: thick, outside: thin, spacing: small" ;
+};
+String RID_DOUBLE_LINE9
+{
+    Text [ en-US ] = "Double, inside: thick, outside: very thick, spacing: large" ;
+};
+String RID_DOUBLE_LINE10
+{
+    Text [ en-US ] = "Double, inside: very thick, outside: thick, Spacing: large" ;
+};
+String RID_SVXITEMS_METRIC_MM
+{
+    Text = "mm" ;
+};
+String RID_SVXITEMS_METRIC_CM
+{
+    Text = "cm" ;
+};
+String RID_SVXITEMS_METRIC_INCH
+{
+    Text = "inch" ;
+};
+String RID_SVXITEMS_METRIC_POINT
+{
+    Text = "pt" ;
+};
+String RID_SVXITEMS_METRIC_TWIP
+{
+    Text = "twip" ;
+};
+String RID_SVXITEMS_METRIC_PIXEL
+{
+    Text = "pixel" ;
+};
+ // GetValueText von BoolItems
+String RID_SVXITEMS_SHADOWED_TRUE
+{
+    Text [ en-US ] = "Shadowed" ;
+};
+String RID_SVXITEMS_SHADOWED_FALSE
+{
+    Text [ en-US ] = "Not Shadowed" ;
+};
+String RID_SVXITEMS_BLINK_TRUE
+{
+    Text [ en-US ] = "Blinking" ;
+};
+String RID_SVXITEMS_BLINK_FALSE
+{
+    Text [ en-US ] = "Not Blinking" ;
+};
+String RID_SVXITEMS_AUTOKERN_TRUE
+{
+    Text [ en-US ] = "Pair Kerning" ;
+};
+String RID_SVXITEMS_AUTOKERN_FALSE
+{
+    Text [ en-US ] = "No pair kerning" ;
+};
+String RID_SVXITEMS_WORDLINE_TRUE
+{
+    Text [ en-US ] = "Individual words" ;
+};
+String RID_SVXITEMS_WORDLINE_FALSE
+{
+    Text [ en-US ] = "Not Words Only" ;
+};
+String RID_SVXITEMS_CONTOUR_TRUE
+{
+    Text [ en-US ] = "Outline" ;
+};
+String RID_SVXITEMS_CONTOUR_FALSE
+{
+    Text [ en-US ] = "No Outline" ;
+};
+String RID_SVXITEMS_NOLINEBREAK_TRUE
+{
+    Text = "?" ;
+};
+String RID_SVXITEMS_NOLINEBREAK_FALSE
+{
+    Text = "?" ;
+};
+String RID_SVXITEMS_NOHYPHEN_TRUE
+{
+    Text = "?" ;
+};
+String RID_SVXITEMS_NOHYPHEN_FALSE
+{
+    Text = "?" ;
+};
+String RID_SVXITEMS_PRINT_TRUE
+{
+    Text [ en-US ] = "Print" ;
+};
+String RID_SVXITEMS_PRINT_FALSE
+{
+    Text [ en-US ] = "Don't print" ;
+};
+String RID_SVXITEMS_OPAQUE_TRUE
+{
+    Text [ en-US ] = "Opaque" ;
+};
+String RID_SVXITEMS_OPAQUE_FALSE
+{
+    Text [ en-US ] = "Not Opaque" ;
+};
+String RID_SVXITEMS_FMTKEEP_TRUE
+{
+    Text [ en-US ] = "Keep with next paragraph" ;
+};
+String RID_SVXITEMS_FMTKEEP_FALSE
+{
+    Text [ en-US ] = "Don't Keep Paragraphs Together" ;
+};
+String RID_SVXITEMS_FMTSPLIT_TRUE
+{
+    Text [ en-US ] = "Split paragraph" ;
+};
+String RID_SVXITEMS_FMTSPLIT_FALSE
+{
+    Text [ en-US ] = "Don't split paragraph" ;
+};
+String RID_SVXITEMS_PROT_CONTENT_TRUE
+{
+    Text [ en-US ] = "Contents protected" ;
+};
+String RID_SVXITEMS_PROT_CONTENT_FALSE
+{
+    Text [ en-US ] = "Contents not protected" ;
+};
+String RID_SVXITEMS_PROT_SIZE_TRUE
+{
+    Text [ en-US ] = "Size protected" ;
+};
+String RID_SVXITEMS_PROT_SIZE_FALSE
+{
+    Text [ en-US ] = "Size not protected" ;
+};
+String RID_SVXITEMS_PROT_POS_TRUE
+{
+    Text [ en-US ] = "Position protected" ;
+};
+String RID_SVXITEMS_PROT_POS_FALSE
+{
+    Text [ en-US ] = "Position not protected" ;
+};
+String RID_SVXITEMS_TRANSPARENT_TRUE
+{
+    Text [ en-US ] = "Transparent" ;
+};
+String RID_SVXITEMS_TRANSPARENT_FALSE
+{
+    Text [ en-US ] = "Not Transparent" ;
+};
+String RID_SVXITEMS_HYPHEN_TRUE
+{
+    Text [ en-US ] = "Hyphenation" ;
+};
+String RID_SVXITEMS_HYPHEN_FALSE
+{
+    Text [ en-US ] = "No hyphenation" ;
+};
+String RID_SVXITEMS_PAGE_END_TRUE
+{
+    Text [ en-US ] = "Page End" ;
+};
+String RID_SVXITEMS_PAGE_END_FALSE
+{
+    Text [ en-US ] = "No Page End" ;
+};
+String RID_SVXITEMS_SIZE_WIDTH
+{
+    Text [ en-US ] = "Width: " ;
+};
+String RID_SVXITEMS_SIZE_HEIGHT
+{
+    Text [ en-US ] = "Height: " ;
+};
+String RID_SVXITEMS_LRSPACE_LEFT
+{
+    Text [ en-US ] = "Indent left " ;
+};
+String RID_SVXITEMS_LRSPACE_FLINE
+{
+    Text [ en-US ] = "First Line " ;
+};
+String RID_SVXITEMS_LRSPACE_RIGHT
+{
+    Text [ en-US ] = "Indent right " ;
+};
+String RID_SVXITEMS_SHADOW_COMPLETE
+{
+    Text [ en-US ] = "Shadow: " ;
+};
+String RID_SVXITEMS_BORDER_COMPLETE
+{
+    Text [ en-US ] = "Borders " ;
+};
+String RID_SVXITEMS_BORDER_NONE
+{
+    Text [ en-US ] = "No border";
+};
+String RID_SVXITEMS_BORDER_TOP
+{
+    Text [ en-US ] = "top " ;
+};
+String RID_SVXITEMS_BORDER_BOTTOM
+{
+    Text [ en-US ] = "bottom " ;
+};
+String RID_SVXITEMS_BORDER_LEFT
+{
+    Text [ en-US ] = "left " ;
+};
+String RID_SVXITEMS_BORDER_RIGHT
+{
+    Text [ en-US ] = "right " ;
+};
+String RID_SVXITEMS_BORDER_DISTANCE
+{
+    Text [ en-US ] = "Spacing " ;
+};
+String RID_SVXITEMS_ULSPACE_UPPER
+{
+    Text [ en-US ] = "From top " ;
+};
+String RID_SVXITEMS_ULSPACE_LOWER
+{
+    Text [ en-US ] = "From bottom " ;
+};
+String RID_SVXITEMS_LINES
+{
+    Text [ en-US ] = "%1 Lines" ;
+    Text [ x-comment ] = "pb: %1 == will be replaced by the number of lines";
+};
+String RID_SVXITEMS_WIDOWS_COMPLETE
+{
+    Text [ en-US ] = "Widow control" ;
+};
+String RID_SVXITEMS_ORPHANS_COMPLETE
+{
+    Text [ en-US ] = "Orphan control" ;
+};
+String RID_SVXITEMS_HYPHEN_MINLEAD
+{
+    Text [ en-US ] = "Characters at end of line" ;
+};
+String RID_SVXITEMS_HYPHEN_MINTRAIL
+{
+    Text [ en-US ] = "Characters at beginning of line" ;
+};
+String RID_SVXITEMS_HYPHEN_MAX
+{
+    Text [ en-US ] = "Hyphens" ;
+};
+String RID_SVXITEMS_PAGEMODEL_COMPLETE
+{
+    Text [ en-US ] = "Page Style: " ;
+};
+String RID_SVXITEMS_KERNING_COMPLETE
+{
+    Text [ en-US ] = "Kerning " ;
+};
+String RID_SVXITEMS_KERNING_EXPANDED
+{
+    Text [ en-US ] = "locked " ;
+};
+String RID_SVXITEMS_KERNING_CONDENSED
+{
+    Text [ en-US ] = "Condensed " ;
+};
+String RID_SVXITEMS_GRAPHIC
+{
+    Text [ en-US ] = "Graphic" ;
+};
+String RID_SVXITEMS_EMPHASIS_NONE_STYLE
+{
+    Text [ en-US ] = "none";
+};
+String RID_SVXITEMS_EMPHASIS_DOT_STYLE
+{
+    Text [ en-US ] = "Dots ";
+};
+String RID_SVXITEMS_EMPHASIS_CIRCLE_STYLE
+{
+    Text [ en-US ] = "Circle ";
+};
+String RID_SVXITEMS_EMPHASIS_DISC_STYLE
+{
+// ??? disc == filled ring
+    Text [ en-US ] = "Filled circle ";
+};
+String RID_SVXITEMS_EMPHASIS_ACCENT_STYLE
+{
+    Text [ en-US ] = "Accent ";
+};
+String RID_SVXITEMS_EMPHASIS_ABOVE_POS
+{
+    Text [ en-US ] = "Above";
+};
+String RID_SVXITEMS_EMPHASIS_BELOW_POS
+{
+    Text [ en-US ] = "Below";
+};
+String RID_SVXITEMS_TWOLINES_OFF
+{
+    Text [ en-US ] = "Double-lined off";
+};
+String RID_SVXITEMS_TWOLINES
+{
+    Text [ en-US ] = "Double-lined";
+};
+String RID_SVXITEMS_SCRPTSPC_OFF
+{
+    Text [ en-US ] = "No automatic character spacing";
+};
+String RID_SVXITEMS_SCRPTSPC_ON
+{
+    Text [ en-US ] = "No automatic character spacing";
+};
+String RID_SVXITEMS_HNGPNCT_OFF
+{
+    Text [ en-US ] = "No hanging punctuation at line end";
+};
+String RID_SVXITEMS_HNGPNCT_ON
+{
+    Text [ en-US ] = "Hanging punctuation at line end";
+};
+String RID_SVXITEMS_FORBIDDEN_RULE_OFF
+{
+    Text [ en-US ] = "Apply list of forbidden characters to beginning and end of lines";
+};
+String RID_SVXITEMS_FORBIDDEN_RULE_ON
+{
+    Text [ en-US ] = "Don't apply list of forbidden characters to beginning and end of lines";
+};
+String RID_SVXITEMS_CHARROTATE_OFF
+{
+    Text [ en-US ] = "No rotated characters";
+};
+String RID_SVXITEMS_CHARROTATE
+{
+    Text [ en-US ] = "Character rotated by $(ARG1)°";
+};
+String RID_SVXITEMS_CHARROTATE_FITLINE
+{
+    Text [ en-US ] = "Fit to line";
+};
+String RID_SVXITEMS_CHARSCALE
+{
+    Text [ en-US ] = "Characters scaled $(ARG1)%";
+};
+String RID_SVXITEMS_CHARSCALE_OFF
+{
+    Text [ en-US ] = "No scaled characters";
+};
+String RID_SVXITEMS_RELIEF_NONE
+{
+    Text [ en-US ] = "No relief";
+};
+String RID_SVXITEMS_RELIEF_EMBOSSED
+{
+    Text [ en-US ] = "Relief";
+};
+String RID_SVXITEMS_RELIEF_ENGRAVED
+{
+    Text [ en-US ] = "Engraved";
+};
+String RID_SVXITEMS_PARAVERTALIGN_AUTO
+{
+    Text [ en-US ] = "Automatic text alignment";
+};
+String RID_SVXITEMS_PARAVERTALIGN_BASELINE
+{
+    Text [ en-US ] = "Text aligned to base line";
+};
+String RID_SVXITEMS_PARAVERTALIGN_TOP
+{
+    Text [ en-US ] = "Text aligned top";
+};
+String RID_SVXITEMS_PARAVERTALIGN_CENTER
+{
+    Text [ en-US ] = "Text aligned middle";
+};
+String RID_SVXITEMS_PARAVERTALIGN_BOTTOM
+{
+    Text [ en-US ] = "Text aligned bottom";
+};
+String RID_SVXITEMS_FRMDIR_HORI_LEFT_TOP
+{
+    Text [ en-US ] = "Text direction left-to-right (horizontal)";
+};
+String RID_SVXITEMS_FRMDIR_HORI_RIGHT_TOP
+{
+    Text [ en-US ] = "Text direction right-to-left (horizontal)";
+};
+String RID_SVXITEMS_FRMDIR_VERT_TOP_RIGHT
+{
+    Text [ en-US ] = "Text direction right-to-left (vertical)";
+};
+String RID_SVXITEMS_FRMDIR_VERT_TOP_LEFT
+{
+    Text [ en-US ] = "Text direction left-to-right (vertical)";
+};
+String RID_SVXITEMS_FRMDIR_ENVIRONMENT
+{
+    Text [ en-US ] = "Use superordinate object text direction setting";
+};
+String RID_SVXITEMS_PARASNAPTOGRID_ON
+{
+    Text[ en-US ] = "Paragraph snaps to text grid (if active)";
+};
+String RID_SVXITEMS_PARASNAPTOGRID_OFF
+{
+    Text[ en-US ] = "Paragraph does not snap to text grid";
+};
+String RID_SVXITEMS_CHARHIDDEN_FALSE
+{
+    Text [ en-US ] = "Not hidden";
+};
+String RID_SVXITEMS_CHARHIDDEN_TRUE
+{
+    Text [ en-US ] = "Hidden";
+};
+// ********************************************************************** EOF
+
diff --git a/svx/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index b241e08996..9ba0b722cf 100644
--- a/svx/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 // include ---------------------------------------------------------------
 #include <com/sun/star/style/CaseMap.hpp>
@@ -40,16 +40,16 @@
 #include <toolkit/unohlp.hxx>
 #include <math.h>
 #include <rtl/math.hxx>
+#include <unotools/fontdefs.hxx>
+#include <vcl/outdev.hxx>
+#include <editeng/eeitem.hxx>
+#include <svtools/unitconv.hxx>
 
-#include <svx/eeitem.hxx>
-
-#include <basic/sbx.hxx>
 #define GLOBALOVERFLOW3
 
-
 #include <svl/memberid.hrc>
-#include <svx/svxids.hrc>
-#include <svx/svxitems.hrc>
+#include <editeng/editids.hrc>
+#include <editeng/editrids.hrc>
 #include <vcl/vclenum.hxx>
 #include <tools/bigint.hxx>
 #include <tools/tenccvt.hxx>
@@ -79,41 +79,38 @@
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/text/FontEmphasis.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
-#include <svx/unomid.hxx>
-
-
-#include "flstitem.hxx"
-#include "fontitem.hxx"
-#include <svx/postitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/fhgtitem.hxx>
-#include "fwdtitem.hxx"
-#include <svx/udlnitem.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/shdditem.hxx>
-#include <svx/akrnitem.hxx>
-#include <svx/wrlmitem.hxx>
-#include <svx/cntritem.hxx>
-#include <svx/prszitem.hxx>
-#include <svx/colritem.hxx>
-#include <svx/cscoitem.hxx>
-#include <svx/kernitem.hxx>
-#include <svx/cmapitem.hxx>
-#include <svx/escpitem.hxx>
-#include <svx/langitem.hxx>
-#include "nlbkitem.hxx"
-#include <svx/nhypitem.hxx>
-#include <svx/lcolitem.hxx>
-#include <svx/blnkitem.hxx>
-#include <svx/emphitem.hxx>
-#include <svx/twolinesitem.hxx>
-#include <svx/scripttypeitem.hxx>
-#include <svx/charrotateitem.hxx>
-#include <svx/charscaleitem.hxx>
-#include <svx/charreliefitem.hxx>
-#include <svx/itemtype.hxx>
-#include <svx/dialmgr.hxx>
-#include "dlgutil.hxx"
+#include <editeng/memberids.hrc>
+#include <editeng/flstitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/fwdtitem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/crsditem.hxx>
+#include <editeng/shdditem.hxx>
+#include <editeng/akrnitem.hxx>
+#include <editeng/wrlmitem.hxx>
+#include <editeng/cntritem.hxx>
+#include <editeng/prszitem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/cscoitem.hxx>
+#include <editeng/kernitem.hxx>
+#include <editeng/cmapitem.hxx>
+#include <editeng/escpitem.hxx>
+#include <editeng/langitem.hxx>
+#include <editeng/nlbkitem.hxx>
+#include <editeng/nhypitem.hxx>
+#include <editeng/lcolitem.hxx>
+#include <editeng/blnkitem.hxx>
+#include <editeng/emphitem.hxx>
+#include <editeng/twolinesitem.hxx>
+#include <editeng/scripttypeitem.hxx>
+#include <editeng/charrotateitem.hxx>
+#include <editeng/charscaleitem.hxx>
+#include <editeng/charreliefitem.hxx>
+#include <editeng/itemtype.hxx>
+#include <editeng/eerdll.hxx>
 
 // #90477#
 #include <tools/tenccvt.hxx>
@@ -573,7 +570,7 @@ XubString SvxPostureItem::GetValueTextByPos( USHORT nPos ) const
     }
 
     if ( nId )
-        sTxt = SVX_RESSTR( nId );
+        sTxt = EditResId( nId );
     return sTxt;
 }
 
@@ -735,7 +732,7 @@ SfxItemPresentation SvxWeightItem::GetPresentation
 XubString SvxWeightItem::GetValueTextByPos( USHORT nPos ) const
 {
     DBG_ASSERT( nPos <= (USHORT)WEIGHT_BLACK, "enum overflow!" );
-    return SVX_RESSTR( RID_SVXITEMS_WEIGHT_BEGIN + nPos );
+    return EE_RESSTR( RID_SVXITEMS_WEIGHT_BEGIN + nPos );
 }
 
 /*-----------------13.03.98 14:18-------------------
@@ -1106,7 +1103,7 @@ SfxItemPresentation SvxFontHeightItem::GetPresentation
             if( SFX_MAPUNIT_RELATIVE != ePropUnit )
             {
                 ( rText = String::CreateFromInt32( (short)nProp ) ) +=
-                        SVX_RESSTR( GetMetricId( ePropUnit ) );
+                        EE_RESSTR( GetMetricId( ePropUnit ) );
                 if( 0 <= (short)nProp )
                     rText.Insert( sal_Unicode('+'), 0 );
             }
@@ -1114,7 +1111,7 @@ SfxItemPresentation SvxFontHeightItem::GetPresentation
             {
                 rText = GetMetricText( (long)nHeight,
                                         eCoreUnit, SFX_MAPUNIT_POINT, pIntl );
-                rText += SVX_RESSTR(GetMetricId(SFX_MAPUNIT_POINT));
+                rText += EE_RESSTR(GetMetricId(SFX_MAPUNIT_POINT));
             }
             else
                 ( rText = String::CreateFromInt32( nProp )) += sal_Unicode('%');
@@ -1319,7 +1316,7 @@ SfxItemPresentation SvxFontWidthItem::GetPresentation
             {
                 rText = GetMetricText( (long)nWidth,
                                         eCoreUnit, SFX_MAPUNIT_POINT, pIntl );
-                rText += SVX_RESSTR(GetMetricId(SFX_MAPUNIT_POINT));
+                rText += EE_RESSTR(GetMetricId(SFX_MAPUNIT_POINT));
             }
             else
                 ( rText = String::CreateFromInt32( nProp )) += sal_Unicode('%');
@@ -1534,7 +1531,7 @@ SfxPoolItem* SvxUnderlineItem::Create(SvStream& rStrm, USHORT) const
 XubString SvxUnderlineItem::GetValueTextByPos( USHORT nPos ) const
 {
     DBG_ASSERT( nPos <= (USHORT)UNDERLINE_BOLDWAVE, "enum overflow!" );
-    return SVX_RESSTR( RID_SVXITEMS_UL_BEGIN + nPos );
+    return EE_RESSTR( RID_SVXITEMS_UL_BEGIN + nPos );
 }
 
 // class SvxOverlineItem ------------------------------------------------
@@ -1567,7 +1564,7 @@ SfxPoolItem* SvxOverlineItem::Create(SvStream& rStrm, USHORT) const
 XubString SvxOverlineItem::GetValueTextByPos( USHORT nPos ) const
 {
     DBG_ASSERT( nPos <= (USHORT)UNDERLINE_BOLDWAVE, "enum overflow!" );
-    return SVX_RESSTR( RID_SVXITEMS_OL_BEGIN + nPos );
+    return EE_RESSTR( RID_SVXITEMS_OL_BEGIN + nPos );
 }
 
 // class SvxCrossedOutItem -----------------------------------------------
@@ -1658,7 +1655,7 @@ SfxItemPresentation SvxCrossedOutItem::GetPresentation
 XubString SvxCrossedOutItem::GetValueTextByPos( USHORT nPos ) const
 {
     DBG_ASSERT( nPos <= (USHORT)STRIKEOUT_X, "enum overflow!" );
-    return SVX_RESSTR( RID_SVXITEMS_STRIKEOUT_BEGIN + nPos );
+    return EE_RESSTR( RID_SVXITEMS_STRIKEOUT_BEGIN + nPos );
 }
 
 /*-----------------13.03.98 16:28-------------------
@@ -1755,7 +1752,7 @@ SfxItemPresentation SvxShadowedItem::GetPresentation
 
             if ( GetValue() )
                 nId = RID_SVXITEMS_SHADOWED_TRUE;
-            rText = SVX_RESSTR(nId);
+            rText = EE_RESSTR(nId);
             return ePres;
         }
         default: ; //prevent warning
@@ -1816,7 +1813,7 @@ SfxItemPresentation SvxAutoKernItem::GetPresentation
 
             if ( GetValue() )
                 nId = RID_SVXITEMS_AUTOKERN_TRUE;
-            rText = SVX_RESSTR(nId);
+            rText = EE_RESSTR(nId);
             return ePres;
         }
         default: ; //prevent warning
@@ -1878,7 +1875,7 @@ SfxItemPresentation SvxWordLineModeItem::GetPresentation
 
             if ( GetValue() )
                 nId = RID_SVXITEMS_WORDLINE_TRUE;
-            rText = SVX_RESSTR(nId);
+            rText = EE_RESSTR(nId);
             return ePres;
         }
         default: ; //prevent warning
@@ -1939,7 +1936,7 @@ SfxItemPresentation SvxContourItem::GetPresentation
 
             if ( GetValue() )
                 nId = RID_SVXITEMS_CONTOUR_TRUE;
-            rText = SVX_RESSTR(nId);
+            rText = EE_RESSTR(nId);
             return ePres;
         }
         default: ; //prevent warning
@@ -2257,11 +2254,11 @@ SfxItemPresentation SvxKerningItem::GetPresentation
             return ePres;
         case SFX_ITEM_PRESENTATION_NAMELESS:
             rText = GetMetricText( (long)GetValue(), eCoreUnit, SFX_MAPUNIT_POINT, pIntl );
-            rText += SVX_RESSTR(GetMetricId(SFX_MAPUNIT_POINT));
+            rText += EE_RESSTR(GetMetricId(SFX_MAPUNIT_POINT));
             return ePres;
         case SFX_ITEM_PRESENTATION_COMPLETE:
         {
-            rText = SVX_RESSTR(RID_SVXITEMS_KERNING_COMPLETE);
+            rText = EE_RESSTR(RID_SVXITEMS_KERNING_COMPLETE);
             USHORT nId = 0;
 
             if ( GetValue() > 0 )
@@ -2270,9 +2267,9 @@ SfxItemPresentation SvxKerningItem::GetPresentation
                 nId = RID_SVXITEMS_KERNING_CONDENSED;
 
             if ( nId )
-                rText += SVX_RESSTR(nId);
+                rText += EE_RESSTR(nId);
             rText += GetMetricText( (long)GetValue(), eCoreUnit, SFX_MAPUNIT_POINT, pIntl );
-            rText += SVX_RESSTR(GetMetricId(SFX_MAPUNIT_POINT));
+            rText += EE_RESSTR(GetMetricId(SFX_MAPUNIT_POINT));
             return ePres;
         }
         default: ; //prevent warning
@@ -2370,7 +2367,7 @@ SfxItemPresentation SvxCaseMapItem::GetPresentation
 XubString SvxCaseMapItem::GetValueTextByPos( USHORT nPos ) const
 {
     DBG_ASSERT( nPos < (USHORT)SVX_CASEMAP_END, "enum overflow!" );
-    return SVX_RESSTR( RID_SVXITEMS_CASEMAP_BEGIN + nPos );
+    return EE_RESSTR( RID_SVXITEMS_CASEMAP_BEGIN + nPos );
 }
 
 /*-----------------13.03.98 16:29-------------------
@@ -2518,7 +2515,7 @@ SfxItemPresentation SvxEscapementItem::GetPresentation
             if ( nEsc != 0 )
             {
                 if( DFLT_ESC_AUTO_SUPER == nEsc || DFLT_ESC_AUTO_SUB == nEsc )
-                    rText += String( SVX_RESSTR(RID_SVXITEMS_ESCAPEMENT_AUTO) );
+                    rText += String( EE_RESSTR(RID_SVXITEMS_ESCAPEMENT_AUTO) );
                 else
                     ( rText += String::CreateFromInt32( nEsc )) += sal_Unicode('%');
             }
@@ -2534,7 +2531,7 @@ SfxItemPresentation SvxEscapementItem::GetPresentation
 XubString SvxEscapementItem::GetValueTextByPos( USHORT nPos ) const
 {
     DBG_ASSERT( nPos < (USHORT)SVX_ESCAPEMENT_END, "enum overflow!" );
-    return SVX_RESSTR(RID_SVXITEMS_ESCAPEMENT_BEGIN + nPos);
+    return EE_RESSTR(RID_SVXITEMS_ESCAPEMENT_BEGIN + nPos);
 }
 
 // -----------------------------------------------------------------------
@@ -2948,7 +2945,7 @@ SfxItemPresentation SvxBlinkItem::GetPresentation
 
             if ( GetValue() )
                 nId = RID_SVXITEMS_BLINK_TRUE;
-            rText = SVX_RESSTR(nId);
+            rText = EE_RESSTR(nId);
             return ePres;
         }
         default: ; //prevent warning
@@ -3009,7 +3006,7 @@ SfxItemPresentation SvxEmphasisMarkItem::GetPresentation
         case SFX_ITEM_PRESENTATION_COMPLETE:
             {
                 sal_uInt16 nVal = GetValue();
-                rText = SVX_RESSTR( RID_SVXITEMS_EMPHASIS_BEGIN_STYLE +
+                rText = EE_RESSTR( RID_SVXITEMS_EMPHASIS_BEGIN_STYLE +
                                         ( EMPHASISMARK_STYLE & nVal ));
                 USHORT nId = ( EMPHASISMARK_POS_ABOVE & nVal )
                                 ? RID_SVXITEMS_EMPHASIS_ABOVE_POS
@@ -3017,7 +3014,7 @@ SfxItemPresentation SvxEmphasisMarkItem::GetPresentation
                                     ? RID_SVXITEMS_EMPHASIS_BELOW_POS
                                     : 0;
                 if( nId )
-                    rText += SVX_RESSTR( nId );
+                    rText += EE_RESSTR( nId );
                 return ePres;
             }
         default: ; //prevent warning
@@ -3210,10 +3207,10 @@ SfxItemPresentation SvxTwoLinesItem::GetPresentation( SfxItemPresentation ePres,
     case SFX_ITEM_PRESENTATION_COMPLETE:
         {
             if( !GetValue() )
-                rText = SVX_RESSTR( RID_SVXITEMS_TWOLINES_OFF );
+                rText = EE_RESSTR( RID_SVXITEMS_TWOLINES_OFF );
             else
             {
-                rText = SVX_RESSTR( RID_SVXITEMS_TWOLINES );
+                rText = EE_RESSTR( RID_SVXITEMS_TWOLINES );
                 if( GetStartBracket() )
                     rText.Insert( GetStartBracket(), 0 );
                 if( GetEndBracket() )
@@ -3302,14 +3299,14 @@ SfxItemPresentation SvxCharRotateItem::GetPresentation(
     case SFX_ITEM_PRESENTATION_COMPLETE:
         {
             if( !GetValue() )
-                rText = SVX_RESSTR( RID_SVXITEMS_CHARROTATE_OFF );
+                rText = EE_RESSTR( RID_SVXITEMS_CHARROTATE_OFF );
             else
             {
-                rText = SVX_RESSTR( RID_SVXITEMS_CHARROTATE );
+                rText = EE_RESSTR( RID_SVXITEMS_CHARROTATE );
                 rText.SearchAndReplaceAscii( "$(ARG1)",
                             String::CreateFromInt32( GetValue() / 10 ));
                 if( IsFitToLine() )
-                    rText += SVX_RESSTR( RID_SVXITEMS_CHARROTATE_FITLINE );
+                    rText += EE_RESSTR( RID_SVXITEMS_CHARROTATE_FITLINE );
             }
             return ePres;
         }
@@ -3447,10 +3444,10 @@ SfxItemPresentation SvxCharScaleWidthItem::GetPresentation(
     case SFX_ITEM_PRESENTATION_COMPLETE:
         {
             if( !GetValue() )
-                rText = SVX_RESSTR( RID_SVXITEMS_CHARSCALE_OFF );
+                rText = EE_RESSTR( RID_SVXITEMS_CHARSCALE_OFF );
             else
             {
-                rText = SVX_RESSTR( RID_SVXITEMS_CHARSCALE );
+                rText = EE_RESSTR( RID_SVXITEMS_CHARSCALE );
                 rText.SearchAndReplaceAscii( "$(ARG1)",
                             String::CreateFromInt32( GetValue() ));
             }
@@ -3522,7 +3519,7 @@ String SvxCharReliefItem::GetValueTextByPos( USHORT nPos ) const
 {
     DBG_ASSERT( RID_SVXITEMS_RELIEF_ENGRAVED - RID_SVXITEMS_RELIEF_NONE,
                     "enum overflow" );
-    return String( SVX_RES( RID_SVXITEMS_RELIEF_BEGIN + nPos ));
+    return String( EditResId( RID_SVXITEMS_RELIEF_BEGIN + nPos ));
 }
 
 USHORT SvxCharReliefItem::GetValueCount() const
diff --git a/svx/source/items/writingmodeitem.cxx b/editeng/source/items/writingmodeitem.cxx
index 35afd13291..2abf14d8d8 100644
--- a/svx/source/items/writingmodeitem.cxx
+++ b/editeng/source/items/writingmodeitem.cxx
@@ -29,17 +29,14 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 // include ---------------------------------------------------------------
 
 
-#include <svx/writingmodeitem.hxx>
-#include <svx/dialmgr.hxx>
-
-#ifndef _SVXITEMS_HRC
-#include <svx/svxitems.hrc>
-#endif
+#include <editeng/writingmodeitem.hxx>
+#include <editeng/eerdll.hxx>
+#include <editeng/editrids.hrc>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::text;
@@ -101,7 +98,7 @@ SfxItemPresentation SvxWritingModeItem::GetPresentation( SfxItemPresentation ePr
 
     case SFX_ITEM_PRESENTATION_NAMELESS:
     case SFX_ITEM_PRESENTATION_COMPLETE:
-        rText = SVX_RESSTR( RID_SVXITEMS_FRMDIR_BEGIN + GetValue() );
+        rText = String( EditResId( RID_SVXITEMS_FRMDIR_BEGIN + GetValue() ) );
         break;
 
     default:
diff --git a/svx/source/items/xmlcnitm.cxx b/editeng/source/items/xmlcnitm.cxx
index b7e6260951..0de29159c7 100644
--- a/svx/source/items/xmlcnitm.cxx
+++ b/editeng/source/items/xmlcnitm.cxx
@@ -29,14 +29,12 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 #include <com/sun/star/xml/AttributeData.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <xmloff/xmlcnimp.hxx>
-#ifndef _XMLOFF_XMLCNITM_HXX
 #include <xmloff/unoatrcn.hxx>
-#endif
-#include "xmlcnitm.hxx"
+#include <editeng/xmlcnitm.hxx>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::container;
diff --git a/svx/source/editeng/SvXMLAutoCorrectExport.cxx b/editeng/source/misc/SvXMLAutoCorrectExport.cxx
index 71bc790664..05d11181b9 100644
--- a/svx/source/editeng/SvXMLAutoCorrectExport.cxx
+++ b/editeng/source/misc/SvXMLAutoCorrectExport.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 #include <SvXMLAutoCorrectExport.hxx>
 #define _SVSTDARR_STRINGSISORTDTOR
 #define _SVSTDARR_STRINGSDTOR
diff --git a/svx/source/editeng/SvXMLAutoCorrectExport.hxx b/editeng/source/misc/SvXMLAutoCorrectExport.hxx
index 6620168ca3..b88fbc7287 100644
--- a/svx/source/editeng/SvXMLAutoCorrectExport.hxx
+++ b/editeng/source/misc/SvXMLAutoCorrectExport.hxx
@@ -34,7 +34,7 @@
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmlnmspe.hxx>
-#include <svx/svxacorr.hxx>
+#include <editeng/svxacorr.hxx>
 
 class SvXMLAutoCorrectExport : public SvXMLExport
 {
diff --git a/svx/source/editeng/SvXMLAutoCorrectImport.cxx b/editeng/source/misc/SvXMLAutoCorrectImport.cxx
index 28b8f493dc..0230e849b8 100644
--- a/svx/source/editeng/SvXMLAutoCorrectImport.cxx
+++ b/editeng/source/misc/SvXMLAutoCorrectImport.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 #include <SvXMLAutoCorrectImport.hxx>
 #ifndef _APP_HXX //autogen
 #include <vcl/svapp.hxx>
diff --git a/svx/source/editeng/SvXMLAutoCorrectImport.hxx b/editeng/source/misc/SvXMLAutoCorrectImport.hxx
index 4b1bfb4b5e..8118782961 100644
--- a/svx/source/editeng/SvXMLAutoCorrectImport.hxx
+++ b/editeng/source/misc/SvXMLAutoCorrectImport.hxx
@@ -37,7 +37,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmlnmspe.hxx>
-#include <svx/svxacorr.hxx>
+#include <editeng/svxacorr.hxx>
 
 class SvXMLAutoCorrectImport : public SvXMLImport
 {
diff --git a/svx/source/editeng/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx
index 9046f720a8..9c90f9e9e9 100644
--- a/svx/source/editeng/acorrcfg.cxx
+++ b/editeng/source/misc/acorrcfg.cxx
@@ -29,15 +29,15 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
-#include "acorrcfg.hxx"
+#include <editeng/acorrcfg.hxx>
 #include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/pathoptions.hxx>
 #include <svl/urihelper.hxx>
 
-#include <svx/svxacorr.hxx>
+#include <editeng/svxacorr.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 
@@ -85,11 +85,6 @@ SvxAutoCorrCfg::~SvxAutoCorrCfg()
     delete pAutoCorrect;
 }
 
-/*String SvxAutoCorrCfg::GetName() const
-{
-    return String( OffResId( RID_STR_NAME_ACORRCFG ));
-}
-*/
 void SvxAutoCorrCfg::SetAutoCorrect( SvxAutoCorrect* pNew )
 {
     if( pNew && pNew != pAutoCorrect )
diff --git a/editeng/source/misc/edtdlg.cxx b/editeng/source/misc/edtdlg.cxx
new file mode 100644
index 0000000000..4f589eee7d
--- /dev/null
+++ b/editeng/source/misc/edtdlg.cxx
@@ -0,0 +1,39 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: sfxdlg.cxx,v $
+ * $Revision: 1.7 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_editeng.hxx"
+
+#include <editeng/edtdlg.hxx>
+
+EditAbstractDialogFactory* EditAbstractDialogFactory::Create()
+{
+    return (EditAbstractDialogFactory*) VclAbstractDialogFactory::Create();
+}
diff --git a/svx/source/editeng/forbiddencharacterstable.cxx b/editeng/source/misc/forbiddencharacterstable.cxx
index 862e4ec7fd..c4d3e158e0 100644
--- a/svx/source/editeng/forbiddencharacterstable.cxx
+++ b/editeng/source/misc/forbiddencharacterstable.cxx
@@ -29,16 +29,14 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
-#include <forbiddencharacterstable.hxx>
+#include <editeng/forbiddencharacterstable.hxx>
 
 #include <unotools/localedatawrapper.hxx>
-#include <unolingu.hxx>
+#include <editeng/unolingu.hxx>
 
-#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#endif
 
 SvxForbiddenCharactersTable::SvxForbiddenCharactersTable( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMSF, USHORT nISize, USHORT nGrow )
  : SvxForbiddenCharactersTableImpl( nISize, nGrow )
diff --git a/svx/source/dialog/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx
index 9f56848d8e..7fe2919621 100644
--- a/svx/source/dialog/hangulhanja.cxx
+++ b/editeng/source/misc/hangulhanja.cxx
@@ -29,11 +29,10 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-#include <svx/hangulhanja.hxx>
-#include <vcl/msgbox.hxx> //add CHINA001
+#include "precompiled_editeng.hxx"
+#include <editeng/hangulhanja.hxx>
+#include <vcl/msgbox.hxx>
 #include <vcl/button.hxx>
-// header for class SvtLinguConfig
 #include <unotools/lingucfg.hxx>
 #include <unotools/linguprops.hxx>
 
@@ -51,14 +50,14 @@
 #include <vcl/stdtext.hxx>
 #include <unotools/charclass.hxx>
 
-#include <svx/svxdlg.hxx> //CHINA001
-#include <svx/dialogs.hrc> //CHINA001
-#include <unolingu.hxx>
+#include <editeng/edtdlg.hxx> 
+#include <editeng/editrids.hrc>
+#include <editeng/unolingu.hxx>
 
 #define HHC HangulHanjaConversion
 
 //.............................................................................
-namespace svx
+namespace editeng
 {
 //.............................................................................
 
@@ -344,7 +343,7 @@ namespace svx
         DBG_ASSERT( m_bIsInteractive, "createDialog when the conversion should not be interactive?" );
         if ( m_bIsInteractive && !m_pConversionDialog )
         {
-            SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
+            EditAbstractDialogFactory* pFact = EditAbstractDialogFactory::Create();
             if(pFact)
             {
                 m_pConversionDialog = pFact->CreateHangulHanjaConversionDialog(m_pUIParent, m_ePrimaryConversionDirection );
diff --git a/svx/source/dialog/lingu.src b/editeng/source/misc/lingu.src
index 196b6d8f67..a3325aedc0 100644
--- a/svx/source/dialog/lingu.src
+++ b/editeng/source/misc/lingu.src
@@ -28,17 +28,10 @@
  *
  ************************************************************************/
  // include ---------------------------------------------------------------
-#include <svx/dialogs.hrc>
+#include <editeng/editrids.hrc>
  // pragma ----------------------------------------------------------------
 
  // QueryBoxen ---------------------------------------------------------------
-QueryBox RID_SVXQB_THESAURUS
-{
-    BUTTONS = WB_YES_NO ;
-    DEFBUTTON = WB_DEF_NO ;
-     // ### ACHTUNG: Neuer Text in Resource? Dieses Wort sollten Sie vermeiden! Thesaurus starten? : Dieses Wort sollten sie vermeiden! Thesaurus starten?
-    Message [ en-US ] = "This word appears in the list of words you want to avoid. Start thesaurus?" ;
-};
 QueryBox RID_SVXQB_CONTINUE
 {
     BUTTONS = WB_YES_NO ;
@@ -55,31 +48,6 @@ QueryBox RID_SVXQB_BW_CONTINUE
     /* ### ACHTUNG: Neuer Text in Resource? Überprüfung am Ende des Dokumentes fortsetzen? : šberpr³fung am Ende des Dokumentes fortsetzen? */
     Message [ en-US ] = "Continue checking at end of document?" ;
 };
-QueryBox RID_SVXQB_BODYTEXT
-{
-    BUTTONS = WB_YES_NO ;
-    DEFBUTTON = WB_DEF_NO ;
-     // ### ACHTUNG: Neuer Text in Resource? Möchten Sie den Haupttext prüfen? : Wollen Sie den Haupttext prüfen?
-    /* ### ACHTUNG: Neuer Text in Resource? Möchten Sie den Haupttext prüfen? : M÷chten Sie den Haupttext pr³fen? */
-    /* ### ACHTUNG: Neuer Text in Resource? Möchten Sie den Haupttext prüfen? : M÷chten Sie den Haupttext pr³fen? */
-    Message [ en-US ] = "Do you want to check the main text?" ;
-};
-QueryBox RID_SVXQB_SPECIAL
-{
-    BUTTONS = WB_YES_NO ;
-    DEFBUTTON = WB_DEF_NO ;
-    /* ### ACHTUNG: Neuer Text in Resource? Sonderbereiche prüfen? : Sonderbereiche pr³fen? */
-    /* ### ACHTUNG: Neuer Text in Resource? Sonderbereiche prüfen? : Sonderbereiche pr³fen? */
-    Message [ en-US ] = "Do you want check the special regions?" ;
-};
-QueryBox RID_SVXQB_SPECIAL_FORCED
-{
-    BUTTONS = WB_YES_NO ;
-    DEFBUTTON = WB_DEF_NO ;
-    /* ### ACHTUNG: Neuer Text in Resource? Sonderbereichprüfung ist ausgeschaltet, Trotzdem prüfen? : Sonderbereichpr³fung ist ausgeschaltet, Trotzdem pr³fen? */
-    /* ### ACHTUNG: Neuer Text in Resource? Sonderbereichprüfung ist ausgeschaltet, Trotzdem prüfen? : Sonderbereichpr³fung ist ausgeschaltet, Trotzdem pr³fen? */
-    Message [ en-US ] = "Check special regions is deactivated. Check anyway?" ;
-};
 String RID_SVXSTR_HMERR_THESAURUS
 {
     /* ### ACHTUNG: Neuer Text in Resource? Ein Thesaurus für die eingestellte Sprache ist nicht verfügbar. \nÜberprüfen Sie bitte Ihre Installation und installieren Sie \ngegebenenfalls die gewünschte Sprache : Ein Thesaurus f³r die eingestellte Sprache ist nicht verf³gbar. \nšberpr³fen Sie bitte Ihre Installation und installieren Sie \ngegebenenfalls die gew³nschte Sprache */
diff --git a/editeng/source/misc/makefile.mk b/editeng/source/misc/makefile.mk
new file mode 100644
index 0000000000..7eb2d80447
--- /dev/null
+++ b/editeng/source/misc/makefile.mk
@@ -0,0 +1,71 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.18 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+PRJ=..$/..
+
+PRJNAME=editeng
+TARGET=misc
+
+#PROJECTPCH4DLL=TRUE
+#PROJECTPCH=eeng_pch
+#PROJECTPCHSOURCE=eeng_pch
+
+ENABLE_EXCEPTIONS=TRUE
+
+# --- Settings -----------------------------------------------------------
+
+.INCLUDE :  settings.mk
+.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+
+# --- Allgemein ----------------------------------------------------------
+
+.IF "$(editdebug)" != "" || "$(EDITDEBUG)" != ""
+CDEFS+=-DEDITDEBUG
+.ENDIF
+
+SLOFILES =	\
+    $(SLO)$/edtdlg.obj \
+    $(SLO)$/unolingu.obj \
+    $(SLO)$/acorrcfg.obj \
+    $(SLO)$/forbiddencharacterstable.obj \
+    $(SLO)$/hangulhanja.obj \
+    $(SLO)$/splwrap.obj \
+    $(SLO)$/svxacorr.obj \
+    $(SLO)$/SvXMLAutoCorrectExport.obj \
+    $(SLO)$/SvXMLAutoCorrectImport.obj \
+    $(SLO)$/swafopt.obj \
+    $(SLO)$/txtrange.obj
+
+SRS1NAME=misc
+SRC1FILES =  \
+        lingu.src
+
+.INCLUDE :  target.mk
+
diff --git a/svx/source/dialog/splwrap.cxx b/editeng/source/misc/splwrap.cxx
index eef9e9732b..bf3ae7d092 100644
--- a/svx/source/dialog/splwrap.cxx
+++ b/editeng/source/misc/splwrap.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 #include<rtl/ustring.hxx>
 #include <tools/shl.hxx>
 #include <vcl/wrkwin.hxx>
@@ -41,22 +41,21 @@
 #ifndef __RSC
 #include <tools/errinf.hxx>
 #endif
-#include <svxerr.hxx>
-#include <dlgutil.hxx>
-#include <unolingu.hxx>
+//#include <svxerr.hxx>
+//#include <dlgutil.hxx>
+#include <editeng/unolingu.hxx>
 #include <sfx2/sfxuno.hxx>
 #include <linguistic/lngprops.hxx>
 #include <com/sun/star/frame/XStorable.hpp>
 
 #include <map>
 
-#include <svx/svxenum.hxx>
-#include <svx/splwrap.hxx>      // Der Wrapper
-#include <svx/svxdlg.hxx>      
-#include <svx/dialmgr.hxx>
-
-#include <svx/dialogs.hrc>
-
+#include <editeng/svxenum.hxx>
+#include <editeng/splwrap.hxx>      // Der Wrapper
+#include <editeng/edtdlg.hxx>      
+#include <editeng/eerdll.hxx>
+#include <editeng/editrids.hrc>
+#include <editeng/editids.hrc>
 
 #define WAIT_ON() if(pWin != NULL) { pWin->EnterWait(); }
 
@@ -346,18 +345,15 @@ void SvxSpellWrapper::ChangeThesWord( const String& )
 
 void SvxSpellWrapper::StartThesaurus( const String &rWord, sal_uInt16 nLanguage )
 {
-
-    String sErr( SVX_RES( RID_SVXSTR_HMERR_THESAURUS ) );
-
     Reference< XThesaurus >  xThes( SvxGetThesaurus() );
     if (!xThes.is())
     {
-        InfoBox( pWin, sErr ).Execute();
+        InfoBox( pWin, EE_RESSTR( RID_SVXSTR_HMERR_THESAURUS ) ).Execute();
         return;
     }
 
     WAIT_ON();	// while looking up for initial word
-    SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
+    EditAbstractDialogFactory* pFact = EditAbstractDialogFactory::Create();
     AbstractThesaurusDialog* pDlg = pFact->CreateThesaurusDialog( pWin, xThes, rWord, nLanguage );
     WAIT_OFF();
     if ( pDlg->Execute()== RET_OK )
@@ -413,7 +409,7 @@ void SvxSpellWrapper::SpellDocument( )
         bDialog = sal_True;
         if (xHyphWord.is())
         {
-            SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
+            EditAbstractDialogFactory* pFact = EditAbstractDialogFactory::Create();
             AbstractHyphenWordDialog* pDlg = pFact->CreateHyphenWordDialog( pWin, 
                             xHyphWord->getWord(),
                             SvxLocaleToLanguage( xHyphWord->getLocale() ),
@@ -470,7 +466,6 @@ sal_Bool SvxSpellWrapper::SpellNext( )
         return sal_False;
     }
 
-    ResMgr& rMgr = DIALOG_MGR();
     sal_Bool bGoOn = sal_False;
 
     if ( bOtherCntnt )
@@ -514,7 +509,7 @@ sal_Bool SvxSpellWrapper::SpellNext( )
         if( bDontWrapAround )
 #else
         sal_uInt16 nResId = bReverse ? RID_SVXQB_BW_CONTINUE : RID_SVXQB_CONTINUE;
-        QueryBox aBox( pWin, ResId( nResId, rMgr ) );
+        QueryBox aBox( pWin, EditResId( nResId ) );
         if ( aBox.Execute() != RET_YES )
 #endif
 
diff --git a/svx/source/editeng/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index f106ee1543..3a3751b2c3 100644
--- a/svx/source/editeng/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 
 #include <com/sun/star/io/XStream.hpp>
@@ -54,14 +54,14 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/io/XActiveDataSource.hpp>
-#include <svx/svxids.hrc>
+#include <editeng/editids.hrc>
 #include <sot/storage.hxx>
 #include <comphelper/storagehelper.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/escpitem.hxx>
-#include <svx/svxacorr.hxx>
-#include "unolingu.hxx"
+#include <editeng/udlnitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/escpitem.hxx>
+#include <editeng/svxacorr.hxx>
+#include <editeng/unolingu.hxx>
 #include <helpid.hrc>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/xml/sax/InputSource.hpp>
diff --git a/svx/source/editeng/swafopt.cxx b/editeng/source/misc/swafopt.cxx
index 0940a4e736..e6dcd15972 100644
--- a/svx/source/editeng/swafopt.cxx
+++ b/editeng/source/misc/swafopt.cxx
@@ -29,11 +29,11 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 #include <vcl/keycodes.hxx>
 #include <tools/string.hxx>
 
-#include <svx/swafopt.hxx>
+#include <editeng/swafopt.hxx>
 
 /*------------------------------------------------------------------------
  Beschreibung:
diff --git a/svx/source/editeng/txtrange.cxx b/editeng/source/misc/txtrange.cxx
index 6ddbda37d2..0c7f9dc7aa 100644
--- a/svx/source/editeng/txtrange.cxx
+++ b/editeng/source/misc/txtrange.cxx
@@ -29,9 +29,9 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
-#include "txtrange.hxx"
+#include <editeng/txtrange.hxx>
 #include <math.h>
 #include <tools/poly.hxx>
 #include <tools/debug.hxx>
diff --git a/svx/source/editeng/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index 65d5c3b0c2..f356c4be73 100644
--- a/svx/source/editeng/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -29,14 +29,14 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 #include <map>
 #include <set>
 #include <vector>
 #include <slist>
 #include <memory>
-#include <unolingu.hxx>
+#include <editeng/unolingu.hxx>
 #include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
 #include <rtl/logfile.hxx>
@@ -66,8 +66,8 @@
 #include <vcl/msgbox.hxx>
 #include <tools/shl.hxx>
 #include <linguistic/misc.hxx>
-#include <svx/dialmgr.hxx>
-#include <svx/dialogs.hrc>
+#include <editeng/eerdll.hxx>
+#include <editeng/editrids.hrc>
 
 using namespace ::rtl;
 using namespace ::comphelper;
@@ -1341,7 +1341,7 @@ short SvxDicError( Window *pParent, sal_Int16 nError )
                 nRid = RID_SVXSTR_DIC_ERR_UNKNOWN;
                 DBG_ASSERT(0, "unexpected case");
         }
-        nRes = InfoBox( pParent, SVX_RESSTR( nRid ) ).Execute();
+        nRes = InfoBox( pParent, EE_RESSTR( nRid ) ).Execute();
     }
     return nRes;
 }
diff --git a/svx/source/outliner/makefile.mk b/editeng/source/outliner/makefile.mk
index deef353049..deef353049 100644
--- a/svx/source/outliner/makefile.mk
+++ b/editeng/source/outliner/makefile.mk
diff --git a/svx/source/outliner/outl_pch.cxx b/editeng/source/outliner/outl_pch.cxx
index 803d3d31d8..58e7511910 100644
--- a/svx/source/outliner/outl_pch.cxx
+++ b/editeng/source/outliner/outl_pch.cxx
@@ -29,6 +29,6 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 #include <outl_pch.hxx>
 
diff --git a/svx/source/outliner/outl_pch.hxx b/editeng/source/outliner/outl_pch.hxx
index 128abb3936..e8a8a5045b 100644
--- a/svx/source/outliner/outl_pch.hxx
+++ b/editeng/source/outliner/outl_pch.hxx
@@ -28,11 +28,9 @@
  *
  ************************************************************************/
 #include <svl/intitem.hxx>
-
-#include <svx/editeng.hxx>
-#include <svx/editview.hxx>
-#include <svx/editdata.hxx>
-#include <eerdll.hxx>
-
-#include <svx/lrspitem.hxx>
-#include <svx/fhgtitem.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/editdata.hxx>
+#include <editeng/eerdll.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/fhgtitem.hxx>
diff --git a/svx/source/outliner/outleeng.cxx b/editeng/source/outliner/outleeng.cxx
index 7812afe440..831cdc02be 100644
--- a/svx/source/outliner/outleeng.cxx
+++ b/editeng/source/outliner/outleeng.cxx
@@ -29,17 +29,23 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-#include <outl_pch.hxx>
+#include "precompiled_editeng.hxx"
+#include <svl/intitem.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/editdata.hxx>
+#include <editeng/eerdll.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/fhgtitem.hxx>
 
 #define _OUTLINER_CXX
-#include <svx/outliner.hxx>
+#include <editeng/outliner.hxx>
 #include <outleeng.hxx>
 #include <paralist.hxx>
-#include <outliner.hrc>
+#include <editeng/editrids.hrc>
 #include <svl/itemset.hxx>
-#include <svx/eeitem.hxx>
-#include "editstat.hxx"
+#include <editeng/eeitem.hxx>
+#include <editeng/editstat.hxx>
 #include "outlundo.hxx"
 
 OutlinerEditEng::OutlinerEditEng( Outliner* pEngOwner, SfxItemPool* pPool )
diff --git a/svx/source/outliner/outleeng.hxx b/editeng/source/outliner/outleeng.hxx
index cf4d7d13a9..99c2567a0f 100644
--- a/svx/source/outliner/outleeng.hxx
+++ b/editeng/source/outliner/outleeng.hxx
@@ -30,9 +30,9 @@
 #ifndef _OUTLEENG_HXX
 #define _OUTLEENG_HXX
 
-#include <svx/outliner.hxx>
+#include <editeng/outliner.hxx>
 #ifndef _EDITENG_HXX
-#include <svx/editeng.hxx>
+#include <editeng/editeng.hxx>
 #endif
 
 typedef EENotify* EENotifyPtr;
diff --git a/svx/source/outliner/outlin2.cxx b/editeng/source/outliner/outlin2.cxx
index c1ee8fe2a0..b3f99e8dae 100644
--- a/svx/source/outliner/outlin2.cxx
+++ b/editeng/source/outliner/outlin2.cxx
@@ -29,24 +29,30 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-#include <outl_pch.hxx>
-
+#include "precompiled_editeng.hxx"
+
+#include <svl/intitem.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/editdata.hxx>
+#include <editeng/eerdll.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/fhgtitem.hxx>
 #include <tools/list.hxx>
 #include <svl/style.hxx>
 #include <vcl/mapmod.hxx>
 
-#include <forbiddencharacterstable.hxx>
+#include <editeng/forbiddencharacterstable.hxx>
 
 #define _OUTLINER_CXX
 
-#include <svx/outliner.hxx>
+#include <editeng/outliner.hxx>
 #include <paralist.hxx>
-#include <svx/outlobj.hxx>
+#include <editeng/outlobj.hxx>
 #include <outleeng.hxx>
 #include <outlundo.hxx>
-#include <svx/eeitem.hxx>
-#include <editstat.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/editstat.hxx>
 
 DBG_NAMEEX(Outliner)
 
diff --git a/svx/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index 1b3871e9d4..f464e6cb81 100644
--- a/svx/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -29,34 +29,40 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
-#include <outl_pch.hxx>
+#include <svl/intitem.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/editdata.hxx>
+#include <editeng/eerdll.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/fhgtitem.hxx>
 
 #include <math.h>
 #include <svl/style.hxx>
 #include <vcl/wrkwin.hxx>
 #define _OUTLINER_CXX
-#include <svx/outliner.hxx>
+#include <editeng/outliner.hxx>
 #include <paralist.hxx>
-#include <svx/outlobj.hxx>
+#include <editeng/outlobj.hxx>
 #include <outleeng.hxx>
 #include <outlundo.hxx>
-#include <svx/eeitem.hxx>
-#include <editstat.hxx>
-#include <svx/scripttypeitem.hxx>
-#include <svx/editobj.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/editstat.hxx>
+#include <editeng/scripttypeitem.hxx>
+#include <editeng/editobj.hxx>
 #include <svl/itemset.hxx>
 #include <svl/whiter.hxx>
 #include <vcl/metric.hxx>
-#include <svx/numitem.hxx>
-#include <svx/adjitem.hxx>
+#include <editeng/numitem.hxx>
+#include <editeng/adjitem.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/metaact.hxx>
 #include <svtools/grfmgr.hxx>
-#include <svx/svxfont.hxx>
-#include <svx/brshitem.hxx>
+#include <editeng/svxfont.hxx>
+#include <editeng/brshitem.hxx>
 #include <svl/itempool.hxx>
 
 // #101498# calculate if it's RTL or not
diff --git a/svx/source/outliner/outliner.src b/editeng/source/outliner/outliner.src
index 1cfea02c3d..6cbd46d3ce 100644
--- a/svx/source/outliner/outliner.src
+++ b/editeng/source/outliner/outliner.src
@@ -28,7 +28,8 @@
  *
  ************************************************************************/
 
-#include <outliner.hrc>
+#include <editeng/editrids.hrc>
+
 String RID_OUTLUNDO_HEIGHT
 {
     Text [ en-US ] = "Move" ;
diff --git a/svx/source/outliner/outlobj.cxx b/editeng/source/outliner/outlobj.cxx
index 72601d9d7e..00b70f8899 100644
--- a/svx/source/outliner/outlobj.cxx
+++ b/editeng/source/outliner/outlobj.cxx
@@ -29,15 +29,15 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 #include <outl_pch.hxx>
 
 #define _OUTLINER_CXX
-#include <svx/outliner.hxx>
-#include <svx/outlobj.hxx>
+#include <editeng/outliner.hxx>
+#include <editeng/outlobj.hxx>
 #include <outleeng.hxx>
-#include <svx/editobj.hxx>
+#include <editeng/editobj.hxx>
 #include <vcl/bitmap.hxx>
 #include <tools/stream.hxx>
 
diff --git a/svx/source/outliner/outlundo.cxx b/editeng/source/outliner/outlundo.cxx
index 5c3612af4f..f5e8116bb7 100644
--- a/svx/source/outliner/outlundo.cxx
+++ b/editeng/source/outliner/outlundo.cxx
@@ -29,12 +29,18 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
-#include <outl_pch.hxx>
+#include <svl/intitem.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/editdata.hxx>
+#include <editeng/eerdll.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/fhgtitem.hxx>
 
 #define _OUTLINER_CXX
-#include <svx/outliner.hxx>
+#include <editeng/outliner.hxx>
 #include <outlundo.hxx>
 
 
diff --git a/svx/source/outliner/outlundo.hxx b/editeng/source/outliner/outlundo.hxx
index 7ed0e83a71..c79aee8ec1 100644
--- a/svx/source/outliner/outlundo.hxx
+++ b/editeng/source/outliner/outlundo.hxx
@@ -31,12 +31,9 @@
 #ifndef _OUTLUNDO_HXX
 #define _OUTLUNDO_HXX
 
-#include <svx/outliner.hxx>
-
-#ifndef _EDITDATA_HXX
-#include <svx/editdata.hxx>
-#endif
-#include <editund2.hxx>
+#include <editeng/outliner.hxx>
+#include <editeng/editdata.hxx>
+#include <editeng/editund2.hxx>
 
 class OutlinerUndoBase : public EditUndo
 {
diff --git a/svx/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx
index e15d7427c3..64cedbf970 100644
--- a/svx/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -29,23 +29,29 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-#include <outl_pch.hxx>
+#include "precompiled_editeng.hxx"
+#include <svl/intitem.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/editdata.hxx>
+#include <editeng/eerdll.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/fhgtitem.hxx>
 #include <svl/style.hxx>
 
 #define _OUTLINER_CXX
-#include <svx/outliner.hxx>
+#include <editeng/outliner.hxx>
 #include <outleeng.hxx>
 #include <paralist.hxx>
 #include <outlundo.hxx>
-#include <svx/outlobj.hxx>
-#include <svx/flditem.hxx>
-#include <svx/flditem.hxx>
-#include <svx/eeitem.hxx>
-#include <svx/numitem.hxx>
+#include <editeng/outlobj.hxx>
+#include <editeng/flditem.hxx>
+#include <editeng/flditem.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/numitem.hxx>
 #include <vcl/window.hxx>
 #include <svl/itemset.hxx>
-#include <editstat.hxx>
+#include <editeng/editstat.hxx>
 
 
 // Breite der Randzonen innerhalb derer beim D&D gescrollt wird
diff --git a/svx/source/outliner/paralist.cxx b/editeng/source/outliner/paralist.cxx
index e5493a24dc..1cdc628140 100644
--- a/svx/source/outliner/paralist.cxx
+++ b/editeng/source/outliner/paralist.cxx
@@ -29,11 +29,11 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 #include <paralist.hxx>
-#include <svx/outliner.hxx>		// nur wegen Paragraph, muss geaendert werden!
-#include <svx/numdef.hxx>
+#include <editeng/outliner.hxx>		// nur wegen Paragraph, muss geaendert werden!
+#include <editeng/numdef.hxx>
 
 DBG_NAME(Paragraph)
 
diff --git a/svx/source/outliner/paralist.hxx b/editeng/source/outliner/paralist.hxx
index c2205530a9..c2205530a9 100644
--- a/svx/source/outliner/paralist.hxx
+++ b/editeng/source/outliner/paralist.hxx
diff --git a/svx/source/svrtf/makefile.mk b/editeng/source/rtf/makefile.mk
index 950036034d..b633d5c088 100644
--- a/svx/source/svrtf/makefile.mk
+++ b/editeng/source/rtf/makefile.mk
@@ -31,13 +31,8 @@
 
 PRJ=..$/..
 
-PROJECTPCH=svxpch
-PROJECTPCHSOURCE=$(PRJ)$/util$/svxpch
-
-PRJNAME=svx
-TARGET=svxrtf
-LIBTARGET=NO
-AUTOSEG=true
+PRJNAME=editeng
+TARGET=rtf
 
 # --- Settings -----------------------------------------------------
 
@@ -49,17 +44,11 @@ AUTOSEG=true
 EXCEPTIONSFILES= \
         $(SLO)$/svxrtf.obj
 
-LIB1TARGET= $(SLB)$/$(TARGET)-core.lib
-LIB1OBJFILES= \
+SLOFILES= \
+        $(EXCEPTIONSFILES) \
         $(SLO)$/rtfitem.obj \
-        $(SLO)$/svxrtf.obj
-
-LIB2TARGET= $(SLB)$/$(TARGET).lib
-LIB2OBJFILES= \
         $(SLO)$/rtfgrf.obj
 
-SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES)
-
 # ==========================================================================
 
 .INCLUDE :  target.mk
diff --git a/svx/source/svrtf/rtfgrf.cxx b/editeng/source/rtf/rtfgrf.cxx
index b889384ba2..c36bf6b29a 100644
--- a/svx/source/svrtf/rtfgrf.cxx
+++ b/editeng/source/rtf/rtfgrf.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
 #include <osl/endian.h>
@@ -40,8 +40,7 @@
 #include <svtools/rtftoken.h>
 #include <svtools/filter.hxx>
 
-#include "svx/impgrf.hxx"
-#include "svxrtf.hxx"
+#include <editeng/svxrtf.hxx>
 
 
 #ifndef DBG_UTIL
@@ -490,7 +489,7 @@ BOOL SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType )
 
         if( bValidBmp )
         {
-            GraphicFilter* pGF = ::GetGrfFilter();
+            GraphicFilter* pGF = GraphicFilter::GetGraphicFilter();
             USHORT nImportFilter = GRFILTER_FORMAT_DONTKNOW;
 
             if( pFilterNm )
diff --git a/svx/source/svrtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index ca87b02088..8cafac9da2 100644
--- a/svx/source/svrtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -29,74 +29,72 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
 
-#include "flstitem.hxx"
-#include "fontitem.hxx"
-#include <svx/postitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/fhgtitem.hxx>
-#include "fwdtitem.hxx"
-#include <svx/udlnitem.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/shdditem.hxx>
-#include <svx/akrnitem.hxx>
-#include <svx/wrlmitem.hxx>
-#include <svx/cntritem.hxx>
-#include <svx/prszitem.hxx>
-#include <svx/colritem.hxx>
-#include <svx/cscoitem.hxx>
-#include <svx/kernitem.hxx>
-#include <svx/cmapitem.hxx>
-#include <svx/escpitem.hxx>
-#include <svx/langitem.hxx>
-#include "nlbkitem.hxx"
-#include <svx/nhypitem.hxx>
-#include <svx/lcolitem.hxx>
-#include <svx/blnkitem.hxx>
-#include <svx/emphitem.hxx>
-#include <svx/twolinesitem.hxx>
-
-#include <svx/pbinitem.hxx>
-#include <svx/sizeitem.hxx>
-#include <svx/lrspitem.hxx>
-#include <svx/ulspitem.hxx>
-#include "prntitem.hxx"
-#include "opaqitem.hxx"
-#include "protitem.hxx"
-#include <svx/shaditem.hxx>
-#include <svx/boxitem.hxx>
-#include <svx/brkitem.hxx>
-#include <svx/keepitem.hxx>
-#include "bolnitem.hxx"
-#include <svx/brshitem.hxx>
-#include <svx/lspcitem.hxx>
-#include <svx/adjitem.hxx>
-#include <svx/orphitem.hxx>
-#include <svx/widwitem.hxx>
-#include <svx/tstpitem.hxx>
-#include <svx/pmdlitem.hxx>
-#include <svx/spltitem.hxx>
-#include <svx/hyznitem.hxx>
-#include <svx/charscaleitem.hxx>
-#include <svx/charrotateitem.hxx>
-#include <svx/charreliefitem.hxx>
-#include <svx/paravertalignitem.hxx>
-#include <svx/forbiddenruleitem.hxx>
-#include <svx/hngpnctitem.hxx>
-#include <svx/scriptspaceitem.hxx>
-#include <svx/frmdiritem.hxx>
-#include "charhiddenitem.hxx"
-
+#include <editeng/flstitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/fwdtitem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/crsditem.hxx>
+#include <editeng/shdditem.hxx>
+#include <editeng/akrnitem.hxx>
+#include <editeng/wrlmitem.hxx>
+#include <editeng/cntritem.hxx>
+#include <editeng/prszitem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/cscoitem.hxx>
+#include <editeng/kernitem.hxx>
+#include <editeng/cmapitem.hxx>
+#include <editeng/escpitem.hxx>
+#include <editeng/langitem.hxx>
+#include <editeng/nlbkitem.hxx>
+#include <editeng/nhypitem.hxx>
+#include <editeng/lcolitem.hxx>
+#include <editeng/blnkitem.hxx>
+#include <editeng/emphitem.hxx>
+#include <editeng/twolinesitem.hxx>
+#include <editeng/pbinitem.hxx>
+#include <editeng/sizeitem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/ulspitem.hxx>
+#include <editeng/prntitem.hxx>
+#include <editeng/opaqitem.hxx>
+#include <editeng/protitem.hxx>
+#include <editeng/shaditem.hxx>
+#include <editeng/boxitem.hxx>
+#include <editeng/brkitem.hxx>
+#include <editeng/keepitem.hxx>
+#include <editeng/bolnitem.hxx>
+#include <editeng/brshitem.hxx>
+#include <editeng/lspcitem.hxx>
+#include <editeng/adjitem.hxx>
+#include <editeng/orphitem.hxx>
+#include <editeng/widwitem.hxx>
+#include <editeng/tstpitem.hxx>
+#include <editeng/pmdlitem.hxx>
+#include <editeng/spltitem.hxx>
+#include <editeng/hyznitem.hxx>
+#include <editeng/charscaleitem.hxx>
+#include <editeng/charrotateitem.hxx>
+#include <editeng/charreliefitem.hxx>
+#include <editeng/paravertalignitem.hxx>
+#include <editeng/forbiddenruleitem.hxx>
+#include <editeng/hngpnctitem.hxx>
+#include <editeng/scriptspaceitem.hxx>
+#include <editeng/frmdiritem.hxx>
+#include <editeng/charhiddenitem.hxx>
 
 #include <svtools/rtftoken.h>
 #include <svl/itempool.hxx>
 #include <svl/itemiter.hxx>
 
-#include "svxrtf.hxx"
-
+#include <editeng/svxrtf.hxx>
+#include <editeng/editids.hrc>
 
 #define BRACELEFT	'{'
 #define BRACERIGHT	'}'
diff --git a/svx/source/svrtf/segincr.asm b/editeng/source/rtf/segincr.asm
index d90d79dbd8..d90d79dbd8 100644
--- a/svx/source/svrtf/segincr.asm
+++ b/editeng/source/rtf/segincr.asm
diff --git a/svx/source/svrtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 8e4587909d..30ed65fceb 100644
--- a/svx/source/svrtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
 
@@ -45,11 +45,11 @@
 #include <comphelper/string.hxx>
 
 #include <com/sun/star/lang/Locale.hpp>
-#include <svx/scriptspaceitem.hxx>
-#include "fontitem.hxx"
-#include <svx/colritem.hxx>
-#include "svxrtf.hxx"
-#include <svx/svxids.hrc>
+#include <editeng/scriptspaceitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/svxrtf.hxx>
+#include <editeng/editids.hrc>
 #include <vcl/svapp.hxx>
 
 #include <com/sun/star/document/XDocumentProperties.hpp>
diff --git a/svx/source/unoedit/UnoForbiddenCharsTable.cxx b/editeng/source/uno/UnoForbiddenCharsTable.cxx
index f75f66d701..c83120428d 100644
--- a/svx/source/unoedit/UnoForbiddenCharsTable.cxx
+++ b/editeng/source/uno/UnoForbiddenCharsTable.cxx
@@ -29,12 +29,12 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-#include "UnoForbiddenCharsTable.hxx"
-#include "forbiddencharacterstable.hxx"
+#include "precompiled_editeng.hxx"
+#include <editeng/UnoForbiddenCharsTable.hxx>
+#include <editeng/forbiddencharacterstable.hxx>
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
-#include "unolingu.hxx" // LocalToLanguage, LanguageToLocale
+#include <editeng/unolingu.hxx> // LocalToLanguage, LanguageToLocale
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/svx/source/unoedit/makefile.mk b/editeng/source/uno/makefile.mk
index a9032e627f..c044e1e38d 100644
--- a/svx/source/unoedit/makefile.mk
+++ b/editeng/source/uno/makefile.mk
@@ -32,8 +32,7 @@
 PRJ=..$/..
 
 PRJNAME=svx
-TARGET=unoedit
-LIBTARGET=NO
+TARGET=uno
 ENABLE_EXCEPTIONS=TRUE
 
 # --- Settings -----------------------------------------------------
@@ -43,27 +42,23 @@ ENABLE_EXCEPTIONS=TRUE
 
 # --- Files --------------------------------------------------------
 
-LIB1TARGET= $(SLB)$/$(TARGET)-core.lib
-LIB1OBJFILES= \
+SLOFILES= \
+        $(SLO)$/unonrule.obj	\
         $(SLO)$/unoedsrc.obj	\
-        $(SLO)$/serviceinfohelper.obj \
         $(SLO)$/unoedhlp.obj	\
+        $(SLO)$/unofdesc.obj	\
         $(SLO)$/unoviwou.obj	\
         $(SLO)$/unofored.obj	\
         $(SLO)$/unoforou.obj	\
+        $(SLO)$/unoipset.obj	\
         $(SLO)$/unotext.obj		\
         $(SLO)$/unotext2.obj	\
-        $(SLO)$/unofield.obj
-
-LIB2TARGET= $(SLB)$/$(TARGET).lib
-LIB2OBJFILES= \
+        $(SLO)$/unofield.obj	\
         $(SLO)$/UnoForbiddenCharsTable.obj \
         $(SLO)$/unopracc.obj	\
         $(SLO)$/unoedprx.obj	\
         $(SLO)$/unoviwed.obj
 
-SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES)
-
 # --- Tagets -------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/svx/source/unoedit/unoedhlp.cxx b/editeng/source/uno/unoedhlp.cxx
index 7de489be70..22c377c59d 100644
--- a/svx/source/unoedit/unoedhlp.cxx
+++ b/editeng/source/uno/unoedhlp.cxx
@@ -29,12 +29,12 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 #include <tools/debug.hxx>
 
-#include "unoedhlp.hxx"
-#include <svx/editdata.hxx>
-#include <svx/editeng.hxx>
+#include <editeng/unoedhlp.hxx>
+#include <editeng/editdata.hxx>
+#include <editeng/editeng.hxx>
 
 //------------------------------------------------------------------------
 
diff --git a/svx/source/unoedit/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx
index a85f50a707..e2de161139 100644
--- a/svx/source/unoedit/unoedprx.cxx
+++ b/editeng/source/uno/unoedprx.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 //------------------------------------------------------------------------
 //
@@ -52,13 +52,13 @@
 //
 //------------------------------------------------------------------------
 #include "unoedprx.hxx"
-#include <svx/unotext.hxx>
-#include "unoedhlp.hxx"
-#include <svx/editdata.hxx>
-#include <svx/editeng.hxx>
-#include <svx/editview.hxx>
-#include "AccessibleStringWrap.hxx"
-#include <svx/outliner.hxx>
+#include <editeng/unotext.hxx>
+#include <editeng/unoedhlp.hxx>
+#include <editeng/editdata.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/AccessibleStringWrap.hxx>
+#include <editeng/outliner.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/svx/source/unoedit/unoedsrc.cxx b/editeng/source/uno/unoedsrc.cxx
index 7efc794107..df10f1faac 100644
--- a/svx/source/unoedit/unoedsrc.cxx
+++ b/editeng/source/uno/unoedsrc.cxx
@@ -29,10 +29,10 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 #include <svl/brdcst.hxx>
 
-#include <svx/unoedsrc.hxx>
+#include <editeng/unoedsrc.hxx>
 
 
 //------------------------------------------------------------------------
diff --git a/svx/source/unodraw/unofdesc.cxx b/editeng/source/uno/unofdesc.cxx
index 2fa0cf4abc..d5cb98a19b 100644
--- a/svx/source/unodraw/unofdesc.cxx
+++ b/editeng/source/uno/unofdesc.cxx
@@ -29,25 +29,25 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <com/sun/star/uno/Any.hxx>
 
 #ifndef _TOOLKIT_HELPRE_VCLUNOHELPER_HXX_
 #include <toolkit/helper/vclunohelper.hxx>
 #endif
-#include <fontitem.hxx>
-#include <svx/fhgtitem.hxx>
-#include <svx/postitem.hxx>
-#include <svx/udlnitem.hxx>
-#include <svx/wghtitem.hxx>
-#include <svx/crsditem.hxx>
-#include <svx/wrlmitem.hxx>
-#include <svx/unomid.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/wghtitem.hxx>
+#include <editeng/crsditem.hxx>
+#include <editeng/wrlmitem.hxx>
+#include <editeng/memberids.hrc>
 #include <svl/itempool.hxx>
 
-#include "unofdesc.hxx"
+#include <editeng/unofdesc.hxx>
 
 using namespace ::rtl;
 using namespace ::com::sun::star;
diff --git a/svx/source/unoedit/unofield.cxx b/editeng/source/uno/unofield.cxx
index 0a97274309..7f5e1387b1 100644
--- a/svx/source/unoedit/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 #include <com/sun/star/util/DateTime.hpp>
 #include <com/sun/star/text/FilenameDisplayFormat.hpp>
 #include <com/sun/star/lang/NoSupportException.hpp>
@@ -40,12 +40,12 @@
 #include <rtl/uuid.h>
 #include <rtl/memory.h>
 
-#include <svx/eeitem.hxx>
-#include <svx/flditem.hxx>
-#include <svx/svdfield.hxx>
-#include <svx/unofield.hxx>
-#include <svx/unoprov.hxx>
-#include <svx/unotext.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/flditem.hxx>
+#include <editeng/svdfield.hxx>
+#include <editeng/unofield.hxx>
+#include <editeng/unotext.hxx>
+#include <comphelper/serviceinfohelper.hxx>
 
 using namespace ::rtl;
 using namespace ::vos;
@@ -1115,7 +1115,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextField::getSupportedServiceNames()
 
 sal_Bool SAL_CALL SvxUnoTextField::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException )
 {
-    return SvxServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() );
+    return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() );
 }
 
 uno::Reference< uno::XInterface > SAL_CALL SvxUnoTextCreateTextField( const ::rtl::OUString& ServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
diff --git a/svx/source/unoedit/unofored.cxx b/editeng/source/uno/unofored.cxx
index 0a357002aa..a9056b923e 100644
--- a/svx/source/unoedit/unofored.cxx
+++ b/editeng/source/uno/unofored.cxx
@@ -29,21 +29,21 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 #include <algorithm>
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <com/sun/star/i18n/WordType.hpp>
 
 #include <svl/itemset.hxx>
-#include <svx/editeng.hxx>
-#include <svx/editview.hxx>
-#include <unoedhlp.hxx>
-#include <svx/editdata.hxx>
-#include <svx/outliner.hxx>
-#include <svx/editobj.hxx>		// nur fuer die GetText-Kruecke
-
-#include <svx/unofored.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/unoedhlp.hxx>
+#include <editeng/editdata.hxx>
+#include <editeng/outliner.hxx>
+#include <editeng/editobj.hxx>		// nur fuer die GetText-Kruecke
+
+#include <editeng/unofored.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/svx/source/unoedit/unoforou.cxx b/editeng/source/uno/unoforou.cxx
index 6c69029fd4..9638d77d8e 100644
--- a/svx/source/unoedit/unoforou.cxx
+++ b/editeng/source/uno/unoforou.cxx
@@ -29,25 +29,24 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 #include <algorithm>
 #include <svl/style.hxx>
 #include <com/sun/star/i18n/WordType.hpp>
 
 #include <svl/itemset.hxx>
-#include <svx/editeng.hxx>
-#include <svx/editdata.hxx>
-#include <svx/outliner.hxx>
-#include <unoedhlp.hxx>
-//#include <svx/svdobj.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editdata.hxx>
+#include <editeng/outliner.hxx>
+#include <editeng/unoedhlp.hxx>
 #include <svl/poolitem.hxx>
 #include <vcl/wrkwin.hxx>
-#include <svx/eeitem.hxx>
+#include <editeng/eeitem.hxx>
 
-#include <svx/unoforou.hxx>
-#include <svx/unofored.hxx>
-#include <svx/outlobj.hxx>
+#include <editeng/unoforou.hxx>
+#include <editeng/unofored.hxx>
+#include <editeng/outlobj.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/svx/source/unodraw/unoipset.cxx b/editeng/source/uno/unoipset.cxx
index f2c62b28b2..f5f0322f93 100644
--- a/svx/source/unodraw/unoipset.cxx
+++ b/editeng/source/uno/unoipset.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <svl/eitem.hxx>
 #include <tools/list.hxx>
@@ -38,12 +38,10 @@
 #include <vector>
 #include <svl/itemprop.hxx>
 
-#include <svx/unoipset.hxx>
-#include <svx/svddef.hxx>
-#include <svx/svxids.hrc>
-#include <svx/unoshprp.hxx>
-#include <svx/editeng.hxx>
-
+#include <editeng/unoipset.hxx>
+#include <editeng/editids.hrc>
+#include <editeng/editeng.hxx>
+#include <svl/itempool.hxx>
 #include <algorithm>
 
 using namespace ::com::sun::star;
@@ -116,55 +114,11 @@ void SvxItemPropertySet::AddUsrAnyForID(const uno::Any& rAny, sal_uInt16 nWID)
     pCombiList->Insert(pNew);
 }
 
-//----------------------------------------------------------------------
-void SvxItemPropertySet::ObtainSettingsFromPropertySet(const SvxItemPropertySet& rPropSet,
-  SfxItemSet& rSet, uno::Reference< beans::XPropertySet > xSet ) const 
-{
-    if(rPropSet.AreThereOwnUsrAnys())
-    {
-        const SfxItemPropertyMap* pSrc = rPropSet.getPropertyMap();
-        PropertyEntryVector_t aSrcPropVector = pSrc->getPropertyEntries();
-        PropertyEntryVector_t::const_iterator aSrcIt = aSrcPropVector.begin();
-        while(aSrcIt != aSrcPropVector.end())
-        {
-            if(aSrcIt->nWID)
-            {
-                uno::Any* pUsrAny = rPropSet.GetUsrAnyForID(aSrcIt->nWID);
-                if(pUsrAny)
-                {
-                    // Aequivalenten Eintrag in pDst suchen
-                    const SfxItemPropertySimpleEntry* pEntry = m_aPropertyMap.getByName( aSrcIt->sName );
-                    if(pEntry)
-                    {
-                        // entry found
-                        if(pEntry->nWID >= OWN_ATTR_VALUE_START && pEntry->nWID <= OWN_ATTR_VALUE_END)
-                        {
-                            // Special ID im PropertySet, kann nur direkt am
-                            // Objekt gesetzt werden+
-                            xSet->setPropertyValue( aSrcIt->sName, *pUsrAny);
-                        }
-                        else
-                        {
-                            if(rSet.GetPool()->IsWhich(pEntry->nWID))
-                                rSet.Put(rSet.GetPool()->GetDefaultItem(pEntry->nWID));
-
-                            // setzen
-                            setPropertyValue(pEntry, *pUsrAny, rSet);
-                        }
-                    }
-                }
-            }
-
-            // next entry
-            ++aSrcIt;
-        }
-    }
-}
-
 /** this function checks if a SFX_METRIC_ITEM realy needs to be converted.
     This check is for items that store either metric values if theire positiv
     or percentage if theire negativ.
 */
+#if 0
 sal_Bool SvxUnoCheckForConversion( const SfxItemSet&, sal_Int32 nWID, const uno::Any& rVal )
 {
     sal_Bool bConvert = sal_True; // the default is that all metric items must be converted
@@ -184,9 +138,9 @@ sal_Bool SvxUnoCheckForConversion( const SfxItemSet&, sal_Int32 nWID, const uno:
     // the default is to always
     return bConvert;
 }
-
+#endif
 //----------------------------------------------------------------------
-uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet ) const
+uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet, bool bSearchInParent, bool bConvert ) const
 {
     uno::Any aVal;
     if(!pMap || !pMap->nWID)
@@ -196,7 +150,8 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry*
     const SfxPoolItem* pItem = 0;
     SfxItemPool* pPool = rSet.GetPool();
 
-    rSet.GetItemState( pMap->nWID, pMap->nWID != SDRATTR_XMLATTRIBUTES, &pItem );
+    // pMap->nWID != SDRATTR_XMLATTRIBUTES
+    rSet.GetItemState( pMap->nWID, bSearchInParent, &pItem );
 
     if( NULL == pItem && pPool )
     {
@@ -217,9 +172,10 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry*
         if( pMap->nMemberId & SFX_METRIC_ITEM )
         {
             // check for needed metric translation
-            if(pMap->nMemberId & SFX_METRIC_ITEM && eMapUnit != SFX_MAPUNIT_100TH_MM)
+            if ( bConvert )
+//			if(pMap->nMemberId & SFX_METRIC_ITEM && eMapUnit != SFX_MAPUNIT_100TH_MM)
             {
-                if( SvxUnoCheckForConversion( rSet, pMap->nWID, aVal ) )
+//				if( SvxUnoCheckForConversion( rSet, pMap->nWID, aVal ) )
                     SvxUnoConvertToMM( eMapUnit, aVal );
             }			
         }
@@ -242,7 +198,7 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry*
 }
 
 //----------------------------------------------------------------------
-void SvxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const uno::Any& rVal, SfxItemSet& rSet ) const
+void SvxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const uno::Any& rVal, SfxItemSet& rSet, bool bConvert ) const
 {
     if(!pMap || !pMap->nWID)
         return;
@@ -275,9 +231,10 @@ void SvxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry* pMa
         if( pMap->nMemberId & SFX_METRIC_ITEM )
         {
             // check for needed metric translation
-            if(pMap->nMemberId & SFX_METRIC_ITEM && eMapUnit != SFX_MAPUNIT_100TH_MM)
+            if ( bConvert )
+//			if(pMap->nMemberId & SFX_METRIC_ITEM && eMapUnit != SFX_MAPUNIT_100TH_MM)
             {
-                if( SvxUnoCheckForConversion( rSet, pMap->nWID, aValue ) )
+//				if( SvxUnoCheckForConversion( rSet, pMap->nWID, aValue ) )
                     SvxUnoConvertFromMM( eMapUnit, aValue );
             }			
         }
diff --git a/svx/source/unodraw/unonrule.cxx b/editeng/source/uno/unonrule.cxx
index b755691e2b..3b869ea59b 100644
--- a/svx/source/unodraw/unonrule.cxx
+++ b/editeng/source/uno/unonrule.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 #define PROPERTY_NONE 0
 
@@ -44,14 +44,15 @@
 #include <rtl/uuid.h>
 #include <rtl/memory.h>
 
-#include <svx/brshitem.hxx>
-#include <svx/unoprnms.hxx>
-#include <svx/numitem.hxx>
-#include <svx/eeitem.hxx>
-#include <svx/unotext.hxx>
-#include <svx/numitem.hxx>
-#include "unofdesc.hxx"
-#include "unonrule.hxx"
+#include <editeng/brshitem.hxx>
+#include <editeng/unoprnms.hxx>
+#include <editeng/numitem.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/unotext.hxx>
+#include <editeng/numitem.hxx>
+#include <editeng/unofdesc.hxx>
+#include <editeng/unonrule.hxx>
+#include <editeng/editids.hrc>
 
 using ::rtl::OUString;
 using ::com::sun::star::util::XCloneable;
diff --git a/svx/source/unoedit/unopracc.cxx b/editeng/source/uno/unopracc.cxx
index 18d73840c4..91e0bc9db7 100644
--- a/svx/source/unoedit/unopracc.cxx
+++ b/editeng/source/uno/unopracc.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 //------------------------------------------------------------------------
 //
@@ -50,8 +50,8 @@
 //
 //------------------------------------------------------------------------
 
-#include "unopracc.hxx"
-#include <svx/unoedsrc.hxx>
+#include <editeng/unopracc.hxx>
+#include <editeng/unoedsrc.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/svx/source/unoedit/unotext.cxx b/editeng/source/uno/unotext.cxx
index 634d2f5ae6..189af6cb15 100644
--- a/svx/source/unoedit/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 #include <vcl/svapp.hxx>
 #include <com/sun/star/style/LineSpacing.hpp>
 #include <com/sun/star/text/ControlCharacter.hpp>
@@ -43,20 +43,20 @@
 #include <rtl/uuid.h>
 #include <rtl/memory.h>
 
-#include <fontitem.hxx>
-#include <svx/tstpitem.hxx>
-#include <svx/unoprnms.hxx>
-#include <svx/unotext.hxx>
-#include <svx/unoedsrc.hxx>
-#include "unonrule.hxx"
-#include "unofdesc.hxx"
-#include <svx/unofield.hxx>
-#include <svx/flditem.hxx>
-#include <svx/numitem.hxx>
-#include <svx/editeng.hxx>
-#include <svx/outliner.hxx>
-#include <svx/unoipset.hxx>
-#include <svx/serviceinfohelper.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/tstpitem.hxx>
+#include <editeng/unoprnms.hxx>
+#include <editeng/unotext.hxx>
+#include <editeng/unoedsrc.hxx>
+#include <editeng/unonrule.hxx>
+#include <editeng/unofdesc.hxx>
+#include <editeng/unofield.hxx>
+#include <editeng/flditem.hxx>
+#include <editeng/numitem.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/outliner.hxx>
+#include <editeng/unoipset.hxx>
+#include <comphelper/serviceinfohelper.hxx>
 
 using namespace ::rtl;
 using namespace ::vos;
@@ -541,7 +541,7 @@ void SvxUnoTextRangeBase::setPropertyValue( const SfxItemPropertySimpleEntry* pM
         //	Fuer Teile von zusammengesetzten Items mit mehreren Properties (z.B. Hintergrund)
         //	muss vorher das alte Item aus dem Dokument geholt werden
         rNewSet.Put(rOldSet.Get(pMap->nWID));			// altes Item in neuen Set
-        mpPropSet->setPropertyValue(pMap, rValue, rNewSet);
+        mpPropSet->setPropertyValue(pMap, rValue, rNewSet, false);
     }
 }
 
@@ -712,7 +712,7 @@ void SvxUnoTextRangeBase::getPropertyValue( const SfxItemPropertySimpleEntry* pM
 
     default:
         if(!GetPropertyValueHelper( *((SfxItemSet*)(&rSet)), pMap, rAny, &maSelection, GetEditSource() ))
-            rAny = mpPropSet->getPropertyValue(pMap, rSet);
+            rAny = mpPropSet->getPropertyValue(pMap, rSet, false, false );
     }
 }
 
@@ -1329,7 +1329,7 @@ uno::Any SAL_CALL SvxUnoTextRangeBase::getPropertyDefault( const OUString& aProp
                     {
                         SfxItemSet aSet( *pPool,	pMap->nWID, pMap->nWID);
                         aSet.Put(pPool->GetDefaultItem(pMap->nWID));
-                        return mpPropSet->getPropertyValue(pMap, aSet);
+                        return mpPropSet->getPropertyValue(pMap, aSet, false, false);
                     }
                 }
             }
@@ -1516,7 +1516,7 @@ void SvxUnoTextRangeBase::GotoEnd(sal_Bool Expand) throw()
 sal_Bool SAL_CALL SvxUnoTextRangeBase::supportsService( const OUString& ServiceName )
     throw(uno::RuntimeException)
 {
-    return SvxServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() );
+    return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() );
 }
 
 uno::Sequence< OUString > SAL_CALL SvxUnoTextRangeBase::getSupportedServiceNames()
@@ -1529,7 +1529,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextRangeBase::getSupportedServiceNames
     SAL_THROW(())
 {
     uno::Sequence< OUString >	aSeq;
-    SvxServiceInfoHelper::addToSequence( aSeq, 3, "com.sun.star.style.CharacterProperties",
+    comphelper::ServiceInfoHelper::addToSequence( aSeq, 3, "com.sun.star.style.CharacterProperties",
                                                   "com.sun.star.style.CharacterPropertiesComplex",
                                                   "com.sun.star.style.CharacterPropertiesAsian");
     return aSeq;
@@ -2341,7 +2341,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextBase::getSupportedServiceNames_Stat
     SAL_THROW(())
 {
     uno::Sequence< OUString > aSeq( SvxUnoTextRangeBase::getSupportedServiceNames_Static() );
-    SvxServiceInfoHelper::addToSequence( aSeq, 1, "com.sun.star.text.Text" );
+    comphelper::ServiceInfoHelper::addToSequence( aSeq, 1, "com.sun.star.text.Text" );
     return aSeq;
 }
 
diff --git a/svx/source/unoedit/unotext2.cxx b/editeng/source/uno/unotext2.cxx
index 7bf8664096..579d2c6dfa 100644
--- a/svx/source/unoedit/unotext2.cxx
+++ b/editeng/source/uno/unotext2.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 #include <vcl/svapp.hxx>
 #include <vos/mutex.hxx>
 
@@ -39,11 +39,11 @@
 #include <rtl/uuid.h>
 #include <rtl/memory.h>
 
-#include <svx/eeitem.hxx>
-#include <svx/flditem.hxx>
-#include <svx/unofield.hxx>
-#include <svx/unotext.hxx>
-#include <svx/serviceinfohelper.hxx>
+#include <editeng/eeitem.hxx>
+#include <editeng/flditem.hxx>
+#include <editeng/unofield.hxx>
+#include <editeng/unotext.hxx>
+#include <comphelper/serviceinfohelper.hxx>
 
 using namespace ::rtl;
 using namespace ::vos;
@@ -398,7 +398,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextContent::getSupportedServiceNames()
     throw(uno::RuntimeException)
 {
     uno::Sequence< OUString > aSeq( SvxUnoTextRangeBase::getSupportedServiceNames() );
-    SvxServiceInfoHelper::addToSequence( aSeq, 5, "com.sun.star.style.ParagraphProperties",
+    comphelper::ServiceInfoHelper::addToSequence( aSeq, 5, "com.sun.star.style.ParagraphProperties",
                                                   "com.sun.star.style.ParagraphPropertiesComplex",
                                                   "com.sun.star.style.ParagraphPropertiesAsian",
                                                   "com.sun.star.text.TextContent",
@@ -698,13 +698,13 @@ OUString SAL_CALL SvxUnoTextCursor::getImplementationName() throw(uno::RuntimeEx
 
 sal_Bool SAL_CALL SvxUnoTextCursor::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException)
 {
-    return SvxServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() );
+    return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() );
 }
 
 uno::Sequence< OUString > SAL_CALL SvxUnoTextCursor::getSupportedServiceNames() throw(uno::RuntimeException)
 {
     uno::Sequence< OUString > aSeq( SvxUnoTextRangeBase::getSupportedServiceNames() );
-    SvxServiceInfoHelper::addToSequence( aSeq, 4,"com.sun.star.style.ParagraphProperties",
+    comphelper::ServiceInfoHelper::addToSequence( aSeq, 4,"com.sun.star.style.ParagraphProperties",
                                                   "com.sun.star.style.ParagraphPropertiesComplex",
                                                   "com.sun.star.style.ParagraphPropertiesAsian",
                                                  "com.sun.star.text.TextCursor");
diff --git a/svx/source/unoedit/unoviwed.cxx b/editeng/source/uno/unoviwed.cxx
index 7b80d0c96f..98ca6ddfff 100644
--- a/svx/source/unoedit/unoviwed.cxx
+++ b/editeng/source/uno/unoviwed.cxx
@@ -29,13 +29,13 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 #include <vcl/outdev.hxx>
 #include <vcl/window.hxx>
 
-#include <svx/unoviwed.hxx>
-#include <svx/editview.hxx>
-#include <svx/editeng.hxx>
+#include <editeng/unoviwed.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/editeng.hxx>
 
 SvxEditEngineViewForwarder::SvxEditEngineViewForwarder( EditView& rView ) :
     mrView( rView )
diff --git a/svx/source/unoedit/unoviwou.cxx b/editeng/source/uno/unoviwou.cxx
index 0d88c9a192..a5fe0380cc 100644
--- a/svx/source/unoedit/unoviwou.cxx
+++ b/editeng/source/uno/unoviwou.cxx
@@ -29,15 +29,13 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 #include <vcl/outdev.hxx>
 #include <vcl/window.hxx>
 
-#include <svx/unoviwou.hxx>
-#include <svx/outliner.hxx>
-#include <svx/editeng.hxx>
-//#include <svx/svdotext.hxx>
-
+#include <editeng/unoviwou.hxx>
+#include <editeng/outliner.hxx>
+#include <editeng/editeng.hxx>
 
 SvxDrawOutlinerViewForwarder::SvxDrawOutlinerViewForwarder( OutlinerView& rOutl ) :
     mrOutlinerView ( rOutl ), maTextShapeTopLeft()
diff --git a/svx/source/xml/editsource.hxx b/editeng/source/xml/editsource.hxx
index 8cca5d8108..02702fa62f 100644
--- a/svx/source/xml/editsource.hxx
+++ b/editeng/source/xml/editsource.hxx
@@ -31,7 +31,7 @@
 #ifndef _SVX_EDITSOURCE_HXX
 #define _SVX_EDITSOURCE_HXX
 
-#include <svx/unoedsrc.hxx>
+#include <editeng/unoedsrc.hxx>
 
 class EditEngine;
 class SvxEditEngineSourceImpl;
diff --git a/editeng/source/xml/makefile.mk b/editeng/source/xml/makefile.mk
new file mode 100644
index 0000000000..bfcfeb70f1
--- /dev/null
+++ b/editeng/source/xml/makefile.mk
@@ -0,0 +1,50 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.12 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..
+PRJNAME=editeng
+TARGET=xml
+
+ENABLE_EXCEPTIONS=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+
+# --- Files --------------------------------------------------------
+SLOFILES = \
+        $(SLO)$/xmltxtimp.obj		\
+        $(SLO)$/xmltxtexp.obj		
+
+# --- Targets --------------------------------------------------------------
+
+.INCLUDE : target.mk
diff --git a/svx/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx
index dc1a3d1134..21bf37ac90 100644
--- a/svx/source/xml/xmltxtexp.cxx
+++ b/editeng/source/xml/xmltxtexp.cxx
@@ -29,10 +29,10 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 /** this file implements an export of a selected EditEngine content into
-    a xml stream. See svx/source/inc/xmledit.hxx for interface */
+    a xml stream. See editeng/source/inc/xmledit.hxx for interface */
 #include <com/sun/star/ucb/XAnyCompareFactory.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -51,15 +51,15 @@
 #include <comphelper/processfactory.hxx>
 #include <unotools/streamwrap.hxx>
 #include <xmloff/xmlexp.hxx>
-#include <svx/unoedsrc.hxx>
-#include <svx/unofored.hxx>
-#include <svx/unotext.hxx>
-#include <svx/unoprnms.hxx>
-#include <svx/unofield.hxx>
-#include <svx/editeng.hxx>
+#include <editeng/unoedsrc.hxx>
+#include <editeng/unofored.hxx>
+#include <editeng/unotext.hxx>
+#include <editeng/unoprnms.hxx>
+#include <editeng/unofield.hxx>
+#include <editeng/editeng.hxx>
 #include "editsource.hxx"
-#include "unonrule.hxx"
-#include <svx/unoipset.hxx>
+#include <editeng/unonrule.hxx>
+#include <editeng/unoipset.hxx>
 
 using namespace com::sun::star;
 using namespace com::sun::star::container;
diff --git a/svx/source/xml/xmltxtimp.cxx b/editeng/source/xml/xmltxtimp.cxx
index ec98e255b2..cc520b0b9d 100644
--- a/svx/source/xml/xmltxtimp.cxx
+++ b/editeng/source/xml/xmltxtimp.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 #include <tools/debug.hxx>
 #include <com/sun/star/io/XActiveDataControl.hpp>
 #include <com/sun/star/io/XActiveDataSource.hpp>
@@ -49,10 +49,10 @@
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmlstyle.hxx>
 #include "editsource.hxx"
-#include <svx/editeng.hxx>
-#include <svx/unotext.hxx>
-#include <svx/unoprnms.hxx>
-#include <svx/unoipset.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/unotext.hxx>
+#include <editeng/unoprnms.hxx>
+#include <editeng/unoipset.hxx>
 
 using namespace com::sun::star;
 using namespace com::sun::star::document;
diff --git a/editeng/util/editeng.dxp b/editeng/util/editeng.dxp
new file mode 100644
index 0000000000..9630d7e067
--- /dev/null
+++ b/editeng/util/editeng.dxp
@@ -0,0 +1,3 @@
+component_getImplementationEnvironment
+component_writeInfo
+component_getFactory
diff --git a/editeng/util/hidother.src b/editeng/util/hidother.src
new file mode 100644
index 0000000000..01f457b457
--- /dev/null
+++ b/editeng/util/hidother.src
@@ -0,0 +1,72 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: hidother.src,v $
+ * $Revision: 1.45 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#include "../inc/helpid.hrc"			// HID_XXX
+#include <editeng/svxids.hrc>
+#include "../inc/fmhelp.hrc"
+
+#define HID_AUTOCORR_HELP_ACORSENTWORD          HID_AUTOCORR_HELP_START+5
+#define HID_AUTOCORR_HELP_ACORSENTWORDENEMDASH  HID_AUTOCORR_HELP_START+13
+#define HID_AUTOCORR_HELP_ACORWORD              HID_AUTOCORR_HELP_START+3
+#define HID_AUTOCORR_HELP_ACORWORDENEMDASH      HID_AUTOCORR_HELP_START+11
+#define HID_AUTOCORR_HELP_CHGFRACTIONSYMBOL     HID_AUTOCORR_HELP_START+20
+#define HID_AUTOCORR_HELP_CHGORDINALNUMBER      HID_AUTOCORR_HELP_START+21
+#define HID_AUTOCORR_HELP_CHGQUOTES             HID_AUTOCORR_HELP_START+15
+#define HID_AUTOCORR_HELP_CHGSGLQUOTES          HID_AUTOCORR_HELP_START+16
+#define HID_AUTOCORR_HELP_CHGTOENEMDASH         HID_AUTOCORR_HELP_START+7
+#define HID_AUTOCORR_HELP_CHGWEIGHTUNDERL       HID_AUTOCORR_HELP_START+19
+#define HID_AUTOCORR_HELP_INGNOREDOUBLESPACE    HID_AUTOCORR_HELP_START+18
+#define HID_AUTOCORR_HELP_SENT                  HID_AUTOCORR_HELP_START+1
+#define HID_AUTOCORR_HELP_SENTENEMDASH          HID_AUTOCORR_HELP_START+9
+#define HID_AUTOCORR_HELP_SENTWORD              HID_AUTOCORR_HELP_START+2
+#define HID_AUTOCORR_HELP_SENTWORDENEMDASH      HID_AUTOCORR_HELP_START+10
+#define HID_AUTOCORR_HELP_SETINETATTR           HID_AUTOCORR_HELP_START+17
+#define HID_AUTOCORR_HELP_WORD                  HID_AUTOCORR_HELP_START+0
+#define HID_AUTOCORR_HELP_WORDENEMDASH          HID_AUTOCORR_HELP_START+8
+
+hidspecial HID_AUTOCORR_HELP_ACORSENTWORD   { HelpID =  HID_AUTOCORR_HELP_ACORSENTWORD;};
+hidspecial HID_AUTOCORR_HELP_ACORSENTWORDENEMDASH   { HelpID =  HID_AUTOCORR_HELP_ACORSENTWORDENEMDASH;};
+hidspecial HID_AUTOCORR_HELP_ACORWORD       { HelpID =  HID_AUTOCORR_HELP_ACORWORD;};
+hidspecial HID_AUTOCORR_HELP_ACORWORDENEMDASH       { HelpID =  HID_AUTOCORR_HELP_ACORWORDENEMDASH;};
+hidspecial HID_AUTOCORR_HELP_CHGFRACTIONSYMBOL  { HelpID =  HID_AUTOCORR_HELP_CHGFRACTIONSYMBOL;};
+hidspecial HID_AUTOCORR_HELP_CHGORDINALNUMBER   { HelpID =  HID_AUTOCORR_HELP_CHGORDINALNUMBER;};
+hidspecial HID_AUTOCORR_HELP_CHGQUOTES          { HelpID =  HID_AUTOCORR_HELP_CHGQUOTES;};
+hidspecial HID_AUTOCORR_HELP_CHGSGLQUOTES       { HelpID =  HID_AUTOCORR_HELP_CHGSGLQUOTES;};
+hidspecial HID_AUTOCORR_HELP_CHGTOENEMDASH      { HelpID =  HID_AUTOCORR_HELP_CHGTOENEMDASH;};
+hidspecial HID_AUTOCORR_HELP_CHGWEIGHTUNDERL    { HelpID =  HID_AUTOCORR_HELP_CHGWEIGHTUNDERL;};
+hidspecial HID_AUTOCORR_HELP_INGNOREDOUBLESPACE { HelpID =  HID_AUTOCORR_HELP_INGNOREDOUBLESPACE;};
+hidspecial HID_AUTOCORR_HELP_SENT           { HelpID =  HID_AUTOCORR_HELP_SENT;};
+hidspecial HID_AUTOCORR_HELP_SENTENEMDASH           { HelpID =  HID_AUTOCORR_HELP_SENTENEMDASH;};
+hidspecial HID_AUTOCORR_HELP_SENTWORD       { HelpID =  HID_AUTOCORR_HELP_SENTWORD;};
+hidspecial HID_AUTOCORR_HELP_SENTWORDENEMDASH       { HelpID =  HID_AUTOCORR_HELP_SENTWORDENEMDASH;};
+hidspecial HID_AUTOCORR_HELP_SETINETATTR        { HelpID =  HID_AUTOCORR_HELP_SETINETATTR;};
+hidspecial HID_AUTOCORR_HELP_WORD           { HelpID =  HID_AUTOCORR_HELP_WORD;};
+hidspecial HID_AUTOCORR_HELP_WORDENEMDASH           { HelpID =  HID_AUTOCORR_HELP_WORDENEMDASH;};
+
+
diff --git a/editeng/util/makefile.mk b/editeng/util/makefile.mk
new file mode 100644
index 0000000000..6eda6550f7
--- /dev/null
+++ b/editeng/util/makefile.mk
@@ -0,0 +1,103 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.61 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..
+
+PRJNAME=editeng
+TARGET=editeng
+GEN_HID=TRUE
+GEN_HID_OTHER=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :  settings.mk
+
+# -------------
+
+HELPIDFILES=    ..$/inc$/helpid.hrc
+
+# editeng
+SHL1TARGET= editeng$(DLLPOSTFIX)
+SHL1IMPLIB= iediteng
+SHL1USE_EXPORTS=name
+SHL1LIBS= \
+    $(SLB)$/items.lib     \
+    $(SLB)$/misc.lib	\
+    $(SLB)$/rtf.lib	\
+    $(SLB)$/uno.lib	\
+    $(SLB)$/accessibility.lib	\
+    $(SLB)$/editeng.lib \
+    $(SLB)$/outliner.lib \
+    $(SLB)$/xml.lib 
+
+SHL1STDLIBS= \
+             $(XMLOFFLIB) \
+             $(BASEGFXLIB) \
+             $(LNGLIB) \
+             $(BASICLIB) \
+             $(SVTOOLLIB) \
+             $(TKLIB) \
+             $(VCLLIB) \
+             $(SVLLIB) \
+             $(SOTLIB) \
+             $(UNOTOOLSLIB) \
+             $(TOOLSLIB) \
+             $(I18NISOLANGLIB) \
+             $(I18NPAPERLIB) \
+             $(COMPHELPERLIB) \
+             $(UCBHELPERLIB) \
+             $(CPPUHELPERLIB) \
+             $(CPPULIB) \
+             $(VOSLIB) \
+             $(SALLIB) \
+             $(ICUUCLIB)
+
+SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
+DEF1NAME=	$(SHL1TARGET)
+DEFLIB1NAME=$(TARGET)
+
+# ------------------------------------------------------------------------------
+
+# Resource files
+SRSFILELIST=\
+        $(SRS)$/misc.srs \
+        $(SRS)$/items.srs \
+        $(SRS)$/editeng.srs \
+        $(SRS)$/outliner.srs
+
+RESLIB1NAME=editeng
+RESLIB1IMAGES=$(PRJ)$/res $(PRJ)$/source/svdraw
+RESLIB1SRSFILES= $(SRSFILELIST)
+
+# --- Targets -------------------------------------------------------
+
+.INCLUDE :  target.mk
+
diff --git a/editeng/util/makefile.pmk b/editeng/util/makefile.pmk
new file mode 100644
index 0000000000..fac1139d7b
--- /dev/null
+++ b/editeng/util/makefile.pmk
@@ -0,0 +1,47 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.pmk,v $
+#
+# $Revision: 1.6 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+# define EDITENG_DLLIMPLEMENTATION (see @ editengdllapi.h)
+CDEFS += -DEDITENG_DLLIMPLEMENTATION
+
+.IF "$(ENABLE_GTK)" != ""
+CFLAGS+=-DENABLE_GTK
+.ENDIF
+
+.IF "$(ENABLE_KDE)" != ""
+CFLAGS+=-DENABLE_KDE
+.ENDIF
+
+.IF "$(ENABLE_KDE4)" != ""
+CFLAGS+=-DENABLE_KDE4
+.ENDIF
+
+VISIBILITY_HIDDEN=TRUE
diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc
index 57bfa50c1d..673b058306 100644
--- a/sfx2/inc/sfx2/sfxsids.hrc
+++ b/sfx2/inc/sfx2/sfxsids.hrc
@@ -32,92 +32,25 @@
 
 // include ---------------------------------------------------------------
 
-#ifndef _SOLAR_HRC
 #include <svl/solar.hrc>
-#endif
-
-#define SID_SFX_START                5000
-#define SID_SFX_END                  8999
-
-#ifndef _CNTIDS_HRC
 #include <sfx2/cntids.hrc>
-#endif
+#include <editeng/editids.hrc>
 
 // Please be careful:
 // Changing just one part here doesn't add new
 // docking windows automatically!
 //
-#define SID_DOCKWIN_START			9800
-#define SID_DOCKWIN_0				9800
-#define SID_DOCKWIN_1				9801
-#define SID_DOCKWIN_2				9802
-#define SID_DOCKWIN_3				9803
-#define SID_DOCKWIN_4				9804
-#define SID_DOCKWIN_5				9805
-#define SID_DOCKWIN_6				9806
-#define SID_DOCKWIN_7				9807
-#define SID_DOCKWIN_8				9808
-#define SID_DOCKWIN_9				9809
-/*
-#define SID_DOCKWIN_10				9810
-#define SID_DOCKWIN_11				9811
-#define SID_DOCKWIN_12				9812
-#define SID_DOCKWIN_13				9813
-#define SID_DOCKWIN_14				9814
-#define SID_DOCKWIN_15				9815
-#define SID_DOCKWIN_16				9816
-#define SID_DOCKWIN_17				9817
-#define SID_DOCKWIN_18				9818
-#define SID_DOCKWIN_19				9819
-#define SID_DOCKWIN_20				9820
-#define SID_DOCKWIN_21				9821
-#define SID_DOCKWIN_22				9822
-#define SID_DOCKWIN_23				9823
-#define SID_DOCKWIN_24				9824
-#define SID_DOCKWIN_25				9825
-#define SID_DOCKWIN_26				9826
-#define SID_DOCKWIN_27				9827
-#define SID_DOCKWIN_28				9828
-#define SID_DOCKWIN_29				9829
-*/
-#define SID_DOCKWIN_END             9999
-
-#define SID_LIB_START               10000
-#define SID_LIB_END                 19999
-
-#define SID_APP_START               20000
-#define SID_APP_END                 29999
-
-#define SID_SW_START                20000
-#define SID_SW_END                  25999
-
-#define SID_SC_START                26000
-#define SID_SC_END                  26999
-
-#define SID_SD_START                27000
-#define SID_SD_END                  27999
-
-#define SID_Sa_START                28000
-#define SID_Sa_END                  28999
-
-#define SID_Sb_START                29000
-#define SID_Sb_END                  29999
-
-#define SID_OBJ_START               30000
-#define SID_OBJ0_START              (SID_OBJ_START +    0)
-#define SID_OBJ2_START              (SID_OBJ_START +  256)
-#define SID_OBJ1_START              (SID_OBJ_START +  512)
-#define SID_OBJ3_START              (SID_OBJ_START +  768)
-#define SID_OBJ4_START              (SID_OBJ_START + 1024)
-#define SID_OBJ5_START              (SID_OBJ_START + 1280)
-#define SID_OBJ6_START              (SID_OBJ_START + 1536)
-#define SID_OBJ7_START              (SID_OBJ_START + 1792)
-#define SID_OBJ_END(nStart)         (nStart+255)
-
-#define SID_SIM_START               SID_OBJ0_START
-#define SID_SCH_START               SID_OBJ1_START
-#define SID_SMA_START               SID_OBJ2_START
-#define SID_BASICIDE_START          SID_OBJ3_START
+
+#define SID_DOCKWIN_0				SID_DOCKWIN_START
+#define SID_DOCKWIN_1				SID_DOCKWIN_START+1
+#define SID_DOCKWIN_2				SID_DOCKWIN_START+2
+#define SID_DOCKWIN_3				SID_DOCKWIN_START+3
+#define SID_DOCKWIN_4				SID_DOCKWIN_START+4
+#define SID_DOCKWIN_5				SID_DOCKWIN_START+5
+#define SID_DOCKWIN_6				SID_DOCKWIN_START+6
+#define SID_DOCKWIN_7				SID_DOCKWIN_START+7
+#define SID_DOCKWIN_8				SID_DOCKWIN_START+8
+#define SID_DOCKWIN_9				SID_DOCKWIN_START+9
 
 //=========================================================================
 
@@ -994,19 +927,6 @@
 #define SID_SFXNODES_ATTACHLIST             (SID_SFXNODES_START + 41)
 #define SID_SFXNODES_END                    SID_SFXNODES_ATTACHLIST
 
-#define SID_OPTIONS_START               (SID_LIB_START +    2000)
-#define SID_OPTIONS_FIRSTFREE           99
-#define SID_OPTIONS_END                 (SID_OPTIONS_START + 100)
-
-#define SID_SBA_START                   (SID_LIB_START	+	2101)
-#define SID_SBA_END                     (SID_SBA_START	+	 149)
-
-#define SID_DBACCESS_START				(SID_LIB_START		+    2251)
-#define SID_DBACCESS_END				(SID_DBACCESS_START	+     200)
-
-#define SID_RPTUI_START                 (SID_LIB_START      +    2452)
-#define SID_RPTUI_END                   (SID_RPTUI_START    +     197)
-
 // SaveTabPage
 #define SID_ATTR_DOCINFO                (SID_OPTIONS_START +  0)
 #define SID_ATTR_BACKUP                 (SID_OPTIONS_START +  1)
@@ -1132,30 +1052,6 @@
 
 // slot IDs from SVX (svxids.hrc) ---------------------------------------------
 
-#define SID_SVX_START                       (SID_LIB_START +   0)
-
-#define SID_ATTR_CHAR                       (SID_SVX_START +   6)
-#define SID_ATTR_CHAR_FONT                  (SID_SVX_START +   7)
-#define SID_ATTR_CHAR_POSTURE               (SID_SVX_START +   8)
-#define SID_ATTR_CHAR_WEIGHT                (SID_SVX_START +   9)
-#define SID_ATTR_CHAR_SHADOWED              (SID_SVX_START +  10)
-#define SID_ATTR_CHAR_WORDLINEMODE          (SID_SVX_START +  11)
-#define SID_ATTR_CHAR_CONTOUR               (SID_SVX_START +  12)
-#define SID_ATTR_CHAR_STRIKEOUT             (SID_SVX_START +  13)
-#define SID_ATTR_CHAR_UNDERLINE             (SID_SVX_START +  14)
-#define SID_ATTR_CHAR_FONTHEIGHT            (SID_SVX_START +  15)
-#define SID_ATTR_CHAR_PROPSIZE              (SID_SVX_START +  16)
-#define SID_ATTR_CHAR_COLOR                 (SID_SVX_START +  17)
-#define SID_ATTR_CHAR_KERNING               (SID_SVX_START +  18)
-#define SID_ATTR_CHAR_CASEMAP               (SID_SVX_START +  19)
-#define SID_ATTR_CHAR_LANGUAGE              (SID_SVX_START +  20)
-#define SID_ATTR_CHAR_ESCAPEMENT            (SID_SVX_START +  21)
-#define SID_ATTR_CHAR_FONTLIST              (SID_SVX_START +  22)
-// Temp-Id f"ur FontMapType
-#define SID_ATTR_CHAR_MAPTYPE               (SID_SVX_START +  64)
-// zusaetzlich f"ur die Ext-Zeichen-TabPage
-#define SID_ATTR_CHAR_AUTOKERN              (SID_SVX_START +  67)
-#define SID_ATTR_CHAR_OVERLINE              (SID_SVX_START +  68)
 #define SID_ZOOM_TOOLBOX                    (SID_SVX_START +  96)
 #define SID_ZOOM_OUT                        (SID_SVX_START +  97)
 #define SID_ZOOM_IN                         (SID_SVX_START +  98)
@@ -1290,11 +1186,6 @@
 
 #define SID_ATTR_CHAR_FILLCOLOR		    	(SID_SFX_START + 1551)
 
-// SvxSizeItem
-#define MID_SIZE_SIZE       0
-#define MID_SIZE_WIDTH      1
-#define MID_SIZE_HEIGHT     2
-
 // SfxScriptOrganizerItem
 #define MID_SCRIPT_ORGANIZER_LANGUAGE       1 // Don't use zero for MID's. It's forbidden to do it!
 
diff --git a/svx/inc/accessibility.hrc b/svx/inc/accessibility.hrc
index 8909545e61..529aa5b3b9 100644
--- a/svx/inc/accessibility.hrc
+++ b/svx/inc/accessibility.hrc
@@ -78,10 +78,8 @@
 #define RID_SVXSTR_GRAPHCTRL_ACC_NAME			(RID_SVXSTR_GRAPHCTRL_ACC_START + 0)
 #define RID_SVXSTR_GRAPHCTRL_ACC_DESCRIPTION	(RID_SVXSTR_GRAPHCTRL_ACC_START + 1)
 
-// text paragraphs and bullets
+// text paragraphs
 #define RID_SVXSTR_A11Y_TEXTHELPER_START		(RID_SVXSTR_ACCESSIBILITY_START + 70)
-#define RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION	(RID_SVXSTR_A11Y_TEXTHELPER_START + 2)
-#define RID_SVXSTR_A11Y_IMAGEBULLET_NAME		(RID_SVXSTR_A11Y_TEXTHELPER_START + 3)
 
 // SvxShowCharSetAcc
 #define RID_SVXSTR_CHARACTER_SELECTION			(RID_SVXSTR_ACCESSIBILITY_START + 80)
diff --git a/svx/inc/dlgutil.hxx b/svx/inc/dlgutil.hxx
index c61de8c316..75085a6b77 100644
--- a/svx/inc/dlgutil.hxx
+++ b/svx/inc/dlgutil.hxx
@@ -31,94 +31,18 @@
 #define _SVX_DLGUTIL_HXX
 
 // include ---------------------------------------------------------------
-#include <vcl/field.hxx>
-#include <svl/poolitem.hxx>
-#include <svl/intitem.hxx>
-#include "svx/svxdllapi.h"
+#include <svtools/unitconv.hxx>
+#include <svx/svxdllapi.h>
 
 // macro -----------------------------------------------------------------
 
 // typedef ---------------------------------------------------------------
 
-typedef long (*FUNC_CONVERT)(long);
-
 // Functions -------------------------------------------------------------
-
-// FieldUnit im MetricField oder -Box umsetzen
-SVX_DLLPUBLIC void SetFieldUnit( MetricField& rCtrl,
-                   FieldUnit eUnit, BOOL bAll = FALSE );
-SVX_DLLPUBLIC void SetFieldUnit( MetricBox& rCtrl,
-                   FieldUnit eUnit, BOOL bAll = FALSE );
+class SfxItemSet;
 
 SVX_DLLPUBLIC FieldUnit GetModuleFieldUnit( const SfxItemSet& );
 
-// Metriken umrechnen
-SVX_DLLPUBLIC long 		CalcToUnit( float nIn, SfxMapUnit eUnit );
-SVX_DLLPUBLIC long 		CalcToPoint( long nIn, SfxMapUnit eUnit, USHORT nFaktor );
-
-SVX_DLLPUBLIC long		ItemToControl( long nIn, SfxMapUnit eItem, SfxFieldUnit eCtrl );
-long		ControlToItem( long nIn, SfxFieldUnit eCtrl, SfxMapUnit eItem );
-
-SVX_DLLPUBLIC FieldUnit	MapToFieldUnit( const SfxMapUnit eUnit );
-MapUnit		FieldToMapUnit( const SfxFieldUnit eUnit );
-
-long		ConvertValueToMap( long nVal, SfxMapUnit eUnit );
-long		ConvertValueToUnit( long nVal, SfxMapUnit eUnit );
-
-SVX_DLLPUBLIC void 		SetMetricValue( MetricField& rField,
-                            long lCoreValue, SfxMapUnit eUnit );
-SVX_DLLPUBLIC long 		GetCoreValue( const MetricField& rField, SfxMapUnit eUnit );
-
-// to Twips
-long 	CMToTwips( long nIn );
-long 	MMToTwips( long nIn );
-long 	InchToTwips( long nIn );
-SVX_DLLPUBLIC long 	PointToTwips( long nIn );
-long 	PicaToTwips( long nIn );
-
-// to CM
-long 	TwipsToCM( long nIn );
-long 	InchToCM( long nIn );
-long 	MMToCM( long nIn );
-long 	PointToCM( long nIn );
-long	PicaToCM( long nIn );
-
-// to MM
-long 	TwipsToMM( long nIn );
-long 	CMToMM( long nIn );
-long 	InchToMM( long nIn );
-long 	PointToMM( long nIn );
-long 	PicaToMM( long nIn );
-
-// to Inch
-long 	TwipsToInch(long nIn );
-long 	CMToInch(long nIn );
-long 	MMToInch(long nIn );
-long 	PointToInch(long nIn );
-long	PicaToInch(long nIn );
-
-// to Point
-long 	TwipsToPoint(long nIn );
-long 	InchToPoint(long nIn );
-long 	CMToPoint(long nIn );
-long 	MMToPoint(long nIn );
-long 	PicaToPoint(long nIn );
-
-// To Pica
-long 	TwipsToPica(long nIn );
-long 	InchToPica(long nIn );
-long 	PointToPica(long nIn );
-long 	CMToPica(long nIn );
-long	MMToPica(long nIn );
-
-// generische Wandlung
-long 	TransformMetric( long nVal, FieldUnit aOld, FieldUnit aNew );
-
-// replacement of the SfxIniManager
-String		ConvertPosSizeToIniString( const Point& rPos, const Size& rSize );
-sal_Bool	ConvertIniStringToPosSize(	const String& rIniStr, Point& rPos, Size& rSize );
-
-
 #define OUTPUT_DRAWMODE_COLOR		(DRAWMODE_DEFAULT)
 #define OUTPUT_DRAWMODE_CONTRAST	(DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT)
 
diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc
index d1c54a76b9..b779de7093 100644
--- a/svx/inc/helpid.hrc
+++ b/svx/inc/helpid.hrc
@@ -37,8 +37,6 @@
 
 // Help-Ids --------------------------------------------------------------
 #define HID_ALIGN_TBX                                               (HID_SVX_START +   1)
-#define HID_AUTOCORR_HELP_END                                       (HID_SVX_START +   2)
-#define HID_AUTOCORR_HELP_START                                     (HID_SVX_START +   3)
 #define HID_BMPMASK_CTL_PIPETTE                                     (HID_SVX_START +   4)
 #define HID_BMPMASK_CTL_QCOL_1                                      (HID_SVX_START +   5)
 #define HID_BMPMASK_TBI_PIPETTE                                     (HID_SVX_START +   6)
diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc
index cab9b7e918..a6bfc43b00 100644
--- a/svx/inc/svx/dialogs.hrc
+++ b/svx/inc/svx/dialogs.hrc
@@ -41,8 +41,6 @@
 #define RID_SVX_FIRSTFREE                   305
 
 // some strings also used in CUI
-#define RID_SVXSTR_PAPERBIN                 (RID_SVX_START + 145)
-#define RID_SVXSTR_PAPERBIN_SETTINGS		(RID_SVX_START + 149)
 #define RID_SVXERRCTX                       (RID_SVX_START + 351)
 #define RID_SVXSTR_COLOR                    (RID_SVX_START + 179)
 #define RID_SVXSTR_TRANSPARENT              (RID_SVX_START + 190)
@@ -179,15 +177,6 @@
 #define RID_SVXPAGE_HEADER                  (RID_SVX_START +  27)
 #define RID_SVXQBX_DELETE_HEADFOOT          (RID_SVX_START +  28)
 
-// ResIds fuer HM-QueryBoxen und Error-Strings
-#define RID_SVXQB_THESAURUS                 (RID_SVX_START +  33)
-#define RID_SVXQB_CONTINUE                  (RID_SVX_START +  34)
-#define RID_SVXQB_BODYTEXT                  (RID_SVX_START +  35)
-#define RID_SVXQB_SPECIAL                   (RID_SVX_START +  36)
-#define RID_SVXQB_SPECIAL_FORCED            (RID_SVX_START +  37)
-// + 38 ist vergeben, siehe RID_SVXDLG_THES_LANGUAGE
-#define RID_SVXQB_BW_CONTINUE               (RID_SVX_START +  39)
-
 // ResId's fuer Dialoge aus StarDraw
 #define RID_SVXPAGE_POSITION                (RID_SVX_START +  46)
 #define RID_SVXPAGE_SIZE                    (RID_SVX_START +  47)
@@ -422,54 +411,12 @@
 #define RID_SVXSTR_SEARCH                   (RID_SVX_START +  81)
 #define RID_SVXSTR_REPLACE                  (RID_SVX_START +  82)
 
-// paper formats
-#define RID_SVXSTR_PAPER_A0                 (RID_SVX_START + 100)
-#define RID_SVXSTR_PAPER_A1                 (RID_SVX_START + 101)	
-#define RID_SVXSTR_PAPER_A2                 (RID_SVX_START + 102)	
-#define RID_SVXSTR_PAPER_A3                 (RID_SVX_START + 103)	
-#define RID_SVXSTR_PAPER_A4                 (RID_SVX_START + 104)	
-#define RID_SVXSTR_PAPER_A5                 (RID_SVX_START + 105)	
-#define RID_SVXSTR_PAPER_B4_ISO             (RID_SVX_START + 106)	
-#define RID_SVXSTR_PAPER_B5_ISO             (RID_SVX_START + 107)	
-#define RID_SVXSTR_PAPER_LETTER             (RID_SVX_START + 108)	
-#define RID_SVXSTR_PAPER_LEGAL              (RID_SVX_START + 109)	
-#define RID_SVXSTR_PAPER_TABLOID            (RID_SVX_START + 110)	
-#define RID_SVXSTR_PAPER_USER               (RID_SVX_START + 111)	
-#define RID_SVXSTR_PAPER_B6_ISO             (RID_SVX_START + 112)	
-#define RID_SVXSTR_PAPER_C4                 (RID_SVX_START + 113)	
-#define RID_SVXSTR_PAPER_C5                 (RID_SVX_START + 114)	
-#define RID_SVXSTR_PAPER_C6                 (RID_SVX_START + 115)	
-#define RID_SVXSTR_PAPER_C65                (RID_SVX_START + 116)	
-#define RID_SVXSTR_PAPER_DL                 (RID_SVX_START + 117)	
-#define RID_SVXSTR_PAPER_DIA                (RID_SVX_START + 118)	
-#define RID_SVXSTR_PAPER_SCREEN             (RID_SVX_START + 119)	
-#define RID_SVXSTR_PAPER_C                  (RID_SVX_START + 120)	
-#define RID_SVXSTR_PAPER_D                  (RID_SVX_START + 121)	
-#define RID_SVXSTR_PAPER_E                  (RID_SVX_START + 122)	
-#define RID_SVXSTR_PAPER_EXECUTIVE          (RID_SVX_START + 123)	
-#define RID_SVXSTR_PAPER_LEGAL2				(RID_SVX_START + 124)	
-#define RID_SVXSTR_PAPER_MONARCH			(RID_SVX_START + 125)	
-#define RID_SVXSTR_PAPER_COM675				(RID_SVX_START + 126)	
-#define RID_SVXSTR_PAPER_COM9				(RID_SVX_START + 127)	
-#define RID_SVXSTR_PAPER_COM10				(RID_SVX_START + 128)	
-#define RID_SVXSTR_PAPER_COM11				(RID_SVX_START + 129)	
-#define RID_SVXSTR_PAPER_COM12				(RID_SVX_START + 130)	
-#define RID_SVXSTR_PAPER_KAI16				(RID_SVX_START + 131)	
-#define RID_SVXSTR_PAPER_KAI32				(RID_SVX_START + 132)	
-#define RID_SVXSTR_PAPER_KAI32BIG			(RID_SVX_START + 133)	
-#define RID_SVXSTR_PAPER_B4_JIS             (RID_SVX_START + 134)	
-#define RID_SVXSTR_PAPER_B5_JIS             (RID_SVX_START + 135)	
-#define RID_SVXSTR_PAPER_B6_JIS             (RID_SVX_START + 136)	
-
 #define RID_SVXSTR_FULLSIZE                 (RID_SVX_START + 144)
 
 // ResIds fuer die verschiedenen Strings des PageDlgs
 #define RID_SVXSTR_CALC_PAGE                (RID_SVX_START + 146)
 #define RID_SVXSTR_DRAW_PAGE                (RID_SVX_START + 147)
 
-// HM_ERR
-#define RID_SVXSTR_HMERR_THESAURUS          (RID_SVX_START + 150)
-
 // Strings der ToolBox-Controls aus tbcontrl.cxx
 #define RID_SVXSTR_FILLPATTERN              (RID_SVX_START + 191)
 #define RID_SVXSTR_FRAME                    (RID_SVX_START + 192)
@@ -910,11 +857,6 @@
 #define RID_SVXSTR_QRY_PRINT_ALL            (RID_SVX_START + 804)
 #define RID_SVXSTR_QRY_PRINT_SELECTION      (RID_SVX_START + 805)
 
-// strings for error messsages in dictionary updates
-#define RID_SVXSTR_DIC_ERR_UNKNOWN			(RID_SVX_START +  810)
-#define RID_SVXSTR_DIC_ERR_FULL				(RID_SVX_START +  811)
-#define RID_SVXSTR_DIC_ERR_READONLY			(RID_SVX_START +  812)
-
 // strings for graphic attributes/undo
 #define RID_SVXSTR_GRAFCROP					(RID_SVX_START + 820)
 #define RID_SVXSTR_UNDO_GRAFMODE			(RID_SVX_START + 821)
diff --git a/svx/inc/svx/impgrf.hxx b/svx/inc/svx/impgrf.hxx
deleted file mode 100644
index b12068e958..0000000000
--- a/svx/inc/svx/impgrf.hxx
+++ /dev/null
@@ -1,65 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: impgrf.hxx,v $
- * $Revision: 1.7 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SVX_IMPGRF_HXX
-#define _SVX_IMPGRF_HXX
-
-// include ---------------------------------------------------------------
-
-#include <svtools/filter.hxx>
-
-#ifndef _BUTTON_HXX //autogen
-#include <vcl/button.hxx>
-#endif
-#include "svx/svxdllapi.h"
-
-// Funktionen ------------------------------------------------------------
-
-// returnt einen static Graphic-Filter, wird einmalig angelegt,
-// steht immer zur Verfuegung, DARF NIE geloescht werden!!!!
-SVX_DLLPUBLIC GraphicFilter* GetGrfFilter();
-SVX_DLLPUBLIC int 	LoadGraphic( const String& rPath, const String& rFilter,
-                     Graphic& rGraphic,
-                     GraphicFilter* pFilter = NULL,
-                     USHORT* pDeterminedFormat = NULL );
-
-// class SvxImportGraphicDialog ------------------------------------------
-#ifndef SV_NODIALOG
-
-#define ENABLE_STANDARD			((USHORT)0x0001)	// Standard-Button
-#define ENABLE_LINK				((USHORT)0x0002)	// Verkn"upfungs-Box
-#define ENABLE_STD_AND_LINK		(ENABLE_STANDARD | ENABLE_LINK)
-#define ENABLE_PROPERTY			((USHORT)0x0004)	// Eigenschaften-Button
-#define ENABLE_ALL				((USHORT)0x0007)	// alle
-#define ENABLE_PROP_WITHOUTLINK ((USHORT)0x0008)	// Eigenschaften ohne Link
-#define ENABLE_EMPTY_FILENAMES	((USHORT)0x0010)	// Leere Dateinamen zulassen
-
-#endif	// SV_NODIALOG
-
-#endif
diff --git a/svx/inc/svx/serviceinfohelper.hxx b/svx/inc/svx/serviceinfohelper.hxx
deleted file mode 100644
index 44fc4fc524..0000000000
--- a/svx/inc/svx/serviceinfohelper.hxx
+++ /dev/null
@@ -1,63 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: unoprov.hxx,v $
- * $Revision: 1.5 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef SVX_UNOPROV_HXX
-#define SVX_UNOPROV_HXX
-
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include "svx/svxdllapi.h"
-
-/***********************************************************************
-* class SvxServiceInfoHelper                                           *
-***********************************************************************/
-
-/** this class provides a basic helper for classes suporting the XServiceInfo Interface.
- *
- *  you can overload the <code>getSupprotedServiceNames</code> to implement a XServiceInfo.
- *  you can use the static helper methods to combine your services with that of parent
- *  or aggregatet classes.
- */
-class SVX_DLLPUBLIC SvxServiceInfoHelper : public ::com::sun::star::lang::XServiceInfo
-{
-public:
-    // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
-
-    // helper
-    static ::com::sun::star::uno::Sequence< ::rtl::OUString > concatSequences( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rSeq1,
-            const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rSeq2 ) throw();
-    static void addToSequence( ::com::sun::star::uno::Sequence< ::rtl::OUString >& rSeq, sal_uInt16 nServices, /* sal_Char* */... ) throw();
-    static sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& SupportedServices ) throw();
-};
-
-#endif
-
diff --git a/svx/inc/svx/svxbox.hxx b/svx/inc/svx/svxbox.hxx
deleted file mode 100644
index 7f1c8aaa75..0000000000
--- a/svx/inc/svx/svxbox.hxx
+++ /dev/null
@@ -1,205 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: svxbox.hxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SVX_BOX_HXX
-#define _SVX_BOX_HXX
-
-// include ---------------------------------------------------------------
-
-#include <svl/svarray.hxx>
-#include <tools/string.hxx>
-
-#ifndef _LSTBOX_HXX //autogen
-#include <vcl/lstbox.hxx>
-#endif
-
-#ifndef _COMBOBOX_HXX //autogen
-#include <vcl/combobox.hxx>
-#endif
-
-// forward ---------------------------------------------------------------
-
-class SvxBoxEntry;
-class SvxListBase;
-
-//#if 0 // _SOLAR__PRIVATE
-SV_DECL_PTRARR( SvxEntryLst, SvxBoxEntry*, 10, 10 )
-//#else
-//typedef SvPtrarr SvxEntryLst;
-//#endif
-
-// class SvxBoxEntry -----------------------------------------------------
-
-class SvxBoxEntry
-{
-    friend class SvxListBox;
-    friend class SvxComboBox;
-
-public:
-    SvxBoxEntry( const String& aName, USHORT nId=0 );
-    SvxBoxEntry( const SvxBoxEntry& rOrg );
-    SvxBoxEntry();
-
-    String 				aName;
-    USHORT 				nId;
-
-private:
-    BOOL   				bModified;
-    BOOL   				bNew;
-};
-
-// class SvxListBox ------------------------------------------------------
-
-class SvxListBox : public ListBox
-{
-    using ListBox::InsertEntry;
-    using ListBox::RemoveEntry;
-    using ListBox::GetEntryPos;
-    using ListBox::IsEntrySelected;
-    using ListBox::SelectEntry;
-
-public:
-    SvxListBox( Window* pParent, WinBits nBits = WB_BORDER );
-    SvxListBox( Window* pParent, const ResId& rId );
-    ~SvxListBox();
-
-    void				InsertNewEntry( const SvxBoxEntry& rEntry );
-    void				InsertEntry( const SvxBoxEntry& rEntry,
-                                     USHORT nId = LISTBOX_ENTRY_NOTFOUND );
-
-    void				RemoveEntry( USHORT nPos );
-    void				RemoveEntry( const SvxBoxEntry& rEntry );
-
-    void				Clear();
-
-    USHORT 				GetEntryPos( const SvxBoxEntry& rEntry ) const;
-    const SvxBoxEntry&  GetSvxBoxEntry( USHORT nIdx ) const;
-
-    inline BOOL			IsEntrySelected( const SvxBoxEntry& rEntry ) const;
-    const SvxBoxEntry&  GetSelectSvxBoxEntry( USHORT nIdx = 0 ) const;
-    inline void			SelectEntry( const SvxBoxEntry& rEntry,
-                                     BOOL bSelect = TRUE );
-
-    void				ModifyEntry( USHORT nPos, const String& aName );
-    USHORT				GetModifiedCount() const;
-    const SvxBoxEntry&	GetModifiedEntry( USHORT nPos ) const;
-
-    USHORT				GetRemovedCount() const;
-    const SvxBoxEntry&	GetRemovedEntry( USHORT nPos ) const;
-
-    USHORT				GetNewCount() const;
-    const SvxBoxEntry&	GetNewEntry( USHORT nPos ) const;
-
-private:
-    SvxEntryLst			aEntryLst;
-    SvxEntryLst			aDelEntryLst;
-    SvxBoxEntry 		aDefault;
-
-    void				InitListBox();
-    void				InsertSorted( SvxBoxEntry* pEntry );
-};
-
-// inlines ---------------------------------------------------------------
-
-inline BOOL	SvxListBox::IsEntrySelected( const SvxBoxEntry& aEntry ) const
-    { return ListBox::IsEntrySelected( aEntry.aName ); }
-
-inline void SvxListBox::SelectEntry( const SvxBoxEntry& aEntry, BOOL bSelect )
-    { ListBox::SelectEntry( aEntry.aName, bSelect ); }
-
-// enum SvxComboBoxStyle -------------------------------------------------
-
-enum SvxComboBoxStyle
-{
-    SVX_CBS_UPPER 	 	= 0x01,
-    SVX_CBS_LOWER	 	= 0x02,
-    SVX_CBS_ALL	  	 	= 0x04,
-    SVX_CBS_FILENAME 	= 0x08,
-#ifdef WIN
-    SVX_CBS_SW_FILENAME = SVX_CBS_FILENAME | SVX_CBS_LOWER
-#else
-    SVX_CBS_SW_FILENAME = SVX_CBS_FILENAME
-#endif
-};
-
-// class SvxComboBox -----------------------------------------------------
-
-class SvxComboBox : public ComboBox
-{
-    using ComboBox::InsertEntry;
-    using ComboBox::RemoveEntry;
-    using ComboBox::GetEntryPos;
-    using Window::SetStyle;
-
-public:
-    SvxComboBox( Window* pParent,
-                 WinBits nBits = WB_BORDER, USHORT nStyleBits = SVX_CBS_ALL );
-    SvxComboBox( Window* pParent, const ResId& rId, USHORT nStyleBits = SVX_CBS_ALL );
-    ~SvxComboBox();
-
-    void				InsertNewEntry( const SvxBoxEntry& );
-    void				InsertEntry( const SvxBoxEntry& );
-
-    void				RemoveEntry( USHORT nPos );
-    void				RemoveEntry( const SvxBoxEntry& rEntry );
-
-    void				Clear();
-
-    USHORT 				GetEntryPos( const SvxBoxEntry& rEntry ) const;
-    const SvxBoxEntry&  GetEntry( USHORT nIdx ) const;
-
-    void				ModifyEntry( USHORT nPos, const String& aName );
-    USHORT				GetModifiedCount() const;
-    const SvxBoxEntry&	GetModifiedEntry( USHORT nPos ) const;
-
-    USHORT				GetRemovedCount() const;
-    const SvxBoxEntry&	GetRemovedEntry( USHORT nPos ) const;
-
-    USHORT				GetNewCount() const;
-    const SvxBoxEntry&	GetNewEntry( USHORT nPos ) const;
-
-    USHORT 				GetStyle() const 			 { return nStyle; }
-    void				SetStyle( const USHORT nSt ) { nStyle = nSt; }
-
-    String				GetText() const;
-
-private:
-    SvxEntryLst			aEntryLst;
-    SvxEntryLst			aDelEntryLst;
-    SvxBoxEntry 		aDefault;
-    USHORT 				nStyle;
-
-    virtual void 		KeyInput( const KeyEvent& rKEvt );
-
-    void				InitComboBox();
-    void				InsertSorted( SvxBoxEntry* pEntry );
-};
-
-#endif
-
diff --git a/svx/inc/svx/svxdlg.hxx b/svx/inc/svx/svxdlg.hxx
index ba3f797439..958b000e85 100644
--- a/svx/inc/svx/svxdlg.hxx
+++ b/svx/inc/svx/svxdlg.hxx
@@ -32,7 +32,8 @@
 // include ---------------------------------------------------------------
 
 #include <sfx2/sfxdlg.hxx>
-#include <svx/hangulhanja.hxx> //add for HangulHanjaConversionDialog
+#include <editeng/edtdlg.hxx>
+
 class SdrModel;
 class SdrView;
 using namespace svx;
@@ -77,49 +78,6 @@ public:
     virtual SvxDistributeVertical GetDistributeVer() const = 0;
 };
 
-class AbstractHangulHanjaConversionDialog : public VclAbstractTerminatedDialog //add for HangulHanjaConversionDialog
-{
- public:
-    virtual void EnableRubySupport( sal_Bool _bVal ) = 0;
-     virtual void SetByCharacter( sal_Bool _bByCharacter ) = 0;
-    virtual	void SetConversionDirectionState( sal_Bool _bTryBothDirections, HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection ) = 0;
-     virtual void SetConversionFormat( HangulHanjaConversion::ConversionFormat _eType ) = 0;
-    virtual void	SetOptionsChangedHdl( const Link& _rHdl ) = 0;
-     virtual void	SetIgnoreHdl( const Link& _rHdl ) = 0;
-     virtual void	SetIgnoreAllHdl( const Link& _rHdl ) = 0;
-     virtual void	SetChangeHdl( const Link& _rHdl ) = 0;
-     virtual void	SetChangeAllHdl( const Link& _rHdl ) = 0;
-    virtual void	SetClickByCharacterHdl( const Link& _rHdl ) = 0;
-     virtual void	SetConversionFormatChangedHdl( const Link& _rHdl ) = 0;
-     virtual void	SetFindHdl( const Link& _rHdl ) = 0;
-    virtual sal_Bool		GetUseBothDirections( ) const= 0;
-    virtual HangulHanjaConversion::ConversionDirection    GetDirection( HangulHanjaConversion::ConversionDirection _eDefaultDirection ) const = 0;
-    virtual void	SetCurrentString(
-                    const String& _rNewString,
-                    const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rSuggestions,
-                    bool _bOriginatesFromDocument = true )=0;
-    virtual String	GetCurrentString( ) const =0;
-    virtual HangulHanjaConversion::ConversionFormat    GetConversionFormat( ) const =0;
-    virtual void	FocusSuggestion( )= 0;
-    virtual String	GetCurrentSuggestion( ) const =0;
-};
-
-class AbstractThesaurusDialog : public VclAbstractDialog
-{
-public:
-    virtual String		GetWord() = 0;
-    virtual sal_uInt16	GetLanguage() const = 0;
-    virtual Window*		GetWindow() = 0;
-};
-
-class AbstractHyphenWordDialog : public VclAbstractDialog
-{
-public:
-    virtual void	SelLeft() = 0;
-    virtual void	SelRight() = 0;
-    virtual Window*	GetWindow() = 0;
-};
-
 class AbstractFmShowColsDialog : public VclAbstractDialog //add for FmShowColsDialog
 {
  public:
@@ -376,7 +334,7 @@ public:
 
 //-------------------------------------------------------------
 
-class SVX_DLLPUBLIC SvxAbstractDialogFactory : public SfxAbstractDialogFactory
+class SVX_DLLPUBLIC SvxAbstractDialogFactory : public SfxAbstractDialogFactory, public EditAbstractDialogFactory
 {
 public:
     static SvxAbstractDialogFactory* Create();
@@ -398,17 +356,6 @@ public:
                                             SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone,
                                             SvxDistributeVertical eVer = SvxDistributeVerticalNone)= 0;
 
-    virtual AbstractHangulHanjaConversionDialog * CreateHangulHanjaConversionDialog( Window* _pParent,  //add for HangulHanjaConversionDialog CHINA001
-                                            HangulHanjaConversion::ConversionDirection _ePrimaryDirection ) = 0;
-
-    virtual AbstractThesaurusDialog*		CreateThesaurusDialog( Window*, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XThesaurus >  xThesaurus,
-                                                const String &rWord, sal_Int16 nLanguage ) = 0;
-
-    virtual AbstractHyphenWordDialog*		CreateHyphenWordDialog( Window*, 
-                                                const String &rWord, LanguageType nLang,
-                                                ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenator >  &xHyphen,
-                                                SvxSpellWrapper* pWrapper ) = 0;
-
     virtual AbstractFmShowColsDialog * CreateFmShowColsDialog( Window* pParent ) = 0;
     
     virtual AbstractSvxZoomDialog * CreateSvxZoomDialog( Window* pParent,  //add for SvxZoomDialog
diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc
index 4bf16135aa..b0e28f0056 100644
--- a/svx/inc/svx/svxids.hrc
+++ b/svx/inc/svx/svxids.hrc
@@ -55,7 +55,6 @@
 
 #define MID_APPFLAG             0x20
 #define MID_AUTOBREAK           0x21
-#define MID_BG_COLOR            0x22
 #define MID_BREAKxxx            0x22
 #define MID_BRUSHSTYLE          0x23
 #define MID_CELLTYPE            0x24
@@ -63,32 +62,26 @@
 #define MID_COMMAND             0x26
 #define MID_CONTENT             0x27
 #define MID_DESCNAMExxx         0x28
-#define MID_DISTANCE            0x29
+
 #define MID_ESCAPEMENT          0x2a
 #define MID_FAMILY              0x2b
-#define MID_FG_COLOR            0x2c
 #define MID_FIRSTLINE_OFFSET    0x2d
-#define MID_FLAGS               0x2e
 #define MID_FONTFAMILY          0x2f
 #define MID_FONTFAMILYNAME      0x30
 #define MID_FONTPITCH           0x31
 #define MID_FONTSTYLE           0x32
 #define MID_PERCENT             0x33
 #define MID_HYPHEN              0x34
-#define MID_INNER_WIDTH         0x35
 #define MID_INTER_LINESPACE     0x36
 #define MID_INTER_SPACE         0x37
 #define MID_LANDSCAPE           0x38
 
 #define MID_LEFT_MARGIN         0x3a
-#define MID_LINESPACE           0x3b
-#define MID_LOCATION            0x3c
 #define MID_LOWER               0x3d
 #define MID_MAXHYPHENS          0x3e
 #define MID_MINLEAD             0x3f
 #define MID_MINTRAIL            0x40
 #define MID_NUMTYPExxx          0x41
-#define MID_OUTER_WIDTH         0x41
 #define MID_PAGEEND             0x42
 #define MID_POS                 0x43
 #define MID_PROPORTIONAL        0x44
@@ -97,7 +90,6 @@
 #define MID_RIGHT_MARGIN        0x47
 #define MID_ROW_DIRECTION       0x48
 #define MID_SIZE                0x4a
-#define MID_TRANSPARENT         0x4b
 #define MID_TYPE                0x4c
 #define MID_UPPER               0x4d
 #define MID_USExxx              0x4e
@@ -426,8 +418,6 @@
 // --------------------------------------------------------------------------
 
 #define SID_ATTR_ZOOM                                   ( SID_SVX_START + 0 )
-#define SID_ATTR_BRUSH                                  ( SID_SVX_START + 1 )
-#define SID_ATTR_TABSTOP                                ( SID_SVX_START + 2 )
 #define SID_ATTR_TABSTOP_DEFAULTS                       ( SID_SVX_START + 3 )
 #define SID_ATTR_TABSTOP_POS                            ( SID_SVX_START + 4 )
 #define SID_ATTR_TABSTOP_OFFSET                         ( SID_SVX_START + 5 )
@@ -449,8 +439,6 @@
 //#define SID_ATTR_CHAR_ESCAPEMENT                        ( SID_SVX_START + 21 )    -> sfxsids.hrc
 //#define SID_ATTR_CHAR_FONTLIST                          ( SID_SVX_START + 22 )    -> sfxsids.hrc
 #define SID_ATTR_BORDER_INNER                           ( SID_SVX_START + 23 )
-#define SID_ATTR_BORDER_OUTER                           ( SID_SVX_START + 24 )
-#define SID_ATTR_BORDER_SHADOW                          ( SID_SVX_START + 25 )
 #define SID_ATTR_PARA                                   ( SID_SVX_START + 26 )
 #define SID_ATTR_PARA_ADJUST                            ( SID_SVX_START + 27 )
 #define SID_ATTR_PARA_ADJUST_LEFT                       ( SID_SVX_START + 28 )
@@ -926,7 +914,6 @@
 #define SID_OFA_REL_DESIGNVIEW                          ( SID_SVX_START + 588 )
 #define SID_OFA_MANUAL_SQL                              ( SID_SVX_START + 589 )
 #define SID_PARA_BACKGRND_DESTINATION                   ( SID_SVX_START + 590 )
-#define SID_ATTR_BRUSH_CHAR                             ( SID_SVX_START + 591 )
 #define SID_FMSLOTS_START                               ( SID_SVX_START + 592 )
 #define SID_FM_CONFIG                                   ( SID_SVX_START + 593 )
 #define SID_FM_PUSHBUTTON                               ( SID_SVX_START + 594 )
@@ -1117,7 +1104,6 @@
 #define SID_HLINKBAR_BOOKMARK                           ( SID_SVX_START + 852 )
 #define SID_HLINKBAR_SEARCH                             ( SID_SVX_START + 853 )
 #define SID_HLINKBAR_TARGET                             ( SID_SVX_START + 854 )
-#define SID_ATTR_NUMBERING_RULE                         ( SID_SVX_START + 855 )
 #define SID_PARAM_NUM_PRESET                            ( SID_SVX_START + 856 )
 #define SID_PARAM_CUR_NUMBER                            ( SID_SVX_START + 857 )
 #define SID_PARAM_CHILD_LEVELS                          ( SID_SVX_START + 858 )
@@ -1180,7 +1166,6 @@
 #define SID_LANGUAGE_OPTIONS                            ( SID_SVX_START + 921 )
 #define SID_GETUNDOSTRINGS                              ( SID_SVX_START + 923 )
 #define SID_GETREDOSTRINGS                              ( SID_SVX_START + 924 )
-#define SID_PARA_VERTALIGN                              ( SID_SVX_START + 925 )
 #define SID_INSERT_IMAGECONTROL                         ( SID_SVX_START + 926 )
 #define SID_INSERT_PROGRESSBAR                          ( SID_SVX_START + 927 )
 #define SID_INSERT_HFIXEDLINE                           ( SID_SVX_START + 928 )
diff --git a/svx/inc/svx/svxitems.hrc b/svx/inc/svx/svxitems.hrc
index 8800b7cb46..f5041c2e90 100644
--- a/svx/inc/svx/svxitems.hrc
+++ b/svx/inc/svx/svxitems.hrc
@@ -34,11 +34,8 @@
 
 #ifndef _SOLAR_HRC
 #include <svl/solar.hrc>
-#endif
 
-// BOOL ---------------------------------------------------------------------
-#define RID_SVXITEMS_TRUE					(RID_SVXITEMS_START +  0)
-#define RID_SVXITEMS_FALSE					(RID_SVXITEMS_START +  1)
+#endif
 
 // Extras -------------------------------------------------------------------
 #define RID_SVXITEMS_EXTRAS_CHARCOLOR		(RID_SVXITEMS_START +  2)
@@ -68,73 +65,20 @@
 #define RID_SVXITEMS_SEARCHAPP_DRAW			(RID_SVXITEMS_START + 27)
 #define RID_SVXITEMS_SEARCHAPP_BASE			(RID_SVXITEMS_START + 28)
 
-// enum SvxBreak ------------------------------------------------------------
-#define RID_SVXITEMS_BREAK_BEGIN			(RID_SVXITEMS_START + 30)
-#define RID_SVXITEMS_BREAK_NONE				(RID_SVXITEMS_START + 30)
-#define RID_SVXITEMS_BREAK_COLUMN_BEFORE	(RID_SVXITEMS_START + 31)
-#define RID_SVXITEMS_BREAK_COLUMN_AFTER		(RID_SVXITEMS_START + 32)
-#define RID_SVXITEMS_BREAK_COLUMN_BOTH		(RID_SVXITEMS_START + 33)
-#define RID_SVXITEMS_BREAK_PAGE_BEFORE		(RID_SVXITEMS_START + 34)
-#define RID_SVXITEMS_BREAK_PAGE_AFTER		(RID_SVXITEMS_START + 35)
-#define RID_SVXITEMS_BREAK_PAGE_BOTH		(RID_SVXITEMS_START + 36)
-
-// enum SvxShadowLocation ---------------------------------------------------
-#define RID_SVXITEMS_SHADOW_BEGIN			(RID_SVXITEMS_START + 40)
-#define RID_SVXITEMS_SHADOW_NONE			(RID_SVXITEMS_START + 40)
-#define RID_SVXITEMS_SHADOW_TOPLEFT			(RID_SVXITEMS_START + 41)
-#define RID_SVXITEMS_SHADOW_TOPRIGHT		(RID_SVXITEMS_START + 42)
-#define RID_SVXITEMS_SHADOW_BOTTOMLEFT		(RID_SVXITEMS_START + 43)
-#define RID_SVXITEMS_SHADOW_BOTTOMRIGHT		(RID_SVXITEMS_START + 44)
-
 // enum BrushStyle ----------------------------------------------------------
-#define RID_SVXITEMS_BRUSHSTYLE_BEGIN		(RID_SVXITEMS_START + 45)
-#define RID_SVXITEMS_BRUSHSTYLE_NULL		(RID_SVXITEMS_START + 45)
-#define RID_SVXITEMS_BRUSHSTYLE_SOLID		(RID_SVXITEMS_START + 46)
-#define RID_SVXITEMS_BRUSHSTYLE_HORZ		(RID_SVXITEMS_START + 47)
-#define RID_SVXITEMS_BRUSHSTYLE_VERT		(RID_SVXITEMS_START + 48)
-#define RID_SVXITEMS_BRUSHSTYLE_CROSS		(RID_SVXITEMS_START + 49)
-#define RID_SVXITEMS_BRUSHSTYLE_DIAGCROSS	(RID_SVXITEMS_START + 50)
-#define RID_SVXITEMS_BRUSHSTYLE_UPDIAG		(RID_SVXITEMS_START + 51)
-#define RID_SVXITEMS_BRUSHSTYLE_DOWNDIAG	(RID_SVXITEMS_START + 52)
-#define RID_SVXITEMS_BRUSHSTYLE_25			(RID_SVXITEMS_START + 53)
-#define RID_SVXITEMS_BRUSHSTYLE_50			(RID_SVXITEMS_START + 54)
-#define RID_SVXITEMS_BRUSHSTYLE_75			(RID_SVXITEMS_START + 55)
-#define RID_SVXITEMS_BRUSHSTYLE_BITMAP		(RID_SVXITEMS_START + 56)
-
-// enum ColorName -----------------------------------------------------------
-#define RID_SVXITEMS_COLOR_BEGIN			(RID_SVXITEMS_START + 60)
-#define RID_SVXITEMS_COLOR					(RID_SVXITEMS_START + 60)
-#define RID_SVXITEMS_COLOR_BLACK			(RID_SVXITEMS_START + 61)
-#define RID_SVXITEMS_COLOR_BLUE				(RID_SVXITEMS_START + 62)
-#define RID_SVXITEMS_COLOR_GREEN			(RID_SVXITEMS_START + 63)
-#define RID_SVXITEMS_COLOR_CYAN				(RID_SVXITEMS_START + 64)
-#define RID_SVXITEMS_COLOR_RED				(RID_SVXITEMS_START + 65)
-#define RID_SVXITEMS_COLOR_MAGENTA			(RID_SVXITEMS_START + 66)
-#define RID_SVXITEMS_COLOR_BROWN			(RID_SVXITEMS_START + 67)
-#define RID_SVXITEMS_COLOR_GRAY				(RID_SVXITEMS_START + 68)
-#define RID_SVXITEMS_COLOR_LIGHTGRAY		(RID_SVXITEMS_START + 69)
-#define RID_SVXITEMS_COLOR_LIGHTBLUE		(RID_SVXITEMS_START + 70)
-#define RID_SVXITEMS_COLOR_LIGHTGREEN		(RID_SVXITEMS_START + 71)
-#define RID_SVXITEMS_COLOR_LIGHTCYAN		(RID_SVXITEMS_START + 72)
-#define RID_SVXITEMS_COLOR_LIGHTRED			(RID_SVXITEMS_START + 73)
-#define RID_SVXITEMS_COLOR_LIGHTMAGENTA		(RID_SVXITEMS_START + 74)
-#define RID_SVXITEMS_COLOR_YELLOW			(RID_SVXITEMS_START + 75)
-#define RID_SVXITEMS_COLOR_WHITE			(RID_SVXITEMS_START + 76)
-#define RID_SVXITEMS_COLOR_MENUBAR			(RID_SVXITEMS_START + 77)
-#define RID_SVXITEMS_COLOR_MENUBARTEXT		(RID_SVXITEMS_START + 78)
-#define RID_SVXITEMS_COLOR_POPUPMENU		(RID_SVXITEMS_START + 79)
-#define RID_SVXITEMS_COLOR_POPUPMENUTEXT	(RID_SVXITEMS_START + 80)
-#define RID_SVXITEMS_COLOR_WINDOWTEXT		(RID_SVXITEMS_START + 81)
-#define RID_SVXITEMS_COLOR_WINDOWWORKSPACE	(RID_SVXITEMS_START + 82)
-#define RID_SVXITEMS_COLOR_HIGHLIGHT		(RID_SVXITEMS_START + 83)
-#define RID_SVXITEMS_COLOR_HIGHLIGHTTEXT	(RID_SVXITEMS_START + 84)
-#define RID_SVXITEMS_COLOR_3DTEXT			(RID_SVXITEMS_START + 85)
-#define RID_SVXITEMS_COLOR_3DFACE			(RID_SVXITEMS_START + 86)
-#define RID_SVXITEMS_COLOR_3DLIGHT			(RID_SVXITEMS_START + 87)
-#define RID_SVXITEMS_COLOR_3DSHADOW			(RID_SVXITEMS_START + 88)
-#define RID_SVXITEMS_COLOR_SCROLLBAR		(RID_SVXITEMS_START + 89)
-#define RID_SVXITEMS_COLOR_FIELD			(RID_SVXITEMS_START + 90)
-#define RID_SVXITEMS_COLOR_FIELDTEXT		(RID_SVXITEMS_START + 91)
+//#define RID_SVXITEMS_BRUSHSTYLE_BEGIN		(RID_SVXITEMS_START + 45)
+//#define RID_SVXITEMS_BRUSHSTYLE_NULL		(RID_SVXITEMS_START + 45)
+//#define RID_SVXITEMS_BRUSHSTYLE_SOLID		(RID_SVXITEMS_START + 46)
+//#define RID_SVXITEMS_BRUSHSTYLE_HORZ		(RID_SVXITEMS_START + 47)
+//#define RID_SVXITEMS_BRUSHSTYLE_VERT		(RID_SVXITEMS_START + 48)
+//#define RID_SVXITEMS_BRUSHSTYLE_CROSS		(RID_SVXITEMS_START + 49)
+//#define RID_SVXITEMS_BRUSHSTYLE_DIAGCROSS	(RID_SVXITEMS_START + 50)
+//#define RID_SVXITEMS_BRUSHSTYLE_UPDIAG		(RID_SVXITEMS_START + 51)
+//#define RID_SVXITEMS_BRUSHSTYLE_DOWNDIAG	(RID_SVXITEMS_START + 52)
+//#define RID_SVXITEMS_BRUSHSTYLE_25			(RID_SVXITEMS_START + 53)
+//#define RID_SVXITEMS_BRUSHSTYLE_50			(RID_SVXITEMS_START + 54)
+//#define RID_SVXITEMS_BRUSHSTYLE_75			(RID_SVXITEMS_START + 55)
+//#define RID_SVXITEMS_BRUSHSTYLE_BITMAP		(RID_SVXITEMS_START + 56)
 
 // enum FontFamily -------------------------------------------------------
 #define RID_SVXITEMS_FONTFAMILY_BEGIN		(RID_SVXITEMS_START + 100)
@@ -152,36 +96,6 @@
 #define RID_SVXITEMS_FONTPITCH_FIXED		(RID_SVXITEMS_START + 111)
 #define RID_SVXITEMS_FONTPITCH_VARIABLE		(RID_SVXITEMS_START + 112)
 
-// enum FontItalic -------------------------------------------------------
-#define RID_SVXITEMS_ITALIC_BEGIN			(RID_SVXITEMS_START + 115)
-#define RID_SVXITEMS_ITALIC_NONE			(RID_SVXITEMS_START + 115)
-#define RID_SVXITEMS_ITALIC_OBLIQUE			(RID_SVXITEMS_START + 116)
-#define RID_SVXITEMS_ITALIC_NORMAL			(RID_SVXITEMS_START + 117)
-
-// enum FontWeight -------------------------------------------------------
-#define RID_SVXITEMS_WEIGHT_BEGIN			(RID_SVXITEMS_START + 120)
-#define RID_SVXITEMS_WEIGHT_DONTKNOW		(RID_SVXITEMS_START + 120)
-#define RID_SVXITEMS_WEIGHT_THIN			(RID_SVXITEMS_START + 121)
-#define RID_SVXITEMS_WEIGHT_ULTRALIGHT		(RID_SVXITEMS_START + 122)
-#define RID_SVXITEMS_WEIGHT_LIGHT			(RID_SVXITEMS_START + 123)
-#define RID_SVXITEMS_WEIGHT_SEMILIGHT		(RID_SVXITEMS_START + 124)
-#define RID_SVXITEMS_WEIGHT_NORMAL			(RID_SVXITEMS_START + 125)
-#define RID_SVXITEMS_WEIGHT_MEDIUM			(RID_SVXITEMS_START + 126)
-#define RID_SVXITEMS_WEIGHT_SEMIBOLD		(RID_SVXITEMS_START + 127)
-#define RID_SVXITEMS_WEIGHT_BOLD			(RID_SVXITEMS_START + 128)
-#define RID_SVXITEMS_WEIGHT_ULTRABOLD		(RID_SVXITEMS_START + 129)
-#define RID_SVXITEMS_WEIGHT_BLACK			(RID_SVXITEMS_START + 130)
-
-// enum FontStrikeout ----------------------------------------------------
-#define RID_SVXITEMS_STRIKEOUT_BEGIN		(RID_SVXITEMS_START + 135)
-#define RID_SVXITEMS_STRIKEOUT_NONE			(RID_SVXITEMS_START + 135)
-#define RID_SVXITEMS_STRIKEOUT_SINGLE		(RID_SVXITEMS_START + 136)
-#define RID_SVXITEMS_STRIKEOUT_DOUBLE		(RID_SVXITEMS_START + 137)
-#define RID_SVXITEMS_STRIKEOUT_DONTKNOW		(RID_SVXITEMS_START + 138)
-#define RID_SVXITEMS_STRIKEOUT_BOLD			(RID_SVXITEMS_START + 139)
-#define RID_SVXITEMS_STRIKEOUT_SLASH		(RID_SVXITEMS_START + 140)
-#define RID_SVXITEMS_STRIKEOUT_X			(RID_SVXITEMS_START + 141)
-
 // enum CharSet ----------------------------------------------------------
 #define RID_SVXITEMS_CHARSET_BEGIN			(RID_SVXITEMS_START + 145)
 #define RID_SVXITEMS_CHARSET_DONTKNOW		(RID_SVXITEMS_START + 145)
@@ -196,83 +110,6 @@
 #define RID_SVXITEMS_CHARSET_SYSTEM			(RID_SVXITEMS_START + 154)
 #define RID_SVXITEMS_CHARSET_SYMBOL			(RID_SVXITEMS_START + 155)
 
-// enum CASEMAP ----------------------------------------------------------
-#define RID_SVXITEMS_CASEMAP_BEGIN			(RID_SVXITEMS_START + 160)
-#define RID_SVXITEMS_CASEMAP_NONE			(RID_SVXITEMS_START + 160)
-#define RID_SVXITEMS_CASEMAP_VERSALIEN		(RID_SVXITEMS_START + 161)
-#define RID_SVXITEMS_CASEMAP_GEMEINE		(RID_SVXITEMS_START + 162)
-#define RID_SVXITEMS_CASEMAP_TITEL			(RID_SVXITEMS_START + 163)
-#define RID_SVXITEMS_CASEMAP_KAPITAELCHEN	(RID_SVXITEMS_START + 164)
-
-// enum ESCAPEMENT -------------------------------------------------------
-#define RID_SVXITEMS_ESCAPEMENT_BEGIN		(RID_SVXITEMS_START + 166)
-#define RID_SVXITEMS_ESCAPEMENT_OFF			(RID_SVXITEMS_START + 166)
-#define RID_SVXITEMS_ESCAPEMENT_SUPER		(RID_SVXITEMS_START + 167)
-#define RID_SVXITEMS_ESCAPEMENT_SUB			(RID_SVXITEMS_START + 168)
-#define RID_SVXITEMS_ESCAPEMENT_AUTO		(RID_SVXITEMS_START + 169)
-
-// enum FontUnderline - used for underline -------------------------------
-#define RID_SVXITEMS_UL_BEGIN				(RID_SVXITEMS_START + 170)
-#define RID_SVXITEMS_UL_NONE				(RID_SVXITEMS_START + 170)
-#define RID_SVXITEMS_UL_SINGLE				(RID_SVXITEMS_START + 171)
-#define RID_SVXITEMS_UL_DOUBLE				(RID_SVXITEMS_START + 172)
-#define RID_SVXITEMS_UL_DOTTED				(RID_SVXITEMS_START + 173)
-#define RID_SVXITEMS_UL_DONTKNOW			(RID_SVXITEMS_START + 174)
-#define RID_SVXITEMS_UL_DASH				(RID_SVXITEMS_START + 175)
-#define RID_SVXITEMS_UL_LONGDASH			(RID_SVXITEMS_START + 176)
-#define RID_SVXITEMS_UL_DASHDOT				(RID_SVXITEMS_START + 177)
-#define RID_SVXITEMS_UL_DASHDOTDOT			(RID_SVXITEMS_START + 178)
-#define RID_SVXITEMS_UL_SMALLWAVE			(RID_SVXITEMS_START + 179)
-#define RID_SVXITEMS_UL_WAVE				(RID_SVXITEMS_START + 180)
-#define RID_SVXITEMS_UL_DOUBLEWAVE			(RID_SVXITEMS_START + 181)
-#define RID_SVXITEMS_UL_BOLD				(RID_SVXITEMS_START + 182)
-#define RID_SVXITEMS_UL_BOLDDOTTED			(RID_SVXITEMS_START + 183)
-#define RID_SVXITEMS_UL_BOLDDASH			(RID_SVXITEMS_START + 184)
-#define RID_SVXITEMS_UL_BOLDLONGDASH		(RID_SVXITEMS_START + 185)
-#define RID_SVXITEMS_UL_BOLDDASHDOT			(RID_SVXITEMS_START + 186)
-#define RID_SVXITEMS_UL_BOLDDASHDOTDOT		(RID_SVXITEMS_START + 187)
-#define RID_SVXITEMS_UL_BOLDWAVE			(RID_SVXITEMS_START + 188)
-
-// enum FontUnderline - used for overline --------------------------------
-#define RID_SVXITEMS_OL_BEGIN				(RID_SVXITEMS_START + 200)
-#define RID_SVXITEMS_OL_NONE				(RID_SVXITEMS_START + 200)
-#define RID_SVXITEMS_OL_SINGLE				(RID_SVXITEMS_START + 201)
-#define RID_SVXITEMS_OL_DOUBLE				(RID_SVXITEMS_START + 202)
-#define RID_SVXITEMS_OL_DOTTED				(RID_SVXITEMS_START + 203)
-#define RID_SVXITEMS_OL_DONTKNOW			(RID_SVXITEMS_START + 204)
-#define RID_SVXITEMS_OL_DASH				(RID_SVXITEMS_START + 205)
-#define RID_SVXITEMS_OL_LONGDASH			(RID_SVXITEMS_START + 206)
-#define RID_SVXITEMS_OL_DASHDOT				(RID_SVXITEMS_START + 207)
-#define RID_SVXITEMS_OL_DASHDOTDOT			(RID_SVXITEMS_START + 208)
-#define RID_SVXITEMS_OL_SMALLWAVE			(RID_SVXITEMS_START + 209)
-#define RID_SVXITEMS_OL_WAVE				(RID_SVXITEMS_START + 210)
-#define RID_SVXITEMS_OL_DOUBLEWAVE			(RID_SVXITEMS_START + 211)
-#define RID_SVXITEMS_OL_BOLD				(RID_SVXITEMS_START + 212)
-#define RID_SVXITEMS_OL_BOLDDOTTED			(RID_SVXITEMS_START + 213)
-#define RID_SVXITEMS_OL_BOLDDASH			(RID_SVXITEMS_START + 214)
-#define RID_SVXITEMS_OL_BOLDLONGDASH		(RID_SVXITEMS_START + 215)
-#define RID_SVXITEMS_OL_BOLDDASHDOT			(RID_SVXITEMS_START + 216)
-#define RID_SVXITEMS_OL_BOLDDASHDOTDOT		(RID_SVXITEMS_START + 217)
-#define RID_SVXITEMS_OL_BOLDWAVE			(RID_SVXITEMS_START + 218)
-
-// enum SvxAdjust -----------------------------------------------------------
-#define RID_SVXITEMS_ADJUST_BEGIN			(RID_SVXITEMS_START + 230)
-#define RID_SVXITEMS_ADJUST_LEFT			(RID_SVXITEMS_START + 230)
-#define RID_SVXITEMS_ADJUST_RIGHT			(RID_SVXITEMS_START + 231)
-#define RID_SVXITEMS_ADJUST_BLOCK			(RID_SVXITEMS_START + 232)
-#define RID_SVXITEMS_ADJUST_CENTER			(RID_SVXITEMS_START + 233)
-#define RID_SVXITEMS_ADJUST_BLOCKLINE		(RID_SVXITEMS_START + 234)
-
-// enum SvxAdjust -----------------------------------------------------------
-#define RID_SVXITEMS_TAB_DECIMAL_CHAR		(RID_SVXITEMS_START + 243)
-#define RID_SVXITEMS_TAB_FILL_CHAR			(RID_SVXITEMS_START + 244)
-#define RID_SVXITEMS_TAB_ADJUST_BEGIN		(RID_SVXITEMS_START + 245)
-#define RID_SVXITEMS_TAB_ADJUST_LEFT		(RID_SVXITEMS_START + 245)
-#define RID_SVXITEMS_TAB_ADJUST_RIGHT		(RID_SVXITEMS_START + 246)
-#define RID_SVXITEMS_TAB_ADJUST_DECIMAL		(RID_SVXITEMS_START + 247)
-#define RID_SVXITEMS_TAB_ADJUST_CENTER		(RID_SVXITEMS_START + 248)
-#define RID_SVXITEMS_TAB_ADJUST_DEFAULT		(RID_SVXITEMS_START + 249)
-
 // type names of slots; needed for attribute list on search & replace dialogue
 #define RID_ATTR_BEGIN						(RID_SVXITEMS_START + 250)
 #define RID_ATTR_ZOOM						(RID_ATTR_BEGIN + 0)
@@ -281,23 +118,23 @@
 #define RID_ATTR_TABSTOP_DEFAULTS			(RID_ATTR_BEGIN + 3)
 #define RID_ATTR_TABSTOP_POS				(RID_ATTR_BEGIN + 4)
 #define RID_ATTR_TABSTOP_OFFSET				(RID_ATTR_BEGIN + 5)
-#define RID_ATTR_CHAR						(RID_ATTR_BEGIN + 6)
-#define RID_ATTR_CHAR_FONT					(RID_ATTR_BEGIN + 7)
-#define RID_ATTR_CHAR_POSTURE				(RID_ATTR_BEGIN + 8)
-#define RID_ATTR_CHAR_WEIGHT				(RID_ATTR_BEGIN + 9)
-#define RID_ATTR_CHAR_SHADOWED				(RID_ATTR_BEGIN + 10)
-#define RID_ATTR_CHAR_WORDLINEMODE			(RID_ATTR_BEGIN + 11)
-#define RID_ATTR_CHAR_CONTOUR				(RID_ATTR_BEGIN + 12)
-#define RID_ATTR_CHAR_STRIKEOUT				(RID_ATTR_BEGIN + 13)
-#define RID_ATTR_CHAR_UNDERLINE				(RID_ATTR_BEGIN + 14)
-#define RID_ATTR_CHAR_FONTHEIGHT			(RID_ATTR_BEGIN + 15)
-#define RID_ATTR_CHAR_PROPSIZE				(RID_ATTR_BEGIN + 16)
-#define RID_ATTR_CHAR_COLOR					(RID_ATTR_BEGIN + 17)
-#define RID_ATTR_CHAR_KERNING				(RID_ATTR_BEGIN + 18)
-#define RID_ATTR_CHAR_CASEMAP				(RID_ATTR_BEGIN + 19)
-#define RID_ATTR_CHAR_LANGUAGE				(RID_ATTR_BEGIN + 20)
-#define RID_ATTR_CHAR_ESCAPEMENT			(RID_ATTR_BEGIN + 21)
-#define RID_ATTR_CHAR_FONTLIST				(RID_ATTR_BEGIN + 22)
+//#define RID_ATTR_CHAR						(RID_ATTR_BEGIN + 6)
+//#define RID_ATTR_CHAR_FONT					(RID_ATTR_BEGIN + 7)
+//#define RID_ATTR_CHAR_POSTURE				(RID_ATTR_BEGIN + 8)
+//#define RID_ATTR_CHAR_WEIGHT				(RID_ATTR_BEGIN + 9)
+//#define RID_ATTR_CHAR_SHADOWED				(RID_ATTR_BEGIN + 10)
+//#define RID_ATTR_CHAR_WORDLINEMODE			(RID_ATTR_BEGIN + 11)
+//#define RID_ATTR_CHAR_CONTOUR				(RID_ATTR_BEGIN + 12)
+//#define RID_ATTR_CHAR_STRIKEOUT				(RID_ATTR_BEGIN + 13)
+//#define RID_ATTR_CHAR_UNDERLINE				(RID_ATTR_BEGIN + 14)
+//#define RID_ATTR_CHAR_FONTHEIGHT			(RID_ATTR_BEGIN + 15)
+//#define RID_ATTR_CHAR_PROPSIZE				(RID_ATTR_BEGIN + 16)
+//#define RID_ATTR_CHAR_COLOR					(RID_ATTR_BEGIN + 17)
+//#define RID_ATTR_CHAR_KERNING				(RID_ATTR_BEGIN + 18)
+//#define RID_ATTR_CHAR_CASEMAP				(RID_ATTR_BEGIN + 19)
+//#define RID_ATTR_CHAR_LANGUAGE				(RID_ATTR_BEGIN + 20)
+//#define RID_ATTR_CHAR_ESCAPEMENT			(RID_ATTR_BEGIN + 21)
+//#define RID_ATTR_CHAR_FONTLIST				(RID_ATTR_BEGIN + 22)
 #define RID_ATTR_BORDER_INNER               (RID_ATTR_BEGIN + 23)
 #define RID_ATTR_BORDER_OUTER				(RID_ATTR_BEGIN + 24)
 #define RID_ATTR_BORDER_SHADOW				(RID_ATTR_BEGIN + 25)
@@ -361,7 +198,6 @@
 #define RID_ATTR_CHAR_CTL_POSTURE           (RID_ATTR_BEGIN + 895)
 #define RID_ATTR_CHAR_CTL_WEIGHT            (RID_ATTR_BEGIN + 896)
 #define RID_ATTR_CHAR_TWO_LINES         	(RID_ATTR_BEGIN + 897)
-#define RID_ATTR_CHAR_EMPHASISMARK          (RID_ATTR_BEGIN + 899)
 
 #define RID_ATTR_PARA_SCRIPTSPACE  			(RID_ATTR_BEGIN + 901)
 #define RID_ATTR_PARA_HANGPUNCTUATION		(RID_ATTR_BEGIN + 902)
@@ -372,32 +208,6 @@
 #define RID_PARA_VERTALIGN					(RID_ATTR_BEGIN + 925)
 
 
-// Umrandungslinien
-#define RID_SINGLE_LINE0					(RID_SVXITEMS_START + 360)
-#define RID_SINGLE_LINE1					(RID_SVXITEMS_START + 361)
-#define RID_SINGLE_LINE2					(RID_SVXITEMS_START + 362)
-#define RID_SINGLE_LINE3					(RID_SVXITEMS_START + 363)
-#define RID_SINGLE_LINE4					(RID_SVXITEMS_START + 364)
-#define RID_DOUBLE_LINE0					(RID_SVXITEMS_START + 365)
-#define RID_DOUBLE_LINE1					(RID_SVXITEMS_START + 366)
-#define RID_DOUBLE_LINE2					(RID_SVXITEMS_START + 367)
-#define RID_DOUBLE_LINE3					(RID_SVXITEMS_START + 368)
-#define RID_DOUBLE_LINE4					(RID_SVXITEMS_START + 369)
-#define RID_DOUBLE_LINE5					(RID_SVXITEMS_START + 370)
-#define RID_DOUBLE_LINE6					(RID_SVXITEMS_START + 371)
-#define RID_DOUBLE_LINE7					(RID_SVXITEMS_START + 372)
-#define RID_DOUBLE_LINE8					(RID_SVXITEMS_START + 373)
-#define RID_DOUBLE_LINE9					(RID_SVXITEMS_START + 374)
-#define RID_DOUBLE_LINE10					(RID_SVXITEMS_START + 375)
-
-// Metric-Texte
-#define RID_SVXITEMS_METRIC_MM				(RID_SVXITEMS_START + 380)
-#define RID_SVXITEMS_METRIC_CM				(RID_SVXITEMS_START + 381)
-#define RID_SVXITEMS_METRIC_INCH			(RID_SVXITEMS_START + 382)
-#define RID_SVXITEMS_METRIC_POINT			(RID_SVXITEMS_START + 383)
-#define RID_SVXITEMS_METRIC_TWIP			(RID_SVXITEMS_START + 384)
-#define RID_SVXITEMS_METRIC_PIXEL			(RID_SVXITEMS_START + 385)
-
 // enum SvxCellHorJustify
 #define RID_SVXITEMS_HORJUST_STANDARD		(RID_SVXITEMS_START + 400)
 #define RID_SVXITEMS_HORJUST_LEFT			(RID_SVXITEMS_START + 401)
@@ -419,46 +229,12 @@
 #define RID_SVXITEMS_ORI_STACKED			(RID_SVXITEMS_START + 413)
 
 // Id's fuer BoolItems
-#define RID_SVXITEMS_SHADOWED_TRUE			(RID_SVXITEMS_START + 415)
-#define RID_SVXITEMS_SHADOWED_FALSE			(RID_SVXITEMS_START + 416)
-#define RID_SVXITEMS_AUTOKERN_TRUE			(RID_SVXITEMS_START + 417)
-#define RID_SVXITEMS_AUTOKERN_FALSE			(RID_SVXITEMS_START + 418)
-#define RID_SVXITEMS_WORDLINE_TRUE			(RID_SVXITEMS_START + 419)
-#define RID_SVXITEMS_WORDLINE_FALSE			(RID_SVXITEMS_START + 420)
-#define RID_SVXITEMS_CONTOUR_TRUE			(RID_SVXITEMS_START + 421)
-#define RID_SVXITEMS_CONTOUR_FALSE			(RID_SVXITEMS_START + 422)
-#define RID_SVXITEMS_NOLINEBREAK_TRUE		(RID_SVXITEMS_START + 423)
-#define RID_SVXITEMS_NOLINEBREAK_FALSE		(RID_SVXITEMS_START + 424)
-#define RID_SVXITEMS_NOHYPHEN_TRUE			(RID_SVXITEMS_START + 425)
-#define RID_SVXITEMS_NOHYPHEN_FALSE			(RID_SVXITEMS_START + 426)
-#define RID_SVXITEMS_PRINT_TRUE				(RID_SVXITEMS_START + 427)
-#define RID_SVXITEMS_PRINT_FALSE			(RID_SVXITEMS_START + 428)
-#define RID_SVXITEMS_OPAQUE_TRUE			(RID_SVXITEMS_START + 429)
-#define RID_SVXITEMS_OPAQUE_FALSE			(RID_SVXITEMS_START + 430)
-#define RID_SVXITEMS_FMTKEEP_TRUE			(RID_SVXITEMS_START + 431)
-#define RID_SVXITEMS_FMTKEEP_FALSE			(RID_SVXITEMS_START + 432)
-#define RID_SVXITEMS_FMTSPLIT_TRUE			(RID_SVXITEMS_START + 433)
-#define RID_SVXITEMS_FMTSPLIT_FALSE			(RID_SVXITEMS_START + 434)
-#define RID_SVXITEMS_PROT_CONTENT_TRUE		(RID_SVXITEMS_START + 435)
-#define RID_SVXITEMS_PROT_CONTENT_FALSE		(RID_SVXITEMS_START + 436)
-#define RID_SVXITEMS_PROT_SIZE_TRUE			(RID_SVXITEMS_START + 437)
-#define RID_SVXITEMS_PROT_SIZE_FALSE		(RID_SVXITEMS_START + 438)
-#define RID_SVXITEMS_PROT_POS_TRUE			(RID_SVXITEMS_START + 439)
-#define RID_SVXITEMS_PROT_POS_FALSE			(RID_SVXITEMS_START + 440)
-#define RID_SVXITEMS_TRANSPARENT_TRUE		(RID_SVXITEMS_START + 441)
-#define RID_SVXITEMS_TRANSPARENT_FALSE		(RID_SVXITEMS_START + 442)
 #define RID_SVXITEMS_BOXINF_TABLE_TRUE		(RID_SVXITEMS_START + 443)
 #define RID_SVXITEMS_BOXINF_TABLE_FALSE		(RID_SVXITEMS_START + 444)
 #define RID_SVXITEMS_BOXINF_DIST_TRUE		(RID_SVXITEMS_START + 445)
 #define RID_SVXITEMS_BOXINF_DIST_FALSE		(RID_SVXITEMS_START + 446)
 #define RID_SVXITEMS_BOXINF_MDIST_TRUE		(RID_SVXITEMS_START + 447)
 #define RID_SVXITEMS_BOXINF_MDIST_FALSE		(RID_SVXITEMS_START + 448)
-#define RID_SVXITEMS_HYPHEN_TRUE			(RID_SVXITEMS_START + 449)
-#define RID_SVXITEMS_HYPHEN_FALSE			(RID_SVXITEMS_START + 450)
-#define RID_SVXITEMS_PAGE_END_TRUE			(RID_SVXITEMS_START + 451)
-#define RID_SVXITEMS_PAGE_END_FALSE			(RID_SVXITEMS_START + 452)
-#define RID_SVXITEMS_BLINK_TRUE				(RID_SVXITEMS_START + 453)
-#define RID_SVXITEMS_BLINK_FALSE			(RID_SVXITEMS_START + 454)
 
 // Complete-Texte -----------------------------------------------------------
 
@@ -466,20 +242,6 @@
 #define RID_SVXITEMS_MARGIN_TOP				(RID_SVXITEMS_START + 481)
 #define RID_SVXITEMS_MARGIN_RIGHT			(RID_SVXITEMS_START + 482)
 #define RID_SVXITEMS_MARGIN_BOTTOM			(RID_SVXITEMS_START + 483)
-#define RID_SVXITEMS_SIZE_WIDTH				(RID_SVXITEMS_START + 484)
-#define RID_SVXITEMS_SIZE_HEIGHT			(RID_SVXITEMS_START + 485)
-#define RID_SVXITEMS_LRSPACE_LEFT			(RID_SVXITEMS_START + 486)
-#define RID_SVXITEMS_LRSPACE_FLINE			(RID_SVXITEMS_START + 487)
-#define RID_SVXITEMS_LRSPACE_RIGHT			(RID_SVXITEMS_START + 488)
-#define RID_SVXITEMS_SHADOW_COMPLETE		(RID_SVXITEMS_START + 489)
-#define RID_SVXITEMS_BORDER_COMPLETE		(RID_SVXITEMS_START + 490)
-#define RID_SVXITEMS_BORDER_TOP				(RID_SVXITEMS_START + 491)
-#define RID_SVXITEMS_BORDER_BOTTOM			(RID_SVXITEMS_START + 492)
-#define RID_SVXITEMS_BORDER_LEFT			(RID_SVXITEMS_START + 493)
-#define RID_SVXITEMS_BORDER_RIGHT			(RID_SVXITEMS_START + 494)
-#define RID_SVXITEMS_BORDER_DISTANCE		(RID_SVXITEMS_START + 495)
-#define RID_SVXITEMS_ULSPACE_UPPER			(RID_SVXITEMS_START + 496)
-#define RID_SVXITEMS_ULSPACE_LOWER			(RID_SVXITEMS_START + 497)
 #define RID_SVXITEMS_PAGE_COMPLETE			(RID_SVXITEMS_START + 498)
 #define RID_SVXITEMS_PAGE_NUM_BEGIN			(RID_SVXITEMS_START + 499)
 #define RID_SVXITEMS_PAGE_NUM_CHR_UPPER		(RID_SVXITEMS_START + 499)
@@ -494,80 +256,13 @@
 #define RID_SVXITEMS_PAGE_USAGE_RIGHT		(RID_SVXITEMS_START + 508)
 #define RID_SVXITEMS_PAGE_USAGE_ALL			(RID_SVXITEMS_START + 509)
 #define RID_SVXITEMS_PAGE_USAGE_MIRROR		(RID_SVXITEMS_START + 510)
-#define RID_SVXITEMS_LINES					(RID_SVXITEMS_START + 511)
-#define RID_SVXITEMS_WIDOWS_COMPLETE		(RID_SVXITEMS_START + 512)
-#define RID_SVXITEMS_ORPHANS_COMPLETE		(RID_SVXITEMS_START + 513)
-#define RID_SVXITEMS_HYPHEN_MINLEAD			(RID_SVXITEMS_START + 514)
-#define RID_SVXITEMS_HYPHEN_MINTRAIL		(RID_SVXITEMS_START + 515)
-#define RID_SVXITEMS_HYPHEN_MAX				(RID_SVXITEMS_START + 516)
-#define RID_SVXITEMS_PAGEMODEL_COMPLETE		(RID_SVXITEMS_START + 517)
-#define RID_SVXITEMS_KERNING_COMPLETE		(RID_SVXITEMS_START + 518)
-#define RID_SVXITEMS_KERNING_EXPANDED		(RID_SVXITEMS_START + 519)
-#define RID_SVXITEMS_KERNING_CONDENSED		(RID_SVXITEMS_START + 520)
 #define RID_SVXITEMS_AUTHOR_COMPLETE		(RID_SVXITEMS_START + 521)
 #define RID_SVXITEMS_DATE_COMPLETE			(RID_SVXITEMS_START + 522)
 #define RID_SVXITEMS_TEXT_COMPLETE			(RID_SVXITEMS_START + 523)
 #define RID_SVXITEMS_BACKGROUND_COLOR		(RID_SVXITEMS_START + 524)
 #define RID_SVXITEMS_PATTERN_COLOR			(RID_SVXITEMS_START + 525)
 
-#define RID_SVXITEMS_GRAPHIC				(RID_SVXITEMS_START + 526)
 #define RID_SVXITEMS_BRUSH_CHAR				(RID_SVXITEMS_START + 527)
-#define RID_SVXITEMS_BORDER_NONE			(RID_SVXITEMS_START + 528)
-
-// enum FontEmphasisMark ---------------------------------------------------
-#define RID_SVXITEMS_EMPHASIS_BEGIN_STYLE	(RID_SVXITEMS_START + 530)
-#define RID_SVXITEMS_EMPHASIS_NONE_STYLE	(RID_SVXITEMS_START + 530)
-#define RID_SVXITEMS_EMPHASIS_DOT_STYLE		(RID_SVXITEMS_START + 531)
-#define RID_SVXITEMS_EMPHASIS_CIRCLE_STYLE	(RID_SVXITEMS_START + 532)
-#define RID_SVXITEMS_EMPHASIS_DISC_STYLE	(RID_SVXITEMS_START + 533)
-#define RID_SVXITEMS_EMPHASIS_ACCENT_STYLE	(RID_SVXITEMS_START + 534)
-
-#define RID_SVXITEMS_EMPHASIS_ABOVE_POS		(RID_SVXITEMS_START + 540)
-#define RID_SVXITEMS_EMPHASIS_BELOW_POS		(RID_SVXITEMS_START + 541)
-
-#define RID_SVXITEMS_TWOLINES_OFF			(RID_SVXITEMS_START + 545)
-#define RID_SVXITEMS_TWOLINES				(RID_SVXITEMS_START + 546)
-
-#define RID_SVXITEMS_SCRPTSPC_OFF			(RID_SVXITEMS_START + 550)
-#define RID_SVXITEMS_SCRPTSPC_ON			(RID_SVXITEMS_START + 551)
-#define RID_SVXITEMS_HNGPNCT_OFF			(RID_SVXITEMS_START + 552)
-#define RID_SVXITEMS_HNGPNCT_ON				(RID_SVXITEMS_START + 553)
-
-#define RID_SVXITEMS_FORBIDDEN_RULE_OFF 	(RID_SVXITEMS_START + 554)
-#define RID_SVXITEMS_FORBIDDEN_RULE_ON 	    (RID_SVXITEMS_START + 555)
-
-#define RID_SVXITEMS_CHARROTATE_OFF			(RID_SVXITEMS_START + 556)
-#define RID_SVXITEMS_CHARROTATE				(RID_SVXITEMS_START + 557)
-#define RID_SVXITEMS_CHARROTATE_FITLINE		(RID_SVXITEMS_START + 558)
-
-#define RID_SVXITEMS_CHARSCALE_OFF			(RID_SVXITEMS_START + 559)
-#define RID_SVXITEMS_CHARSCALE				(RID_SVXITEMS_START + 560)
-
-#define RID_SVXITEMS_RELIEF_BEGIN			(RID_SVXITEMS_START + 561)
-#define RID_SVXITEMS_RELIEF_NONE			(RID_SVXITEMS_START + 561)
-#define RID_SVXITEMS_RELIEF_EMBOSSED		(RID_SVXITEMS_START + 562)
-#define RID_SVXITEMS_RELIEF_ENGRAVED		(RID_SVXITEMS_START + 563)
-#define RID_SVXITEMS_RELIEF_END				(RID_SVXITEMS_START + 564)
-
-#define RID_SVXITEMS_PARAVERTALIGN_AUTO			(RID_SVXITEMS_START + 565)
-#define RID_SVXITEMS_PARAVERTALIGN_BASELINE		(RID_SVXITEMS_START + 566)
-#define RID_SVXITEMS_PARAVERTALIGN_TOP	 		(RID_SVXITEMS_START + 567)
-#define RID_SVXITEMS_PARAVERTALIGN_CENTER		(RID_SVXITEMS_START + 568)
-#define RID_SVXITEMS_PARAVERTALIGN_BOTTOM		(RID_SVXITEMS_START + 569)
-
-#define RID_SVXITEMS_FRMDIR_BEGIN				(RID_SVXITEMS_START + 570)
-#define RID_SVXITEMS_FRMDIR_HORI_LEFT_TOP		(RID_SVXITEMS_START + 570)
-#define RID_SVXITEMS_FRMDIR_HORI_RIGHT_TOP		(RID_SVXITEMS_START + 571)
-#define RID_SVXITEMS_FRMDIR_VERT_TOP_RIGHT		(RID_SVXITEMS_START + 572)
-#define RID_SVXITEMS_FRMDIR_VERT_TOP_LEFT		(RID_SVXITEMS_START + 573)
-#define RID_SVXITEMS_FRMDIR_ENVIRONMENT			(RID_SVXITEMS_START + 574)
-#define RID_SVXITEMS_FRMDIR_END					(RID_SVXITEMS_START + 574)
-
-#define RID_SVXITEMS_PARASNAPTOGRID_ON                     (RID_SVXITEMS_START + 575)
-#define RID_SVXITEMS_PARASNAPTOGRID_OFF                    (RID_SVXITEMS_START + 576)
-
-#define RID_SVXITEMS_CHARHIDDEN_FALSE           (RID_SVXITEMS_START + 577)
-#define RID_SVXITEMS_CHARHIDDEN_TRUE            (RID_SVXITEMS_START + 578)
 
 // Ueberlaufpruefung --------------------------------------------------------
 
diff --git a/svx/inc/svx/unomid.hxx b/svx/inc/svx/unomid.hxx
index 0a0328b924..803fad9dd4 100644
--- a/svx/inc/svx/unomid.hxx
+++ b/svx/inc/svx/unomid.hxx
@@ -29,82 +29,6 @@
  ************************************************************************/
 #ifndef _SVX_UNOMID_HXX
 #define _SVX_UNOMID_HXX
-//LRSpaceItem
-#define MID_LR_MARGIN		0
-#define MID_LRP_MARGIN  	1
-#define MID_LR_REL_MARGIN	2
-#define MID_LRP_REL_MARGIN  3
-#define MID_L_MARGIN		4
-#define MID_R_MARGIN		5
-#define MID_L_REL_MARGIN	6
-#define MID_R_REL_MARGIN	7
-#define MID_FIRST_LINE_INDENT	 	8
-#define MID_FIRST_LINE_REL_INDENT   9
-#define MID_FIRST_AUTO				10
-#define MID_TXT_LMARGIN 			11
-
-//ULSpaceItem
-#define MID_UL_MARGIN		1
-#define MID_UL_REL_MARGIN	2
-#define MID_UP_MARGIN		3
-#define MID_LO_MARGIN		4
-#define MID_UP_REL_MARGIN	5
-#define MID_LO_REL_MARGIN	6
-
-//SvxBoolItem
-#define MID_BOLD			0
-#define MID_WEIGHT          1
-
-//SvxPostureItem
-#define MID_ITALIC          0
-#define MID_POSTURE         1
-
-//SvxFontHeightItem
-#define MID_FONTHEIGHT     	1
-#define MID_FONTHEIGHT_PROP 2
-#define MID_FONTHEIGHT_DIFF 3
-
-//SvxFontWidthItem
-#define MID_FONTWIDTH     	0
-#define MID_FONTWIDTH_PROP  1
-
-//SvxTextLineItem
-#define MID_TEXTLINED		0
-#define MID_TL_STYLE		1
-#define MID_TL_COLOR		2
-#define MID_TL_HASCOLOR		3
-
-//SvxCrossedOutItem
-#define MID_CROSSED_OUT		0
-#define MID_CROSS_OUT       1
-
-//SvxExcapementItem
-#define MID_ESC			 0
-#define MID_ESC_HEIGHT   1
-#define MID_AUTO_ESC     2
-
-//SvxLanguageItem
-#define MID_LANGUAGE		0
-#define MID_COUNTRY			1
-#define MID_LANG_COUNTRY	2
-
-//BrushItem
-#define MID_BACK_COLOR			0
-#define MID_GRAPHIC_POSITION    1
-#define MID_GRAPHIC_LINK        2
-#define MID_GRAPHIC             3
-#define MID_GRAPHIC_TRANSPARENT 4
-#define MID_GRAPHIC_URL        	5
-#define MID_GRAPHIC_FILTER     	6
-#define MID_GRAPHIC_REPEAT     	7
-#define MID_GRAPHIC_TRANSPARENCY 8
-#define MID_BACK_COLOR_R_G_B    9
-#define MID_BACK_COLOR_TRANSPARENCY 10
-
-//ProtectItem
-#define MID_PROTECT_CONTENT		0
-#define MID_PROTECT_SIZE        1
-#define MID_PROTECT_POSITION    2
 
 //AdjustItem
 #define MID_PARA_ADJUST			0
@@ -124,21 +48,6 @@
 #define MID_MARGIN_UP_MARGIN	4
 #define MID_MARGIN_LO_MARGIN	5
 
-//SvxBoxItem
-#define LEFT_BORDER  			1
-#define RIGHT_BORDER            2
-#define TOP_BORDER              3
-#define BOTTOM_BORDER           4
-#define BORDER_DISTANCE         5
-#define LEFT_BORDER_DISTANCE    6
-#define RIGHT_BORDER_DISTANCE   7
-#define TOP_BORDER_DISTANCE     8
-#define BOTTOM_BORDER_DISTANCE  9
-#define MID_LEFT_BORDER             10
-#define MID_RIGHT_BORDER            11
-#define MID_TOP_BORDER              12
-#define MID_BOTTOM_BORDER           13
-
 #define ALL_BORDER					10
 #define ALL_BORDER_PADDING			11
 #define LEFT_BORDER_PADDING			12
@@ -151,70 +60,13 @@
 #define TOP_BORDER_LINE_WIDTH		19
 #define BOTTOM_BORDER_LINE_WIDTH	20
 
-//SvxFontItem
-// Don't use 0 as it used for the whole struct
-#define MID_FONT_FAMILY_NAME 	1
-#define MID_FONT_STYLE_NAME     2
-#define MID_FONT_FAMILY         3
-#define MID_FONT_CHAR_SET       4
-#define MID_FONT_PITCH          5
-
-//SvxHyphenZoneItem
-#define MID_IS_HYPHEN	      	0
-#define MID_HYPHEN_MIN_LEAD     1
-#define MID_HYPHEN_MIN_TRAIL    2
-#define MID_HYPHEN_MAX_HYPHENS  3
-
-//SvxFmtBreakItem
-#define MID_BREAK_BEFORE		0
-#define MID_BREAK_AFTER			1
-
-//SvxCaseMapItem
-#define MID_CASEMAP_VARIANT		0
-#define MID_CASEMAP_TRANS		1
-
-//SvxLineSpaceItem
-#define MID_LS_FIXED			0
-#define MID_LS_MINIMUM			1
-#define MID_LS_DISTANCE			2
-
-//SvxLanguageItem
-#define MID_LANG_INT			0
-#define MID_LANG_LOCALE			1
-
-//NameOrIndex
-#define MID_NAME				16
-#define MID_GRAFURL				32
-
 // XFillBitmapItem (is also a NameOrIndex)
 #define MID_BITMAP              8
 
-//SvxTwoLinesItem
-#define MID_TWOLINES			0
-#define MID_START_BRACKET 		1
-#define MID_END_BRACKET 		2
-
-//SvxEmphasisMarkItem
-#define MID_EMPHASIS			0
-
-//SvxCharRotateItem
-#define MID_ROTATE				0
-#define MID_FITTOLINE			1
-
-// SvxCharReliefItem
-#define MID_RELIEF				0
-
-// SvxTabStop
-#define MID_TABSTOPS            0
-#define MID_STD_TAB             1
-
 // SvxHorJustifyItem
 #define MID_HORJUST_HORJUST		0
 #define MID_HORJUST_ADJUST		1
 
-// SvxPageModelItem
-#define MID_AUTO                1
-
 // SvxZoomItem
 #define MID_VALUE               2
 
@@ -225,11 +77,6 @@
 #define MID_END_Y               4
 #define MID_LIMIT               5
 
-// SvxBoxInfoItem
-#define MID_HORIZONTAL          1
-#define MID_VERTICAL            2
-#define MID_VALIDFLAGS          4
-
 // SvxColumnItem
 #define MID_COLUMNARRAY         7
 #define MID_ACTUAL              4
@@ -269,4 +116,5 @@
 #define MID_LINEDASH_DISTANCE		7
 
 #define MID_LEFT                    3
+
 #endif
diff --git a/svx/inc/svx/unoshprp.hxx b/svx/inc/svx/unoshprp.hxx
index 73c4c45bf4..1ad6e3db5c 100644
--- a/svx/inc/svx/unoshprp.hxx
+++ b/svx/inc/svx/unoshprp.hxx
@@ -94,7 +94,6 @@
  #endif
 #endif
 
-#define OWN_ATTR_VALUE_START					(3900)
 #define OWN_ATTR_VALUE_START_TEXT				(OWN_ATTR_VALUE_START+0)	// the next 10 entries are reserved for text
 #define OWN_ATTR_VALUE_POLYGONKIND				(OWN_ATTR_VALUE_START+10)
 #define OWN_ATTR_VALUE_POLYPOLYGON				(OWN_ATTR_VALUE_START+11)
@@ -194,7 +193,7 @@
 
 #define OWN_ATTR_EDGE_POLYPOLYGONBEZIER			(OWN_ATTR_VALUE_START+88)
 
-#define OWN_ATTR_VALUE_END                      OWN_ATTR_EDGE_POLYPOLYGONBEZIER // WARNING: ee items start at 3991!
+// maximum is OWN_ATTR_VALUE_END = OWN_ATTR_VALUE_START+90
 
 // #FontWork#
 #define FONTWORK_PROPERTIES \
diff --git a/svx/inc/svxerr.hxx b/svx/inc/svxerr.hxx
index 41bd5f6d58..9c2a153ee2 100644
--- a/svx/inc/svxerr.hxx
+++ b/svx/inc/svxerr.hxx
@@ -39,6 +39,7 @@
 #define ERRCODE_SVX_LINGU_THESAURUSNOTEXISTS   (1UL | ERRCODE_AREA_SVX | \
                                                 ERRCODE_CLASS_NOTEXISTS)
 
+// moved to editeng lib
 #define ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS    (2UL | ERRCODE_AREA_SVX)
 
 #define ERRCODE_SVX_LINGU_LINGUNOTEXISTS       (3UL | ERRCODE_AREA_SVX | \
@@ -52,7 +53,8 @@
 
 #define ERRCODE_SVX_GRAPHIC_NOTREADABLE	 	   (7UL | ERRCODE_AREA_SVX | \
                                                 ERRCODE_CLASS_READ )
-#define ERRCODE_SVX_GRAPHIC_WRONG_FILEFORMAT   (8UL | ERRCODE_AREA_SVX | \
+// moved to editeng lib
+//#define ERRCODE_SVX_GRAPHIC_WRONG_FILEFORMAT   (8UL | ERRCODE_AREA_SVX | \
                                                 ERRCODE_CLASS_READ )
 #define ERRCODE_SVX_LINGU_NOLANGUAGE		   (9UL | ERRCODE_AREA_SVX | \
                                                 ERRCODE_CLASS_NOTEXISTS )
diff --git a/svx/source/accessibility/accessibility.src b/svx/source/accessibility/accessibility.src
index 82fe774f5b..f809dabc3d 100644
--- a/svx/source/accessibility/accessibility.src
+++ b/svx/source/accessibility/accessibility.src
@@ -196,16 +196,6 @@ String RID_SVXSTR_GRAPHCTRL_ACC_DESCRIPTION
     Text [ en-US ] = "This is where you can edit the contour." ;
 };
 
-String RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION
-{
-    Text [ en-US ] = "Image bullet in paragraph" ;
-};
-
-String RID_SVXSTR_A11Y_IMAGEBULLET_NAME
-{
-    Text [ en-US ] = "Image bullet" ;
-};
-
 String RID_SVXSTR_CHARACTER_SELECTION
 {
     Text [ en-US ] = "Special character selection";
diff --git a/svx/source/dialog/dlgutil.cxx b/svx/source/dialog/dlgutil.cxx
index ac001a03a6..565378cc68 100644
--- a/svx/source/dialog/dlgutil.cxx
+++ b/svx/source/dialog/dlgutil.cxx
@@ -39,100 +39,6 @@
 
 // -----------------------------------------------------------------------
 
-void SetFieldUnit( MetricField& rField, FieldUnit eUnit, BOOL bAll )
-{
-    sal_Int64 nFirst	= rField.Denormalize( rField.GetFirst( FUNIT_TWIP ) );
-    sal_Int64 nLast = rField.Denormalize( rField.GetLast( FUNIT_TWIP ) );
-    sal_Int64 nMin = rField.Denormalize( rField.GetMin( FUNIT_TWIP ) );
-    sal_Int64 nMax = rField.Denormalize( rField.GetMax( FUNIT_TWIP ) );
-
-    if ( !bAll )
-    {
-        switch ( eUnit )
-        {
-            case FUNIT_M:
-            case FUNIT_KM:
-                eUnit = FUNIT_CM;
-                break;
-
-            case FUNIT_FOOT:
-            case FUNIT_MILE:
-                eUnit = FUNIT_INCH;
-                break;
-            default: ;//prevent warning
-        }
-    }
-    rField.SetUnit( eUnit );
-    switch( eUnit )
-    {
-        case FUNIT_MM:
-            rField.SetSpinSize( 50 );
-            break;
-
-        case FUNIT_INCH:
-            rField.SetSpinSize( 2 );
-            break;
-
-        default:
-            rField.SetSpinSize( 10 );
-    }
-
-    if ( FUNIT_POINT == eUnit )
-    {
-        if( rField.GetDecimalDigits() > 1 )
-            rField.SetDecimalDigits( 1 );
-    }
-    else
-        rField.SetDecimalDigits( 2 );
-
-    if ( !bAll )
-    {
-        rField.SetFirst( rField.Normalize( nFirst ), FUNIT_TWIP );
-        rField.SetLast( rField.Normalize( nLast ), FUNIT_TWIP );
-        rField.SetMin( rField.Normalize( nMin ), FUNIT_TWIP );
-        rField.SetMax( rField.Normalize( nMax ), FUNIT_TWIP );
-    }
-}
-
-// -----------------------------------------------------------------------
-
-void SetFieldUnit( MetricBox& rBox, FieldUnit eUnit, BOOL bAll )
-{
-    sal_Int64 nMin = rBox.Denormalize( rBox.GetMin( FUNIT_TWIP ) );
-    sal_Int64 nMax = rBox.Denormalize( rBox.GetMax( FUNIT_TWIP ) );
-
-    if ( !bAll )
-    {
-        switch ( eUnit )
-        {
-            case FUNIT_M:
-            case FUNIT_KM:
-                eUnit = FUNIT_CM;
-                break;
-
-            case FUNIT_FOOT:
-            case FUNIT_MILE:
-                eUnit = FUNIT_INCH;
-                break;
-            default: ;//prevent warning
-        }
-    }
-    rBox.SetUnit( eUnit );
-
-    if ( FUNIT_POINT == eUnit && rBox.GetDecimalDigits() > 1 )
-        rBox.SetDecimalDigits( 1 );
-    else
-        rBox.SetDecimalDigits( 2 );
-
-    if ( !bAll )
-    {
-        rBox.SetMin( rBox.Normalize( nMin ), FUNIT_TWIP );
-        rBox.SetMax( rBox.Normalize( nMax ), FUNIT_TWIP );
-    }
-}
-
-// -----------------------------------------------------------------------
-
 FieldUnit GetModuleFieldUnit( const SfxItemSet& rSet )
 {
     FieldUnit eUnit = FUNIT_INCH;
@@ -142,665 +48,3 @@ FieldUnit GetModuleFieldUnit( const SfxItemSet& rSet )
     return eUnit;
 }
 
-// -----------------------------------------------------------------------
-void SetMetricValue( MetricField& rField, long nCoreValue, SfxMapUnit eUnit )
-{
-    sal_Int64 nVal = OutputDevice::LogicToLogic( nCoreValue, (MapUnit)eUnit, MAP_100TH_MM );
-    nVal = rField.Normalize( nVal );
-    rField.SetValue( nVal, FUNIT_100TH_MM );
-
-}
-
-// -----------------------------------------------------------------------
-
-long GetCoreValue( const MetricField& rField, SfxMapUnit eUnit )
-{
-    sal_Int64 nVal = rField.GetValue( FUNIT_100TH_MM );
-    // avoid rounding issues
-    const sal_Int64 nSizeMask = 0xffffffffff000000LL;
-    bool bRoundBefore = true;
-    if( nVal >= 0 )
-    {
-        if( (nVal & nSizeMask) == 0 )
-            bRoundBefore = false;
-    }
-    else
-    {
-        if( ((-nVal) & nSizeMask ) == 0 )
-            bRoundBefore = false;
-    }
-    if( bRoundBefore )
-        nVal = rField.Denormalize( nVal );
-    sal_Int64 nUnitVal = OutputDevice::LogicToLogic( static_cast<long>(nVal), MAP_100TH_MM, (MapUnit)eUnit );
-    if( ! bRoundBefore )
-        nUnitVal = rField.Denormalize( nUnitVal );
-    return static_cast<long>(nUnitVal);
-}
-
-// -----------------------------------------------------------------------
-
-long CalcToUnit( float nIn, SfxMapUnit eUnit )
-{
-    // nIn ist in Points
-
-    DBG_ASSERT( eUnit == SFX_MAPUNIT_TWIP 		||
-                eUnit == SFX_MAPUNIT_100TH_MM 	||
-                eUnit == SFX_MAPUNIT_10TH_MM 	||
-                eUnit == SFX_MAPUNIT_MM 		||
-                eUnit == SFX_MAPUNIT_CM, "this unit is not implemented" );
-
-    float nTmp = nIn;
-
-    if ( SFX_MAPUNIT_TWIP != eUnit )
-        nTmp = nIn * 10 / 567;
-
-    switch ( eUnit )
-    {
-        case SFX_MAPUNIT_100TH_MM:	nTmp *= 100; break;
-        case SFX_MAPUNIT_10TH_MM:	nTmp *= 10;	 break;
-        case SFX_MAPUNIT_MM:					 break;
-        case SFX_MAPUNIT_CM:		nTmp /= 10;	 break;
-        default: ;//prevent warning
-    }
-
-    nTmp *= 20;
-    long nRet = (long)nTmp;
-    return nRet;
-//!	return (long)(nTmp * 20);
-}
-
-// -----------------------------------------------------------------------
-
-long ItemToControl( long nIn, SfxMapUnit eItem, SfxFieldUnit eCtrl )
-{
-    long nOut = 0;
-
-    switch ( eItem )
-    {
-        case SFX_MAPUNIT_100TH_MM:
-        case SFX_MAPUNIT_10TH_MM:
-        case SFX_MAPUNIT_MM:
-        {
-            if ( eItem == SFX_MAPUNIT_10TH_MM )
-                nIn /= 10;
-            else if ( eItem == SFX_MAPUNIT_100TH_MM )
-                nIn /= 100;
-            nOut = TransformMetric( nIn, FUNIT_MM, (FieldUnit)eCtrl );
-        }
-        break;
-
-        case SFX_MAPUNIT_CM:
-        {
-            nOut = TransformMetric( nIn, FUNIT_CM, (FieldUnit)eCtrl );
-        }
-        break;
-
-        case SFX_MAPUNIT_1000TH_INCH:
-        case SFX_MAPUNIT_100TH_INCH:
-        case SFX_MAPUNIT_10TH_INCH:
-        case SFX_MAPUNIT_INCH:
-        {
-            if ( eItem == SFX_MAPUNIT_10TH_INCH )
-                nIn /= 10;
-            else if ( eItem == SFX_MAPUNIT_100TH_INCH )
-                nIn /= 100;
-            else if ( eItem == SFX_MAPUNIT_1000TH_INCH )
-                nIn /= 1000;
-            nOut = TransformMetric( nIn, FUNIT_INCH, (FieldUnit)eCtrl );
-        }
-        break;
-
-        case SFX_MAPUNIT_POINT:
-        {
-            nOut = TransformMetric( nIn, FUNIT_POINT, (FieldUnit)eCtrl );
-        }
-        break;
-
-        case SFX_MAPUNIT_TWIP:
-        {
-            nOut = TransformMetric( nIn, FUNIT_TWIP, (FieldUnit)eCtrl );
-        }
-        break;
-        default: ;//prevent warning
-    }
-    return nOut;
-}
-
-// -----------------------------------------------------------------------
-
-long ControlToItem( long nIn, SfxFieldUnit eCtrl, SfxMapUnit eItem )
-{
-    return ItemToControl( nIn, eItem, eCtrl );
-}
-
-// -----------------------------------------------------------------------
-
-FieldUnit MapToFieldUnit( const SfxMapUnit eUnit )
-{
-    switch ( eUnit )
-    {
-        case SFX_MAPUNIT_100TH_MM:
-        case SFX_MAPUNIT_10TH_MM:
-        case SFX_MAPUNIT_MM:
-            return FUNIT_MM;
-
-        case SFX_MAPUNIT_CM:
-            return FUNIT_CM;
-
-        case SFX_MAPUNIT_1000TH_INCH:
-        case SFX_MAPUNIT_100TH_INCH:
-        case SFX_MAPUNIT_10TH_INCH:
-        case SFX_MAPUNIT_INCH:
-            return FUNIT_INCH;
-
-        case SFX_MAPUNIT_POINT:
-            return FUNIT_POINT;
-
-        case SFX_MAPUNIT_TWIP:
-            return FUNIT_TWIP;
-        default: ;//prevent warning
-    }
-    return FUNIT_NONE;
-}
-
-// -----------------------------------------------------------------------
-
-MapUnit FieldToMapUnit( const SfxFieldUnit /*eUnit*/ )
-{
-    return MAP_APPFONT;
-}
-
-// -----------------------------------------------------------------------
-
-long ConvertValueToMap( long nVal, SfxMapUnit eUnit )
-{
-    long nNew = nVal;
-
-    switch ( eUnit )
-    {
-        case SFX_MAPUNIT_10TH_MM:
-        case SFX_MAPUNIT_10TH_INCH:
-            nNew *= 10;
-            break;
-
-        case SFX_MAPUNIT_100TH_MM:
-        case SFX_MAPUNIT_100TH_INCH:
-            nNew *= 100;
-            break;
-
-        case SFX_MAPUNIT_1000TH_INCH:
-            nNew *= 1000;
-        default: ;//prevent warning
-    }
-    return nNew;
-}
-
-// -----------------------------------------------------------------------
-
-long ConvertValueToUnit( long nVal, SfxMapUnit eUnit )
-{
-    long nNew = nVal;
-
-    switch ( eUnit )
-    {
-        case SFX_MAPUNIT_10TH_MM:
-        case SFX_MAPUNIT_10TH_INCH:
-            nNew /= 10;
-            break;
-
-        case SFX_MAPUNIT_100TH_MM:
-        case SFX_MAPUNIT_100TH_INCH:
-            nNew /= 100;
-            break;
-
-        case SFX_MAPUNIT_1000TH_INCH:
-            nNew /= 1000;
-        break;
-        default: ;//prevent warning
-    }
-    return nNew;
-}
-
-// -----------------------------------------------------------------------
-
-long CalcToPoint( long nIn, SfxMapUnit eUnit, USHORT nFaktor )
-{
-    DBG_ASSERT( eUnit == SFX_MAPUNIT_TWIP 		||
-                eUnit == SFX_MAPUNIT_100TH_MM 	||
-                eUnit == SFX_MAPUNIT_10TH_MM 	||
-                eUnit == SFX_MAPUNIT_MM 		||
-                eUnit == SFX_MAPUNIT_CM, "this unit is not implemented" );
-
-    long nRet = 0;
-
-    if ( SFX_MAPUNIT_TWIP == eUnit )
-        nRet = nIn;
-    else
-        nRet = nIn * 567;
-
-    switch ( eUnit )
-    {
-        case SFX_MAPUNIT_100TH_MM:	nRet /= 100; break;
-        case SFX_MAPUNIT_10TH_MM:	nRet /= 10;	 break;
-        case SFX_MAPUNIT_MM:					 break;
-        case SFX_MAPUNIT_CM:		nRet *= 10;	 break;
-        default: ;//prevent warning
-    }
-
-    // ggf. aufrunden
-    if ( SFX_MAPUNIT_TWIP != eUnit )
-    {
-        long nMod = 10;
-        long nTmp = nRet % nMod;
-
-        if ( nTmp >= 4 )
-            nRet += 10 - nTmp;
-        nRet /= 10;
-    }
-    return nRet * nFaktor / 20;
-}
-
-// -----------------------------------------------------------------------
-
-long CMToTwips( long nIn )
-{
-    long nRet = 0;
-
-    if ( nIn <= ( LONG_MAX / 567 ) && nIn >= ( LONG_MIN / 567 ) )
-        nRet = nIn * 567;
-    return nRet;
-}
-
-// -----------------------------------------------------------------------
-
-long MMToTwips( long nIn )
-{
-    long nRet = 0;
-
-    if ( nIn <= ( LONG_MAX / 567 ) && nIn >= ( LONG_MIN / 567 ) )
-        nRet = nIn * 567 / 10;
-    return nRet;
-}
-
-// -----------------------------------------------------------------------
-
-long InchToTwips( long nIn )
-{
-    long nRet = 0;
-
-    if ( nIn <= ( LONG_MAX / 1440 ) && nIn >= ( LONG_MIN / 1440 ) )
-        nRet = nIn * 1440;
-    return nRet;
-}
-
-// -----------------------------------------------------------------------
-
-long PointToTwips( long nIn )
-{
-    long nRet = 0;
-
-    if ( nIn <= ( LONG_MAX / 20 ) && nIn >= ( LONG_MIN / 20 ) )
-        nRet = nIn * 20;
-    return nRet;
-}
-
-// -----------------------------------------------------------------------
-
-long PicaToTwips( long nIn )
-{
-    long nRet = 0;
-
-    if ( nIn <= ( LONG_MAX / 240 ) && nIn >= ( LONG_MIN / 240 ) )
-        nRet = nIn * 240;
-    return nRet;
-}
-
-// -----------------------------------------------------------------------
-
-long TwipsToCM( long nIn )
-{
-    long nRet = nIn / 567;
-    return nRet;
-}
-
-// -----------------------------------------------------------------------
-
-long InchToCM( long nIn )
-{
-    long nRet = 0;
-
-    if ( nIn <= ( LONG_MAX / 254 ) && nIn >= ( LONG_MIN / 254 ) )
-        nRet = nIn * 254 / 100;
-    return nRet;
-}
-
-// -----------------------------------------------------------------------
-
-long MMToCM( long nIn )
-{
-    long nRet = nIn / 10;
-    return nRet;
-}
-
-// -----------------------------------------------------------------------
-
-long PointToCM( long nIn )
-{
-    long nRet = 0;
-
-    if ( nIn <= ( LONG_MAX / 20 ) && nIn >= ( LONG_MIN / 20 ) )
-        nRet = nIn * 20 / 567;
-    return nRet;
-}
-
-// -----------------------------------------------------------------------
-
-long PicaToCM( long nIn)
-{
-    long nRet = 0;
-
-    if ( nIn <= ( LONG_MAX / 12 / 20 ) && nIn >= ( LONG_MIN / 12 / 20 ) )
-        nRet = nIn * 12 * 20 / 567;
-    return nRet;
-}
-
-// -----------------------------------------------------------------------
-
-long TwipsToMM( long nIn )
-{
-    long nRet = 0;
-
-    if ( nIn <= ( LONG_MAX / 10 ) && nIn >= ( LONG_MIN / 10 ) )
-        nRet = nIn * 10 / 566;
-    return nRet;
-}
-
-// -----------------------------------------------------------------------
-
-long CMToMM( long nIn )
-{
-    long nRet = 0;
-
-    if ( nIn <= ( LONG_MAX / 10 ) && nIn >= ( LONG_MIN / 10 ) )
-        nRet = nIn * 10;
-    return nRet;
-}
-
-// -----------------------------------------------------------------------
-
-long InchToMM( long nIn )
-{
-    long nRet = 0;
-
-    if ( nIn <= ( LONG_MAX / 254 ) && nIn >= ( LONG_MIN / 254 ) )
-        nRet = nIn * 254 / 10;
-    return nRet;
-}
-
-// -----------------------------------------------------------------------
-
-long PointToMM( long nIn )
-{
-    long nRet = 0;
-
-    if ( nIn <= ( LONG_MAX / 200 ) && nIn >= ( LONG_MIN / 200 ) )
-        nRet = nIn * 200 / 567;
-    return nRet;
-}
-
-// -----------------------------------------------------------------------
-
-long PicaToMM( long nIn )
-{
-    long nRet = 0;
-
-    if ( nIn <= ( LONG_MAX / 12 / 200 ) && nIn >= ( LONG_MIN / 12 / 200 ) )
-        nRet = nIn * 12 * 200 / 567;
-    return nRet;
-}
-
-// -----------------------------------------------------------------------
-
-long TwipsToInch( long nIn )
-{
-    long nRet = nIn / 1440;
-    return nRet;
-}
-
-// -----------------------------------------------------------------------
-
-long CMToInch( long nIn )
-{
-    long nRet = 0;
-
-    if ( nIn <= ( LONG_MAX / 100 ) && nIn >= ( LONG_MIN / 100 ) )
-        nRet = nIn * 100 / 254;
-    return nRet;
-}
-
-// -----------------------------------------------------------------------
-
-long MMToInch( long nIn )
-{
-    long nRet = 0;
-
-    if ( nIn <= ( LONG_MAX / 10 ) && nIn >= ( LONG_MIN / 10 ) )
-        nRet = nIn * 10 / 254;
-    return nRet;
-}
-
-// -----------------------------------------------------------------------
-
-long PointToInch( long nIn )
-{
-    long nRet = nIn / 72;
-    return nRet;
-}
-
-// -----------------------------------------------------------------------
-
-long PicaToInch( long nIn )
-{
-    long nRet = nIn / 6;
-    return nRet;
-}
-
-// -----------------------------------------------------------------------
-
-long TwipsToPoint( long nIn )
-{
-    long nRet = nIn / 20;
-    return nRet;
-}
-
-// -----------------------------------------------------------------------
-
-long InchToPoint( long nIn )
-{
-    long nRet = 0;
-
-    if ( nIn <= ( LONG_MAX / 72 ) && nIn >= ( LONG_MIN / 72 ) )
-        nRet = nIn * 72;
-    return nRet;
-}
-
-// -----------------------------------------------------------------------
-
-long CMToPoint( long nIn )
-{
-    long nRet = 0;
-
-    if ( nIn <= ( LONG_MAX / 567 ) && nIn >= ( LONG_MIN / 567 ) )
-        nRet = nIn * 567 / 20;
-    return nRet;
-}
-
-// -----------------------------------------------------------------------
-
-long MMToPoint( long nIn )
-{
-    long nRet = 0;
-
-    if ( nIn <= ( LONG_MAX / 567 ) && nIn >= ( LONG_MIN / 567 ) )
-        nRet = nIn * 567 / 200;
-    return nRet;
-}
-
-// -----------------------------------------------------------------------
-
-long PicaToPoint( long nIn )
-{
-    long nRet = nIn / 12;
-    return nRet;
-}
-
-// -----------------------------------------------------------------------
-
-long TwipsToPica( long nIn )
-{
-    long nRet = nIn / 240;
-    return nRet;
-}
-
-// -----------------------------------------------------------------------
-
-long InchToPica( long nIn )
-{
-    long nRet = 0;
-
-    if ( nIn <= ( LONG_MAX / 6 ) && nIn >= ( LONG_MIN / 6 ) )
-        nRet = nIn * 6;
-    return nRet;
-}
-
-// -----------------------------------------------------------------------
-
-long PointToPica( long nIn )
-{
-    long nRet = 0;
-
-    if ( nIn <= ( LONG_MAX / 12 ) && nIn >= ( LONG_MIN / 12 ) )
-        nRet = nIn * 12;
-    return nRet;
-}
-
-// -----------------------------------------------------------------------
-
-long CMToPica( long nIn )
-{
-    long nRet = 0;
-
-    if ( nIn <= ( LONG_MAX / 567 ) && nIn >= ( LONG_MIN / 567 ) )
-        nRet = nIn * 567 / 20 / 12;
-    return nRet;
-}
-
-// -----------------------------------------------------------------------
-
-long MMToPica( long nIn )
-{
-    long nRet = 0;
-
-    if ( nIn <= ( LONG_MAX / 567 ) && nIn >= ( LONG_MIN / 567 ) )
-        nRet = nIn * 567 / 200 / 12;
-    return nRet;
-}
-
-// -----------------------------------------------------------------------
-
-long Nothing( long nIn )
-{
-    long nRet = nIn;
-    return nRet;
-}
-
-FUNC_CONVERT ConvertTable[6][6] =
-{
-//  CM,			MM			INCH		 POINT		  PICAS=32	   TWIPS
-    { Nothing, 	CMToMM, 	CMToInch,    CMToPoint,   CMToPica,    CMToTwips },
-    { MMToCM,		Nothing,	MMToInch,	 MMToPoint,   MMToPica,    MMToTwips },
-    { InchToCM,	InchToMM,	Nothing,	 InchToPoint, InchToPica,  InchToTwips },
-    { PointToCM,	PointToMM,  PointToInch, Nothing,	  PointToPica, PointToTwips },
-    { PicaToCM,	PicaToMM,   PicaToInch,  PicaToPoint, Nothing,	   PicaToTwips },
-    { TwipsToCM,	TwipsToMM,  TwipsToInch, TwipsToPoint,TwipsToPica, Nothing }
-};
-
-// -----------------------------------------------------------------------
-
-long TransformMetric( long nVal, FieldUnit aOld, FieldUnit aNew )
-{
-    if ( aOld == FUNIT_NONE	  || aNew == FUNIT_NONE ||
-         aOld == FUNIT_CUSTOM || aNew == FUNIT_CUSTOM )
-    {
-        return nVal;
-    }
-
-    USHORT nOld = 0;
-    USHORT nNew = 0;
-
-    switch ( aOld )
-    {
-        case FUNIT_CM:
-            nOld = 0; break;
-        case FUNIT_MM:
-            nOld = 1; break;
-        case FUNIT_INCH:
-            nOld = 2; break;
-        case FUNIT_POINT:
-            nOld = 3; break;
-        case FUNIT_PICA:
-            nOld = 4; break;
-        case FUNIT_TWIP:
-            nOld = 5; break;
-        default: ;//prevent warning
-    }
-
-    switch ( aNew )
-    {
-        case FUNIT_CM:
-            nNew = 0; break;
-        case FUNIT_MM:
-            nNew = 1; break;
-        case FUNIT_INCH:
-            nNew = 2; break;
-        case FUNIT_POINT:
-            nNew = 3; break;
-        case FUNIT_PICA:
-            nNew = 4; break;
-        case FUNIT_TWIP:
-            nNew = 5; break;
-        default: ;//prevent warning
-    }
-    return ConvertTable[nOld][nNew]( nVal );
-}
-
-String ConvertPosSizeToIniString( const Point& rPos, const Size& rSize )
-{
-    String aRet = String::CreateFromInt32( rPos.X() );
-    aRet += '/';
-    aRet += String::CreateFromInt32( rPos.Y() );
-    aRet += '/';
-    aRet += String::CreateFromInt32( rSize.Width() );
-    aRet += '/';
-    aRet += String::CreateFromInt32( rSize.Height() );
-    return aRet;
-}
-
-sal_Bool ConvertIniStringToPosSize( const String& rIniStr, Point& rPos, Size& rSize )
-{
-    if ( rIniStr.GetTokenCount('/') != 4 )
-        return sal_False;
-
-    USHORT nIdx = 0;
-    rPos.X() = rIniStr.GetToken( 0, '/', nIdx ).ToInt32();
-    rPos.Y() = rIniStr.GetToken( 0, '/', nIdx ).ToInt32();
-    rSize.Width() = rIniStr.GetToken( 0, '/', nIdx ).ToInt32();
-    rSize.Height() = rIniStr.GetToken( 0, '/', nIdx ).ToInt32();
-
-    // negative sizes are invalid
-    if ( rSize.Width() < 0 || rSize.Height() < 0 )
-        return sal_False;
-
-    return sal_True;
-}
-
diff --git a/svx/source/dialog/impgrf.cxx b/svx/source/dialog/impgrf.cxx
deleted file mode 100644
index 1ff3e548d0..0000000000
--- a/svx/source/dialog/impgrf.cxx
+++ /dev/null
@@ -1,113 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: impgrf.cxx,v $
- * $Revision: 1.27 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-// include ------------------------------------------------------------------
-
-#include <limits.h>				// USHRT_MAX
-#include <tools/urlobj.hxx>
-#include <tools/bigint.hxx>
-#include <svl/eitem.hxx>
-#include <svl/stritem.hxx>
-#include <vcl/msgbox.hxx>
-#include <vcl/waitobj.hxx>
-#include <unotools/pathoptions.hxx>
-#include <unotools/viewoptions.hxx>
-#include <unotools/localfilehelper.hxx>
-#include <ucbhelper/content.hxx>
-#include <osl/file.hxx>
-#include <com/sun/star/ucb/CommandAbortedException.hpp>
-#include <unotools/ucbstreamhelper.hxx>
-
-using namespace ::ucbhelper;
-using namespace com::sun::star::uno;
-
-#include <svx/dialogs.hrc>
-#include "impgrf.hrc"
-
-#define _SVX_IMPGRF_CXX
-#include "svx/impgrf.hxx"
-#include <svx/dialmgr.hxx>
-#include "svxerr.hxx"
-#include "helpid.hrc"
-
-// defines ---------------------------------------------------------------
-
-#define IMPGRF_INIKEY_ASLINK		"ImportGraphicAsLink"
-#define IMPGRF_INIKEY_PREVIEW		"ImportGraphicPreview"
-#define IMPGRF_CONFIGNAME			String(DEFINE_CONST_UNICODE("ImportGraphicDialog"))
-
-GraphicFilter* GetGrfFilter()
-{
-    return GraphicFilter::GetGraphicFilter();
-}
-
-// -----------------------------------------------------------------------
-
-int LoadGraphic( const String &rPath, const String &rFilterName,
-                 Graphic& rGraphic, GraphicFilter* pFilter,
-                 USHORT* pDeterminedFormat )
-{
-    if ( !pFilter )
-        pFilter = ::GetGrfFilter();
-
-    const USHORT nFilter = rFilterName.Len() && pFilter->GetImportFormatCount()
-                    ? pFilter->GetImportFormatNumber( rFilterName )
-                    : GRFILTER_FORMAT_DONTKNOW;
-
-    // dann teste mal auf File-Protokoll:
-    SvStream* pStream = NULL;
-    INetURLObject aURL( rPath );
-
-    if ( aURL.HasError() || INET_PROT_NOT_VALID == aURL.GetProtocol() )
-    {
-        aURL.SetSmartProtocol( INET_PROT_FILE );
-        aURL.SetSmartURL( rPath );
-    }
-    else if ( INET_PROT_FILE != aURL.GetProtocol() )
-    {
-        pStream = ::utl::UcbStreamHelper::CreateStream( rPath, STREAM_READ );
-    }
-
-    int nRes = GRFILTER_OK;
-    if ( !pStream )
-        nRes = pFilter->ImportGraphic( rGraphic, aURL, nFilter, pDeterminedFormat );
-    else
-        nRes = pFilter->ImportGraphic( rGraphic, rPath, *pStream, nFilter, pDeterminedFormat );
-
-#ifdef DBG_UTIL
-    if( nRes )
-        DBG_WARNING2( "GrafikFehler [%d] - [%s]", nRes, rPath.GetBuffer() );
-#endif
-
-    return nRes;
-}
-
diff --git a/svx/source/dialog/impgrf.src b/svx/source/dialog/impgrf.src
deleted file mode 100644
index 430d41dc1b..0000000000
--- a/svx/source/dialog/impgrf.src
+++ /dev/null
@@ -1,153 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: impgrf.src,v $
- * $Revision: 1.29 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
- // pragma -------------------------------------------------------------------
-
- // include ------------------------------------------------------------------
-#include <svx/dialogs.hrc>
-#include "impgrf.hrc"
- // --------------------------------------------------------------------------
-String RID_SVXSTR_ALL_FILES
-{
-    Text [ en-US ] = "<All files>" ;
-};
-Resource RID_SVXRES_IMPORTGRAPHIC
-{
-    String STR_IMPORT_ALL
-    {
-        Text [ en-US ] = "<All formats>" ;
-    };
-    String STR_UNKNOWN_FORMAT
-    {
-        Text [ en-US ] = "Unknown file format!" ;
-    };
-    String STR_PATH_NOT_FOUND1
-    {
-        Text [ en-US ] = "The directory '" ;
-    };
-    String STR_PATH_NOT_FOUND2
-    {
-        Text [ en-US ] = "' does not exist" ;
-    };
-    String STR_FLT_BMP
-    {
-        Text = "BMP - MS Windows,*.BMP,BMPp0" ;
-    };
-    String STR_FLT_SGF
-    {
-        Text = "SGF - StarWriter SGF,*.SGF,????0" ;
-    };
-    String STR_FLT_SGV
-    {
-        Text = "SGV - StarDraw 2.0,*.SGV,????0" ;
-    };
-    String STR_FLT_SVM
-    {
-        Text = "SVM - StarView Metafile,*.SVM,SVM 0" ;
-    };
-    String STR_GRFILTER_OPENERROR
-    {
-        Text [ en-US ] = "Graphics file cannot be opened" ;
-    };
-    String STR_GRFILTER_IOERROR
-    {
-        Text [ en-US ] = "Graphics file cannot be read" ;
-    };
-    String STR_GRFILTER_FORMATERROR
-    {
-        Text [ en-US ] = "Unknown graphics format" ;
-    };
-    String STR_GRFILTER_VERSIONERROR
-    {
-        Text [ en-US ] = "Cannot support version of graphic file" ;
-    };
-    String STR_GRFILTER_FILTERERROR
-    {
-        Text [ en-US ] = "Graphics filter not found" ;
-    };
-    String STR_GRFILTER_TOOBIG
-    {
-        Text [ en-US ] = "Not enough memory to insert graphic" ;
-    };
-    String STR_PROPERTIES
-    {
-        Text [ en-US ] = "~Properties..." ;
-    };
-    String STR_HOME
-    {
-        Text [ en-US ] = "Standard" ;
-    };
-    String STR_LINK
-    {
-        Text [ en-US ] = "~Link" ;
-    };
-    String STR_PREVIEW
-    {
-        Text [ en-US ] = "Pr~eview" ;
-    };
-    String STR_FILTER
-    {
-        Text [ en-US ] = "~Filter..." ;
-    };
-};
- // ********************************************************************** EOF
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svx/source/dialog/makefile.mk b/svx/source/dialog/makefile.mk
index cc4c2f968b..0cd91e7b1f 100644
--- a/svx/source/dialog/makefile.mk
+++ b/svx/source/dialog/makefile.mk
@@ -58,7 +58,6 @@ SRC1FILES =  \
         hdft.src \
         hyprlink.src \
         imapdlg.src \
-        impgrf.src \
         langbox.src \
         language.src \
         lingu.src \
@@ -83,7 +82,6 @@ LIB1OBJFILES= \
         $(SLO)$/dlgutil.obj \
         $(SLO)$/framelink.obj\
         $(SLO)$/hangulhanja.obj \
-        $(SLO)$/impgrf.obj \
         $(SLO)$/langbox.obj \
         $(SLO)$/opengrf.obj \
         $(SLO)$/simptabl.obj \
diff --git a/svx/source/dialog/opengrf.cxx b/svx/source/dialog/opengrf.cxx
index 6ca40f2486..6a9834a1ef 100644
--- a/svx/source/dialog/opengrf.cxx
+++ b/svx/source/dialog/opengrf.cxx
@@ -63,7 +63,7 @@
 #include "opengrf.hxx"
 
 #include <svx/dialogs.hrc>
-#include "impgrf.hrc"
+//#include "impgrf.hrc"
 
 
 //-----------------------------------------------------------------------------
diff --git a/svx/source/dialog/svxbox.cxx b/svx/source/dialog/svxbox.cxx
deleted file mode 100644
index cb8c4c388f..0000000000
--- a/svx/source/dialog/svxbox.cxx
+++ /dev/null
@@ -1,623 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: svxbox.cxx,v $
- * $Revision: 1.8 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-#include <tools/debug.hxx>
-#ifndef _APP_HXX //autogen
-#include <vcl/svapp.hxx>
-#endif
-
-#include <svx/svxbox.hxx>
-#include <unotools/charclass.hxx>
-
-// -----------------------------------------------------------------------
-
-SV_IMPL_PTRARR(SvxEntryLst, SvxBoxEntry*)
-
-/*--------------------------------------------------------------------
-     Beschreibung: Ein ListboxElement
- --------------------------------------------------------------------*/
-
-SvxBoxEntry::SvxBoxEntry() :
-    nId(LISTBOX_ENTRY_NOTFOUND),
-    bModified(FALSE),
-    bNew(FALSE)
-{
-}
-
-
-SvxBoxEntry::SvxBoxEntry(const String& aNam, USHORT nIdx) :
-    aName(aNam),
-    nId(nIdx),
-    bModified(FALSE),
-    bNew(FALSE)
-{
-}
-
-
-SvxBoxEntry::SvxBoxEntry(const SvxBoxEntry& rOld) :
-    aName(rOld.aName),
-    nId(rOld.nId),
-    bModified(rOld.bModified),
-    bNew(rOld.bNew)
-{
-}
-
-/*--------------------------------------------------------------------
-     Beschreibung:
- --------------------------------------------------------------------*/
-
-SvxListBox::SvxListBox(Window* pParent, WinBits nBits) :
-    ListBox(pParent, nBits)
-{
-    InitListBox();
-}
-
-
-SvxListBox::SvxListBox(Window* pParent, const ResId& rId):
-    ListBox(pParent, rId)
-{
-    InitListBox();
-}
-
-/*--------------------------------------------------------------------
-     Beschreibung: Basisklasse Dtor
- --------------------------------------------------------------------*/
-
-__EXPORT SvxListBox::~SvxListBox()
-{
-    aEntryLst.DeleteAndDestroy(0,	aEntryLst.Count());
-    aDelEntryLst.DeleteAndDestroy(0, aDelEntryLst.Count());
-}
-
-/*--------------------------------------------------------------------
-     Beschreibung: Evtl. Liste aus der Ressource beachten
- --------------------------------------------------------------------*/
-
-void SvxListBox::InitListBox()
-{
-    // Verwaltung fuer die Stringlist aus der Resource aufbauen
-    USHORT nSize = GetEntryCount();
-    for(USHORT i=0; i < nSize; ++i)
-    {	const SvxBoxEntry* pTmp = new SvxBoxEntry(ListBox::GetEntry(i), i);
-        const SvxBoxEntry* &rpTmp = pTmp;
-        aEntryLst.Insert(rpTmp, aEntryLst.Count());
-    }
-}
-
-/*--------------------------------------------------------------------
-     Beschreibung: neue Eintraege verwalten
- --------------------------------------------------------------------*/
-
-void SvxListBox::InsertNewEntry(const SvxBoxEntry& rEntry)
-{
-    SvxBoxEntry* pNew = new SvxBoxEntry(rEntry);
-    pNew->bNew = TRUE;
-    InsertSorted(pNew);
-}
-
-/*--------------------------------------------------------------------
-     Beschreibung: Eintrag in die ListBox aufnehmen
- --------------------------------------------------------------------*/
-
-void SvxListBox::InsertEntry(const SvxBoxEntry& rEntry, USHORT nPos)
-{
-    if(nPos != LISTBOX_ENTRY_NOTFOUND)
-    {
-        SvxBoxEntry* pEntry = new SvxBoxEntry(rEntry);
-        ListBox::InsertEntry(pEntry->aName, nPos);
-        //const SvxBoxEntry* &rpEntry = pEntry;
-        aEntryLst.C40_INSERT(SvxBoxEntry, pEntry, nPos);
-    }
-    else
-        InsertSorted(new SvxBoxEntry(rEntry));
-}
-
-/*--------------------------------------------------------------------
-     Beschreibung: Eintrag aus der Liste loeschen
- --------------------------------------------------------------------*/
-
-void SvxListBox::RemoveEntry(USHORT nPos)
-{
-    if(nPos >= aEntryLst.Count())
-        return;
-
-    // Altes Element austragen
-    SvxBoxEntry* pEntry = aEntryLst[nPos];
-    aEntryLst.Remove(nPos, 1);
-    ListBox::RemoveEntry(nPos);
-
-    // keine neuen Eintraege in die Liste mit aufnehmen
-    if(pEntry->bNew)
-        return;
-
-    // in DeleteListe eintragen
-    aDelEntryLst.C40_INSERT(SvxBoxEntry, pEntry, aDelEntryLst.Count());
-}
-
-/*--------------------------------------------------------------------
-     Beschreibung: Eintrag ueber konkretes Obkjekt loeschen
- --------------------------------------------------------------------*/
-
-void SvxListBox::RemoveEntry(const SvxBoxEntry& rEntry)
-{
-    USHORT nPos = ListBox::GetEntryPos(rEntry.aName);
-    RemoveEntry(nPos);
-}
-
-/*--------------------------------------------------------------------
-     Beschreibung: Listen loeschen und Anzeige loeschen
- --------------------------------------------------------------------*/
-
-void SvxListBox::Clear()
-{
-    ListBox::Clear();
-    aEntryLst.DeleteAndDestroy(0, aEntryLst.Count());
-    aDelEntryLst.DeleteAndDestroy(0, aDelEntryLst.Count());
-}
-
-/*--------------------------------------------------------------------
-     Beschreibung: Position by Name
- --------------------------------------------------------------------*/
-
-USHORT SvxListBox::GetEntryPos(const SvxBoxEntry& rEntry) const
-{
-    return ListBox::GetEntryPos(rEntry.aName);
-}
-
-/*--------------------------------------------------------------------
-     Beschreibung: Rund um die Entries
- --------------------------------------------------------------------*/
-
-const SvxBoxEntry& SvxListBox::GetSvxBoxEntry(USHORT nPos) const
-{
-    if(nPos < aEntryLst.Count())
-        return *aEntryLst[nPos];
-    else
-        return aDefault;
-}
-
-/*--------------------------------------------------------------------
-     Beschreibung: aktullen Eintrag zurueckgeben
- --------------------------------------------------------------------*/
-
-const SvxBoxEntry& SvxListBox::GetSelectSvxBoxEntry(USHORT nSelId) const
-{
-    String aName(ListBox::GetSelectEntry(nSelId));
-
-    if(aName.Len() > 0)
-    {
-        for (USHORT i=0; i < aEntryLst.Count(); i++)
-        {
-            if(aEntryLst[i]->aName == aName )
-                return *aEntryLst[i];
-        }
-    }
-    return aDefault;
-}
-
-/*--------------------------------------------------------------------
-     Beschreibung: modifizierte Eintraege
- --------------------------------------------------------------------*/
-
-USHORT SvxListBox::GetModifiedCount() const
-{
-    USHORT nMod  = 0;
-    USHORT nSize = aEntryLst.Count();
-    for(USHORT i=0; i < nSize; ++i)
-    {	if(aEntryLst[i]->bModified)
-            nMod++;
-    }
-    return nMod;
-}
-
-/*--------------------------------------------------------------------
-     Beschreibung: Modifizierte Eintraege behandeln
- --------------------------------------------------------------------*/
-
-void SvxListBox::ModifyEntry(USHORT nPos, const String& rName)
-{
-    if(nPos >= aEntryLst.Count())
-        return;
-
-    SvxBoxEntry* pEntry = aEntryLst[nPos];
-    aEntryLst.Remove(nPos, 1);
-    aEntryLst[nPos]->aName 		= rName;
-    aEntryLst[nPos]->bModified 	= TRUE;
-    ListBox::RemoveEntry(nPos);
-
-    InsertSorted(pEntry);
-}
-
-/*--------------------------------------------------------------------
-     Beschreibung: alle modifizierten Eintraege bahandeln
- --------------------------------------------------------------------*/
-
-const SvxBoxEntry& SvxListBox::GetModifiedEntry(USHORT nPos) const
-{
-    USHORT nSize = aEntryLst.Count();
-    USHORT nMod  = 0;
-    for(USHORT i=0; i < nSize; ++i)
-    {	if(aEntryLst[i]->bModified)
-        {	if(nMod == nPos)
-                return *aEntryLst[i];
-            nMod++;
-        }
-    }
-    return aDefault;
-}
-
-/*--------------------------------------------------------------------
-     Beschreibung: geloeschte Eintraege
- --------------------------------------------------------------------*/
-
-USHORT SvxListBox::GetRemovedCount() const
-{
-    return aDelEntryLst.Count();
-}
-
-
-const SvxBoxEntry& SvxListBox::GetRemovedEntry(USHORT nPos) const
-{
-    if(nPos < aDelEntryLst.Count())
-        return *aDelEntryLst[nPos];
-
-    return aDefault;
-}
-
-/*--------------------------------------------------------------------
-     Beschreibung: Neue Entries begutachten
- --------------------------------------------------------------------*/
-
-USHORT SvxListBox::GetNewCount() const
-{
-    USHORT nNew = 0;
-    USHORT nSize = aEntryLst.Count();
-    for(USHORT i=0; i < nSize; ++i)
-    {	if(aEntryLst[i]->bNew)
-            nNew++;
-    }
-    return nNew;
-}
-
-/*--------------------------------------------------------------------
-     Beschreibung:	Alle neuen Eintraege ueberpruefen
- --------------------------------------------------------------------*/
-
-const SvxBoxEntry& SvxListBox::GetNewEntry(USHORT nPos) const
-{
-    USHORT nSize = aEntryLst.Count();
-    USHORT nNew  = 0;
-    for(USHORT i=0; i < nSize; ++i)
-    {	if(aEntryLst[i]->bNew)
-        {	if(nNew == nPos)
-                return *aEntryLst[i];
-            nNew++;
-        }
-    }
-    return aDefault;
-}
-
-/*--------------------------------------------------------------------
-     Beschreibung: Sortiert einfuegen
- --------------------------------------------------------------------*/
-
-void SvxListBox::InsertSorted(SvxBoxEntry* pEntry)
-{
-    ListBox::InsertEntry(pEntry->aName);
-    USHORT nPos = ListBox::GetEntryPos(pEntry->aName);
-    aEntryLst.C40_INSERT(SvxBoxEntry, pEntry, nPos);
-}
-
-/*--------------------------------------------------------------------
-     Beschreibung: ComboBoxen mit Verwaltungseinheit
- --------------------------------------------------------------------*/
-
-SvxComboBox::SvxComboBox(Window* pParent, WinBits nBits, USHORT nStyleBits) :
-    ComboBox(pParent, nBits),
-    nStyle(nStyleBits)
-{
-    InitComboBox();
-}
-
-
-SvxComboBox::SvxComboBox(Window* pParent, const ResId& rId, USHORT nStyleBits ):
-    ComboBox(pParent, rId),
-    nStyle(nStyleBits)
-{
-    InitComboBox();
-}
-
-/*--------------------------------------------------------------------
-     Beschreibung: Basisklasse Dtor
- --------------------------------------------------------------------*/
-
-__EXPORT SvxComboBox::~SvxComboBox()
-{
-    aEntryLst.DeleteAndDestroy(0,	aEntryLst.Count());
-    aDelEntryLst.DeleteAndDestroy(0, aDelEntryLst.Count());
-}
-
-/*--------------------------------------------------------------------
-     Beschreibung: Evtl. Liste aus der Ressource beachten
- --------------------------------------------------------------------*/
-
-void SvxComboBox::InitComboBox()
-{
-    // Verwaltung fuer die Stringlist aus der Resource aufbauen
-    USHORT nSize = GetEntryCount();
-    for(USHORT i=0; i < nSize; ++i)
-    {	const SvxBoxEntry* pTmp = new SvxBoxEntry(ComboBox::GetEntry(i), i);
-        const SvxBoxEntry* &rpTmp = pTmp;
-        aEntryLst.Insert(rpTmp, aEntryLst.Count());
-    }
-}
-
-/*--------------------------------------------------------------------
-     Beschreibung: neue Eintraege verwalten
- --------------------------------------------------------------------*/
-
-void SvxComboBox::InsertNewEntry(const SvxBoxEntry& rEntry)
-{
-    SvxBoxEntry* pNew = new SvxBoxEntry(rEntry);
-    pNew->bNew = TRUE;
-    InsertSorted(pNew);
-}
-
-/*--------------------------------------------------------------------
-     Beschreibung: Eintrag in die ComboBox aufnehmen
- --------------------------------------------------------------------*/
-
-void SvxComboBox::InsertEntry(const SvxBoxEntry& rEntry)
-{
-    InsertSorted(new SvxBoxEntry(rEntry));
-}
-
-/*--------------------------------------------------------------------
-     Beschreibung: Eintrag aus der Liste loeschen
- --------------------------------------------------------------------*/
-
-void SvxComboBox::RemoveEntry(USHORT nPos)
-{
-    if(nPos >= aEntryLst.Count())
-        return;
-
-    // Altes Element austragen
-    SvxBoxEntry* pEntry = aEntryLst[nPos];
-    aEntryLst.Remove(nPos, 1);
-    ComboBox::RemoveEntry(nPos);
-
-    // keine neuen Eintraege in die Liste mit aufnehmen
-    if(pEntry->bNew)
-        return;
-
-    // in DeleteListe eintragen
-    aDelEntryLst.C40_INSERT(SvxBoxEntry, pEntry, aDelEntryLst.Count());
-}
-
-/*--------------------------------------------------------------------
-     Beschreibung: Eintrag ueber konkretes Obkjekt loeschen
- --------------------------------------------------------------------*/
-
-void SvxComboBox::RemoveEntry(const SvxBoxEntry& rEntry)
-{
-    USHORT nPos = ComboBox::GetEntryPos(rEntry.aName);
-    RemoveEntry(nPos);
-}
-
-/*--------------------------------------------------------------------
-     Beschreibung: Listen loeschen und Anzeige loeschen
- --------------------------------------------------------------------*/
-
-void SvxComboBox::Clear()
-{
-    ComboBox::Clear();
-    aEntryLst.DeleteAndDestroy(0, aEntryLst.Count());
-    aDelEntryLst.DeleteAndDestroy(0, aDelEntryLst.Count());
-}
-
-
-/*--------------------------------------------------------------------
-     Beschreibung: Position by Name
- --------------------------------------------------------------------*/
-
-USHORT SvxComboBox::GetEntryPos(const SvxBoxEntry& rEntry) const
-{
-    return ComboBox::GetEntryPos(rEntry.aName);
-}
-
-/*--------------------------------------------------------------------
-     Beschreibung: Rund um die Entries
- --------------------------------------------------------------------*/
-
-const SvxBoxEntry& SvxComboBox::GetEntry(USHORT nPos) const
-{
-    if(nPos < aEntryLst.Count())
-        return *aEntryLst[nPos];
-    else
-        return aDefault;
-}
-
-/*--------------------------------------------------------------------
-     Beschreibung: modifizierte Eintraege
- --------------------------------------------------------------------*/
-
-USHORT SvxComboBox::GetModifiedCount() const
-{
-    USHORT nMod  = 0;
-    USHORT nSize = aEntryLst.Count();
-    for(USHORT i=0; i < nSize; ++i)
-    {	if(aEntryLst[i]->bModified)
-            nMod++;
-    }
-    return nMod;
-}
-
-/*--------------------------------------------------------------------
-     Beschreibung: Modifizierte Eintraege behandeln
- --------------------------------------------------------------------*/
-
-void SvxComboBox::ModifyEntry(USHORT nPos, const String& rName)
-{
-    if(nPos >= aEntryLst.Count())
-        return;
-
-    SvxBoxEntry* pEntry = aEntryLst[nPos];
-    aEntryLst.Remove(nPos, 1);
-    aEntryLst[nPos]->aName 		= rName;
-    aEntryLst[nPos]->bModified 	= TRUE;
-    ComboBox::RemoveEntry(nPos);
-
-    InsertSorted(pEntry);
-}
-
-/*--------------------------------------------------------------------
-     Beschreibung: alle modifizierten Eintraege bahandeln
- --------------------------------------------------------------------*/
-
-const SvxBoxEntry& SvxComboBox::GetModifiedEntry(USHORT nPos) const
-{
-    USHORT nSize = aEntryLst.Count();
-    USHORT nMod  = 0;
-    for(USHORT i=0; i < nSize; ++i)
-    {	if(aEntryLst[i]->bModified)
-        {	if(nMod == nPos)
-                return *aEntryLst[i];
-            nMod++;
-        }
-    }
-    return aDefault;
-}
-
-/*--------------------------------------------------------------------
-     Beschreibung: geloeschte Eintraege
- --------------------------------------------------------------------*/
-
-USHORT SvxComboBox::GetRemovedCount() const
-{
-    return aDelEntryLst.Count();
-}
-
-
-const SvxBoxEntry& SvxComboBox::GetRemovedEntry(USHORT nPos) const
-{
-    if(nPos < aDelEntryLst.Count())
-        return *aDelEntryLst[nPos];
-
-    return aDefault;
-}
-
-/*--------------------------------------------------------------------
-     Beschreibung: Neue Entries begutachten
- --------------------------------------------------------------------*/
-
-USHORT SvxComboBox::GetNewCount() const
-{
-    USHORT nNew = 0;
-    USHORT nSize = aEntryLst.Count();
-    for(USHORT i=0; i < nSize; ++i)
-    {	if(aEntryLst[i]->bNew)
-            nNew++;
-    }
-    return nNew;
-}
-
-/*--------------------------------------------------------------------
-     Beschreibung:	Alle neuen Eintraege ueberpruefen
- --------------------------------------------------------------------*/
-
-const SvxBoxEntry& SvxComboBox::GetNewEntry(USHORT nPos) const
-{
-    USHORT nSize = aEntryLst.Count();
-    USHORT nNew  = 0;
-    for(USHORT i=0; i < nSize; ++i)
-    {	if(aEntryLst[i]->bNew)
-        {	if(nNew == nPos)
-                return *aEntryLst[i];
-            nNew++;
-        }
-    }
-    return aDefault;
-}
-
-/*--------------------------------------------------------------------
-     Beschreibung: Sortiert einfuegen
- --------------------------------------------------------------------*/
-
-void SvxComboBox::InsertSorted(SvxBoxEntry* pEntry)
-{
-    ComboBox::InsertEntry(pEntry->aName);
-    USHORT nPos = ComboBox::GetEntryPos(pEntry->aName);
-    aEntryLst.C40_INSERT(SvxBoxEntry, pEntry, nPos);
-}
-
-
-/*--------------------------------------------------------------------
-    Beschreibung: Je nach Option bestimmte Zeichen ausblenden
- --------------------------------------------------------------------*/
-
-void __EXPORT SvxComboBox::KeyInput( const KeyEvent& rKEvt )
-{
-    sal_Unicode cChar = rKEvt.GetCharCode();
-
-    if(nStyle & SVX_CBS_FILENAME)
-    {
-#if defined UNX
-        if( cChar == sal_Unicode( '/' ) || cChar == sal_Unicode( ' ' ) )
-            return;
-#else
-        if( cChar == sal_Unicode( ':' ) || cChar == sal_Unicode( '\\' ) || 
-            cChar == sal_Unicode( '.' ) || cChar == sal_Unicode( ' ' ) )
-            return;
-#endif
-    }
-    ComboBox::KeyInput(rKEvt);
-}
-
-/*--------------------------------------------------------------------
-    Beschreibung: Text nach Option konvertieren
- --------------------------------------------------------------------*/
-
-String SvxComboBox::GetText() const
-{
-    String aTxt(ComboBox::GetText());
-    CharClass aCharClass( Application::GetSettings().GetLocale() );
-
-    if(nStyle & SVX_CBS_LOWER)
-        return aCharClass.lower(aTxt);
-
-    if(nStyle & SVX_CBS_UPPER)
-        return aCharClass.upper(aTxt);
-
-    return aTxt;
-}
-
-
diff --git a/svx/source/items/makefile.mk b/svx/source/items/makefile.mk
index d99f1705f5..0c2e4b7ff5 100644
--- a/svx/source/items/makefile.mk
+++ b/svx/source/items/makefile.mk
@@ -55,24 +55,12 @@ SRC1FILES =  \
 
 LIB1TARGET= $(SLB)$/$(TARGET)-core.lib
 LIB1OBJFILES= \
-        $(SLO)$/writingmodeitem.obj \
-        $(SLO)$/frmitems.obj \
-        $(SLO)$/paraitem.obj \
-        $(SLO)$/textitem.obj \
-        $(SLO)$/flditem.obj \
-        $(SLO)$/svxfont.obj \
-        $(SLO)$/paperinf.obj    \
         $(SLO)$/drawitem.obj	\
-        $(SLO)$/itemtype.obj	\
         $(SLO)$/chrtitem.obj	\
-        $(SLO)$/bulitem.obj \
         $(SLO)$/e3ditem.obj \
-        $(SLO)$/numitem.obj \
         $(SLO)$/grfitem.obj \
         $(SLO)$/clipfmtitem.obj \
-        $(SLO)$/xmlcnitm.obj \
-        $(SLO)$/customshapeitem.obj \
-        $(SLO)$/charhiddenitem.obj
+        $(SLO)$/customshapeitem.obj 
 
 LIB2TARGET= $(SLB)$/$(TARGET).lib
 LIB2OBJFILES= \
@@ -80,7 +68,7 @@ LIB2OBJFILES= \
         $(SLO)$/postattr.obj	\
         $(SLO)$/hlnkitem.obj \
         $(SLO)$/pageitem.obj	\
-                $(SLO)$/viewlayoutitem.obj    \
+        $(SLO)$/viewlayoutitem.obj    \
         $(SLO)$/algitem.obj \
         $(SLO)$/rotmodit.obj \
         $(SLO)$/numinf.obj	\
@@ -94,11 +82,6 @@ LIB2OBJFILES= \
 SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES)
 
 EXCEPTIONSFILES= \
-        $(SLO)$/paraitem.obj \
-        $(SLO)$/frmitems.obj \
-        $(SLO)$/numitem.obj\
-        $(SLO)$/xmlcnitm.obj\
-        $(SLO)$/flditem.obj \
         $(SLO)$/customshapeitem.obj
 
 .INCLUDE :	target.mk
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index dd852ebdef..e4782e8518 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -606,6 +606,53 @@ void SvxShape::ForceMetricTo100th_mm(Pair& rPoint) const throw()
 }
 
 //----------------------------------------------------------------------
+//----------------------------------------------------------------------
+void SvxItemPropertySet_ObtainSettingsFromPropertySet(const SvxItemPropertySet& rPropSet,
+  SfxItemSet& rSet, uno::Reference< beans::XPropertySet > xSet, const SfxItemPropertyMap* pMap ) const 
+{
+    if(rPropSet.AreThereOwnUsrAnys())
+    {
+        const SfxItemPropertyMap* pSrc = rPropSet.getPropertyMap();
+        PropertyEntryVector_t aSrcPropVector = pSrc->getPropertyEntries();
+        PropertyEntryVector_t::const_iterator aSrcIt = aSrcPropVector.begin();
+        while(aSrcIt != aSrcPropVector.end())
+        {
+            if(aSrcIt->nWID)
+            {
+                uno::Any* pUsrAny = rPropSet.GetUsrAnyForID(aSrcIt->nWID);
+                if(pUsrAny)
+                {
+                    // Aequivalenten Eintrag in pDst suchen
+                    const SfxItemPropertySimpleEntry* pEntry = pMap->getByName( aSrcIt->sName );
+                    if(pEntry)
+                    {
+                        // entry found
+                        if(pEntry->nWID >= OWN_ATTR_VALUE_START && pEntry->nWID <= OWN_ATTR_VALUE_END)
+                        {
+                            // Special ID im PropertySet, kann nur direkt am
+                            // Objekt gesetzt werden+
+                            xSet->setPropertyValue( aSrcIt->sName, *pUsrAny);
+                        }
+                        else
+                        {
+                            if(rSet.GetPool()->IsWhich(pEntry->nWID))
+                                rSet.Put(rSet.GetPool()->GetDefaultItem(pEntry->nWID));
+
+                            // setzen
+                            setPropertyValue(pEntry, *pUsrAny, rSet);
+                        }
+                    }
+                }
+            }
+
+            // next entry
+            ++aSrcIt;
+        }
+    }
+}
+
+
+
 void SvxShape::ObtainSettingsFromPropertySet(const SvxItemPropertySet& rPropSet)
 {
     DBG_TESTSOLARMUTEX();
@@ -613,7 +660,7 @@ void SvxShape::ObtainSettingsFromPropertySet(const SvxItemPropertySet& rPropSet)
     {
         SfxItemSet aSet( mpModel->GetItemPool(), SDRATTR_START, SDRATTR_END, 0);
         Reference< beans::XPropertySet > xShape( (OWeakObject*)this, UNO_QUERY );
-        mpPropSet->ObtainSettingsFromPropertySet(rPropSet, aSet, xShape);
+        ObtainSettingsFromPropertySet(rPropSet, aSet, xShape, mpPropSet->getPropertyMap() );
 
         mpObj->SetMergedItemSetAndBroadcast(aSet);
 
diff --git a/svx/source/unoedit/serviceinfohelper.cxx b/svx/source/unoedit/serviceinfohelper.cxx
deleted file mode 100644
index 0dee9103b1..0000000000
--- a/svx/source/unoedit/serviceinfohelper.cxx
+++ /dev/null
@@ -1,109 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: unoprov.cxx,v $
- * $Revision: 1.72.92.1 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-
-#include "svx/serviceinfohelper.hxx"
-#include <stdarg.h>
-
-// #####################################################################
-
-/** returns an empty UString(). most times sufficient */
-::rtl::OUString SAL_CALL SvxServiceInfoHelper::getImplementationName() throw( ::com::sun::star::uno::RuntimeException )
-{
-    return ::rtl::OUString();
-}
-
-/** the base implementation iterates over the service names from <code>getSupportedServiceNames</code> */
-sal_Bool SAL_CALL SvxServiceInfoHelper::supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException)
-{
-    return supportsService( ServiceName, getSupportedServiceNames() );
-}
-
-sal_Bool SAL_CALL SvxServiceInfoHelper::supportsService( const ::rtl::OUString& ServiceName, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& SupportedServices ) throw()
-{
-    const ::rtl::OUString * pArray = SupportedServices.getConstArray();
-    for( sal_Int32 i = 0; i < SupportedServices.getLength(); i++ )
-        if( pArray[i] == ServiceName )
-            return sal_True;
-    return sal_False;
-}
-
-/** the base implementation has no supported services */
-::com::sun::star::uno::Sequence< ::rtl::OUString > SvxServiceInfoHelper::getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException )
-{
-    ::com::sun::star::uno::Sequence< ::rtl::OUString> aSeq(0);
-    return aSeq;
-}
-
-/** this method concatenates the given sequences and returns the result
- */
-::com::sun::star::uno::Sequence< ::rtl::OUString > SvxServiceInfoHelper::concatSequences( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rSeq1,
-        const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rSeq2 ) throw()
-{
-    const sal_Int32 nLen1 = rSeq1.getLength();
-    const sal_Int32 nLen2 = rSeq2.getLength();
-
-    ::com::sun::star::uno::Sequence< ::rtl::OUString > aSeq( nLen1 + nLen2 );
-
-    ::rtl::OUString* pStrings = aSeq.getArray();
-
-    sal_Int32 nIdx;
-    const ::rtl::OUString* pStringSrc = rSeq1.getConstArray();
-    for( nIdx = 0; nIdx < nLen1; nIdx++ )
-        *pStrings++ = *pStringSrc++;
-
-    pStringSrc = rSeq2.getConstArray();
-    for( nIdx = 0; nIdx < nLen2; nIdx++ )
-        *pStrings++ = *pStringSrc++;
-
-    return aSeq;
-}
-
-/** this method adds a variable number of char pointer to a given Sequence
- */
-void SvxServiceInfoHelper::addToSequence( ::com::sun::star::uno::Sequence< ::rtl::OUString >& rSeq, sal_uInt16 nServices, /* char * */ ... ) throw()
-{
-    sal_uInt32 nCount = rSeq.getLength();
-
-    rSeq.realloc( nCount + nServices );
-    rtl::OUString* pStrings = rSeq.getArray();
-
-    va_list marker;
-    va_start( marker, nServices );
-    for( sal_uInt16 i = 0 ; i < nServices; i++ )
-        pStrings[nCount++] = rtl::OUString::createFromAscii(va_arg( marker, char*));
-    va_end( marker );
-}
-
-
-
-
diff --git a/svx/util/hidother.src b/svx/util/hidother.src
index 4cc209b069..525365aab4 100644
--- a/svx/util/hidother.src
+++ b/svx/util/hidother.src
@@ -32,42 +32,6 @@
 #include <svx/svxids.hrc>
 #include "../inc/fmhelp.hrc"
 
-#define HID_AUTOCORR_HELP_ACORSENTWORD          HID_AUTOCORR_HELP_START+5
-#define HID_AUTOCORR_HELP_ACORSENTWORDENEMDASH  HID_AUTOCORR_HELP_START+13
-#define HID_AUTOCORR_HELP_ACORWORD              HID_AUTOCORR_HELP_START+3
-#define HID_AUTOCORR_HELP_ACORWORDENEMDASH      HID_AUTOCORR_HELP_START+11
-#define HID_AUTOCORR_HELP_CHGFRACTIONSYMBOL     HID_AUTOCORR_HELP_START+20
-#define HID_AUTOCORR_HELP_CHGORDINALNUMBER      HID_AUTOCORR_HELP_START+21
-#define HID_AUTOCORR_HELP_CHGQUOTES             HID_AUTOCORR_HELP_START+15
-#define HID_AUTOCORR_HELP_CHGSGLQUOTES          HID_AUTOCORR_HELP_START+16
-#define HID_AUTOCORR_HELP_CHGTOENEMDASH         HID_AUTOCORR_HELP_START+7
-#define HID_AUTOCORR_HELP_CHGWEIGHTUNDERL       HID_AUTOCORR_HELP_START+19
-#define HID_AUTOCORR_HELP_INGNOREDOUBLESPACE    HID_AUTOCORR_HELP_START+18
-#define HID_AUTOCORR_HELP_SENT                  HID_AUTOCORR_HELP_START+1
-#define HID_AUTOCORR_HELP_SENTENEMDASH          HID_AUTOCORR_HELP_START+9
-#define HID_AUTOCORR_HELP_SENTWORD              HID_AUTOCORR_HELP_START+2
-#define HID_AUTOCORR_HELP_SENTWORDENEMDASH      HID_AUTOCORR_HELP_START+10
-#define HID_AUTOCORR_HELP_SETINETATTR           HID_AUTOCORR_HELP_START+17
-#define HID_AUTOCORR_HELP_WORD                  HID_AUTOCORR_HELP_START+0
-#define HID_AUTOCORR_HELP_WORDENEMDASH          HID_AUTOCORR_HELP_START+8
-hidspecial HID_AUTOCORR_HELP_ACORSENTWORD   { HelpID =  HID_AUTOCORR_HELP_ACORSENTWORD;};
-hidspecial HID_AUTOCORR_HELP_ACORSENTWORDENEMDASH   { HelpID =  HID_AUTOCORR_HELP_ACORSENTWORDENEMDASH;};
-hidspecial HID_AUTOCORR_HELP_ACORWORD       { HelpID =  HID_AUTOCORR_HELP_ACORWORD;};
-hidspecial HID_AUTOCORR_HELP_ACORWORDENEMDASH       { HelpID =  HID_AUTOCORR_HELP_ACORWORDENEMDASH;};
-hidspecial HID_AUTOCORR_HELP_CHGFRACTIONSYMBOL  { HelpID =  HID_AUTOCORR_HELP_CHGFRACTIONSYMBOL;};
-hidspecial HID_AUTOCORR_HELP_CHGORDINALNUMBER   { HelpID =  HID_AUTOCORR_HELP_CHGORDINALNUMBER;};
-hidspecial HID_AUTOCORR_HELP_CHGQUOTES          { HelpID =  HID_AUTOCORR_HELP_CHGQUOTES;};
-hidspecial HID_AUTOCORR_HELP_CHGSGLQUOTES       { HelpID =  HID_AUTOCORR_HELP_CHGSGLQUOTES;};
-hidspecial HID_AUTOCORR_HELP_CHGTOENEMDASH      { HelpID =  HID_AUTOCORR_HELP_CHGTOENEMDASH;};
-hidspecial HID_AUTOCORR_HELP_CHGWEIGHTUNDERL    { HelpID =  HID_AUTOCORR_HELP_CHGWEIGHTUNDERL;};
-hidspecial HID_AUTOCORR_HELP_INGNOREDOUBLESPACE { HelpID =  HID_AUTOCORR_HELP_INGNOREDOUBLESPACE;};
-hidspecial HID_AUTOCORR_HELP_SENT           { HelpID =  HID_AUTOCORR_HELP_SENT;};
-hidspecial HID_AUTOCORR_HELP_SENTENEMDASH           { HelpID =  HID_AUTOCORR_HELP_SENTENEMDASH;};
-hidspecial HID_AUTOCORR_HELP_SENTWORD       { HelpID =  HID_AUTOCORR_HELP_SENTWORD;};
-hidspecial HID_AUTOCORR_HELP_SENTWORDENEMDASH       { HelpID =  HID_AUTOCORR_HELP_SENTWORDENEMDASH;};
-hidspecial HID_AUTOCORR_HELP_SETINETATTR        { HelpID =  HID_AUTOCORR_HELP_SETINETATTR;};
-hidspecial HID_AUTOCORR_HELP_WORD           { HelpID =  HID_AUTOCORR_HELP_WORD;};
-hidspecial HID_AUTOCORR_HELP_WORDENEMDASH           { HelpID =  HID_AUTOCORR_HELP_WORDENEMDASH;};
 hidspecial HID_FIELD_SEL                    { HelpID =HID_FIELD_SEL             ;};
 hidspecial HID_FIELD_SEL_WIN                { HelpID =HID_FIELD_SEL_WIN         ;};
 hidspecial HID_FILL_ATTR_LISTBOX                { HelpID = HID_FILL_ATTR_LISTBOX ;};