resyncing to master

71 files changed, 546 insertions, 1474 deletions

diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index 2cc9b4a0663f..1f8e90a79a87 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -34,7 +34,11 @@ $(eval $(call gb_Library_set_include,svx,\
     -I$(realpath $(SRCDIR)/svx/source/inc) \
     -I$(realpath $(SRCDIR)/svx/inc/pch) \
     $$(SOLARINC) \
-    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,svx,\
+	udkapi \
+	offapi \
 ))
 
 $(eval $(call gb_Library_add_defs,svx,\
@@ -180,7 +184,6 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
     svx/source/stbctrls/zoomctrl \
     svx/source/svdraw/ActionDescriptionProvider \
     svx/source/smarttags/SmartTagMgr \
-    svx/source/svdraw/impgrfll \
     svx/source/table/accessiblecell \
     svx/source/table/accessibletableshape \
     svx/source/table/celleditsource \
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index d4bc81352f90..6cce86288d1a 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -36,12 +36,16 @@ $(eval $(call gb_Library_add_package_headers,svxcore,\
     svx_sdi \
 ))
 
+$(eval $(call gb_Library_add_api,svxcore,\
+	udkapi \
+	offapi \
+))
+
 $(eval $(call gb_Library_set_include,svxcore,\
     -I$(realpath $(SRCDIR)/svx/inc) \
     -I$(realpath $(SRCDIR)/svx/inc/pch) \
     -I$(realpath $(SRCDIR)/svx/source/inc) \
     $$(INCLUDE) \
-    -I$(OUTDIR)/inc/offuh \
     -I$(WORKDIR)/SdiTarget/svx/sdi \
 ))
 
diff --git a/svx/Library_textconversiondlgs.mk b/svx/Library_textconversiondlgs.mk
index 69bb8c75c8ff..f2d20fcf46f1 100644
--- a/svx/Library_textconversiondlgs.mk
+++ b/svx/Library_textconversiondlgs.mk
@@ -33,7 +33,11 @@ $(eval $(call gb_Library_set_include,textconversiondlgs,\
     -I$(realpath $(SRCDIR)/svx/inc) \
     -I$(realpath $(SRCDIR)/svx/inc/pch) \
     $$(INCLUDE) \
-    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,textconversiondlgs,\
+	udkapi \
+	offapi \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,textconversiondlgs,\
diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc
index 227d57425e63..632a4c5c0a8d 100755
--- a/svx/inc/globlmn_tmpl.hrc
+++ b/svx/inc/globlmn_tmpl.hrc
@@ -909,12 +909,6 @@
     HelpID = SID_SHOW_CREDITS ; \
     Text [ en-US ] = "%PRODUCTNAME Credits..." ;
 
-#define ITEM_HELP_ONLINE_REGISTRATION \
-    Identifier = SID_ONLINE_REGISTRATION ; \
-    Command = ".uno:OnlineRegistrationDlg" ; \
-    Text [ en-US ] = "~Registration..." ; \
-
-
 #define ITEM_HELP_ABOUT \
     Identifier = SID_ABOUT ; \
     Command = ".uno:About" ; \
diff --git a/svx/inc/svx/ctredlin.hxx b/svx/inc/svx/ctredlin.hxx
index e7d5d46ed83d..3b7ed86b4b68 100644
--- a/svx/inc/svx/ctredlin.hxx
+++ b/svx/inc/svx/ctredlin.hxx
@@ -121,9 +121,9 @@ protected:
 
 public:
 
-                    SvxRedlinTable( Window* pParent,WinBits nBits );
-                    SvxRedlinTable( Window* pParent,const ResId& rResId);
-                    ~SvxRedlinTable();
+    SvxRedlinTable(SvxSimpleTableContainer& rParent, WinBits nBits = WB_BORDER);
+    SvxRedlinTable(SvxSimpleTableContainer& rParent, const ResId& rResId);
+    ~SvxRedlinTable();
 
     // For FilterPage only {
     void            SetFilterDate(sal_Bool bFlag=sal_True);
@@ -318,6 +318,7 @@ private:
     Link            RejectAllClickLk;
     Link            UndoClickLk;
 
+    SvxSimpleTableContainer m_aViewDataContainer;
     SvxRedlinTable  aViewData;
     PushButton      PbAccept;
     PushButton      PbReject;
diff --git a/svx/inc/svx/float3d.hxx b/svx/inc/svx/float3d.hxx
index 9a2b7dacf333..b13cb6fd995b 100644
--- a/svx/inc/svx/float3d.hxx
+++ b/svx/inc/svx/float3d.hxx
@@ -205,8 +205,6 @@ private:
     FmFormPage*         pFmPage;
     VirtualDevice*      pVDev;
     E3dView*            p3DView;
-    List*               pFavorSetList;
-    List*               pMatFavSetList;
 
     SfxBindings*                pBindings;
     Svx3DCtrlItem*              pControllerItem;
diff --git a/svx/inc/svx/simptabl.hxx b/svx/inc/svx/simptabl.hxx
index 98020a97fcc4..fb12e3443a02 100644
--- a/svx/inc/svx/simptabl.hxx
+++ b/svx/inc/svx/simptabl.hxx
@@ -40,31 +40,32 @@
 #include "svx/svxdllapi.h"
 
 class SvxSimpleTable;
-class SvxSimpTblContainer : public Control
+class SVX_DLLPUBLIC SvxSimpleTableContainer : public Control
 {
 private:
     SvxSimpleTable*     m_pTable;
 
 protected:
-    virtual long        PreNotify( NotifyEvent& rNEvt );
+    virtual long PreNotify( NotifyEvent& rNEvt );
 
 public:
-    SvxSimpTblContainer( Window* pParent, WinBits nWinStyle = 0 );
-    SvxSimpTblContainer( Window* pParent, const ResId& rResId );
+    SvxSimpleTableContainer( Window* pParent, WinBits nWinStyle = WB_BORDER );
+    SvxSimpleTableContainer( Window* pParent, const ResId& rResId );
 
-    inline void         SetTable( SvxSimpleTable* _pTable ) { m_pTable = _pTable; }
+    void SetTable(SvxSimpleTable* pTable);
+
+    virtual void SetSizePixel(const Size& rNewSize);
 };
 
 class SVX_DLLPUBLIC SvxSimpleTable : public SvHeaderTabListBox
 {
-    using Window::SetPosSizePixel;
 private:
+    SvxSimpleTableContainer& m_rParentTableContainer;
 
     Link                aHeaderBarClickLink;
     Link                aHeaderBarDblClickLink;
     Link                aCommandLink;
     CommandEvent        aCEvt;
-    SvxSimpTblContainer aPrivContainer;
     HeaderBar           aHeaderBar;
     long                nOldPos;
     sal_uInt16              nHeaderItemId;
@@ -72,7 +73,6 @@ private:
     sal_Bool                bPaintFlag;
     sal_Bool                bSortDirection;
     sal_uInt16              nSortCol;
-    Window*             pMyParentWin;
 
     DECL_LINK( StartDragHdl, HeaderBar* );
     DECL_LINK( DragHdl, HeaderBar* );
@@ -87,7 +87,6 @@ protected:
 
     virtual void            SetTabs();
     virtual void            Paint( const Rectangle& rRect );
-    virtual void            UpdateViewSize();
 
     virtual void            HBarClick();
     virtual void            HBarDblClick();
@@ -102,10 +101,12 @@ protected:
 
 public:
 
-    SvxSimpleTable( Window* pParent,WinBits nBits =WB_BORDER );
-    SvxSimpleTable( Window* pParent,const ResId& );
+    SvxSimpleTable(SvxSimpleTableContainer& rParent, WinBits nBits = WB_BORDER);
+    SvxSimpleTable(SvxSimpleTableContainer& rParent, const ResId&);
     ~SvxSimpleTable();
 
+    void UpdateViewSize();
+
     void            InsertHeaderEntry(const XubString& rText,
                             sal_uInt16 nCol=HEADERBAR_APPEND,
                             HeaderBarItemBits nBits = HIB_STDSTYLE);
@@ -139,15 +140,6 @@ public:
     sal_Bool            IsEnabled() const;
 
     void            TableToTop();
-    void            SetPosPixel( const Point& rNewPos );
-    Point           GetPosPixel() const ;
-    virtual void    SetPosSizePixel( const Point& rNewPos, Size& rNewSize );
-    void            SetPosSize( const Point& rNewPos, const Size& rNewSize );
-    void            SetSizePixel(const Size& rNewSize );
-    void            SetOutputSizePixel(const Size& rNewSize );
-
-    Size            GetSizePixel() const;
-    Size            GetOutputSizePixel() const;
 
     sal_uInt16          GetSelectedCol();
     void            SortByCol(sal_uInt16,sal_Bool bDir=sal_True);
diff --git a/svx/inc/svx/svdobj.hxx b/svx/inc/svx/svdobj.hxx
index 72964cf30e30..afa9c9b8b4ee 100644
--- a/svx/inc/svx/svdobj.hxx
+++ b/svx/inc/svx/svdobj.hxx
@@ -483,6 +483,7 @@ protected:
     // beim Clone wird das Flag nicht mitkopiert!
     // Das Flag ist persistent.
     unsigned                    bEmptyPresObj : 1;     // Leeres Praesentationsobjekt (Draw)
+    unsigned                    mbGhosted : 1; // FIXME find a better way to ghost writer drawing objects
 
     // sal_True=Objekt ist als Objekt der MasterPage nicht sichtbar
     unsigned                    bNotVisibleAsMaster : 1;
@@ -1036,6 +1037,8 @@ public:
     sal_Bool IsEmptyPresObj() const { return bEmptyPresObj; }
     void SetNotVisibleAsMaster(sal_Bool bFlg) { bNotVisibleAsMaster=bFlg; }
     sal_Bool IsNotVisibleAsMaster() const { return bNotVisibleAsMaster; }
+    void SetGhosted( sal_Bool bGhosted ) { mbGhosted = bGhosted; }
+    sal_Bool IsGhosted() const { return mbGhosted; }
 
     // #i25616#
     sal_Bool LineIsOutsideGeometry() const { return mbLineIsOutsideGeometry; }
diff --git a/svx/inc/svx/svdorect.hxx b/svx/inc/svx/svdorect.hxx
index fd98d69213f8..d92fb91d9054 100644
--- a/svx/inc/svx/svdorect.hxx
+++ b/svx/inc/svx/svdorect.hxx
@@ -31,6 +31,7 @@
 
 #include <svx/svdotext.hxx>
 #include "svx/svxdllapi.h"
+#include <boost/shared_ptr.hpp>
 
 //************************************************************
 //   Vorausdeklarationen
@@ -60,11 +61,7 @@ protected:
     virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact();
     virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties();
 
-    XPolygon*                   mpXPoly;
-
-protected:
-    // Liefert sal_True, wenn das Painten ein Polygon erfordert.
-    bool PaintNeedsXPoly(long nEckRad) const;
+    ::boost::shared_ptr< XPolygon >                 mpXPoly;
 
 protected:
     XPolygon ImpCalcXPoly(const Rectangle& rRect1, long nRad1) const;
diff --git a/svx/inc/svx/svdtrans.hxx b/svx/inc/svx/svdtrans.hxx
index b0cd472a2681..9855404040e0 100644
--- a/svx/inc/svx/svdtrans.hxx
+++ b/svx/inc/svx/svdtrans.hxx
@@ -65,35 +65,24 @@ inline void MovePoint(Point& rPnt, const Size& S)        { rPnt.X()+=S.Width();
 inline void MovePoly(Polygon& rPoly, const Size& S)      { rPoly.Move(S.Width(),S.Height()); }
 inline void MovePoly(PolyPolygon& rPoly, const Size& S)  { rPoly.Move(S.Width(),S.Height()); }
 void MoveXPoly(XPolygon& rPoly, const Size& S);
-void MoveXPoly(XPolyPolygon& rPoly, const Size& S);
 
 SVX_DLLPUBLIC void ResizeRect(Rectangle& rRect, const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bNoJustify = false);
 inline void ResizePoint(Point& rPnt, const Point& rRef, Fraction xFact, Fraction yFact);
 void ResizePoly(Polygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact);
 void ResizeXPoly(XPolygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact);
-void ResizePoly(PolyPolygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact);
-void ResizeXPoly(XPolyPolygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact);
 
 inline void RotatePoint(Point& rPnt, const Point& rRef, double sn, double cs);
 SVX_DLLPUBLIC void RotatePoly(Polygon& rPoly, const Point& rRef, double sn, double cs);
 void RotateXPoly(XPolygon& rPoly, const Point& rRef, double sn, double cs);
-void RotatePoly(PolyPolygon& rPoly, const Point& rRef, double sn, double cs);
 void RotateXPoly(XPolyPolygon& rPoly, const Point& rRef, double sn, double cs);
 
-// MirrorRect macht nur Sinn bei Spiegelachsen
-// mit einem durch 45 Degree teilbaren Winkel!
-void MirrorRect(Rectangle& rRect, const Point& rRef1, const Point& rRef2, bool bNoJustify); // ni.
 void MirrorPoint(Point& rPnt, const Point& rRef1, const Point& rRef2);
 void MirrorPoly(Polygon& rPoly, const Point& rRef1, const Point& rRef2);
 void MirrorXPoly(XPolygon& rPoly, const Point& rRef1, const Point& rRef2);
-void MirrorPoly(PolyPolygon& rPoly, const Point& rRef1, const Point& rRef2);
-void MirrorXPoly(XPolyPolygon& rPoly, const Point& rRef1, const Point& rRef2);
 
 inline void ShearPoint(Point& rPnt, const Point& rRef, double tn, bool bVShear = false);
 SVX_DLLPUBLIC void ShearPoly(Polygon& rPoly, const Point& rRef, double tn, bool bVShear = false);
 void ShearXPoly(XPolygon& rPoly, const Point& rRef, double tn, bool bVShear = false);
-void ShearPoly(PolyPolygon& rPoly, const Point& rRef, double tn, bool bVShear = false);
-void ShearXPoly(XPolyPolygon& rPoly, const Point& rRef, double tn, bool bVShear = false);
 
 // rPnt.X bzw rPnt.Y wird auf rCenter.X bzw. rCenter.Y gesetzt!
 // anschliessend muss rPnt nur noch um rCenter gedreht werden.
@@ -266,8 +255,6 @@ public:
 
 // Fuer die Umrechnung von Masseinheiten
 SVX_DLLPUBLIC FrPair GetMapFactor(MapUnit eS, MapUnit eD);
-FrPair GetMapFactor(MapUnit eS, FieldUnit eD);
-FrPair GetMapFactor(FieldUnit eS, MapUnit eD);
 FrPair GetMapFactor(FieldUnit eS, FieldUnit eD);
 
 inline bool IsMetric(MapUnit eU) {
diff --git a/svx/inc/svx/unopage.hxx b/svx/inc/svx/unopage.hxx
index ac84ef560c36..0e68afd53a3b 100644
--- a/svx/inc/svx/unopage.hxx
+++ b/svx/inc/svx/unopage.hxx
@@ -54,7 +54,6 @@ class SdrModel;
 class SdrView;
 class SdrPageView;
 class SdrObject;
-class List;
 class SvxShapeDescriptor;
 class SvxShape;
 class SvxShapeGroup;
diff --git a/svx/inc/svx/viewpt3d.hxx b/svx/inc/svx/viewpt3d.hxx
index 41e654dae150..9d4b79133ded 100644
--- a/svx/inc/svx/viewpt3d.hxx
+++ b/svx/inc/svx/viewpt3d.hxx
@@ -94,8 +94,6 @@ class SVX_DLLPUBLIC Viewport3D
     void SetVUV(const basegfx::B3DVector& rNewVUV);
     void SetPRP(const basegfx::B3DPoint& rNewPRP);
     void SetVPD(double fNewVPD);
-    void SetNearClipDist(double fNewNCD);
-    void SetFarClipDist(double fNewFCD);
 
     const basegfx::B3DPoint&    GetVRP() const  { return aVRP; }
     const basegfx::B3DVector&   GetVPN() const  { return aVPN; }
@@ -114,20 +112,12 @@ class SVX_DLLPUBLIC Viewport3D
     AspectMapType GetAspectMapping() { return eAspectMapping; }
 
     void SetViewWindow(double fX, double fY, double fW, double fH);
-    void GetViewWindow(double& rX, double& rY, double& rW, double& rH) const;
 
     void SetDeviceWindow(const Rectangle& rRect);
     const Rectangle& GetDeviceWindow() const { return aDeviceRect; }
 
     // Beobachterstandpunkt in Weltkoordinaten zurueckgeben
     const basegfx::B3DPoint&    GetViewPoint();
-
-    // View-Transformationen
-    const basegfx::B3DHomMatrix&    GetViewTransform();
-
-    // Projektion und Mapping
-    basegfx::B3DPoint DoProjection(const basegfx::B3DPoint& rVec) const;
-    basegfx::B3DPoint   MapToDevice(const basegfx::B3DPoint& rVec) const;
 };
 
 #endif      // _VIEWPT3D_HXX
diff --git a/svx/inc/svx/xtable.hxx b/svx/inc/svx/xtable.hxx
index 0f5e57b96d35..b35979d12790 100644
--- a/svx/inc/svx/xtable.hxx
+++ b/svx/inc/svx/xtable.hxx
@@ -198,14 +198,16 @@ protected:
     Table               aTable;
     Table*              pBmpTable;
 
-    sal_Bool                bTableDirty;
-    sal_Bool                bBitmapsDirty;
-    sal_Bool                bOwnPool;
-
-                        XPropertyTable( const String& rPath,
-                                        XOutdevItemPool* pXPool = NULL,
-                                        sal_uInt16 nInitSize = 16,
-                                        sal_uInt16 nReSize = 16 );
+    sal_Bool            bTableDirty;
+    sal_Bool            bBitmapsDirty;
+    sal_Bool            bOwnPool;
+
+                        XPropertyTable(
+                            const String& rPath,
+                            XOutdevItemPool* pXPool = NULL,
+                            sal_uInt16 nInitSize = 16,
+                            sal_uInt16 nReSize = 16
+                        );
                         XPropertyTable( SvStream& rIn );
     void                Clear();
 
@@ -214,26 +216,28 @@ public:
 
     long                Count() const;
 
-    sal_Bool                Insert(long nIndex, XPropertyEntry* pEntry);
+    sal_Bool            Insert(long nIndex, XPropertyEntry* pEntry);
     XPropertyEntry*     Replace(long nIndex, XPropertyEntry* pEntry);
-    XPropertyEntry*     Remove(long nIndex, sal_uInt16 nDummy);
-    XPropertyEntry*     Get( long nIndex, sal_uInt16 nDummy ) const;
+    XPropertyEntry*     Remove(long nIndex);
 
+                        // Note: Get(long) & Get( String& ) are ambiguous
+    XPropertyEntry*     Get( long nIndex, sal_uInt16 nDummy ) const;
     long                Get(const String& rName);
+
     Bitmap*             GetBitmap( long nIndex ) const;
 
     const String&       GetName() const { return aName; }
     void                SetName( const String& rString );
     const String&       GetPath() const { return aPath; }
     void                SetPath( const String& rString ) { aPath = rString; }
-    sal_Bool                IsDirty() const { return bTableDirty && bBitmapsDirty; }
+    sal_Bool            IsDirty() const { return bTableDirty && bBitmapsDirty; }
     void                SetDirty( sal_Bool bDirty = sal_True )
                             { bTableDirty = bDirty; bBitmapsDirty = bDirty; }
 
-    virtual sal_Bool        Load() = 0;
-    virtual sal_Bool        Save() = 0;
-    virtual sal_Bool        Create() = 0;
-    virtual sal_Bool        CreateBitmapsForUI() = 0;
+    virtual sal_Bool    Load() = 0;
+    virtual sal_Bool    Save() = 0;
+    virtual sal_Bool    Create() = 0;
+    virtual sal_Bool    CreateBitmapsForUI() = 0;
     virtual Bitmap*     CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True ) = 0;
 };
 
@@ -241,6 +245,8 @@ public:
 // class XPropertyList
 // --------------------
 
+typedef ::std::vector< XPropertyEntry* > XPropertyEntryList_impl;
+typedef ::std::vector< Bitmap* > BitmapList_impl;
 class SVX_DLLPUBLIC XPropertyList
 {
 protected:
@@ -248,17 +254,17 @@ protected:
     String              aPath;
     XOutdevItemPool*    pXPool;
 
-    List                aList;
-    List*               pBmpList;
+    XPropertyEntryList_impl aList;
+    BitmapList_impl*        pBmpList;
 
-    sal_Bool                bListDirty;
-    sal_Bool                bBitmapsDirty;
-    sal_Bool                bOwnPool;
+    sal_Bool            bListDirty;
+    sal_Bool            bBitmapsDirty;
+    sal_Bool            bOwnPool;
 
-                        XPropertyList(  const String& rPath,
-                                        XOutdevItemPool* pXPool = NULL,
-                                        sal_uInt16 nInitSize = 16,
-                                        sal_uInt16 nReSize = 16 );
+                        XPropertyList(
+                            const String& rPath,
+                            XOutdevItemPool* pXPool = NULL
+                        );
                         XPropertyList( SvStream& rIn );
     void                Clear();
 
@@ -269,24 +275,26 @@ public:
 
     void                Insert( XPropertyEntry* pEntry, long nIndex = LIST_APPEND );
     XPropertyEntry*     Replace( XPropertyEntry* pEntry, long nIndex );
-    XPropertyEntry*     Remove( long nIndex, sal_uInt16 nDummy );
-    XPropertyEntry*     Get( long nIndex, sal_uInt16 nDummy ) const;
+    XPropertyEntry*     Remove( long nIndex );
 
+                        // Note: Get(long) & Get( String& ) are ambiguous
+    XPropertyEntry*     Get( long nIndex, sal_uInt16 nDummy ) const;
     long                Get(const String& rName);
+
     Bitmap*             GetBitmap( long nIndex ) const;
 
     const String&       GetName() const { return aName; }
     void                SetName( const String& rString );
     const String&       GetPath() const { return aPath; }
     void                SetPath( const String& rString ) { aPath = rString; }
-    sal_Bool                IsDirty() const { return bListDirty && bBitmapsDirty; }
+    sal_Bool            IsDirty() const { return bListDirty && bBitmapsDirty; }
     void                SetDirty( sal_Bool bDirty = sal_True )
                             { bListDirty = bDirty; bBitmapsDirty = bDirty; }
 
-    virtual sal_Bool        Load() = 0;
-    virtual sal_Bool        Save() = 0;
-    virtual sal_Bool        Create() = 0;
-    virtual sal_Bool        CreateBitmapsForUI() = 0;
+    virtual sal_Bool    Load() = 0;
+    virtual sal_Bool    Save() = 0;
+    virtual sal_Bool    Create() = 0;
+    virtual sal_Bool    CreateBitmapsForUI() = 0;
     virtual Bitmap*     CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True ) = 0;
 };
 
@@ -297,55 +305,28 @@ public:
 class SVX_DLLPUBLIC XColorTable : public XPropertyTable
 {
 public:
-    explicit        XColorTable( const String& rPath,
-                                 XOutdevItemPool* pXPool = NULL,
-                                 sal_uInt16 nInitSize = 16,
-                                 sal_uInt16 nReSize = 16 );
+    explicit        XColorTable(
+                        const String& rPath,
+                        XOutdevItemPool* pXPool = NULL
+                    );
     virtual         ~XColorTable();
 
     using XPropertyTable::Replace;
-    XColorEntry*    Replace(long nIndex, XColorEntry* pEntry );
+    XColorEntry*        Replace(long nIndex, XColorEntry* pEntry );
     using XPropertyTable::Remove;
-    XColorEntry*    Remove(long nIndex);
+    XColorEntry*        Remove(long nIndex);
     using XPropertyTable::Get;
-    XColorEntry*    GetColor(long nIndex) const;
+    XColorEntry*        GetColor(long nIndex) const;
 
     virtual sal_Bool    Load();
     virtual sal_Bool    Save();
     virtual sal_Bool    Create();
     virtual sal_Bool    CreateBitmapsForUI();
-    virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
+    virtual Bitmap*     CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
 
     static XColorTable& GetStdColorTable();
 };
 
-// -------------------
-// class XColorList
-// -------------------
-
-class XColorList : public XPropertyList
-{
-public:
-    explicit        XColorList( const String& rPath,
-                                XOutdevItemPool* pXPool = NULL,
-                                sal_uInt16 nInitSize = 16,
-                                sal_uInt16 nReSize = 16 );
-    virtual         ~XColorList();
-
-    using XPropertyList::Replace;
-    XColorEntry*    Replace(XColorEntry* pEntry, long nIndex );
-    using XPropertyList::Remove;
-    XColorEntry*    Remove(long nIndex);
-    using XPropertyList::Get;
-    XColorEntry*    GetColor(long nIndex) const;
-
-    virtual sal_Bool    Load();
-    virtual sal_Bool    Save();
-    virtual sal_Bool    Create();
-    virtual sal_Bool    CreateBitmapsForUI();
-    virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
-};
-
 // --------------------
 // class XLineEndTable
 // --------------------
@@ -353,18 +334,20 @@ public:
 class XLineEndTable : public XPropertyTable
 {
 public:
-    explicit        XLineEndTable( const String& rPath,
-                                    XOutdevItemPool* pXPool = NULL,
-                                    sal_uInt16 nInitSize = 16,
-                                    sal_uInt16 nReSize = 16 );
+    explicit        XLineEndTable(
+                        const String& rPath,
+                        XOutdevItemPool* pXPool = NULL,
+                        sal_uInt16 nInitSize = 16,
+                        sal_uInt16 nReSize = 16
+                    );
     virtual         ~XLineEndTable();
 
     using XPropertyTable::Replace;
-    XLineEndEntry*  Replace(long nIndex, XLineEndEntry* pEntry );
+    XLineEndEntry*      Replace(long nIndex, XLineEndEntry* pEntry );
     using XPropertyTable::Remove;
-    XLineEndEntry*  Remove(long nIndex);
+    XLineEndEntry*      Remove(long nIndex);
     using XPropertyTable::Get;
-    XLineEndEntry*  GetLineEnd(long nIndex) const;
+    XLineEndEntry*      GetLineEnd(long nIndex) const;
 
     virtual sal_Bool    Load();
     virtual sal_Bool    Save();
@@ -387,8 +370,11 @@ private:
     void impDestroy();
 
 public:
-    explicit XLineEndList(const String& rPath, XOutdevItemPool* pXPool = 0, sal_uInt16 nInitSize = 16, sal_uInt16 nReSize = 16);
-    virtual ~XLineEndList();
+    explicit        XLineEndList(
+                        const String& rPath,
+                        XOutdevItemPool* pXPool = 0
+                    );
+    virtual         ~XLineEndList();
 
     using XPropertyList::Replace;
     XLineEndEntry* Replace(XLineEndEntry* pEntry, long nIndex);
@@ -411,10 +397,12 @@ public:
 class XDashTable : public XPropertyTable
 {
 public:
-    explicit        XDashTable( const String& rPath,
-                                XOutdevItemPool* pXPool = NULL,
-                                sal_uInt16 nInitSize = 16,
-                                sal_uInt16 nReSize = 16 );
+    explicit        XDashTable(
+                        const String& rPath,
+                        XOutdevItemPool* pXPool = NULL,
+                        sal_uInt16 nInitSize = 16,
+                        sal_uInt16 nReSize = 16
+                    );
     virtual         ~XDashTable();
 
     using XPropertyTable::Replace;
@@ -445,21 +433,24 @@ private:
     void impDestroy();
 
 public:
-    explicit XDashList(const String& rPath, XOutdevItemPool* pXPool = 0, sal_uInt16 nInitSize = 16, sal_uInt16 nReSize = 16);
-    virtual ~XDashList();
+    explicit            XDashList(
+                            const String& rPath,
+                            XOutdevItemPool* pXPool = 0
+                        );
+    virtual             ~XDashList();
 
     using XPropertyList::Replace;
-    XDashEntry* Replace(XDashEntry* pEntry, long nIndex);
+    XDashEntry*         Replace(XDashEntry* pEntry, long nIndex);
     using XPropertyList::Remove;
-    XDashEntry* Remove(long nIndex);
+    XDashEntry*         Remove(long nIndex);
     using XPropertyList::Get;
-    XDashEntry* GetDash(long nIndex) const;
+    XDashEntry*         GetDash(long nIndex) const;
 
-    virtual sal_Bool Load();
-    virtual sal_Bool Save();
-    virtual sal_Bool Create();
-    virtual sal_Bool CreateBitmapsForUI();
-    virtual Bitmap* CreateBitmapForUI(long nIndex, sal_Bool bDelete = sal_True);
+    virtual sal_Bool    Load();
+    virtual sal_Bool    Save();
+    virtual sal_Bool    Create();
+    virtual sal_Bool    CreateBitmapsForUI();
+    virtual Bitmap*     CreateBitmapForUI(long nIndex, sal_Bool bDelete = sal_True);
 };
 
 // --------------------
@@ -469,10 +460,12 @@ public:
 class XHatchTable : public XPropertyTable
 {
 public:
-    explicit        XHatchTable( const String& rPath,
-                                    XOutdevItemPool* pXPool = NULL,
-                                    sal_uInt16 nInitSize = 16,
-                                    sal_uInt16 nReSize = 16 );
+    explicit        XHatchTable(
+                        const String& rPath,
+                        XOutdevItemPool* pXPool = NULL,
+                        sal_uInt16 nInitSize = 16,
+                        sal_uInt16 nReSize = 16
+                    );
     virtual         ~XHatchTable();
 
     using XPropertyTable::Replace;
@@ -503,7 +496,10 @@ private:
     void impDestroy();
 
 public:
-    explicit XHatchList(const String& rPath, XOutdevItemPool* pXPool = 0, sal_uInt16 nInitSize = 16, sal_uInt16 nReSize = 16);
+    explicit        XHatchList(
+                        const String& rPath,
+                        XOutdevItemPool* pXPool = 0
+                    );
     ~XHatchList();
 
     using XPropertyList::Replace;
@@ -527,10 +523,12 @@ public:
 class XGradientTable : public XPropertyTable
 {
 public:
-    explicit        XGradientTable( const String& rPath,
-                                    XOutdevItemPool* pXPool = NULL,
-                                    sal_uInt16 nInitSize = 16,
-                                    sal_uInt16 nReSize = 16 );
+    explicit        XGradientTable(
+                        const String& rPath,
+                        XOutdevItemPool* pXPool = NULL,
+                        sal_uInt16 nInitSize = 16,
+                        sal_uInt16 nReSize = 16
+                    );
     virtual         ~XGradientTable();
 
     using XPropertyTable::Replace;
@@ -544,7 +542,7 @@ public:
     virtual sal_Bool    Save();
     virtual sal_Bool    Create();
     virtual sal_Bool    CreateBitmapsForUI();
-    virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
+    virtual Bitmap*     CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
 };
 
 // -------------------
@@ -561,21 +559,24 @@ private:
     void impDestroy();
 
 public:
-    explicit XGradientList(const String& rPath, XOutdevItemPool* pXPool = 0, sal_uInt16 nInitSize = 16, sal_uInt16 nReSize = 16);
-    virtual ~XGradientList();
+    explicit    XGradientList(
+                    const String& rPath,
+                    XOutdevItemPool* pXPool = 0
+                );
+    virtual     ~XGradientList();
 
     using XPropertyList::Replace;
-    XGradientEntry* Replace(XGradientEntry* pEntry, long nIndex);
+    XGradientEntry*     Replace(XGradientEntry* pEntry, long nIndex);
     using XPropertyList::Remove;
-    XGradientEntry* Remove(long nIndex);
+    XGradientEntry*     Remove(long nIndex);
     using XPropertyList::Get;
-    XGradientEntry* GetGradient(long nIndex) const;
+    XGradientEntry*     GetGradient(long nIndex) const;
 
-    virtual sal_Bool Load();
-    virtual sal_Bool Save();
-    virtual sal_Bool Create();
-    virtual sal_Bool CreateBitmapsForUI();
-    virtual Bitmap* CreateBitmapForUI(long nIndex, sal_Bool bDelete = sal_True);
+    virtual sal_Bool    Load();
+    virtual sal_Bool    Save();
+    virtual sal_Bool    Create();
+    virtual sal_Bool    CreateBitmapsForUI();
+    virtual Bitmap*     CreateBitmapForUI(long nIndex, sal_Bool bDelete = sal_True);
 };
 
 // ---------------------
@@ -585,10 +586,12 @@ public:
 class XBitmapTable : public XPropertyTable
 {
 public:
-    explicit        XBitmapTable( const String& rPath,
-                                    XOutdevItemPool* pXPool = NULL,
-                                    sal_uInt16 nInitSize = 16,
-                                    sal_uInt16 nReSize = 16 );
+    explicit        XBitmapTable(
+                        const String& rPath,
+                        XOutdevItemPool* pXPool = NULL,
+                        sal_uInt16 nInitSize = 16,
+                        sal_uInt16 nReSize = 16
+                    );
     virtual         ~XBitmapTable();
 
     using XPropertyTable::Replace;
@@ -602,7 +605,7 @@ public:
     virtual sal_Bool    Save();
     virtual sal_Bool    Create();
     virtual sal_Bool    CreateBitmapsForUI();
-    virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
+    virtual Bitmap*     CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
 };
 
 // -------------------
@@ -612,10 +615,10 @@ public:
 class SVX_DLLPUBLIC XBitmapList : public XPropertyList
 {
 public:
-    explicit        XBitmapList( const String& rPath,
-                                    XOutdevItemPool* pXPool = NULL,
-                                    sal_uInt16 nInitSize = 16,
-                                    sal_uInt16 nReSize = 16 );
+    explicit        XBitmapList(
+                        const String& rPath,
+                        XOutdevItemPool* pXPool = NULL
+                    );
     virtual         ~XBitmapList();
 
     using XPropertyList::Replace;
@@ -629,7 +632,7 @@ public:
     virtual sal_Bool    Save();
     virtual sal_Bool    Create();
     virtual sal_Bool    CreateBitmapsForUI();
-    virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
+    virtual Bitmap*     CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
 };
 
 #endif // _XTABLE_HXX
diff --git a/svx/source/core/coreservices.cxx b/svx/source/core/coreservices.cxx
index 63fc7614ec99..c6ce5f2ed826 100644
--- a/svx/source/core/coreservices.cxx
+++ b/svx/source/core/coreservices.cxx
@@ -72,13 +72,7 @@ extern Sequence< OUString > SAL_CALL FontWorkCharacterSpacingControl_getSupporte
 extern "C"
 {
 
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment (
-    const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory (
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL svxcore_component_getFactory (
     const sal_Char * pImplName, void * pServiceManager, void *  )
 {
     void * pRet = 0;
diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
index 53cc25b61fb9..923a989064f1 100644
--- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
@@ -49,9 +49,9 @@
 #include <svx/svdpage.hxx>
 #include <svx/svdmodel.hxx>
 #include "svx/svditer.hxx"
-#include "unopolyhelper.hxx"
 #include <uno/mapping.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
+#include <basegfx/tools/unotools.hxx>
 #include <com/sun/star/document/XActionLockable.hpp>
 
 // ---------------------------
@@ -446,7 +446,8 @@ com::sun::star::drawing::PolyPolygonBezierCoords SAL_CALL EnhancedCustomShapeEng
                 SdrObject::Free( pNewObj );
             }
             SdrObject::Free( pObj );
-            SvxConvertB2DPolyPolygonToPolyPolygonBezier( aPolyPolygon, aPolyPolygonBezierCoords );
+            basegfx::unotools::b2DPolyPolygonToPolyPolygonBezier( aPolyPolygon,
+                                                                  aPolyPolygonBezierCoords );
         }
     }
 
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index c7bb02dd1fa7..af2873f69cc4 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -147,8 +147,8 @@ void SvLBoxColorString::Paint( const Point& rPos, SvLBox& rDev,
 //  class SvxRedlinTable
 //----------------------------------------------------------------------------
 
-SvxRedlinTable::SvxRedlinTable( Window* pParent,WinBits nBits ):
-        SvxSimpleTable(pParent,nBits )
+SvxRedlinTable::SvxRedlinTable(SvxSimpleTableContainer& rParent,WinBits nBits)
+    : SvxSimpleTable(rParent,nBits)
 {
     bAuthor=sal_False;
     bDate=sal_False;
@@ -159,8 +159,8 @@ SvxRedlinTable::SvxRedlinTable( Window* pParent,WinBits nBits ):
     SetNodeDefaultImages();
 }
 
-SvxRedlinTable::SvxRedlinTable( Window* pParent,const ResId& rResId):
-        SvxSimpleTable(pParent,rResId)
+SvxRedlinTable::SvxRedlinTable(SvxSimpleTableContainer& rParent,const ResId& rResId)
+    : SvxSimpleTable(rParent,rResId)
 {
     bAuthor=sal_False;
     bDate=sal_False;
@@ -465,7 +465,7 @@ SvLBoxEntry* SvxRedlinTable::InsertEntry(const String& rStr,RedlinData *pUserDat
     else
         aCurEntry.Erase();
 
-    return SvTreeListBox::InsertEntry( aFirstStr, pParent, sal_False, nPos, pUserData );
+    return SvxSimpleTable::InsertEntry( aFirstStr, pParent, sal_False, nPos, pUserData );
 
 }
 
@@ -487,7 +487,7 @@ SvLBoxEntry* SvxRedlinTable::InsertEntry(const String& rStr,RedlinData *pUserDat
     else
         aCurEntry.Erase();
 
-    return SvTreeListBox::InsertEntry( aFirstStr, pParent, sal_False, nPos, pUserData );
+    return SvxSimpleTable::InsertEntry( aFirstStr, pParent, sal_False, nPos, pUserData );
 }
 
 SvLBoxEntry* SvxRedlinTable::CreateEntry() const
@@ -549,7 +549,8 @@ void SvxRedlinTable::InitEntry( SvLBoxEntry* pEntry, const XubString& rStr,
 
 SvxTPView::SvxTPView( Window * pParent)
     : TabPage( pParent, SVX_RES(SID_REDLIN_VIEW_PAGE)),
-    aViewData   ( this, SVX_RES( DG_VIEW) ),
+    m_aViewDataContainer(this, SVX_RES(DG_VIEW)),
+    aViewData(m_aViewDataContainer),
     PbAccept    ( this, SVX_RES(PB_ACCEPT    ) ),
     PbReject    ( this, SVX_RES(PB_REJECT  ) ),
     PbAcceptAll ( this, SVX_RES(PB_ACCEPTALL  ) ),
@@ -590,7 +591,7 @@ String SvxTPView::GetMyName() const
 void SvxTPView::Resize()
 {
     Size aSize=GetOutputSizePixel();
-    Point aPos=aViewData.GetPosPixel();
+    Point aPos = m_aViewDataContainer.GetPosPixel();
     aSize.Height()-=aPos.Y()+nDistance;
     aSize.Width()-=2*aPos.X();
 
@@ -614,7 +615,7 @@ void SvxTPView::Resize()
         aPos.Y()=newY;
         PbUndo.SetPosPixel(aPos);
     }
-    aViewData.SetSizePixel(aSize);
+    m_aViewDataContainer.SetSizePixel(aSize);
 }
 
 void SvxTPView::InsertWriterHeader()
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index ecdb09c4b8a7..14ffb9233046 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -963,19 +963,17 @@ void RecovDocListEntry::Paint(const Point&       aPos   ,
     }
 }
 //===============================================
-RecovDocList::RecovDocList(      Window* pParent,
-                           const ResId&  rResId )
-    : SvxSimpleTable      ( pParent, rResId            )
-    , m_aGreenCheckImg    ( ResId(IMG_GREENCHECK,*rResId.GetResMgr()     ) )
-    , m_aYellowCheckImg   ( ResId(IMG_YELLOWCHECK,*rResId.GetResMgr()    ) )
-    , m_aRedCrossImg      ( ResId(IMG_REDCROSS,*rResId.GetResMgr()       ) )
-    , m_aSuccessRecovStr  ( ResId(STR_SUCCESSRECOV,*rResId.GetResMgr()   ) )
-    , m_aOrigDocRecovStr  ( ResId(STR_ORIGDOCRECOV,*rResId.GetResMgr()   ) )
-    , m_aRecovFailedStr   ( ResId(STR_RECOVFAILED,*rResId.GetResMgr()    ) )
-    , m_aRecovInProgrStr  ( ResId(STR_RECOVINPROGR,*rResId.GetResMgr()   ) )
-    , m_aNotRecovYetStr   ( ResId(STR_NOTRECOVYET,*rResId.GetResMgr()    ) )
+RecovDocList::RecovDocList(SvxSimpleTableContainer& rParent, ResMgr &rResMgr)
+    : SvxSimpleTable      ( rParent )
+    , m_aGreenCheckImg    ( ResId(IMG_GREENCHECK, rResMgr ) )
+    , m_aYellowCheckImg   ( ResId(IMG_YELLOWCHECK, rResMgr ) )
+    , m_aRedCrossImg      ( ResId(IMG_REDCROSS, rResMgr ) )
+    , m_aSuccessRecovStr  ( ResId(STR_SUCCESSRECOV, rResMgr ) )
+    , m_aOrigDocRecovStr  ( ResId(STR_ORIGDOCRECOV, rResMgr ) )
+    , m_aRecovFailedStr   ( ResId(STR_RECOVFAILED, rResMgr ) )
+    , m_aRecovInProgrStr  ( ResId(STR_RECOVINPROGR, rResMgr ) )
+    , m_aNotRecovYetStr   ( ResId(STR_NOTRECOVYET, rResMgr ) )
 {
-    //SetEntryHeight( short( maGreenCheckImg.GetSizePixel().Height() ) );
 }
 
 //===============================================
@@ -1019,7 +1017,8 @@ RecoveryDialog::RecoveryDialog(Window*       pParent,
     , m_aProgressFT         ( this           , SVX_RES  ( FT_RECOV_PROGR                 ) )
     , m_aProgrParent        ( this           , SVX_RES  ( WIN_RECOV_PROGR                ) )
     , m_aFileListFT         ( this           , SVX_RES  ( FT_RECOV_FILELIST              ) )
-    , m_aFileListLB         ( this           , SVX_RES  ( LB_RECOV_FILELIST              ) )
+    , m_aFileListLBContainer( this           , SVX_RES  ( LB_RECOV_FILELIST              ) )
+    , m_aFileListLB         (m_aFileListLBContainer, DIALOG_MGR())
     , m_aBottomFL           ( this           , SVX_RES  ( FL_RECOV_BOTTOM                ) )
     , m_aNextBtn            ( this           , SVX_RES  ( BTN_RECOV_NEXT                 ) )
     , m_aCancelBtn          ( this           , SVX_RES  ( BTN_RECOV_CANCEL               ) )
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 0e89b85d879e..38be3d8d5b1b 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -187,6 +187,7 @@ public:
         cStartBracket( 0 ), cEndBracket( 0 ), nFontWidthScale( 100 ),
         bSelection( sal_False ), bGetSelection( sal_False ), bUseResText( sal_False ),
         bDrawBaseLine( sal_True ), bPreviewBackgroundToCharacter( sal_False ), bTwoLines( sal_False ),
+        bNoLines( sal_False ),
         bIsCJKUI( sal_False ), bIsCTLUI( sal_False ),
         bUseFontNameAsText( sal_False ), bTextInited( sal_False )
         {
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index 14d2ccef225c..9dfefa37b493 100644
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -767,7 +767,6 @@ void FrameSelectorImpl::SelectBorder( FrameBorder& rBorder, bool bSelect )
     rBorder.Select( bSelect );
     DrawArrows( rBorder );
     DoInvalidate( false );
-    maSelectHdl.Call( this );
 }
 
 void FrameSelectorImpl::SilentGrabFocus()
@@ -1125,6 +1124,8 @@ void FrameSelector::MouseButtonDown( const MouseEvent& rMEvt )
                 for( SelFrameBorderIter aIt( mxImpl->maEnabBorders ); aIt.Is(); ++aIt )
                     mxImpl->ToggleBorderState( **aIt );
             }
+
+            GetSelectHdl().Call( this );
         }
     }
 }
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index 75d3a8dca672..6b29963fd8b9 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -772,19 +772,6 @@ void SvxRubyDialog::DataChanged( const DataChangedEvent& rDCEvt )
         UpdateColors();
 }
 
-void lcl_MoveBox(long nOffset, Edit& rLeft, Edit& rRight)
-{
-    Size aLeftSz(rLeft.GetSizePixel());
-    Point aRightPos(rRight.GetPosPixel());
-    Size aRightSz(rRight.GetSizePixel());
-    aLeftSz.Width() += nOffset;
-    aRightSz.Width() -= nOffset;
-    aRightPos.X() += nOffset;
-    rLeft.SetSizePixel(aLeftSz);
-    rRight.SetPosSizePixel(aRightPos, aRightSz);
-
-}
-
 RubyPreview::RubyPreview(SvxRubyDialog& rParent, const ResId& rResId) :
         Window(&rParent, rResId),
         rParentDlg(rParent)
diff --git a/svx/source/dialog/sendreportunx.cxx b/svx/source/dialog/sendreportunx.cxx
index ae1de194fcf2..8360a1fbe8d1 100644
--- a/svx/source/dialog/sendreportunx.cxx
+++ b/svx/source/dialog/sendreportunx.cxx
@@ -227,17 +227,18 @@ namespace svx{
 
             if ( fp )
             {
-                ByteString  strUTF8( GetUsing(), RTL_TEXTENCODING_UTF8 );
+                ByteString strUTF8( GetUsing(), RTL_TEXTENCODING_UTF8 );
 
-                fwrite( strUTF8.GetBuffer(), 1, strUTF8.Len(), fp );
+                size_t nWritten = fwrite(strUTF8.GetBuffer(), 1, strUTF8.Len(), fp);
+                OSL_VERIFY(nWritten == strUTF8.Len());
                 fclose( fp );
 #if defined( LINUX ) || defined (MACOSX)
-                setenv( "ERRORREPORT_BODYFILE", szBodyFile, 1 );
+                setenv("ERRORREPORT_BODYFILE", szBodyFile, 1);
 #else
-            static ::rtl::OString   strEnvBodyFile = "ERRORREPORT_BODYFILE";
-            strEnvBodyFile += "=";
-            strEnvBodyFile += szBodyFile;
-            putenv( (char *)strEnvBodyFile.getStr() );
+                static ::rtl::OString strEnvBodyFile = "ERRORREPORT_BODYFILE";
+                strEnvBodyFile += "=";
+                strEnvBodyFile += szBodyFile;
+                putenv((char *)strEnvBodyFile.getStr());
 #endif
             }
 
diff --git a/svx/source/dialog/simptabl.cxx b/svx/source/dialog/simptabl.cxx
index 93444e81a7c3..1e101266d7f3 100644
--- a/svx/source/dialog/simptabl.cxx
+++ b/svx/source/dialog/simptabl.cxx
@@ -37,30 +37,37 @@
 #include <comphelper/processfactory.hxx>
 #include <unotools/intlwrapper.hxx>
 
-// SvxSimpTblContainer  ------------------------------------------------------
+// SvxSimpleTableContainer  ------------------------------------------------------
 
-SvxSimpTblContainer::SvxSimpTblContainer( Window* pParent, WinBits nWinStyle):
-        Control(pParent,nWinStyle)
+SvxSimpleTableContainer::SvxSimpleTableContainer(Window* pParent, WinBits nStyle)
+    : Control(pParent, nStyle)
+    , m_pTable(NULL)
 {
-    //Do Nothing;
+    SetBorderStyle(WINDOW_BORDER_NOBORDER);
 }
 
-SvxSimpTblContainer::SvxSimpTblContainer( Window* pParent, const ResId& rResId):
-        Control(pParent,rResId)
+SvxSimpleTableContainer::SvxSimpleTableContainer( Window* pParent, const ResId& rResId)
+    : Control(pParent, rResId)
+    , m_pTable(NULL)
 {
-    //Do Nothing;
+    SetBorderStyle(WINDOW_BORDER_NOBORDER);
 }
 
-long SvxSimpTblContainer::PreNotify( NotifyEvent& rNEvt )
+void SvxSimpleTableContainer::SetTable(SvxSimpleTable* pTable)
+{
+    m_pTable = pTable;
+}
+
+long SvxSimpleTableContainer::PreNotify( NotifyEvent& rNEvt )
 {
     long nResult = sal_True;
     if ( rNEvt.GetType() == EVENT_KEYINPUT )
     {
         const KeyCode& aKeyCode = rNEvt.GetKeyEvent()->GetKeyCode();
         sal_uInt16 nKey = aKeyCode.GetCode();
-        if ( nKey == KEY_TAB )
+        if (nKey == KEY_TAB)
             GetParent()->Notify( rNEvt );
-        else if ( m_pTable->IsFocusOnCellEnabled() && ( nKey == KEY_LEFT || nKey == KEY_RIGHT ) )
+        else if (m_pTable && m_pTable->IsFocusOnCellEnabled() && ( nKey == KEY_LEFT || nKey == KEY_RIGHT))
             return 0;
         else
             nResult = Control::PreNotify( rNEvt );
@@ -71,25 +78,29 @@ long SvxSimpTblContainer::PreNotify( NotifyEvent& rNEvt )
     return nResult;
 }
 
+void SvxSimpleTableContainer::SetSizePixel(const Size& rNewSize )
+{
+    Control::SetSizePixel(rNewSize);
+    if (m_pTable)
+        m_pTable->UpdateViewSize();
+}
 
 // SvxSimpleTable ------------------------------------------------------------
 
-SvxSimpleTable::SvxSimpleTable( Window* pParent,WinBits nBits ):
-        SvHeaderTabListBox(pParent,WB_CLIPCHILDREN | WB_HSCROLL | WB_TABSTOP),
-        aPrivContainer(pParent,nBits|WB_DIALOGCONTROL),
-        aHeaderBar(pParent,WB_BUTTONSTYLE | WB_BORDER | WB_TABSTOP),
+SvxSimpleTable::SvxSimpleTable(SvxSimpleTableContainer& rParent, WinBits nBits):
+        SvHeaderTabListBox(&rParent, nBits | WB_CLIPCHILDREN | WB_HSCROLL | WB_TABSTOP),
+        m_rParentTableContainer(rParent),
+        aHeaderBar(&rParent,WB_BUTTONSTYLE | WB_BORDER | WB_TABSTOP),
         nHeaderItemId(1),
         bResizeFlag(sal_False),
         bPaintFlag(sal_True)
 {
+    m_rParentTableContainer.SetTable(this);
+
     bSortDirection=sal_True;
     nSortCol=0xFFFF;
     nOldPos=0;
 
-    SetParent(&aPrivContainer);
-    aHeaderBar.SetParent(&aPrivContainer);
-    aPrivContainer.SetTable( this );
-
     aHeaderBar.SetStartDragHdl(LINK( this, SvxSimpleTable, StartDragHdl));
     aHeaderBar.SetDragHdl(LINK( this, SvxSimpleTable, DragHdl));
     aHeaderBar.SetEndDragHdl(LINK( this, SvxSimpleTable, EndDragHdl));
@@ -100,51 +111,34 @@ SvxSimpleTable::SvxSimpleTable( Window* pParent,WinBits nBits ):
     DisableTransientChildren();
     InitHeaderBar( &aHeaderBar );
 
+    UpdateViewSize();
+
     aHeaderBar.Show();
     SvHeaderTabListBox::Show();
 }
 
-
-SvxSimpleTable::SvxSimpleTable( Window* pParent,const ResId& rResId):
-        SvHeaderTabListBox(pParent,WB_CLIPCHILDREN | WB_HSCROLL | WB_TABSTOP),
-        aPrivContainer(pParent,rResId),
-        aHeaderBar(pParent,WB_BUTTONSTYLE | WB_BORDER  | WB_TABSTOP),
+SvxSimpleTable::SvxSimpleTable(SvxSimpleTableContainer& rParent,const ResId& rResId):
+        SvHeaderTabListBox(&rParent,rResId),
+        m_rParentTableContainer(rParent),
+        aHeaderBar(&rParent,WB_BUTTONSTYLE | WB_BORDER  | WB_TABSTOP),
         nHeaderItemId(1),
         bResizeFlag(sal_True),
         bPaintFlag(sal_True)
 {
+    SetStyle(GetStyle()|WB_CLIPCHILDREN | WB_HSCROLL | WB_TABSTOP),
+    m_rParentTableContainer.SetTable(this);
 
     bSortDirection=sal_True;
     nOldPos=0;
     nSortCol=0xFFFF;
 
-    pMyParentWin=pParent;
-    SetParent(&aPrivContainer);
-    aHeaderBar.SetParent(&aPrivContainer);
-    aPrivContainer.SetTable( this );
-
-    WinBits nBits=aPrivContainer.GetStyle()|WB_DIALOGCONTROL;
-    aPrivContainer.SetStyle(nBits);
-
     aHeaderBar.SetStartDragHdl(LINK( this, SvxSimpleTable, StartDragHdl));
     aHeaderBar.SetDragHdl(LINK( this, SvxSimpleTable, DragHdl));
     aHeaderBar.SetEndDragHdl(LINK( this, SvxSimpleTable, EndDragHdl));
     aHeaderBar.SetSelectHdl(LINK( this, SvxSimpleTable, HeaderBarClick));
     aHeaderBar.SetDoubleClickHdl(LINK( this, SvxSimpleTable, HeaderBarDblClick));
 
-    Size theWinSize=aPrivContainer.GetOutputSizePixel();
-    Size HbSize=aHeaderBar.GetSizePixel();
-
-    HbSize.Width()=theWinSize.Width();
-    theWinSize.Height()-=HbSize.Height();
-    Point   thePos(0,0);
-
-    aHeaderBar.SetPosPixel(thePos);
-    aHeaderBar.SetSizePixel(HbSize);
-
-    thePos.Y()+=HbSize.Height();
-    SvHeaderTabListBox::SetPosPixel(thePos);
-    SvHeaderTabListBox::SetSizePixel(theWinSize);
+    UpdateViewSize();
 
     EnableCellFocus();
     DisableTransientChildren();
@@ -156,20 +150,16 @@ SvxSimpleTable::SvxSimpleTable( Window* pParent,const ResId& rResId):
 
 SvxSimpleTable::~SvxSimpleTable()
 {
-    SetParent(pMyParentWin);
-    aPrivContainer.SetParent(this);
-    aHeaderBar.SetParent(this);
 }
 
-
 void SvxSimpleTable::UpdateViewSize()
 {
-    Size theWinSize=aPrivContainer.GetOutputSizePixel();
+    Size theWinSize=m_rParentTableContainer.GetSizePixel();
     Size HbSize=aHeaderBar.GetSizePixel();
 
     HbSize.Width()=theWinSize.Width();
     theWinSize.Height()-=HbSize.Height();
-    Point   thePos(0,0);
+    Point thePos(0,0);
 
     aHeaderBar.SetPosPixel(thePos);
     aHeaderBar.SetSizePixel(HbSize);
@@ -281,81 +271,37 @@ void SvxSimpleTable::ClearHeader()
 
 void SvxSimpleTable::ShowTable()
 {
-    aPrivContainer.Show();
+    m_rParentTableContainer.Show();
 }
 
 void SvxSimpleTable::HideTable()
 {
-    aPrivContainer.Hide();
+    m_rParentTableContainer.Hide();
 }
 
 sal_Bool SvxSimpleTable::IsVisible() const
 {
-    return aPrivContainer.IsVisible();
+    return m_rParentTableContainer.IsVisible();
 }
 
 void SvxSimpleTable::EnableTable()
 {
-    aPrivContainer.Enable();
+    m_rParentTableContainer.Enable();
 }
 
 void SvxSimpleTable::DisableTable()
 {
-    aPrivContainer.Disable();
+    m_rParentTableContainer.Disable();
 }
 
 sal_Bool SvxSimpleTable::IsEnabled() const
 {
-    return aPrivContainer.IsEnabled();
+    return m_rParentTableContainer.IsEnabled();
 }
 
 void SvxSimpleTable::TableToTop()
 {
-    aPrivContainer.ToTop();
-}
-
-void SvxSimpleTable::SetPosPixel( const Point& rNewPos )
-{
-    aPrivContainer.SetPosPixel(rNewPos);
-}
-
-Point SvxSimpleTable::GetPosPixel() const
-{
-    return aPrivContainer.GetPosPixel();
-}
-
-void SvxSimpleTable::SetPosSizePixel( const Point& rNewPos, Size& rNewSize )
-{
-    aPrivContainer.SetPosPixel(rNewPos);
-    aPrivContainer.SetSizePixel(rNewSize);
-}
-
-void SvxSimpleTable::SetPosSize( const Point& rNewPos, const Size& rNewSize )
-{
-    aPrivContainer.SetPosPixel(rNewPos);
-    SvHeaderTabListBox::SetPosSizePixel(rNewPos,rNewSize);
-}
-
-Size SvxSimpleTable::GetSizePixel() const
-{
-    return aPrivContainer.GetSizePixel();
-}
-
-Size SvxSimpleTable::GetOutputSizePixel() const
-{
-    return aPrivContainer.GetOutputSizePixel();
-}
-
-void SvxSimpleTable::SetSizePixel(const Size& rNewSize )
-{
-    aPrivContainer.SetSizePixel(rNewSize);
-    UpdateViewSize();
-}
-
-void SvxSimpleTable::SetOutputSizePixel(const Size& rNewSize )
-{
-    aPrivContainer.SetOutputSizePixel(rNewSize);
-    UpdateViewSize();
+    m_rParentTableContainer.ToTop();
 }
 
 sal_uInt16 SvxSimpleTable::GetSelectedCol()
diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx
index 9f276fb90ec5..99e8fc8911dd 100644
--- a/svx/source/dialog/txencbox.cxx
+++ b/svx/source/dialog/txencbox.cxx
@@ -36,6 +36,7 @@
 #include <vcl/svapp.hxx>
 #include <rtl/tencinfo.h>
 #include <rtl/locale.h>
+#include <rtl/strbuf.hxx>
 #include <osl/nlsupport.h>
 
 //========================================================================
@@ -202,9 +203,9 @@ void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc, sal_uI
     else
     {
 #ifdef DBG_UTIL
-        ByteString aMsg( "SvxTextEncodingBox::InsertTextEncoding: no resource string for text encoding: " );
-        aMsg += ByteString::CreateFromInt32( nEnc );
-        DBG_ERRORFILE( aMsg.GetBuffer() );
+        rtl::OStringBuffer aMsg(RTL_CONSTASCII_STRINGPARAM("SvxTextEncodingBox::InsertTextEncoding: no resource string for text encoding: "));
+        aMsg.append(static_cast<sal_Int32>(nEnc));
+        DBG_ERRORFILE(aMsg.getStr());
 #endif
     }
 }
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index 20d9c96739ab..ea7ba5b82443 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -234,8 +234,6 @@ Svx3DWin::Svx3DWin( SfxBindings* pInBindings,
         pFmPage             ( NULL ),
         pVDev               ( NULL ),
         p3DView             ( NULL ),
-        pFavorSetList       ( NULL ),
-        pMatFavSetList      ( NULL ),
 
         pBindings           ( pInBindings ),
         pControllerItem(0L),
@@ -450,7 +448,6 @@ Svx3DWin::Svx3DWin( SfxBindings* pInBindings,
 // -----------------------------------------------------------------------
 Svx3DWin::~Svx3DWin()
 {
-    //delete pMatFavSetList;
     delete p3DView;
     delete pVDev;
     delete pModel;
diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx
index a31523b47ebd..68996657aa26 100644
--- a/svx/source/engine3d/obj3d.cxx
+++ b/svx/source/engine3d/obj3d.cxx
@@ -70,7 +70,6 @@
 #include <svtools/colorcfg.hxx>
 #include <editeng/eeitem.hxx>
 #include <svx/xgrscit.hxx>
-#include "svdoimp.hxx"
 #include <svx/sdr/properties/e3dproperties.hxx>
 #include <svx/sdr/properties/e3dcompoundproperties.hxx>
 #include <basegfx/polygon/b3dpolypolygontools.hxx>
diff --git a/svx/source/engine3d/viewpt3d2.cxx b/svx/source/engine3d/viewpt3d2.cxx
index 76dba241fe92..c487ab3f2a0d 100644
--- a/svx/source/engine3d/viewpt3d2.cxx
+++ b/svx/source/engine3d/viewpt3d2.cxx
@@ -66,15 +66,6 @@ void Viewport3D::SetViewWindow(double fX, double fY, double fW, double fH)
     fHRatio = aDeviceRect.GetHeight() / aViewWin.H;
 }
 
-void Viewport3D::GetViewWindow(double& rX, double& rY,
-                               double& rW, double& rH) const
-{
-    rX = aViewWin.X;
-    rY = aViewWin.Y;
-    rW = aViewWin.W;
-    rH = aViewWin.H;
-}
-
 // Returns observer position (PRP) in world coordinates
 
 const basegfx::B3DPoint& Viewport3D::GetViewPoint()
@@ -84,15 +75,6 @@ const basegfx::B3DPoint& Viewport3D::GetViewPoint()
     return aViewPoint;
 }
 
-// Returns transformations matrix
-
-const basegfx::B3DHomMatrix& Viewport3D::GetViewTransform()
-{
-    MakeTransform();
-
-    return aViewTf;
-}
-
 // Calculate View transformations matrix
 
 void Viewport3D::MakeTransform(void)
@@ -205,48 +187,6 @@ void Viewport3D::SetDeviceWindow(const Rectangle& rRect)
     aDeviceRect = rRect;
 }
 
-// Project the  3D pointon the View plane
-
-basegfx::B3DPoint Viewport3D::DoProjection(const basegfx::B3DPoint& rVec) const
-{
-    basegfx::B3DPoint aVec(rVec);
-
-    if ( eProjection == PR_PERSPECTIVE )
-    {
-        double fPrDist = fVPD - aPRP.getZ();
-
-        if ( aPRP.getZ() == rVec.getZ() )
-        {
-            aVec.setX(0.0);
-            aVec.setY(0.0);
-        }
-        else
-        {
-            // This is the version for any PRP, but not used due to
-            // performance reasons
-            fPrDist /= aVec.getZ() - aPRP.getZ();
-            aVec.setX(aVec.getX() * fPrDist);
-            aVec.setY(aVec.getY() * fPrDist);
-        }
-    }
-
-    return aVec;
-}
-
-// Mapp 3D point to device coordinates
-
-basegfx::B3DPoint Viewport3D::MapToDevice(const basegfx::B3DPoint& rVec) const
-{
-    basegfx::B3DPoint aRetval;
-
-    // Subtract Y-coordinate, since the device Y-Axis runs from top to bottom
-    aRetval.setX((double)aDeviceRect.Left() + ((rVec.getX() - aViewWin.X) * fWRatio));
-    aRetval.setY((double)aDeviceRect.Bottom() - ((rVec.getY() - aViewWin.Y) * fHRatio));
-    aRetval.setZ(rVec.getZ());
-
-    return aRetval;
-}
-
 // Set View Reference Point
 
 void Viewport3D::SetVRP(const basegfx::B3DPoint& rNewVRP)
@@ -290,22 +230,4 @@ void Viewport3D::SetVPD(double fNewVPD)
     bTfValid = sal_False;
 }
 
-// Set distance of the front Clipping plane
-
-void Viewport3D::SetNearClipDist(double fNewNCD)
-{
-    fNearClipDist = fNewNCD;
-    bTfValid = sal_False;
-}
-
-// Set distance of the rear Clipping plane
-
-void Viewport3D::SetFarClipDist(double fNewFCD)
-{
-    fFarClipDist = fNewFCD;
-    bTfValid = sal_False;
-}
-
-// eof
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index df4f2448342a..8a89d8185cb6 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -3158,7 +3158,8 @@ namespace svxform
         ModalDialog( _pCondDlg, SVX_RES( RID_SVXDLG_NAMESPACE_ITEM ) ),
 
         m_aNamespacesFT         ( this, SVX_RES( FT_NAMESPACES ) ),
-        m_aNamespacesList       ( this, SVX_RES( LB_NAMESPACES ) ),
+        m_aNamespacesListContainer  ( this, SVX_RES( LB_NAMESPACES ) ),
+        m_aNamespacesList       ( m_aNamespacesListContainer ),
         m_aAddNamespaceBtn      ( this, SVX_RES( PB_ADD_NAMESPACE ) ),
         m_aEditNamespaceBtn     ( this, SVX_RES( PB_EDIT_NAMESPACE ) ),
         m_aDeleteNamespaceBtn   ( this, SVX_RES( PB_DELETE_NAMESPACE ) ),
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index ba335ba09209..5ab40f1880da 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -462,25 +462,6 @@ sal_Int16 getControlTypeByObject(const Reference< ::com::sun::star::lang::XServi
 }
 
 //------------------------------------------------------------------------------
-void setConnection(const Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet, const Reference< ::com::sun::star::sdbc::XConnection>& _rxConn)
-{
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "fmtools::setConnection" );
-    Reference< ::com::sun::star::beans::XPropertySet> xRowSetProps(_rxRowSet, UNO_QUERY);
-    if (xRowSetProps.is())
-    {
-        try
-        {
-            Any aConn(makeAny(_rxConn));
-            xRowSetProps->setPropertyValue(FM_PROP_ACTIVE_CONNECTION, aConn);
-        }
-        catch(Exception&)
-        {
-            OSL_FAIL("::setConnection : could not set the connection !");
-        }
-
-    }
-}
-//------------------------------------------------------------------------------
 sal_Bool isRowSetAlive(const Reference< XInterface >& _rxRowSet)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "fmtools::isRowSetAlive" );
diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx
index f8be9c56146e..5c3b3efe4e14 100644
--- a/svx/source/gengal/gengal.cxx
+++ b/svx/source/gengal/gengal.cxx
@@ -51,7 +51,6 @@
 
 #include <tools/urlobj.hxx>
 #include <tools/fsys.hxx>
-#include <svtools/filedlg.hxx>
 
 #include <vcl/window.hxx>
 #include <vcl/svapp.hxx>
diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx
index a119b4500e90..0d5acf0de782 100644
--- a/svx/source/inc/datanavi.hxx
+++ b/svx/source/inc/datanavi.hxx
@@ -417,6 +417,7 @@ namespace svxform
         typedef std::vector< ::rtl::OUString > PrefixList;
 
         FixedText           m_aNamespacesFT;
+        SvxSimpleTableContainer m_aNamespacesListContainer;
         SvxSimpleTable      m_aNamespacesList;
         PushButton          m_aAddNamespaceBtn;
         PushButton          m_aEditNamespaceBtn;
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index b9ff1f927847..b2a15ee67bc7 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -619,9 +619,7 @@ class RecovDocList : public SvxSimpleTable
 
         //---------------------------------------
         /** @short TODO */
-        RecovDocList(      Window* pParent,
-                     const ResId&  rResId );
-
+        RecovDocList(SvxSimpleTableContainer& rParent, ResMgr& rResMgr);
         //---------------------------------------
         /** @short TODO */
         virtual ~RecovDocList();
@@ -649,6 +647,7 @@ class RecoveryDialog : public IExtendedTabPage
         FixedText       m_aProgressFT;
         Window          m_aProgrParent;
         FixedText       m_aFileListFT;
+        SvxSimpleTableContainer m_aFileListLBContainer;
         RecovDocList    m_aFileListLB;
         FixedLine       m_aBottomFL;
         PushButton      m_aNextBtn;
diff --git a/svx/source/inc/svdoimp.hxx b/svx/source/inc/svdoimp.hxx
deleted file mode 100644
index 4f4187d7f272..000000000000
--- a/svx/source/inc/svdoimp.hxx
+++ /dev/null
@@ -1,105 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * 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_SVDOIMP_HXX
-#define _SVX_SVDOIMP_HXX
-
-#include <vcl/mapmod.hxx>
-
-#include <svx/rectenum.hxx>
-
-
-class Bitmap;
-
-///////////////////////////////////////////////////////////////////////////////
-
-// #104609# Extracted from old XOutDev's ImpCalcBmpFillStartValues
-
-/** Calc offset and size for bitmap fill
-
-    This method calculates the size and the offset from the left, top
-    position of a shape in logical coordinates
-
-    @param rStartOffset
-    The offset from the left, top position of the output rectangle is returned
-
-    @param rBmpOutputSize
-    The output size of the bitmap is returned herein
-
-    @param rOutputRect
-    Specifies the output rectangle into which the bitmap should be tiled into
-
-    @param rOutputMapMode
-    Specifies the logical coordinate system the output rectangle is in
-
-    @param rFillBitmap
-    Specifies the bitmap to fill with
-
-    @param rBmpSize
-    The desired destination bitmap size. If null, size is taken from the bitmap
-
-    @param rBmpPerCent
-    Percentage of bitmap size, relative to the output rectangle
-
-    @param rBmpOffPerCent
-    Offset for bitmap tiling, in percentage relative to bitmap output size
-
-    @param bBmpLogSize
-    True when using the preferred bitmap size, False when using the percentage value
-
-    @param bBmpTile
-    True for tiling. False only paints one instance of the bitmap
-
-    @param bBmpStretch
-    True if bitmap should be stretched to output rect dimension
-
-    @param eBmpRectPoint
-    Position of the start point relative to the bitmap
-
- */
-void ImpCalcBmpFillSizes( Size&            rStartOffset,
-                          Size&            rBmpOutputSize,
-                          const Rectangle& rOutputRect,
-                          const MapMode&   rOutputMapMode,
-                          const Bitmap&    rFillBitmap,
-                          const Size&      rBmpSize,
-                          const Size&      rBmpPerCent,
-                          const Size&      rBmpOffPerCent,
-                          sal_Bool             bBmpLogSize,
-                          sal_Bool             bBmpTile,
-                          sal_Bool             bBmpStretch,
-                          RECT_POINT       eBmpRectPoint );
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-#endif // _SVX_SVDOIMP_HXX
-
-// eof
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/unopolyhelper.hxx b/svx/source/inc/unopolyhelper.hxx
deleted file mode 100644
index cc55cfae1f0a..000000000000
--- a/svx/source/inc/unopolyhelper.hxx
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * 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_UNOPOLYHELPER_HXX
-#define _SVX_UNOPOLYHELPER_HXX
-
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
-
-#include <svx/svxdllapi.h>
-
-namespace com { namespace sun { namespace star { namespace drawing {
-    struct PolyPolygonBezierCoords;
-} } } }
-
-namespace basegfx {
-    class B2DPolyPolygon;
-}
-
-/** convert a drawing::PolyPolygonBezierCoords to a B2DPolyPolygon
-*/
-basegfx::B2DPolyPolygon SvxConvertPolyPolygonBezierToB2DPolyPolygon( const com::sun::star::drawing::PolyPolygonBezierCoords* pSourcePolyPolygon)
-    throw( com::sun::star::lang::IllegalArgumentException );
-
-/** convert a B2DPolyPolygon to a drawing::PolyPolygonBezierCoords
-*/
-SVX_DLLPUBLIC void SvxConvertB2DPolyPolygonToPolyPolygonBezier( const basegfx::B2DPolyPolygon& rPolyPoly, com::sun::star::drawing::PolyPolygonBezierCoords& rRetval );
-
-
-#endif
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx
index 45cd62053ad4..50205c25241c 100644
--- a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx
@@ -45,6 +45,7 @@
 #include <svx/xfltrit.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <svx/sdr/primitive2d/sdrdecompositiontools.hxx>
+#include <drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
@@ -171,6 +172,15 @@ namespace sdr
                 }
             }
 
