ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

lets have just one getB2DRange function/method

Browse Source 
Change-Id: I5081abca177c6fb8bd21d971d93dc115d57de294
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192589
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Jenkins
This commit is contained in:
Noel Grandin
2025-10-19 12:13:53 +02:00
parent 4bc08277e8
commit 40e5bc6e68
45 changed files with 74 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cppcanvas/source/mtfrenderer/implrenderer.cxx
+1 -1
View File
@@ -562,7 +562,7 @@ namespace cppcanvas::internal
}
const ::basegfx::B2DRectangle aBounds(
::basegfx::utils::getRange(aDevicePoly) );
aDevicePoly.getB2DRange() );
const ::basegfx::B2DVector aOffset(
rGradient.GetOfsX() / 100.0,
rGradient.GetOfsY() / 100.0);
cppcanvas/source/mtfrenderer/polypolyaction.cxx
+4 -4
View File
@@ -89,7 +89,7 @@ namespace cppcanvas::internal
bool bStroke ) :
CachedPrimitiveBase( rCanvas, false ),
mxPolyPoly( ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( rCanvas->getUNOCanvas()->getDevice(), rPolyPoly) ),
maBounds( ::basegfx::utils::getRange(rPolyPoly) ),
maBounds( rPolyPoly.getB2DRange() ),
mpCanvas( rCanvas )
{
cppcanvastools::initRenderState(maState,rState);
@@ -109,7 +109,7 @@ namespace cppcanvas::internal
int nTransparency ) :
CachedPrimitiveBase( rCanvas, false ),
mxPolyPoly( ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( rCanvas->getUNOCanvas()->getDevice(), rPolyPoly) ),
maBounds( ::basegfx::utils::getRange(rPolyPoly) ),
maBounds( rPolyPoly.getB2DRange() ),
mpCanvas( rCanvas )
{
cppcanvastools::initRenderState(maState,rState);
@@ -258,7 +258,7 @@ namespace cppcanvas::internal
const rendering::Texture& rTexture ) :
CachedPrimitiveBase( rCanvas, true ),
mxPolyPoly( ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( rCanvas->getUNOCanvas()->getDevice(), rPolyPoly) ),
maBounds( ::basegfx::utils::getRange(rPolyPoly) ),
maBounds( rPolyPoly.getB2DRange() ),
mpCanvas( rCanvas ),
maTexture( rTexture )
{
@@ -367,7 +367,7 @@ namespace cppcanvas::internal
rendering::StrokeAttributes aStrokeAttributes ) :
CachedPrimitiveBase( rCanvas, false ),
mxPolyPoly( ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( rCanvas->getUNOCanvas()->getDevice(), rPolyPoly) ),
maBounds( ::basegfx::utils::getRange(rPolyPoly) ),
maBounds( rPolyPoly.getB2DRange() ),
mpCanvas( rCanvas ),
maStrokeAttributes(std::move( aStrokeAttributes ))
{
cppcanvas/source/mtfrenderer/textaction.cxx
+4 -4
View File
@@ -585,7 +585,7 @@ namespace cppcanvas::internal
const ::basegfx::B2DPolyPolygon aPoly(
cppcanvastools::createTextLinesPolyPolygon( 0.0, nLineWidth,
rLineInfo ) );
auto aRange = basegfx::utils::getRange( aPoly ).getRange();
auto aRange = aPoly.getB2DRange().getRange();
o_rOverallSize = basegfx::B2DSize(aRange.getX(), aRange.getY());
o_rTextLines = ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon(
@@ -1567,7 +1567,7 @@ namespace cppcanvas::internal
return calcEffectTextBounds( ::basegfx::unotools::b2DRectangleFromRealRectangle2D(
xTextLayout->queryTextBounds() ),
::basegfx::utils::getRange( aPoly ),
aPoly.getB2DRange(),
maReliefOffset,
maShadowOffset,
aLocalState,
@@ -2122,7 +2122,7 @@ namespace cppcanvas::internal
rShadowColor,
rTextFillColor,
xTextBoundsPoly,
::basegfx::utils::getRange(aResultingPolyPolygon),
aResultingPolyPolygon.getB2DRange(),
xTextPoly,
aCharWidthSeq,
rVDev,
@@ -2140,7 +2140,7 @@ namespace cppcanvas::internal
rShadowColor,
rTextFillColor,
xTextBoundsPoly,
::basegfx::utils::getRange(aResultingPolyPolygon),
aResultingPolyPolygon.getB2DRange(),
xTextPoly,
aCharWidthSeq,
rVDev,
cppcanvas/source/mtfrenderer/textlineshelper.cxx
+3 -3
View File
@@ -59,19 +59,19 @@ void TextLinesHelper::init(double nLineWidth, const cppcanvastools::TextLineInfo
if (aOverline.count())
{
aRange.expand(::basegfx::utils::getRange(aOverline));
aRange.expand(aOverline.getB2DRange());
mxOverline = ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon(xDevice, aOverline);
}
if (aUnderline.count())
{
aRange.expand(::basegfx::utils::getRange(aUnderline));
aRange.expand(aUnderline.getB2DRange());
mxUnderline = ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon(xDevice, aUnderline);
}
if (aStrikeout.count())
{
aRange.expand(::basegfx::utils::getRange(aStrikeout));
aRange.expand(aStrikeout.getB2DRange());
mxStrikeout = ::basegfx::unotools::xPolyPolygonFromB2DPolyPolygon(xDevice, aStrikeout);
}