strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Ocke Janssen [oj] 2011-01-03 14:49:28 +01:00
parent e28d24e20f
commit 8a8d24e0e1
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
reportdesign/source/ui/report/dlgedfunc.cxx
View file

@ -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;
}
// -----------------------------------------------------------------------------