summaryrefslogtreecommitdiff
path: root/svgio
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-10-20 11:46:42 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-20 11:46:42 +0200
commit03a6b6ef1c6fef294e6fa530da8918171f91a916 (patch)
treecefc87cae50cb0ca1c684d0e7de12442d7b0afe1 /svgio
parentdf7390e6c99d2784a8129121056a7ccf2adc4d54 (diff)
loplugin:defaultparams
Change-Id: Idad9ea385a9b83ad88792cc489413eeb6e6fcd9b
Diffstat (limited to 'svgio')
-rw-r--r--svgio/source/svgreader/svgcharacternode.cxx10
-rw-r--r--svgio/source/svgreader/svgcirclenode.cxx2
-rw-r--r--svgio/source/svgreader/svgstyleattributes.cxx14
-rw-r--r--svgio/source/svgreader/svgtextnode.cxx2
-rw-r--r--svgio/source/svgreader/svgtextpathnode.cxx6
-rw-r--r--svgio/source/svgreader/svgtools.cxx2
-rw-r--r--svgio/source/svgreader/svgusenode.cxx2
7 files changed, 19 insertions, 19 deletions
diff --git a/svgio/source/svgreader/svgcharacternode.cxx b/svgio/source/svgreader/svgcharacternode.cxx
index 618943716a4b..74d388dc6617 100644
--- a/svgio/source/svgreader/svgcharacternode.cxx
+++ b/svgio/source/svgreader/svgcharacternode.cxx
@@ -273,7 +273,7 @@ namespace svgio
bBiDiStrong);
// prepare FontSize
- double fFontWidth(rSvgStyleAttributes.getFontSize().solve(*this, length));
+ double fFontWidth(rSvgStyleAttributes.getFontSize().solve(*this));
double fFontHeight(fFontWidth);
// prepare locale
@@ -418,7 +418,7 @@ namespace svgio
case BaselineShift_Length:
{
const SvgNumber aNumber(rSvgStyleAttributes.getBaselineShiftNumber());
- const double mfBaselineShift(aNumber.solve(*this, length));
+ const double mfBaselineShift(aNumber.solve(*this));
aPosition.setY(aPosition.getY() + mfBaselineShift);
break;
@@ -526,7 +526,7 @@ namespace svgio
{
const localTextBreakupHelper alocalTextBreakupHelper(*pCandidate, rSvgTextPosition);
const drawinglayer::primitive2d::Primitive2DSequence aResult(
- alocalTextBreakupHelper.getResult(drawinglayer::primitive2d::BreakupUnit_character));
+ alocalTextBreakupHelper.getResult());
if(aResult.hasElements())
{
@@ -595,7 +595,7 @@ namespace svgio
: mpParent(pParent),
maX(), // computed below
maY(), // computed below
- maRotate(solveSvgNumberVector(rSvgTextPositions.getRotate(), rInfoProvider, length)),
+ maRotate(solveSvgNumberVector(rSvgTextPositions.getRotate(), rInfoProvider)),
mfTextLength(0.0),
maPosition(), // computed below
mnRotationIndex(0),
@@ -605,7 +605,7 @@ namespace svgio
// get TextLength if provided
if(rSvgTextPositions.getTextLength().isSet())
{
- mfTextLength = rSvgTextPositions.getTextLength().solve(rInfoProvider, length);
+ mfTextLength = rSvgTextPositions.getTextLength().solve(rInfoProvider);
}
// SVG does not really define in which units a \91rotate\92 for Text/TSpan is given,
diff --git a/svgio/source/svgreader/svgcirclenode.cxx b/svgio/source/svgreader/svgcirclenode.cxx
index 0f0c63a6a411..ee34d2f1cd23 100644
--- a/svgio/source/svgreader/svgcirclenode.cxx
+++ b/svgio/source/svgreader/svgcirclenode.cxx
@@ -119,7 +119,7 @@ namespace svgio
if(pStyle && getR().isSet())
{
- const double fR(getR().solve(*this, length));
+ const double fR(getR().solve(*this));
if(fR > 0.0)
{
diff --git a/svgio/source/svgreader/svgstyleattributes.cxx b/svgio/source/svgreader/svgstyleattributes.cxx
index ae9bb3a91bf6..00a492bc361b 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -413,7 +413,7 @@ namespace svgio
// all possible units
aStart.setX(rFillGradient.getCx().solve(mrOwner, xcoordinate));
aStart.setY(rFillGradient.getCy().solve(mrOwner, ycoordinate));
- fRadius = rFillGradient.getR().solve(mrOwner, length);
+ fRadius = rFillGradient.getR().solve(mrOwner);
if(bFocal)
{
@@ -602,7 +602,7 @@ namespace svgio
if(pFill || pFillGradient || pFillPattern)
{
- const double fFillOpacity(getFillOpacity().solve(mrOwner, length));
+ const double fFillOpacity(getFillOpacity().solve(mrOwner));
if(basegfx::fTools::more(fFillOpacity, 0.0))
{
@@ -660,12 +660,12 @@ namespace svgio
if(pStroke || pStrokeGradient || pStrokePattern)
{
drawinglayer::primitive2d::Primitive2DSequence aNewStroke;
- const double fStrokeOpacity(getStrokeOpacity().solve(mrOwner, length));
+ const double fStrokeOpacity(getStrokeOpacity().solve(mrOwner));
if(basegfx::fTools::more(fStrokeOpacity, 0.0))
{
// get stroke width; SVG does not use 0.0 == hairline, so 0.0 is no line at all
- const double fStrokeWidth(getStrokeWidth().isSet() ? getStrokeWidth().solve(mrOwner, length) : 1.0);
+ const double fStrokeWidth(getStrokeWidth().isSet() ? getStrokeWidth().solve(mrOwner) : 1.0);
if(basegfx::fTools::more(fStrokeWidth, 0.0))
{
@@ -676,7 +676,7 @@ namespace svgio
if(!getStrokeDasharray().empty())
{
- aDashArray = solveSvgNumberVector(getStrokeDasharray(), mrOwner, length);
+ aDashArray = solveSvgNumberVector(getStrokeDasharray(), mrOwner);
}
// todo: Handle getStrokeDashOffset()
@@ -798,7 +798,7 @@ namespace svgio
double fTargetWidth(rMarker.getMarkerWidth().isSet() ? rMarker.getMarkerWidth().solve(mrOwner, xcoordinate) : 3.0);
double fTargetHeight(rMarker.getMarkerHeight().isSet() ? rMarker.getMarkerHeight().solve(mrOwner, xcoordinate) : 3.0);
const bool bStrokeWidth(SvgMarkerNode::strokeWidth == rMarker.getMarkerUnits());
- const double fStrokeWidth(getStrokeWidth().isSet() ? getStrokeWidth().solve(mrOwner, length) : 1.0);
+ const double fStrokeWidth(getStrokeWidth().isSet() ? getStrokeWidth().solve(mrOwner) : 1.0);
if(bStrokeWidth)
{
@@ -1865,7 +1865,7 @@ namespace svgio
else
{
// no BaselineShift or inherit (which is automatically)
- setBaselineShift(BaselineShift_Baseline);
+ setBaselineShift();
}
}
break;
diff --git a/svgio/source/svgreader/svgtextnode.cxx b/svgio/source/svgreader/svgtextnode.cxx
index 0ad425cd4b10..44b2ed37b708 100644
--- a/svgio/source/svgreader/svgtextnode.cxx
+++ b/svgio/source/svgreader/svgtextnode.cxx
@@ -201,7 +201,7 @@ namespace svgio
const_cast< SvgNode& >(rChildCandidate).setAlternativeParent(this);
DecomposeChild(rChildCandidate, aNewTarget, rSvgTextPosition);
- const_cast< SvgNode& >(rChildCandidate).setAlternativeParent(0);
+ const_cast< SvgNode& >(rChildCandidate).setAlternativeParent();
}
if(aNewTarget.hasElements())
diff --git a/svgio/source/svgreader/svgtextpathnode.cxx b/svgio/source/svgreader/svgtextpathnode.cxx
index a645126e954e..a5d9c15ca629 100644
--- a/svgio/source/svgreader/svgtextpathnode.cxx
+++ b/svgio/source/svgreader/svgtextpathnode.cxx
@@ -406,7 +406,7 @@ namespace svgio
if(pSvgPathNode->getPathLength().isSet())
{
- const double fUserLength(pSvgPathNode->getPathLength().solve(*this, length));
+ const double fUserLength(pSvgPathNode->getPathLength().solve(*this));
if(fUserLength > 0.0 && !basegfx::fTools::equal(fUserLength, fBasegfxPathLength))
{
@@ -425,7 +425,7 @@ namespace svgio
}
else
{
- fPosition = getStartOffset().solve(*this, length) * fUserToBasegfx;
+ fPosition = getStartOffset().solve(*this) * fUserToBasegfx;
}
}
@@ -454,7 +454,7 @@ namespace svgio
rTextStart);
const drawinglayer::primitive2d::Primitive2DSequence aResult(
- aPathTextBreakupHelper.getResult(drawinglayer::primitive2d::BreakupUnit_character));
+ aPathTextBreakupHelper.getResult());
if(aResult.hasElements())
{
diff --git a/svgio/source/svgreader/svgtools.cxx b/svgio/source/svgreader/svgtools.cxx
index 5cd34792b6a4..3ca8c82a4f15 100644
--- a/svgio/source/svgreader/svgtools.cxx
+++ b/svgio/source/svgreader/svgtools.cxx
@@ -422,7 +422,7 @@ namespace svgio
fNum = rtl::math::stringToDouble(
aNum.makeStringAndClear(), '.', ',',
- &eStatus, 0);
+ &eStatus);
return eStatus == rtl_math_ConversionStatus_Ok;
}
diff --git a/svgio/source/svgreader/svgusenode.cxx b/svgio/source/svgreader/svgusenode.cxx
index 04b0893efe7c..f67b17383d81 100644
--- a/svgio/source/svgreader/svgusenode.cxx
+++ b/svgio/source/svgreader/svgusenode.cxx
@@ -153,7 +153,7 @@ namespace svgio
// to be valid for the subtree.
const_cast< SvgNode* >(mpXLink)->setAlternativeParent(this);
mpXLink->decomposeSvgNode(aNewTarget, true);
- const_cast< SvgNode* >(mpXLink)->setAlternativeParent(0);
+ const_cast< SvgNode* >(mpXLink)->setAlternativeParent();
if(aNewTarget.hasElements())
{