+            if (rCaptionObj.IsGhosted())
+            {
+                const basegfx::BColor aRGBWhite(1.0, 1.0, 1.0);
+                const basegfx::BColorModifier aBColorModifier(aRGBWhite, 0.5, basegfx::BCOLORMODIFYMODE_INTERPOLATE);
+                const drawinglayer::primitive2d::Primitive2DReference xGhostedRef(
+                        new drawinglayer::primitive2d::ModifiedColorPrimitive2D(xRetval, aBColorModifier));
+                xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xGhostedRef, 1);
+            }
+
             return xRetval;
         }
     } // end of namespace contact
diff --git a/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx b/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx
index dd41ddcd900a..03fcc439c74f 100644
--- a/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx
@@ -36,6 +36,7 @@
 #include <svl/itemset.hxx>
 #include <svx/sxciaitm.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
@@ -78,6 +79,8 @@ namespace sdr
             // create primitive data
             const sal_uInt16 nIdentifier(GetCircObj().GetObjIdentifier());
 
+            drawinglayer::primitive2d::Primitive2DSequence xRetval;
+
             // always create primitives to allow the decomposition of SdrEllipsePrimitive2D
             // or SdrEllipseSegmentPrimitive2D to create needed invisible elements for HitTest
             // and/or BoundRect
@@ -88,7 +91,7 @@ namespace sdr
                         aObjectMatrix,
                         aAttribute));
 
-                return drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1);
+                xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1);
             }
             else
             {
@@ -108,8 +111,18 @@ namespace sdr
                         bCloseSegment,
                         bCloseUsingCenter));
 
-                return drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1);
+                xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1);
+            }
+
+            if (GetCircObj().IsGhosted())
+            {
+                const basegfx::BColor aRGBWhite(1.0, 1.0, 1.0);
+                const basegfx::BColorModifier aBColorModifier(aRGBWhite, 0.5, basegfx::BCOLORMODIFYMODE_INTERPOLATE);
+                const drawinglayer::primitive2d::Primitive2DReference xReference(
+                        new drawinglayer::primitive2d::ModifiedColorPrimitive2D(xRetval, aBColorModifier));
+                xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1);
             }
+            return xRetval;
         }
     } // end of namespace contact
 } // end of namespace sdr
diff --git a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
index 16d717451d4e..db4094c3cdfd 100644
--- a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
@@ -39,6 +39,7 @@
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <svx/obj3d.hxx>
 #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx>
+#include <drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
@@ -233,6 +234,15 @@ namespace sdr
                 drawinglayer::primitive2d::createHiddenGeometryPrimitives2D(
                     false, aObjectRange));
 
+            if (GetCustomShapeObj().IsGhosted())
+            {
+                const basegfx::BColor aRGBWhite(1.0, 1.0, 1.0);
+                const basegfx::BColorModifier aBColorModifier(aRGBWhite, 0.5, basegfx::BCOLORMODIFYMODE_INTERPOLATE);
+                const drawinglayer::primitive2d::Primitive2DReference xReference(
+                        new drawinglayer::primitive2d::ModifiedColorPrimitive2D(xRetval, aBColorModifier));
+                xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1);
+            }
+
             return xRetval;
         }
     } // end of namespace contact
diff --git a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
index 46a8d4611021..34c1b99802c1 100644
--- a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
@@ -35,6 +35,7 @@
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <svx/sdr/primitive2d/sdrpathprimitive2d.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
@@ -137,7 +138,17 @@ namespace sdr
                     aAttribute,
                     aUnitPolyPolygon));
 
-            return drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1);
+            drawinglayer::primitive2d::Primitive2DSequence xRetval(&xReference, 1);
+
+            if (GetPathObj().IsGhosted())
+            {
+                const basegfx::BColor aRGBWhite(1.0, 1.0, 1.0);
+                const basegfx::BColorModifier aBColorModifier(aRGBWhite, 0.5, basegfx::BCOLORMODIFYMODE_INTERPOLATE);
+                const drawinglayer::primitive2d::Primitive2DReference xGhostedRef(
+                        new drawinglayer::primitive2d::ModifiedColorPrimitive2D(xRetval, aBColorModifier));
+                xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xGhostedRef, 1);
+            }
+            return xRetval;
         }
     } // end of namespace contact
 } // end of namespace sdr
diff --git a/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx b/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx
index cfa44f41a43a..fd6a688934f0 100644
--- a/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx
@@ -37,6 +37,7 @@
 #include <svx/sdr/primitive2d/sdrprimitivetools.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <svx/svdmodel.hxx>
+#include <drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
@@ -95,8 +96,17 @@ namespace sdr
                     fCornerRadiusY,
                     // #i105856# use fill for HitTest when TextFrame and not PickThrough
                     GetRectObj().IsTextFrame() && !bPickThroughTransparentTextFrames));
+            drawinglayer::primitive2d::Primitive2DSequence xRetVal(&xReference, 1);
 
-            return drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1);
+            if ( GetRectObj().IsGhosted( ) )
+            {
+                const basegfx::BColor aRGBWhite(1.0, 1.0, 1.0);
+                const basegfx::BColorModifier aBColorModifier(aRGBWhite, 0.5, basegfx::BCOLORMODIFYMODE_INTERPOLATE);
+                const drawinglayer::primitive2d::Primitive2DReference xGhostedRef(
+                        new drawinglayer::primitive2d::ModifiedColorPrimitive2D(xRetVal, aBColorModifier));
+                xRetVal = drawinglayer::primitive2d::Primitive2DSequence(&xGhostedRef, 1);
+            }
+            return xRetVal;
         }
     } // end of namespace contact
 } // end of namespace sdr
