summaryrefslogtreecommitdiffstats
path: root/basegfx
diff options
context:
space:
mode:
Diffstat (limited to 'basegfx')
-rw-r--r--basegfx/source/color/bcolormodifier.cxx24
-rw-r--r--basegfx/source/polygon/b2dpolygontools.cxx42
-rw-r--r--basegfx/source/polygon/b2dpolypolygontools.cxx21
-rw-r--r--basegfx/source/polygon/b3dpolypolygontools.cxx25
-rw-r--r--basegfx/source/tools/bgradient.cxx10
-rw-r--r--basegfx/source/tools/canvastools.cxx4
-rw-r--r--basegfx/source/tools/unopolypolygon.cxx4
7 files changed, 55 insertions, 75 deletions
diff --git a/basegfx/source/color/bcolormodifier.cxx b/basegfx/source/color/bcolormodifier.cxx
index 3b9d1ce158c3..04ab3757cb45 100644
--- a/basegfx/source/color/bcolormodifier.cxx
+++ b/basegfx/source/color/bcolormodifier.cxx
@@ -47,7 +47,7 @@ namespace basegfx
OUString BColorModifier_gray::getModifierName() const
{
- return "gray";
+ return u"gray"_ustr;
}
BColorModifier_invert::~BColorModifier_invert()
@@ -66,7 +66,7 @@ namespace basegfx
OUString BColorModifier_invert::getModifierName() const
{
- return "invert";
+ return u"invert"_ustr;
}
BColorModifier_luminance_to_alpha::~BColorModifier_luminance_to_alpha()
@@ -87,7 +87,7 @@ namespace basegfx
OUString BColorModifier_luminance_to_alpha::getModifierName() const
{
- return "luminance_to_alpha";
+ return u"luminance_to_alpha"_ustr;
}
BColorModifier_replace::~BColorModifier_replace()
@@ -113,7 +113,7 @@ namespace basegfx
OUString BColorModifier_replace::getModifierName() const
{
- return "replace";
+ return u"replace"_ustr;
}
BColorModifier_interpolate::~BColorModifier_interpolate()
@@ -139,7 +139,7 @@ namespace basegfx
OUString BColorModifier_interpolate::getModifierName() const
{
- return "interpolate";
+ return u"interpolate"_ustr;
}
BColorModifier_matrix::~BColorModifier_matrix()
@@ -194,7 +194,7 @@ namespace basegfx
OUString BColorModifier_matrix::getModifierName() const
{
- return "matrix";
+ return u"matrix"_ustr;
}
BColorModifier_saturate::BColorModifier_saturate(double fValue)
@@ -239,7 +239,7 @@ namespace basegfx
OUString BColorModifier_saturate::getModifierName() const
{
- return "saturate";
+ return u"saturate"_ustr;
}
BColorModifier_hueRotate::BColorModifier_hueRotate(double fRad)
@@ -290,7 +290,7 @@ namespace basegfx
OUString BColorModifier_hueRotate::getModifierName() const
{
- return "hueRotate";
+ return u"hueRotate"_ustr;
}
BColorModifier_black_and_white::~BColorModifier_black_and_white()
@@ -325,7 +325,7 @@ namespace basegfx
OUString BColorModifier_black_and_white::getModifierName() const
{
- return "black_and_white";
+ return u"black_and_white"_ustr;
}
BColorModifier_gamma::BColorModifier_gamma(double fValue)
@@ -376,7 +376,7 @@ namespace basegfx
OUString BColorModifier_gamma::getModifierName() const
{
- return "gamma";
+ return u"gamma"_ustr;
}
BColorModifier_RGBLuminanceContrast::BColorModifier_RGBLuminanceContrast(double fRed, double fGreen, double fBlue, double fLuminance, double fContrast)
@@ -458,7 +458,7 @@ namespace basegfx
OUString BColorModifier_RGBLuminanceContrast::getModifierName() const
{
- return "RGBLuminanceContrast";
+ return u"RGBLuminanceContrast"_ustr;
}
BColorModifier_randomize::BColorModifier_randomize(double fRandomPart)
@@ -514,7 +514,7 @@ namespace basegfx
OUString BColorModifier_randomize::getModifierName() const
{
- return "randomize";
+ return u"randomize"_ustr;
}
::basegfx::BColor BColorModifierStack::getModifiedColor(const ::basegfx::BColor& rSource) const
diff --git a/basegfx/source/polygon/b2dpolygontools.cxx b/basegfx/source/polygon/b2dpolygontools.cxx
index 482d35d4df1d..89c8eea90111 100644
--- a/basegfx/source/polygon/b2dpolygontools.cxx
+++ b/basegfx/source/polygon/b2dpolygontools.cxx
@@ -3250,12 +3250,10 @@ namespace basegfx::utils
if(nLength)
{
aRetval.reserve(nLength);
- const css::awt::Point* pArray = rPointSequenceSource.getConstArray();
- const css::awt::Point* pArrayEnd = pArray + rPointSequenceSource.getLength();
- for(;pArray != pArrayEnd; pArray++)
+ for(auto& point : rPointSequenceSource)
{
- aRetval.append(B2DPoint(pArray->X, pArray->Y));
+ aRetval.append(B2DPoint(point.X, point.Y));
}
// check for closed state flag
@@ -3301,7 +3299,7 @@ namespace basegfx::utils
// copy first point if closed
if(bIsClosed)
{
- *pSequence = *rPointSequenceRetval.getConstArray();
+ *pSequence = rPointSequenceRetval[0];
}
}
else
@@ -3317,8 +3315,8 @@ namespace basegfx::utils
const css::drawing::PointSequence& rPointSequenceSource,
const css::drawing::FlagSequence& rFlagSequenceSource)
{
- const sal_uInt32 nCount(static_cast<sal_uInt32>(rPointSequenceSource.getLength()));
- OSL_ENSURE(nCount == static_cast<sal_uInt32>(rFlagSequenceSource.getLength()),
+ const sal_Int32 nCount(rPointSequenceSource.getLength());
+ OSL_ENSURE(nCount == rFlagSequenceSource.getLength(),
"UnoPolygonBezierCoordsToB2DPolygon: Unequal count of Points and Flags (!)");
// prepare new polygon
@@ -3328,32 +3326,28 @@ namespace basegfx::utils
{
aRetval.reserve(nCount);
- const css::awt::Point* pPointSequence = rPointSequenceSource.getConstArray();
- const css::drawing::PolygonFlags* pFlagSequence = rFlagSequenceSource.getConstArray();
-
// get first point and flag
- B2DPoint aNewCoordinatePair(pPointSequence->X, pPointSequence->Y); pPointSequence++;
- css::drawing::PolygonFlags ePolygonFlag(*pFlagSequence); pFlagSequence++;
+ B2DPoint aNewCoordinatePair(rPointSequenceSource[0].X, rPointSequenceSource[0].Y);
B2DPoint aControlA;
B2DPoint aControlB;
// first point is not allowed to be a control point
- OSL_ENSURE(ePolygonFlag != css::drawing::PolygonFlags_CONTROL,
+ OSL_ENSURE(rFlagSequenceSource[0] != css::drawing::PolygonFlags_CONTROL,
"UnoPolygonBezierCoordsToB2DPolygon: Start point is a control point, illegal input polygon (!)");
// add first point as start point
aRetval.append(aNewCoordinatePair);
- for(sal_uInt32 b(1); b < nCount;)
+ for(sal_Int32 b(1); b < nCount;)
{
// prepare loop
bool bControlA(false);
bool bControlB(false);
// get next point and flag
- aNewCoordinatePair = B2DPoint(pPointSequence->X, pPointSequence->Y);
- ePolygonFlag = *pFlagSequence;
- pPointSequence++; pFlagSequence++; b++;
+ aNewCoordinatePair = B2DPoint(rPointSequenceSource[b].X, rPointSequenceSource[b].Y);
+ css::drawing::PolygonFlags ePolygonFlag = rFlagSequenceSource[b];
+ b++;
if(b < nCount && ePolygonFlag == css::drawing::PolygonFlags_CONTROL)
{
@@ -3361,9 +3355,9 @@ namespace basegfx::utils
bControlA = true;
// get next point and flag
- aNewCoordinatePair = B2DPoint(pPointSequence->X, pPointSequence->Y);
- ePolygonFlag = *pFlagSequence;
- pPointSequence++; pFlagSequence++; b++;
+ aNewCoordinatePair = B2DPoint(rPointSequenceSource[b].X, rPointSequenceSource[b].Y);
+ ePolygonFlag = rFlagSequenceSource[b];
+ b++;
}
if(b < nCount && ePolygonFlag == css::drawing::PolygonFlags_CONTROL)
@@ -3372,9 +3366,9 @@ namespace basegfx::utils
bControlB = true;
// get next point and flag
- aNewCoordinatePair = B2DPoint(pPointSequence->X, pPointSequence->Y);
- ePolygonFlag = *pFlagSequence;
- pPointSequence++; pFlagSequence++; b++;
+ aNewCoordinatePair = B2DPoint(rPointSequenceSource[b].X, rPointSequenceSource[b].Y);
+ ePolygonFlag = rFlagSequenceSource[b];
+ b++;
}
// two or no control points are consumed, another one would be an error.
@@ -3559,7 +3553,7 @@ namespace basegfx::utils
if(bClosed)
{
// add first point as closing point
- *pPointSequence = *rPointSequenceRetval.getConstArray();
+ *pPointSequence = rPointSequenceRetval[0];
*pFlagSequence = css::drawing::PolygonFlags_NORMAL;
}
}
diff --git a/basegfx/source/polygon/b2dpolypolygontools.cxx b/basegfx/source/polygon/b2dpolypolygontools.cxx
index faf734f6e79e..cccd168bde00 100644
--- a/basegfx/source/polygon/b2dpolypolygontools.cxx
+++ b/basegfx/source/polygon/b2dpolypolygontools.cxx
@@ -554,13 +554,10 @@ namespace basegfx::utils
{
B2DPolyPolygon aRetval;
aRetval.reserve(rPointSequenceSequenceSource.getLength());
- const css::drawing::PointSequence* pPointSequence = rPointSequenceSequenceSource.getConstArray();
- const css::drawing::PointSequence* pPointSeqEnd = pPointSequence + rPointSequenceSequenceSource.getLength();
- for(;pPointSequence != pPointSeqEnd; pPointSequence++)
+ for (auto& rPointSequence : rPointSequenceSequenceSource)
{
- const B2DPolygon aNewPolygon = UnoPointSequenceToB2DPolygon(*pPointSequence);
- aRetval.append(aNewPolygon);
+ aRetval.append(UnoPointSequenceToB2DPolygon(rPointSequence));
}
return aRetval;
@@ -595,23 +592,19 @@ namespace basegfx::utils
const css::drawing::PolyPolygonBezierCoords& rPolyPolygonBezierCoordsSource)
{
B2DPolyPolygon aRetval;
- const sal_uInt32 nSequenceCount(static_cast<sal_uInt32>(rPolyPolygonBezierCoordsSource.Coordinates.getLength()));
+ const sal_Int32 nSequenceCount(rPolyPolygonBezierCoordsSource.Coordinates.getLength());
if(nSequenceCount)
{
- OSL_ENSURE(nSequenceCount == static_cast<sal_uInt32>(rPolyPolygonBezierCoordsSource.Flags.getLength()),
+ OSL_ENSURE(nSequenceCount == rPolyPolygonBezierCoordsSource.Flags.getLength(),
"UnoPolyPolygonBezierCoordsToB2DPolyPolygon: unequal number of Points and Flags (!)");
- const css::drawing::PointSequence* pPointSequence = rPolyPolygonBezierCoordsSource.Coordinates.getConstArray();
- const css::drawing::FlagSequence* pFlagSequence = rPolyPolygonBezierCoordsSource.Flags.getConstArray();
- for(sal_uInt32 a(0); a < nSequenceCount; a++)
+ for(sal_Int32 a(0); a < nSequenceCount; a++)
{
const B2DPolygon aNewPolygon(UnoPolygonBezierCoordsToB2DPolygon(
- *pPointSequence,
- *pFlagSequence));
+ rPolyPolygonBezierCoordsSource.Coordinates[a],
+ rPolyPolygonBezierCoordsSource.Flags[a]));
- pPointSequence++;
- pFlagSequence++;
aRetval.append(aNewPolygon);
}
}
diff --git a/basegfx/source/polygon/b3dpolypolygontools.cxx b/basegfx/source/polygon/b3dpolypolygontools.cxx
index ffd8bded4d59..856fc40dff7e 100644
--- a/basegfx/source/polygon/b3dpolypolygontools.cxx
+++ b/basegfx/source/polygon/b3dpolypolygontools.cxx
@@ -472,32 +472,25 @@ namespace basegfx::utils
"UnoPolyPolygonShape3DToB3DPolygon: Not all double sequences have the same "
"length (!)" );
- const css::drawing::DoubleSequence* pInnerSequenceX = rPolyPolygonShape3DSource.SequenceX.getConstArray();
- const css::drawing::DoubleSequence* pInnerSequenceY = rPolyPolygonShape3DSource.SequenceY.getConstArray();
- const css::drawing::DoubleSequence* pInnerSequenceZ = rPolyPolygonShape3DSource.SequenceZ.getConstArray();
-
for(sal_Int32 a(0); a < nOuterSequenceCount; a++)
{
basegfx::B3DPolygon aNewPolygon;
- const sal_Int32 nInnerSequenceCount(pInnerSequenceX->getLength());
- assert(nInnerSequenceCount == pInnerSequenceY->getLength()
- && nInnerSequenceCount == pInnerSequenceZ->getLength()
+
+ auto& rInnerSequenceX = rPolyPolygonShape3DSource.SequenceX[a];
+ auto& rInnerSequenceY = rPolyPolygonShape3DSource.SequenceY[a];
+ auto& rInnerSequenceZ = rPolyPolygonShape3DSource.SequenceZ[a];
+
+ const sal_Int32 nInnerSequenceCount(rInnerSequenceX.getLength());
+ assert(nInnerSequenceCount == rInnerSequenceY.getLength()
+ && nInnerSequenceCount == rInnerSequenceZ.getLength()
&& "UnoPolyPolygonShape3DToB3DPolygon: Not all double sequences have "
"the same length (!)");
- const double* pArrayX = pInnerSequenceX->getConstArray();
- const double* pArrayY = pInnerSequenceY->getConstArray();
- const double* pArrayZ = pInnerSequenceZ->getConstArray();
-
for(sal_Int32 b(0); b < nInnerSequenceCount; b++)
{
- aNewPolygon.append(basegfx::B3DPoint(*pArrayX++,*pArrayY++,*pArrayZ++));
+ aNewPolygon.append(basegfx::B3DPoint(rInnerSequenceX[b], rInnerSequenceY[b], rInnerSequenceZ[b]));
}
- pInnerSequenceX++;
- pInnerSequenceY++;
- pInnerSequenceZ++;
-
// #i101520# correction is needed for imported polygons of old format,
// see callers
basegfx::utils::checkClosed(aNewPolygon);
diff --git a/basegfx/source/tools/bgradient.cxx b/basegfx/source/tools/bgradient.cxx
index 9f98c54cfc1c..a8bbe95c526b 100644
--- a/basegfx/source/tools/bgradient.cxx
+++ b/basegfx/source/tools/bgradient.cxx
@@ -55,12 +55,12 @@ StringMap lcl_jsonToStringMap(std::u16string_view rJSON)
basegfx::BGradient lcl_buildGradientFromStringMap(StringMap& rMap)
{
- basegfx::BGradient aGradient(
- basegfx::BColorStops(ColorToBColorConverter(rMap["startcolor"].toInt32(16)).getBColor(),
- ColorToBColorConverter(rMap["endcolor"].toInt32(16)).getBColor()));
+ basegfx::BGradient aGradient(basegfx::BColorStops(
+ ColorToBColorConverter(rMap[u"startcolor"_ustr].toInt32(16)).getBColor(),
+ ColorToBColorConverter(rMap[u"endcolor"_ustr].toInt32(16)).getBColor()));
- aGradient.SetGradientStyle(lcl_getStyleFromString(rMap["style"]));
- aGradient.SetAngle(Degree10(rMap["angle"].toInt32()));
+ aGradient.SetGradientStyle(lcl_getStyleFromString(rMap[u"style"_ustr]));
+ aGradient.SetAngle(Degree10(rMap[u"angle"_ustr].toInt32()));
return aGradient;
}
diff --git a/basegfx/source/tools/canvastools.cxx b/basegfx/source/tools/canvastools.cxx
index 70f4787710ad..b46662419b95 100644
--- a/basegfx/source/tools/canvastools.cxx
+++ b/basegfx/source/tools/canvastools.cxx
@@ -287,8 +287,8 @@ namespace basegfx::unotools
if( !xLinePoly.is() )
{
throw lang::IllegalArgumentException(
- "basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(): Invalid input"
- "poly-polygon, cannot retrieve vertex data",
+ u"basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(): Invalid input"
+ "poly-polygon, cannot retrieve vertex data"_ustr,
uno::Reference< uno::XInterface >(),
0 );
}
diff --git a/basegfx/source/tools/unopolypolygon.cxx b/basegfx/source/tools/unopolypolygon.cxx
index 323e06a96f18..3f4d273cf8f2 100644
--- a/basegfx/source/tools/unopolypolygon.cxx
+++ b/basegfx/source/tools/unopolypolygon.cxx
@@ -95,8 +95,8 @@ namespace basegfx::unotools
// found - contract violation.
if( !xLinePoly.is() )
throw lang::IllegalArgumentException(
- "UnoPolyPolygon::addPolyPolygon(): Invalid input "
- "poly-polygon, cannot retrieve vertex data",
+ u"UnoPolyPolygon::addPolyPolygon(): Invalid input "
+ "poly-polygon, cannot retrieve vertex data"_ustr,
getXWeak(), 1);
aSrcPoly = unotools::polyPolygonFromPoint2DSequenceSequence(
generated by cgit (git 2.34.1) at 2024-05-12 06:46:39 +0000