diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2016-08-02 14:30:09 +0200 |
|---|---|---|
| committer | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2016-09-29 04:19:03 +0000 |
| commit | a87a31602165cb2a37c32f5928e4f9daade7271d (patch) | |
| tree | b169a6d961d7a0cbbf61c18a236d3a0c2f40f698 /sd/source/ui | |
| parent | 2f6f851acab5284f516ad6a91c05149ffed575d2 (diff) | |
merge SdrPageView::IsObjSelectable and SdrPageView::IsObjMarkable
These member functions have the same purpose and share same
functionality in great parts.
The checks are rewritten for better readability and merged
into IsObjMarkable.
This adds IsInserted and a same page check to the function.
Tested selection of nested grouped objects.
Tested selection of objects in front of objects on master pages.
The fix for #i43302# doesn't seem nessasary (saw no way to create
empty groups) but leaving it on for now.
Change-Id: I35d84c66dfd832d626ba2700f22d4c437593cac7
Reviewed-on: https://gerrit.libreoffice.org/27786
Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
Tested-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
Diffstat (limited to 'sd/source/ui')
| -rw-r--r-- | sd/source/ui/func/fusel.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/func/futext.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index 6ba46951c997..007cb9614cc8 100644 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -673,7 +673,7 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) SdrObject* pObj; if (mpView->PickObj(aMDPos, mpView->getHitTolLog(), pObj, pPV, SdrSearchOptions::ALSOONMASTER | SdrSearchOptions::BEFOREMARK)) { - if (pPV->IsObjSelectable(pObj)) + if (pPV->IsObjMarkable(pObj)) { mpView->UnmarkAllObj(); mpView->MarkObj(pObj,pPV); diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index 9b0979b958ca..6ae69e7843b4 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -660,7 +660,7 @@ bool FuText::MouseButtonUp(const MouseEvent& rMEvt) SdrPageView* pPV; if (mpView->PickObj(aMDPos, mpView->getHitTolLog(), pObj, pPV, SdrSearchOptions::ALSOONMASTER | SdrSearchOptions::BEFOREMARK)) { - if (pPV->IsObjSelectable(pObj)) + if (pPV->IsObjMarkable(pObj)) { mpView->UnmarkAllObj(); mpView->MarkObj(pObj,pPV); |