[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - framework/source

[Caolán McNamara]

 framework/source/layoutmanager/layoutmanager.cxx |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 9d918f5c4b19f2ac32cd5fa9c867a4777278d787
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Mar 26 13:37:10 2015 +0000

    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 at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index e8d466b..5fd00ba 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 )
                     {