loplugin: cstylecast

Change-Id: Id2b5b2510fb13f77592d7a0455f34ccd8a20c2d7

7 files changed, 16 insertions, 115 deletions

diff --git a/svx/inc/dragmt3d.hxx b/svx/inc/dragmt3d.hxx
index eb428c6cf3c3..65a0ee889f3c 100644
--- a/svx/inc/dragmt3d.hxx
+++ b/svx/inc/dragmt3d.hxx
@@ -76,7 +76,7 @@ public:
     virtual void CancelSdrDrag() SAL_OVERRIDE;
     virtual bool EndSdrDrag(bool bCopy) SAL_OVERRIDE;
 
-    E3dView& Get3DView()  { return (E3dView&)getSdrDragView();  }
+    E3dView& Get3DView()  { return static_cast<E3dView&>(getSdrDragView());  }
 
     // for migration from XOR to overlay
     virtual void CreateOverlayGeometry(::sdr::overlay::OverlayManager& rOverlayManager) SAL_OVERRIDE;
diff --git a/svx/inc/polygn3d.hxx b/svx/inc/polygn3d.hxx
deleted file mode 100644
index 87a0db46068e..000000000000
--- a/svx/inc/polygn3d.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_INC_POLYGN3D_HXX
-#define INCLUDED_SVX_INC_POLYGN3D_HXX
-
-#include <svx/obj3d.hxx>
-#include <svx/svxdllapi.h>
-
-class SVX_DLLPUBLIC E3dPolygonObj : public E3dCompoundObject
-{
-private:
-    // parameters
-    basegfx::B3DPolyPolygon aPolyPoly3D;
-    basegfx::B3DPolyPolygon aPolyNormals3D;
-    basegfx::B2DPolyPolygon aPolyTexture2D;
-    bool            bLineOnly;
-
-    SVX_DLLPRIVATE void CreateDefaultNormals();
-    SVX_DLLPRIVATE void CreateDefaultTexture();
-
-protected:
-    virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() SAL_OVERRIDE;
-
-public:
-    void SetPolyPolygon3D(const basegfx::B3DPolyPolygon& rNewPolyPoly3D);
-    void SetPolyNormals3D(const basegfx::B3DPolyPolygon& rNewPolyPoly3D);
-    void SetPolyTexture2D(const basegfx::B2DPolyPolygon& rNewPolyPoly2D);
-
-    TYPEINFO_OVERRIDE();
-
-    E3dPolygonObj(
-        E3dDefaultAttributes& rDefault,
-        const basegfx::B3DPolyPolygon& rPolyPoly3D,
-        bool bLinOnly=false);
-
-    E3dPolygonObj();
-    virtual ~E3dPolygonObj();
-
-    const basegfx::B3DPolyPolygon& GetPolyPolygon3D() const { return aPolyPoly3D; }
-    const basegfx::B3DPolyPolygon& GetPolyNormals3D() const { return aPolyNormals3D; }
-    const basegfx::B2DPolyPolygon& GetPolyTexture2D() const { return aPolyTexture2D; }
-
-    virtual sal_uInt16 GetObjIdentifier() const SAL_OVERRIDE;
-    virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const SAL_OVERRIDE;
-
-    virtual E3dPolygonObj* Clone() const SAL_OVERRIDE;
-
-    // LineOnly?
-    bool GetLineOnly() { return bLineOnly; }
-    void SetLineOnly(bool bNew);
-};
-
-#endif // INCLUDED_SVX_INC_POLYGN3D_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sdr/contact/viewcontactofe3dcube.hxx b/svx/inc/sdr/contact/viewcontactofe3dcube.hxx
index b375bc36e9f8..531b926939b6 100644
--- a/svx/inc/sdr/contact/viewcontactofe3dcube.hxx
+++ b/svx/inc/sdr/contact/viewcontactofe3dcube.hxx
@@ -21,13 +21,7 @@
 #define INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFE3DCUBE_HXX
 
 #include <svx/sdr/contact/viewcontactofe3d.hxx>
