dba34c: #i96942# check if hit shape is a custom one

1 files changed, 5 insertions, 3 deletions

diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx
index 1535ce7d6ee1..13badddbb079 100644
--- a/reportdesign/source/ui/report/dlgedfunc.cxx
+++ b/reportdesign/source/ui/report/dlgedfunc.cxx
@@ -451,6 +451,7 @@ void DlgEdFunc::activateOle(SdrObject* _pObj)
 void DlgEdFunc::deactivateOle(bool _bSelect)
 {
     OLEObjCache& rObjCache = GetSdrGlobalData().GetOLEObjCache();
+    OReportController& rController = m_pParent->getSectionWindow()->getViewsWindow()->getView()->getReportView()->getController();
     const ULONG nCount = rObjCache.Count();
     for(ULONG i = 0 ; i< nCount;++i)
     {
@@ -464,7 +465,6 @@ void DlgEdFunc::deactivateOle(bool _bSelect)
                 m_bUiActive = false;
                 if ( m_bShowPropertyBrowser )
                 {
-                    OReportController& rController = m_pParent->getSectionWindow()->getViewsWindow()->getView()->getReportView()->getController();
                     rController.executeChecked(SID_SHOW_PROPERTYBROWSER,uno::Sequence< beans::PropertyValue >());
                 }
 
@@ -639,15 +639,17 @@ bool DlgEdFunc::isRectangleHit(const MouseEvent& rMEvt)
                     if (pObjOverlapped && !m_bSelectionMode)
                     {
                         colorizeOverlappedObject(pObjOverlapped);
+                    }
                 }
             }
         }
     }
-    }
-    else if ( aVEvt.pObj && !m_bSelectionMode)
+    else if ( aVEvt.pObj && (aVEvt.pObj->GetObjIdentifier() != OBJ_CUSTOMSHAPE) && !m_bSelectionMode)
     {
         colorizeOverlappedObject(aVEvt.pObj);
     }
+    else
+        bIsSetPoint = false;
     return bIsSetPoint;
 }
 // -----------------------------------------------------------------------------