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

[Gabor Kelemen (via logerrit)]

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

New commits:
commit ea3df44acc9da8dd91b1e5a6638822db3a5f391b
Author:     Gabor Kelemen <kelemen.gabor2 at nisz.hu>
AuthorDate: Tue Nov 26 22:50:25 2019 +0100
Commit:     Aron Budea <aron.budea at collabora.com>
CommitDate: Tue Mar 24 13:58:53 2020 +0100

    tdf#111922 Fix Position&Size sidebar Height/Width order of magnitude
    
    Change-Id: Ib279199cdca58911b989a146d60ce764742e5008
    Reviewed-on: https://gerrit.libreoffice.org/83843
    Tested-by: Jenkins
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
    (cherry picked from commit a573829438bf4a3dc43e8774bfe4e29989e2e352)
    Reviewed-on: https://gerrit.libreoffice.org/83980
    Reviewed-by: László Németh <nemeth at numbertext.org>
    (cherry picked from commit baa365141e8b3c619c7de0b01612ffe0cc3885c7)
    Reviewed-on: https://gerrit.libreoffice.org/85236
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    (cherry picked from commit 261fef18ecef98bbe05de7422b6552f42b77176d)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90972
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Aron Budea <aron.budea at collabora.com>

diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index f494d970fda7..9b97d56f89ad 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -1089,12 +1089,12 @@ void PosSizePropertyPanel::SetPosSizeMinMax()
     mpMtrPosY->SetMax(basegfx::fround64(fBottom));
     mpMtrPosY->SetLast(basegfx::fround64(fBottom));
 
-    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));
+    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));
 }
 
 void PosSizePropertyPanel::UpdateUIScale()
commit b0cc070a1f3ba98fc124ac7d99e643ff58368231
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Dec 3 15:54:27 2019 +0000
Commit:     Aron Budea <aron.budea at collabora.com>
CommitDate: Tue Mar 24 13:58:36 2020 +0100

    Resolves: tdf#99711 update metric for spinbuttons before setting their values
    
    which avoids the rounding problem
    
    Change-Id: I7e6a700037661ded1ba73d08009b9279ee12a140
    Reviewed-on: https://gerrit.libreoffice.org/84364
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Tested-by: Jenkins
    (cherry picked from commit 162a9d7e625315bb7d2f7353bfe160dc2217defa)
    Reviewed-on: https://gerrit.libreoffice.org/84399
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 154ab3d8a265c86ba5211578757542f87478b12e)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90970
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Aron Budea <aron.budea at collabora.com>

diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 78a1bd1809ee..f494d970fda7 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -103,10 +103,10 @@ PosSizePropertyPanel::PosSizePropertyPanel(
     get( mpBtnEditChart,   "btnEditChart" );
     Initialize();
 
+    mpBindings->Update( SID_ATTR_METRIC );
     mpBindings->Update( SID_ATTR_TRANSFORM_WIDTH );
     mpBindings->Update( SID_ATTR_TRANSFORM_HEIGHT );
     mpBindings->Update( SID_ATTR_TRANSFORM_PROTECT_SIZE );
-    mpBindings->Update( SID_ATTR_METRIC );
 }
 
 PosSizePropertyPanel::~PosSizePropertyPanel()