Kaydet (Commit) 03a6b6ef authored tarafından Stephan Bergmann's avatar Stephan Bergmann

loplugin:defaultparams

Change-Id: Idad9ea385a9b83ad88792cc489413eeb6e6fcd9b
üst df7390e6
......@@ -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,
......
......@@ -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)
{
......
......@@ -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;
......
......@@ -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())
......
......@@ -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())
{
......
......@@ -422,7 +422,7 @@ namespace svgio
fNum = rtl::math::stringToDouble(
aNum.makeStringAndClear(), '.', ',',
&eStatus, 0);
&eStatus);
return eStatus == rtl_math_ConversionStatus_Ok;
}
......
......@@ -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())
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment