[libreoffice/f21] Related: fdo#78151 only make outline title and subtitle readonly in master view

[Caolán McNamara]

commit 6adbaabb100830a2d9b8d3a51997fd13dd649c08
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Dec 3 10:57:25 2014 +0000

    Related: fdo#78151 only make outline title and subtitle readonly in master view

 ...-78151-only-make-outline-title-and-subtit.patch |   43 ++++++++++++++++++++
 libreoffice.spec                                   |    7 +++-
 2 files changed, 49 insertions(+), 1 deletions(-)
---
diff --git a/0001-Related-fdo-78151-only-make-outline-title-and-subtit.patch b/0001-Related-fdo-78151-only-make-outline-title-and-subtit.patch
new file mode 100644
index 0000000..efbf420
--- /dev/null
+++ b/0001-Related-fdo-78151-only-make-outline-title-and-subtit.patch
@@ -0,0 +1,43 @@
+From f8533123802c5a709280dd06b4452d00a11c71b1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Wed, 3 Dec 2014 10:49:15 +0000
+Subject: [PATCH] Related: fdo#78151 only make outline, title and subtitle
+ read-only
+
+Change-Id: Ic62291a61f6f4c055255f644df5f5e02fe6d0801
+---
+ sd/source/ui/view/sdview.cxx | 18 ++++++++++++++++--
+ 1 file changed, 16 insertions(+), 2 deletions(-)
+
+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;
+ }
+-- 
+1.9.3
+
diff --git a/libreoffice.spec b/libreoffice.spec
index b8a79ed..d2629ef 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -46,7 +46,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.1
-Release:        9%{?libo_prerelease}%{?dist}
+Release:        10%{?libo_prerelease}%{?dist}
 License:        (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0 and CC0
 Group:          Applications/Productivity
 URL:            http://www.libreoffice.org/
@@ -362,6 +362,7 @@ Patch55: 0001-Revert-Resolves-i63015-always-default-to-WinAnsiEnco.patch
 Patch56: 0001-Resolves-fdo-84043-don-t-create-duplicate-Mirrored-X.patch
 Patch57: 0001-Resolves-rhbz-1165444-abrt-crash-with-NULL-pView.patch
 Patch58: 0001-Only-call-super-expensive-Invalidate-on-scrollbar-to.patch
+Patch59: 0001-Related-fdo-78151-only-make-outline-title-and-subtit.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
@@ -2332,6 +2333,10 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Wed Dec 03 2014 Caolán McNamara <caolanm at redhat.com> - 1:4.3.4.1-10
+- Related: fdo#78151 only make outline title and subtitle readonly in
+  master view
+
 * Tue Dec 02 2014 Caolán McNamara <caolanm at redhat.com> - 1:4.3.4.1-9
 - Fix slow updates with annotations