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

[notifications at fedoraproject.org]

>From e5178630aa1b55c928bc84a7748ffbc0bded0c3d 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:39:38 +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 83a6e48..c29993d 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -319,6 +319,7 @@ Patch22: 0001-build-libetonyek-with-no-strict-aliasing.patch
 Patch23: 0002-propagate-user-set-CFLAGS-to-build.patch
 Patch24: 0001-gdk-pixbuf-xlib-2.0-gdk-pixbuf-2.0.patch
 Patch25: 0001-Resolves-rhbz-1204244-group-sdb-windows-together-as-.patch
+Patch26: 0001-Resolves-tdf-90256-repair-invalid-docking-positions.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/libreoffice.git/commit/?h=master&id=e5178630aa1b55c928bc84a7748ffbc0bded0c3d