[Libreoffice-commits] core.git: svx/source

Stephan Bergmann sbergman at redhat.com
Thu Aug 28 06:50:48 PDT 2014


 svx/source/svdraw/svdobj.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 27eb09662da8ca9bf44d424dec15d86a92b08b84
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Aug 28 15:50:12 2014 +0200

    Avoid unnecessary, potentially invalid downcasts from SdrObject to SdrObjGroup
    
    Change-Id: If00b4a11ce5e568b9e4ff00038dc9e1f068cfd79

diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index acbd428..ab285d4 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -2881,10 +2881,10 @@ void SdrObject::SetUserCall(SdrObjUserCall* pUser)
 
 void SdrObject::SendUserCall(SdrUserCallType eUserCall, const Rectangle& rBoundRect) const
 {
-    SdrObjGroup* pGroup = NULL;
+    SdrObject* pGroup = NULL;
 
     if( pObjList && pObjList->GetListKind() == SDROBJLIST_GROUPOBJ )
-        pGroup = (SdrObjGroup*) pObjList->GetOwnerObj();
+        pGroup = pObjList->GetOwnerObj();
 
     if ( pUserCall )
     {
@@ -2936,8 +2936,8 @@ void SdrObject::SendUserCall(SdrUserCallType eUserCall, const Rectangle& rBoundR
 
         if( pGroup->GetObjList()                                       &&
             pGroup->GetObjList()->GetListKind() == SDROBJLIST_GROUPOBJ &&
-            pGroup != (SdrObjGroup*) pObjList->GetOwnerObj() )
-            pGroup = (SdrObjGroup*) pObjList->GetOwnerObj();
+            pGroup != pObjList->GetOwnerObj() )
+            pGroup = pObjList->GetOwnerObj();
         else
             pGroup = NULL;
     }


More information about the Libreoffice-commits mailing list