diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-12-03 10:49:15 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-12-03 10:53:22 +0000 |
commit | 8ee17eb341aaa4285d6a1fb6cdb54214379b63ec (patch) | |
tree | 5a625f045fbdfa3d3de67c3b956d8d18c4c8a494 | |
parent | 645aae7dfaa8f55f93009dd227d9beeca0399059 (diff) |
Related: fdo#78151 only make outline, title and subtitle read-only
Change-Id: Ic62291a61f6f4c055255f644df5f5e02fe6d0801
(cherry picked from commit f8533123802c5a709280dd06b4452d00a11c71b1)
-rw-r--r-- | sd/source/ui/view/sdview.cxx | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index 9b93c8c47cb3..1eb87b55839a 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -738,8 +738,22 @@ bool View::SdrBeginTextEdit( } } - if (bMasterPage && bReturn) - maMasterViewFilter.Start(pOutl); + if (bMasterPage && bReturn && pOutl) + { + const SdrTextObj* pTextObj = pOutl->GetTextObj(); + const SdPage* pSdPage = pTextObj ? static_cast<const SdPage*>(pTextObj->GetPage()) : NULL; + const PresObjKind eKind = pSdPage ? pSdPage->GetPresObjKind(const_cast<SdrTextObj*>(pTextObj)) : PRESOBJ_NONE; + switch (eKind) + { + case PRESOBJ_TITLE: + case PRESOBJ_OUTLINE: + case PRESOBJ_TEXT: + maMasterViewFilter.Start(pOutl); + break; + default: + break; + } + } return bReturn; } |