[Libreoffice-commits] core.git: 2 commits - vcl/source

[Noel Grandin (via logerrit)]

 vcl/source/control/button.cxx |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 7441aaa4c5b2215e369c62e22af098184e8ce807
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue Jul 4 14:46:24 2023 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Jul 4 19:17:04 2023 +0200

    unnecessary LogicToPixel in RadioButton::Draw
    
    we are already using logical pixels here, and ImplDraw wants logical
    pixels
    
    Change-Id: I0edc990c9943d68228600a15ccadca62127b02bf
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153967
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index ec171d91137d..a99e9733496c 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -2531,7 +2531,6 @@ void RadioButton::Draw( OutputDevice* pDev, const Point& 
rPos,
     if ( !maImage )
     {
         MapMode     aResMapMode( MapUnit::Map100thMM );
-        Point       aPos  = pDev->LogicToPixel( rPos );
         Size        aSize = GetSizePixel();
         Size        aImageSize = pDev->LogicToPixel( Size( 300, 300 ), 
aResMapMode );
         Size        aBrd1Size = pDev->LogicToPixel( Size( 20, 20 ), 
aResMapMode );
@@ -2565,7 +2564,7 @@ void RadioButton::Draw( OutputDevice* pDev, const Point& 
rPos,
             pDev->SetTextColor( GetTextColor() );
         pDev->SetTextFillColor();
 
-        ImplDraw( pDev, nFlags, aPos, aSize,
+        ImplDraw( pDev, nFlags, rPos, aSize,
                   aImageSize, aStateRect, aMouseRect );
 
         Point   aCenterPos = aStateRect.Center();
commit d408fe5cd45c9594feecec727ab2f73c66e361d0
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue Jul 4 14:36:48 2023 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Jul 4 19:16:55 2023 +0200

    unnecessary LogicToPixel in CheckBox::Draw
    
    we are already in logical pixels here, and the ImplDraw call expects
    logical pixels
    
    Change-Id: I7eab69b92998fd36c811fc7ac3949adb2f4fff7c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153966
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 69646cc9637e..ec171d91137d 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -3355,7 +3355,6 @@ void CheckBox::Draw( OutputDevice* pDev, const Point& 
rPos,
                      SystemTextColorFlags nFlags )
 {
     MapMode     aResMapMode( MapUnit::Map100thMM );
-    Point       aPos  = pDev->LogicToPixel( rPos );
     Size        aSize = GetSizePixel();
     Size        aImageSize = pDev->LogicToPixel( Size( 300, 300 ), aResMapMode 
);
     Size        aBrd1Size = pDev->LogicToPixel( Size( 20, 20 ), aResMapMode );
@@ -3392,7 +3391,7 @@ void CheckBox::Draw( OutputDevice* pDev, const Point& 
rPos,
         pDev->SetTextColor( GetTextColor() );
     pDev->SetTextFillColor();
 
-    ImplDraw( pDev, nFlags, aPos, aSize,
+    ImplDraw( pDev, nFlags, rPos, aSize,
               aImageSize, aStateRect, aMouseRect );
 
     pDev->SetLineColor();