diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-07-03 15:53:00 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-07-03 16:17:22 +0100 |
| commit | abbe4f9d64073d77c4be93b7c89c03d0651bacef (patch) | |
| tree | 62412baed3e7000f830ffc25faecf40d91e2b7fd /sd/source/ui/func/futext.cxx | |
| parent | 2a583603dec40090289ddb5b4b70d800794cf57b (diff) | |
fix deselect of textbox on slides with images in underlying master
The original work of tdf#55430 tries to select an object under
another one on the second click, but these images are unselectable
so this fails. Red Hat has a whole new shiny bunch of templates which
have such images in their masters.
Check if the object is selectable before continuing
Change-Id: I182abaf50e8bb1084c5819dc9e1ffd8b386a9e93
Diffstat (limited to 'sd/source/ui/func/futext.cxx')
| -rw-r--r-- | sd/source/ui/func/futext.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index e308e2ef6da8..c3b40902319a 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -657,9 +657,12 @@ bool FuText::MouseButtonUp(const MouseEvent& rMEvt) **************************************************************/ if (mpView->PickObj(aMDPos, mpView->getHitTolLog(), pObj, pPV, SdrSearchOptions::ALSOONMASTER | SdrSearchOptions::BEFOREMARK)) { - mpView->UnmarkAllObj(); - mpView->MarkObj(pObj,pPV,false,false); - return bReturn; + if (pPV->IsObjSelectable(pObj)) + { + mpView->UnmarkAllObj(); + mpView->MarkObj(pObj,pPV,false,false); + return bReturn; + } } } } |