| 1 |
From 3c22024f41029dd4c1dca6b265d1fd0f14fc2f95 Mon Sep 17 00:00:00 2001 |
| 2 |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com> |
| 3 |
Date: Thu, 26 Mar 2015 13:37:10 +0000 |
| 4 |
Subject: [PATCH] Resolves: tdf#90256 repair invalid docking positions |
| 5 |
|
| 6 |
Change-Id: If144a867dc4be6975c08cd1eea9ebb540975aafc |
| 7 |
--- |
| 8 |
framework/source/layoutmanager/layoutmanager.cxx | 9 ++++++++- |
| 9 |
1 file changed, 8 insertions(+), 1 deletion(-) |
| 10 |
|
| 11 |
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx |
| 12 |
index d4e4eee..94e99ff 100644 |
| 13 |
--- a/framework/source/layoutmanager/layoutmanager.cxx |
| 14 |
+++ b/framework/source/layoutmanager/layoutmanager.cxx |
| 15 |
@@ -531,8 +531,15 @@ bool LayoutManager::readWindowStateData( const OUString& aName, UIElement& rElem |
| 16 |
else if ( aWindowState[n].Name == WINDOWSTATE_PROPERTY_DOCKPOS ) |
| 17 |
{ |
| 18 |
awt::Point aPoint; |
| 19 |
- if ( aWindowState[n].Value >>= aPoint ) |
| 20 |
+ if (aWindowState[n].Value >>= aPoint) |
| 21 |
+ { |
| 22 |
+ //tdf#90256 repair these broken Docking positions |
| 23 |
+ if (aPoint.X < 0) |
| 24 |
+ aPoint.X = SAL_MAX_INT32; |
| 25 |
+ if (aPoint.Y < 0) |
| 26 |
+ aPoint.Y = SAL_MAX_INT32; |
| 27 |
rElementData.m_aDockedData.m_aPos = aPoint; |
| 28 |
+ } |
| 29 |
} |
| 30 |
else if ( aWindowState[n].Name == WINDOWSTATE_PROPERTY_POS ) |
| 31 |
{ |
| 32 |
-- |
| 33 |
1.9.3 |
| 34 |
|
Parent Directory
| 
Revision Log