Move headers included only in svx from include/svx/sdr/* to svx/inc/sdr/*

Change-Id: I084cbab30dfb0a7d567d1b172a79320687d20a06

67 files changed, 0 insertions, 5679 deletions

diff --git a/include/svx/sdr/attribute/sdrfilltextattribute.hxx b/include/svx/sdr/attribute/sdrfilltextattribute.hxx
deleted file mode 100644
index 1f398abdd65c..000000000000
--- a/include/svx/sdr/attribute/sdrfilltextattribute.hxx
+++ /dev/null
@@ -1,65 +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_SDRFILLTEXTATTRIBUTE_HXX
-#define INCLUDED_SVX_SDR_ATTRIBUTE_SDRFILLTEXTATTRIBUTE_HXX
-
-#include <sal/types.h>
-#include <drawinglayer/attribute/sdrfillattribute.hxx>
-#include <drawinglayer/attribute/fillgradientattribute.hxx>
-#include <svx/sdr/attribute/sdrtextattribute.hxx>
-
-
-
-namespace drawinglayer
-{
-    namespace attribute
-    {
-        class SdrFillTextAttribute
-        {
-            // shadow and text attributes
-            SdrFillAttribute            maFill;                     // fill attributes (if used)
-            FillGradientAttribute       maFillFloatTransGradient;   // fill float transparence gradient (if used)
-            SdrTextAttribute            maTextAttribute;            // text and text attributes (if used)
-
-        public:
-            SdrFillTextAttribute(
-                const SdrFillAttribute& rFill,
-                const FillGradientAttribute& rFillFloatTransGradient,
-                const SdrTextAttribute& rTextAttribute);
-            SdrFillTextAttribute();
-            SdrFillTextAttribute(const SdrFillTextAttribute& rCandidate);
-            SdrFillTextAttribute& operator=(const SdrFillTextAttribute& rCandidate);
-
-            // compare operator
-            bool operator==(const SdrFillTextAttribute& rCandidate) const;
-
-            // data access
-            const SdrFillAttribute& getFill() const { return maFill; }
-            const FillGradientAttribute& getFillFloatTransGradient() const { return maFillFloatTransGradient; }
-            const SdrTextAttribute& getText() const { return maTextAttribute; }
-        };
-    } // end of namespace attribute
-} // end of namespace drawinglayer
-
-
-
-#endif // INCLUDED_SVX_SDR_ATTRIBUTE_SDRFILLTEXTATTRIBUTE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/attribute/sdrformtextoutlineattribute.hxx b/include/svx/sdr/attribute/sdrformtextoutlineattribute.hxx
deleted file mode 100644
index 03b58180ceb1..000000000000
--- a/include/svx/sdr/attribute/sdrformtextoutlineattribute.hxx
+++ /dev/null
@@ -1,74 +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_SDRFORMTEXTOUTLINEATTRIBUTE_HXX
-#define INCLUDED_SVX_SDR_ATTRIBUTE_SDRFORMTEXTOUTLINEATTRIBUTE_HXX
-
-#include <sal/types.h>
-
-
-// predefines
-
-namespace drawinglayer { namespace attribute {
-    class ImpSdrFormTextOutlineAttribute;
-    class LineAttribute;
-    class StrokeAttribute;
-}}
-
-
-
-namespace drawinglayer
-{
-    namespace attribute
-    {
-        class SdrFormTextOutlineAttribute
-        {
-        private:
-            ImpSdrFormTextOutlineAttribute*     mpSdrFormTextOutlineAttribute;
-
-        public:
-            /// constructors/assignmentoperator/destructor
-            SdrFormTextOutlineAttribute(
-                const LineAttribute& rLineAttribute,
-                const StrokeAttribute& rStrokeAttribute,
-                sal_uInt8 nTransparence);
-            SdrFormTextOutlineAttribute();
-            SdrFormTextOutlineAttribute(const SdrFormTextOutlineAttribute& rCandidate);
-            SdrFormTextOutlineAttribute& operator=(const SdrFormTextOutlineAttribute& rCandidate);
-            ~SdrFormTextOutlineAttribute();
-
-            // checks if the incarnation is default constructed
-            bool isDefault() const;
-
-            // compare operator
-            bool operator==(const SdrFormTextOutlineAttribute& rCandidate) const;
-
-            // data read access
-            const LineAttribute& getLineAttribute() const;
-            const StrokeAttribute& getStrokeAttribute() const;
-            sal_uInt8 getTransparence() const;
-        };
-    } // end of namespace attribute
-} // end of namespace drawinglayer
-
-
-
-#endif // INCLUDED_SVX_SDR_ATTRIBUTE_SDRFORMTEXTOUTLINEATTRIBUTE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/objectcontactofpageview.hxx b/include/svx/sdr/contact/objectcontactofpageview.hxx
deleted file mode 100644
index 0b1bf34a384d..000000000000
--- a/include/svx/sdr/contact/objectcontactofpageview.hxx
+++ /dev/null
@@ -1,144 +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_OBJECTCONTACTOFPAGEVIEW_HXX
-#define INCLUDED_SVX_SDR_CONTACT_OBJECTCONTACTOFPAGEVIEW_HXX
-
-#include <svx/sdr/contact/objectcontact.hxx>
-
-
-// predeclarations
-
-class SdrPageWindow;
-class SdrPage;
-
-
-
-namespace sdr
-{
-    namespace contact
-    {
-        class ObjectContactOfPageView : public ObjectContact, public Timer
-        {
-        protected:
-            // the owner of this ObjectContactOfPageView. Set from constructor and not
-            // to be changed in any way.
-            SdrPageWindow&                                      mrPageWindow;
-
-            // Process the whole displaying, the real version
-            void DoProcessDisplay(DisplayInfo& rDisplayInfo);
-
-        public:
-            // access to SdrPageWindow
-            SdrPageWindow& GetPageWindow() const { return mrPageWindow; }
-
-            // access to SdrPage of PageView
-            SdrPage* GetSdrPage() const;
-
-            // basic constructor, used from SdrPageView.
-            explicit ObjectContactOfPageView(SdrPageWindow& rPageWindow);
-            virtual ~ObjectContactOfPageView();
-
-            // LazyInvalidate request. This is used from the VOCs to mark that they
-            // got invalidated by an ActionCanged() call. An active view needs to remember
-            // this and take action on it. Default implementation directly calls back
-            // triggerLazyInvalidate() which promptly handles the request
-            virtual void setLazyInvalidate(ViewObjectContact& rVOC) SAL_OVERRIDE;
-
-            // call this to support evtl. preparations for repaint
-            virtual void PrepareProcessDisplay() SAL_OVERRIDE;
-
-            // From baseclass Timer, the timeout call triggered by te LazyInvalidate mechanism
-            virtual void Timeout() SAL_OVERRIDE;
-
-            // Process the whole displaying
-            virtual void ProcessDisplay(DisplayInfo& rDisplayInfo) SAL_OVERRIDE;
-
-            // test if visualizing of entered groups is switched on at all
-            virtual bool DoVisualizeEnteredGroup() const SAL_OVERRIDE;
-
-            // get active group's (the entered group) ViewContact
-            virtual const ViewContact* getActiveViewContact() const SAL_OVERRIDE;
-
-            // Invalidate given rectangle at the window/output which is represented by
-            // this ObjectContact.
-            virtual void InvalidatePartOfView(const basegfx::B2DRange& rRange) const SAL_OVERRIDE;
-
-            // Get info if given Rectangle is visible in this view
-            virtual bool IsAreaVisible(const basegfx::B2DRange& rRange) const SAL_OVERRIDE;
-
-            // Get info about the need to visualize GluePoints. The default
-            // is that it is not necessary.
-            virtual bool AreGluePointsVisible() const SAL_OVERRIDE;
-
-            // check if text animation is allowed.
-            virtual bool IsTextAnimationAllowed() const SAL_OVERRIDE;
-
-            // check if graphic animation is allowed.
-            virtual bool IsGraphicAnimationAllowed() const SAL_OVERRIDE;
-
-            // check if asynchronious graphis loading is allowed. Default is sal_False.
-            virtual bool IsAsynchronGraphicsLoadingAllowed() const SAL_OVERRIDE;
-
-            // check if buffering of MasterPages is allowed. Default is sal_False.
-            virtual bool IsMasterPageBufferingAllowed() const SAL_OVERRIDE;
-
-            // print? Default is false
-            virtual bool isOutputToPrinter() const SAL_OVERRIDE;
-
-            // window? Default is true
-            virtual bool isOutputToWindow() const SAL_OVERRIDE;
-
-            // VirtualDevice? Default is false
-            virtual bool isOutputToVirtualDevice() const SAL_OVERRIDE;
-
-            // recording MetaFile? Default is false
-            virtual bool isOutputToRecordingMetaFile() const SAL_OVERRIDE;
-
-            // pdf export? Default is false
-            virtual bool isOutputToPDFFile() const SAL_OVERRIDE;
-
-            // gray display mode
-            virtual bool isDrawModeGray() const SAL_OVERRIDE;
-
-            // gray display mode
-            virtual bool isDrawModeBlackWhite() const SAL_OVERRIDE;
-
-            // high contrast display mode
-            virtual bool isDrawModeHighContrast() const SAL_OVERRIDE;
-
-            // overloaded access to SdrPageView
-            virtual SdrPageView* TryToGetSdrPageView() const SAL_OVERRIDE;
-
-            // access to OutputDevice. May return 0L like the default implementations do. Needs to be overloaded as needed.
-            virtual OutputDevice* TryToGetOutputDevice() const SAL_OVERRIDE;
-
-            /** sets all UNO controls which are associated with this ObjectContact to
-                design or alive mode.
-            */
-            void    SetUNOControlsDesignMode( bool _bDesignMode ) const;
-        };
-    } // end of namespace contact
-} // end of namespace sdr
-
-
-
-#endif // INCLUDED_SVX_SDR_CONTACT_OBJECTCONTACTOFPAGEVIEW_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewcontactofe3dcube.hxx b/include/svx/sdr/contact/viewcontactofe3dcube.hxx
deleted file mode 100644
index 323df6d10a00..000000000000
--- a/include/svx/sdr/contact/viewcontactofe3dcube.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_CONTACT_VIEWCONTACTOFE3DCUBE_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DCUBE_HXX
-
-#include <svx/sdr/contact/viewcontactofe3d.hxx>
-
-
-// predeclarations
-
-class E3dCubeObj;
-
-
-
-namespace sdr
-{
-    namespace contact
-    {
-        class ViewContactOfE3dCube : public ViewContactOfE3d
-        {
-        public:
-            // basic constructor, used from SdrObject.
-            ViewContactOfE3dCube(E3dCubeObj& rCubeObj);
-            virtual ~ViewContactOfE3dCube();
-
-            // access to SdrObject
-            E3dCubeObj& GetE3dCubeObj() const
-            {
-                return (E3dCubeObj&)GetE3dObject();
-            }
-
-        protected:
-            // This method is responsible for creating the graphical visualisation data which is
-            // stored in the local primitive list. Default creates a yellow replacement rectangle.
-            virtual drawinglayer::primitive3d::Primitive3DSequence createViewIndependentPrimitive3DSequence() const SAL_OVERRIDE;
-        };
-    } // end of namespace contact
-} // end of namespace sdr
-
-
-
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DCUBE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewcontactofe3dextrude.hxx b/include/svx/sdr/contact/viewcontactofe3dextrude.hxx
deleted file mode 100644
index 4e7647167a92..000000000000
--- a/include/svx/sdr/contact/viewcontactofe3dextrude.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_CONTACT_VIEWCONTACTOFE3DEXTRUDE_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DEXTRUDE_HXX
-
-#include <svx/sdr/contact/viewcontactofe3d.hxx>
-
-
-// predeclarations
-
-class E3dExtrudeObj;
-
-
-
-namespace sdr
-{
-    namespace contact
-    {
-        class ViewContactOfE3dExtrude : public ViewContactOfE3d
-        {
-        public:
-            // basic constructor, used from SdrObject.
-            explicit ViewContactOfE3dExtrude(E3dExtrudeObj& rExtrude);
-            virtual ~ViewContactOfE3dExtrude();
-
-            // access to SdrObject
-            E3dExtrudeObj& GetE3dExtrudeObj() const
-            {
-                return (E3dExtrudeObj&)GetE3dObject();
-            }
-
-        protected:
-            // This method is responsible for creating the graphical visualisation data which is
-            // stored in the local primitive list. Default creates a yellow replacement rectangle.
-            virtual drawinglayer::primitive3d::Primitive3DSequence createViewIndependentPrimitive3DSequence() const SAL_OVERRIDE;
-        };
-    } // end of namespace contact
-} // end of namespace sdr
-
-
-
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DEXTRUDE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewcontactofe3dlathe.hxx b/include/svx/sdr/contact/viewcontactofe3dlathe.hxx
deleted file mode 100644
index 572837f069e0..000000000000
--- a/include/svx/sdr/contact/viewcontactofe3dlathe.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_CONTACT_VIEWCONTACTOFE3DLATHE_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DLATHE_HXX
-
-#include <svx/sdr/contact/viewcontactofe3d.hxx>
-
-
-// predeclarations
-
-class E3dLatheObj;
-
-
-
-namespace sdr
-{
-    namespace contact
-    {
-        class ViewContactOfE3dLathe : public ViewContactOfE3d
-        {
-        public:
-            // basic constructor, used from SdrObject.
-            explicit ViewContactOfE3dLathe(E3dLatheObj& rLathe);
-            virtual ~ViewContactOfE3dLathe();
-
-            // access to SdrObject
-            E3dLatheObj& GetE3dLatheObj() const
-            {
-                return (E3dLatheObj&)GetE3dObject();
-            }
-
-        protected:
-            // This method is responsible for creating the graphical visualisation data which is
-            // stored in the local primitive list. Default creates a yellow replacement rectangle.
-            virtual drawinglayer::primitive3d::Primitive3DSequence createViewIndependentPrimitive3DSequence() const SAL_OVERRIDE;
-        };
-    } // end of namespace contact
-} // end of namespace sdr
-
-
-
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DLATHE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewcontactofe3dpolygon.hxx b/include/svx/sdr/contact/viewcontactofe3dpolygon.hxx
deleted file mode 100644
index e0ee21118602..000000000000
--- a/include/svx/sdr/contact/viewcontactofe3dpolygon.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_CONTACT_VIEWCONTACTOFE3DPOLYGON_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DPOLYGON_HXX
-
-#include <svx/sdr/contact/viewcontactofe3d.hxx>
-
-
-// predeclarations
-
-class E3dPolygonObj;
-
-
-
-namespace sdr
-{
-    namespace contact
-    {
-        class ViewContactOfE3dPolygon : public ViewContactOfE3d
-        {
-        public:
-            // basic constructor, used from SdrObject.
-            explicit ViewContactOfE3dPolygon(E3dPolygonObj& rPolygon);
-            virtual ~ViewContactOfE3dPolygon();
-
-            // access to SdrObject
-            E3dPolygonObj& GetE3dPolygonObj() const
-            {
-                return (E3dPolygonObj&)GetE3dObject();
-            }
-
-        protected:
-            // This method is responsible for creating the graphical visualisation data which is
-            // stored in the local primitive list. Default creates a yellow replacement rectangle.
-            virtual drawinglayer::primitive3d::Primitive3DSequence createViewIndependentPrimitive3DSequence() const SAL_OVERRIDE;
-        };
-    } // end of namespace contact
-} // end of namespace sdr
-
-
-
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DPOLYGON_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewcontactofe3dsphere.hxx b/include/svx/sdr/contact/viewcontactofe3dsphere.hxx
deleted file mode 100644
index 01e0d4204948..000000000000
--- a/include/svx/sdr/contact/viewcontactofe3dsphere.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_CONTACT_VIEWCONTACTOFE3DSPHERE_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DSPHERE_HXX
-
-#include <svx/sdr/contact/viewcontactofe3d.hxx>
-
-
-// predeclarations
-
-class E3dSphereObj;
-
-
-
-namespace sdr
-{
-    namespace contact
-    {
-        class ViewContactOfE3dSphere : public ViewContactOfE3d
-        {
-        public:
-            // basic constructor, used from SdrObject.
-            explicit ViewContactOfE3dSphere(E3dSphereObj& rSphere);
-            virtual ~ViewContactOfE3dSphere();
-
-            // access to SdrObject
-            E3dSphereObj& GetE3dSphereObj() const
-            {
-                return (E3dSphereObj&)GetE3dObject();
-            }
-
-        protected:
-            // This method is responsible for creating the graphical visualisation data which is
-            // stored in the local primitive list. Default creates a yellow replacement rectangle.
-            virtual drawinglayer::primitive3d::Primitive3DSequence createViewIndependentPrimitive3DSequence() const SAL_OVERRIDE;
-        };
-    } // end of namespace contact
-} // end of namespace sdr
-
-
-
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DSPHERE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewcontactofgraphic.hxx b/include/svx/sdr/contact/viewcontactofgraphic.hxx
deleted file mode 100644
index b6f25e0650b3..000000000000
--- a/include/svx/sdr/contact/viewcontactofgraphic.hxx
+++ /dev/null
@@ -1,85 +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_VIEWCONTACTOFGRAPHIC_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFGRAPHIC_HXX
-
-#include <sal/types.h>
-#include <svx/sdr/contact/viewcontactoftextobj.hxx>
-
-
-// predeclarations
-
-class SdrGrafObj;
-namespace drawinglayer { namespace attribute { class SdrLineFillShadowTextAttribute; }}
-class GraphicAttr;
-
-
-
-namespace sdr
-{
-    namespace contact
-    {
-        class ViewContactOfGraphic : public ViewContactOfTextObj
-        {
-        private:
-            // helpers for constructing various primitive visualisations in various states
-            drawinglayer::primitive2d::Primitive2DSequence createVIP2DSForPresObj(
-                const basegfx::B2DHomMatrix& rObjectMatrix,
-                const drawinglayer::attribute::SdrLineFillShadowTextAttribute& rAttribute) const;
-            drawinglayer::primitive2d::Primitive2DSequence createVIP2DSForDraft(
-                const basegfx::B2DHomMatrix& rObjectMatrix,
-                const drawinglayer::attribute::SdrLineFillShadowTextAttribute& rAttribute) const;
-
-        protected:
-            // Create a Object-Specific ViewObjectContact, set ViewContact and
-            // ObjectContact. Always needs to return something.
-            virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE;
-
-        public:
-            // access to SdrObject
-            SdrGrafObj& GetGrafObject() const
-            {
-                return ((SdrGrafObj&)GetSdrObject());
-            }
-
-            // basic constructor, destructor
-            explicit ViewContactOfGraphic(SdrGrafObj& rGrafObj);
-            virtual ~ViewContactOfGraphic();
-
-            // #i102380#
-            void flushGraphicObjects();
-
-            // helpers for viusualisation state
-            bool visualisationUsesPresObj() const;
-            bool visualisationUsesDraft() const;
-
-        protected:
-            // This method is responsible for creating the graphical visualisation data
-            // ONLY based on model data
-            virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE;
-        };
-    } // end of namespace contact
-} // end of namespace sdr
-
-
-
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFGRAPHIC_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewcontactofgroup.hxx b/include/svx/sdr/contact/viewcontactofgroup.hxx
deleted file mode 100644
index 4ed308ca4eb0..000000000000
--- a/include/svx/sdr/contact/viewcontactofgroup.hxx
+++ /dev/null
@@ -1,67 +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_VIEWCONTACTOFGROUP_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFGROUP_HXX
-
-#include <svx/sdr/contact/viewcontactofsdrobj.hxx>
-
-
-// predeclarations
-
-class SdrObjGroup;
-
-
-
-namespace sdr
-{
-    namespace contact
-    {
-        class ViewContactOfGroup : public ViewContactOfSdrObj
-        {
-        protected:
-            // Create a Object-Specific ViewObjectContact, set ViewContact and
-            // ObjectContact. Always needs to return something. Default is to create
-            // a standard ViewObjectContact containing the given ObjectContact and *this
-            virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE;
-
-            // internal access to SdrObject
-            SdrObjGroup& GetSdrObjGroup() const
-            {
-                return (SdrObjGroup&)GetSdrObject();
-            }
-
-        public:
-            // basic constructor, used from SdrObject.
-            explicit ViewContactOfGroup(SdrObjGroup& rGroup);
-            virtual ~ViewContactOfGroup();
-
-        protected:
-            // This method is responsible for creating the graphical visualisation data
-            // ONLY based on model data
-            virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE;
-        };
-    } // end of namespace contact
-} // end of namespace sdr
-
-
-
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFGROUP_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx b/include/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx
deleted file mode 100644
index e2f62c4b50e3..000000000000
--- a/include/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx
+++ /dev/null
@@ -1,77 +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_VIEWCONTACTOFMASTERPAGEDESCRIPTOR_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFMASTERPAGEDESCRIPTOR_HXX
-
-#include <sal/types.h>
-#include <svx/sdr/contact/viewcontact.hxx>
-#include <svx/sdrmasterpagedescriptor.hxx>
-
-
-// predeclarations
-class SfxItemSet;
-class Bitmap;
-class MapMode;
-
-
-
-namespace sdr
-{
-    namespace contact
-    {
-        class ViewContactOfMasterPageDescriptor : public ViewContact
-        {
-        protected:
-            // the owner of this ViewContact. Set from constructor and not
-            // to be changed in any way.
-            sdr::MasterPageDescriptor&                      mrMasterPageDescriptor;
-
-            // Create a Object-Specific ViewObjectContact
-            virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE;
-
-            // This method is responsible for creating the graphical visualisation data
-            virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE;
-
-        public:
-            // basic constructor
-            explicit ViewContactOfMasterPageDescriptor(sdr::MasterPageDescriptor& rDescriptor);
-
-            // The destructor.
-            virtual ~ViewContactOfMasterPageDescriptor();
-
-            // access to MasterPageDescriptor
-            sdr::MasterPageDescriptor& GetMasterPageDescriptor() const
-            {
-                return mrMasterPageDescriptor;
-            }
-
-            // Access to possible sub-hierarchy and parent
-            virtual sal_uInt32 GetObjectCount() const SAL_OVERRIDE;
-            virtual ViewContact& GetViewContact(sal_uInt32 nIndex) const SAL_OVERRIDE;
-            virtual ViewContact* GetParentContact() const SAL_OVERRIDE;
-        };
-    } // end of namespace contact
-} // end of namespace sdr
-
-
-
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFMASTERPAGEDESCRIPTOR_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewcontactofopenglobj.hxx b/include/svx/sdr/contact/viewcontactofopenglobj.hxx
deleted file mode 100644
index aceb6e80da24..000000000000
--- a/include/svx/sdr/contact/viewcontactofopenglobj.hxx
+++ /dev/null
@@ -1,37 +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_SDR_CONTACT_VIEWCONTACTOFOPENGLOBJ_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFOPENGLOBJ_HXX
-
-#include <svx/sdr/contact/viewcontactofsdrobj.hxx>
-
-class SdrOpenGLObj;
-
-namespace sdr {
-namespace contact {
-
-class ViewContactOfOpenGLObj : public ViewContactOfSdrObj
-{
-public:
-    explicit ViewContactOfOpenGLObj(SdrOpenGLObj& rOpenGLObj);
-    virtual ~ViewContactOfOpenGLObj();
-
-protected:
-    virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE;
-
-    virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE;
-};
-
-} // namespace contact
-} // namespace sdr
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx b/include/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx
deleted file mode 100644
index d201b8957fb5..000000000000
--- a/include/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx
+++ /dev/null
@@ -1,62 +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_VIEWCONTACTOFSDRCAPTIONOBJ_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRCAPTIONOBJ_HXX
-
-#include <svx/sdr/contact/viewcontactofsdrrectobj.hxx>
-
-
-// predeclarations
-
-class SdrCaptionObj;
-
-
-
-namespace sdr
-{
-    namespace contact
-    {
-        class ViewContactOfSdrCaptionObj : public ViewContactOfSdrRectObj
-        {
-        protected:
-            // internal access to SdrCaptionObj
-            SdrCaptionObj& GetCaptionObj() const
-            {
-                return (SdrCaptionObj&)GetSdrObject();
-            }
-
-        public:
-            // basic constructor, used from SdrObject.
-            explicit ViewContactOfSdrCaptionObj(SdrCaptionObj& rCaptionObj);
-            virtual ~ViewContactOfSdrCaptionObj();
-
-        protected:
-            // This method is responsible for creating the graphical visualisation data
-            // ONLY based on model data
-            virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE;
-        };
-    } // end of namespace contact
-} // end of namespace sdr
-
-
-
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRCAPTIONOBJ_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewcontactofsdrcircobj.hxx b/include/svx/sdr/contact/viewcontactofsdrcircobj.hxx
deleted file mode 100644
index 919b438436e6..000000000000
--- a/include/svx/sdr/contact/viewcontactofsdrcircobj.hxx
+++ /dev/null
@@ -1,62 +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_VIEWCONTACTOFSDRCIRCOBJ_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRCIRCOBJ_HXX
-
-#include <svx/sdr/contact/viewcontactofsdrrectobj.hxx>
-
-
-// predeclarations
-
-class SdrCircObj;
-
-
-
-namespace sdr
-{
-    namespace contact
-    {
-        class ViewContactOfSdrCircObj : public ViewContactOfSdrRectObj
-        {
-        protected:
-            // internal access to SdrCircObj
-            SdrCircObj& GetCircObj() const
-            {
-                return (SdrCircObj&)GetSdrObject();
-            }
-
-        public:
-            // basic constructor, used from SdrObject.
-            explicit ViewContactOfSdrCircObj(SdrCircObj& rCircObj);
-            virtual ~ViewContactOfSdrCircObj();
-
-        protected:
-            // This method is responsible for creating the graphical visualisation data
-            // ONLY based on model data
-            virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE;
-        };
-    } // end of namespace contact
-} // end of namespace sdr
-
-
-
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRCIRCOBJ_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewcontactofsdredgeobj.hxx b/include/svx/sdr/contact/viewcontactofsdredgeobj.hxx
deleted file mode 100644
index 496f34a99450..000000000000
--- a/include/svx/sdr/contact/viewcontactofsdredgeobj.hxx
+++ /dev/null
@@ -1,62 +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_VIEWCONTACTOFSDREDGEOBJ_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDREDGEOBJ_HXX
-
-#include <svx/sdr/contact/viewcontactoftextobj.hxx>
-
-
-// predeclarations
-
-class SdrEdgeObj;
-
-
-
-namespace sdr
-{
-    namespace contact
-    {
-        class ViewContactOfSdrEdgeObj : public ViewContactOfTextObj
-        {
-        protected:
-            // internal access to SdrEdgeObj
-            SdrEdgeObj& GetEdgeObj() const
-            {
-                return (SdrEdgeObj&)GetSdrObject();
-            }
-
-        public:
-            // basic constructor, used from SdrObject.
-            explicit ViewContactOfSdrEdgeObj(SdrEdgeObj& rEdgeObj);
-            virtual ~ViewContactOfSdrEdgeObj();
-
-        protected:
-            // This method is responsible for creating the graphical visualisation data
-            // ONLY based on model data
-            virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE;
-        };
-    } // end of namespace contact
-} // end of namespace sdr
-
-
-
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDREDGEOBJ_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx b/include/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx
deleted file mode 100644
index 4981e1970945..000000000000
--- a/include/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx
+++ /dev/null
@@ -1,62 +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_VIEWCONTACTOFSDRMEASUREOBJ_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRMEASUREOBJ_HXX
-
-#include <svx/sdr/contact/viewcontactoftextobj.hxx>
-
-
-// predeclarations
-
-class SdrMeasureObj;
-
-
-
-namespace sdr
-{
-    namespace contact
-    {
-        class ViewContactOfSdrMeasureObj : public ViewContactOfTextObj
-        {
-        protected:
-            // internal access to SdrMeasureObj
-            SdrMeasureObj& GetMeasureObj() const
-            {
-                return (SdrMeasureObj&)GetSdrObject();
-            }
-
-        public:
-            // basic constructor, used from SdrObject.
-            explicit ViewContactOfSdrMeasureObj(SdrMeasureObj& rMeasureObj);
-            virtual ~ViewContactOfSdrMeasureObj();
-
-        protected:
-            // This method is responsible for creating the graphical visualisation data
-            // ONLY based on model data
-            virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE;
-        };
-    } // end of namespace contact
-} // end of namespace sdr
-
-
-
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRMEASUREOBJ_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx b/include/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx
deleted file mode 100644
index 60142ff65db7..000000000000
--- a/include/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx
+++ /dev/null
@@ -1,65 +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_VIEWCONTACTOFSDROBJCUSTOMSHAPE_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDROBJCUSTOMSHAPE_HXX
-
-#include <svx/sdr/contact/viewcontactoftextobj.hxx>
-
-
-// predeclarations
-
-class SdrObjCustomShape;
-
-
-
-namespace sdr
-{
-    namespace contact
-    {
-        class ViewContactOfSdrObjCustomShape : public ViewContactOfTextObj
-        {
-        protected:
-            // internal access to SdrObjCustomShape
-            SdrObjCustomShape& GetCustomShapeObj() const
-            {
-                return (SdrObjCustomShape&)GetSdrObject();
-            }
-
-            // #i101684# internal tooling
-            basegfx::B2DRange getCorrectedTextBoundRect() const;
-
-        public:
-            // basic constructor, used from SdrObject.
-            explicit ViewContactOfSdrObjCustomShape(SdrObjCustomShape& rCustomShape);
-            virtual ~ViewContactOfSdrObjCustomShape();
-
-        protected:
-            // This method is responsible for creating the graphical visualisation data
-            // ONLY based on model data
-            virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE;
-        };
-    } // end of namespace contact
-} // end of namespace sdr
-
-
-
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDROBJCUSTOMSHAPE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewcontactofsdrole2obj.hxx b/include/svx/sdr/contact/viewcontactofsdrole2obj.hxx
deleted file mode 100644
index cd8e2903dec8..000000000000
--- a/include/svx/sdr/contact/viewcontactofsdrole2obj.hxx
+++ /dev/null
@@ -1,84 +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_VIEWCONTACTOFSDROLE2OBJ_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDROLE2OBJ_HXX
-
-#include <svx/sdr/contact/viewcontactofsdrrectobj.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>
-
-
-// predeclarations
-
-class SdrOle2Obj;
-class Graphic;
-
-
-
-namespace sdr
-{
-    namespace contact
-    {
-        class ViewContactOfSdrOle2Obj : public ViewContactOfSdrRectObj
-        {
-        private:
-            // #i123539# allow local buffering of chart data (if chart)
-            drawinglayer::primitive2d::Primitive2DReference mxChartContent;
-
-        protected:
-            // Create a Object-Specific ViewObjectContact, set ViewContact and
-            // ObjectContact. Always needs to return something.
-            virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE;
-
-        public:
-            // access to SdrOle2Obj
-            SdrOle2Obj& GetOle2Obj() const
-            {
-                return (SdrOle2Obj&)GetSdrObject();
-            }
-
-            /// helper to create transformation from SdrObject
-            basegfx::B2DHomMatrix createObjectTransform() const;
-
-            // basic constructor, used from SdrObject.
-            explicit ViewContactOfSdrOle2Obj(SdrOle2Obj& rOle2Obj);
-            virtual ~ViewContactOfSdrOle2Obj();
-
-            // helper for creating a OLE sequence for this object. It takes care od attributes, needed
-            // scaling (e.g. for EmptyPresObj's), the correct graphic and other stuff. It is used from
-            // createViewIndependentPrimitive2DSequence with false, and with evtl. HighContrast true
-            // from the VOC which knows that
-            drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceWithParameters() const;
-
-            // #i123539# get rid of buffered chart content (if there) on change
-            virtual void ActionChanged() SAL_OVERRIDE;
-
-        protected:
-            // This method is responsible for creating the graphical visualisation data
-            // ONLY based on model data, just wraps to call createPrimitive2DSequenceWithParameters(false)
-            virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE;
-        };
-    } // end of namespace contact
-} // end of namespace sdr
-
-
-
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDROLE2OBJ_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewcontactofsdrpage.hxx b/include/svx/sdr/contact/viewcontactofsdrpage.hxx
deleted file mode 100644
index 3be8aec6952b..000000000000
--- a/include/svx/sdr/contact/viewcontactofsdrpage.hxx
+++ /dev/null
@@ -1,303 +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_VIEWCONTACTOFSDRPAGE_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRPAGE_HXX
-
-#include <sal/types.h>
-#include <svx/sdr/contact/viewcontact.hxx>
-
-
-// predeclarations
-class SdrPage;
-
-namespace sdr { namespace contact {
-    class ViewContactOfSdrPage;
-}}
-
-
-
-namespace sdr
-{
-    namespace contact
-    {
-        class ViewContactOfPageSubObject : public ViewContact
-        {
-        protected:
-            ViewContactOfSdrPage&                       mrParentViewContactOfSdrPage;
-
-        public:
-            explicit ViewContactOfPageSubObject(ViewContactOfSdrPage& rParentViewContactOfSdrPage);
-            virtual ~ViewContactOfPageSubObject();
-
-            virtual ViewContact* GetParentContact() const SAL_OVERRIDE;
-            const SdrPage& getPage() const;
-        };
-    } // end of namespace contact
-} // end of namespace sdr
-
-
-
-namespace sdr
-{
-    namespace contact
-    {
-        class ViewContactOfPageBackground : public ViewContactOfPageSubObject
-        {
-        protected:
-            virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE;
-            virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE;
-
-        public:
-            explicit ViewContactOfPageBackground(ViewContactOfSdrPage& rParentViewContactOfSdrPage);
-            virtual ~ViewContactOfPageBackground();
-        };
-    } // end of namespace contact
-} // end of namespace sdr
-
-
-
-namespace sdr
-{
-    namespace contact
-    {
-        class ViewContactOfPageShadow : public ViewContactOfPageSubObject
-        {
-        protected:
-            virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE;
-            virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE;
-
-        public:
-            explicit ViewContactOfPageShadow(ViewContactOfSdrPage& rParentViewContactOfSdrPage);
-            virtual ~ViewContactOfPageShadow();
-        };
-    } // end of namespace contact
-} // end of namespace sdr
-
-
-
-namespace sdr
-{
-    namespace contact
-    {
-        class ViewContactOfPageFill : public ViewContactOfPageSubObject
-        {
-        protected:
-            virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE;
-            virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE;
-
-        public:
-            explicit ViewContactOfPageFill(ViewContactOfSdrPage& rParentViewContactOfSdrPage);
-            virtual ~ViewContactOfPageFill();
-        };
-    } // end of namespace contact
-} // end of namespace sdr
-
-
-
-namespace sdr
-{
-    namespace contact
-    {
-        class ViewContactOfMasterPage : public ViewContactOfPageSubObject
-        {
-        protected:
-            virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE;
-            virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE;
-
-        public:
-            explicit ViewContactOfMasterPage(ViewContactOfSdrPage& rParentViewContactOfSdrPage);
-            virtual ~ViewContactOfMasterPage();
-        };
-    } // end of namespace contact
-} // end of namespace sdr
-
-
-
-namespace sdr
-{
-    namespace contact
-    {
-        class ViewContactOfOuterPageBorder : public ViewContactOfPageSubObject
-        {
-        protected:
-            virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE;
-            virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE;
-
-        public:
-            explicit ViewContactOfOuterPageBorder(ViewContactOfSdrPage& rParentViewContactOfSdrPage);
-            virtual ~ViewContactOfOuterPageBorder();
-        };
-    } // end of namespace contact
-} // end of namespace sdr
-
-
-
-namespace sdr
-{
-    namespace contact
-    {
-        class ViewContactOfInnerPageBorder : public ViewContactOfPageSubObject
-        {
-        protected:
-            virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE;
-            virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE;
-
-        public:
-            explicit ViewContactOfInnerPageBorder(ViewContactOfSdrPage& rParentViewContactOfSdrPage);
-            virtual ~ViewContactOfInnerPageBorder();
-        };
-    } // end of namespace contact
-} // end of namespace sdr
-
-
-
-namespace sdr
-{
-    namespace contact
-    {
-        class ViewContactOfPageHierarchy : public ViewContactOfPageSubObject
-        {
-        protected:
-            virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE;
-            virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE;
-
-        public:
-            explicit ViewContactOfPageHierarchy(ViewContactOfSdrPage& rParentViewContactOfSdrPage);
-            virtual ~ViewContactOfPageHierarchy();
-
-            virtual sal_uInt32 GetObjectCount() const SAL_OVERRIDE;
-            virtual ViewContact& GetViewContact(sal_uInt32 nIndex) const SAL_OVERRIDE;
-        };
-    } // end of namespace contact
-} // end of namespace sdr
-
-
-
-namespace sdr
-{
-    namespace contact
-    {
-        class ViewContactOfGrid : public ViewContactOfPageSubObject
-        {
-        protected:
-            // bitfield
-            bool                                        mbFront : 1;
-
-            virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE;
-            virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE;
-
-        public:
-            ViewContactOfGrid(ViewContactOfSdrPage& rParentViewContactOfSdrPage, bool bFront);
-            virtual ~ViewContactOfGrid();
-
-            bool getFront() const { return mbFront; }
-        };
-    } // end of namespace contact
-} // end of namespace sdr
-
-
-
-namespace sdr
-{
-    namespace contact
-    {
-        class ViewContactOfHelplines : public ViewContactOfPageSubObject
-        {
-        protected:
-            // bitfield
-            bool                                        mbFront : 1;
-
-            virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE;
-            virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE;
-
-        public:
-            ViewContactOfHelplines(ViewContactOfSdrPage& rParentViewContactOfSdrPage, bool bFront);
-            virtual ~ViewContactOfHelplines();
-
-            bool getFront() const { return mbFront; }
-        };
-    } // end of namespace contact
-} // end of namespace sdr
-
-
-
-namespace sdr
-{
-    namespace contact
-    {
-        class ViewContactOfSdrPage : public ViewContact
-        {
-        protected:
-            // the owner of this ViewContact. Set from constructor and not
-            // to be changed in any way.
-            SdrPage&                                        mrPage;
-
-            // helper viewContacts to build a clear paint hierarchy
-            ViewContactOfPageBackground                     maViewContactOfPageBackground;
-            ViewContactOfPageShadow                         maViewContactOfPageShadow;
-            ViewContactOfPageFill                           maViewContactOfPageFill;
-            ViewContactOfMasterPage                         maViewContactOfMasterPage;
-            ViewContactOfOuterPageBorder                    maViewContactOfOuterPageBorder;
-            ViewContactOfInnerPageBorder                    maViewContactOfInnerPageBorder;
-            ViewContactOfGrid                               maViewContactOfGridBack;
-            ViewContactOfHelplines                          maViewContactOfHelplinesBack;
-            ViewContactOfPageHierarchy                      maViewContactOfPageHierarchy;
-            ViewContactOfGrid                               maViewContactOfGridFront;
-            ViewContactOfHelplines                          maViewContactOfHelplinesFront;
-
-            // Create a Object-Specific ViewObjectContact, set ViewContact and
-            // ObjectContact. Always needs to return something. Default is to create
-            // a standard ViewObjectContact containing the given ObjectContact and *this
-            virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE;
-
-        public:
-            // access to SdrObject
-            SdrPage& GetSdrPage() const
-            {
-                return mrPage;
-            }
-
-            // basic constructor, used from SdrPage.
-            explicit ViewContactOfSdrPage(SdrPage& rObj);
-            virtual ~ViewContactOfSdrPage();
-
-            // Access to possible sub-hierarchy
-            virtual sal_uInt32 GetObjectCount() const SAL_OVERRIDE;
-            virtual ViewContact& GetViewContact(sal_uInt32 nIndex) const SAL_OVERRIDE;
-
-            // React on changes of the object of this ViewContact
-            virtual void ActionChanged() SAL_OVERRIDE;
-
-            // overload for acessing the SdrPage
-            virtual SdrPage* TryToGetSdrPage() const SAL_OVERRIDE;
-
-        protected:
-            // This method is responsible for creating the graphical visualisation data
-            // ONLY based on model data
-            virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE;
-        };
-    } // end of namespace contact
-} // end of namespace sdr
-
-
-
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRPAGE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewcontactofsdrpathobj.hxx b/include/svx/sdr/contact/viewcontactofsdrpathobj.hxx
deleted file mode 100644
index daa37db432ee..000000000000
--- a/include/svx/sdr/contact/viewcontactofsdrpathobj.hxx
+++ /dev/null
@@ -1,62 +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_VIEWCONTACTOFSDRPATHOBJ_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRPATHOBJ_HXX
-
-#include <svx/sdr/contact/viewcontactoftextobj.hxx>
-
-
-// predeclarations
-
-class SdrPathObj;
-
-
-
-namespace sdr
-{
-    namespace contact
-    {
-        class ViewContactOfSdrPathObj : public ViewContactOfTextObj
-        {
-        protected:
-            // internal access to SdrPathObj
-            SdrPathObj& GetPathObj() const
-            {
-                return (SdrPathObj&)GetSdrObject();
-            }
-
-        public:
-            // basic constructor, used from SdrObject.
-            explicit ViewContactOfSdrPathObj(SdrPathObj& rTextObj);
-            virtual ~ViewContactOfSdrPathObj();
-
-        protected:
-            // This method is responsible for creating the graphical visualisation data
-            // ONLY based on model data
-            virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE;
-        };
-    } // end of namespace contact
-} // end of namespace sdr
-
-
-
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRPATHOBJ_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewcontactofunocontrol.hxx b/include/svx/sdr/contact/viewcontactofunocontrol.hxx
deleted file mode 100644
index 84378f2ce8cc..000000000000
--- a/include/svx/sdr/contact/viewcontactofunocontrol.hxx
+++ /dev/null
@@ -1,92 +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_VIEWCONTACTOFUNOCONTROL_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFUNOCONTROL_HXX
-
-#include <com/sun/star/uno/Reference.hxx>
-#include <svx/sdr/contact/viewcontactofsdrmediaobj.hxx>
-#include <svx/svxdllapi.h>
-
-#include <memory>
-
-class OutputDevice;
-class Window;
-class SdrUnoObj;
-namespace com { namespace sun { namespace star {
-    namespace awt {
-        class XControl;
-        class XControlContainer;
-    }
-} } }
-
-
-namespace sdr { namespace contact {
-
-
-
-    //= ViewContactOfUnoControl
-
-    class ViewContactOfUnoControl_Impl;
-    class SVX_DLLPRIVATE ViewContactOfUnoControl : public ViewContactOfSdrObj
-    {
-    private:
-        ::std::auto_ptr< ViewContactOfUnoControl_Impl >   m_pImpl;
-
-    public:
-        // access to SdrObject
-        SdrUnoObj& GetSdrUnoObj() const
-        {
-            return ((SdrUnoObj&)GetSdrObject());
-        }
-
-        explicit ViewContactOfUnoControl( SdrUnoObj& _rUnoObject );
-        virtual ~ViewContactOfUnoControl();
-
-        /** access control to selected members
-        */
-        struct SdrUnoObjAccessControl { friend class ::SdrUnoObj; private: SdrUnoObjAccessControl() { } };
-
-        /** retrieves a temporary XControl instance, whose parent is the given window
-            @seealso SdrUnoObj::GetTemporaryControlForWindow
-        */
-        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >
-            getTemporaryControlForWindow( const Window& _rWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& _inout_ControlContainer ) const;
-
-    protected:
-        virtual ViewObjectContact& CreateObjectSpecificViewObjectContact( ObjectContact& _rObjectContact ) SAL_OVERRIDE;
-
-    private:
-        ViewContactOfUnoControl();                                            // never implemented
-        ViewContactOfUnoControl( const ViewContactOfUnoControl& );              // never implemented
-        ViewContactOfUnoControl& operator=( const ViewContactOfUnoControl& );   // never implemented
-
-    protected:
-        // This method is responsible for creating the graphical visualisation data
-        // ONLY based on model data
-        virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE;
-    };
-
-
-} } // namespace sdr::contact
-
-
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFUNOCONTROL_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewobjectcontactofe3d.hxx b/include/svx/sdr/contact/viewobjectcontactofe3d.hxx
deleted file mode 100644
index 306798bcc416..000000000000
--- a/include/svx/sdr/contact/viewobjectcontactofe3d.hxx
+++ /dev/null
@@ -1,74 +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_VIEWOBJECTCONTACTOFE3D_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFE3D_HXX
-
-#include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx>
-#include <drawinglayer/primitive3d/baseprimitive3d.hxx>
-
-
-// predeclarations
-
-namespace sdr { namespace contact {
-    class ViewObjectContactOfE3dScene;
-}}
-
-
-
-namespace sdr
-{
-    namespace contact
-    {
-        class ViewObjectContactOfE3d : public ViewObjectContactOfSdrObj
-        {
-        protected:
-            // Primitive3D sequence of the ViewContact. This contains all necessary information
-            // for the graphical visualisation and needs to be supported by all VCs which
-            // can be visualized.
-            drawinglayer::primitive3d::Primitive3DSequence          mxPrimitive3DSequence;
-
-            // This method is responsible for creating the graphical visualisation data which is
-            // stored/cached in the local primitive. Default gets view-independent Primitive3D
-            // from the ViewContact using ViewContact::getViewIndependentPrimitive3DSequence(), takes care of
-            // visibility and ghosted.
-            // This method will not handle included hierarchies and not check geometric visibility.
-            drawinglayer::primitive3d::Primitive3DSequence createPrimitive3DSequence(const DisplayInfo& rDisplayInfo) const;
-
-            // also overload the 2d method to deliver a 2d object with embedd3d 3d and the 3d transformation which is able to
-            // answer the get2DRange question accordingly
-            virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE;
-
-        public:
-            ViewObjectContactOfE3d(ObjectContact& rObjectContact, ViewContact& rViewContact);
-            virtual ~ViewObjectContactOfE3d();
-
-            // access to the local primitive sequence. This will ensure that the list is
-            // current in comparing the local list content with a fresh created incarnation
-            // This method will not handle included hierarchies or visibility.
-            drawinglayer::primitive3d::Primitive3DSequence getPrimitive3DSequence(const DisplayInfo& rDisplayInfo) const;
-        };
-    } // end of namespace contact
-} // end of namespace sdr
-
-
-
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFE3D_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewobjectcontactofe3dscene.hxx b/include/svx/sdr/contact/viewobjectcontactofe3dscene.hxx
deleted file mode 100644
index b25e161dd613..000000000000
--- a/include/svx/sdr/contact/viewobjectcontactofe3dscene.hxx
+++ /dev/null
@@ -1,54 +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_VIEWOBJECTCONTACTOFE3DSCENE_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFE3DSCENE_HXX
-
-#include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>
-
-
-
-namespace sdr
-{
-    namespace contact
-    {
-        class SVX_DLLPUBLIC ViewObjectContactOfE3dScene : public ViewObjectContactOfSdrObj
-        {
-        protected:
-            // 2d primitive creator
-            virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE;
-
-        public:
-            // basic constructor.
-            ViewObjectContactOfE3dScene(ObjectContact& rObjectContact, ViewContact& rViewContact);
-            virtual ~ViewObjectContactOfE3dScene();
-
-            // process this primitive: Eventually also recursively travel an existing hierarchy,
-            // e.g. for group objects, scenes or pages. This method will test geometrical visibility.
-            virtual drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const SAL_OVERRIDE;
-        };
-    } // end of namespace contact
-} // end of namespace sdr
-
-
-
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFE3DSCENE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewobjectcontactofgraphic.hxx b/include/svx/sdr/contact/viewobjectcontactofgraphic.hxx
deleted file mode 100644
index 7c1a6709f9c8..000000000000
--- a/include/svx/sdr/contact/viewobjectcontactofgraphic.hxx
+++ /dev/null
@@ -1,73 +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_VIEWOBJECTCONTACTOFGRAPHIC_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFGRAPHIC_HXX
-
-#include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx>
-
-
-// predeclarations
-class SdrGrafObj;
-
-namespace sdr { namespace event {
-    class AsynchGraphicLoadingEvent;
-}}
-
-
-
-namespace sdr
-{
-    namespace contact
-    {
-        class ViewObjectContactOfGraphic : public ViewObjectContactOfSdrObj
-        {
-        private:
-            // allow async loading event helper to call tooling methods
-            friend class sdr::event::AsynchGraphicLoadingEvent;
-
-            // Member which takes care for the asynch loading events which may be necessary
-            // for asynch graphics loading.
-            sdr::event::AsynchGraphicLoadingEvent*      mpAsynchLoadEvent;
-
-            // async graphics loading helpers. Only to be used internally or from the
-            // event helper class (in .cxx file)
-            bool impPrepareGraphicWithAsynchroniousLoading();
-            bool impPrepareGraphicWithSynchroniousLoading();
-            void doAsynchGraphicLoading();
-            void forgetAsynchGraphicLoadingEvent(sdr::event::AsynchGraphicLoadingEvent* pEvent);
-
-        protected:
-            SdrGrafObj& getSdrGrafObj();
-
-            // This method is responsible for creating the graphical visualisation data
-            virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE;
-
-        public:
-            ViewObjectContactOfGraphic(ObjectContact& rObjectContact, ViewContact& rViewContact);
-            virtual ~ViewObjectContactOfGraphic();
-        };
-    } // end of namespace contact
-} // end of namespace sdr
-
-
-
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFGRAPHIC_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewobjectcontactofgroup.hxx b/include/svx/sdr/contact/viewobjectcontactofgroup.hxx
deleted file mode 100644
index 556aa37e12cc..000000000000
--- a/include/svx/sdr/contact/viewobjectcontactofgroup.hxx
+++ /dev/null
@@ -1,54 +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_VIEWOBJECTCONTACTOFGROUP_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFGROUP_HXX
-
-#include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx>
-
-
-// predeclarations
-
-
-
-namespace sdr
-{
-    namespace contact
-    {
-        class SVX_DLLPUBLIC ViewObjectContactOfGroup : public ViewObjectContactOfSdrObj
-        {
-        public:
-            // basic constructor.
-            ViewObjectContactOfGroup(ObjectContact& rObjectContact, ViewContact& rViewContact);
-            virtual ~ViewObjectContactOfGroup();
-
-            // This method recursively paints the draw hierarchy.
-            virtual drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const SAL_OVERRIDE;
-
-        private:
-            virtual bool isPrimitiveVisibleOnAnyLayer(const SetOfByte& aLayers) const SAL_OVERRIDE;
-        };
-    } // end of namespace contact
-} // end of namespace sdr
-
-
-
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFGROUP_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx b/include/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx
deleted file mode 100644
index 2cae0aa7833a..000000000000
--- a/include/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx
+++ /dev/null
@@ -1,57 +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_VIEWOBJECTCONTACTOFMASTERPAGEDESCRIPTOR_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFMASTERPAGEDESCRIPTOR_HXX
-
-#include <svx/sdr/contact/viewobjectcontact.hxx>
-
-
-// predeclarations
-
-namespace sdr {
-    class MasterPageDescriptor;
-}
-
-
-
-namespace sdr
-{
-    namespace contact
-    {
-        class ViewObjectContactOfMasterPageDescriptor : public ViewObjectContact
-        {
-        public:
-            ViewObjectContactOfMasterPageDescriptor(ObjectContact& rObjectContact, ViewContact& rViewContact);
-            virtual ~ViewObjectContactOfMasterPageDescriptor();
-
-            // access to MasterPageDescriptor
-            sdr::MasterPageDescriptor& GetMasterPageDescriptor() const;
-
-            virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE;
-            virtual drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const SAL_OVERRIDE;
-        };
-    } // end of namespace contact
-} // end of namespace sdr
-
-
-
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFMASTERPAGEDESCRIPTOR_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewobjectcontactofopenglobj.hxx b/include/svx/sdr/contact/viewobjectcontactofopenglobj.hxx
deleted file mode 100644
index 2abae09a3c43..000000000000
--- a/include/svx/sdr/contact/viewobjectcontactofopenglobj.hxx
+++ /dev/null
@@ -1,36 +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_SDR_CONTACT_VIEWOBJECTCONTACTOFOPENGLOBJ_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFOPENGLOBJ_HXX
-
-#include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx>
-#include <vcl/opengl/OpenGLContext.hxx>
-
-class Window;
-
-namespace sdr {
-namespace contact {
-
-class ViewObjectContactOfOpenGLObj : public ViewObjectContactOfSdrObj
-{
-public:
-    ViewObjectContactOfOpenGLObj(ObjectContact& rObjectContact, ViewContact& rViewContact);
-    virtual ~ViewObjectContactOfOpenGLObj();
-
-private:
-    Window* getWindow() const;
-};
-
-} // namespace sdr
-} // namespace contact
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx b/include/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx
deleted file mode 100644
index f770a341fcc0..000000000000
--- a/include/svx/sdr/contact/viewobjectcontactofsdrmediaobj.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_CONTACT_VIEWOBJECTCONTACTOFSDRMEDIAOBJ_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFSDRMEDIAOBJ_HXX
-
-#include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx>
-#include <svx/sdr/contact/viewobjectcontact.hxx>
-#include <tools/gen.hxx>
-
-namespace avmedia { class MediaItem; }
-class Window;
-
-namespace sdr
-{
-    namespace contact
-    {
-        class SdrMediaWindow;
-
-        class ViewObjectContactOfSdrMediaObj : public ViewObjectContactOfSdrObj
-        {
-        public:
-
-            ViewObjectContactOfSdrMediaObj( ObjectContact& rObjectContact,
-                                            ViewContact& rViewContact,
-                                            const ::avmedia::MediaItem& rMediaItem );
-            virtual ~ViewObjectContactOfSdrMediaObj();
-
-        public:
-
-            Window* getWindow() const;
-
-            Size    getPreferredSize() const;
-
-            void    updateMediaItem( ::avmedia::MediaItem& rItem ) const;
-            void    executeMediaItem( const ::avmedia::MediaItem& rItem );
-
-        private:
-
-            ::sdr::contact::SdrMediaWindow* mpMediaWindow;
-
-        };
-    } // end of namespace contact
-} // end of namespace sdr
-
-
-
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFSDRMEDIAOBJ_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx b/include/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx
deleted file mode 100644
index 01acfabbb507..000000000000
--- a/include/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx
+++ /dev/null
@@ -1,54 +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_VIEWOBJECTCONTACTOFSDROLE2OBJ_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFSDROLE2OBJ_HXX
-
-#include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx>
-
-
-// predeclarations
-class SdrOle2Obj;
-
-
-
-namespace sdr
-{
-    namespace contact
-    {
-        class ViewObjectContactOfSdrOle2Obj : public ViewObjectContactOfSdrObj
-        {
-        protected:
-            const SdrOle2Obj& getSdrOle2Object() const;
-
-            // This method is responsible for creating the graphical visualisation data
-            virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE;
-
-        public:
-            ViewObjectContactOfSdrOle2Obj(ObjectContact& rObjectContact, ViewContact& rViewContact);
-            virtual ~ViewObjectContactOfSdrOle2Obj();
-        };
-    } // end of namespace contact
-} // end of namespace sdr
-
-
-
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFSDROLE2OBJ_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewobjectcontactofsdrpage.hxx b/include/svx/sdr/contact/viewobjectcontactofsdrpage.hxx
deleted file mode 100644
index 59ffc2b513d0..000000000000
--- a/include/svx/sdr/contact/viewobjectcontactofsdrpage.hxx
+++ /dev/null
@@ -1,238 +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_VIEWOBJECTCONTACTOFSDRPAGE_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFSDRPAGE_HXX
-
-#include <svx/sdr/contact/viewobjectcontact.hxx>
-
-
-// predeclarations
-
-class SdrPage;
-
-
-
-namespace sdr
-{
-    namespace contact
-    {
-        class SVX_DLLPUBLIC ViewObjectContactOfPageSubObject : public ViewObjectContact
-        {
-        protected:
-            const SdrPage& getPage() const;
-
-        public:
-            ViewObjectContactOfPageSubObject(ObjectContact& rObjectContact, ViewContact& rViewContact);
-            virtual ~ViewObjectContactOfPageSubObject();
-
-            virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE;
-            virtual bool isPrimitiveGhosted(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE;
-        };
-    } // end of namespace contact
-} // end of namespace sdr
-
-
-
-namespace sdr
-{
-    namespace contact
-    {
-        class SVX_DLLPUBLIC ViewObjectContactOfPageBackground : public ViewObjectContactOfPageSubObject
-        {
-        protected:
-            virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE;
-
-        public:
-            ViewObjectContactOfPageBackground(ObjectContact& rObjectContact, ViewContact& rViewContact);
-            virtual ~ViewObjectContactOfPageBackground();
-
-            virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE;
-        };
-    } // end of namespace contact
-} // end of namespace sdr
-
-
-
-namespace sdr
-{
-    namespace contact
-    {
-        class SVX_DLLPUBLIC ViewObjectContactOfMasterPage : public ViewObjectContactOfPageSubObject
-        {
-        protected:
-        public:
-            ViewObjectContactOfMasterPage(ObjectContact& rObjectContact, ViewContact& rViewContact);
-            virtual ~ViewObjectContactOfMasterPage();
-
-            virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE;
-        };
-    } // end of namespace contact
-} // end of namespace sdr
-
-
-
-namespace sdr
-{
-    namespace contact
-    {
-        class SVX_DLLPUBLIC ViewObjectContactOfPageFill : public ViewObjectContactOfPageSubObject
-        {
-        protected:
-            virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE;
-
-        public:
-            ViewObjectContactOfPageFill(ObjectContact& rObjectContact, ViewContact& rViewContact);
-            virtual ~ViewObjectContactOfPageFill();
-
-            virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE;
-        };
-    } // end of namespace contact
-} // end of namespace sdr
-
-
-
-namespace sdr
-{
-    namespace contact
-    {
-        class SVX_DLLPUBLIC ViewObjectContactOfPageShadow : public ViewObjectContactOfPageSubObject
-        {
-        public:
-            ViewObjectContactOfPageShadow(ObjectContact& rObjectContact, ViewContact& rViewContact);
-            virtual ~ViewObjectContactOfPageShadow();
-
-            virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE;
-        };
-    } // end of namespace contact
-} // end of namespace sdr
-
-
-
-namespace sdr
-{
-    namespace contact
-    {
-        class SVX_DLLPUBLIC ViewObjectContactOfOuterPageBorder : public ViewObjectContactOfPageSubObject
-        {
-        public:
-            ViewObjectContactOfOuterPageBorder(ObjectContact& rObjectContact, ViewContact& rViewContact);
-            virtual ~ViewObjectContactOfOuterPageBorder();
-
-            virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE;
-        };
-    } // end of namespace contact
-} // end of namespace sdr
-
-
-
-namespace sdr
-{
-    namespace contact
-    {
-        class SVX_DLLPUBLIC ViewObjectContactOfInnerPageBorder : public ViewObjectContactOfPageSubObject
-        {
-        public:
-            ViewObjectContactOfInnerPageBorder(ObjectContact& rObjectContact, ViewContact& rViewContact);
-            virtual ~ViewObjectContactOfInnerPageBorder();
-
-            virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE;
-        };
-    } // end of namespace contact
-} // end of namespace sdr
-
-
-
-namespace sdr
-{
-    namespace contact
-    {
-        class SVX_DLLPUBLIC ViewObjectContactOfPageHierarchy : public ViewObjectContactOfPageSubObject
-        {
-        public:
-            ViewObjectContactOfPageHierarchy(ObjectContact& rObjectContact, ViewContact& rViewContact);
-            virtual ~ViewObjectContactOfPageHierarchy();
-
-            virtual drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const SAL_OVERRIDE;
-        };
-    } // end of namespace contact
-} // end of namespace sdr
-
-
-
-namespace sdr
-{
-    namespace contact
-    {
-        class SVX_DLLPUBLIC ViewObjectContactOfPageGrid : public ViewObjectContactOfPageSubObject
-        {
-        protected:
-            virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE;
-
-        public:
-            ViewObjectContactOfPageGrid(ObjectContact& rObjectContact, ViewContact& rViewContact);
-            virtual ~ViewObjectContactOfPageGrid();
-
-            virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE;
-        };
-    } // end of namespace contact
-} // end of namespace sdr
-
-
-
-namespace sdr
-{
-    namespace contact
-    {
-        class SVX_DLLPUBLIC ViewObjectContactOfPageHelplines : public ViewObjectContactOfPageSubObject
-        {
-        protected:
-            virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE;
-
-        public:
-            ViewObjectContactOfPageHelplines(ObjectContact& rObjectContact, ViewContact& rViewContact);
-            virtual ~ViewObjectContactOfPageHelplines();
-
-            virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE;
-        };
-    } // end of namespace contact
-} // end of namespace sdr
-
-
-
-namespace sdr
-{
-    namespace contact
-    {
-        class SVX_DLLPUBLIC ViewObjectContactOfSdrPage : public ViewObjectContact
-        {
-        public:
-            ViewObjectContactOfSdrPage(ObjectContact& rObjectContact, ViewContact& rViewContact);
-            virtual ~ViewObjectContactOfSdrPage();
-
-            virtual drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const SAL_OVERRIDE;
-        };
-    } // end of namespace contact
-} // end of namespace sdr
-
-
-
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFSDRPAGE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewobjectcontactofunocontrol.hxx b/include/svx/sdr/contact/viewobjectcontactofunocontrol.hxx
deleted file mode 100644
index a1ade08cd65f..000000000000
--- a/include/svx/sdr/contact/viewobjectcontactofunocontrol.hxx
+++ /dev/null
@@ -1,131 +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_VIEWOBJECTCONTACTOFUNOCONTROL_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFUNOCONTROL_HXX
-
-#include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx>
-
-#include <com/sun/star/uno/Reference.hxx>
-#include <rtl/ref.hxx>
-#include <svx/svxdllapi.h>
-
-class OutputDevice;
-class Window;
-class SdrUnoObj;
-namespace com { namespace sun { namespace star {
-    namespace awt {
-        class XControl;
-        class XControlContainer;
-    }
-} } }
-
-
-namespace sdr { namespace contact {
-
-
-    class ViewContactOfUnoControl;
-    class ObjectContactOfPageView;
-
-    //= ViewObjectContactOfUnoControl
-
-    class ViewObjectContactOfUnoControl_Impl;
-    class SVX_DLLPRIVATE ViewObjectContactOfUnoControl : public ViewObjectContactOfSdrObj
-    {
-    protected:
-        ::rtl::Reference< ViewObjectContactOfUnoControl_Impl >    m_pImpl;
-
-    public:
-        ViewObjectContactOfUnoControl( ObjectContact& _rObjectContact, ViewContactOfUnoControl& _rViewContact );
-
-        /// returns the ->XControl instance belonging to the instance, creates it if necessary
-        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >
-                getControl();
-
-        /** retrieves a temporary XControl instance, whose parent is the given device
-            @seealso SdrUnoObj::GetTemporaryControlForWindow
-        */
-        static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >
-            getTemporaryControlForWindow(
-                const Window& _rWindow,
-                ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& _inout_ControlContainer,
-                const SdrUnoObj& _rUnoObject
-            );
-
-        /// ensures that the control belonging to this instances has a given visibility
-        void    ensureControlVisibility( bool _bVisible ) const;
-
-        /** sets the design/alive mode of the control
-        */
-        void    setControlDesignMode( bool _bDesignMode ) const;
-
-        /** callback from impl class to react on changes of properties form the XControlModel
-        */
-        void propertyChange();
-
-        /** React on changes of the object of this ViewContact
-        */
-        virtual void ActionChanged() SAL_OVERRIDE;
-
-        /** to be called when any aspect of the control which requires view updates changed
-        */
-        struct ImplAccess { friend class ViewObjectContactOfUnoControl_Impl; friend class ViewObjectContactOfUnoControl; private: ImplAccess() { } };
-        void onControlChangedOrModified( ImplAccess ) { impl_onControlChangedOrModified(); }
-
-    protected:
-        virtual ~ViewObjectContactOfUnoControl();
-
-        // support for Primitive2D
-        virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE;
-
-        // visibility check
-        virtual bool isPrimitiveVisible( const DisplayInfo& _rDisplayInfo ) const SAL_OVERRIDE;
-        /// to be called when any aspect of the control which requires view updates changed
-        void impl_onControlChangedOrModified();
-
-    private:
-        ViewObjectContactOfUnoControl();                                                    // never implemented
-        ViewObjectContactOfUnoControl( const ViewObjectContactOfUnoControl& );              // never implemented
-        ViewObjectContactOfUnoControl& operator=( const ViewObjectContactOfUnoControl& );   // never implemented
-    };
-
-
-    //= UnoControlPrintOrPreviewContact
-
-    class SVX_DLLPRIVATE UnoControlPrintOrPreviewContact : public ViewObjectContactOfUnoControl
-    {
-    public:
-        UnoControlPrintOrPreviewContact( ObjectContactOfPageView& _rObjectContact, ViewContactOfUnoControl& _rViewContact );
-        virtual ~UnoControlPrintOrPreviewContact();
-
-    private:
-        UnoControlPrintOrPreviewContact();                                                 // never implemented
-        UnoControlPrintOrPreviewContact( const UnoControlPrintOrPreviewContact& );            // never implemented
-        UnoControlPrintOrPreviewContact& operator=( const UnoControlPrintOrPreviewContact& ); // never implemented
-
-        virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo ) const SAL_OVERRIDE;
-    };
-
-
-} } // namespace sdr::contact
-
-
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFUNOCONTROL_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/overlay/overlaycrosshair.hxx b/include/svx/sdr/overlay/overlaycrosshair.hxx
deleted file mode 100644
index e9a70a7e234d..000000000000
--- a/include/svx/sdr/overlay/overlaycrosshair.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_OVERLAYCROSSHAIR_HXX
-#define INCLUDED_SVX_SDR_OVERLAY_OVERLAYCROSSHAIR_HXX
-
-#include <svx/sdr/overlay/overlayobject.hxx>
-
-
-
-namespace sdr
-{
-    namespace overlay
-    {
-        class OverlayCrosshairStriped : public OverlayObjectWithBasePosition
-        {
-        protected:
-            // geometry creation for OverlayObject
-            virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE;
-
-        public:
-            explicit OverlayCrosshairStriped(const basegfx::B2DPoint& rBasePos);
-            virtual ~OverlayCrosshairStriped();
-
-            // react on stripe definition change
-            virtual void stripeDefinitionHasChanged() SAL_OVERRIDE;
-        };
-    } // end of namespace overlay
-} // end of namespace sdr
-
-
-
-#endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYCROSSHAIR_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/overlay/overlayhatchrect.hxx b/include/svx/sdr/overlay/overlayhatchrect.hxx
deleted file mode 100644
index e69c61b87849..000000000000
--- a/include/svx/sdr/overlay/overlayhatchrect.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_SDR_OVERLAY_OVERLAYHATCHRECT_HXX
-#define INCLUDED_SVX_SDR_OVERLAY_OVERLAYHATCHRECT_HXX
-
-#include <svx/sdr/overlay/overlayobject.hxx>
-#include <vcl/hatch.hxx>
-
-
-
-class PolyPolygon;
-
-namespace sdr
-{
-    namespace overlay
-    {
-        class OverlayHatchRect : public OverlayObjectWithBasePosition
-        {
-            // geometric definitions
-            basegfx::B2DPoint               maSecondPosition;
-            const double                    mfDiscreteGrow;
-            const double                    mfDiscreteShrink;
-            const double                    mfHatchRotation;
-            const double                    mfRotation;
-
-            // geometry creation for OverlayObject
-            virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence();
-
-        public:
-            OverlayHatchRect(
-                const basegfx::B2DPoint& rBasePosition,
-                const basegfx::B2DPoint& rSecondPosition,
-                const Color& rHatchColor,
-                double fDiscreteGrow,
-                double fDiscreteShrink,
-                double fHatchRotation,
-                double fRotation);
-
-            const basegfx::B2DPoint& getSecondPosition() const { return maSecondPosition; }
-
-            // data read access
-            double getDiscreteGrow() const { return mfDiscreteGrow; }
-            double getDiscreteShrink() const { return mfDiscreteShrink; }
-            double getHatchRotation() const { return mfHatchRotation; }
-            double getRotation() const { return mfRotation; }
-        };
-    } // end of namespace overlay
-} // end of namespace sdr
-
-
-
-#endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYHATCHRECT_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/overlay/overlayhelpline.hxx b/include/svx/sdr/overlay/overlayhelpline.hxx
deleted file mode 100644
index 2e3bc1640ae7..000000000000
--- a/include/svx/sdr/overlay/overlayhelpline.hxx
+++ /dev/null
@@ -1,60 +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_OVERLAYHELPLINE_HXX
-#define INCLUDED_SVX_SDR_OVERLAY_OVERLAYHELPLINE_HXX
-
-#include <svx/sdr/overlay/overlayobject.hxx>
-#include <svx/svdhlpln.hxx>
-
-
-
-namespace sdr
-{
-    namespace overlay
-    {
-        class OverlayHelplineStriped : public OverlayObjectWithBasePosition
-        {
-        protected:
-            // remember HelpLineKind
-            SdrHelpLineKind                             meKind;
-
-            // geometry creation for OverlayObject
-            virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE;
-
-        public:
-            explicit OverlayHelplineStriped(
-                const basegfx::B2DPoint& rBasePos,
-                SdrHelpLineKind eNewKind = SDRHELPLINE_POINT);
-            virtual ~OverlayHelplineStriped();
-
-            // dat read access
-            SdrHelpLineKind getKind() const { return meKind; }
-
-            // react on stripe definition change
-            virtual void stripeDefinitionHasChanged() SAL_OVERRIDE;
-        };
-    } // end of namespace overlay
-} // end of namespace sdr
-
-
-
-#endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYHELPLINE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/overlay/overlayline.hxx b/include/svx/sdr/overlay/overlayline.hxx
deleted file mode 100644
index 65b7bb58fc54..000000000000
--- a/include/svx/sdr/overlay/overlayline.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_OVERLAY_OVERLAYLINE_HXX
-#define INCLUDED_SVX_SDR_OVERLAY_OVERLAYLINE_HXX
-
-#include <svx/sdr/overlay/overlayobject.hxx>
-
-
-
-namespace sdr
-{
-    namespace overlay
-    {
-        class OverlayLineStriped : public OverlayObjectWithBasePosition
-        {
-        protected:
-            // second position in pixel
-            basegfx::B2DPoint                       maSecondPosition;
-
-            // geometry creation for OverlayObject
-            virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE;
-
-        public:
-            OverlayLineStriped(
-                const basegfx::B2DPoint& rBasePos,
-                const basegfx::B2DPoint& rSecondPos);
-            virtual ~OverlayLineStriped();
-
-            // change second position
-            const basegfx::B2DPoint& getSecondPosition() const { return maSecondPosition; }
-
-            // react on stripe definition change
-            virtual void stripeDefinitionHasChanged() SAL_OVERRIDE;
-        };
-    } // end of namespace overlay
-} // end of namespace sdr
-
-
-
-#endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYLINE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/overlay/overlaymanagerbuffered.hxx b/include/svx/sdr/overlay/overlaymanagerbuffered.hxx
deleted file mode 100644
index 2db2cf1da96f..000000000000
--- a/include/svx/sdr/overlay/overlaymanagerbuffered.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_OVERLAY_OVERLAYMANAGERBUFFERED_HXX
-#define INCLUDED_SVX_SDR_OVERLAY_OVERLAYMANAGERBUFFERED_HXX
-
-#include <svx/sdr/overlay/overlaymanager.hxx>
-#include <basegfx/range/b2irange.hxx>
-#include <vcl/virdev.hxx>
-
-
-
-namespace sdr
-{
-    namespace overlay
-    {
-        class OverlayManagerBuffered : public OverlayManager
-        {
-        protected:
-            // The VirtualDevice for draw window content buffering, this
-            // is the view content without overlay
-            VirtualDevice                           maBufferDevice;
-
-            // #i73602# The VirtualDevice for OverlayPaint buffering. This
-            // is an extra device to avoid flickering of overlay paints
-            VirtualDevice                           maOutputBufferDevice;
-
-            // Timer for buffering
-            Timer                                   maBufferTimer;
-
-            // Range for buffering (in pixel to be independent from mapMode)
-            basegfx::B2IRange                       maBufferRememberedRangePixel;
-
-            // bitfield
-            // Flag to decide if PreRendering shall be used for overlay refreshes.
-            // Default is false.
-            bool                                    mbRefreshWithPreRendering : 1;
-
-            // link for timer
-            DECL_LINK(ImpBufferTimerHandler, AutoTimer*);
-
-            // Internal methods for buffering
-            void ImpPrepareBufferDevice();
-            void ImpRestoreBackground() const ;
-            void ImpRestoreBackground(const Region& rRegionPixel) const;
-            void ImpSaveBackground(const Region& rRegion, OutputDevice* pPreRenderDevice = 0L);
-
-            OverlayManagerBuffered(
-                OutputDevice& rOutputDevice,
-                bool bRefreshWithPreRendering = false);
-            virtual ~OverlayManagerBuffered();
-
-        public:
-            static rtl::Reference<OverlayManager> create(OutputDevice& rOutputDevice,
-                bool bRefreshWithPreRendering = false);
-
-            // complete redraw
-            virtual void completeRedraw(const Region& rRegion, OutputDevice* pPreRenderDevice = 0L) const SAL_OVERRIDE;
-
-            // flush. Do buffered updates.
-            virtual void flush() SAL_OVERRIDE;
-
-            // #i68597# part of content gets copied, react on it
-            virtual void copyArea(const Point& rDestPt, const Point& rSrcPt, const Size& rSrcSize) SAL_OVERRIDE;
-
-            // restore part of background. Implemented form buffered versions only.
-            virtual void restoreBackground(const Region& rRegion) const SAL_OVERRIDE;
-
-            // invalidate the given range at local OutputDevice
-            virtual void invalidateRange(const basegfx::B2DRange& rRange) SAL_OVERRIDE;
-
-            // access to RefreshWithPreRendering Flag
-            bool DoRefreshWithPreRendering() const { return mbRefreshWithPreRendering; }
-        };
-    } // end of namespace overlay
-} // end of namespace sdr
-
-
-
-#endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYMANAGERBUFFERED_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/overlay/overlayrectangle.hxx b/include/svx/sdr/overlay/overlayrectangle.hxx
deleted file mode 100644
index 7279a11bea0e..000000000000
--- a/include/svx/sdr/overlay/overlayrectangle.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_OVERLAY_OVERLAYRECTANGLE_HXX
-#define INCLUDED_SVX_SDR_OVERLAY_OVERLAYRECTANGLE_HXX
-
-#include <svx/sdr/overlay/overlayobject.hxx>
-#include <tools/gen.hxx>
-
-
-
-class PolyPolygon;
-
-namespace sdr
-{
-    namespace overlay
-    {
-        class OverlayRectangle : public OverlayObjectWithBasePosition
-        {
-            // geometric definitions
-            basegfx::B2DPoint               maSecondPosition;
-            const double                    mfTransparence;
-            const double                    mfDiscreteGrow;
-            const double                    mfDiscreteShrink;
-            const double                    mfRotation;
-
-            // #i53216# added CursorBlinkTime (in ms)
-            sal_uInt32                      mnBlinkTime;
-
-            /// bitfield
-            // Flag to remember which state to draw. Inited with false (0)
-            bool                            mbOverlayState : 1;
-
-            // geometry creation for OverlayObject
-            virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE;
-
-        public:
-            OverlayRectangle(
-                const basegfx::B2DPoint& rBasePosition,
-                const basegfx::B2DPoint& rSecondPosition,
-                const Color& rHatchColor,
-                double fTransparence,
-                double fDiscreteGrow,
-                double fDiscreteShrink,
-                double fRotation,
-                sal_uInt32 nBlinkTime,
-                bool bAnimate);
-
-            // data read access
-            double getTransparence() const { return mfTransparence; }
-            double getDiscreteGrow() const { return mfDiscreteGrow; }
-            double getDiscreteShrink() const { return mfDiscreteShrink; }
-            double getRotation() const { return mfRotation; }
-
-            // added CursorBlinkTime (in ms)
-            sal_uInt32 getBlinkTime() const { return mnBlinkTime; }
-
-            // execute event from base class ::sdr::animation::Event. Default
-            // implementation does nothing and does not create a new event.
-            virtual void Trigger(sal_uInt32 nTime) SAL_OVERRIDE;
-        };
-    } // end of namespace overlay
-} // end of namespace sdr
-
-
-
-#endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYRECTANGLE_HXX
-
-// eof
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/overlay/overlayrollingrectangle.hxx b/include/svx/sdr/overlay/overlayrollingrectangle.hxx
deleted file mode 100644
index 2d7748e8d013..000000000000
--- a/include/svx/sdr/overlay/overlayrollingrectangle.hxx
+++ /dev/null
@@ -1,75 +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_OVERLAYROLLINGRECTANGLE_HXX
-#define INCLUDED_SVX_SDR_OVERLAY_OVERLAYROLLINGRECTANGLE_HXX
-
-#include <svx/sdr/overlay/overlayobject.hxx>
-
-
-
-namespace sdr
-{
-    namespace overlay
-    {
-        class OverlayRollingRectangleStriped : public OverlayObjectWithBasePosition
-        {
-        protected:
-            // second position in pixel
-            basegfx::B2DPoint                       maSecondPosition;
-
-            // bitfield
-            // Flag to switch on/off long lines to the OutputDevice bounds
-            bool                                    mbExtendedLines : 1;
-
-            // Flag to switch on/off the bounds itself
-            bool                                    mbShowBounds : 1;
-
-            // geometry creation for OverlayObject
-            virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE;
-
-        public:
-            OverlayRollingRectangleStriped(
-                const basegfx::B2DPoint& rBasePos,
-                const basegfx::B2DPoint& rSecondPos,
-                bool bExtendedLines = false,
-                bool bShowBounds = true);
-            virtual ~OverlayRollingRectangleStriped();
-
-            // change second position
-            const basegfx::B2DPoint& getSecondPosition() const { return maSecondPosition; }
-            void setSecondPosition(const basegfx::B2DPoint& rNew);
-
-            // change extended lines
-            bool getExtendedLines() const { return mbExtendedLines; }
-
-            // change show bounds
-            bool getShowBounds() const { return mbShowBounds; }
-
-            // react on stripe definition change
-            virtual void stripeDefinitionHasChanged() SAL_OVERRIDE;
-        };
-    } // end of namespace overlay
-} // end of namespace sdr
-
-
-
-#endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYROLLINGRECTANGLE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/overlay/overlaytools.hxx b/include/svx/sdr/overlay/overlaytools.hxx
deleted file mode 100644
index 3dab6a607f75..000000000000
--- a/include/svx/sdr/overlay/overlaytools.hxx
+++ /dev/null
@@ -1,275 +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_OVERLAYTOOLS_HXX
-#define INCLUDED_SVX_SDR_OVERLAY_OVERLAYTOOLS_HXX
-
-#include <drawinglayer/primitive2d/primitivetools2d.hxx>
-#include <vcl/bitmapex.hxx>
-
-
-// Overlay helper class which holds a BotmapEx which is to be visualized
-// at the given logic position with the Bitmap's pixel size, unscaled and
-// unrotated (like a marker). The discrete pixel on the bitmap assocciated
-// with the target position is given in discrete X,Y coordinates
-namespace drawinglayer
-{
-    namespace primitive2d
-    {
-        class OverlayBitmapExPrimitive : public DiscreteMetricDependentPrimitive2D
-        {
-        private:
-            // The BitmapEx to use, PixelSize is used
-            BitmapEx                                maBitmapEx;
-
-            // The logic position
-            basegfx::B2DPoint                       maBasePosition;
-
-            // The pixel inside the BitmapEx which is assocciated with
-            // the target position (offset in the bitmap)
-            sal_uInt16                              mnCenterX;
-            sal_uInt16                              mnCenterY;
-
-            // evtl. rotation and shear around center
-            double                                  mfShearX;
-            double                                  mfRotation;
-
-        protected:
-            virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE;
-
-        public:
-            OverlayBitmapExPrimitive(
-                const BitmapEx& rBitmapEx,
-                const basegfx::B2DPoint& rBasePosition,
-                sal_uInt16 nCenterX,
-                sal_uInt16 nCenterY,
-                double fShearX = 0.0,
-                double fRotation = 0.0);
-
-            // data access
-            const BitmapEx& getBitmapEx() const { return maBitmapEx; }
-            const basegfx::B2DPoint& getBasePosition() const { return maBasePosition; }
-            sal_uInt16 getCenterX() const { return mnCenterX; }
-            sal_uInt16 getCenterY() const { return mnCenterY; }
-            double getShearX() const { return mfShearX; }
-            double getRotation() const { return mfRotation; }
-
-            // compare operator
-            virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE;
-
-            DeclPrimitive2DIDBlock()
-        };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-
-// Overlay helper class for a crosshair
-namespace drawinglayer
-{
-    namespace primitive2d
-    {
-        class OverlayCrosshairPrimitive : public ViewportDependentPrimitive2D
-        {
-        private:
-            // The logic position
-            basegfx::B2DPoint                       maBasePosition;
-
-            // The stripe colors and legth
-            basegfx::BColor                         maRGBColorA;
-            basegfx::BColor                         maRGBColorB;
-            double                                  mfDiscreteDashLength;
-
-        protected:
-            virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE;
-
-        public:
-            OverlayCrosshairPrimitive(
-                const basegfx::B2DPoint& rBasePosition,
-                const basegfx::BColor& rRGBColorA,
-                const basegfx::BColor& rRGBColorB,
-                double fDiscreteDashLength);
-
-            // data access
-            const basegfx::B2DPoint& getBasePosition() const { return maBasePosition; }
-            const basegfx::BColor& getRGBColorA() const { return maRGBColorA; }
-            const basegfx::BColor& getRGBColorB() const { return maRGBColorB; }
-            double getDiscreteDashLength() const { return mfDiscreteDashLength; }
-
-            // compare operator
-            virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE;
-
-            DeclPrimitive2DIDBlock()
-        };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-
-// Overlay helper class for a hatch rectangle as used e.g. for text object
-// selection hilighting
-namespace drawinglayer
-{
-    namespace primitive2d
-    {
-        class OverlayRectanglePrimitive : public DiscreteMetricDependentPrimitive2D
-        {
-        private:
-            // the logic rectangle definition
-            basegfx::B2DRange               maObjectRange;
-
-            // the graphic definition
-            basegfx::BColor                 maColor;
-            double                          mfTransparence;
-
-            // the dscrete grow and shrink of the box
-            double                          mfDiscreteGrow;
-            double                          mfDiscreteShrink;
-
-            // the rotation of the primitive itself
-            double                          mfRotation;
-
-        protected:
-            virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE;
-
-        public:
-            OverlayRectanglePrimitive(
-                const basegfx::B2DRange& rObjectRange,
-                const basegfx::BColor& rColor,
-                double fTransparence,
-                double fDiscreteGrow,
-                double fDiscreteShrink,
-                double fRotation);
-
-            // data access
-            const basegfx::B2DRange& getObjectRange() const { return maObjectRange; }
-            const basegfx::BColor& getColor() const { return maColor; }
-            double getTransparence() const { return mfTransparence; }
-            double getDiscreteGrow() const { return mfDiscreteGrow; }
-            double getDiscreteShrink() const { return mfDiscreteShrink; }
-            double getRotation() const { return mfRotation; }
-
-            // compare operator
-            virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE;
-
-            DeclPrimitive2DIDBlock()
-        };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-
-// Overlay helper class for a striped helpline
-
-namespace drawinglayer
-{
-    namespace primitive2d
-    {
-        enum HelplineStyle
-        {
-            HELPLINESTYLE_POINT,
-            HELPLINESTYLE_VERTICAL,
-            HELPLINESTYLE_HORIZONTAL
-        };
-
-        class OverlayHelplineStripedPrimitive : public ViewportDependentPrimitive2D
-        {
-        private:
-            // The logic position
-            basegfx::B2DPoint                       maBasePosition;
-
-            // the style
-            HelplineStyle                           meStyle;
-
-            // The stripe colors and legth
-            basegfx::BColor                         maRGBColorA;
-            basegfx::BColor                         maRGBColorB;
-            double                                  mfDiscreteDashLength;
-
-        protected:
-            virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE;
-
-        public:
-            OverlayHelplineStripedPrimitive(
-                const basegfx::B2DPoint& rBasePosition,
-                HelplineStyle eStyle,
-                const basegfx::BColor& rRGBColorA,
-                const basegfx::BColor& rRGBColorB,
-                double fDiscreteDashLength);
-
-            // data access
-            const basegfx::B2DPoint& getBasePosition() const { return maBasePosition; }
-            HelplineStyle getStyle() const { return meStyle; }
-            const basegfx::BColor& getRGBColorA() const { return maRGBColorA; }
-            const basegfx::BColor& getRGBColorB() const { return maRGBColorB; }
-            double getDiscreteDashLength() const { return mfDiscreteDashLength; }
-
-            // compare operator
-            virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE;
-
-            DeclPrimitive2DIDBlock()
-        };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-
-// Overlay helper class for rolling rectangle helplines. This primitive is
-// only for the extended lines to the ends of the view
-
-namespace drawinglayer
-{
-    namespace primitive2d
-    {
-        class OverlayRollingRectanglePrimitive : public ViewportDependentPrimitive2D
-        {
-        private:
-            // The logic range
-            basegfx::B2DRange                       maRollingRectangle;
-
-            // The stripe colors and legth
-            basegfx::BColor                         maRGBColorA;
-            basegfx::BColor                         maRGBColorB;
-            double                                  mfDiscreteDashLength;
-
-        protected:
-            virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE;
-
-        public:
-            OverlayRollingRectanglePrimitive(
-                const basegfx::B2DRange& aRollingRectangle,
-                const basegfx::BColor& rRGBColorA,
-                const basegfx::BColor& rRGBColorB,
-                double fDiscreteDashLength);
-
-            // data access
-            const basegfx::B2DRange& getRollingRectangle() const { return maRollingRectangle; }
-            const basegfx::BColor& getRGBColorA() const { return maRGBColorA; }
-            const basegfx::BColor& getRGBColorB() const { return maRGBColorB; }
-            double getDiscreteDashLength() const { return mfDiscreteDashLength; }
-
-            // compare operator
-            virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE;
-
-            DeclPrimitive2DIDBlock()
-        };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-
-
-#endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYTOOLS_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 30b7dd02b4e7..000000000000
--- a/include/svx/sdr/overlay/overlaytriangle.hxx
+++ /dev/null
@@ -1,62 +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 : public OverlayObjectWithBasePosition
-        {
-        protected:
-            // second and third position in pixel
-            basegfx::B2DPoint                       maSecondPosition;
-            basegfx::B2DPoint                       maThirdPosition;
-
-            // geometry creation for OverlayObject
-            virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE;
-
-        public:
-            OverlayTriangle(
-                const basegfx::B2DPoint& rBasePos,
-                const basegfx::B2DPoint& rSecondPos,
-                const basegfx::B2DPoint& rThirdPos,
-                Color aTriangleColor);
-            virtual ~OverlayTriangle();
-
-            // change second position
-            const basegfx::B2DPoint& getSecondPosition() const { return maSecondPosition; }
-
-            // change third position
-            const basegfx::B2DPoint& getThirdPosition() const { return maThirdPosition; }
-        };
-    } // 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/sdrcaptionprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx
deleted file mode 100644
index 02d11c4ebf72..000000000000
--- a/include/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx
+++ /dev/null
@@ -1,79 +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_SDRCAPTIONPRIMITIVE2D_HXX
-#define INCLUDED_SVX_SDR_PRIMITIVE2D_SDRCAPTIONPRIMITIVE2D_HXX
-
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx>
-#include <basegfx/polygon/b2dpolygon.hxx>
-
-
-// predefines
-
-
-
-namespace drawinglayer
-{
-    namespace primitive2d
-    {
-        class SdrCaptionPrimitive2D : public BufferedDecompositionPrimitive2D
-        {
-        private:
-            ::basegfx::B2DHomMatrix                     maTransform;
-            attribute::SdrLineFillShadowTextAttribute   maSdrLFSTAttribute;
-            ::basegfx::B2DPolygon                       maTail;
-            double                                      mfCornerRadiusX;    // [0.0..1.0] relative to 1/2 width
-            double                                      mfCornerRadiusY;    // [0.0..1.0] relative to 1/2 height
-
-        protected:
-            // local decomposition.
-            virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE;
-
-        public:
-            SdrCaptionPrimitive2D(
-                const ::basegfx::B2DHomMatrix& rTransform,
-                const attribute::SdrLineFillShadowTextAttribute& rSdrLFSTAttribute,
-                const ::basegfx::B2DPolygon& rTail,
-                double fCornerRadiusX = 0.0,
-                double fCornerRadiusY = 0.0);
-
-            // compare operator
-            virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE;
-
-            // data access
-            const ::basegfx::B2DHomMatrix& getTransform() const { return maTransform; }
-            const attribute::SdrLineFillShadowTextAttribute& getSdrLFSTAttribute() const { return maSdrLFSTAttribute; }
-            const ::basegfx::B2DPolygon& getTail() const { return maTail; }
-            double getCornerRadiusX() const { return mfCornerRadiusX; }
-            double getCornerRadiusY() const { return mfCornerRadiusY; }
-            bool isCornerRadiusUsed() const { return (0.0 != mfCornerRadiusX || 0.0 != mfCornerRadiusY); }
-
-            // provide unique ID
-            DeclPrimitive2DIDBlock()
-        };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-
-
-#endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRCAPTIONPRIMITIVE2D_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx
deleted file mode 100644
index 36591ed8bde7..000000000000
--- a/include/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx
+++ /dev/null
@@ -1,68 +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_SDRCONNECTORPRIMITIVE2D_HXX
-#define INCLUDED_SVX_SDR_PRIMITIVE2D_SDRCONNECTORPRIMITIVE2D_HXX
-
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
-#include <svx/sdr/attribute/sdrlineshadowtextattribute.hxx>
-#include <basegfx/polygon/b2dpolygon.hxx>
-
-
-// predefines
-
-
-
-namespace drawinglayer
-{
-    namespace primitive2d
-    {
-        class SdrConnectorPrimitive2D : public BufferedDecompositionPrimitive2D
-        {
-        private:
-            attribute::SdrLineShadowTextAttribute       maSdrLSTAttribute;
-            ::basegfx::B2DPolygon                       maUnitPolygon;
-
-        protected:
-            // local decomposition.
-            virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE;
-
-        public:
-            SdrConnectorPrimitive2D(
-                const attribute::SdrLineShadowTextAttribute& rSdrLSTAttribute,
-                const ::basegfx::B2DPolygon& rUnitPolygon);
-
-            // data access
-            const attribute::SdrLineShadowTextAttribute& getSdrLSTAttribute() const { return maSdrLSTAttribute; }
-            const ::basegfx::B2DPolygon& getUnitPolygon() const { return maUnitPolygon; }
-
-            // compare operator
-            virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE;
-
-            // provide unique ID
-            DeclPrimitive2DIDBlock()
-        };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-
-
-#endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRCONNECTORPRIMITIVE2D_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
deleted file mode 100644
index ccdc4a2c9265..000000000000
--- a/include/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
+++ /dev/null
@@ -1,89 +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_SDRCUSTOMSHAPEPRIMITIVE2D_HXX
-#define INCLUDED_SVX_SDR_PRIMITIVE2D_SDRCUSTOMSHAPEPRIMITIVE2D_HXX
-
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <svx/sdr/attribute/sdrshadowtextattribute.hxx>
-
-
-// predefines
-
-
-
-namespace drawinglayer
-{
-    namespace primitive2d
-    {
-        class SdrCustomShapePrimitive2D : public BufferedDecompositionPrimitive2D
-        {
-        private:
-            attribute::SdrShadowTextAttribute           maSdrSTAttribute;
-            Primitive2DSequence                         maSubPrimitives;
-            basegfx::B2DHomMatrix                       maTextBox;
-
-            // bitfield
-            // defines if SdrTextWordWrapItem was set at SdrObjCustomShape which means
-            // that the text needs to be block formatted
-            bool                                        mbWordWrap : 1;
-
-            // defines that the object contains/is a 3D AutoShape. Needed for
-            // making exceptions with shadow generation
-            bool                                        mb3DShape : 1;
-
-            // #SJ# Allow text clipping against TextBox in special cases (used for SC)
-            bool                                        mbForceTextClipToTextRange : 1;
-
-        protected:
-            // local decomposition.
-            virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE;
-
-        public:
-            SdrCustomShapePrimitive2D(
-                const attribute::SdrShadowTextAttribute& rSdrSTAttribute,
-                const Primitive2DSequence& rSubPrimitives,
-                const basegfx::B2DHomMatrix& rTextBox,
-                bool bWordWrap,
-                bool b3DShape,
-                bool bForceTextClipToTextRange);
-
-            // data access
-            const attribute::SdrShadowTextAttribute& getSdrSTAttribute() const { return maSdrSTAttribute; }
-            const Primitive2DSequence& getSubPrimitives() const { return maSubPrimitives; }
-            const basegfx::B2DHomMatrix& getTextBox() const { return maTextBox; }
-            bool getWordWrap() const { return mbWordWrap; }
-            bool get3DShape() const { return mb3DShape; }
-            bool isForceTextClipToTextRange() const { return mbForceTextClipToTextRange; }
-
-            // compare operator
-            virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE;
-
-            // provide unique ID
-            DeclPrimitive2DIDBlock()
-        };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-
-
-#endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRCUSTOMSHAPEPRIMITIVE2D_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx
deleted file mode 100644
index 39f7c16bfd58..000000000000
--- a/include/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx
+++ /dev/null
@@ -1,112 +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_SDRELLIPSEPRIMITIVE2D_HXX
-#define INCLUDED_SVX_SDR_PRIMITIVE2D_SDRELLIPSEPRIMITIVE2D_HXX
-
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx>
-
-
-// predefines
-
-
-
-namespace drawinglayer
-{
-    namespace primitive2d
-    {
-        class SdrEllipsePrimitive2D : public BufferedDecompositionPrimitive2D
-        {
-        private:
-            ::basegfx::B2DHomMatrix                     maTransform;
-            attribute::SdrLineFillShadowTextAttribute   maSdrLFSTAttribute;
-
-        protected:
-            // local decomposition.
-            virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE;
-
-        public:
-            SdrEllipsePrimitive2D(
-                const ::basegfx::B2DHomMatrix& rTransform,
-                const attribute::SdrLineFillShadowTextAttribute& rSdrLFSTAttribute);
-
-            // data access
-            const ::basegfx::B2DHomMatrix& getTransform() const { return maTransform; }
-            const attribute::SdrLineFillShadowTextAttribute& getSdrLFSTAttribute() const { return maSdrLFSTAttribute; }
-
-            // compare operator
-            virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE;
-
-            // provide unique ID
-            DeclPrimitive2DIDBlock()
-        };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-
-
-namespace drawinglayer
-{
-    namespace primitive2d
-    {
-        class SdrEllipseSegmentPrimitive2D : public SdrEllipsePrimitive2D
-        {
-        private:
-            double                                      mfStartAngle;
-            double                                      mfEndAngle;
-
-            // bitfield
-            bool                                        mbCloseSegment : 1;
-            bool                                        mbCloseUsingCenter : 1;
-
-        protected:
-            // local decomposition.
-            virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE;
-
-        public:
-            SdrEllipseSegmentPrimitive2D(
-                const ::basegfx::B2DHomMatrix& rTransform,
-                const attribute::SdrLineFillShadowTextAttribute& rSdrLFSTAttribute,
-                double fStartAngle,
-                double fEndAngle,
-                bool bCloseSegment,
-                bool bCloseUsingCenter);
-
-            // data access
-            double getStartAngle() const { return mfStartAngle; }
-            double getEndAngle() const { return mfEndAngle; }
-            bool getCloseSegment() const { return mbCloseSegment; }
-            bool getCloseUsingCenter() const { return mbCloseUsingCenter; }
-
-            // compare operator
-            virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE;
-
-            // provide unique ID
-            DeclPrimitive2DIDBlock()
-        };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-
-
-#endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRELLIPSEPRIMITIVE2D_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx
deleted file mode 100644
index b1a9bd564236..000000000000
--- a/include/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx
+++ /dev/null
@@ -1,76 +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_SDRGRAFPRIMITIVE2D_HXX
-#define INCLUDED_SVX_SDR_PRIMITIVE2D_SDRGRAFPRIMITIVE2D_HXX
-
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <svtools/grfmgr.hxx>
-#include <svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx>
-
-
-// predefines
-
-
-
-namespace drawinglayer
-{
-    namespace primitive2d
-    {
-        class SdrGrafPrimitive2D : public BufferedDecompositionPrimitive2D
-        {
-        private:
-            ::basegfx::B2DHomMatrix                     maTransform;
-            attribute::SdrLineFillShadowTextAttribute   maSdrLFSTAttribute;
-            GraphicObject                               maGraphicObject;
-            GraphicAttr                                 maGraphicAttr;
-
-        protected:
-            // local decomposition.
-            virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE;
-
-        public:
-            SdrGrafPrimitive2D(
-                const ::basegfx::B2DHomMatrix& rTransform,
-                const attribute::SdrLineFillShadowTextAttribute& rSdrLFSTAttribute,
-                const GraphicObject& rGraphicObject,
-                const GraphicAttr& rGraphicAttr);
-
-            // data access
-            const ::basegfx::B2DHomMatrix& getTransform() const { return maTransform; }
-            const attribute::SdrLineFillShadowTextAttribute& getSdrLFSTAttribute() const { return maSdrLFSTAttribute; }
-            const GraphicObject& getGraphicObject() const { return maGraphicObject; }
-            const GraphicAttr& getGraphicAttr() const { return maGraphicAttr; }
-            bool isTransparent() const;
-
-            // compare operator
-            virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE;
-
-            // provide unique ID
-            DeclPrimitive2DIDBlock()
-        };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-
-
-#endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRGRAFPRIMITIVE2D_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx
deleted file mode 100644
index 67177c7c814d..000000000000
--- a/include/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx
+++ /dev/null
@@ -1,125 +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_SDRMEASUREPRIMITIVE2D_HXX
-#define INCLUDED_SVX_SDR_PRIMITIVE2D_SDRMEASUREPRIMITIVE2D_HXX
-
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
-#include <svx/sdr/attribute/sdrlineshadowtextattribute.hxx>
-
-
-// predefines
-
-namespace drawinglayer { namespace primitive2d {
-    enum MeasureTextPosition
-    {
-        MEASURETEXTPOSITION_AUTOMATIC,
-        MEASURETEXTPOSITION_NEGATIVE,
-        MEASURETEXTPOSITION_CENTERED,
-        MEASURETEXTPOSITION_POSITIVE
-    };
-}}
-
-namespace drawinglayer { namespace attribute {
-    class SdrLineAttribute;
-}}
-
-
-
-namespace drawinglayer
-{
-    namespace primitive2d
-    {
-        class SdrMeasurePrimitive2D : public BufferedDecompositionPrimitive2D
-        {
-        private:
-            attribute::SdrLineShadowTextAttribute       maSdrLSTAttribute;
-            basegfx::B2DPoint                           maStart;
-            basegfx::B2DPoint                           maEnd;
-            MeasureTextPosition                         meHorizontal;
-            MeasureTextPosition                         meVertical;
-            double                                      mfDistance;
-            double                                      mfUpper;
-            double                                      mfLower;
-            double                                      mfLeftDelta;
-            double                                      mfRightDelta;
-
-            // bitfield
-            bool                                        mbBelow : 1;
-            bool                                        mbTextRotation : 1;
-            bool                                        mbTextAutoAngle : 1;
-
-            // internal decomposition helper
-            Primitive2DReference impCreatePart(
-                const attribute::SdrLineAttribute& rLineAttribute,
-                const basegfx::B2DHomMatrix& rObjectMatrix,
-                const basegfx::B2DPoint& rStart,
-                const basegfx::B2DPoint& rEnd,
-                bool bLeftActive,
-                bool bRightActive) const;
-
-        protected:
-            // local decomposition.
-            virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE;
-
-        public:
-            SdrMeasurePrimitive2D(
-                const attribute::SdrLineShadowTextAttribute& rSdrLSTAttribute,
-                const basegfx::B2DPoint& rStart,
-                const basegfx::B2DPoint& rEnd,
-                MeasureTextPosition eHorizontal,
-                MeasureTextPosition eVertical,
-                double fDistance,
-                double fUpper,
-                double fLower,
-                double fLeftDelta,
-                double fRightDelta,
-                bool bBelow,
-                bool bTextRotation,
-                bool bTextAutoAngle);
-
-            // data access
-            const attribute::SdrLineShadowTextAttribute& getSdrLSTAttribute() const { return maSdrLSTAttribute; }
-            const basegfx::B2DPoint& getStart() const { return maStart; }
-            const basegfx::B2DPoint& getEnd() const { return maEnd; }
-            MeasureTextPosition getHorizontal() const { return meHorizontal; }
-            MeasureTextPosition getVertical() const { return meVertical; }
-            double getDistance() const { return mfDistance; }
-            double getUpper() const { return mfUpper; }
-            double getLower() const { return mfLower; }
-            double getLeftDelta() const { return mfLeftDelta; }
-            double getRightDelta() const { return mfRightDelta; }
-            bool getBelow() const { return mbBelow; }
-            bool getTextRotation() const { return mbTextRotation; }
-            bool getTextAutoAngle() const { return mbTextAutoAngle; }
-
-            // compare operator
-            virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE;
-
-            // provide unique ID
-            DeclPrimitive2DIDBlock()
-        };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-
-
-#endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRMEASUREPRIMITIVE2D_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/primitive2d/sdrole2primitive2d.hxx b/include/svx/sdr/primitive2d/sdrole2primitive2d.hxx
deleted file mode 100644
index 888d1c770d80..000000000000
--- a/include/svx/sdr/primitive2d/sdrole2primitive2d.hxx
+++ /dev/null
@@ -1,70 +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_SDROLE2PRIMITIVE2D_HXX
-#define INCLUDED_SVX_SDR_PRIMITIVE2D_SDROLE2PRIMITIVE2D_HXX
-
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx>
-
-
-// predefines
-
-
-
-namespace drawinglayer
-{
-    namespace primitive2d
-    {
-        class SdrOle2Primitive2D : public BasePrimitive2D
-        {
-        private:
-            Primitive2DSequence                         maOLEContent;
-            basegfx::B2DHomMatrix                       maTransform;
-            attribute::SdrLineFillShadowTextAttribute   maSdrLFSTAttribute;
-
-        public:
-            SdrOle2Primitive2D(
-                const Primitive2DSequence& rOLEContent,
-                const basegfx::B2DHomMatrix& rTransform,
-                const attribute::SdrLineFillShadowTextAttribute& rSdrLFSTAttribute);
-
-            // data access
-            const Primitive2DSequence& getOLEContent() const { return maOLEContent; }
-            const basegfx::B2DHomMatrix& getTransform() const { return maTransform; }
-            const attribute::SdrLineFillShadowTextAttribute& getSdrLFSTAttribute() const { return maSdrLFSTAttribute; }
-
-            // compare operator
-            virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE;
-
-            // local decomposition.
-            virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE;
-
-            // provide unique ID
-            DeclPrimitive2DIDBlock()
-        };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-
-
-#endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDROLE2PRIMITIVE2D_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx
deleted file mode 100644
index c2394e827e83..000000000000
--- a/include/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx
+++ /dev/null
@@ -1,80 +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_SDROLECONTENTPRIMITIVE2D_HXX
-#define INCLUDED_SVX_SDR_PRIMITIVE2D_SDROLECONTENTPRIMITIVE2D_HXX
-
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <svx/svdobj.hxx>
-
-
-// predefinitions
-
-class SdrOle2Obj;
-
-
-
-namespace drawinglayer
-{
-    namespace primitive2d
-    {
-        class SdrOleContentPrimitive2D : public BufferedDecompositionPrimitive2D
-        {
-        private:
-            SdrObjectWeakRef                            mpSdrOle2Obj;
-            basegfx::B2DHomMatrix                       maObjectTransform;
-
-            // #i104867# The GraphicVersion number to identify in operator== if
-            // the graphic has changed, but without fetching it (which may
-            // be expensive, e.g. triggering chart creation)
-            sal_uInt32                                  mnGraphicVersion;
-
-        protected:
-            // local decomposition.
-            virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE;
-
-        public:
-            SdrOleContentPrimitive2D(
-                const SdrOle2Obj& rSdrOle2Obj,
-                const basegfx::B2DHomMatrix& rObjectTransform,
-                sal_uInt32 nGraphicVersion
-            );
-
-            // compare operator
-            virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE;
-
-            // The default implementation will use getDecomposition results to create the range
-            virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE;
-
-            // data access
-            const basegfx::B2DHomMatrix& getObjectTransform() const { return maObjectTransform; }
-            sal_uInt32 getGraphicVersion() const { return mnGraphicVersion; }
-
-            // provide unique ID
-            DeclPrimitive2DIDBlock()
-        };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-
-
-#endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDROLECONTENTPRIMITIVE2D_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/primitive2d/sdrpathprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrpathprimitive2d.hxx
deleted file mode 100644
index ce8bd26de582..000000000000
--- a/include/svx/sdr/primitive2d/sdrpathprimitive2d.hxx
+++ /dev/null
@@ -1,72 +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_SDRPATHPRIMITIVE2D_HXX
-#define INCLUDED_SVX_SDR_PRIMITIVE2D_SDRPATHPRIMITIVE2D_HXX
-
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx>
-#include <basegfx/polygon/b2dpolypolygon.hxx>
-
-
-// predefines
-
-
-
-namespace drawinglayer
-{
-    namespace primitive2d
-    {
-        class SdrPathPrimitive2D : public BufferedDecompositionPrimitive2D
-        {
-        private:
-            basegfx::B2DHomMatrix                       maTransform;
-            attribute::SdrLineFillShadowTextAttribute   maSdrLFSTAttribute;
-            basegfx::B2DPolyPolygon                     maUnitPolyPolygon;
-
-        protected:
-            // local decomposition.
-            virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE;
-
-        public:
-            SdrPathPrimitive2D(
-                const basegfx::B2DHomMatrix& rTransform,
-                const attribute::SdrLineFillShadowTextAttribute& rSdrLFSTAttribute,
-                const basegfx::B2DPolyPolygon& rUnitPolyPolygon);
-
-            // data access
-            const basegfx::B2DHomMatrix& getTransform() const { return maTransform; }
-            const attribute::SdrLineFillShadowTextAttribute& getSdrLFSTAttribute() const { return maSdrLFSTAttribute; }
-            const basegfx::B2DPolyPolygon& getUnitPolyPolygon() const { return maUnitPolyPolygon; }
-
-            // compare operator
-            virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE;
-
-            // provide unique ID
-            DeclPrimitive2DIDBlock()
-        };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-
-
-#endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRPATHPRIMITIVE2D_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/primitive2d/sdrprimitivetools.hxx b/include/svx/sdr/primitive2d/sdrprimitivetools.hxx
deleted file mode 100644
index a81aa0b12d7d..000000000000
--- a/include/svx/sdr/primitive2d/sdrprimitivetools.hxx
+++ /dev/null
@@ -1,49 +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_SDRPRIMITIVETOOLS_HXX
-#define INCLUDED_SVX_SDR_PRIMITIVE2D_SDRPRIMITIVETOOLS_HXX
-
-#include <vcl/bitmapex.hxx>
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
-
-
-// predefines
-
-namespace basegfx {
-    class BColor;
-}
-
-
-// helper methods
-
-namespace drawinglayer
-{
-    namespace primitive2d
-    {
-        // create a 3x3 cross in given color as BitmapEx
-        BitmapEx createDefaultCross_3x3(const basegfx::BColor& rBColor);
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-
-
-#endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRPRIMITIVETOOLS_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx
deleted file mode 100644
index 0c7453377d81..000000000000
--- a/include/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx
+++ /dev/null
@@ -1,81 +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_SDRRECTANGLEPRIMITIVE2D_HXX
-#define INCLUDED_SVX_SDR_PRIMITIVE2D_SDRRECTANGLEPRIMITIVE2D_HXX
-
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx>
-
-
-// predefines
-
-
-
-namespace drawinglayer
-{
-    namespace primitive2d
-    {
-        class SdrRectanglePrimitive2D : public BufferedDecompositionPrimitive2D
-        {
-        private:
-            basegfx::B2DHomMatrix                       maTransform;
-            attribute::SdrLineFillShadowTextAttribute   maSdrLFSTAttribute;
-            double                                      mfCornerRadiusX;    // [0.0..1.0] relative to 1/2 width
-            double                                      mfCornerRadiusY;    // [0.0..1.0] relative to 1/2 height
-
-            // bitfield
-            // flag which decides if the HitArea should be the filled geometry
-            bool                                        mbForceFillForHitTest : 1;
-
-        protected:
-            // local decomposition.
-            virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE;
-
-        public:
-            SdrRectanglePrimitive2D(
-                const basegfx::B2DHomMatrix& rTransform,
-                const attribute::SdrLineFillShadowTextAttribute& rSdrLFSTAttribute,
-                double fCornerRadiusX,
-                double fCornerRadiusY,
-                bool bForceFillForHitTest);
-
-            // data access
-            const basegfx::B2DHomMatrix& getTransform() const { return maTransform; }
-            const attribute::SdrLineFillShadowTextAttribute& getSdrLFSTAttribute() const { return maSdrLFSTAttribute; }
-            double getCornerRadiusX() const { return mfCornerRadiusX; }
-            double getCornerRadiusY() const { return mfCornerRadiusY; }
-            bool isCornerRadiusUsed() const { return (0.0 != mfCornerRadiusX || 0.0 != mfCornerRadiusY); }
-            bool getForceFillForHitTest() const { return mbForceFillForHitTest; }
-
-            // compare operator
-            virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE;
-
-            // provide unique ID
-            DeclPrimitive2DIDBlock()
-        };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-
-
-#endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRRECTANGLEPRIMITIVE2D_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/primitive2d/sdrtextprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrtextprimitive2d.hxx
deleted file mode 100644
index 650002181201..000000000000
--- a/include/svx/sdr/primitive2d/sdrtextprimitive2d.hxx
+++ /dev/null
@@ -1,338 +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_SDRTEXTPRIMITIVE2D_HXX
-#define INCLUDED_SVX_SDR_PRIMITIVE2D_SDRTEXTPRIMITIVE2D_HXX
-
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
-#include <basegfx/polygon/b2dpolypolygon.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <com/sun/star/drawing/XDrawPage.hpp>
-#include <editeng/outlobj.hxx>
-#include <tools/color.hxx>
-#include <svx/sdr/attribute/sdrformtextattribute.hxx>
-#include <tools/weakbase.hxx>
-#include <svx/sdtaitm.hxx>
-
-
-// predefines
-class SdrText;
-
-
-
-namespace drawinglayer
-{
-    namespace primitive2d
-    {
-        class SdrTextPrimitive2D : public BufferedDecompositionPrimitive2D
-        {
-        private:
-            // The text model data; this sould later just be the OutlinerParaObject or
-            // something equal
-            ::tools::WeakReference< SdrText >       mrSdrText;
-
-            // #i97628#
-            // The text content; now as local OutlinerParaObject copy (internally RefCounted and
-            // COW) and in exclusive, local form as needed in a primitive
-            const OutlinerParaObject                maOutlinerParaObject;
-
-            // remember last VisualizingPage for which a decomposition was made. If the new target
-            // is not given or different, the decomposition needs to be potentially removed
-            // for supporting e.g. page number change on MasterPage objects or the different
-            // field renderings in SubGeometry and MasterPage mnode
-            com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage > mxLastVisualizingPage;
-
-            // remember last PageNumber for which a decomposition was made. This is only used
-            // when mbContainsPageField is true, else it is 0
-            sal_Int16                               mnLastPageNumber;
-
-            // remember last PageCount for which a decomposition was made. This is only used
-            // when mbContainsPageCountField is true, else it is 0
-            sal_Int16                               mnLastPageCount;
-
-            // #i101443# remember last TextBackgroundColor to decide if a new decomposition is
-            // needed because of background color change
-            Color                                   maLastTextBackgroundColor;
-
-            // bitfield
-            // is there a PageNumber, Header, Footer or DateTimeField used? Evaluated at construction
-            bool                                    mbContainsPageField : 1;
-            bool                                    mbContainsPageCountField : 1;
-            bool                                    mbContainsOtherFields : 1;
-
-        protected:
-            // support for XTEXT_PAINTSHAPE_BEGIN/XTEXT_PAINTSHAPE_END Metafile comments
-            Primitive2DSequence encapsulateWithTextHierarchyBlockPrimitive2D(const Primitive2DSequence& rCandidate) const;
-
-        public:
-            SdrTextPrimitive2D(
-                const SdrText* pSdrText,
-                const OutlinerParaObject& rOutlinerParaObjectPtr);
-
-            // get data
-            const SdrText* getSdrText() const { return mrSdrText.get(); }
-            const OutlinerParaObject& getOutlinerParaObject() const { return maOutlinerParaObject; }
-
-            // compare operator
-            virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE;
-
-            // own get2DDecomposition to take aspect of decomposition with or without spell checker
-            // into account
-            virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE;
-
-            // transformed clone operator
-            virtual SdrTextPrimitive2D* createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const = 0;
-        };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-
-
-namespace drawinglayer
-{
-    namespace primitive2d
-    {
-        class SdrContourTextPrimitive2D : public SdrTextPrimitive2D
-        {
-        private:
-            // unit contour polygon (scaled to [0.0 .. 1.0])
-            basegfx::B2DPolyPolygon             maUnitPolyPolygon;
-
-            // complete contour polygon transform (scale, rotate, shear, translate)
-            basegfx::B2DHomMatrix               maObjectTransform;
-
-        protected:
-            // local decomposition.
-            virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE;
-
-        public:
-            SdrContourTextPrimitive2D(
-                const SdrText* pSdrText,
-                const OutlinerParaObject& rOutlinerParaObjectPtr,
-                const basegfx::B2DPolyPolygon& rUnitPolyPolygon,
-                const basegfx::B2DHomMatrix& rObjectTransform);
-
-            // get data
-            const basegfx::B2DPolyPolygon& getUnitPolyPolygon() const { return maUnitPolyPolygon; }
-            const basegfx::B2DHomMatrix& getObjectTransform() const { return maObjectTransform; }
-
-            // compare operator
-            virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE;
-
-            // transformed clone operator
-            virtual SdrTextPrimitive2D* createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const SAL_OVERRIDE;
-
-            // provide unique ID
-            DeclPrimitive2DIDBlock()
-        };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-
-
-namespace drawinglayer
-{
-    namespace primitive2d
-    {
-        class SdrPathTextPrimitive2D : public SdrTextPrimitive2D
-        {
-        private:
-            // the path to use. Each paragraph will use one Polygon.
-            basegfx::B2DPolyPolygon             maPathPolyPolygon;
-
-            // the Fontwork parameters
-            attribute::SdrFormTextAttribute     maSdrFormTextAttribute;
-
-        protected:
-            // local decomposition.
-            virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE;
-
-        public:
-            SdrPathTextPrimitive2D(
-                const SdrText* pSdrText,
-                const OutlinerParaObject& rOutlinerParaObjectPtr,
-                const basegfx::B2DPolyPolygon& rPathPolyPolygon,
-                const attribute::SdrFormTextAttribute& rSdrFormTextAttribute);
-
-            // get data
-            const basegfx::B2DPolyPolygon& getPathPolyPolygon() const { return maPathPolyPolygon; }
-            const attribute::SdrFormTextAttribute& getSdrFormTextAttribute() const { return maSdrFormTextAttribute; }
-
-            // compare operator
-            virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE;
-
-            // transformed clone operator
-            virtual SdrTextPrimitive2D* createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const SAL_OVERRIDE;
-
-            // provide unique ID
-            DeclPrimitive2DIDBlock()
-        };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-
-
-namespace drawinglayer
-{
-    namespace primitive2d
-    {
-        class SdrBlockTextPrimitive2D : public SdrTextPrimitive2D
-        {
-        private:
-            // text range transformation from unit range ([0.0 .. 1.0]) to text range
-            basegfx::B2DHomMatrix                   maTextRangeTransform;
-
-            // text alignments
-            SdrTextHorzAdjust                       maSdrTextHorzAdjust;
-            SdrTextVertAdjust                       maSdrTextVertAdjust;
-
-            // bitfield
-            bool                                    mbFixedCellHeight : 1;
-            bool                                    mbUnlimitedPage : 1;    // force layout with no text break
-            bool                                    mbCellText : 1;         // this is a cell text as block text
-            bool                                    mbWordWrap : 1;         // for CustomShapes text layout
-            bool                                    mbClipOnBounds : 1;     // for CustomShapes text layout
-
-        protected:
-            // local decomposition.
-            virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE;
-
-        public:
-            SdrBlockTextPrimitive2D(
-                const SdrText* pSdrText,
-                const OutlinerParaObject& rOutlinerParaObjectPtr,
-                const basegfx::B2DHomMatrix& rTextRangeTransform,
-                SdrTextHorzAdjust aSdrTextHorzAdjust,
-                SdrTextVertAdjust aSdrTextVertAdjust,
-                bool bFixedCellHeight,
-                bool bUnlimitedPage,
-                bool bCellText,
-                bool bWordWrap,
-                bool bClipOnBounds);
-
-            // get data
-            const basegfx::B2DHomMatrix& getTextRangeTransform() const { return maTextRangeTransform; }
-            SdrTextHorzAdjust getSdrTextHorzAdjust() const { return maSdrTextHorzAdjust; }
-            SdrTextVertAdjust getSdrTextVertAdjust() const { return maSdrTextVertAdjust; }
-            bool isFixedCellHeight() const { return mbFixedCellHeight; }
-            bool getUnlimitedPage() const { return mbUnlimitedPage; }
-            bool getCellText() const { return mbCellText; }
-            bool getWordWrap() const { return mbWordWrap; }
-            bool getClipOnBounds() const { return mbClipOnBounds; }
-
-            // compare operator
-            virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE;
-
-            // transformed clone operator
-            virtual SdrTextPrimitive2D* createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const SAL_OVERRIDE;
-
-            // provide unique ID
-            DeclPrimitive2DIDBlock()
-        };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-
-
-namespace drawinglayer
-{
-    namespace primitive2d
-    {
-        class SdrStretchTextPrimitive2D : public SdrTextPrimitive2D
-        {
-        private:
-            // text range transformation from unit range ([0.0 .. 1.0]) to text range
-            basegfx::B2DHomMatrix                   maTextRangeTransform;
-
-            // bitfield
-            bool                                    mbFixedCellHeight : 1;
-
-        protected:
-            // local decomposition.
-            virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE;
-
-        public:
-            SdrStretchTextPrimitive2D(
-                const SdrText* pSdrText,
-                const OutlinerParaObject& rOutlinerParaObjectPtr,
-                const basegfx::B2DHomMatrix& rTextRangeTransform,
-                bool bFixedCellHeight);
-
-            // get data
-            const basegfx::B2DHomMatrix& getTextRangeTransform() const { return maTextRangeTransform; }
-            bool isFixedCellHeight() const { return mbFixedCellHeight; }
-
-            // compare operator
-            virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE;
-
-            // transformed clone operator
-            virtual SdrTextPrimitive2D* createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const SAL_OVERRIDE;
-
-            // provide unique ID
-            DeclPrimitive2DIDBlock()
-        };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-
-
-namespace drawinglayer
-{
-    namespace primitive2d
-    {
-        class SdrAutoFitTextPrimitive2D : public SdrTextPrimitive2D
-        {
-        private:
-            ::basegfx::B2DHomMatrix                 maTextRangeTransform;   // text range transformation from unit range ([0.0 .. 1.0]) to text range
-
-            // bitfield
-            bool                                    mbWordWrap : 1;         // for CustomShapes text layout
-
-        protected:
-            // local decomposition.
-            virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE;
-
-        public:
-            SdrAutoFitTextPrimitive2D(
-                const SdrText* pSdrText,
-                const OutlinerParaObject& rOutlinerParaObjectPtr,
-                const ::basegfx::B2DHomMatrix& rTextRangeTransform,
-                bool bWordWrap);
-
-            // get data
-            const basegfx::B2DHomMatrix& getTextRangeTransform() const { return maTextRangeTransform; }
-            bool getWordWrap() const { return mbWordWrap; }
-
-            // compare operator
-            virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE;
-
-            // transformed clone operator
-            virtual SdrTextPrimitive2D* createTransformedClone(const ::basegfx::B2DHomMatrix& rTransform) const SAL_OVERRIDE;
-
-            // provide unique ID
-            DeclPrimitive2DIDBlock()
-        };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-
-
-#endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRTEXTPRIMITIVE2D_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/primitive3d/sdrattributecreator3d.hxx b/include/svx/sdr/primitive3d/sdrattributecreator3d.hxx
deleted file mode 100644
index 4a7270690a1f..000000000000
--- a/include/svx/sdr/primitive3d/sdrattributecreator3d.hxx
+++ /dev/null
@@ -1,55 +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_PRIMITIVE3D_SDRATTRIBUTECREATOR3D_HXX
-#define INCLUDED_SVX_SDR_PRIMITIVE3D_SDRATTRIBUTECREATOR3D_HXX
-
-#include <sal/types.h>
-
-
-// predefines
-class SfxItemSet;
-
-namespace drawinglayer { namespace attribute {
-    class Sdr3DObjectAttribute;
-}}
-
-namespace basegfx {
-    class B2DRange;
-}
-
-
-
-namespace drawinglayer
-{
-    namespace primitive2d
-    {
-        // SdrAttribute creators
-        attribute::Sdr3DObjectAttribute* createNewSdr3DObjectAttribute(const SfxItemSet& rSet);
-
-        // helpers
-
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-
-
-#endif // INCLUDED_SVX_SDR_PRIMITIVE3D_SDRATTRIBUTECREATOR3D_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/properties/captionproperties.hxx b/include/svx/sdr/properties/captionproperties.hxx
deleted file mode 100644
index b93653b36cf7..000000000000
--- a/include/svx/sdr/properties/captionproperties.hxx
+++ /dev/null
@@ -1,67 +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_PROPERTIES_CAPTIONPROPERTIES_HXX
-#define INCLUDED_SVX_SDR_PROPERTIES_CAPTIONPROPERTIES_HXX
-
-#include <svx/sdr/properties/rectangleproperties.hxx>
-
-
-
-namespace sdr
-{
-    namespace properties
-    {
-        class CaptionProperties : public RectangleProperties
-        {
-        protected:
-            // create a new itemset
-            virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool) SAL_OVERRIDE;
-
-            // react on ItemSet changes
-            virtual void ItemSetChanged(const SfxItemSet& rSet) SAL_OVERRIDE;
-
-        public:
-            // basic constructor
-            explicit CaptionProperties(SdrObject& rObj);
-
-            // constructor for copying, but using new object
-            CaptionProperties(const CaptionProperties& rProps, SdrObject& rObj);
-
-            // destructor
-            virtual ~CaptionProperties();
-
-            // Clone() operator, normally just calls the local copy constructor
-            virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE;
-
-            // set a new StyleSheet and broadcast
-            virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE;
-
-            // force default attributes for a specific object type, called from
-            // DefaultProperties::GetObjectItemSet() if a new ItemSet is created
-            virtual void ForceDefaultAttributes() SAL_OVERRIDE;
-        };
-    } // end of namespace properties
-} // end of namespace sdr
-
-
-
-#endif // INCLUDED_SVX_SDR_PROPERTIES_CAPTIONPROPERTIES_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/properties/circleproperties.hxx b/include/svx/sdr/properties/circleproperties.hxx
deleted file mode 100644
index 4a8087d81d55..000000000000
--- a/include/svx/sdr/properties/circleproperties.hxx
+++ /dev/null
@@ -1,67 +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_PROPERTIES_CIRCLEPROPERTIES_HXX
-#define INCLUDED_SVX_SDR_PROPERTIES_CIRCLEPROPERTIES_HXX
-
-#include <svx/sdr/properties/rectangleproperties.hxx>
-
-
-
-namespace sdr
-{
-    namespace properties
-    {
-        class CircleProperties : public RectangleProperties
-        {
-        protected:
-            // create a new itemset
-            virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool) SAL_OVERRIDE;
-
-            // react on ItemSet changes
-            virtual void ItemSetChanged(const SfxItemSet& rSet) SAL_OVERRIDE;
-
-        public:
-            // basic constructor
-            explicit CircleProperties(SdrObject& rObj);
-
-            // constructor for copying, but using new object
-            CircleProperties(const CircleProperties& rProps, SdrObject& rObj);
-
-            // destructor
-            virtual ~CircleProperties();
-
-            // Clone() operator, normally just calls the local copy constructor
-            virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE;
-
-            // set a new StyleSheet and broadcast
-            virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE;
-
-            // force default attributes for a specific object type, called from
-            // DefaultProperties::GetObjectItemSet() if a new ItemSet is created
-            virtual void ForceDefaultAttributes() SAL_OVERRIDE;
-        };
-    } // end of namespace properties
-} // end of namespace sdr
-
-
-
-#endif // INCLUDED_SVX_SDR_PROPERTIES_CIRCLEPROPERTIES_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/properties/connectorproperties.hxx b/include/svx/sdr/properties/connectorproperties.hxx
deleted file mode 100644
index d05391aebb7b..000000000000
--- a/include/svx/sdr/properties/connectorproperties.hxx
+++ /dev/null
@@ -1,63 +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_PROPERTIES_CONNECTORPROPERTIES_HXX
-#define INCLUDED_SVX_SDR_PROPERTIES_CONNECTORPROPERTIES_HXX
-
-#include <svx/sdr/properties/textproperties.hxx>
-
-
-
-namespace sdr
-{
-    namespace properties
-    {
-        class ConnectorProperties : public TextProperties
-        {
-        protected:
-            // create a new itemset
-            virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool) SAL_OVERRIDE;
-
-            // react on ItemSet changes
-            virtual void ItemSetChanged(const SfxItemSet& rSet) SAL_OVERRIDE;
-
-        public:
-            // basic constructor
-            explicit ConnectorProperties(SdrObject& rObj);
-
-            // constructor for copying, but using new object
-            ConnectorProperties(const ConnectorProperties& rProps, SdrObject& rObj);
-
-            // destructor
-            virtual ~ConnectorProperties();
-
-            // Clone() operator, normally just calls the local copy constructor
-            virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE;
-
-            // set a new StyleSheet and broadcast
-            virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE;
-        };
-    } // end of namespace properties
-} // end of namespace sdr
-
-
-
-#endif // INCLUDED_SVX_SDR_PROPERTIES_CONNECTORPROPERTIES_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/properties/customshapeproperties.hxx b/include/svx/sdr/properties/customshapeproperties.hxx
deleted file mode 100644
index 95d725ec647e..000000000000
--- a/include/svx/sdr/properties/customshapeproperties.hxx
+++ /dev/null
@@ -1,91 +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_PROPERTIES_CUSTOMSHAPEPROPERTIES_HXX
-#define INCLUDED_SVX_SDR_PROPERTIES_CUSTOMSHAPEPROPERTIES_HXX
-
-#include <svx/sdr/properties/textproperties.hxx>
-
-
-
-namespace sdr
-{
-    namespace properties
-    {
-        class CustomShapeProperties : public TextProperties
-        {
-        private:
-            void UpdateTextFrameStatus(bool bInvalidateRenderGeometry);
-
-        protected:
-            // create a new itemset
-            virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool) SAL_OVERRIDE;
-
-            // test changeability for a single item
-            virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) const SAL_OVERRIDE;
-
-            // react on ItemSet changes
-            virtual void ItemSetChanged(const SfxItemSet& rSet) SAL_OVERRIDE;
-
-            // react on Item change
-            virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem) SAL_OVERRIDE;
-
-            // Called after ItemChange() is done for all items. Allows local reactions on
-            // specific item changes
-            virtual void PostItemChange(const sal_uInt16 nWhich) SAL_OVERRIDE;
-
-            // clear single item
-            virtual void ClearObjectItem(const sal_uInt16 nWhich = 0) SAL_OVERRIDE;
-
-            // clear single item direct, do not do any notifies or things like that.
-            // Also supports complete deleteion of items when default parameter 0 is used.
-            virtual void ClearObjectItemDirect(const sal_uInt16 nWhich = 0) SAL_OVERRIDE;
-
-        public:
-
-            // set a new StyleSheet and broadcast
-            virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE;
-
-            // force default attributes for a specific object type, called from
-            // DefaultProperties::GetObjectItemSet() if a new ItemSet is created
-            virtual void ForceDefaultAttributes() SAL_OVERRIDE;
-
-            // basic constructor
-            explicit CustomShapeProperties(SdrObject& rObj);
-
-            // constructor for copying, but using new object
-            CustomShapeProperties(const CustomShapeProperties& rProps, SdrObject& rObj);
-
-            // destructor
-            virtual ~CustomShapeProperties();
-
-            // Clone() operator, normally just calls the local copy constructor
-            virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE;
-
-            // This is the notifyer from SfxListener
-            virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE;
-        };
-    } // end of namespace properties
-} // end of namespace sdr
-
-
-
-#endif // INCLUDED_SVX_SDR_PROPERTIES_CUSTOMSHAPEPROPERTIES_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/properties/e3dextrudeproperties.hxx b/include/svx/sdr/properties/e3dextrudeproperties.hxx
deleted file mode 100644
index dac3f8e173ea..000000000000
--- a/include/svx/sdr/properties/e3dextrudeproperties.hxx
+++ /dev/null
@@ -1,58 +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_PROPERTIES_E3DEXTRUDEPROPERTIES_HXX
-#define INCLUDED_SVX_SDR_PROPERTIES_E3DEXTRUDEPROPERTIES_HXX
-
-#include <svx/sdr/properties/e3dcompoundproperties.hxx>
-#include <svx/svxdllapi.h>
-
-
-
-namespace sdr
-{
-    namespace properties
-    {
-        class SVX_DLLPUBLIC E3dExtrudeProperties : public E3dCompoundProperties
-        {
-        protected:
-            // Called after ItemChange() is done for all items.
-            virtual void PostItemChange(const sal_uInt16 nWhich) SAL_OVERRIDE;
-
-        public:
-            // basic constructor
-            explicit E3dExtrudeProperties(SdrObject& rObj);
-
-            // constructor for copying, but using new object
-            E3dExtrudeProperties(const E3dExtrudeProperties& rProps, SdrObject& rObj);
-
-            // destructor
-            virtual ~E3dExtrudeProperties();
-
-            // Clone() operator, normally just calls the local copy constructor
-            virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE;
-        };
-    } // end of namespace properties
-} // end of namespace sdr
-
-
-
-#endif // INCLUDED_SVX_SDR_PROPERTIES_E3DEXTRUDEPROPERTIES_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/properties/e3dlatheproperties.hxx b/include/svx/sdr/properties/e3dlatheproperties.hxx
deleted file mode 100644
index 4a5b56559cbc..000000000000
--- a/include/svx/sdr/properties/e3dlatheproperties.hxx
+++ /dev/null
@@ -1,58 +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_PROPERTIES_E3DLATHEPROPERTIES_HXX
-#define INCLUDED_SVX_SDR_PROPERTIES_E3DLATHEPROPERTIES_HXX
-
-#include <svx/sdr/properties/e3dcompoundproperties.hxx>
-#include <svx/svxdllapi.h>
-
-
-
-namespace sdr
-{
-    namespace properties
-    {
-        class SVX_DLLPUBLIC E3dLatheProperties : public E3dCompoundProperties
-        {
-        protected:
-            // Called after ItemChange() is done for all items.
-            virtual void PostItemChange(const sal_uInt16 nWhich) SAL_OVERRIDE;
-
-        public:
-            // basic constructor
-            explicit E3dLatheProperties(SdrObject& rObj);
-
-            // constructor for copying, but using new object
-            E3dLatheProperties(const E3dLatheProperties& rProps, SdrObject& rObj);
-
-            // destructor
-            virtual ~E3dLatheProperties();
-
-            // Clone() operator, normally just calls the local copy constructor
-            virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE;
-        };
-    } // end of namespace properties
-} // end of namespace sdr
-
-
-
-#endif // INCLUDED_SVX_SDR_PROPERTIES_E3DLATHEPROPERTIES_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/properties/e3dsceneproperties.hxx b/include/svx/sdr/properties/e3dsceneproperties.hxx
deleted file mode 100644
index a92296d23bba..000000000000
--- a/include/svx/sdr/properties/e3dsceneproperties.hxx
+++ /dev/null
@@ -1,88 +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_PROPERTIES_E3DSCENEPROPERTIES_HXX
-#define INCLUDED_SVX_SDR_PROPERTIES_E3DSCENEPROPERTIES_HXX
-
-#include <svx/sdr/properties/e3dproperties.hxx>
-
-
-
-namespace sdr
-{
-    namespace properties
-    {
-        class E3dSceneProperties : public E3dProperties
-        {
-        protected:
-            // Called after ItemChange() is done for all items.
-            virtual void PostItemChange(const sal_uInt16 nWhich) SAL_OVERRIDE;
-
-        public:
-            // basic constructor
-            explicit E3dSceneProperties(SdrObject& rObj);
-
-            // constructor for copying, but using new object
-            E3dSceneProperties(const E3dSceneProperties& rProps, SdrObject& rObj);
-
-            // destructor
-            virtual ~E3dSceneProperties();
-
-            // Clone() operator, normally just calls the local copy constructor
-            virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE;
-
-            // get itemset
-            virtual const SfxItemSet& GetObjectItemSet() const SAL_OVERRIDE;
-
-            // get merged ItemSet. Normappl, this maps directly to GetObjectItemSet(), but may
-            // be overloaded e.g for group objects to return a merged ItemSet of the object.
-            // When using this method the returned ItemSet may contain items in the state
-            // SFX_ITEM_DONTCARE which means there were several such items with different
-            // values.
-            virtual const SfxItemSet& GetMergedItemSet() const SAL_OVERRIDE;
-
-            // Set merged ItemSet. Normally, this maps to SetObjectItemSet().
-            virtual void SetMergedItemSet(const SfxItemSet& rSet, bool bClearAllItems = false) SAL_OVERRIDE;
-
-            // Set a single item, iterate over hierarchies if necessary.
-            virtual void SetMergedItem(const SfxPoolItem& rItem) SAL_OVERRIDE;
-
-            // Clear a single item, iterate over hierarchies if necessary.
-            virtual void ClearMergedItem(const sal_uInt16 nWhich = 0) SAL_OVERRIDE;
-
-            // set a new StyleSheet and broadcast
-            virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE;
-
-            // get the installed StyleSheet
-            virtual SfxStyleSheet* GetStyleSheet() const SAL_OVERRIDE;
-
-            // Move properties to a new ItemPool. Default implementation does nothing.
-            virtual void MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = 0L) SAL_OVERRIDE;
-
-            // Special for scene:
-            void SetSceneItemsFromCamera();
-        };
-    } // end of namespace properties
-} // end of namespace sdr
-
-
-
-#endif // INCLUDED_SVX_SDR_PROPERTIES_E3DSCENEPROPERTIES_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/properties/e3dsphereproperties.hxx b/include/svx/sdr/properties/e3dsphereproperties.hxx
deleted file mode 100644
index a92596b6661f..000000000000
--- a/include/svx/sdr/properties/e3dsphereproperties.hxx
+++ /dev/null
@@ -1,57 +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_PROPERTIES_E3DSPHEREPROPERTIES_HXX
-#define INCLUDED_SVX_SDR_PROPERTIES_E3DSPHEREPROPERTIES_HXX
-
-#include <svx/sdr/properties/e3dcompoundproperties.hxx>
-
-
-
-namespace sdr
-{
-    namespace properties
-    {
-        class E3dSphereProperties : public E3dCompoundProperties
-        {
-        protected:
-            // Called after ItemChange() is done for all items.
-            virtual void PostItemChange(const sal_uInt16 nWhich) SAL_OVERRIDE;
-
-        public:
-            // basic constructor
-            explicit E3dSphereProperties(SdrObject& rObj);
-
-            // constructor for copying, but using new object
-            E3dSphereProperties(const E3dSphereProperties& rProps, SdrObject& rObj);
-
-            // destructor
-            virtual ~E3dSphereProperties();
-
-            // Clone() operator, normally just calls the local copy constructor
-            virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE;
-        };
-    } // end of namespace properties
-} // end of namespace sdr
-
-
-
-#endif // INCLUDED_SVX_SDR_PROPERTIES_E3DSPHEREPROPERTIES_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/properties/graphicproperties.hxx b/include/svx/sdr/properties/graphicproperties.hxx
deleted file mode 100644
index 8299f5a2955d..000000000000
--- a/include/svx/sdr/properties/graphicproperties.hxx
+++ /dev/null
@@ -1,67 +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_PROPERTIES_GRAPHICPROPERTIES_HXX
-#define INCLUDED_SVX_SDR_PROPERTIES_GRAPHICPROPERTIES_HXX
-
-#include <svx/sdr/properties/rectangleproperties.hxx>
-
-
-
-namespace sdr
-{
-    namespace properties
-    {
-        class GraphicProperties : public RectangleProperties
-        {
-        protected:
-            // create a new itemset
-            virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool) SAL_OVERRIDE;
-
-            // react on ItemSet changes
-            virtual void ItemSetChanged(const SfxItemSet& rSet) SAL_OVERRIDE;
-
-        public:
-            // basic constructor
-            explicit GraphicProperties(SdrObject& rObj);
-
-            // constructor for copying, but using new object
-            GraphicProperties(const GraphicProperties& rProps, SdrObject& rObj);
-
-            // destructor
-            virtual ~GraphicProperties();
-
-            // Clone() operator, normally just calls the local copy constructor
-            virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE;
-
-            // set a new StyleSheet and broadcast
-            virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE;
-
-            // force default attributes for a specific object type, called from
-            // DefaultProperties::GetObjectItemSet() if a new ItemSet is created
-            virtual void ForceDefaultAttributes() SAL_OVERRIDE;
-        };
-    } // end of namespace properties
-} // end of namespace sdr
-
-
-
-#endif // INCLUDED_SVX_SDR_PROPERTIES_GRAPHICPROPERTIES_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/properties/groupproperties.hxx b/include/svx/sdr/properties/groupproperties.hxx
deleted file mode 100644
index 41a08c45168b..000000000000
--- a/include/svx/sdr/properties/groupproperties.hxx
+++ /dev/null
@@ -1,121 +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_PROPERTIES_GROUPPROPERTIES_HXX
-#define INCLUDED_SVX_SDR_PROPERTIES_GROUPPROPERTIES_HXX
-
-#include <svx/sdr/properties/defaultproperties.hxx>
-
-
-
-namespace sdr
-{
-    namespace properties
-    {
-        class GroupProperties : public DefaultProperties
-        {
-        protected:
-            // create a new itemset
-            virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool) SAL_OVERRIDE;
-
-            // test changeability for a single item
-            virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) const SAL_OVERRIDE;
-
-            // Do the ItemChange, may do special handling
-            virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) SAL_OVERRIDE;
-
-            // Called after ItemChange() is done for all items.
-            virtual void PostItemChange(const sal_uInt16 nWhich) SAL_OVERRIDE;
-
-            // react on ItemSet changes
-            virtual void ItemSetChanged(const SfxItemSet& rSet) SAL_OVERRIDE;
-
-        public:
-            // basic constructor
-            explicit GroupProperties(SdrObject& rObj);
-
-            // copy constructor
-            GroupProperties(const GroupProperties& rProps, SdrObject& rObj);
-
-            // destructor
-            virtual ~GroupProperties();
-
-            // Clone() operator, normally just calls the local copy constructor
-            virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE;
-
-            // get itemset
-            virtual const SfxItemSet& GetObjectItemSet() const SAL_OVERRIDE;
-
-            // get merged ItemSet. Normally, this maps directly to GetObjectItemSet(), but may
-            // be overloaded e.g for group objects to return a merged ItemSet of the object.
-            // When using this method the returned ItemSet may contain items in the state
-            // SFX_ITEM_DONTCARE which means there were several such items with different
-            // values.
-            virtual const SfxItemSet& GetMergedItemSet() const SAL_OVERRIDE;
-
-            // Set merged ItemSet. Normally, this maps to SetObjectItemSet().
-            virtual void SetMergedItemSet(const SfxItemSet& rSet, bool bClearAllItems = false) SAL_OVERRIDE;
-
-            // set single item
-            virtual void SetObjectItem(const SfxPoolItem& rItem) SAL_OVERRIDE;
-
-            // set single item direct, do not do any notifies or things like that
-            virtual void SetObjectItemDirect(const SfxPoolItem& rItem) SAL_OVERRIDE;
-
-            // clear single item
-            virtual void ClearObjectItem(const sal_uInt16 nWhich = 0) SAL_OVERRIDE;
-
-            // clear single item direct, do not do any notifies or things like that.
-            // Also supports complete deleteion of items when default parameter 0 is used.
-            virtual void ClearObjectItemDirect(const sal_uInt16 nWhich = 0) SAL_OVERRIDE;
-
-            // Set a single item, iterate over hierarchies if necessary.
-            virtual void SetMergedItem(const SfxPoolItem& rItem) SAL_OVERRIDE;
-
-            // Clear a single item, iterate over hierarchies if necessary.
-            virtual void ClearMergedItem(const sal_uInt16 nWhich = 0) SAL_OVERRIDE;
-
-            // set complete item set
-            virtual void SetObjectItemSet(const SfxItemSet& rSet) SAL_OVERRIDE;
-
-            // set a new StyleSheet
-            virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE;
-
-            // get the local StyleSheet
-            virtual SfxStyleSheet* GetStyleSheet() const SAL_OVERRIDE;
-
-            // force default attributes for a specific object type, called from
-            // DefaultProperties::GetObjectItemSet() if a new ItemSet is created
-            virtual void ForceDefaultAttributes() SAL_OVERRIDE;
-
-            // Move properties to a new ItemPool.
-            virtual void MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = 0L) SAL_OVERRIDE;
-
-            // force all attributes which come from styles to hard attributes
-            // to be able to live without the style.
-            virtual void ForceStyleToHardAttributes() SAL_OVERRIDE;
-        };
-    } // end of namespace properties
-} // end of namespace sdr
-
-
-
-#endif // INCLUDED_SVX_SDR_PROPERTIES_GROUPPROPERTIES_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/properties/itemsettools.hxx b/include/svx/sdr/properties/itemsettools.hxx
deleted file mode 100644
index 6c4ce0e59d20..000000000000
--- a/include/svx/sdr/properties/itemsettools.hxx
+++ /dev/null
@@ -1,68 +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_PROPERTIES_ITEMSETTOOLS_HXX
-#define INCLUDED_SVX_SDR_PROPERTIES_ITEMSETTOOLS_HXX
-
-#include <sal/types.h>
-
-
-// predeclarations
-
-class SdrObject;
-class SfxItemSet;
-class Rectangle;
-class Fraction;
-
-
-// class to remember broadcast start positions
-namespace sdr
-{
-    namespace properties
-    {
-        class ItemChangeBroadcaster
-        {
-            sal_uInt32                                      mnCount;
-            void*                                           mpData;
-
-        public:
-            explicit ItemChangeBroadcaster(const SdrObject& rObj);
-            ~ItemChangeBroadcaster();
-
-            sal_uInt32 GetRectangleCount() const;
-            const Rectangle& GetRectangle(sal_uInt32 nIndex) const;
-        };
-    } // end of namespace properties
-} // end of namespace sdr
-
-
-
-namespace sdr
-{
-    namespace properties
-    {
-        void ScaleItemSet(SfxItemSet& rSet, const Fraction& rScale);
-    } // end of namespace properties
-} // end of namespace sdr
-
-
-
-#endif // INCLUDED_SVX_SDR_PROPERTIES_ITEMSETTOOLS_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/properties/measureproperties.hxx b/include/svx/sdr/properties/measureproperties.hxx
deleted file mode 100644
index 0d4c0f1343e9..000000000000
--- a/include/svx/sdr/properties/measureproperties.hxx
+++ /dev/null
@@ -1,67 +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_PROPERTIES_MEASUREPROPERTIES_HXX
-#define INCLUDED_SVX_SDR_PROPERTIES_MEASUREPROPERTIES_HXX
-
-#include <svx/sdr/properties/textproperties.hxx>
-
-
-
-namespace sdr
-{
-    namespace properties
-    {
-        class MeasureProperties : public TextProperties
-        {
-        protected:
-            // create a new itemset
-            virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool) SAL_OVERRIDE;
-
-            // react on ItemSet changes
-            virtual void ItemSetChanged(const SfxItemSet& rSet) SAL_OVERRIDE;
-
-        public:
-            // basic constructor
-            explicit MeasureProperties(SdrObject& rObj);
-
-            // constructor for copying, but using new object
-            MeasureProperties(const MeasureProperties& rProps, SdrObject& rObj);
-
-            // destructor
-            virtual ~MeasureProperties();
-
-            // Clone() operator, normally just calls the local copy constructor
-            virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE;
-
-            // set a new StyleSheet and broadcast
-            virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE;
-
-            // force default attributes for a specific object type, called from
-            // DefaultProperties::GetObjectItemSet() if a new ItemSet is created
-            virtual void ForceDefaultAttributes() SAL_OVERRIDE;
-        };
-    } // end of namespace properties
-} // end of namespace sdr
-
-
-
-#endif // INCLUDED_SVX_SDR_PROPERTIES_MEASUREPROPERTIES_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/properties/oleproperties.hxx b/include/svx/sdr/properties/oleproperties.hxx
deleted file mode 100644
index 9a78025acd77..000000000000
--- a/include/svx/sdr/properties/oleproperties.hxx
+++ /dev/null
@@ -1,58 +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_PROPERTIES_OLEPROPERTIES_HXX
-#define INCLUDED_SVX_SDR_PROPERTIES_OLEPROPERTIES_HXX
-
-#include <svx/sdr/properties/rectangleproperties.hxx>
-
-
-
-namespace sdr
-{
-    namespace properties
-    {
-        class OleProperties : public RectangleProperties
-        {
-        protected:
-        public:
-            // basic constructor
-            explicit OleProperties(SdrObject& rObj);
-
-            // constructor for copying, but using new object
-            OleProperties(const OleProperties& rProps, SdrObject& rObj);
-
-            // destructor
-            virtual ~OleProperties();
-
-            // Clone() operator, normally just calls the local copy constructor
-            virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE;
-
-            // force default attributes for a specific object type, called from
-            // DefaultProperties::GetObjectItemSet() if a new ItemSet is created
-            virtual void ForceDefaultAttributes() SAL_OVERRIDE;
-        };
-    } // end of namespace properties
-} // end of namespace sdr
-
-
-
-#endif // INCLUDED_SVX_SDR_PROPERTIES_OLEPROPERTIES_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/properties/pageproperties.hxx b/include/svx/sdr/properties/pageproperties.hxx
deleted file mode 100644
index 6af7debda17a..000000000000
--- a/include/svx/sdr/properties/pageproperties.hxx
+++ /dev/null
@@ -1,73 +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_PROPERTIES_PAGEPROPERTIES_HXX
-#define INCLUDED_SVX_SDR_PROPERTIES_PAGEPROPERTIES_HXX
-
-#include <svx/sdr/properties/emptyproperties.hxx>
-
-
-
-namespace sdr
-{
-    namespace properties
-    {
-        class PageProperties : public EmptyProperties
-        {
-        protected:
-            // create a new object specific itemset with object specific ranges.
-            virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& pPool) SAL_OVERRIDE;
-
-            // Do the ItemChange, may do special handling
-            virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) SAL_OVERRIDE;
-
-            // Called after ItemChange() is done for all items.
-            virtual void PostItemChange(const sal_uInt16 nWhich) SAL_OVERRIDE;
-
-        public:
-            // basic constructor
-            explicit PageProperties(SdrObject& rObj);
-
-            // constructor for copying, but using new object
-            PageProperties(const PageProperties& rProps, SdrObject& rObj);
-
-            // destructor
-            virtual ~PageProperties();
-
-            // Clone() operator, normally just calls the local copy constructor
-            virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE;
-
-            // get itemset. Overloaded here to allow creating the empty itemset
-            // without asserting
-            virtual const SfxItemSet& GetObjectItemSet() const SAL_OVERRIDE;
-
-            // get the installed StyleSheet
-            virtual SfxStyleSheet* GetStyleSheet() const SAL_OVERRIDE;
-
-            // clear single item
-            virtual void ClearObjectItem(const sal_uInt16 nWhich = 0) SAL_OVERRIDE;
-        };
-    } // end of namespace properties
-} // end of namespace sdr
-
-
-
-#endif // INCLUDED_SVX_SDR_PROPERTIES_PAGEPROPERTIES_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */