diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2024-04-14 12:50:42 +0500 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2024-04-15 06:34:33 +0200 |
| commit | 690526f95e3ee4fd25bb2c987e093543e4bc435b (patch) | |
| tree | 06b6bb7b6c907fb1876eac1e60b7dac952b21f7b /sw/source/core/layout/wsfrm.cxx | |
| parent | 1dc92b9e9951ef118d2d823d54f9a022c2e41a27 (diff) | |
Generalize basegfx::fround for templated return type
And use it when assigning to tools::Long
Change-Id: I0814d7bac9cdd48191ba69c64e3b12a4973b3417
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166071
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sw/source/core/layout/wsfrm.cxx')
| -rw-r--r-- | sw/source/core/layout/wsfrm.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx index 0cda5673219e..28c3238b16d6 100644 --- a/sw/source/core/layout/wsfrm.cxx +++ b/sw/source/core/layout/wsfrm.cxx @@ -181,10 +181,10 @@ SwRect TransformableSwFrame::getUntransformedFrameArea() const const basegfx::B2DVector aAbsScale(basegfx::absolute(aScale)); return SwRect( - basegfx::fround(aCenter.getX() - (0.5 * aAbsScale.getX())), - basegfx::fround(aCenter.getY() - (0.5 * aAbsScale.getY())), - basegfx::fround(aAbsScale.getX()), - basegfx::fround(aAbsScale.getY())); + basegfx::fround<tools::Long>(aCenter.getX() - (0.5 * aAbsScale.getX())), + basegfx::fround<tools::Long>(aCenter.getY() - (0.5 * aAbsScale.getY())), + basegfx::fround<tools::Long>(aAbsScale.getX()), + basegfx::fround<tools::Long>(aAbsScale.getY())); } } @@ -206,10 +206,10 @@ SwRect TransformableSwFrame::getUntransformedFramePrintArea() const const SwRect aUntransformedFrameArea(getUntransformedFrameArea()); return SwRect( - basegfx::fround(aCenter.getX() - (0.5 * aAbsScale.getX())) - aUntransformedFrameArea.Left(), - basegfx::fround(aCenter.getY() - (0.5 * aAbsScale.getY())) - aUntransformedFrameArea.Top(), - basegfx::fround(aAbsScale.getX()), - basegfx::fround(aAbsScale.getY())); + basegfx::fround<tools::Long>(aCenter.getX() - (0.5 * aAbsScale.getX())) - aUntransformedFrameArea.Left(), + basegfx::fround<tools::Long>(aCenter.getY() - (0.5 * aAbsScale.getY())) - aUntransformedFrameArea.Top(), + basegfx::fround<tools::Long>(aAbsScale.getX()), + basegfx::fround<tools::Long>(aAbsScale.getY())); } } @@ -240,8 +240,8 @@ void TransformableSwFrame::adaptFrameAreasToTransformations() basegfx::B2DRange aRangeFrameArea(0.0, 0.0, 1.0, 1.0); aRangeFrameArea.transform(getLocalFrameAreaTransformation()); const SwRect aNewFrm( - basegfx::fround(aRangeFrameArea.getMinX()), basegfx::fround(aRangeFrameArea.getMinY()), - basegfx::fround(aRangeFrameArea.getWidth()), basegfx::fround(aRangeFrameArea.getHeight())); + basegfx::fround<tools::Long>(aRangeFrameArea.getMinX()), basegfx::fround<tools::Long>(aRangeFrameArea.getMinY()), + basegfx::fround<tools::Long>(aRangeFrameArea.getWidth()), basegfx::fround<tools::Long>(aRangeFrameArea.getHeight())); if(aNewFrm != mrSwFrameAreaDefinition.getFrameArea()) { @@ -256,10 +256,10 @@ void TransformableSwFrame::adaptFrameAreasToTransformations() basegfx::B2DRange aRangeFramePrintArea(0.0, 0.0, 1.0, 1.0); aRangeFramePrintArea.transform(getLocalFramePrintAreaTransformation()); const SwRect aNewPrt( - basegfx::fround(aRangeFramePrintArea.getMinX()) - mrSwFrameAreaDefinition.getFrameArea().Left(), - basegfx::fround(aRangeFramePrintArea.getMinY()) - mrSwFrameAreaDefinition.getFrameArea().Top(), - basegfx::fround(aRangeFramePrintArea.getWidth()), - basegfx::fround(aRangeFramePrintArea.getHeight())); + basegfx::fround<tools::Long>(aRangeFramePrintArea.getMinX()) - mrSwFrameAreaDefinition.getFrameArea().Left(), + basegfx::fround<tools::Long>(aRangeFramePrintArea.getMinY()) - mrSwFrameAreaDefinition.getFrameArea().Top(), + basegfx::fround<tools::Long>(aRangeFramePrintArea.getWidth()), + basegfx::fround<tools::Long>(aRangeFramePrintArea.getHeight())); if(aNewPrt != mrSwFrameAreaDefinition.getFramePrintArea()) { |