loplugin: cstylecast

Change-Id: I0ccdd2ce18336afea67a3f296b26b2de50f14808

5 files changed, 14 insertions, 24 deletions

diff --git a/include/svx/sdr/contact/viewcontactofpageobj.hxx b/include/svx/sdr/contact/viewcontactofpageobj.hxx
index 60fc63d505d3..a495f091542c 100644
--- a/include/svx/sdr/contact/viewcontactofpageobj.hxx
+++ b/include/svx/sdr/contact/viewcontactofpageobj.hxx
@@ -22,11 +22,11 @@
 
 #include <svx/sdr/contact/viewcontactofsdrobj.hxx>
 #include <svx/svxdllapi.h>
+#include <svx/svdopage.hxx>
 
 
 // predeclarations
 
-class SdrPageObj;
 class SdrPage;
 
 
@@ -53,9 +53,9 @@ namespace sdr
             virtual void ActionChanged() SAL_OVERRIDE;
 
             // access to SdrObject
-            SdrPageObj& GetPageObj() const
+            const SdrPageObj& GetPageObj() const
             {
-                return (SdrPageObj&)GetSdrObject();
+                return static_cast<const SdrPageObj&>(GetSdrObject());
             }
         };
     } // end of namespace contact
diff --git a/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx b/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx
index 67e5294aa973..223eff49c9b4 100644
--- a/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx
+++ b/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx
@@ -22,12 +22,12 @@
 
 #include <svx/sdr/contact/viewcontactofsdrobj.hxx>
 #include <svx/svxdllapi.h>
+#include <svx/svdomedia.hxx>
 #include <tools/gen.hxx>
 
 
 // predeclarations
 
-class SdrMediaObj;
 namespace avmedia { class MediaItem; }
 
 
@@ -49,9 +49,9 @@ namespace sdr
         public:
 
             // access to SdrMediaObj
-            SdrMediaObj& GetSdrMediaObj() const
+            const SdrMediaObj& GetSdrMediaObj() const
             {
-                return (SdrMediaObj&)GetSdrObject();
+                return static_cast<const SdrMediaObj&>(GetSdrObject());
             }
 
             Size    getPreferredSize() const;
diff --git a/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx b/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx
index 88ddf4615d6b..9bad53a0d0d1 100644
--- a/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx
+++ b/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx
@@ -21,12 +21,7 @@
 #define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRRECTOBJ_HXX
 
 #include <svx/sdr/contact/viewcontactoftextobj.hxx>
-
-
-// predeclarations
-
-class SdrRectObj;
-
+#include <svx/svdorect.hxx>
 
 
 namespace sdr
@@ -37,9 +32,9 @@ namespace sdr
         {
         protected:
             // internal access to SdrRectObj
-            SdrRectObj& GetRectObj() const
+            const SdrRectObj& GetRectObj() const
             {
-                return (SdrRectObj&)GetSdrObject();
+                return static_cast<const SdrRectObj&>(GetSdrObject());
             }
 
         public:
diff --git a/include/svx/sdr/contact/viewcontactoftextobj.hxx b/include/svx/sdr/contact/viewcontactoftextobj.hxx
index 3fa4639e5e42..fb07c4c52cc4 100644
--- a/include/svx/sdr/contact/viewcontactoftextobj.hxx
+++ b/include/svx/sdr/contact/viewcontactoftextobj.hxx
@@ -21,12 +21,7 @@
 #define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFTEXTOBJ_HXX
 
 #include <svx/sdr/contact/viewcontactofsdrobj.hxx>
-
-
-// predeclarations
-
-class SdrTextObj;
-
+#include <svx/svdotext.hxx>
 
 
 namespace sdr
@@ -37,9 +32,9 @@ namespace sdr
         {
         protected:
             // internal access to SdrTextObj
-            SdrTextObj& GetTextObj() const
+            const SdrTextObj& GetTextObj() const
             {
-                return (SdrTextObj&)GetSdrObject();
+                return static_cast<const SdrTextObj&>(GetSdrObject());
             }
 
         public:
diff --git a/include/svx/svdomedia.hxx b/include/svx/svdomedia.hxx
index 224f11742cdc..a828d1184b4a 100644
--- a/include/svx/svdomedia.hxx
+++ b/include/svx/svdomedia.hxx
@@ -68,8 +68,8 @@ public:
 
         Size                        getPreferredSize() const;
 
-        ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >
-                                    getSnapshot();
+        const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >
+                                    getSnapshot() const;
         ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream>
                                     GetInputStream();
         void                        SetInputStream(css::uno::Reference<css::io::XInputStream> const&);