diff --git a/svx/source/svdraw/impgrfll.cxx b/svx/source/svdraw/impgrfll.cxx
deleted file mode 100644
index 55d221386d23..000000000000
--- a/svx/source/svdraw/impgrfll.cxx
+++ /dev/null
@@ -1,258 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * 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/rectenum.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/outdev.hxx>
-#include <vcl/bitmap.hxx>
-
-///////////////////////////////////////////////////////////////////////////////
-
-void ImpCalcBmpFillSizes( Size&            rStartOffset,
-                          Size&            rBmpOutputSize,
-                          const Rectangle& rOutputRect,
-                          const MapMode&   rOutputMapMode,
-                          const Bitmap&    rFillBitmap,
-                          const Size&      rBmpSize,
-                          const Size&      rBmpPerCent,
-                          const Size&      rBmpOffPerCent,
-                          sal_Bool             bBmpLogSize,
-                          sal_Bool             bBmpTile,
-                          sal_Bool             bBmpStretch,
-                          RECT_POINT       eBmpRectPoint )
-{
-    sal_Bool    bOriginalSize = sal_False, bScaleSize = sal_False;
-
-    // Falls keine Groessen gegeben sind ( z.B. alte Dokumente )
-    // berechnen wir uns die Groesse selber aus der Bitmap
-    // ==> altes Verhalten;
-    // wenn nur eine Groesse gegeben ist, wird die andere
-    // Groesse angepasst berechnet
-    if( bBmpLogSize )
-    {
-        if( !rBmpSize.Width() && !rBmpSize.Height() )
-            bOriginalSize = sal_True;
-        else if( !rBmpSize.Width() || !rBmpSize.Height() )
-            bScaleSize = sal_True;
-    }
-    else
-    {
-        if( !rBmpPerCent.Width() && !rBmpPerCent.Height() )
-            bOriginalSize = sal_True;
-        else if( !rBmpPerCent.Width() || !rBmpPerCent.Height() )
-            bScaleSize = sal_True;
-    }
-
-    // entweder Originalgroesse oder angepasste Groesse
-    if( bOriginalSize || bScaleSize )
-    {
-        MapMode aBmpPrefMapMode( rFillBitmap.GetPrefMapMode() );
-        Size    aBmpPrefSize( rFillBitmap.GetPrefSize() );
-
-        // Falls keine gesetzt ist, nehmen wir Pixel
-        if( !aBmpPrefSize.Width() || !aBmpPrefSize.Height() )
-        {
-            aBmpPrefSize = rFillBitmap.GetSizePixel();
-            aBmpPrefMapMode = MAP_PIXEL;
-        }
-
-        if( bOriginalSize )
-        {
-            if( MAP_PIXEL == aBmpPrefMapMode.GetMapUnit() )
-                rBmpOutputSize = Application::GetDefaultDevice()->PixelToLogic( aBmpPrefSize, rOutputMapMode );
-            else
-                rBmpOutputSize = OutputDevice::LogicToLogic( aBmpPrefSize, aBmpPrefMapMode, rOutputMapMode );
-        }
-        else
-        {
-            if( bBmpLogSize )
-            {
-                rBmpOutputSize = rBmpSize;
-
-                if( !rBmpSize.Width() )
-                    rBmpOutputSize.Width() = basegfx::fround( (double) rBmpSize.Height() * aBmpPrefSize.Width() / aBmpPrefSize.Height() );
-                else
-                    rBmpOutputSize.Height() = basegfx::fround( (double) rBmpSize.Width() * aBmpPrefSize.Height() / aBmpPrefSize.Width() );
-            }
-            else
-            {
-                if( !rBmpPerCent.Width() )
-                {
-                    rBmpOutputSize.Height() = basegfx::fround( (double) rOutputRect.GetHeight() * rBmpPerCent.Height() / 100. );
-                    rBmpOutputSize.Width() = basegfx::fround( (double) rBmpOutputSize.Height() * aBmpPrefSize.Width() / aBmpPrefSize.Height() );
-                }
-                else
-                {
-                    rBmpOutputSize.Width() = basegfx::fround( (double) rOutputRect.GetWidth() * rBmpPerCent.Width() / 100. );
-                    rBmpOutputSize.Height() = basegfx::fround( (double) rBmpOutputSize.Width() * aBmpPrefSize.Height() / aBmpPrefSize.Width() );
-                }
-            }
-        }
-    }
-    // ansonsten koennen wir die Groesse leicht selber berechnen
-    else
-    {
-        if( bBmpLogSize )
-            rBmpOutputSize = rBmpSize;
-        else
-        {
-            rBmpOutputSize.Width() = basegfx::fround( (double) rOutputRect.GetWidth() * rBmpPerCent.Width() / 100. );
-            rBmpOutputSize.Height() = basegfx::fround( (double) rOutputRect.GetHeight() * rBmpPerCent.Height() / 100. );
-        }
-    }
-
-    // nur bei Kachelung die anderen Positionen berechnen
-    if( bBmpTile )
-    {
-        Point aStartPoint;
-
-        // Grundposition der ersten Kachel berechen;
-        // Diese Position wird spaeter zur Berechnung der absoluten
-        // Startposition links oberhalb des Objektes benutzt
-        switch( eBmpRectPoint )
-        {
-            case( RP_MT ):
-            {
-                aStartPoint.X() = rOutputRect.Left() + ( ( rOutputRect.GetWidth() - rBmpOutputSize.Width() ) >> 1 );
-                aStartPoint.Y() = rOutputRect.Top();
-            }
-            break;
-
-            case( RP_RT ):
-            {
-                aStartPoint.X() = rOutputRect.Right() - rBmpOutputSize.Width();
-                aStartPoint.Y() = rOutputRect.Top();
-            }
-            break;
-
-            case( RP_LM ):
-            {
-                aStartPoint.X() = rOutputRect.Left();
-                aStartPoint.Y() = rOutputRect.Top() + ( ( rOutputRect.GetHeight() - rBmpOutputSize.Height() ) >> 1  );
-            }
-            break;
-
-            case( RP_MM ):
-            {
-                aStartPoint.X() = rOutputRect.Left() + ( ( rOutputRect.GetWidth() - rBmpOutputSize.Width() ) >> 1 );
-                aStartPoint.Y() = rOutputRect.Top() + ( ( rOutputRect.GetHeight() - rBmpOutputSize.Height() ) >> 1 );
-            }
-            break;
-
-            case( RP_RM ):
-            {
-                aStartPoint.X() = rOutputRect.Right() - rBmpOutputSize.Width();
-                aStartPoint.Y() = rOutputRect.Top() + ( ( rOutputRect.GetHeight() - rBmpOutputSize.Height() ) >> 1 );
-            }
-            break;
-
-            case( RP_LB ):
-            {
-                aStartPoint.X() = rOutputRect.Left();
-                aStartPoint.Y() = rOutputRect.Bottom() - rBmpOutputSize.Height();
-            }
-            break;
-
-            case( RP_MB ):
-            {
-                aStartPoint.X() = rOutputRect.Left() + ( ( rOutputRect.GetWidth() - rBmpOutputSize.Width() ) >> 1 );
-                aStartPoint.Y() = rOutputRect.Bottom() - rBmpOutputSize.Height();
-            }
-            break;
-
-            case( RP_RB ):
-            {
-                aStartPoint.X() = rOutputRect.Right() - rBmpOutputSize.Width();
-                aStartPoint.Y() = rOutputRect.Bottom() - rBmpOutputSize.Height();
-            }
-            break;
-
-            // default linke obere Ecke
-            default:
-                aStartPoint = rOutputRect.TopLeft();
-            break;
-        }
-
-        // X- oder Y-Positionsoffset beruecksichtigen
-        if( rBmpOffPerCent.Width() )
-            aStartPoint.X() += ( rBmpOutputSize.Width() * rBmpOffPerCent.Width() / 100 );
-
-        if( rBmpOffPerCent.Height() )
-            aStartPoint.Y() += ( rBmpOutputSize.Height() * rBmpOffPerCent.Height() / 100 );
-
-        // echten Startpunkt berechnen ( links oben )
-        if( rBmpOutputSize.Width() && rBmpOutputSize.Height() )
-        {
-            const long nDiffX = aStartPoint.X() - rOutputRect.Left();
-            const long nDiffY = aStartPoint.Y() - rOutputRect.Top();
-
-            if ( nDiffX )
-            {
-                long nCount = nDiffX / rBmpOutputSize.Width() + 1;
-
-                if ( rBmpOffPerCent.Height() && ( nCount & 1L ) )
-                    nCount++;
-
-                aStartPoint.X() -= ( nCount * rBmpOutputSize.Width() );
-            }
-
-            if ( nDiffY )
-            {
-                long nCount = nDiffY / rBmpOutputSize.Height() + 1;
-
-                if ( rBmpOffPerCent.Width() && ( nCount & 1L ) )
-                    nCount++;
-
-                aStartPoint.Y() -= ( nCount * rBmpOutputSize.Height() );
-            }
-        }
-
-        rStartOffset = Size( aStartPoint.X() - rOutputRect.Left(),
-                             aStartPoint.Y() - rOutputRect.Top() );
-    }
-    else
-    {
-        if( bBmpStretch )
-        {
-            rStartOffset = Size(0, 0);
-            rBmpOutputSize = rOutputRect.GetSize();
-        }
-        else
-        {
-            rStartOffset = Size( ( rOutputRect.GetWidth() - rBmpOutputSize.Width() ) >> 1,
-                                 ( rOutputRect.GetHeight() - rBmpOutputSize.Height() ) >> 1 );
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// eof
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index f7a18f4f2d1d..c8d87094c447 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -819,32 +819,6 @@ void SdrModel::SetTextDefaults() const
     SetTextDefaults( pItemPool, nDefTextHgt );
 }
 
-void ImpGetDefaultFontsLanguage( SvxFontItem& rLatin, SvxFontItem& rAsian, SvxFontItem& rComplex)
-{
-    const sal_uInt16 nItemCnt = 3;
-    static struct {
-        sal_uInt16 nFntType, nLanguage;
-    }  aOutTypeArr[ nItemCnt ] = {
-        {  DEFAULTFONT_LATIN_TEXT, LANGUAGE_ENGLISH_US },
-        {  DEFAULTFONT_CJK_TEXT, LANGUAGE_ENGLISH_US },
-        {  DEFAULTFONT_CTL_TEXT, LANGUAGE_ARABIC_SAUDI_ARABIA }
-    };
-    SvxFontItem* aItemArr[ nItemCnt ] = { &rLatin, &rAsian, &rComplex };
-
-    for( sal_uInt16 n = 0; n < nItemCnt; ++n )
-    {
-        Font aFnt( OutputDevice::GetDefaultFont(
-            aOutTypeArr[ n ].nFntType, aOutTypeArr[ n ].nLanguage,
-            DEFAULTFONT_FLAGS_ONLYONE, 0 ));
-        SvxFontItem* pI = aItemArr[ n ];
-        pI->SetFamily( aFnt.GetFamily());
-        pI->SetFamilyName( aFnt.GetName());
-        pI->SetStyleName( String() );
-        pI->SetPitch( aFnt.GetPitch());
-        pI->SetCharSet( aFnt.GetCharSet() );
-    }
-}
-
 void SdrModel::SetTextDefaults( SfxItemPool* pItemPool, sal_uIntPtr nDefTextHgt )
 {
     // #95114# set application-language specific dynamic pool language defaults
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index f615a0e5e704..ab9818fcdd45 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -42,7 +42,6 @@
 #include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/awt/Rectangle.hpp>
-#include "unopolyhelper.hxx"
 #include <comphelper/processfactory.hxx>
 #include <svl/urihelper.hxx>
 #include <com/sun/star/uno/Sequence.h>
@@ -93,6 +92,7 @@
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <basegfx/tools/unotools.hxx>
 
 inline double ImplTwipsToMM(double fVal) { return (fVal * (127.0 / 72.0)); }
 inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
@@ -575,7 +575,7 @@ basegfx::B2DPolyPolygon SdrObjCustomShape::GetLineGeometry( const SdrObjCustomSh
         com::sun::star::drawing::PolyPolygonBezierCoords aBezierCoords = xCustomShapeEngine->getLineGeometry();
         try
         {
-            aRetval = SvxConvertPolyPolygonBezierToB2DPolyPolygon( &aBezierCoords );
+            aRetval = basegfx::unotools::polyPolygonBezierToB2DPolyPolygon( aBezierCoords );
             if ( !bBezierAllowed && aRetval.areControlPointsUsed())
             {
                 aRetval = basegfx::tools::adaptiveSubdivideByAngle(aRetval);
diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx
index 23b7eccc40d6..b32b528989a8 100644
--- a/svx/source/svdraw/svdoattr.cxx
+++ b/svx/source/svdraw/svdoattr.cxx
@@ -85,7 +85,6 @@
 #include <svx/sdr/properties/attributeproperties.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include "svx/xlinjoit.hxx"
-#include <svdoimp.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 5fbb55f46bc3..3cea9733a202 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -96,7 +96,6 @@
 #include <svx/fmmodel.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/objface.hxx>
-#include "svdoimp.hxx"
 #include <vcl/graphictools.hxx>
 #include <svtools/colorcfg.hxx>
 #include <svx/sdr/properties/emptyproperties.hxx>
@@ -388,6 +387,7 @@ SdrObject::SdrObject()
     bNoPrint         =sal_False;
     bEmptyPresObj    =sal_False;
     bNotVisibleAsMaster=sal_False;
+    mbGhosted        = sal_False;
     bClosedObj       =sal_False;
     mbVisible        = true;
 
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index 98537d10816b..b8ab00494604 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -51,7 +51,6 @@
 #include "svx/svdglob.hxx"   // StringCache
 #include "svx/svdstr.hrc"    // Objektname
 #include <editeng/eeitem.hxx>
-#include "svdoimp.hxx"
 #include <svx/sdr/properties/circleproperties.hxx>
 #include <svx/sdr/contact/viewcontactofsdrcircobj.hxx>
 #include <basegfx/point/b2dpoint.hxx>
@@ -291,7 +290,7 @@ basegfx::B2DPolygon SdrCircObj::ImpCalcXPolyCirc(const SdrObjKind eCicrleKind, c
 void SdrCircObj::RecalcXPoly()
 {
     const basegfx::B2DPolygon aPolyCirc(ImpCalcXPolyCirc(meCircleKind, aRect, nStartWink, nEndWink));
-    mpXPoly = new XPolygon(aPolyCirc);
+    mpXPoly.reset( new XPolygon(aPolyCirc) );
 }
 
 void SdrCircObj::TakeObjNameSingul(XubString& rName) const
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index b1b9c9064e67..98a318c1b04d 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -49,7 +49,6 @@
 #include <svl/style.hxx>
 #include <svl/smplhint.hxx>
 #include <editeng/eeitem.hxx>
-#include "svdoimp.hxx"
 #include <svx/sdr/properties/connectorproperties.hxx>
 #include <svx/sdr/contact/viewcontactofsdredgeobj.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index f53d09e25941..a95f7041d4a9 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -62,7 +62,6 @@
 #include <svx/svdopath.hxx>
 #include <svx/svdpage.hxx>
 #include <unotools/syslocale.hxx>
-#include "svdoimp.hxx"
 #include <svx/sdr/properties/measureproperties.hxx>
 #include <svx/sdr/contact/viewcontactofsdrmeasureobj.hxx>
 #include <basegfx/point/b2dpoint.hxx>
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index e907b7103110..2ccedbb1a9c8 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -57,7 +57,6 @@
 #include <svx/polypolygoneditor.hxx>
 #include <svx/xlntrit.hxx>
 #include <vcl/salbtype.hxx>     // FRound
-#include "svdoimp.hxx"
 #include <svx/sdr/contact/viewcontactofsdrpathobj.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 
diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index e6ecaee1a2bb..a234ec12c0b8 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -51,7 +51,6 @@
 #include <svx/xflclit.hxx>
 #include <svx/xlnclit.hxx>
 #include <svx/xlnwtit.hxx>
-#include "svdoimp.hxx"
 #include <svx/sdr/properties/rectangleproperties.hxx>
 #include <svx/sdr/contact/viewcontactofsdrrectobj.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
@@ -78,21 +77,18 @@ sdr::contact::ViewContact* SdrRectObj::CreateObjectSpecificViewContact()
 TYPEINIT1(SdrRectObj,SdrTextObj);
 
 SdrRectObj::SdrRectObj()
-:   mpXPoly(0L)
 {
     bClosedObj=sal_True;
 }
 
 SdrRectObj::SdrRectObj(const Rectangle& rRect)
-:   SdrTextObj(rRect),
-    mpXPoly(NULL)
+:   SdrTextObj(rRect)
 {
     bClosedObj=sal_True;
 }
 
 SdrRectObj::SdrRectObj(SdrObjKind eNewTextKind)
-:   SdrTextObj(eNewTextKind),
-    mpXPoly(NULL)
+:   SdrTextObj(eNewTextKind)
 {
     DBG_ASSERT(eTextKind==OBJ_TEXT || eTextKind==OBJ_TEXTEXT ||
                eTextKind==OBJ_OUTLINETEXT || eTextKind==OBJ_TITLETEXT,
@@ -101,8 +97,7 @@ SdrRectObj::SdrRectObj(SdrObjKind eNewTextKind)
 }
 
 SdrRectObj::SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rRect)
-:   SdrTextObj(eNewTextKind,rRect),
-    mpXPoly(NULL)
+:   SdrTextObj(eNewTextKind,rRect)
 {
     DBG_ASSERT(eTextKind==OBJ_TEXT || eTextKind==OBJ_TEXTEXT ||
                eTextKind==OBJ_OUTLINETEXT || eTextKind==OBJ_TITLETEXT,
@@ -111,8 +106,7 @@ SdrRectObj::SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rRect)
 }
 
 SdrRectObj::SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat)
-:    SdrTextObj(eNewTextKind,rNewRect,rInput,rBaseURL,eFormat),
-    mpXPoly(NULL)
+:    SdrTextObj(eNewTextKind,rNewRect,rInput,rBaseURL,eFormat)
 {
     DBG_ASSERT(eTextKind==OBJ_TEXT || eTextKind==OBJ_TEXTEXT ||
                eTextKind==OBJ_OUTLINETEXT || eTextKind==OBJ_TITLETEXT,
@@ -122,25 +116,11 @@ SdrRectObj::SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStr
 
 SdrRectObj::~SdrRectObj()
 {
-    if(mpXPoly)
-    {
-        delete mpXPoly;
-    }
 }
 
 void SdrRectObj::SetXPolyDirty()
 {
-    if(mpXPoly)
-    {
-        delete mpXPoly;
-        mpXPoly = 0L;
-    }
-}
-
-bool SdrRectObj::PaintNeedsXPoly(long nEckRad) const
-{
-    bool bNeed=aGeo.nDrehWink!=0 || aGeo.nShearWink!=0 || nEckRad!=0;
-    return bNeed;
+    mpXPoly.reset();
 }
 
 XPolygon SdrRectObj::ImpCalcXPoly(const Rectangle& rRect1, long nRad1) const
@@ -169,7 +149,7 @@ XPolygon SdrRectObj::ImpCalcXPoly(const Rectangle& rRect1, long nRad1) const
 
 void SdrRectObj::RecalcXPoly()
 {
-    mpXPoly = new XPolygon(ImpCalcXPoly(aRect,GetEckenradius()));
+    mpXPoly.reset( new XPolygon(ImpCalcXPoly(aRect,GetEckenradius())) );
 }
 
 const XPolygon& SdrRectObj::GetXPoly() const
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index eb48bfa0edfe..4343948ebac9 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -71,22 +71,6 @@
 
 using namespace ::com::sun::star;
 
-namespace {
-void DumpObjectList (const ::std::vector<SdrObjectWeakRef>& rContainer)
-{
-    ::std::vector<SdrObjectWeakRef>::const_iterator iObject (rContainer.begin());
-    ::std::vector<SdrObjectWeakRef>::const_iterator iEnd (rContainer.end());
-    for (int nIndex=0 ; iObject!=iEnd; ++iObject,++nIndex)
-    {
-        const SdrObject* pObject = iObject->get();
-        OSL_TRACE("%d : %x, %s", nIndex,
-            pObject,
-            ::rtl::OUStringToOString(pObject->GetName(),RTL_TEXTENCODING_UTF8).getStr());
-    }
-}
-}
-
-
 class SdrObjList::WeakSdrObjectContainerType
     : public ::std::vector<SdrObjectWeakRef>
 {
diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx
index 180e967571bf..d8bed549f058 100644
--- a/svx/source/svdraw/svdtrans.cxx
+++ b/svx/source/svdraw/svdtrans.cxx
@@ -38,20 +38,11 @@
 #include <tools/debug.hxx>
 #include <unotools/syslocale.hxx>
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
 void MoveXPoly(XPolygon& rPoly, const Size& S)
 {
     rPoly.Move(S.Width(),S.Height());
 }
 
-void MoveXPoly(XPolyPolygon& rPoly, const Size& S)
-{
-    rPoly.Move(S.Width(),S.Height());
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
 void ResizeRect(Rectangle& rRect, const Point& rRef, const Fraction& rxFact, const Fraction& ryFact, bool bNoJustify)
 {
     Fraction xFact(rxFact);
@@ -107,24 +98,6 @@ void ResizeXPoly(XPolygon& rPoly, const Point& rRef, const Fraction& xFact, cons
     }
 }
 
-void ResizePoly(PolyPolygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact)
-{
-    sal_uInt16 nAnz=rPoly.Count();
-    for (sal_uInt16 i=0; i<nAnz; i++) {
-        ResizePoly(rPoly[i],rRef,xFact,yFact);
-    }
-}
-
-void ResizeXPoly(XPolyPolygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact)
-{
-    sal_uInt16 nAnz=rPoly.Count();
-    for (sal_uInt16 i=0; i<nAnz; i++) {
-        ResizeXPoly(rPoly[i],rRef,xFact,yFact);
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
 void RotatePoly(Polygon& rPoly, const Point& rRef, double sn, double cs)
 {
     sal_uInt16 nAnz=rPoly.GetSize();
@@ -141,14 +114,6 @@ void RotateXPoly(XPolygon& rPoly, const Point& rRef, double sn, double cs)
     }
 }
 
-void RotatePoly(PolyPolygon& rPoly, const Point& rRef, double sn, double cs)
-{
-    sal_uInt16 nAnz=rPoly.Count();
-    for (sal_uInt16 i=0; i<nAnz; i++) {
-        RotatePoly(rPoly[i],rRef,sn,cs);
-    }
-}
-
 void RotateXPoly(XPolyPolygon& rPoly, const Point& rRef, double sn, double cs)
 {
     sal_uInt16 nAnz=rPoly.Count();
@@ -157,14 +122,6 @@ void RotateXPoly(XPolyPolygon& rPoly, const Point& rRef, double sn, double cs)
     }
 }
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void MirrorRect(Rectangle& rRect, const Point& /*rRef1*/, const Point& /*rRef2*/, bool bNoJustify)
-{
-    // !!! fehlende Implementation !!!
-    if (!bNoJustify) rRect.Justify();
-}
-
 void MirrorPoint(Point& rPnt, const Point& rRef1, const Point& rRef2)
 {
     long mx=rRef2.X()-rRef1.X();
@@ -216,24 +173,6 @@ void MirrorXPoly(XPolygon& rPoly, const Point& rRef1, const Point& rRef2)
     }
 }
 
-void MirrorPoly(PolyPolygon& rPoly, const Point& rRef1, const Point& rRef2)
-{
-    sal_uInt16 nAnz=rPoly.Count();
-    for (sal_uInt16 i=0; i<nAnz; i++) {
-        MirrorPoly(rPoly[i],rRef1,rRef2);
-    }
-}
-
-void MirrorXPoly(XPolyPolygon& rPoly, const Point& rRef1, const Point& rRef2)
-{
-    sal_uInt16 nAnz=rPoly.Count();
-    for (sal_uInt16 i=0; i<nAnz; i++) {
-        MirrorXPoly(rPoly[i],rRef1,rRef2);
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
 void ShearPoly(Polygon& rPoly, const Point& rRef, double tn, bool bVShear)
 {
     sal_uInt16 nAnz=rPoly.GetSize();
@@ -250,24 +189,6 @@ void ShearXPoly(XPolygon& rPoly, const Point& rRef, double tn, bool bVShear)
     }
 }
 
-void ShearPoly(PolyPolygon& rPoly, const Point& rRef, double tn, bool bVShear)
-{
-    sal_uInt16 nAnz=rPoly.Count();
-    for (sal_uInt16 i=0; i<nAnz; i++) {
-        ShearPoly(rPoly[i],rRef,tn,bVShear);
-    }
-}
-
-void ShearXPoly(XPolyPolygon& rPoly, const Point& rRef, double tn, bool bVShear)
-{
-    sal_uInt16 nAnz=rPoly.Count();
-    for (sal_uInt16 i=0; i<nAnz; i++) {
-        ShearXPoly(rPoly[i],rRef,tn,bVShear);
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
 double CrookRotateXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCenter,
                          const Point& rRad, double& rSin, double& rCos, bool bVert)
 {
@@ -790,30 +711,6 @@ FrPair GetMapFactor(MapUnit eS, MapUnit eD)
     return aRet;
 };
 
-FrPair GetMapFactor(MapUnit eS, FieldUnit eD)
-{
-    FrPair aS(GetInchOrMM(eS));
-    FrPair aD(GetInchOrMM(eD));
-    bool bSInch=IsInch(eS);
-    bool bDInch=IsInch(eD);
-    FrPair aRet(aD.X()/aS.X(),aD.Y()/aS.Y());
-    if (bSInch && !bDInch) { aRet.X()*=Fraction(127,5); aRet.Y()*=Fraction(127,5); }
-    if (!bSInch && bDInch) { aRet.X()*=Fraction(5,127); aRet.Y()*=Fraction(5,127); }
-    return aRet;
-};
-
-FrPair GetMapFactor(FieldUnit eS, MapUnit eD)
-{
-    FrPair aS(GetInchOrMM(eS));
-    FrPair aD(GetInchOrMM(eD));
-    bool bSInch=IsInch(eS);
-    bool bDInch=IsInch(eD);
-    FrPair aRet(aD.X()/aS.X(),aD.Y()/aS.Y());
-    if (bSInch && !bDInch) { aRet.X()*=Fraction(127,5); aRet.Y()*=Fraction(127,5); }
-    if (!bSInch && bDInch) { aRet.X()*=Fraction(5,127); aRet.Y()*=Fraction(5,127); }
-    return aRet;
-};
-
 FrPair GetMapFactor(FieldUnit eS, FieldUnit eD)
 {
     if (eS==eD) return FrPair(1,1,1,1);
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 4d26e69e2396..d0f8f1693af7 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -938,7 +938,7 @@ double SAL_CALL Cell::getValue(  ) throw (RuntimeException)
 
 void SAL_CALL Cell::setValue( double nValue ) throw (RuntimeException)
 {
-    if( mfValue == nValue )
+    if( mfValue != nValue )
     {
         mfValue = nValue;
         mnCellContentType = CellContentType_VALUE;
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index e7b10ef33c99..1b5ed3ec5505 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -111,7 +111,6 @@
 
 void lcl_ResizeValueSet( Window &rWin, ValueSet &rValueSet );
 void lcl_CalcSizeValueSet( Window &rWin, ValueSet &rValueSet, const Size &aItemSize );
-sal_Bool lcl_FontChangedHint( const SfxHint &rHint );
 
 // namespaces
 using ::rtl::OUString;
@@ -2628,23 +2627,6 @@ void lcl_CalcSizeValueSet( Window &rWin, ValueSet &rValueSet, const Size &aItemS
     rWin.SetOutputSizePixel( aSize );
 }
 
-// -----------------------------------------------------------------------
-
-sal_Bool lcl_FontChangedHint( const SfxHint &rHint )
-{
-    SfxPoolItemHint *pItemHint = PTR_CAST(SfxPoolItemHint, &rHint);
-    if ( pItemHint )
-    {
-        SfxPoolItem *pItem = pItemHint->GetObject();
-        return ( pItem->Which() == SID_ATTR_CHAR_FONTLIST );
-    }
-    else
-    {
-        SfxSimpleHint* pSimpleHint = PTR_CAST(SfxSimpleHint, &rHint);
-        return pSimpleHint && ( SFX_HINT_DATACHANGED ==
-                            ( pSimpleHint->GetId() & SFX_HINT_DATACHANGED ) );
-    }
-}
 // -----------------------------------------------------------------------------
 Reference< ::com::sun::star::accessibility::XAccessible > SvxFontNameBox_Impl::CreateAccessible()
 {
diff --git a/svx/source/unodialogs/textconversiondlgs/services.cxx b/svx/source/unodialogs/textconversiondlgs/services.cxx
index 330a069140c2..d488b0f95a11 100644
--- a/svx/source/unodialogs/textconversiondlgs/services.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/services.cxx
@@ -48,13 +48,7 @@ static struct ::cppu::ImplementationEntry g_entries_unodialogs_chinesetranslatio
 extern "C"
 {
 //==================================================================================================
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-//==================================================================================================
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL textconversiondlgs_component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return ::cppu::component_getFactoryHelper(
diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx
index 65dd6f4a0bb0..4c887860b656 100644
--- a/svx/source/unodraw/XPropertyTable.cxx
+++ b/svx/source/unodraw/XPropertyTable.cxx
@@ -40,12 +40,12 @@
 #include <vcl/svapp.hxx>
 
 #include <cppuhelper/implbase2.hxx>
-#include "unopolyhelper.hxx"
 #include <svx/xdef.hxx>
 
 #include "svx/unoapi.hxx"
 #include <editeng/unoprnms.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/tools/unotools.hxx>
 
 using namespace com::sun::star;
 using namespace ::cppu;
@@ -171,9 +171,9 @@ void SAL_CALL SvxUnoXPropertyTable::removeByName( const  OUString& Name )
         if( pEntry && pEntry->GetName() == aInternalName )
         {
             if( mpList )
-                delete mpList->Remove( i, 0 );
+                delete mpList->Remove( i );
             else
-                delete mpTable->Remove( i, 0 );
+                delete mpTable->Remove( i );
             return;
         }
     }
@@ -383,7 +383,8 @@ uno::Any SvxUnoXLineEndTable::getAny( const XPropertyEntry* pEntry ) const throw
 
     uno::Any aAny;
     drawing::PolyPolygonBezierCoords aBezier;
-    SvxConvertB2DPolyPolygonToPolyPolygonBezier( ((XLineEndEntry*)pEntry)->GetLineEnd(), aBezier );
+    basegfx::unotools::b2DPolyPolygonToPolyPolygonBezier( ((XLineEndEntry*)pEntry)->GetLineEnd(),
+                                                          aBezier );
     aAny <<= aBezier;
     return aAny;
 }
@@ -397,7 +398,7 @@ XPropertyEntry* SvxUnoXLineEndTable::getEntry( const OUString& rName, const uno:
     basegfx::B2DPolyPolygon aPolyPolygon;
     drawing::PolyPolygonBezierCoords* pCoords = (drawing::PolyPolygonBezierCoords*)rAny.getValue();
     if( pCoords->Coordinates.getLength() > 0 )
-        aPolyPolygon = SvxConvertPolyPolygonBezierToB2DPolyPolygon( pCoords );
+        aPolyPolygon = basegfx::unotools::polyPolygonBezierToB2DPolyPolygon( *pCoords );
 
     // #86265# make sure polygon is closed
     aPolyPolygon.setClosed(true);
diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx
index 5f66007443a2..21b220683a72 100644
--- a/svx/source/unodraw/unoctabl.cxx
+++ b/svx/source/unodraw/unoctabl.cxx
@@ -256,13 +256,7 @@ extern uno::Sequence< OUString > SAL_CALL ExtrusionDepthController_getSupportedS
 extern "C"
 {
 
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment (
-    const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory (
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL svx_component_getFactory (
     const sal_Char * pImplName, void * pServiceManager, void *  )
 {
     void * pRet = 0;
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index b0e1ace320f0..93363cab2d9b 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -62,7 +62,6 @@
 #include "shapeimpl.hxx"
 #include "svx/unoshprp.hxx"
 #include <svx/svdoashp.hxx>
-#include "unopolyhelper.hxx"
 
 // #i29181#
 #include "svx/svdviter.hxx"
@@ -71,6 +70,7 @@
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/tools/unotools.hxx>
 
 #include <comphelper/servicehelper.hxx>
 
@@ -1331,132 +1331,6 @@ SvxShapePolyPolygonBezier::~SvxShapePolyPolygonBezier() throw()
 {
 }
 
-basegfx::B2DPolyPolygon SvxConvertPolyPolygonBezierToB2DPolyPolygon(const drawing::PolyPolygonBezierCoords* pSourcePolyPolygon)
-    throw( IllegalArgumentException )
-{
-    const sal_Int32 nOuterSequenceCount(pSourcePolyPolygon->Coordinates.getLength());
-    basegfx::B2DPolyPolygon aNewPolyPolygon;
-
-    if(pSourcePolyPolygon->Flags.getLength() != nOuterSequenceCount)
-    {
-        throw IllegalArgumentException();
-    }
-
-    // get pointers to inner sequence
-    const drawing::PointSequence* pInnerSequence = pSourcePolyPolygon->Coordinates.getConstArray();
-    const drawing::FlagSequence* pInnerSequenceFlags = pSourcePolyPolygon->Flags.getConstArray();
-
-    for(sal_Int32 a(0); a < nOuterSequenceCount; a++)
-    {
-        const sal_Int32 nInnerSequenceCount(pInnerSequence->getLength());
-
-        if(pInnerSequenceFlags->getLength() != nInnerSequenceCount)
-        {
-            throw IllegalArgumentException();
-        }
-
-        // prepare new polygon
-        basegfx::B2DPolygon aNewPolygon;
-        const awt::Point* pArray = pInnerSequence->getConstArray();
-        const drawing::PolygonFlags* pArrayFlags = pInnerSequenceFlags->getConstArray();
-
-        // get first point and flag
-        basegfx::B2DPoint aNewCoordinatePair(pArray->X, pArray->Y); pArray++;
-        XPolyFlags ePolyFlag((XPolyFlags)((sal_uInt16)*pArrayFlags)); pArrayFlags++;
-        basegfx::B2DPoint aControlA;
-        basegfx::B2DPoint aControlB;
-
-        // first point is not allowed to be a control point
-        if(XPOLY_CONTROL == ePolyFlag)
-        {
-            throw IllegalArgumentException();
-        }
-
-        // add first point as start point
-        aNewPolygon.append(aNewCoordinatePair);
-
-        for(sal_Int32 b(1); b < nInnerSequenceCount;)
-        {
-            // prepare loop
-            bool bControlA(false);
-            bool bControlB(false);
-
-            // get next point and flag
-            aNewCoordinatePair = basegfx::B2DPoint(pArray->X, pArray->Y);
-            ePolyFlag = XPolyFlags((XPolyFlags)((sal_uInt16)*pArrayFlags));
-            pArray++; pArrayFlags++; b++;
-
-            if(b < nInnerSequenceCount && XPOLY_CONTROL == ePolyFlag)
-            {
-                aControlA = aNewCoordinatePair;
-                bControlA = true;
-
-                // get next point and flag
-                aNewCoordinatePair = basegfx::B2DPoint(pArray->X, pArray->Y);
-                ePolyFlag = XPolyFlags((XPolyFlags)((sal_uInt16)*pArrayFlags));
-                pArray++; pArrayFlags++; b++;
-            }
-
-            if(b < nInnerSequenceCount && XPOLY_CONTROL == ePolyFlag)
-            {
-                aControlB = aNewCoordinatePair;
-                bControlB = true;
-
-                // get next point and flag
-                aNewCoordinatePair = basegfx::B2DPoint(pArray->X, pArray->Y);
-                ePolyFlag = XPolyFlags((XPolyFlags)((sal_uInt16)*pArrayFlags));
-                pArray++; pArrayFlags++; b++;
-            }
-
-            // two or no control points are consumed, another one would be an error.
-            // It's also an error if only one control point was read
-            if(XPOLY_CONTROL == ePolyFlag || bControlA != bControlB)
-            {
-                throw IllegalArgumentException();
-            }
-
-            // the previous writes used the B2DPolyPoygon -> PolyPolygon converter
-            // which did not create minimal PolyPolygons, but created all control points
-            // as null vectors (identical points). Because of the former P(CA)(CB)-norm of
-            // B2DPolygon and it's unused sign of being the zero-vector and CA and CB being
-            // relative to P, an empty edge was exported as P == CA == CB. Luckily, the new
-            // export format can be read without errors by the old OOo-versions, so we need only
-            // to correct here at read and do not need to export a wrong but compatible version
-            // for the future.
-            if(bControlA
-                && aControlA.equal(aControlB)
-                && aControlA.equal(aNewPolygon.getB2DPoint(aNewPolygon.count() - 1)))
-            {
-                bControlA = bControlB = false;
-            }
-
-            if(bControlA)
-            {
-                // add bezier edge
-                aNewPolygon.appendBezierSegment(aControlA, aControlB, aNewCoordinatePair);
-            }
-            else
-            {
-                // add edge
-                aNewPolygon.append(aNewCoordinatePair);
-            }
-        }
-
-        // next sequence
-        pInnerSequence++;
-        pInnerSequenceFlags++;
-
-        // #i72807# API import uses old line start/end-equal definition for closed,
-        // so we need to correct this to closed state here
-        basegfx::tools::checkClosed(aNewPolygon);
-
-        // add new subpolygon
-        aNewPolyPolygon.append(aNewPolygon);
-    }
-
-    return aNewPolyPolygon;
-}
-
 //----------------------------------------------------------------------
 
 bool SvxShapePolyPolygonBezier::setPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
@@ -1467,7 +1341,9 @@ bool SvxShapePolyPolygonBezier::setPropertyValueImpl( const ::rtl::OUString& rNa
     {
         if( rValue.getValue() && (rValue.getValueType() == ::getCppuType(( const drawing::PolyPolygonBezierCoords*)0) ) )
         {
-            basegfx::B2DPolyPolygon aNewPolyPolygon(SvxConvertPolyPolygonBezierToB2DPolyPolygon( (drawing::PolyPolygonBezierCoords*)rValue.getValue()));
+            basegfx::B2DPolyPolygon aNewPolyPolygon(
+                basegfx::unotools::polyPolygonBezierToB2DPolyPolygon(
+                    *(drawing::PolyPolygonBezierCoords*)rValue.getValue()));
             SetPolygon(aNewPolyPolygon);
             return true;
         }
@@ -1483,7 +1359,8 @@ bool SvxShapePolyPolygonBezier::setPropertyValueImpl( const ::rtl::OUString& rNa
                 basegfx::B2DHomMatrix aNewHomogenMatrix;
 
                 mpObj->TRGetBaseGeometry(aNewHomogenMatrix, aNewPolyPolygon);
-                aNewPolyPolygon = SvxConvertPolyPolygonBezierToB2DPolyPolygon((drawing::PolyPolygonBezierCoords*)rValue.getValue());
+                aNewPolyPolygon = basegfx::unotools::polyPolygonBezierToB2DPolyPolygon(
+                    *(drawing::PolyPolygonBezierCoords*)rValue.getValue());
                 mpObj->TRSetBaseGeometry(aNewHomogenMatrix, aNewPolyPolygon);
             }
             return true;
@@ -1497,44 +1374,6 @@ bool SvxShapePolyPolygonBezier::setPropertyValueImpl( const ::rtl::OUString& rNa
     throw IllegalArgumentException();
 }
 
-void SvxConvertB2DPolyPolygonToPolyPolygonBezier( const basegfx::B2DPolyPolygon& rPolyPoly, drawing::PolyPolygonBezierCoords& rRetval )
-{
-    // use PolyPolygon converter as base. Since PolyPolygonBezierCoords uses
-    // integer coordinates, this is no precision loss at all.
-    const PolyPolygon aPolyPoly(rPolyPoly);
-
-    // Polygone innerhalb vrobereiten
-    rRetval.Coordinates.realloc((sal_Int32)aPolyPoly.Count());
-    rRetval.Flags.realloc((sal_Int32)aPolyPoly.Count());
-
-    // Zeiger auf aeussere Arrays holen
-    drawing::PointSequence* pOuterSequence = rRetval.Coordinates.getArray();
-    drawing::FlagSequence*  pOuterFlags = rRetval.Flags.getArray();
-
-    for(sal_uInt16 a=0;a<aPolyPoly.Count();a++)
-    {
-        // Einzelpolygon holen
-        const Polygon& rPoly = aPolyPoly[a];
-
-        // Platz in Arrays schaffen
-        pOuterSequence->realloc((sal_Int32)rPoly.GetSize());
-        pOuterFlags->realloc((sal_Int32)rPoly.GetSize());
-
-        // Pointer auf arrays holen
-        awt::Point* pInnerSequence = pOuterSequence->getArray();
-        drawing::PolygonFlags* pInnerFlags = pOuterFlags->getArray();
-
-        for(sal_uInt16 b=0;b<rPoly.GetSize();b++)
-        {
-            *pInnerSequence++ = awt::Point( rPoly[b].X(), rPoly[b].Y() );
-            *pInnerFlags++ = (drawing::PolygonFlags)((sal_uInt16)rPoly.GetFlags(b));
-        }
-
-        pOuterSequence++;
-        pOuterFlags++;
-    }
-}
-
 //----------------------------------------------------------------------
 
 bool SvxShapePolyPolygonBezier::getPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
@@ -1546,7 +1385,7 @@ bool SvxShapePolyPolygonBezier::getPropertyValueImpl( const ::rtl::OUString& rNa
         // PolyPolygon in eine struct PolyPolygon packen
         const basegfx::B2DPolyPolygon& rPolyPoly = GetPolygon();
         drawing::PolyPolygonBezierCoords aRetval;
-        SvxConvertB2DPolyPolygonToPolyPolygonBezier(rPolyPoly, aRetval );
+        basegfx::unotools::b2DPolyPolygonToPolyPolygonBezier(rPolyPoly, aRetval);
 
         rValue <<= aRetval;
         break;
@@ -1558,7 +1397,7 @@ bool SvxShapePolyPolygonBezier::getPropertyValueImpl( const ::rtl::OUString& rNa
         basegfx::B2DHomMatrix aNewHomogenMatrix;
         mpObj.get()->TRGetBaseGeometry(aNewHomogenMatrix, aNewPolyPolygon);
         drawing::PolyPolygonBezierCoords aRetval;
-        SvxConvertB2DPolyPolygonToPolyPolygonBezier(aNewPolyPolygon, aRetval);
+        basegfx::unotools::b2DPolyPolygonToPolyPolygonBezier(aNewPolyPolygon, aRetval);
 
         rValue <<= aRetval;
         break;
diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx
index f56f870c006b..5a0d631ffa32 100644
--- a/svx/source/unodraw/unoshap3.cxx
+++ b/svx/source/unodraw/unoshap3.cxx
@@ -362,13 +362,13 @@ bool Svx3DSceneObject::setPropertyValueImpl( const ::rtl::OUString& rName, const
 
             // rescue object transformations
             SdrObjListIter aIter(*pScene->GetSubList(), IM_DEEPWITHGROUPS);
-            List aObjTrans;
+            std::vector<basegfx::B3DHomMatrix*> aObjTrans;
             while(aIter.IsMore())
             {
                 E3dObject* p3DObj = (E3dObject*)aIter.Next();
                 basegfx::B3DHomMatrix* pNew = new basegfx::B3DHomMatrix;
                 *pNew = p3DObj->GetTransform();
-                aObjTrans.Insert(pNew, LIST_APPEND);
+                aObjTrans.push_back(pNew);
             }
 
             // reset object transformations
@@ -422,7 +422,7 @@ bool Svx3DSceneObject::setPropertyValueImpl( const ::rtl::OUString& rName, const
             while(aIter.IsMore())
             {
                 E3dObject* p3DObj = (E3dObject*)aIter.Next();
-                basegfx::B3DHomMatrix* pMat = (basegfx::B3DHomMatrix*)aObjTrans.GetObject(nIndex++);
+                basegfx::B3DHomMatrix* pMat = aObjTrans[nIndex++];
                 p3DObj->NbcSetTransform(*pMat);
                 delete pMat;
             }
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 82a2c0ea13ab..7524b4ffc61a 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -97,6 +97,7 @@
 #include <editeng/outlobj.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <basegfx/tools/unotools.hxx>
 #include "shapeimpl.hxx"
 
 #include <vector>
@@ -104,7 +105,6 @@
 // #i68523#
 #include "svx/lathe3d.hxx"
 #include "svx/extrud3d.hxx"
-#include "unopolyhelper.hxx"
 
 #include <boost/bind.hpp>
 
@@ -2365,7 +2365,7 @@ bool SvxShape::setPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper
                     drawing::PolyPolygonBezierCoords aPolyPoly;
                     if ( rValue >>= aPolyPoly )
                     {
-                        basegfx::B2DPolyPolygon aNewPolyPolygon( SvxConvertPolyPolygonBezierToB2DPolyPolygon( &aPolyPoly ) );
+                        basegfx::B2DPolyPolygon aNewPolyPolygon( basegfx::unotools::polyPolygonBezierToB2DPolyPolygon( aPolyPoly ) );
                         // Reintroduction of fix for issue i59051 (#i108851#)
                         ForceMetricToItemPoolMetric( aNewPolyPolygon );
                         if( mpModel->IsWriter() )
@@ -2814,7 +2814,7 @@ bool SvxShape::getPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper
                     // Reintroduction of fix for issue #i59051# (#i108851#)
                     ForceMetricTo100th_mm( aPolyPoly );
                     drawing::PolyPolygonBezierCoords aRetval;
-                    SvxConvertB2DPolyPolygonToPolyPolygonBezier( aPolyPoly, aRetval);
+                    basegfx::unotools::b2DPolyPolygonToPolyPolygonBezier( aPolyPoly, aRetval);
                     rValue <<= aRetval;
                     break;
                 }
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 99f832ebad5a..4c77a8793150 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -47,7 +47,6 @@
 
 #include "svx/unoapi.hxx"
 #include <svl/style.hxx>
-#include "unopolyhelper.hxx"
 
 #include <tools/bigint.hxx>
 #include <svl/itemset.hxx>
@@ -63,6 +62,7 @@
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/vector/b2dvector.hxx>
+#include <basegfx/tools/unotools.hxx>
 
 #include <stdio.h>
 
@@ -1763,7 +1763,7 @@ bool XLineStartItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMe
     else
     {
         com::sun::star::drawing::PolyPolygonBezierCoords aBezier;
-        SvxConvertB2DPolyPolygonToPolyPolygonBezier( maPolyPolygon, aBezier );
+        basegfx::unotools::b2DPolyPolygonToPolyPolygonBezier( maPolyPolygon, aBezier );
         rVal <<= aBezier;
     }
 
@@ -1790,7 +1790,7 @@ bool XLineStartItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8
             com::sun::star::drawing::PolyPolygonBezierCoords* pCoords = (com::sun::star::drawing::PolyPolygonBezierCoords*)rVal.getValue();
             if( pCoords->Coordinates.getLength() > 0 )
             {
-                maPolyPolygon = SvxConvertPolyPolygonBezierToB2DPolyPolygon( pCoords );
+                maPolyPolygon = basegfx::unotools::polyPolygonBezierToB2DPolyPolygon( *pCoords );
                 // #i72807# close line start/end polygons hard
                 // maPolyPolygon.setClosed(true);
             }
@@ -2421,7 +2421,7 @@ bool XLineEndItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemb
     else
     {
         com::sun::star::drawing::PolyPolygonBezierCoords aBezier;
-        SvxConvertB2DPolyPolygonToPolyPolygonBezier( maPolyPolygon, aBezier );
+        basegfx::unotools::b2DPolyPolygonToPolyPolygonBezier( maPolyPolygon, aBezier );
         rVal <<= aBezier;
     }
     return true;
@@ -2447,7 +2447,7 @@ bool XLineEndItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 n
             com::sun::star::drawing::PolyPolygonBezierCoords* pCoords = (com::sun::star::drawing::PolyPolygonBezierCoords*)rVal.getValue();
             if( pCoords->Coordinates.getLength() > 0 )
             {
-                maPolyPolygon = SvxConvertPolyPolygonBezierToB2DPolyPolygon( pCoords );
+                maPolyPolygon = basegfx::unotools::polyPolygonBezierToB2DPolyPolygon( *pCoords );
                 // #i72807# close line start/end polygons hard
                 // maPolyPolygon.setClosed(true);
             }
diff --git a/svx/source/xoutdev/xtabbtmp.cxx b/svx/source/xoutdev/xtabbtmp.cxx
index 48ca4fbc91d7..fab3c2f01d72 100644
--- a/svx/source/xoutdev/xtabbtmp.cxx
+++ b/svx/source/xoutdev/xtabbtmp.cxx
@@ -68,10 +68,12 @@ static char const aChckXML[]     = { 'P', 'K', 0x03, 0x04 };        // = 6.0
 |*
 *************************************************************************/
 
-XBitmapTable::XBitmapTable( const String& rPath,
-                            XOutdevItemPool* pInPool,
-                            sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
-                XPropertyTable( rPath, pInPool, nInitSize, nReSize)
+XBitmapTable::XBitmapTable(
+    const String& rPath,
+    XOutdevItemPool* pInPool,
+    sal_uInt16 nInitSize,
+    sal_uInt16 nReSize
+) : XPropertyTable( rPath, pInPool, nInitSize, nReSize )
 {
     pBmpTable = new Table( nInitSize, nReSize );
 }
@@ -93,7 +95,7 @@ XBitmapEntry* XBitmapTable::Replace(long nIndex, XBitmapEntry* pEntry )
 
 XBitmapEntry* XBitmapTable::Remove(long nIndex)
 {
-    return (XBitmapEntry*) XPropertyTable::Remove(nIndex, 0);
+    return (XBitmapEntry*) XPropertyTable::Remove(nIndex);
 }
 
 /************************************************************************/
@@ -148,10 +150,10 @@ Bitmap* XBitmapTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
 |*
 *************************************************************************/
 
-XBitmapList::XBitmapList( const String& rPath,
-                            XOutdevItemPool* pInPool,
-                            sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
-                XPropertyList( rPath, pInPool, nInitSize, nReSize)
+XBitmapList::XBitmapList(
+    const String& rPath,
+    XOutdevItemPool* pInPool
+) : XPropertyList( rPath, pInPool )
 {
     // pBmpList = new List( nInitSize, nReSize );
 }
@@ -173,7 +175,7 @@ XBitmapEntry* XBitmapList::Replace(XBitmapEntry* pEntry, long nIndex )
 
 XBitmapEntry* XBitmapList::Remove(long nIndex)
 {
-    return (XBitmapEntry*) XPropertyList::Remove(nIndex, 0);
+    return (XBitmapEntry*) XPropertyList::Remove(nIndex);
 }
 
 /************************************************************************/
diff --git a/svx/source/xoutdev/xtabcolr.cxx b/svx/source/xoutdev/xtabcolr.cxx
index eae0c09360e2..4bb68120b97a 100644
--- a/svx/source/xoutdev/xtabcolr.cxx
+++ b/svx/source/xoutdev/xtabcolr.cxx
@@ -63,10 +63,11 @@ static char const aChckXML[]    = { '<', '?', 'x', 'm', 'l' };      // = 6.0
 |*
 *************************************************************************/
 
-XColorTable::XColorTable( const String& rPath,
-                            XOutdevItemPool* pInPool,
-                            sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
-                XPropertyTable( rPath, pInPool, nInitSize, nReSize)
+XColorTable::XColorTable(
+    const String& rPath,
+    XOutdevItemPool* pInPool
+) :
+    XPropertyTable( rPath, pInPool )
 {
     // ColorTable braucht keine eigene BmpTable
     // pBmpTable = new Table( nInitSize, nReSize );
@@ -95,7 +96,7 @@ XColorEntry* XColorTable::Replace(long nIndex, XColorEntry* pEntry )
 
 XColorEntry* XColorTable::Remove(long nIndex)
 {
-    return (XColorEntry*) XPropertyTable::Remove(nIndex, 0);
+    return (XColorEntry*) XPropertyTable::Remove(nIndex);
 }
 
 /************************************************************************/
@@ -456,86 +457,4 @@ Bitmap* XColorTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
     return( NULL );
 }
 
-// --------------------
-// class XColorList
-// --------------------
-
-/*************************************************************************
-|*
-|* XColorList::XColorList()
-|*
-*************************************************************************/
-
-XColorList::XColorList( const String& rPath,
-                            XOutdevItemPool* pInPool,
-                            sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
-                XPropertyList( rPath, pInPool, nInitSize, nReSize)
-{
-    // pBmpList = new List( nInitSize, nReSize );
-}
-
-/************************************************************************/
-
-XColorList::~XColorList()
-{
-}
-
-/************************************************************************/
-
-XColorEntry* XColorList::Replace(XColorEntry* pEntry, long nIndex )
-{
-    return (XColorEntry*) XPropertyList::Replace(pEntry, nIndex);
-}
-
-/************************************************************************/
-
-XColorEntry* XColorList::Remove(long nIndex)
-{
-    return (XColorEntry*) XPropertyList::Remove(nIndex, 0);
-}
-
-/************************************************************************/
-
-XColorEntry* XColorList::GetColor(long nIndex) const
-{
-    return (XColorEntry*) XPropertyList::Get(nIndex, 0);
-}
-
-/************************************************************************/
-
-sal_Bool XColorList::Load()
-{
-    return( sal_False );
-}
-
-/************************************************************************/
-
-sal_Bool XColorList::Save()
-{
-    return( sal_False );
-}
-
-/************************************************************************/
-
-sal_Bool XColorList::Create()
-{
-    return( sal_False );
-}
-
-/************************************************************************/
-
-sal_Bool XColorList::CreateBitmapsForUI()
-{
-    return( sal_False );
-}
-
-/************************************************************************/
-
-Bitmap* XColorList::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
-{
-    return( NULL );
-}
-
-// eof
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx
index f5c71a65200a..39034d467057 100644
--- a/svx/source/xoutdev/xtabdash.cxx
+++ b/svx/source/xoutdev/xtabdash.cxx
@@ -83,10 +83,13 @@ char const aChckXML[]   = { '<', '?', 'x', 'm', 'l' };      // = 6.0
 |*
 *************************************************************************/
 
-XDashTable::XDashTable( const String& rPath,
-                            XOutdevItemPool* pInPool,
-                            sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
-                XPropertyTable( rPath, pInPool, nInitSize, nReSize)
+XDashTable::XDashTable(
+    const String& rPath,
+    XOutdevItemPool* pInPool,
+    sal_uInt16 nInitSize,
+    sal_uInt16 nReSize
+) :
+    XPropertyTable( rPath, pInPool, nInitSize, nReSize )
 {
     pBmpTable = new Table( nInitSize, nReSize );
 }
@@ -108,7 +111,7 @@ XDashEntry* XDashTable::Replace(long nIndex, XDashEntry* pEntry )
 
 XDashEntry* XDashTable::Remove(long nIndex)
 {
-    return (XDashEntry*) XPropertyTable::Remove(nIndex, 0);
+    return (XDashEntry*) XPropertyTable::Remove(nIndex);
 }
 
 /************************************************************************/
@@ -240,11 +243,13 @@ void XDashList::impDestroy()
     }
 }
 
-XDashList::XDashList(const String& rPath, XOutdevItemPool* pInPool, sal_uInt16 nInitSize, sal_uInt16 nReSize)
-:   XPropertyList(rPath, pInPool, nInitSize, nReSize),
+XDashList::XDashList(
+    const String& rPath,
+    XOutdevItemPool* pInPool
+) : XPropertyList( rPath, pInPool ),
     mpData(0)
 {
-    pBmpList = new List(nInitSize, nReSize);
+    pBmpList = new BitmapList_impl();
 }
 
 XDashList::~XDashList()
@@ -259,7 +264,7 @@ XDashEntry* XDashList::Replace(XDashEntry* pEntry, long nIndex )
 
 XDashEntry* XDashList::Remove(long nIndex)
 {
-    return (XDashEntry*) XPropertyList::Remove(nIndex, 0);
+    return (XDashEntry*) XPropertyList::Remove(nIndex);
 }
 
 XDashEntry* XDashList::GetDash(long nIndex) const
@@ -337,7 +342,13 @@ sal_Bool XDashList::CreateBitmapsForUI()
         DBG_ASSERT( pBmp, "XDashList: Bitmap(UI) konnte nicht erzeugt werden!" );
 
         if( pBmp )
-            pBmpList->Insert( pBmp, i );
+        {
+            if ( (size_t)i < pBmpList->size() ) {
+                pBmpList->insert( pBmpList->begin() + i, pBmp );
+            } else {
+                pBmpList->push_back( pBmp );
+            }
+        }
     }
 
     impDestroy();
diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx
index 87709fd57399..1066f77c6418 100644
--- a/svx/source/xoutdev/xtabgrdt.cxx
+++ b/svx/source/xoutdev/xtabgrdt.cxx
@@ -79,10 +79,13 @@ char const aChckXML[]       = { '<', '?', 'x', 'm', 'l' };      // = 6.0
 |*
 *************************************************************************/
 
-XGradientTable::XGradientTable( const String& rPath,
-                            XOutdevItemPool* pInPool,
-                            sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
-                XPropertyTable( rPath, pInPool, nInitSize, nReSize)
+XGradientTable::XGradientTable(
+    const String& rPath,
+    XOutdevItemPool* pInPool,
+    sal_uInt16 nInitSize,
+    sal_uInt16 nReSize
+) :
+    XPropertyTable( rPath, pInPool, nInitSize, nReSize )
 {
     pBmpTable = new Table( nInitSize, nReSize );
 }
@@ -104,7 +107,7 @@ XGradientEntry* XGradientTable::Replace(long nIndex, XGradientEntry* pEntry )
 
 XGradientEntry* XGradientTable::Remove(long nIndex)
 {
-    return (XGradientEntry*) XPropertyTable::Remove(nIndex, 0);
+    return (XGradientEntry*) XPropertyTable::Remove(nIndex);
 }
 
 /************************************************************************/
@@ -222,11 +225,13 @@ void XGradientList::impDestroy()
     }
 }
 
-XGradientList::XGradientList( const String& rPath, XOutdevItemPool* pInPool, sal_uInt16 nInitSize, sal_uInt16 nReSize)
-:   XPropertyList(rPath, pInPool, nInitSize, nReSize),
+XGradientList::XGradientList(
+    const String& rPath,
+    XOutdevItemPool* pInPool
+) : XPropertyList( rPath, pInPool ),
     mpData(0)
 {
-    pBmpList = new List(nInitSize, nReSize);
+    pBmpList = new BitmapList_impl();
 }
 
 XGradientList::~XGradientList()
@@ -245,7 +250,7 @@ XGradientEntry* XGradientList::Replace(XGradientEntry* pEntry, long nIndex )
 
 XGradientEntry* XGradientList::Remove(long nIndex)
 {
-    return( (XGradientEntry*) XPropertyList::Remove( nIndex, 0 ) );
+    return( (XGradientEntry*) XPropertyList::Remove( nIndex ) );
 }
 
 XGradientEntry* XGradientList::GetGradient(long nIndex) const
@@ -330,7 +335,13 @@ sal_Bool XGradientList::CreateBitmapsForUI()
         DBG_ASSERT( pBmp, "XGradientList: Bitmap(UI) konnte nicht erzeugt werden!" );
 
         if( pBmp )
-            pBmpList->Insert( pBmp, i );
+        {
+            if ( (size_t)i < pBmpList->size() ) {
+                pBmpList->insert( pBmpList->begin() + i, pBmp );
+            } else {
+                pBmpList->push_back( pBmp );
+            }
+        }
     }
 
     impDestroy();
diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx
index ef83d3a8b78a..a87d86fa1e9e 100644
--- a/svx/source/xoutdev/xtabhtch.cxx
+++ b/svx/source/xoutdev/xtabhtch.cxx
@@ -77,10 +77,14 @@ char const aChckXML[]    = { '<', '?', 'x', 'm', 'l' };     // = 6.0
 |*
 *************************************************************************/
 
-XHatchTable::XHatchTable( const String& rPath,
-                            XOutdevItemPool* pInPool,
-                            sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
-                XPropertyTable( rPath, pInPool, nInitSize, nReSize)
+XHatchTable::XHatchTable(
+    const String& rPath,
+    XOutdevItemPool* pInPool,
+    sal_uInt16
+    nInitSize,
+    sal_uInt16 nReSize
+)
+    : XPropertyTable( rPath, pInPool, nInitSize, nReSize )
 {
     pBmpTable = new Table( nInitSize, nReSize );
 }
@@ -102,7 +106,7 @@ XHatchEntry* XHatchTable::Replace(long nIndex, XHatchEntry* pEntry )
 
 XHatchEntry* XHatchTable::Remove(long nIndex)
 {
-    return (XHatchEntry*) XPropertyTable::Remove(nIndex, 0);
+    return (XHatchEntry*) XPropertyTable::Remove(nIndex);
 }
 
 /************************************************************************/
@@ -230,11 +234,13 @@ void XHatchList::impDestroy()
     }
 }
 
-XHatchList::XHatchList(const String& rPath, XOutdevItemPool* pInPool, sal_uInt16 nInitSize, sal_uInt16 nReSize)
-:   XPropertyList(rPath, pInPool, nInitSize, nReSize),
-    mpData(0)
+XHatchList::XHatchList(
+    const String& rPath,
+    XOutdevItemPool* pInPool
+)   : XPropertyList( rPath, pInPool )
+    , mpData(0)
 {
-    pBmpList = new List(nInitSize, nReSize);
+    pBmpList = new BitmapList_impl();
 }
 
 XHatchList::~XHatchList()
@@ -253,7 +259,7 @@ XHatchEntry* XHatchList::Replace(XHatchEntry* pEntry, long nIndex )
 
 XHatchEntry* XHatchList::Remove(long nIndex)
 {
-    return (XHatchEntry*) XPropertyList::Remove(nIndex, 0);
+    return (XHatchEntry*) XPropertyList::Remove(nIndex);
 }
 
 XHatchEntry* XHatchList::GetHatch(long nIndex) const
@@ -331,7 +337,13 @@ sal_Bool XHatchList::CreateBitmapsForUI()
         DBG_ASSERT( pBmp, "XHatchList: Bitmap(UI) konnte nicht erzeugt werden!" );
 
         if( pBmp )
-            pBmpList->Insert( pBmp, i );
+        {
+            if ( (size_t)i < pBmpList->size() ) {
+                pBmpList->insert( pBmpList->begin() + i, pBmp );
+            } else {
+                pBmpList->push_back( pBmp );
+            }
+        }
     }
 
     impDestroy();
diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx
index 42fe9043accc..705485feeef7 100644
--- a/svx/source/xoutdev/xtable.cxx
+++ b/svx/source/xoutdev/xtable.cxx
@@ -56,17 +56,19 @@ Color RGB_Color( ColorData nColorName )
 |*
 *************************************************************************/
 
-XPropertyTable::XPropertyTable( const String& rPath,
-                                XOutdevItemPool* pInPool,
-                                sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
-            aName           ( pszStandard, 8 ),
-            aPath           ( rPath ),
-            pXPool          ( pInPool ),
-            aTable          ( nInitSize, nReSize ),
-            pBmpTable       ( NULL ),
-            bTableDirty     ( sal_True ),
-            bBitmapsDirty   ( sal_True ),
-            bOwnPool        ( sal_False )
+XPropertyTable::XPropertyTable(
+    const String& rPath,
+    XOutdevItemPool* pInPool,
+    sal_uInt16 nInitSize,
+    sal_uInt16 nReSize
+)   : aName         ( pszStandard, 8 )
+    , aPath         ( rPath )
+    , pXPool        ( pInPool )
+    , aTable        ( nInitSize, nReSize )
+    , pBmpTable     ( NULL )
+    , bTableDirty   ( sal_True )
+    , bBitmapsDirty ( sal_True )
+    , bOwnPool      ( sal_False )
 {
     if( !pXPool )
     {
@@ -256,7 +258,7 @@ XPropertyEntry* XPropertyTable::Replace( long nIndex, XPropertyEntry* pEntry )
 |*
 *************************************************************************/
 
-XPropertyEntry* XPropertyTable::Remove( long nIndex, sal_uInt16 /*nDummy*/)
+XPropertyEntry* XPropertyTable::Remove( long nIndex )
 {
     if( pBmpTable && !bBitmapsDirty )
     {
@@ -288,17 +290,16 @@ void XPropertyTable::SetName( const String& rString )
 |*
 *************************************************************************/
 
-XPropertyList::XPropertyList( const String& rPath,
-                                XOutdevItemPool* pInPool,
-                                sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
-            aName           ( pszStandard, 8 ),
-            aPath           ( rPath ),
-            pXPool          ( pInPool ),
-            aList           ( nInitSize, nReSize ),
-            pBmpList        ( NULL ),
-            bListDirty      ( sal_True ),
-            bBitmapsDirty   ( sal_True ),
-            bOwnPool        ( sal_False )
+XPropertyList::XPropertyList(
+    const String& rPath,
+    XOutdevItemPool* pInPool
+) : aName           ( pszStandard, 8 ),
+    aPath           ( rPath ),
+    pXPool          ( pInPool ),
+    pBmpList        ( NULL ),
+    bListDirty      ( sal_True ),
+    bBitmapsDirty   ( sal_True ),
+    bOwnPool        ( sal_False )
 {
     if( !pXPool )
     {
@@ -327,23 +328,17 @@ XPropertyList::XPropertyList( SvStream& /*rIn*/) :
 
 XPropertyList::~XPropertyList()
 {
-    XPropertyEntry* pEntry = (XPropertyEntry*)aList.First();
-    Bitmap* pBitmap = NULL;
-    for( sal_uIntPtr nIndex = 0; nIndex < aList.Count(); nIndex++ )
-    {
-        delete pEntry;
-        pEntry = (XPropertyEntry*)aList.Next();
+    for( size_t i = 0, n = aList.size(); i < n; ++i ) {
+        delete aList[ i ];
     }
+    aList.clear();
 
     if( pBmpList )
     {
-        pBitmap = (Bitmap*) pBmpList->First();
-
-        for( sal_uIntPtr nIndex = 0; nIndex < pBmpList->Count(); nIndex++ )
-        {
-            delete pBitmap;
-            pBitmap = (Bitmap*) pBmpList->Next();
+        for ( size_t i = 0, n = pBmpList->size(); i < n; ++i ) {
+            delete (*pBmpList)[ i ];
         }
+        pBmpList->clear();
         delete pBmpList;
         pBmpList = NULL;
     }
@@ -362,9 +357,17 @@ XPropertyList::~XPropertyList()
 
 void XPropertyList::Clear()
 {
-    aList.Clear();
+    for( size_t i = 0, n = aList.size(); i < n; ++i ) {
+        delete aList[ i ];
+    }
+    aList.clear();
     if( pBmpList )
-        pBmpList->Clear();
+    {
+        for ( size_t i = 0, n = pBmpList->size(); i < n; ++i ) {
+            delete (*pBmpList)[ i ];
+        }
+        pBmpList->clear();
+    }
 }
 
 /************************************************************************/
@@ -377,7 +380,7 @@ long XPropertyList::Count() const
         if( !( (XPropertyList*) this )->Load() )
             ( (XPropertyList*) this )->Create();
     }
-    return( aList.Count() );
+    return( aList.size() );
 }
 
 /*************************************************************************
@@ -394,7 +397,7 @@ XPropertyEntry* XPropertyList::Get( long nIndex, sal_uInt16 /*nDummy*/) const
         if( !( (XPropertyList*) this )->Load() )
             ( (XPropertyList*) this )->Create();
     }
-    return (XPropertyEntry*) aList.GetObject( (sal_uIntPtr) nIndex );
+    return ( (size_t)nIndex < aList.size() ) ? aList[ nIndex ] : NULL;
 }
 
 /*************************************************************************
@@ -411,15 +414,13 @@ long XPropertyList::Get(const XubString& rName)
         if( !Load() )
             Create();
     }
-    long nPos = 0;
-    XPropertyEntry* pEntry = (XPropertyEntry*)aList.First();
-    while (pEntry && pEntry->GetName() != rName)
-    {
-        nPos++;
-        pEntry = (XPropertyEntry*)aList.Next();
+
+    for( long i = 0, n = aList.size(); i < n; ++i ) {
+        if ( aList[ i ]->GetName() == rName ) {
+            return i;
+        }
     }
-    if (!pEntry) nPos = -1;
-    return nPos;
+    return -1;
 }
 
 /*************************************************************************
@@ -437,10 +438,10 @@ Bitmap* XPropertyList::GetBitmap( long nIndex ) const
             ( (XPropertyList*) this )->bBitmapsDirty = sal_False;
             ( (XPropertyList*) this )->CreateBitmapsForUI();
         }
-        if( pBmpList->Count() >= (sal_uIntPtr) nIndex )
-            return (Bitmap*) pBmpList->GetObject( (sal_uIntPtr) nIndex );
+        if( (size_t)nIndex < pBmpList->size() )
+            return (*pBmpList)[ nIndex ];
     }
-    return( NULL );
+    return NULL;
 }
 
 /*************************************************************************
@@ -451,13 +452,22 @@ Bitmap* XPropertyList::GetBitmap( long nIndex ) const
 
 void XPropertyList::Insert( XPropertyEntry* pEntry, long nIndex )
 {
-    aList.Insert( pEntry, (sal_uIntPtr) nIndex );
+    if ( (size_t)nIndex < aList.size() ) {
+        aList.insert( aList.begin() + nIndex, pEntry );
+    } else {
+        aList.push_back( pEntry );
+    }
 
     if( pBmpList && !bBitmapsDirty )
     {
         Bitmap* pBmp = CreateBitmapForUI(
-                (sal_uIntPtr) nIndex < aList.Count() ? nIndex : aList.Count() - 1 );
-        pBmpList->Insert( pBmp, (sal_uIntPtr) nIndex );
+            (size_t)nIndex < aList.size() ? nIndex : aList.size() - 1
+        );
+        if ( (size_t)nIndex < pBmpList->size() ) {
+            pBmpList->insert( pBmpList->begin() + nIndex, pBmp );
+        } else {
+            pBmpList->push_back( pBmp );
+        }
     }
 }
 
@@ -469,14 +479,22 @@ void XPropertyList::Insert( XPropertyEntry* pEntry, long nIndex )
 
 XPropertyEntry* XPropertyList::Replace( XPropertyEntry* pEntry, long nIndex )
 {
-    XPropertyEntry* pOldEntry = (XPropertyEntry*) aList.Replace( pEntry, (sal_uIntPtr) nIndex );
+    XPropertyEntry* pOldEntry = (size_t)nIndex < aList.size() ? aList[ nIndex ] : NULL;
+    if ( pOldEntry ) {
+        aList[ nIndex ] = pEntry;
+    }
 
     if( pBmpList && !bBitmapsDirty )
     {
         Bitmap* pBmp = CreateBitmapForUI( (sal_uIntPtr) nIndex );
-        Bitmap* pOldBmp = (Bitmap*) pBmpList->Replace( pBmp, (sal_uIntPtr) nIndex );
-        if( pOldBmp )
-            delete pOldBmp;
+        if ( (size_t)nIndex < pBmpList->size() )
+        {
+            delete (*pBmpList)[ nIndex ];
+            (*pBmpList)[ nIndex ] = pBmp;
+        }
+        else {
+            pBmpList->push_back( pBmp );
+        }
     }
     return pOldEntry;
 }
@@ -487,15 +505,23 @@ XPropertyEntry* XPropertyList::Replace( XPropertyEntry* pEntry, long nIndex )
 |*
 *************************************************************************/
 
-XPropertyEntry* XPropertyList::Remove( long nIndex, sal_uInt16 /*nDummy*/)
+XPropertyEntry* XPropertyList::Remove( long nIndex )
 {
     if( pBmpList && !bBitmapsDirty )
     {
-        Bitmap* pOldBmp = (Bitmap*) pBmpList->Remove( (sal_uIntPtr) nIndex );
-        if( pOldBmp )
-            delete pOldBmp;
+        if ( (size_t)nIndex < pBmpList->size() )
+        {
+            delete (*pBmpList)[ nIndex ];
+            pBmpList->erase( pBmpList->begin() + nIndex );
+        }
+    }
+
+    XPropertyEntry* pEntry = NULL;
+    if ( (size_t)nIndex < aList.size() ) {
+        pEntry = aList[ nIndex ];
+        aList.erase( aList.begin() + nIndex );
     }
-    return (XPropertyEntry*) aList.Remove( (sal_uIntPtr) nIndex );
+    return pEntry;
 }
 
 /************************************************************************/
diff --git a/svx/source/xoutdev/xtablend.cxx b/svx/source/xoutdev/xtablend.cxx
index 89818aaae434..dab030cc88bf 100644
--- a/svx/source/xoutdev/xtablend.cxx
+++ b/svx/source/xoutdev/xtablend.cxx
@@ -90,10 +90,13 @@ static char const aChckXML[]   = { '<', '?', 'x', 'm', 'l' };       // = 6.0
 |*
 *************************************************************************/
 
-XLineEndTable::XLineEndTable( const String& rPath,
-                            XOutdevItemPool* pInPool,
-                            sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
-                XPropertyTable( rPath, pInPool, nInitSize, nReSize)
+XLineEndTable::XLineEndTable(
+    const String& rPath,
+    XOutdevItemPool* pInPool,
+    sal_uInt16 nInitSize,
+    sal_uInt16 nReSize
+)
+    : XPropertyTable( rPath, pInPool, nInitSize, nReSize)
 {
     pBmpTable = new Table( nInitSize, nReSize );
 }
@@ -115,7 +118,7 @@ XLineEndEntry* XLineEndTable::Replace(long nIndex, XLineEndEntry* pEntry )
 
 XLineEndEntry* XLineEndTable::Remove(long nIndex)
 {
-    return (XLineEndEntry*) XPropertyTable::Remove(nIndex, 0);
+    return (XLineEndEntry*) XPropertyTable::Remove(nIndex);
 }
 
 /************************************************************************/
@@ -247,11 +250,14 @@ void XLineEndList::impDestroy()
     }
 }
 
-XLineEndList::XLineEndList(const String& rPath, XOutdevItemPool* _pXPool, sal_uInt16 nInitSize, sal_uInt16 nReSize)
-:   XPropertyList(rPath, _pXPool, nInitSize, nReSize),
-    mpData(0)
+XLineEndList::XLineEndList(
+    const String& rPath,
+    XOutdevItemPool* _pXPool
+)
+    : XPropertyList( rPath, _pXPool )
+    , mpData(0)
 {
-    pBmpList = new List(nInitSize, nReSize);
+    pBmpList = new BitmapList_impl();
 }
 
 XLineEndList::~XLineEndList()
@@ -266,7 +272,7 @@ XLineEndEntry* XLineEndList::Replace(XLineEndEntry* pEntry, long nIndex )
 
 XLineEndEntry* XLineEndList::Remove(long nIndex)
 {
-    return (XLineEndEntry*) XPropertyList::Remove(nIndex, 0);
+    return (XLineEndEntry*) XPropertyList::Remove(nIndex);
 }
 
 XLineEndEntry* XLineEndList::GetLineEnd(long nIndex) const
@@ -351,7 +357,13 @@ sal_Bool XLineEndList::CreateBitmapsForUI()
         OSL_ENSURE(0 != pBmp, "XLineEndList: Bitmap(UI) could not be created!" );
 
         if( pBmp )
-            pBmpList->Insert( pBmp, i );
+        {
+            if ( (size_t)i < pBmpList->size() ) {
+                pBmpList->insert( pBmpList->begin() + i, pBmp );
+            } else {
+                pBmpList->push_back( pBmp );
+            }
+        }
     }
 
     impDestroy();
diff --git a/svx/util/svx.component b/svx/util/svx.component
index 5907d69fef50..3e31d96db28a 100755
--- a/svx/util/svx.component
+++ b/svx/util/svx.component
@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="svx"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.Draw.GraphicExporter">
     <service name="com.sun.star.drawing.GraphicExportFilter"/>
diff --git a/svx/util/svx.dxp b/svx/util/svx.dxp
index f0e1c69934bc..70033078921a 100755
--- a/svx/util/svx.dxp
+++ b/svx/util/svx.dxp
@@ -1,2 +1 @@
-component_getImplementationEnvironment
 component_getFactory
diff --git a/svx/util/svxcore.component b/svx/util/svxcore.component
index d266e06188c1..3f6aeeb29d9f 100755
--- a/svx/util/svxcore.component
+++ b/svx/util/svxcore.component
@@ -25,7 +25,8 @@
 * for a copy of the LGPLv3 License.
 *
 **********************************************************************-->
-<component xmlns="http://openoffice.org/2010/uno-components" loader="com.sun.star.loader.SharedLibrary">
+<component loader="com.sun.star.loader.SharedLibrary" prefix="svxcore"
+    xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.svx.ExtrusionDepthController">
     <service name="com.sun.star.frame.PopupMenuController"/>
   </implementation>
diff --git a/svx/util/textconversiondlgs.component b/svx/util/textconversiondlgs.component
index 184743583645..ebac1d6b68e2 100755
--- a/svx/util/textconversiondlgs.component
+++ b/svx/util/textconversiondlgs.component
@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="textconversiondlgs"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.linguistic2.ChineseTranslationDialog">
     <service name="com.sun.star.linguistic2.ChineseTranslationDialog"/>
diff --git a/svx/workben/edittest.cxx b/svx/workben/edittest.cxx
index 3f92f9bedb82..966f56b594fa 100644
--- a/svx/workben/edittest.cxx
+++ b/svx/workben/edittest.cxx
@@ -39,7 +39,6 @@
 #include <svx/svxacorr.hxx>
 #include <tools/fsys.hxx>
 #include <svx/xpoly.hxx>
-#include <svtools/filedlg.hxx>
 
 #include <vcl/window.hxx>
 #include <vcl/svapp.hxx>