[Libreoffice-commits] core.git: sd/inc sd/source

Stephan Bergmann sbergman at redhat.com
Fri Oct 7 16:55:41 UTC 2016


 sd/inc/drawdoc.hxx           |    2 +-
 sd/source/core/drawdoc2.cxx  |    3 +--
 sd/source/ui/func/fudraw.cxx |    4 ++--
 sd/source/ui/func/fusel.cxx  |    2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit ff2a399b61f34f7920e594e8cbb6c19045b24956
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Oct 7 18:52:00 2016 +0200

    SdDrawDocument::GetHitIMapObject rCmpWnd param is unused
    
    ...ever since 8a6861a404c082226b52df335e3b0046164e6432 "initial import"
    
    Change-Id: Id048d7ae1a1aa855b33e2490154ee449f16c9b2f

diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index fadb16d..1bb0467 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -438,7 +438,7 @@ public:
     static     SdAnimationInfo* GetShapeUserData(SdrObject& rObject, bool bCreate = false );
 
     SAL_DLLPRIVATE static SdIMapInfo*  GetIMapInfo( SdrObject* pObject );
-    SAL_DLLPRIVATE static IMapObject*  GetHitIMapObject( SdrObject* pObject, const Point& rWinPoint, const vcl::Window& rCmpWnd );
+    SAL_DLLPRIVATE static IMapObject*  GetHitIMapObject( SdrObject* pObject, const Point& rWinPoint );
 
     SAL_DLLPRIVATE CharClass*          GetCharClass() const { return mpCharClass; }
 
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index 530d0d6..6171e19 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -1000,8 +1000,7 @@ SdIMapInfo* SdDrawDocument::GetIMapInfo( SdrObject* pObject )
 }
 
 IMapObject* SdDrawDocument::GetHitIMapObject( SdrObject* pObj,
-                                              const Point& rWinPoint,
-                                              const vcl::Window& /* rCmpWnd */ )
+                                              const Point& rWinPoint )
 {
     SdIMapInfo* pIMapInfo = GetIMapInfo( pObj );
     IMapObject* pIMapObj = nullptr;
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index f3d7575..b8d44f1 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -659,7 +659,7 @@ bool FuDraw::SetPointer(SdrObject* pObj, const Point& rPos)
                     }
             }
             else if (bImageMapInfo &&
-                     SdDrawDocument::GetHitIMapObject(pObj, rPos, *mpWindow))
+                     SdDrawDocument::GetHitIMapObject(pObj, rPos))
             {
                 /******************************************************
                 * ImageMap
@@ -783,7 +783,7 @@ bool FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrViewE
     // URL for IMapObject underneath pointer is help text
     if ( SdDrawDocument::GetIMapInfo(pObj) )
     {
-        IMapObject* pIMapObj = SdDrawDocument::GetHitIMapObject(pObj, aPos, *mpWindow );
+        IMapObject* pIMapObj = SdDrawDocument::GetHitIMapObject(pObj, aPos);
 
         if ( pIMapObj )
         {
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index e8f3b6e6..90df8c9 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -1222,7 +1222,7 @@ bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
     {
         if ( SdDrawDocument::GetIMapInfo( pObj ) )
         {
-            const IMapObject* pIMapObj = SdDrawDocument::GetHitIMapObject( pObj, rPos, *mpWindow );
+            const IMapObject* pIMapObj = SdDrawDocument::GetHitIMapObject( pObj, rPos );
 
             if ( pIMapObj && !pIMapObj->GetURL().isEmpty() )
             {


More information about the Libreoffice-commits mailing list