summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/draw/dflyobj.cxx32
-rw-r--r--sw/source/core/layout/wsfrm.cxx28
-rw-r--r--sw/source/ui/table/autoformatpreview.cxx15
3 files changed, 39 insertions, 36 deletions
diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx
index 691de68289cc..26254ad9e9f2 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -866,8 +866,8 @@ void SwVirtFlyDrawObj::NbcCrop(const basegfx::B2DPoint& rRef, double fxFact, dou
// rRef is relative to the Crop-Action, si in X/Y-Ranges of [0.0 .. 1.0],
// to get the correct absolute position, transform using the old Rect
const Point aRef(
- aOldRect.Left() + basegfx::fround(aOldRect.GetWidth() * rRef.getX()),
- aOldRect.Top() + basegfx::fround(aOldRect.GetHeight() * rRef.getY()));
+ aOldRect.Left() + basegfx::fround<tools::Long>(aOldRect.GetWidth() * rRef.getX()),
+ aOldRect.Top() + basegfx::fround<tools::Long>(aOldRect.GetHeight() * rRef.getY()));
// apply transformation, use old ResizeRect for now
tools::Rectangle aNewRect( aOldRect );
@@ -956,8 +956,8 @@ void SwVirtFlyDrawObj::NbcCrop(const basegfx::B2DPoint& rRef, double fxFact, dou
// Create the new TopLeft of the unrotated, cropped object by creating
// as if re-creating the unrotated geometry
aNewTopLeft = Point(
- basegfx::fround(aRotNewCenter.getX() - (0.5 * aNewRect.getOpenWidth())),
- basegfx::fround(aRotNewCenter.getY() - (0.5 * aNewRect.getOpenHeight())));
+ basegfx::fround<tools::Long>(aRotNewCenter.getX() - (0.5 * aNewRect.getOpenWidth())),
+ basegfx::fround<tools::Long>(aRotNewCenter.getY() - (0.5 * aNewRect.getOpenHeight())));
}
// check if we have movement and execute if yes
@@ -1018,10 +1018,10 @@ void SwVirtFlyDrawObj::NbcResize(const Point& rRef, const Fraction& xFact, const
// create new modified, but untransformed OutRect
setOutRectangle(tools::Rectangle(
- basegfx::fround(aCenter.getX() - (0.5 * aAbsScale.getX())),
- basegfx::fround(aCenter.getY() - (0.5 * aAbsScale.getY())),
- basegfx::fround(aCenter.getX() + (0.5 * aAbsScale.getX())),
- basegfx::fround(aCenter.getY() + (0.5 * 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>(aCenter.getX() + (0.5 * aAbsScale.getX())),
+ basegfx::fround<tools::Long>(aCenter.getY() + (0.5 * aAbsScale.getY()))));
// restore FrameAreas so that actions below not adapted to new
// full transformations take the correct actions
@@ -1242,21 +1242,21 @@ void SwVirtFlyDrawObj::addCropHandles(SdrHdlList& rTarget) const
basegfx::B2DPoint aPos;
aPos = aTargetTransform * basegfx::B2DPoint(0.0, 0.0);
- rTarget.AddHdl(std::make_unique<SdrCropHdl>(Point(basegfx::fround(aPos.getX()), basegfx::fround(aPos.getY())), SdrHdlKind::UpperLeft, fShearX, fRotate));
+ rTarget.AddHdl(std::make_unique<SdrCropHdl>(Point(basegfx::fround<tools::Long>(aPos.getX()), basegfx::fround<tools::Long>(aPos.getY())), SdrHdlKind::UpperLeft, fShearX, fRotate));
aPos = aTargetTransform * basegfx::B2DPoint(0.5, 0.0);
- rTarget.AddHdl(std::make_unique<SdrCropHdl>(Point(basegfx::fround(aPos.getX()), basegfx::fround(aPos.getY())), SdrHdlKind::Upper, fShearX, fRotate));
+ rTarget.AddHdl(std::make_unique<SdrCropHdl>(Point(basegfx::fround<tools::Long>(aPos.getX()), basegfx::fround<tools::Long>(aPos.getY())), SdrHdlKind::Upper, fShearX, fRotate));
aPos = aTargetTransform * basegfx::B2DPoint(1.0, 0.0);
- rTarget.AddHdl(std::make_unique<SdrCropHdl>(Point(basegfx::fround(aPos.getX()), basegfx::fround(aPos.getY())), SdrHdlKind::UpperRight, fShearX, fRotate));
+ rTarget.AddHdl(std::make_unique<SdrCropHdl>(Point(basegfx::fround<tools::Long>(aPos.getX()), basegfx::fround<tools::Long>(aPos.getY())), SdrHdlKind::UpperRight, fShearX, fRotate));
aPos = aTargetTransform * basegfx::B2DPoint(0.0, 0.5);
- rTarget.AddHdl(std::make_unique<SdrCropHdl>(Point(basegfx::fround(aPos.getX()), basegfx::fround(aPos.getY())), SdrHdlKind::Left , fShearX, fRotate));
+ rTarget.AddHdl(std::make_unique<SdrCropHdl>(Point(basegfx::fround<tools::Long>(aPos.getX()), basegfx::fround<tools::Long>(aPos.getY())), SdrHdlKind::Left , fShearX, fRotate));
aPos = aTargetTransform * basegfx::B2DPoint(1.0, 0.5);
- rTarget.AddHdl(std::make_unique<SdrCropHdl>(Point(basegfx::fround(aPos.getX()), basegfx::fround(aPos.getY())), SdrHdlKind::Right, fShearX, fRotate));
+ rTarget.AddHdl(std::make_unique<SdrCropHdl>(Point(basegfx::fround<tools::Long>(aPos.getX()), basegfx::fround<tools::Long>(aPos.getY())), SdrHdlKind::Right, fShearX, fRotate));
aPos = aTargetTransform * basegfx::B2DPoint(0.0, 1.0);
- rTarget.AddHdl(std::make_unique<SdrCropHdl>(Point(basegfx::fround(aPos.getX()), basegfx::fround(aPos.getY())), SdrHdlKind::LowerLeft, fShearX, fRotate));
+ rTarget.AddHdl(std::make_unique<SdrCropHdl>(Point(basegfx::fround<tools::Long>(aPos.getX()), basegfx::fround<tools::Long>(aPos.getY())), SdrHdlKind::LowerLeft, fShearX, fRotate));
aPos = aTargetTransform * basegfx::B2DPoint(0.5, 1.0);
- rTarget.AddHdl(std::make_unique<SdrCropHdl>(Point(basegfx::fround(aPos.getX()), basegfx::fround(aPos.getY())), SdrHdlKind::Lower, fShearX, fRotate));
+ rTarget.AddHdl(std::make_unique<SdrCropHdl>(Point(basegfx::fround<tools::Long>(aPos.getX()), basegfx::fround<tools::Long>(aPos.getY())), SdrHdlKind::Lower, fShearX, fRotate));
aPos = aTargetTransform * basegfx::B2DPoint(1.0, 1.0);
- rTarget.AddHdl(std::make_unique<SdrCropHdl>(Point(basegfx::fround(aPos.getX()), basegfx::fround(aPos.getY())), SdrHdlKind::LowerRight, fShearX, fRotate));
+ rTarget.AddHdl(std::make_unique<SdrCropHdl>(Point(basegfx::fround<tools::Long>(aPos.getX()), basegfx::fround<tools::Long>(aPos.getY())), SdrHdlKind::LowerRight, fShearX, fRotate));
}
// Macro
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())
{
diff --git a/sw/source/ui/table/autoformatpreview.cxx b/sw/source/ui/table/autoformatpreview.cxx
index e04fffefcae4..08ec0e27d3d5 100644
--- a/sw/source/ui/table/autoformatpreview.cxx
+++ b/sw/source/ui/table/autoformatpreview.cxx
@@ -237,9 +237,10 @@ void AutoFormatPreview::DrawString(vcl::RenderContext& rRenderContext, size_t nC
Size aStrSize;
sal_uInt8 nFormatIndex = GetFormatIndex(nCol, nRow);
const basegfx::B2DRange aCellRange(maArray.GetCellRange(nCol, nRow));
- const tools::Rectangle cellRect(
- basegfx::fround(aCellRange.getMinX()), basegfx::fround(aCellRange.getMinY()),
- basegfx::fround(aCellRange.getMaxX()), basegfx::fround(aCellRange.getMaxY()));
+ const tools::Rectangle cellRect(basegfx::fround<tools::Long>(aCellRange.getMinX()),
+ basegfx::fround<tools::Long>(aCellRange.getMinY()),
+ basegfx::fround<tools::Long>(aCellRange.getMaxX()),
+ basegfx::fround<tools::Long>(aCellRange.getMaxY()));
Point aPos = cellRect.TopLeft();
tools::Long nRightX = 0;
@@ -327,9 +328,11 @@ void AutoFormatPreview::DrawBackground(vcl::RenderContext& rRenderContext)
rRenderContext.SetLineColor();
rRenderContext.SetFillColor(aBrushItem.GetColor());
const basegfx::B2DRange aCellRange(maArray.GetCellRange(nCol, nRow));
- rRenderContext.DrawRect(tools::Rectangle(
- basegfx::fround(aCellRange.getMinX()), basegfx::fround(aCellRange.getMinY()),
- basegfx::fround(aCellRange.getMaxX()), basegfx::fround(aCellRange.getMaxY())));
+ rRenderContext.DrawRect(
+ tools::Rectangle(basegfx::fround<tools::Long>(aCellRange.getMinX()),
+ basegfx::fround<tools::Long>(aCellRange.getMinY()),
+ basegfx::fround<tools::Long>(aCellRange.getMaxX()),
+ basegfx::fround<tools::Long>(aCellRange.getMaxY())));
rRenderContext.Pop();
}
}
generated by cgit (git 2.34.1) at 2024-06-01 21:37:15 +0000