diff options
| author | Armin Le Grand <alg@apache.org> | 2013-04-09 11:22:48 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-17 09:27:40 +0100 |
| commit | 0994eb59a1bd1a993c7b6650570454ecad6077b0 (patch) | |
| tree | 38243e899a1fb58c4e9db54dc883a46c7bbb055c /sd | |
| parent | 881b79dc21560bbdb6bf0e9b50061d1507e5e165 (diff) | |
Resolves: #i121538# Disable FontWork dialog entries (slots)...
when CustomShapes are selected to avoid unwanted FontWork editing on these
shapes
(cherry picked from commit c73f0e910fcf3a940c24a639dba9b4ced2057399)
Conflicts:
sw/source/ui/shells/drawsh.cxx
sw/source/ui/shells/drwtxtsh.cxx
Change-Id: I6b702512c48e7b2376874b2e8184563d12d5c6e8
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/view/drviews6.cxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx index a4b0c2e116ed..8b9f5dd1d978 100644 --- a/sd/source/ui/view/drviews6.cxx +++ b/sd/source/ui/view/drviews6.cxx @@ -54,6 +54,7 @@ #include "DrawDocShell.hxx" #include "sdabstdlg.hxx" #include "framework/FrameworkHelper.hxx" +#include <svx/svdoashp.hxx> namespace sd { @@ -122,8 +123,14 @@ void DrawViewShell::GetFormTextState(SfxItemSet& rSet) if ( rMarkList.GetMarkCount() == 1 ) pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); - if ( pObj == NULL || !pObj->ISA(SdrTextObj) || - !((SdrTextObj*) pObj)->HasText() ) + const SdrTextObj* pTextObj = dynamic_cast< const SdrTextObj* >(pObj); + const bool bDeactivate( + !pObj || + !pTextObj || + !pTextObj->HasText() || + dynamic_cast< const SdrObjCustomShape* >(pObj)); // #121538# no FontWork for CustomShapes + + if(bDeactivate) { // automatic open/close the FontWork-Dialog; first deactivate it |