summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-12-03 10:49:15 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-12-03 10:51:30 +0000
commitf8533123802c5a709280dd06b4452d00a11c71b1 (patch)
tree18f73619591c47aa20761020e6e1accee12c7cfa
parent605906233b568ce7c88f77023b6a4121ee878375 (diff)
Related: fdo#78151 only make outline, title and subtitle read-only
Change-Id: Ic62291a61f6f4c055255f644df5f5e02fe6d0801
-rw-r--r--sd/source/ui/view/sdview.cxx18
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;
}