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 /include/svx | |
| 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 'include/svx')
| -rw-r--r-- | include/svx/svdpagv.hxx | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx index e410b4396e6d..98bd49e3afad 100644 --- a/include/svx/svdpagv.hxx +++ b/include/svx/svdpagv.hxx @@ -232,14 +232,9 @@ public: /// At least one member must be visible for the Group object and /// it must not be locked /// @returns - // true, if the object's layer is visible and not locked + /// true, if the object's layer is visible and not locked bool IsObjMarkable(SdrObject* pObj) const; - /// Hmm, selectable is surely the same as markable, now that I - /// see this as I look for a place to put it. - /// TODO: merge these - bool IsObjSelectable(SdrObject *pObj) const; - /// Entering (editing) an object group /// After that, we have direct access to all member objects of the group. /// All other objects are not editable in the meantime (until the next |