loplugin: cstylecast

Change-Id: Id2b5b2510fb13f77592d7a0455f34ccd8a20c2d7

5 files changed, 15 insertions, 42 deletions

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: