caolanm pushed to libreoffice (f21). "Resolves: tdf#90256 repair invalid docking positions"

[notifications at fedoraproject.org]

>From 64bc57f96594b2a24912fb08b645d556679064a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
Date: Thu, 26 Mar 2015 13:42:12 +0000
Subject: Resolves: tdf#90256 repair invalid docking positions


diff --git a/0001-Resolves-tdf-90256-repair-invalid-docking-positions.patch b/0001-Resolves-tdf-90256-repair-invalid-docking-positions.patch
new file mode 100644
index 0000000..4856428
--- /dev/null
+++ b/0001-Resolves-tdf-90256-repair-invalid-docking-positions.patch
@@ -0,0 +1,34 @@
+From 3c22024f41029dd4c1dca6b265d1fd0f14fc2f95 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Thu, 26 Mar 2015 13:37:10 +0000
+Subject: [PATCH] Resolves: tdf#90256 repair invalid docking positions
+
+Change-Id: If144a867dc4be6975c08cd1eea9ebb540975aafc
+---
+ framework/source/layoutmanager/layoutmanager.cxx | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
+index d4e4eee..94e99ff 100644
+--- a/framework/source/layoutmanager/layoutmanager.cxx
++++ b/framework/source/layoutmanager/layoutmanager.cxx
+@@ -531,8 +531,15 @@ bool LayoutManager::readWindowStateData( const OUString& aName, UIElement& rElem
+                     else if ( aWindowState[n].Name == WINDOWSTATE_PROPERTY_DOCKPOS )
+                     {
+                         awt::Point aPoint;
+-                        if ( aWindowState[n].Value >>= aPoint )
++                        if (aWindowState[n].Value >>= aPoint)
++                        {
++                            //tdf#90256 repair these broken Docking positions
++                            if (aPoint.X < 0)
++                                aPoint.X = SAL_MAX_INT32;
++                            if (aPoint.Y < 0)
++                                aPoint.Y = SAL_MAX_INT32;
+                             rElementData.m_aDockedData.m_aPos = aPoint;
++                        }
+                     }
+                     else if ( aWindowState[n].Name == WINDOWSTATE_PROPERTY_POS )
+                     {
+-- 
+1.9.3
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 426206d..0bac65b 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -46,7 +46,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.2
-Release:        5%{?libo_prerelease}%{?dist}
+Release:        6%{?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/
@@ -373,7 +373,8 @@ Patch75: 0001-add-accel.-to-switch-monitors-to-pres.-console.patch
 Patch76: 0001-build-libetonyek-with-no-strict-aliasing.patch
 Patch77: 0002-propagate-user-set-CFLAGS-to-build.patch
 Patch78: 0001-fdo-69036-do-not-try-to-create-a-sfxApplication-when.patch
-Patch79: 0001-fdo-69036-do-not-try-to-create-a-sfxApplication-when.patch
+Patch79: 0001-Resolves-rhbz-1204244-group-sdb-windows-together-as-.patch
+Patch80: 0001-Resolves-tdf-90256-repair-invalid-docking-positions.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
@@ -2354,6 +2355,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Thu Mar 26 2015 Caolán McNamara <caolanm at redhat.com> - 1:4.3.6.2-6
+- Resolves: tdf#90256 repair invalid docking positions
+
 * Mon Mar 23 2015 Caolán McNamara <caolanm at redhat.com> - 1:4.3.6.2-5
 - Resolves: rhbz#1204244 group sdb windows together as 'base'
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/libreoffice.git/commit/?h=f21&id=64bc57f96594b2a24912fb08b645d556679064a3