-
-
-// predeclarations
-
-class E3dCubeObj;
-
-
+#include <svx/cube3d.hxx>
 
 namespace sdr
 {
@@ -41,9 +35,9 @@ namespace sdr
             virtual ~ViewContactOfE3dCube();
 
             // access to SdrObject
-            E3dCubeObj& GetE3dCubeObj() const
+            const E3dCubeObj& GetE3dCubeObj() const
             {
-                return (E3dCubeObj&)GetE3dObject();
+                return static_cast<const E3dCubeObj&>(GetE3dObject());
             }
 
         protected:
diff --git a/svx/inc/sdr/contact/viewcontactofe3dextrude.hxx b/svx/inc/sdr/contact/viewcontactofe3dextrude.hxx
index 32ac676d43ba..e91b46994ee7 100644
--- a/svx/inc/sdr/contact/viewcontactofe3dextrude.hxx
+++ b/svx/inc/sdr/contact/viewcontactofe3dextrude.hxx
@@ -21,12 +21,7 @@
 #define INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFE3DEXTRUDE_HXX
 
 #include <svx/sdr/contact/viewcontactofe3d.hxx>
-
-
-// predeclarations
-
-class E3dExtrudeObj;
-
+#include <svx/extrud3d.hxx>
 
 
 namespace sdr
@@ -41,9 +36,9 @@ namespace sdr
             virtual ~ViewContactOfE3dExtrude();
 
             // access to SdrObject
-            E3dExtrudeObj& GetE3dExtrudeObj() const
+            const E3dExtrudeObj& GetE3dExtrudeObj() const
             {
-                return (E3dExtrudeObj&)GetE3dObject();
+                return static_cast<const E3dExtrudeObj&>(GetE3dObject());
             }
 
         protected:
diff --git a/svx/inc/sdr/contact/viewcontactofe3dlathe.hxx b/svx/inc/sdr/contact/viewcontactofe3dlathe.hxx
index 5d50ba58aead..cf13907d313d 100644
--- a/svx/inc/sdr/contact/viewcontactofe3dlathe.hxx
+++ b/svx/inc/sdr/contact/viewcontactofe3dlathe.hxx
@@ -21,12 +21,7 @@
 #define INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFE3DLATHE_HXX
 
 #include <svx/sdr/contact/viewcontactofe3d.hxx>
-
-
-// predeclarations
-
-class E3dLatheObj;
-
+#include <svx/lathe3d.hxx>
 
 
 namespace sdr
@@ -41,9 +36,9 @@ namespace sdr
             virtual ~ViewContactOfE3dLathe();
 
             // access to SdrObject
-            E3dLatheObj& GetE3dLatheObj() const
+            const E3dLatheObj& GetE3dLatheObj() const
             {
-                return (E3dLatheObj&)GetE3dObject();
+                return static_cast<const E3dLatheObj&>(GetE3dObject());
             }
 
         protected:
diff --git a/svx/inc/sdr/contact/viewcontactofe3dpolygon.hxx b/svx/inc/sdr/contact/viewcontactofe3dpolygon.hxx
index 18601e81f64e..77043792f52b 100644
--- a/svx/inc/sdr/contact/viewcontactofe3dpolygon.hxx
+++ b/svx/inc/sdr/contact/viewcontactofe3dpolygon.hxx
@@ -21,13 +21,7 @@
 #define INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFE3DPOLYGON_HXX
 
 #include <svx/sdr/contact/viewcontactofe3d.hxx>
-
-
-// predeclarations
-
-class E3dPolygonObj;
-
-
+#include <svx/polygn3d.hxx>
 
 namespace sdr
 {
@@ -41,9 +35,9 @@ namespace sdr
             virtual ~ViewContactOfE3dPolygon();
 
             // access to SdrObject
-            E3dPolygonObj& GetE3dPolygonObj() const
+            const E3dPolygonObj& GetE3dPolygonObj() const
             {
-                return (E3dPolygonObj&)GetE3dObject();
+                return static_cast<const E3dPolygonObj&>(GetE3dObject());
             }
 
         protected:
diff --git a/svx/inc/sdr/contact/viewcontactofe3dsphere.hxx b/svx/inc/sdr/contact/viewcontactofe3dsphere.hxx
index 186251a03a49..eadc02b3fd94 100644
--- a/svx/inc/sdr/contact/viewcontactofe3dsphere.hxx
+++ b/svx/inc/sdr/contact/viewcontactofe3dsphere.hxx
@@ -21,12 +21,7 @@
 #define INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFE3DSPHERE_HXX
 
 #include <svx/sdr/contact/viewcontactofe3d.hxx>
-
-
-// predeclarations
-
-class E3dSphereObj;
-
+#include <svx/sphere3d.hxx>
 
 
 namespace sdr
@@ -41,9 +36,9 @@ namespace sdr
             virtual ~ViewContactOfE3dSphere();
 
             // access to SdrObject
-            E3dSphereObj& GetE3dSphereObj() const
+            const E3dSphereObj& GetE3dSphereObj() const
             {
-                return (E3dSphereObj&)GetE3dObject();
+                return static_cast<const E3dSphereObj&>(GetE3dObject());
             }
 
         protected: