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

[Caolán McNamara]

 sfx2/source/dialog/dinfdlg.cxx |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 7040862125fb1d805286771c26f6b51396cfb145
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Aug 29 14:01:09 2017 +0100

    Resolves: rhbz#1400287 resizing properties dialog hides widgets
    
    Change-Id: I5d066f53c5bdfb4dd50d60c5cb4b66e425c0293c
    Reviewed-on: https://gerrit.libreoffice.org/41698
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 83916da238ad..787cb7a83dfe 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1506,6 +1506,7 @@ CustomPropertiesWindow::CustomPropertiesWindow(vcl::Window* pParent,
     m_aDurationField->SetPosSizePixel(aPos, aSize);
     m_aDateField->SetPosSizePixel(aPos, aSize);
     m_aTimeField->SetPosSizePixel(aPos, aSize);
+    m_aYesNoButton->SetPosSizePixel(aPos, aSize);
 
     m_aEditLoseFocusIdle.SetPriority( TaskPriority::LOWEST );
     m_aEditLoseFocusIdle.SetInvokeHandler( LINK( this, CustomPropertiesWindow, EditTimeoutHdl ) );
@@ -1796,12 +1797,13 @@ void CustomPropertiesWindow::updateLineWidth()
 
         vcl::Window** pCurrent = pWindows;
         vcl::Window** pNewCurrent = pNewWindows;
-        while ( *pCurrent )
+        while (*pCurrent)
         {
-            Size aSize = (*pCurrent)->GetSizePixel();
-            Point aPos = (*pCurrent)->GetPosPixel();
-            aPos.Y() = (*pNewCurrent)->GetPosPixel().Y();
-            (*pNewCurrent)->SetPosSizePixel( aPos, aSize );
+            Size aSize = (*pNewCurrent)->GetSizePixel();
+            aSize.Width() = (*pCurrent)->GetSizePixel().Width();
+            Point aPos = (*pNewCurrent)->GetPosPixel();
+            aPos.X() = (*pCurrent)->GetPosPixel().X();
+            (*pNewCurrent)->SetPosSizePixel(aPos, aSize);
             pCurrent++;
             pNewCurrent++;
         }