[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sd/source

[Caolán McNamara]

 sd/source/ui/view/sdview.cxx |   18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

New commits:
commit 8ee17eb341aaa4285d6a1fb6cdb54214379b63ec
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Dec 3 10:49:15 2014 +0000

    Related: fdo#78151 only make outline, title and subtitle read-only
    
    Change-Id: Ic62291a61f6f4c055255f644df5f5e02fe6d0801
    (cherry picked from commit f8533123802c5a709280dd06b4452d00a11c71b1)

diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 9b93c8c..1eb87b5 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;
 }