commit 0aea0cee58fe77a9058217dfdfc3d6a02b29ee2a
author Caolán McNamara <caolanm@redhat.com> Tue Jun 29 20:50:04 2021 +0100
committer Caolán McNamara <caolanm@redhat.com> Wed Jun 30 10:10:53 2021 +0200
tree aa6f732370e132fe1226dcf5f114726b59816141
parent 7838efe4b703945ccde963f8506c8c7744e04e6e

WinFloatRound has the same content as FRound

Change-Id: Iaf1565d937ded7ab675ab216aef0100dd7af92e4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118136
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

vcl/source/window/window2.cxx

diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 3975629..db6f493 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -22,6 +22,8 @@
#include <o3tl/float_int_conversion.hxx>
#include <sal/log.hxx>

#include <tools/helpers.hxx>

#include <vcl/toolkit/dialog.hxx>
#include <vcl/event.hxx>
#include <vcl/toolkit/fixed.hxx>
@@ -369,11 +371,6 @@ void Window::SetZoom( const Fraction& rZoom )
    }
}

static tools::Long WinFloatRound( double fVal )
{
    return( fVal > 0.0 ? static_cast<tools::Long>( fVal + 0.5 ) : -static_cast<tools::Long>( -fVal + 0.5 ) );
}

void Window::SetZoomedPointFont(vcl::RenderContext& rRenderContext, const vcl::Font& rFont)
{
    const Fraction& rZoom = GetZoom();
@@ -381,8 +378,8 @@ void Window::SetZoomedPointFont(vcl::RenderContext& rRenderContext, const vcl::F
    {
        vcl::Font aFont(rFont);
        Size aSize = aFont.GetFontSize();
        aSize.setWidth( WinFloatRound(double(aSize.Width() * rZoom)) );
        aSize.setHeight( WinFloatRound(double(aSize.Height() * rZoom)) );
        aSize.setWidth( FRound(double(aSize.Width() * rZoom)) );
        aSize.setHeight( FRound(double(aSize.Height() * rZoom)) );
        aFont.SetFontSize(aSize);
        SetPointFont(rRenderContext, aFont);
    }
@@ -399,7 +396,7 @@ tools::Long Window::CalcZoom( tools::Long nCalc ) const
    if ( rZoom.GetNumerator() != rZoom.GetDenominator() )
    {
        double n = double(nCalc * rZoom);
        nCalc = WinFloatRound( n );
        nCalc = FRound( n );
    }
    return nCalc;
}