move some svx/ headers inside the module

Change-Id: I8d9a50039a8139caebb2cfb83ca476d39432f255
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88238
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

34 files changed, 0 insertions, 2398 deletions

diff --git a/include/svx/AffineMatrixItem.hxx b/include/svx/AffineMatrixItem.hxx
deleted file mode 100644
index 4c9f9cf06a6c..000000000000
--- a/include/svx/AffineMatrixItem.hxx
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_SVX_AFFINEMATRIXITEM_HXX
-#define INCLUDED_SVX_AFFINEMATRIXITEM_HXX
-
-#include <com/sun/star/geometry/AffineMatrix2D.hpp>
-#include <sal/types.h>
-#include <svl/poolitem.hxx>
-#include <svx/svxdllapi.h>
-
-class SfxItemPool;
-
-class AffineMatrixItem final : public SfxPoolItem
-{
-private:
-    css::geometry::AffineMatrix2D        maMatrix;
-
-public:
-    AffineMatrixItem(const css::geometry::AffineMatrix2D* pMatrix);
-    AffineMatrixItem(const AffineMatrixItem&);
-    virtual ~AffineMatrixItem() override;
-
-    virtual bool operator==(const SfxPoolItem&) const override;
-    virtual AffineMatrixItem* Clone( SfxItemPool* pPool = nullptr ) const override;
-
-    virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
-    virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
-};
-
-#endif // INCLUDED_SVX_AFFINEMATRIXITEM_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/CommonStylePreviewRenderer.hxx b/include/svx/CommonStylePreviewRenderer.hxx
deleted file mode 100644
index 5b742861134c..000000000000
--- a/include/svx/CommonStylePreviewRenderer.hxx
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#ifndef INCLUDED_SVX_COMMONSTYLEPREVIEWRENDERER_HXX
-#define INCLUDED_SVX_COMMONSTYLEPREVIEWRENDERER_HXX
-
-#include <memory>
-
-#include <sfx2/objsh.hxx>
-#include <sfx2/StylePreviewRenderer.hxx>
-#include <svx/svxdllapi.h>
-#include <rtl/ustring.hxx>
-#include <tools/color.hxx>
-#include <tools/gen.hxx>
-
-class OutputDevice;
-class SfxStyleSheetBase;
-class SvxFont;
-
-namespace svx
-{
-
-class CommonStylePreviewRenderer final : public sfx2::StylePreviewRenderer
-{
-    std::unique_ptr<SvxFont> m_pFont;
-    Color maFontColor;
-    Color maBackgroundColor;
-    Size maPixelSize;
-    OUString const maStyleName;
-
-public:
-    CommonStylePreviewRenderer(const SfxObjectShell& rShell, OutputDevice& rOutputDev,
-                               SfxStyleSheetBase* pStyle, long nMaxHeight);
-    virtual ~CommonStylePreviewRenderer() override;
-
-    virtual bool recalculate() override;
-    virtual Size getRenderSize() override;
-    virtual bool render(const tools::Rectangle& aRectangle, RenderAlign eRenderAlign = RenderAlign::CENTER) override;
-};
-
-} // end namespace svx
-
-#endif // INCLUDED_SVX_COMMONSTYLEPREVIEWRENDERER_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/DescriptionGenerator.hxx b/include/svx/DescriptionGenerator.hxx
deleted file mode 100644
index 7ee67c9104ff..000000000000
--- a/include/svx/DescriptionGenerator.hxx
+++ /dev/null
@@ -1,138 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-
-#ifndef INCLUDED_SVX_DESCRIPTIONGENERATOR_HXX
-#define INCLUDED_SVX_DESCRIPTIONGENERATOR_HXX
-
-#include <com/sun/star/uno/Reference.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <svx/svxdllapi.h>
-
-namespace com::sun::star::beans { class XPropertySet; }
-namespace com::sun::star::drawing { class XShape; }
-
-
-namespace accessibility {
-
-/** This class creates description strings for shapes.
-    <p>Initialized with a given shape additional calls to the
-    <member>addProperty</member> method will build a descriptive string that
-    starts with a general shape description and the shapes style.  Appended
-    are all the specified property names and values that differ from the
-    default values in the style.</p>
-*/
-class DescriptionGenerator
-{
-public:
-    enum class PropertyType {
-        Color,
-        Integer
-    };
-
-    /** Creates a new description generator with an empty description
-        string.  Usually you will want to call initialize next to specify
-        a general description of the shape.
-        @param xShape
-            The shape from which properties will be extracted by later calls
-            to <member>addProperty</member>.
-    */
-    DescriptionGenerator (const css::uno::Reference<
-        css::drawing::XShape>& xShape);
-
-    ~DescriptionGenerator();
-
-    /** Initialize the description with the given prefix followed by the
-        shape style in parentheses and a colon.
-        @param sPrefix
-            An introductory description of the shape that is made more
-            specific by later calls to <member>addProperty</member>.
-    */
-    void Initialize (const OUString& sPrefix);
-
-    /** Initialize the description with the specified string from the
-        resource followed by the shape style in parentheses and a colon.
-        @param pResourceId
-            A resource id the specifies the introductory description of the
-            shape that is made more specific by later calls to
-            <member>addProperty</member>.
-    */
-    void Initialize(const char* pResourceId);
-
-    /**  Returns the description string and then resets it.  Usually called
-         as last method before destroying the object.
-         @return
-             The description string in its current form.
-    */
-    OUString operator() (void);
-
-    /** Add the given property name and its associated value to the
-        description string.  If the property value does not differ from the
-        default value of the shape's style then the description string is
-        not modified.
-        @param sPropertyName
-            The Name of the property to append.
-        @param aType
-            Type of the property's value.  It controls the transformation
-            into the value's string representation.
-        @param sLocalizedName
-            Localized name of the property.  An empty string tells the
-            method to use the property name instead.
-    */
-    void AddProperty (const OUString& sPropertyName,
-        PropertyType aType);
-
-    /** Append the given string as is to the current description.
-        @param sString
-            String to append to the current description.  It is not modified
-            in any way.
-    */
-    void AppendString (const OUString& sString);
-
-private:
-    /// Reference to the shape from which the properties are extracted.
-    css::uno::Reference< css::drawing::XShape> mxShape;
-
-    /// Reference to the shape's property set.
-    css::uno::Reference< css::beans::XPropertySet> mxSet;
-
-    /// The description string that is build.
-    OUStringBuffer msDescription;
-
-    /** This flag is used to determine whether to insert a separator e.g. a
-        comma before the next property.
-    */
-    bool mbIsFirstProperty;
-
-    /** Add a property value formatted as color to the description string.
-    */
-    void AddColor (const OUString& sPropertyName);
-
-    /** Add a property value formatted as integer to the description string.
-    */
-    void AddInteger (const OUString& sPropertyName);
-};
-
-
-} // end of namespace accessibility
-
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/XPropertyTable.hxx b/include/svx/XPropertyTable.hxx
deleted file mode 100644
index 4bec7a94ba6c..000000000000
--- a/include/svx/XPropertyTable.hxx
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SVX_XPROPERTYTABLE_HXX
-#define INCLUDED_SVX_XPROPERTYTABLE_HXX
-
-#include <com/sun/star/uno/XInterface.hpp>
-#include <svx/xtable.hxx>
-
-// FIXME: should have a single factory method with an enumeration here [!]
-
-css::uno::Reference< css::uno::XInterface > SvxUnoXColorTable_createInstance( XPropertyList* pList ) throw();
-css::uno::Reference< css::uno::XInterface > SvxUnoXLineEndTable_createInstance( XPropertyList* pList ) throw();
-css::uno::Reference< css::uno::XInterface > SvxUnoXDashTable_createInstance( XPropertyList* pList ) throw();
-css::uno::Reference< css::uno::XInterface > SvxUnoXHatchTable_createInstance( XPropertyList* pList ) throw();
-css::uno::Reference< css::uno::XInterface > SvxUnoXGradientTable_createInstance( XPropertyList* pList ) throw();
-css::uno::Reference< css::uno::XInterface > SvxUnoXBitmapTable_createInstance( XPropertyList* pList ) throw();
-
-#endif
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/colrctrl.hxx b/include/svx/colrctrl.hxx
deleted file mode 100644
index de0fe888dd28..000000000000
--- a/include/svx/colrctrl.hxx
+++ /dev/null
@@ -1,113 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_SVX_COLRCTRL_HXX
-#define INCLUDED_SVX_COLRCTRL_HXX
-
-#include <sal/types.h>
-#include <sfx2/dockwin.hxx>
-#include <svl/lstner.hxx>
-#include <vcl/transfer.hxx>
-#include <svx/SvxColorValueSet.hxx>
-#include <svx/xtable.hxx>
-#include <tools/gen.hxx>
-#include <tools/link.hxx>
-#include <vcl/vclptr.hxx>
-
-namespace vcl { class Window; }
-
-class SfxBindings;
-class SfxBroadcaster;
-class SfxChildWindow;
-class SfxHint;
-
-/*************************************************************************
-|*
-|* SvxColorValueSet_docking
-|*
-\************************************************************************/
-
-class SAL_WARN_UNUSED SvxColorValueSet_docking final : public SvxColorValueSet, public DragSourceHelper
-{
-    bool            mbLeftButton;
-    Point           aDragPosPixel;
-
-    void            DoDrag();
-
-    // ValueSet
-    virtual void    MouseButtonDown( const MouseEvent& rMEvt ) override;
-    virtual void    MouseButtonUp( const MouseEvent& rMEvt ) override;
-
-    // DragSourceHelper
-    virtual void    StartDrag( sal_Int8 nAction, const Point& rPtPixel ) override;
-
-                    DECL_LINK(ExecDragHdl, void*, void);
-
-public:
-    SvxColorValueSet_docking( vcl::Window* pParent );
-
-    bool IsLeftButton() const { return mbLeftButton; }
-};
-
-/*************************************************************************
-|*
-|* SvxColorDockingWindow
-|*
-\************************************************************************/
-
-class SAL_WARN_UNUSED SvxColorDockingWindow final : public SfxDockingWindow, public SfxListener
-{
-friend class SvxColorChildWindow;
-
-private:
-    XColorListRef       pColorList;
-    VclPtr<SvxColorValueSet_docking> aColorSet;
-    sal_uInt16          nCols;
-    sal_uInt16          nLines;
-    long                nCount;
-    Size                aItemSize;
-
-    void                FillValueSet();
-    void                SetSize();
-       DECL_LINK( SelectHdl, ValueSet*, void );
-
-    /** This function is called when the window gets the focus.  It grabs
-        the focus to the color value set so that it can be controlled with
-        the keyboard.
-    */
-    virtual void GetFocus() override;
-
-    virtual bool    Close() override;
-    virtual void    Resize() override;
-    virtual void    Resizing( Size& rSize ) override;
-
-public:
-    SvxColorDockingWindow(SfxBindings* pBindings,
-                          SfxChildWindow *pCW,
-                          vcl::Window* pParent);
-    virtual ~SvxColorDockingWindow() override;
-    virtual void    dispose() override;
-
-    virtual void    Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
-
-    virtual bool    EventNotify( NotifyEvent& rNEvt ) override;
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/dbcharsethelper.hxx b/include/svx/dbcharsethelper.hxx
deleted file mode 100644
index 91d7aa5f6e1f..000000000000
--- a/include/svx/dbcharsethelper.hxx
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SVX_DBCHARSETHELPER_HXX
-#define INCLUDED_SVX_DBCHARSETHELPER_HXX
-
-#include <svx/svxdllapi.h>
-#include <rtl/textenc.h>
-
-#include <vector>
-
-namespace svxform { namespace charset_helper
-{
-
-    /** enumerates all supported charsets
-        @return the number of charsets supported
-    */
-    sal_Int32 getSupportedTextEncodings( ::std::vector< rtl_TextEncoding >& _rEncs );
-
-}
-}
-
-
-#endif // SVX_DBCHARSETCLIENT_HXX
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/extrud3d.hxx b/include/svx/extrud3d.hxx
deleted file mode 100644
index b66779957dc7..000000000000
--- a/include/svx/extrud3d.hxx
+++ /dev/null
@@ -1,116 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SVX_EXTRUD3D_HXX
-#define INCLUDED_SVX_EXTRUD3D_HXX
-
-#include <svl/intitem.hxx>
-#include <svl/itemset.hxx>
-#include <svx/obj3d.hxx>
-#include <svx/svxdllapi.h>
-#include <svx/svddef.hxx>
-#include <svx/svx3ditems.hxx>
-
-class E3dDefaultAttributes;
-
-/*************************************************************************
-|*
-|* 3D extrusion object created from the provided 2D polygon
-|*
-\************************************************************************/
-
-class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC E3dExtrudeObj final : public E3dCompoundObject
-{
-private:
-    // to allow sdr::properties::E3dExtrudeProperties access to SetGeometryValid()
-    friend class sdr::properties::E3dExtrudeProperties;
-
-    // geometry, which determines the object
-    basegfx::B2DPolyPolygon         maExtrudePolygon;
-
-    virtual std::unique_ptr<sdr::contact::ViewContact> CreateObjectSpecificViewContact() override;
-    virtual std::unique_ptr<sdr::properties::BaseProperties> CreateObjectSpecificProperties() override;
-    void SetDefaultAttributes(const E3dDefaultAttributes& rDefault);
-
-private:
-    // protected destructor - due to final, make private
-    virtual ~E3dExtrudeObj() override;
-
-public:
-    E3dExtrudeObj(
-        SdrModel& rSdrModel,
-        const E3dDefaultAttributes& rDefault,
-        const basegfx::B2DPolyPolygon& rPP,
-        double fDepth);
-    E3dExtrudeObj(SdrModel& rSdrModel);
-
-    // PercentDiagonal: 0..100, before 0.0..0.5
-    sal_uInt16 GetPercentDiagonal() const
-        { return GetObjectItemSet().Get(SDRATTR_3DOBJ_PERCENT_DIAGONAL).GetValue(); }
-
-    // BackScale: 0..100, before 0.0..1.0
-    sal_uInt16 GetPercentBackScale() const
-        { return GetObjectItemSet().Get(SDRATTR_3DOBJ_BACKSCALE).GetValue(); }
-
-    // BackScale: 0..100, before 0.0..1.0
-    sal_uInt32 GetExtrudeDepth() const
-        { return GetObjectItemSet().Get(SDRATTR_3DOBJ_DEPTH).GetValue(); }
-
-    // #107245# GetSmoothNormals() for bExtrudeSmoothed
-    bool GetSmoothNormals() const
-        { return GetObjectItemSet().Get(SDRATTR_3DOBJ_SMOOTH_NORMALS).GetValue(); }
-
-    // #107245# GetSmoothLids() for bExtrudeSmoothFrontBack
-    bool GetSmoothLids() const
-        { return GetObjectItemSet().Get(SDRATTR_3DOBJ_SMOOTH_LIDS).GetValue(); }
-
-    // #107245# GetCharacterMode() for bExtrudeCharacterMode
-    bool GetCharacterMode() const
-        { return GetObjectItemSet().Get(SDRATTR_3DOBJ_CHARACTER_MODE).GetValue(); }
-
-    // #107245# GetCloseFront() for bExtrudeCloseFront
-    bool GetCloseFront() const
-        { return GetObjectItemSet().Get(SDRATTR_3DOBJ_CLOSE_FRONT).GetValue(); }
-
-    // #107245# GetCloseBack() for bExtrudeCloseBack
-    bool GetCloseBack() const
-        { return GetObjectItemSet().Get(SDRATTR_3DOBJ_CLOSE_BACK).GetValue(); }
-
-    virtual sal_uInt16 GetObjIdentifier() const override;
-
-    virtual E3dExtrudeObj* CloneSdrObject(SdrModel& rTargetModel) const override;
-
-    // implemented mainly for the purposes of Clone()
-    E3dExtrudeObj& operator=(const E3dExtrudeObj& rObj);
-
-    // TakeObjName...() is for the display in the UI (for example "3 frames selected")
-    virtual OUString TakeObjNameSingul() const override;
-    virtual OUString TakeObjNamePlural() const override;
-
-    // set/get local parameters with geometry regeneration
-    void SetExtrudePolygon(const basegfx::B2DPolyPolygon &rNew);
-    const basegfx::B2DPolyPolygon &GetExtrudePolygon() const { return maExtrudePolygon; }
-
-    virtual bool IsBreakObjPossible() override;
-    virtual std::unique_ptr<SdrAttrObj,SdrObjectFreeOp> GetBreakObj() override;
-};
-
-#endif // INCLUDED_SVX_EXTRUD3D_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/polygn3d.hxx b/include/svx/polygn3d.hxx
deleted file mode 100644
index 0c6a7799d27a..000000000000
--- a/include/svx/polygn3d.hxx
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SVX_INC_POLYGN3D_HXX
-#define INCLUDED_SVX_INC_POLYGN3D_HXX
-
-#include <svx/obj3d.hxx>
-#include <svx/svxdllapi.h>
-
-class SVXCORE_DLLPUBLIC E3dPolygonObj final : public E3dCompoundObject
-{
-    // parameters
-    basegfx::B3DPolyPolygon aPolyPoly3D;
-    basegfx::B3DPolyPolygon aPolyNormals3D;
-    basegfx::B2DPolyPolygon aPolyTexture2D;
-    bool            bLineOnly;
-
-    SVX_DLLPRIVATE void CreateDefaultNormals();
-    SVX_DLLPRIVATE void CreateDefaultTexture();
-
-    virtual std::unique_ptr<sdr::contact::ViewContact> CreateObjectSpecificViewContact() override;
-
-    // protected destructor
-    virtual ~E3dPolygonObj() override;
-
-public:
-    void SetPolyPolygon3D(const basegfx::B3DPolyPolygon& rNewPolyPoly3D);
-    void SetPolyNormals3D(const basegfx::B3DPolyPolygon& rNewPolyPoly3D);
-    void SetPolyTexture2D(const basegfx::B2DPolyPolygon& rNewPolyPoly2D);
-
-    E3dPolygonObj(
-        SdrModel& rSdrModel,
-        const basegfx::B3DPolyPolygon& rPolyPoly3D);
-    E3dPolygonObj(SdrModel& rSdrModel);
-
-    const basegfx::B3DPolyPolygon& GetPolyPolygon3D() const { return aPolyPoly3D; }
-    const basegfx::B3DPolyPolygon& GetPolyNormals3D() const { return aPolyNormals3D; }
-    const basegfx::B2DPolyPolygon& GetPolyTexture2D() const { return aPolyTexture2D; }
-
-    virtual sal_uInt16 GetObjIdentifier() const override;
-    virtual SdrObjectUniquePtr DoConvertToPolyObj(bool bBezier, bool bAddText) const override;
-
-    virtual E3dPolygonObj* CloneSdrObject(SdrModel& rTargetModel) const override;
-
-    // implemented mainly for the purposes of Clone()
-    E3dPolygonObj& operator=(const E3dPolygonObj& rObj);
-
-    // LineOnly?
-    bool GetLineOnly() const { return bLineOnly; }
-    void SetLineOnly(bool bNew);
-};
-
-#endif // INCLUDED_SVX_INC_POLYGN3D_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdgcoitm.hxx b/include/svx/sdgcoitm.hxx
deleted file mode 100644
index 936d60bed35c..000000000000
--- a/include/svx/sdgcoitm.hxx
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SVX_SDGCOITM_HXX
-#define INCLUDED_SVX_SDGCOITM_HXX
-
-#include <svx/sdprcitm.hxx>
-#include <svx/svddef.hxx>
-#include <svx/svxdllapi.h>
-
-
-// SdrGrafRedItem -
-
-
-class SVXCORE_DLLPUBLIC SdrGrafRedItem : public SdrSignedPercentItem
-{
-public:
-
-
-                            SdrGrafRedItem( short nRedPercent = 0 ) : SdrSignedPercentItem( SDRATTR_GRAFRED, nRedPercent ) {}
-
-    virtual SdrGrafRedItem* Clone( SfxItemPool* pPool = nullptr ) const override;
-};
-
-
-// SdrGrafGreenItem -
-
-
-class SVXCORE_DLLPUBLIC SdrGrafGreenItem : public SdrSignedPercentItem
-{
-public:
-
-
-                            SdrGrafGreenItem( short nGreenPercent = 0 ) : SdrSignedPercentItem( SDRATTR_GRAFGREEN, nGreenPercent ) {}
-
-    virtual SdrGrafGreenItem* Clone( SfxItemPool* pPool = nullptr ) const override;
-};
-
-
-// SdrGrafBlueItem -
-
-
-class SVXCORE_DLLPUBLIC SdrGrafBlueItem : public SdrSignedPercentItem
-{
-public:
-
-
-                            SdrGrafBlueItem( short nBluePercent = 0 ) : SdrSignedPercentItem( SDRATTR_GRAFBLUE, nBluePercent ) {}
-
-    virtual SdrGrafBlueItem* Clone( SfxItemPool* pPool = nullptr ) const override;
-};
-
-#endif // INCLUDED_SVX_SDGCOITM_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdginitm.hxx b/include/svx/sdginitm.hxx
deleted file mode 100644
index 975c0b8c7be8..000000000000
--- a/include/svx/sdginitm.hxx
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SVX_SDGINITM_HXX
-#define INCLUDED_SVX_SDGINITM_HXX
-
-#include <svx/sdooitm.hxx>
-#include <svx/svddef.hxx>
-#include <svx/svxdllapi.h>
-
-
-// SdrGrafInvertItem -
-
-
-class SdrGrafInvertItem : public SdrOnOffItem
-{
-public:
-
-
-                            SdrGrafInvertItem( bool bInvert = false ) : SdrOnOffItem( SDRATTR_GRAFINVERT, bInvert ) {}
-
-    virtual SdrGrafInvertItem*    Clone( SfxItemPool* pPool = nullptr ) const override;
-};
-
-#endif // INCLUDED_SVX_SDGINITM_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdgtritm.hxx b/include/svx/sdgtritm.hxx
deleted file mode 100644
index 05f2f8eb5554..000000000000
--- a/include/svx/sdgtritm.hxx
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SVX_SDGTRITM_HXX
-#define INCLUDED_SVX_SDGTRITM_HXX
-
-#include <svx/sdprcitm.hxx>
-#include <svx/svddef.hxx>
-#include <svx/svxdllapi.h>
-
-
-// SdrGrafTransparenceItem -
-
-
-class SVXCORE_DLLPUBLIC SdrGrafTransparenceItem : public SdrPercentItem
-{
-public:
-
-                            SdrGrafTransparenceItem( sal_uInt16 nTransparencePercent = 0 ) : SdrPercentItem( SDRATTR_GRAFTRANSPARENCE, nTransparencePercent ) {}
-
-    virtual SdrGrafTransparenceItem*    Clone( SfxItemPool* pPool = nullptr ) const override;
-};
-
-#endif // INCLUDED_SVX_SDGTRITM_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/attribute/sdrformtextattribute.hxx b/include/svx/sdr/attribute/sdrformtextattribute.hxx
deleted file mode 100644
index 1260509b4234..000000000000
--- a/include/svx/sdr/attribute/sdrformtextattribute.hxx
+++ /dev/null
@@ -1,86 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SVX_SDR_ATTRIBUTE_SDRFORMTEXTATTRIBUTE_HXX
-#define INCLUDED_SVX_SDR_ATTRIBUTE_SDRFORMTEXTATTRIBUTE_HXX
-
-#include <sal/types.h>
-#include <svx/xenum.hxx>
-#include <tools/color.hxx>
-#include <o3tl/cow_wrapper.hxx>
-
-// predefines
-
-class SfxItemSet;
-
-namespace drawinglayer { namespace attribute {
-    class ImpSdrFormTextAttribute;
-    class SdrFormTextOutlineAttribute;
-}}
-
-
-namespace drawinglayer
-{
-    namespace attribute
-    {
-        class SdrFormTextAttribute
-        {
-        public:
-            typedef o3tl::cow_wrapper< ImpSdrFormTextAttribute > ImplType;
-
-        private:
-            ImplType mpSdrFormTextAttribute;
-
-        public:
-            /// constructors/assignmentoperator/destructor
-            SdrFormTextAttribute(const SfxItemSet& rSet);
-            SdrFormTextAttribute();
-            SdrFormTextAttribute(const SdrFormTextAttribute& rCandidate);
-            SdrFormTextAttribute(SdrFormTextAttribute&& rCandidate) noexcept;
-            SdrFormTextAttribute& operator=(const SdrFormTextAttribute& rCandidate);
-            SdrFormTextAttribute& operator=(SdrFormTextAttribute&& rCandidate) noexcept;
-            ~SdrFormTextAttribute();
-
-            // checks if the incarnation is default constructed
-            bool isDefault() const;
-
-            // compare operator
-            bool operator==(const SdrFormTextAttribute& rCandidate) const;
-
-            // data read access
-            sal_Int32 getFormTextDistance() const;
-            sal_Int32 getFormTextStart() const;
-            sal_Int32 getFormTextShdwXVal() const;
-            sal_Int32 getFormTextShdwYVal() const;
-            XFormTextStyle getFormTextStyle() const;
-            XFormTextAdjust getFormTextAdjust() const;
-            XFormTextShadow getFormTextShadow() const;
-            Color const & getFormTextShdwColor() const;
-            const SdrFormTextOutlineAttribute& getOutline() const;
-            const SdrFormTextOutlineAttribute& getShadowOutline() const;
-            bool getFormTextMirror() const;
-            bool getFormTextOutline() const;
-        };
-    } // end of namespace attribute
-} // end of namespace drawinglayer
-
-
-#endif // INCLUDED_SVX_SDR_ATTRIBUTE_SDRFORMTEXTATTRIBUTE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx b/include/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx
deleted file mode 100644
index 510b481d5922..000000000000
--- a/include/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SVX_SDR_ATTRIBUTE_SDRLINEFILLSHADOWTEXTATTRIBUTE_HXX
-#define INCLUDED_SVX_SDR_ATTRIBUTE_SDRLINEFILLSHADOWTEXTATTRIBUTE_HXX
-
-#include <svx/sdr/attribute/sdrlineshadowtextattribute.hxx>
-#include <drawinglayer/attribute/sdrfillattribute.hxx>
-#include <drawinglayer/attribute/fillgradientattribute.hxx>
-
-
-namespace drawinglayer
-{
-    namespace attribute
-    {
-        class SdrLineFillShadowTextAttribute : public SdrLineShadowTextAttribute
-        {
-            // add fill and transGradient attributes
-            SdrFillAttribute            maFill;                     // fill attributes (if used)
-            FillGradientAttribute       maFillFloatTransGradient;   // fill float transparence gradient (if used)
-
-        public:
-            SdrLineFillShadowTextAttribute(
-                const SdrLineAttribute& rLine,
-                const SdrFillAttribute& rFill,
-                const SdrLineStartEndAttribute& rLineStartEnd,
-                const SdrShadowAttribute& rShadow,
-                const FillGradientAttribute& rFillFloatTransGradient,
-                const SdrTextAttribute& rTextAttribute);
-            SdrLineFillShadowTextAttribute();
-            SdrLineFillShadowTextAttribute(const SdrLineFillShadowTextAttribute& rCandidate);
-            SdrLineFillShadowTextAttribute& operator=(const SdrLineFillShadowTextAttribute& rCandidate);
-
-            // checks if the incarnation is default constructed
-            bool isDefault() const;
-
-            // compare operator
-            bool operator==(const SdrLineFillShadowTextAttribute& rCandidate) const;
-
-            // data access
-            const SdrFillAttribute& getFill() const { return maFill; }
-            const FillGradientAttribute& getFillFloatTransGradient() const { return maFillFloatTransGradient; }
-        };
-    } // end of namespace attribute
-} // end of namespace drawinglayer
-
-
-#endif // INCLUDED_SVX_SDR_ATTRIBUTE_SDRLINEFILLSHADOWTEXTATTRIBUTE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/attribute/sdrlineshadowtextattribute.hxx b/include/svx/sdr/attribute/sdrlineshadowtextattribute.hxx
deleted file mode 100644
index c084013b59b9..000000000000
--- a/include/svx/sdr/attribute/sdrlineshadowtextattribute.hxx
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SVX_SDR_ATTRIBUTE_SDRLINESHADOWTEXTATTRIBUTE_HXX
-#define INCLUDED_SVX_SDR_ATTRIBUTE_SDRLINESHADOWTEXTATTRIBUTE_HXX
-
-#include <svx/sdr/attribute/sdrshadowtextattribute.hxx>
-#include <drawinglayer/attribute/sdrlineattribute.hxx>
-#include <drawinglayer/attribute/sdrlinestartendattribute.hxx>
-
-
-namespace drawinglayer
-{
-    namespace attribute
-    {
-        class SdrLineShadowTextAttribute : public SdrShadowTextAttribute
-        {
-            // line, shadow, lineStartEnd and text attributes
-            SdrLineAttribute                maLine;                     // line attributes (if used)
-            SdrLineStartEndAttribute        maLineStartEnd;             // line start end (if used)
-
-        public:
-            SdrLineShadowTextAttribute(
-                const SdrLineAttribute& rLine,
-                const SdrLineStartEndAttribute& rLineStartEnd,
-                const SdrShadowAttribute& rShadow,
-                const SdrTextAttribute& rTextAttribute);
-            SdrLineShadowTextAttribute();
-            SdrLineShadowTextAttribute(const SdrLineShadowTextAttribute& rCandidate);
-            SdrLineShadowTextAttribute& operator=(const SdrLineShadowTextAttribute& rCandidate);
-
-            // checks if the incarnation is default constructed
-            bool isDefault() const;
-
-            // compare operator
-            bool operator==(const SdrLineShadowTextAttribute& rCandidate) const;
-
-            // data access
-            const SdrLineAttribute& getLine() const { return maLine; }
-            const SdrLineStartEndAttribute& getLineStartEnd() const { return maLineStartEnd; }
-        };
-    } // end of namespace attribute
-} // end of namespace drawinglayer
-
-
-#endif // INCLUDED_SVX_SDR_ATTRIBUTE_SDRLINESHADOWTEXTATTRIBUTE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/attribute/sdrshadowtextattribute.hxx b/include/svx/sdr/attribute/sdrshadowtextattribute.hxx
deleted file mode 100644
index 9bac9712adf1..000000000000
--- a/include/svx/sdr/attribute/sdrshadowtextattribute.hxx
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SVX_SDR_ATTRIBUTE_SDRSHADOWTEXTATTRIBUTE_HXX
-#define INCLUDED_SVX_SDR_ATTRIBUTE_SDRSHADOWTEXTATTRIBUTE_HXX
-
-#include <drawinglayer/attribute/sdrshadowattribute.hxx>
-#include <svx/sdr/attribute/sdrtextattribute.hxx>
-
-
-namespace drawinglayer
-{
-    namespace attribute
-    {
-        class SdrShadowTextAttribute
-        {
-            // shadow and text attributes
-            SdrShadowAttribute          maShadow;                   // shadow attributes (if used)
-            SdrTextAttribute            maTextAttribute;            // text and text attributes (if used)
-
-        public:
-            SdrShadowTextAttribute(
-                const SdrShadowAttribute& rShadow,
-                const SdrTextAttribute& rTextAttribute);
-            SdrShadowTextAttribute();
-            SdrShadowTextAttribute(const SdrShadowTextAttribute& rCandidate);
-            SdrShadowTextAttribute& operator=(const SdrShadowTextAttribute& rCandidate);
-
-            // checks if the incarnation is default constructed
-            bool isDefault() const;
-
-            // compare operator
-            bool operator==(const SdrShadowTextAttribute& rCandidate) const;
-
-            // data access
-            const SdrShadowAttribute& getShadow() const { return maShadow; }
-            const SdrTextAttribute& getText() const { return maTextAttribute; }
-        };
-    } // end of namespace attribute
-} // end of namespace drawinglayer
-
-
-#endif // INCLUDED_SVX_SDR_ATTRIBUTE_SDRSHADOWTEXTATTRIBUTE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/attribute/sdrtextattribute.hxx b/include/svx/sdr/attribute/sdrtextattribute.hxx
deleted file mode 100644
index b81853ac637c..000000000000
--- a/include/svx/sdr/attribute/sdrtextattribute.hxx
+++ /dev/null
@@ -1,130 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SVX_SDR_ATTRIBUTE_SDRTEXTATTRIBUTE_HXX
-#define INCLUDED_SVX_SDR_ATTRIBUTE_SDRTEXTATTRIBUTE_HXX
-
-#include <sal/types.h>
-#include <svx/xenum.hxx>
-#include <editeng/outlobj.hxx>
-#include <svx/sdtaitm.hxx>
-#include <o3tl/cow_wrapper.hxx>
-
-// predefines
-
-class SdrText;
-
-namespace drawinglayer { namespace animation {
-    class AnimationEntryList;
-}}
-
-namespace drawinglayer { namespace attribute {
-    class SdrFormTextAttribute;
-}}
-
-namespace drawinglayer { namespace attribute {
-    class ImpSdrTextAttribute;
-}}
-
-
-namespace drawinglayer
-{
-    namespace attribute
-    {
-        class SdrTextAttribute
-        {
-        public:
-            typedef o3tl::cow_wrapper< ImpSdrTextAttribute > ImplType;
-
-        private:
-            ImplType mpSdrTextAttribute;
-
-        public:
-            /// constructors/assignmentoperator/destructor
-            SdrTextAttribute(
-                const SdrText& rSdrText,
-                const OutlinerParaObject& rOutlinerParaObject,
-                XFormTextStyle eFormTextStyle,
-                sal_Int32 aTextLeftDistance,
-                sal_Int32 aTextUpperDistance,
-                sal_Int32 aTextRightDistance,
-                sal_Int32 aTextLowerDistance,
-                SdrTextHorzAdjust aSdrTextHorzAdjust,
-                SdrTextVertAdjust aSdrTextVertAdjust,
-                bool bContour,
-                bool bFitToSize,
-                bool bAutoFit,
-                bool bHideContour,
-                bool bBlink,
-                bool bScroll,
-                bool bInEditMode,
-                bool bFixedCellHeight,
-                bool bWrongSpell,
-                bool bChainable);
-
-            SdrTextAttribute();
-            SdrTextAttribute(const SdrTextAttribute& rCandidate);
-            SdrTextAttribute(SdrTextAttribute&& rCandidate) noexcept;
-            SdrTextAttribute& operator=(const SdrTextAttribute& rCandidate);
-            SdrTextAttribute& operator=(SdrTextAttribute&& rCandidate) noexcept;
-            ~SdrTextAttribute();
-
-            // checks if the incarnation is default constructed
-            bool isDefault() const;
-
-            // compare operator
-            bool operator==(const SdrTextAttribute& rCandidate) const;
-
-            // data read access
-            const SdrText& getSdrText() const;
-            const OutlinerParaObject& getOutlinerParaObject() const;
-            bool isContour() const;
-            bool isFitToSize() const;
-            bool isAutoFit() const;
-            bool isHideContour() const;
-            bool isBlink() const;
-            bool isScroll() const;
-            bool isInEditMode() const;
-            bool isFixedCellHeight() const;
-            const SdrFormTextAttribute& getSdrFormTextAttribute() const;
-            sal_Int32 getTextLeftDistance() const;
-            sal_Int32 getTextUpperDistance() const;
-            sal_Int32 getTextRightDistance() const;
-            sal_Int32 getTextLowerDistance() const;
-            SdrTextHorzAdjust getSdrTextHorzAdjust() const;
-            SdrTextVertAdjust getSdrTextVertAdjust() const;
-
-            bool isChainable() const;
-
-
-            // helpers: animation timing generators
-            void getBlinkTextTiming(
-                drawinglayer::animation::AnimationEntryList& rAnimList) const;
-            void getScrollTextTiming(
-                drawinglayer::animation::AnimationEntryList& rAnimList,
-                double fFrameLength,
-                double fTextLength) const;
-        };
-    } // end of namespace attribute
-} // end of namespace drawinglayer
-
-
-#endif // INCLUDED_SVX_SDR_ATTRIBUTE_SDRTEXTATTRIBUTE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx
deleted file mode 100644
index a7124bade869..000000000000
--- a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx
+++ /dev/null
@@ -1,115 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SVX_SDR_CONTACT_OBJECTCONTACTOFOBJLISTPAINTER_HXX
-#define INCLUDED_SVX_SDR_CONTACT_OBJECTCONTACTOFOBJLISTPAINTER_HXX
-
-#include <svx/sdr/contact/objectcontact.hxx>
-#include <svx/svxdllapi.h>
-#include <svx/svdpage.hxx>
-#include <tools/weakbase.hxx>
-
-class SdrPage;
-class SdrObject;
-
-namespace sdr { namespace contact {
-
-class SVXCORE_DLLPUBLIC ObjectContactPainter : public ObjectContact
-{
-protected:
-    // Hierarchy access methods
-    virtual sal_uInt32 GetPaintObjectCount() const = 0;
-    virtual ViewContact& GetPaintObjectViewContact(sal_uInt32 nIndex) = 0;
-
-public:
-    // basic constructor/destructor
-    ObjectContactPainter();
-    virtual ~ObjectContactPainter() override;
-};
-
-// typedef for transferring SdrObject
-typedef ::std::vector< SdrObject* > SdrObjectVector;
-
-class SVXCORE_DLLPUBLIC ObjectContactOfObjListPainter final : public ObjectContactPainter
-{
-    // Target OutputDevice
-    OutputDevice&                                   mrTargetOutputDevice;
-
-    // Set StartPoint for next run, also given in constructor
-    SdrObjectVector                                 maStartObjects;
-
-    // the processed page which is the base e.g. for PageNumberFields
-    const SdrPage*                                  mpProcessedPage;
-
-    // Hierarchy access methods
-    virtual sal_uInt32 GetPaintObjectCount() const override;
-    virtual ViewContact& GetPaintObjectViewContact(sal_uInt32 nIndex) override;
-
-public:
-    // basic constructor/destructor
-    ObjectContactOfObjListPainter(
-        OutputDevice& rTargetDevice,
-        const SdrObjectVector& rObjects,
-        const SdrPage* pProcessedPage);
-    virtual ~ObjectContactOfObjListPainter() override;
-
-    // Process the whole displaying
-    virtual void ProcessDisplay(DisplayInfo& rDisplayInfo) override;
-
-    // recording MetaFile? Default is false
-    virtual bool isOutputToRecordingMetaFile() const override;
-
-    // pdf export? Default is false
-    virtual bool isOutputToPDFFile() const override;
-
-    virtual OutputDevice* TryToGetOutputDevice() const override;
-};
-
-class ObjectContactOfPagePainter : public ObjectContactPainter
-{
-    // the original ObjectContact this painter is working on
-    ObjectContact&                                  mrOriginalObjectContact;
-
-    // Set StartPoint for next run, also given in constructor
-    tools::WeakReference<SdrPage>                   mxStartPage;
-
-protected:
-    // Hierarchy access methods
-    virtual sal_uInt32 GetPaintObjectCount() const override;
-    virtual ViewContact& GetPaintObjectViewContact(sal_uInt32 nIndex) override;
-
-public:
-    // basic constructor
-    ObjectContactOfPagePainter(ObjectContact& rOriginalObjectContact);
-    virtual ~ObjectContactOfPagePainter() override;
-
-    // set another page
-    void SetStartPage(const SdrPage* pPage);
-    const SdrPage* GetStartPage() const { return mxStartPage.get(); }
-    SdrPage* GetStartPage() { return mxStartPage.get(); }
-
-    virtual OutputDevice* TryToGetOutputDevice() const override;
-};
-
-}}
-
-
-#endif // INCLUDED_SVX_SDR_CONTACT_OBJECTCONTACTOFOBJLISTPAINTER_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewcontactofe3d.hxx b/include/svx/sdr/contact/viewcontactofe3d.hxx
deleted file mode 100644
index d5931aeec66f..000000000000
--- a/include/svx/sdr/contact/viewcontactofe3d.hxx
+++ /dev/null
@@ -1,98 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3D_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3D_HXX
-
-#include <svx/obj3d.hxx>
-#include <svx/sdr/contact/viewcontactofsdrobj.hxx>
-#include <drawinglayer/primitive3d/baseprimitive3d.hxx>
-
-namespace drawinglayer { namespace attribute {
-    class SdrLineAttribute;
-}}
-
-namespace basegfx {
-    class BColor;
-    class B3DHomMatrix;
-}
-
-namespace sdr { namespace contact {
-
-class ViewContactOfE3dScene;
-
-class ViewContactOfE3d : public ViewContactOfSdrObj
-{
-protected:
-    // Create an Object-Specific ViewObjectContact, set ViewContact and
-    // ObjectContact. Always needs to return something.
-    virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) override;
-
-public:
-    // basic constructor, used from E3dObject.
-    explicit ViewContactOfE3d(E3dObject& rObj);
-    virtual ~ViewContactOfE3d() override;
-
-    // access to E3dObject
-    const E3dObject& GetE3dObject() const
-    {
-        return static_cast<const E3dObject&>(GetSdrObject());
-    }
-
-    // public helpers
-    drawinglayer::primitive2d::Primitive2DContainer impCreateWithGivenPrimitive3DContainer(
-        const drawinglayer::primitive3d::Primitive3DContainer& rxContent3D) const;
-
-
-    // primitive stuff
-
-    // Primitive3DContainer of the ViewContact. This contains all necessary information
-    // for the graphical visualisation and needs to be supported by all 3D VCs which
-    // can be visualized. It does NOT contain the object transformation to be able to
-    // buffer for all possible usages
-    drawinglayer::primitive3d::Primitive3DContainer              mxViewIndependentPrimitive3DContainer;
-
-protected:
-    // This method is responsible for creating the graphical visualisation data which is
-    // stored in mxViewIndependentPrimitive3DContainer, but without object transformation
-    virtual drawinglayer::primitive3d::Primitive3DContainer createViewIndependentPrimitive3DContainer() const = 0;
-
-    // This method is responsible for creating the graphical visualisation data derived ONLY from
-    // the model data. The default implementation will try to create a 3D to 2D embedding (will work
-    // when scene is known) which can then be used for 2D processing concerning ranges
-    virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override;
-
-public:
-    // access to the local primitive without the object's local 3D transform. This is e.g. needed
-    // to get the not-yet transformed BoundVolume for e.g. interactions
-    drawinglayer::primitive3d::Primitive3DContainer const & getVIP3DSWithoutObjectTransform() const;
-
-    // access to the local primitive. This will ensure that the list is
-    // current in comparing the local list content with a fresh created incarnation. It will
-    // use getVIP3DSWithoutObjectTransform and embed to 3d transform primitive when object's
-    // local 3d transform is used
-    drawinglayer::primitive3d::Primitive3DContainer getViewIndependentPrimitive3DContainer() const;
-};
-
-}}
-
-
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3D_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewcontactofpageobj.hxx b/include/svx/sdr/contact/viewcontactofpageobj.hxx
deleted file mode 100644
index a339f1bcecdd..000000000000
--- a/include/svx/sdr/contact/viewcontactofpageobj.hxx
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFPAGEOBJ_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFPAGEOBJ_HXX
-
-#include <svx/sdr/contact/viewcontactofsdrobj.hxx>
-#include <svx/svxdllapi.h>
-#include <svx/svdopage.hxx>
-
-class SdrPage;
-
-namespace sdr { namespace contact {
-
-class ViewContactOfPageObj final : public ViewContactOfSdrObj
-{
-    // Create an Object-Specific ViewObjectContact, set ViewContact and
-    // ObjectContact. Always needs to return something.
-    virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) override;
-
-    // create graphical visualisation data
-    virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override;
-public:
-    // basic constructor, used from SdrObject.
-    explicit ViewContactOfPageObj(SdrPageObj& rPageObj);
-    virtual ~ViewContactOfPageObj() override;
-
-    // #WIP# React on changes of the object of this ViewContact
-    virtual void ActionChanged() override;
-
-    // access to SdrObject
-    const SdrPageObj& GetPageObj() const
-    {
-        return static_cast<const SdrPageObj&>(GetSdrObject());
-    }
-};
-
-}}
-
-
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFPAGEOBJ_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx b/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx
deleted file mode 100644
index e067fce70bda..000000000000
--- a/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRRECTOBJ_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRRECTOBJ_HXX
-
-#include <svx/sdr/contact/viewcontactoftextobj.hxx>
-#include <svx/svdorect.hxx>
-
-namespace sdr { namespace contact {
-
-class ViewContactOfSdrRectObj : public ViewContactOfTextObj
-{
-protected:
-    // internal access to SdrRectObj
-    const SdrRectObj& GetRectObj() const
-    {
-        return static_cast<const SdrRectObj&>(GetSdrObject());
-    }
-
-public:
-    // basic constructor, used from SdrObject.
-    explicit ViewContactOfSdrRectObj(SdrRectObj& rTextObj);
-    virtual ~ViewContactOfSdrRectObj() override;
-
-protected:
-    // This method is responsible for creating the graphical visualisation data
-    // ONLY based on model data
-    virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override;
-};
-
-}}
-
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRRECTOBJ_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewcontactoftextobj.hxx b/include/svx/sdr/contact/viewcontactoftextobj.hxx
deleted file mode 100644
index a81c4893bea2..000000000000
--- a/include/svx/sdr/contact/viewcontactoftextobj.hxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFTEXTOBJ_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFTEXTOBJ_HXX
-
-#include <svx/sdr/contact/viewcontactofsdrobj.hxx>
-
-class SdrTextObj;
-
-namespace sdr { namespace contact {
-
-class ViewContactOfTextObj : public ViewContactOfSdrObj
-{
-public:
-    // basic constructor, used from SdrObject.
-    explicit ViewContactOfTextObj(SdrTextObj& rTextObj);
-    virtual ~ViewContactOfTextObj() override;
-};
-
-}}
-
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFTEXTOBJ_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx b/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx
deleted file mode 100644
index 4af2540c0fd6..000000000000
--- a/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFPAGEOBJ_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFPAGEOBJ_HXX
-
-#include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx>
-#include <memory>
-
-class SdrPage;
-
-namespace sdr { namespace contact {
-
-class PagePrimitiveExtractor;
-
-class ViewObjectContactOfPageObj final : public ViewObjectContactOfSdrObj
-{
-private:
-    // the page painter helper
-    std::unique_ptr<PagePrimitiveExtractor> mpExtractor;
-
-    // This method is responsible for creating the graphical visualisation data which is
-    // stored/cached in the local primitive.
-    // This method will not handle included hierarchies and not check geometric visibility.
-    virtual drawinglayer::primitive2d::Primitive2DContainer createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const override;
-
-public:
-    ViewObjectContactOfPageObj(ObjectContact& rObjectContact, ViewContact& rViewContact);
-    virtual ~ViewObjectContactOfPageObj() override;
-};
-
-}}
-
-
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFPAGEOBJ_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/overlay/overlayobjectcell.hxx b/include/svx/sdr/overlay/overlayobjectcell.hxx
deleted file mode 100644
index 050893ce907f..000000000000
--- a/include/svx/sdr/overlay/overlayobjectcell.hxx
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SVX_SDR_OVERLAY_OVERLAYOBJECTCELL_HXX
-#define INCLUDED_SVX_SDR_OVERLAY_OVERLAYOBJECTCELL_HXX
-
-#include <svx/sdr/overlay/overlayobject.hxx>
-
-#include <vector>
-
-
-namespace sdr
-{
-    namespace overlay
-    {
-        // OverlayObjectCell - used for cell cursor, selection and AutoFill handle
-
-        class OverlayObjectCell final : public OverlayObject
-        {
-        public:
-            typedef ::std::vector< basegfx::B2DRange > RangeVector;
-
-        private:
-            RangeVector     maRectangles;
-
-            // geometry creation for OverlayObject
-            virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override;
-
-        public:
-            OverlayObjectCell( const Color& rColor, const RangeVector& rRects);
-            virtual ~OverlayObjectCell() override;
-        };
-
-    } // end of namespace overlay
-} // end of namespace sdr
-
-
-#endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYOBJECTCELL_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/overlay/overlaytriangle.hxx b/include/svx/sdr/overlay/overlaytriangle.hxx
deleted file mode 100644
index a7fbe0cb6200..000000000000
--- a/include/svx/sdr/overlay/overlaytriangle.hxx
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SVX_SDR_OVERLAY_OVERLAYTRIANGLE_HXX
-#define INCLUDED_SVX_SDR_OVERLAY_OVERLAYTRIANGLE_HXX
-
-#include <svx/sdr/overlay/overlayobject.hxx>
-
-namespace sdr
-{
-    namespace overlay
-    {
-        class OverlayTriangle final : public OverlayObjectWithBasePosition
-        {
-            // second and third position in pixel
-            basegfx::B2DPoint const                       maSecondPosition;
-            basegfx::B2DPoint const                       maThirdPosition;
-
-            // geometry creation for OverlayObject
-            virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override;
-
-        public:
-            OverlayTriangle(
-                const basegfx::B2DPoint& rBasePos,
-                const basegfx::B2DPoint& rSecondPos,
-                const basegfx::B2DPoint& rThirdPos,
-                Color aTriangleColor);
-            virtual ~OverlayTriangle() override;
-        };
-    } // end of namespace overlay
-} // end of namespace sdr
-
-#endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYTRIANGLE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/primitive2d/sdrattributecreator.hxx b/include/svx/sdr/primitive2d/sdrattributecreator.hxx
deleted file mode 100644
index b26d516b239d..000000000000
--- a/include/svx/sdr/primitive2d/sdrattributecreator.hxx
+++ /dev/null
@@ -1,132 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SVX_SDR_PRIMITIVE2D_SDRATTRIBUTECREATOR_HXX
-#define INCLUDED_SVX_SDR_PRIMITIVE2D_SDRATTRIBUTECREATOR_HXX
-
-#include <sal/types.h>
-#include <svx/svxdllapi.h>
-
-
-// predefines
-class SfxItemSet;
-class SdrText;
-
-namespace drawinglayer { namespace attribute {
-    class SdrLineAttribute;
-    class SdrLineStartEndAttribute;
-    class SdrShadowAttribute;
-    class SdrFillAttribute;
-    class SdrTextAttribute;
-    class FillGradientAttribute;
-    class SdrFillGraphicAttribute;
-    class SdrShadowTextAttribute;
-    class SdrLineShadowTextAttribute;
-    class SdrLineFillShadowTextAttribute;
-    class SdrLineFillShadowAttribute3D;
-    class SdrSceneAttribute;
-    class SdrLightingAttribute;
-    class SdrFillTextAttribute;
-}}
-
-namespace basegfx {
-    class B2DRange;
-}
-
-
-namespace drawinglayer
-{
-    namespace primitive2d
-    {
-        // SdrAttribute creators
-        attribute::SdrLineAttribute SVXCORE_DLLPUBLIC createNewSdrLineAttribute(
-            const SfxItemSet& rSet);
-
-        attribute::SdrLineStartEndAttribute SVXCORE_DLLPUBLIC createNewSdrLineStartEndAttribute(
-            const SfxItemSet& rSet,
-            double fWidth);
-
-        attribute::SdrShadowAttribute createNewSdrShadowAttribute(
-            const SfxItemSet& rSet);
-
-        attribute::SdrFillAttribute SVXCORE_DLLPUBLIC createNewSdrFillAttribute(
-            const SfxItemSet& rSet);
-
-        // #i101508# Support handing over given text-to-border distances
-        attribute::SdrTextAttribute createNewSdrTextAttribute(
-            const SfxItemSet& rSet,
-            const SdrText& rText,
-            const sal_Int32* pLeft = nullptr,
-            const sal_Int32* pUpper = nullptr,
-            const sal_Int32* pRight = nullptr,
-            const sal_Int32* pLower = nullptr);
-
-        attribute::FillGradientAttribute SVXCORE_DLLPUBLIC createNewTransparenceGradientAttribute(
-            const SfxItemSet& rSet);
-
-        attribute::SdrFillGraphicAttribute createNewSdrFillGraphicAttribute(
-            const SfxItemSet& rSet);
-
-        attribute::SdrShadowTextAttribute createNewSdrShadowTextAttribute(
-            const SfxItemSet& rSet,
-            const SdrText* pText,
-            bool bSuppressText); // #i98072# added option to suppress text on demand
-
-        attribute::SdrLineShadowTextAttribute createNewSdrLineShadowTextAttribute(
-            const SfxItemSet& rSet,
-            const SdrText* pText);
-
-        attribute::SdrLineFillShadowTextAttribute createNewSdrLineFillShadowTextAttribute(
-            const SfxItemSet& rSet,
-            const SdrText* pText,
-            bool bHasContent); // used from OLE and graphic
-
-        attribute::SdrLineFillShadowAttribute3D createNewSdrLineFillShadowAttribute(
-            const SfxItemSet& rSet,
-            bool bSuppressFill);
-
-        attribute::SdrSceneAttribute createNewSdrSceneAttribute(
-            const SfxItemSet& rSet);
-
-        attribute::SdrLightingAttribute createNewSdrLightingAttribute(
-            const SfxItemSet& rSet);
-
-        // #i101508# Support handing over given text-to-border distances
-        attribute::SdrFillTextAttribute createNewSdrFillTextAttribute(
-            const SfxItemSet& rSet,
-            const SdrText* pSdrText,
-            const sal_Int32* pLeft = nullptr,
-            const sal_Int32* pUpper = nullptr,
-            const sal_Int32* pRight = nullptr,
-            const sal_Int32* pLower = nullptr);
-
-        // helpers
-        void calculateRelativeCornerRadius(
-            sal_Int32 nRadius,
-            const ::basegfx::B2DRange& rObjectRange,
-            double& rfCornerRadiusX,
-            double& rfCornerRadiusY);
-
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-
-#endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRATTRIBUTECREATOR_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx b/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx
deleted file mode 100644
index e8e538d8e4ed..000000000000
--- a/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx
+++ /dev/null
@@ -1,82 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SVX_SDR_PRIMITIVE2D_SDRDECOMPOSITIONTOOLS_HXX
-#define INCLUDED_SVX_SDR_PRIMITIVE2D_SDRDECOMPOSITIONTOOLS_HXX
-
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
-
-#include <svx/svxdllapi.h>
-
-// predefines
-namespace basegfx {
-    class B2DPolygon;
-    class B2DPolyPolygon;
-    class B2DHomMatrix;
-}
-
-namespace drawinglayer { namespace attribute {
-    class SdrFillAttribute;
-    class SdrLineAttribute;
-    class FillGradientAttribute;
-    class SdrShadowAttribute;
-    class SdrLineStartEndAttribute;
-    class SdrTextAttribute;
-}}
-
-
-namespace drawinglayer
-{
-    namespace primitive2d
-    {
-        Primitive2DReference SVXCORE_DLLPUBLIC createPolyPolygonFillPrimitive(
-            const basegfx::B2DPolyPolygon& rPolyPolygon,
-            const attribute::SdrFillAttribute& rFill,
-            const attribute::FillGradientAttribute& rFillGradient);
-
-        Primitive2DReference SVXCORE_DLLPUBLIC createPolyPolygonFillPrimitive(
-            const basegfx::B2DPolyPolygon& rPolyPolygon,
-            const basegfx::B2DRange& rDefinitionRange,
-            const attribute::SdrFillAttribute& rFill,
-            const attribute::FillGradientAttribute& rFillGradient);
-
-        Primitive2DReference SVXCORE_DLLPUBLIC createPolygonLinePrimitive(
-            const basegfx::B2DPolygon& rPolygon,
-            const attribute::SdrLineAttribute& rLine,
-            const attribute::SdrLineStartEndAttribute& rStroke);
-
-        Primitive2DReference SVXCORE_DLLPUBLIC createTextPrimitive(
-            const basegfx::B2DPolyPolygon& rUnitPolyPolygon,
-            const basegfx::B2DHomMatrix& rObjectTransform,
-            const attribute::SdrTextAttribute& rText,
-            const attribute::SdrLineAttribute& rStroke,
-            bool bCellText,
-            bool bWordWrap);
-
-        Primitive2DContainer SVXCORE_DLLPUBLIC createEmbeddedShadowPrimitive(
-            const Primitive2DContainer& rContent,
-            const attribute::SdrShadowAttribute& rShadow);
-
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-
-#endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRDECOMPOSITIONTOOLS_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sxcaitm.hxx b/include/svx/sxcaitm.hxx
deleted file mode 100644
index fc36d007604a..000000000000
--- a/include/svx/sxcaitm.hxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#pragma once
-
-#include <svx/svddef.hxx>
-
-#include <svx/sdangitm.hxx>
-
-// SDRATTR_CAPTIONFIXEDANGLE SdrOnOffItem:
-// sal_True=angle predefined by SdrCaptionAngleItem
-// sal_False=free angle
-
-// class SdrCaptionAngleItem
-// angle in 1/100 degree
-// only if Type2, Type3 and Type4
-// and only if SdrCaptionIsFixedAngleItem=TRUE
-
-class SdrCaptionAngleItem final : public SdrAngleItem {
-public:
-    SdrCaptionAngleItem(long nAngle=0): SdrAngleItem(SDRATTR_CAPTIONANGLE,nAngle) {}
-    virtual SdrCaptionAngleItem* Clone(SfxItemPool*) const override
-    {
-        return new SdrCaptionAngleItem(*this);
-    }
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sxfiitm.hxx b/include/svx/sxfiitm.hxx
deleted file mode 100644
index 20bd44b84ff3..000000000000
--- a/include/svx/sxfiitm.hxx
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_SVX_SXFIITM_HXX
-#define INCLUDED_SVX_SXFIITM_HXX
-
-#include <svl/poolitem.hxx>
-#include <tools/fract.hxx>
-
-/*************************************************************************/
-/* FractionItem                                                          */
-/*************************************************************************/
-
-class SdrFractionItem: public SfxPoolItem {
-    Fraction nValue;
-public:
-    SdrFractionItem(sal_uInt16 nId, const Fraction& rVal): SfxPoolItem(nId), nValue(rVal) {}
-    virtual bool             operator==(const SfxPoolItem&) const override;
-    virtual bool GetPresentation(SfxItemPresentation ePresentation, MapUnit eCoreMetric, MapUnit ePresentationMetric, OUString &rText, const IntlWrapper&) const override;
-    virtual SdrFractionItem* Clone(SfxItemPool *pPool=nullptr) const override;
-            const Fraction&  GetValue() const { return nValue; }
-};
-
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sxmfsitm.hxx b/include/svx/sxmfsitm.hxx
deleted file mode 100644
index 741ebc27e1d7..000000000000
--- a/include/svx/sxmfsitm.hxx
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_SVX_SXMFSITM_HXX
-#define INCLUDED_SVX_SXMFSITM_HXX
-
-#include <svx/svddef.hxx>
-#include <svl/stritem.hxx>
-
-// Format string (similar to Calc), e.g. "#.###,00km"
-// overwrites SdrMeasureUnitItem and SdrMeasureShowUnitItem
-class SdrMeasureFormatStringItem: public SfxStringItem {
-public:
-    SdrMeasureFormatStringItem()                   : SfxStringItem() { SetWhich(SDRATTR_MEASUREFORMATSTRING); }
-    virtual SdrMeasureFormatStringItem* Clone(SfxItemPool*) const override
-    {
-        return new SdrMeasureFormatStringItem(*this);
-    }
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sxsiitm.hxx b/include/svx/sxsiitm.hxx
deleted file mode 100644
index 38d2d58ab205..000000000000
--- a/include/svx/sxsiitm.hxx
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_SVX_SXSIITM_HXX
-#define INCLUDED_SVX_SXSIITM_HXX
-
-#include <svx/sxfiitm.hxx>
-
-class SdrScaleItem: public SdrFractionItem {
-public:
-    SdrScaleItem(sal_uInt16 nId, const Fraction& rVal): SdrFractionItem(nId,rVal) {}
-    virtual bool GetPresentation(SfxItemPresentation ePresentation, MapUnit eCoreMetric, MapUnit ePresentationMetric, OUString &rText, const IntlWrapper&) const override;
-    virtual SdrScaleItem* Clone(SfxItemPool *pPool=nullptr) const override;
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/textchain.hxx b/include/svx/textchain.hxx
deleted file mode 100644
index cba226c98ff2..000000000000
--- a/include/svx/textchain.hxx
+++ /dev/null
@@ -1,108 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SVX_TEXTCHAIN_HXX
-#define INCLUDED_SVX_TEXTCHAIN_HXX
-
-#include <editeng/editdata.hxx>
-#include <map>
-
-class ImpChainLinkProperties;
-class SdrTextObj;
-class SdrModel;
-
-namespace rtl {
-    class OUString;
-}
-
-typedef OUString ChainLinkId;
-
-enum class CursorChainingEvent
-{
-    TO_NEXT_LINK,
-    TO_PREV_LINK,
-    UNCHANGED,
-    NULL_EVENT
-};
-
-class ImpChainLinkProperties
-{
-protected:
-    friend class TextChain;
-
-    ImpChainLinkProperties() {
-        aNilChainingEvent = false;
-        aCursorEvent = CursorChainingEvent::NULL_EVENT;
-        aPreChainingSel = ESelection(0,0,0,0);
-        aPostChainingSel = ESelection(0,0,0,0);
-        aIsPartOfLastParaInNextLink = false; // XXX: Should come from file
-        aSwitchingToNextBox = false;
-    }
-
-private:
-    // NOTE: Remember to set default value in constructor when adding field
-    bool aNilChainingEvent;
-    CursorChainingEvent aCursorEvent;
-    ESelection aPreChainingSel;
-    ESelection aPostChainingSel;
-    bool aIsPartOfLastParaInNextLink;
-    bool aSwitchingToNextBox;
-};
-
-
-class TextChain
-{
-public:
-    ~TextChain();
-
-    ImpChainLinkProperties *GetLinkProperties(const SdrTextObj *);
-
-    // Specific Link Properties
-    CursorChainingEvent const & GetCursorEvent(const SdrTextObj *);
-    void SetCursorEvent(const SdrTextObj *, CursorChainingEvent const &);
-
-    bool GetNilChainingEvent(const SdrTextObj *);
-    void SetNilChainingEvent(const SdrTextObj *, bool);
-
-    ESelection const & GetPreChainingSel(const SdrTextObj *);
-    void SetPreChainingSel(const SdrTextObj *, ESelection const &);
-
-    ESelection const & GetPostChainingSel(const SdrTextObj *);
-    void SetPostChainingSel(const SdrTextObj *, ESelection const &);
-
-    // return whether a paragraph is split between this box and the next
-    bool GetIsPartOfLastParaInNextLink(const SdrTextObj *);
-    void SetIsPartOfLastParaInNextLink(const SdrTextObj *, bool );
-
-    // return whether we are currently moving the cursor to the next box (useful to know whether we should prevent SetOutlinerParaObject invocations in SdrTextObj::EndTextEdit)
-    bool GetSwitchingToNextBox(const SdrTextObj *);
-    void SetSwitchingToNextBox(const SdrTextObj *, bool);
-
-protected:
-    TextChain();
-
-private:
-    std::map< ChainLinkId, ImpChainLinkProperties *> maLinkPropertiesMap;
-
-    friend class SdrModel;
-};
-
-#endif // INCLUDED_SVX_TEXTCHAIN_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/textchaincursor.hxx b/include/svx/textchaincursor.hxx
deleted file mode 100644
index 562a24dbd8ec..000000000000
--- a/include/svx/textchaincursor.hxx
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SVX_TEXTCHAINCURSOR_HXX
-#define INCLUDED_SVX_TEXTCHAINCURSOR_HXX
-
-#include <svx/svxdllapi.h>
-
-class SdrObjEditView;
-class SdrTextObj;
-class KeyEvent;
-class SdrOutliner;
-enum class CursorChainingEvent;
-struct ESelection;
-
-
-class TextChainCursorManager
-{
-public:
-    TextChainCursorManager(SdrObjEditView *pEditView, const SdrTextObj *pTextObj);
-
-    bool HandleKeyEvent( const KeyEvent& rKEvt );
-
-    // Used by HandledKeyEvent and basic building block for handling cursor event
-    void HandleCursorEvent(const CursorChainingEvent aCurEvt,
-                           const ESelection& aNewSel);
-
-    // To be used after chaining event to deal with some nuisances
-    void  HandleCursorEventAfterChaining(const CursorChainingEvent aCurEvt,
-                                         const ESelection& aNewSel);
-
-private:
-    SdrObjEditView *mpEditView;
-    const SdrTextObj *mpTextObj;
-
-    // flag for handling of CANC which is kind of an exceptional case
-    bool mbHandlingDel;
-
-    void impChangeEditingTextObj(SdrTextObj *pTargetTextObj, ESelection aNewSel);
-    void impDetectEvent(const KeyEvent& rKEvt,
-                        CursorChainingEvent& rOutCursorEvt,
-                        ESelection& rOutSel,
-                        bool& rOutHandled);
-};
-
-
-#endif // INCLUDED_SVX_TEXTCHAINCURSOR_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-
diff --git a/include/svx/textchainflow.hxx b/include/svx/textchainflow.hxx
deleted file mode 100644
index 2c5f5d8c00a5..000000000000
--- a/include/svx/textchainflow.hxx
+++ /dev/null
@@ -1,107 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SVX_TEXTCHAINFLOW_HXX
-#define INCLUDED_SVX_TEXTCHAINFLOW_HXX
-
-#include <svx/textchain.hxx>
-#include <memory>
-
-class SdrTextObj;
-class SdrOutliner;
-class NonOverflowingText;
-class OverflowingText;
-class TextChain;
-class OutlinerParaObject;
-class OFlowChainedText;
-class UFlowChainedText;
-
-class TextChainFlow
-{
-public:
-    TextChainFlow(SdrTextObj *pChainTarget);
-    virtual ~TextChainFlow();
-
-    // Check for flow events in Outliner
-    virtual void CheckForFlowEvents(SdrOutliner *);
-
-    void ExecuteUnderflow(SdrOutliner *);
-
-    // Uses two outliners: one for the non-overflow text and one for overflowing (might be the same)
-    void ExecuteOverflow(SdrOutliner *, SdrOutliner *);
-
-    bool IsOverflow() const;
-    bool IsUnderflow() const;
-
-    SdrTextObj *GetLinkTarget() const;
-
-protected:
-    // Cursor related
-    bool mbPossiblyCursorOut;
-    ESelection maOverflowPosSel;
-    ESelection maPostChainingSel;
-
-    std::unique_ptr<OFlowChainedText> mpOverflChText;
-    std::unique_ptr<UFlowChainedText> mpUnderflChText;
-
-    void impCheckForFlowEvents(SdrOutliner *, SdrOutliner *);
-
-    TextChain *GetTextChain() const;
-
-    virtual void impLeaveOnlyNonOverflowingText(SdrOutliner *);
-    void impMoveChainedTextToNextLink(SdrOutliner *);
-
-    virtual void impSetFlowOutlinerParams(SdrOutliner *, SdrOutliner *);
-
-private:
-    bool mbOFisUFinduced;
-
-    void impUpdateCursorInfo();
-
-    SdrTextObj *mpTargetLink;
-    SdrTextObj *mpNextLink;
-
-    TextChain *mpTextChain;
-
-    bool bUnderflow;
-    bool bOverflow;
-};
-
-
-// NOTE: EditingTextChainFlow might be strongly coupled with behavior in SdrTextObj::onChainingEvent
-class EditingTextChainFlow : public TextChainFlow
-{
-public:
-    EditingTextChainFlow(SdrTextObj *);
-    virtual void CheckForFlowEvents(SdrOutliner *) override;
-
-    //virtual void ExecuteOverflow(SdrOutliner *, SdrOutliner *) override;
-
-protected:
-    virtual void impLeaveOnlyNonOverflowingText(SdrOutliner *) override;
-
-    virtual void impSetFlowOutlinerParams(SdrOutliner *, SdrOutliner *) override;
-
-private:
-    void impBroadcastCursorInfo() const;
-};
-
-#endif // INCLUDED_SVX_TEXTCHAINFLOW_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/xftshtit.hxx b/include/svx/xftshtit.hxx
deleted file mode 100644
index 2195386c7f49..000000000000
--- a/include/svx/xftshtit.hxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SVX_XFTSHTIT_HXX
-#define INCLUDED_SVX_XFTSHTIT_HXX
-
-#include <svl/intitem.hxx>
-
-/*************************************************************************
-|*
-|* FormText item for transparent shadow
-|*
-\************************************************************************/
-
-class XFormTextShadowTranspItem final : public SfxUInt16Item
-{
-public:
-                            XFormTextShadowTranspItem(sal_uInt16 nShdwTransparence = 0);
-    virtual XFormTextShadowTranspItem* Clone(SfxItemPool* pPool = nullptr) const override;
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */