summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-03-26 13:37:10 +0000
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-03-30 08:54:42 +0000
commit9d918f5c4b19f2ac32cd5fa9c867a4777278d787 (patch)
tree0598e66656a370323779c4fd41c29546c77a50c1
parent3eba5eb1774ab621a1f0f4dcc7e82cce6c025b0a (diff)
Resolves: tdf#90256 repair invalid docking positions
Change-Id: If144a867dc4be6975c08cd1eea9ebb540975aafc (cherry picked from commit 3c22024f41029dd4c1dca6b265d1fd0f14fc2f95) Reviewed-on: https://gerrit.libreoffice.org/15020 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
-rw-r--r--framework/source/layoutmanager/layoutmanager.cxx9
1 files changed, 8 insertions, 1 deletions
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index e8d466b878a7..5fd00baa164b 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -525,8 +525,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 )
{