[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - svx/source

[Aron Budea (via logerrit)]

 svx/source/sidebar/possize/PosSizePropertyPanel.cxx |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 1fcc356dc5e6530fbfeffd734965322310bc4b42
Author:     Aron Budea <aron.budea at collabora.com>
AuthorDate: Tue Mar 24 16:28:32 2020 +0100
Commit:     Aron Budea <aron.budea at collabora.com>
CommitDate: Tue Mar 24 16:31:14 2020 +0100

    Revert "tdf#111922 Fix Position&Size sidebar Height/Width order of..."
    
    This reverts commit ea3df44acc9da8dd91b1e5a6638822db3a5f391b.
    
    It causes cypress test failures with current online master.
    
    Change-Id: I107e0527bd0368b67fca3e67b1ec9454a2cb4c5d

diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index b0ebe3fdb16b..5af69633c30b 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -1098,12 +1098,12 @@ void PosSizePropertyPanel::SetPosSizeMinMax()
     mpMtrPosY->SetMax(basegfx::fround64(fBottom));
     mpMtrPosY->SetLast(basegfx::fround64(fBottom));
 
-    double fMaxWidth = maWorkArea.getWidth() - (maRect.getWidth() - fLeft);
-    double fMaxHeight = maWorkArea.getHeight() - (maRect.getHeight() - fTop);
-    mpMtrWidth->SetMax(basegfx::fround64(fMaxWidth*100));
-    mpMtrWidth->SetLast(basegfx::fround64(fMaxWidth*100));
-    mpMtrHeight->SetMax(basegfx::fround64(fMaxHeight*100));
-    mpMtrHeight->SetLast(basegfx::fround64(fMaxHeight*100));
+    double fMaxWidth = maWorkArea.getWidth() - (maRect.getMinX() - fLeft);
+    double fMaxHeight = maWorkArea.getHeight() - (maRect.getMinY() - fTop);
+    mpMtrWidth->SetMax(basegfx::fround64(fMaxWidth));
+    mpMtrWidth->SetLast(basegfx::fround64(fMaxWidth));
+    mpMtrHeight->SetMax(basegfx::fround64(fMaxHeight));
+    mpMtrHeight->SetLast(basegfx::fround64(fMaxHeight));
 }
 
 void PosSizePropertyPanel::UpdateUIScale()