summaryrefslogtreecommitdiff
path: root/svgio/source/svgreader
diff options
context:
space:
mode:
authorArmin Le Grand <alg@apache.org>2011-12-24 12:58:46 +0000
committerArmin Le Grand <alg@apache.org>2011-12-24 12:58:46 +0000
commit39fed128f1fd6a10ec8cf6b78828631fd54a40c5 (patch)
treefaba6d1d626067c3f68d052aaccb2d67d660be01 /svgio/source/svgreader
parent65c9af466b36fa02e437a21127b62dadcd5fae9a (diff)
svg: added WaE changes from branch svgreplacement to trunc (revisions r122204, r122214)
Diffstat (limited to 'svgio/source/svgreader')
-rw-r--r--svgio/source/svgreader/svgcharacternode.cxx12
-rw-r--r--svgio/source/svgreader/svgcirclenode.cxx6
-rwxr-xr-xsvgio/source/svgreader/svgclippathnode.cxx4
-rw-r--r--svgio/source/svgreader/svgdocumenthandler.cxx6
-rw-r--r--svgio/source/svgreader/svgellipsenode.cxx6
-rw-r--r--svgio/source/svgreader/svggnode.cxx4
-rw-r--r--svgio/source/svgreader/svggradientnode.cxx4
-rw-r--r--svgio/source/svgreader/svggradientstopnode.cxx4
-rw-r--r--svgio/source/svgreader/svgimagenode.cxx6
-rw-r--r--svgio/source/svgreader/svglinenode.cxx6
-rwxr-xr-xsvgio/source/svgreader/svgmarkernode.cxx4
-rwxr-xr-xsvgio/source/svgreader/svgmasknode.cxx4
-rw-r--r--svgio/source/svgreader/svgnode.cxx6
-rw-r--r--svgio/source/svgreader/svgpathnode.cxx6
-rwxr-xr-xsvgio/source/svgreader/svgpatternnode.cxx4
-rw-r--r--svgio/source/svgreader/svgpolynode.cxx6
-rw-r--r--svgio/source/svgreader/svgrectnode.cxx6
-rw-r--r--svgio/source/svgreader/svgstyleattributes.cxx44
-rw-r--r--svgio/source/svgreader/svgstylenode.cxx4
-rw-r--r--svgio/source/svgreader/svgsvgnode.cxx4
-rw-r--r--svgio/source/svgreader/svgsymbolnode.cxx4
-rw-r--r--svgio/source/svgreader/svgtextnode.cxx6
-rw-r--r--svgio/source/svgreader/svgtextpathnode.cxx6
-rw-r--r--svgio/source/svgreader/svgtools.cxx15
-rw-r--r--svgio/source/svgreader/svgtrefnode.cxx4
-rw-r--r--svgio/source/svgreader/svgtspannode.cxx4
-rw-r--r--svgio/source/svgreader/svgusenode.cxx6
27 files changed, 152 insertions, 39 deletions
diff --git a/svgio/source/svgreader/svgcharacternode.cxx b/svgio/source/svgreader/svgcharacternode.cxx
index bf37cb6e9361..32dfa9eec86b 100644
--- a/svgio/source/svgreader/svgcharacternode.cxx
+++ b/svgio/source/svgreader/svgcharacternode.cxx
@@ -48,7 +48,7 @@ namespace svgio
{
}
- void SvgTextPositions::parseTextPositionAttributes(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent)
+ void SvgTextPositions::parseTextPositionAttributes(const rtl::OUString& /*rTokenName*/, SVGToken aSVGToken, const rtl::OUString& aContent)
{
// parse own
switch(aSVGToken)
@@ -149,6 +149,10 @@ namespace svgio
}
break;
}
+ default:
+ {
+ break;
+ }
}
}
@@ -181,7 +185,7 @@ namespace svgio
}
};
- bool localTextBreakupHelper::allowChange(sal_uInt32 nCount, basegfx::B2DHomMatrix& rNewTransform, sal_uInt32 nIndex, sal_uInt32 nLength)
+ bool localTextBreakupHelper::allowChange(sal_uInt32 /*nCount*/, basegfx::B2DHomMatrix& rNewTransform, sal_uInt32 /*nIndex*/, sal_uInt32 /*nLength*/)
{
const double fRotation(mrSvgTextPosition.consumeRotation());
@@ -364,6 +368,10 @@ namespace svgio
aTextAlign = TextAlign_right;
break;
}
+ default:
+ {
+ break;
+ }
}
}
diff --git a/svgio/source/svgreader/svgcirclenode.cxx b/svgio/source/svgreader/svgcirclenode.cxx
index 95a81ff5611d..f1928a2edf8f 100644
--- a/svgio/source/svgreader/svgcirclenode.cxx
+++ b/svgio/source/svgreader/svgcirclenode.cxx
@@ -116,10 +116,14 @@ namespace svgio
}
break;
}
+ default:
+ {
+ break;
+ }
}
}
- void SvgCircleNode::decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const
+ void SvgCircleNode::decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool /*bReferenced*/) const
{
const SvgStyleAttributes* pStyle = getSvgStyleAttributes();
diff --git a/svgio/source/svgreader/svgclippathnode.cxx b/svgio/source/svgreader/svgclippathnode.cxx
index 11889a4437c9..c2d4b37fb523 100755
--- a/svgio/source/svgreader/svgclippathnode.cxx
+++ b/svgio/source/svgreader/svgclippathnode.cxx
@@ -98,6 +98,10 @@ namespace svgio
}
break;
}
+ default:
+ {
+ break;
+ }
}
}
diff --git a/svgio/source/svgreader/svgdocumenthandler.cxx b/svgio/source/svgreader/svgdocumenthandler.cxx
index 1c0fe65d79ef..ab1b931b2671 100644
--- a/svgio/source/svgreader/svgdocumenthandler.cxx
+++ b/svgio/source/svgreader/svgdocumenthandler.cxx
@@ -500,15 +500,15 @@ namespace svgio
}
}
- void SvgDocHdl::ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) throw (xml::sax::SAXException, uno::RuntimeException)
+ void SvgDocHdl::ignorableWhitespace(const ::rtl::OUString& /*aWhitespaces*/) throw (xml::sax::SAXException, uno::RuntimeException)
{
}
- void SvgDocHdl::processingInstruction( const ::rtl::OUString& aTarget, const ::rtl::OUString& aData ) throw (xml::sax::SAXException, uno::RuntimeException)
+ void SvgDocHdl::processingInstruction(const ::rtl::OUString& /*aTarget*/, const ::rtl::OUString& /*aData*/) throw (xml::sax::SAXException, uno::RuntimeException)
{
}
- void SvgDocHdl::setDocumentLocator( const uno::Reference< xml::sax::XLocator >& xLocator ) throw (xml::sax::SAXException, uno::RuntimeException)
+ void SvgDocHdl::setDocumentLocator(const uno::Reference< xml::sax::XLocator >& /*xLocator*/) throw (xml::sax::SAXException, uno::RuntimeException)
{
}
} // end of namespace svgreader
diff --git a/svgio/source/svgreader/svgellipsenode.cxx b/svgio/source/svgreader/svgellipsenode.cxx
index 7eee1b9cedb2..f50f964bba61 100644
--- a/svgio/source/svgreader/svgellipsenode.cxx
+++ b/svgio/source/svgreader/svgellipsenode.cxx
@@ -130,10 +130,14 @@ namespace svgio
}
break;
}
+ default:
+ {
+ break;
+ }
}
}
- void SvgEllipseNode::decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const
+ void SvgEllipseNode::decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool /*bReferenced*/) const
{
const SvgStyleAttributes* pStyle = getSvgStyleAttributes();
diff --git a/svgio/source/svgreader/svggnode.cxx b/svgio/source/svgreader/svggnode.cxx
index 03b49c837e5a..fa756b7eb0f9 100644
--- a/svgio/source/svgreader/svggnode.cxx
+++ b/svgio/source/svgreader/svggnode.cxx
@@ -82,6 +82,10 @@ namespace svgio
}
break;
}
+ default:
+ {
+ break;
+ }
}
}
diff --git a/svgio/source/svgreader/svggradientnode.cxx b/svgio/source/svgreader/svggradientnode.cxx
index c5a535250b74..87bbbbbe2c2b 100644
--- a/svgio/source/svgreader/svggradientnode.cxx
+++ b/svgio/source/svgreader/svggradientnode.cxx
@@ -242,6 +242,10 @@ namespace svgio
}
break;
}
+ default:
+ {
+ break;
+ }
}
}
diff --git a/svgio/source/svgreader/svggradientstopnode.cxx b/svgio/source/svgreader/svggradientstopnode.cxx
index b6da00e584bb..dd7f39644ac1 100644
--- a/svgio/source/svgreader/svggradientstopnode.cxx
+++ b/svgio/source/svgreader/svggradientstopnode.cxx
@@ -77,6 +77,10 @@ namespace svgio
}
break;
}
+ default:
+ {
+ break;
+ }
}
}
diff --git a/svgio/source/svgreader/svgimagenode.cxx b/svgio/source/svgreader/svgimagenode.cxx
index 5ee2e0d58e9e..578d7edbe0ae 100644
--- a/svgio/source/svgreader/svgimagenode.cxx
+++ b/svgio/source/svgreader/svgimagenode.cxx
@@ -162,6 +162,10 @@ namespace svgio
}
break;
}
+ default:
+ {
+ break;
+ }
}
}
@@ -194,7 +198,7 @@ namespace svgio
}
}
- void SvgImageNode::decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const
+ void SvgImageNode::decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool /*bReferenced*/) const
{
// get size range and create path
const SvgStyleAttributes* pStyle = getSvgStyleAttributes();
diff --git a/svgio/source/svgreader/svglinenode.cxx b/svgio/source/svgreader/svglinenode.cxx
index 12f52061f919..3a9fc912ff4d 100644
--- a/svgio/source/svgreader/svglinenode.cxx
+++ b/svgio/source/svgreader/svglinenode.cxx
@@ -124,10 +124,14 @@ namespace svgio
}
break;
}
+ default:
+ {
+ break;
+ }
}
}
- void SvgLineNode::decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const
+ void SvgLineNode::decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool /*bReferenced*/) const
{
const SvgStyleAttributes* pStyle = getSvgStyleAttributes();
diff --git a/svgio/source/svgreader/svgmarkernode.cxx b/svgio/source/svgreader/svgmarkernode.cxx
index 1e0342b44e15..fb068ca78719 100755
--- a/svgio/source/svgreader/svgmarkernode.cxx
+++ b/svgio/source/svgreader/svgmarkernode.cxx
@@ -180,6 +180,10 @@ namespace svgio
}
break;
}
+ default:
+ {
+ break;
+ }
}
}
diff --git a/svgio/source/svgreader/svgmasknode.cxx b/svgio/source/svgreader/svgmasknode.cxx
index 45eeebab92e3..6bc9945cffb0 100755
--- a/svgio/source/svgreader/svgmasknode.cxx
+++ b/svgio/source/svgreader/svgmasknode.cxx
@@ -168,6 +168,10 @@ namespace svgio
}
break;
}
+ default:
+ {
+ break;
+ }
}
}
diff --git a/svgio/source/svgreader/svgnode.cxx b/svgio/source/svgreader/svgnode.cxx
index bcd802be6640..7332ca9f0f25 100644
--- a/svgio/source/svgreader/svgnode.cxx
+++ b/svgio/source/svgreader/svgnode.cxx
@@ -93,7 +93,7 @@ namespace svgio
}
}
- void SvgNode::parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent)
+ void SvgNode::parseAttribute(const rtl::OUString& /*rTokenName*/, SVGToken aSVGToken, const rtl::OUString& aContent)
{
switch(aSVGToken)
{
@@ -131,6 +131,10 @@ namespace svgio
}
break;
}
+ default:
+ {
+ break;
+ }
}
}
diff --git a/svgio/source/svgreader/svgpathnode.cxx b/svgio/source/svgreader/svgpathnode.cxx
index 7027f29f1a79..486d7d366d1f 100644
--- a/svgio/source/svgreader/svgpathnode.cxx
+++ b/svgio/source/svgreader/svgpathnode.cxx
@@ -105,10 +105,14 @@ namespace svgio
}
break;
}
+ default:
+ {
+ break;
+ }
}
}
- void SvgPathNode::decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const
+ void SvgPathNode::decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool /*bReferenced*/) const
{
// fill and/or stroke needed, also a path
const SvgStyleAttributes* pStyle = getSvgStyleAttributes();
diff --git a/svgio/source/svgreader/svgpatternnode.cxx b/svgio/source/svgreader/svgpatternnode.cxx
index e7df8b62344f..bbcbbc96d306 100755
--- a/svgio/source/svgreader/svgpatternnode.cxx
+++ b/svgio/source/svgreader/svgpatternnode.cxx
@@ -203,6 +203,10 @@ namespace svgio
}
break;
}
+ default:
+ {
+ break;
+ }
}
}
diff --git a/svgio/source/svgreader/svgpolynode.cxx b/svgio/source/svgreader/svgpolynode.cxx
index 2b3c991a8593..efe1f74ae080 100644
--- a/svgio/source/svgreader/svgpolynode.cxx
+++ b/svgio/source/svgreader/svgpolynode.cxx
@@ -102,10 +102,14 @@ namespace svgio
}
break;
}
+ default:
+ {
+ break;
+ }
}
}
- void SvgPolyNode::decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const
+ void SvgPolyNode::decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool /*bReferenced*/) const
{
const SvgStyleAttributes* pStyle = getSvgStyleAttributes();
diff --git a/svgio/source/svgreader/svgrectnode.cxx b/svgio/source/svgreader/svgrectnode.cxx
index 8ad8eadf8300..79ef6d04fc21 100644
--- a/svgio/source/svgreader/svgrectnode.cxx
+++ b/svgio/source/svgreader/svgrectnode.cxx
@@ -158,10 +158,14 @@ namespace svgio
}
break;
}
+ default:
+ {
+ break;
+ }
}
}
- void SvgRectNode::decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const
+ void SvgRectNode::decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool /*bReferenced*/) const
{
// get size range and create path
const SvgStyleAttributes* pStyle = getSvgStyleAttributes();
diff --git a/svgio/source/svgreader/svgstyleattributes.cxx b/svgio/source/svgreader/svgstyleattributes.cxx
index 35204aa3ce86..b3e326212e0c 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -75,6 +75,7 @@ namespace svgio
case FontStretch_semi_expanded: aSource = FontStretch_expanded; break;
case FontStretch_expanded: aSource = FontStretch_extra_expanded; break;
case FontStretch_extra_expanded: aSource = FontStretch_ultra_expanded; break;
+ default: break;
}
return aSource;
@@ -92,6 +93,7 @@ namespace svgio
case FontStretch_expanded: aSource = FontStretch_semi_expanded; break;
case FontStretch_extra_expanded: aSource = FontStretch_expanded; break;
case FontStretch_ultra_expanded: aSource = FontStretch_extra_expanded; break;
+ default: break;
}
return aSource;
@@ -109,6 +111,7 @@ namespace svgio
case FontWeight_600: aSource = FontWeight_700; break;
case FontWeight_700: aSource = FontWeight_800; break;
case FontWeight_800: aSource = FontWeight_900; break;
+ default: break;
}
return aSource;
@@ -126,6 +129,7 @@ namespace svgio
case FontWeight_700: aSource = FontWeight_600; break;
case FontWeight_800: aSource = FontWeight_700; break;
case FontWeight_900: aSource = FontWeight_800; break;
+ default: break;
}
return aSource;
@@ -146,6 +150,7 @@ namespace svgio
case FontWeight_700: nRetval = WEIGHT_BOLD; break;
case FontWeight_800: nRetval = WEIGHT_ULTRABOLD; break;
case FontWeight_900: nRetval = WEIGHT_BLACK; break;
+ default: break;
}
return nRetval;
@@ -697,11 +702,11 @@ namespace svgio
// check for fill rsults
const basegfx::B2DPolyPolygonVector& rLineFillVector(aExtractor.getExtractedLineFills());
- if(!aExtractor.getExtractedLineFills().empty())
+ if(!rLineFillVector.empty())
{
const basegfx::B2DPolyPolygon aMergedArea(
basegfx::tools::mergeToSinglePolyPolygon(
- aExtractor.getExtractedLineFills()));
+ rLineFillVector));
if(aMergedArea.count())
{
@@ -883,7 +888,7 @@ namespace svgio
drawinglayer::primitive2d::Primitive2DSequence& rTarget,
const drawinglayer::primitive2d::Primitive2DSequence& rMarkerPrimitives,
const basegfx::B2DHomMatrix& rMarkerTransform,
- const basegfx::B2DRange& rClipRange,
+ const basegfx::B2DRange& /*rClipRange*/,
const SvgMarkerNode& rMarker,
const basegfx::B2DPolygon& rCandidate,
const sal_uInt32 nIndex) const
@@ -950,9 +955,9 @@ namespace svgio
{
pPrepared = pMid;
- for(sal_uInt32 a(1); a < nMarkerCount - 1; a++)
+ for(sal_uInt32 b(1); b < nMarkerCount - 1; b++)
{
- add_singleMarker(rTarget, aMarkerPrimitives, aMarkerTransform, aClipRange, *pPrepared, aCandidate, a);
+ add_singleMarker(rTarget, aMarkerPrimitives, aMarkerTransform, aClipRange, *pPrepared, aCandidate, b);
}
}
}
@@ -1161,7 +1166,7 @@ namespace svgio
{
}
- void SvgStyleAttributes::parseStyleAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent)
+ void SvgStyleAttributes::parseStyleAttribute(const rtl::OUString& /*rTokenName*/, SVGToken aSVGToken, const rtl::OUString& aContent)
{
switch(aSVGToken)
{
@@ -1169,7 +1174,6 @@ namespace svgio
{
SvgPaint aSvgPaint;
rtl::OUString aURL;
- bool bUseCurrent(false);
if(readSvgPaint(aContent, aSvgPaint, aURL))
{
@@ -1387,7 +1391,6 @@ namespace svgio
}
case SVGTokenFont:
{
- bool bBla = true;
break;
}
case SVGTokenFontFamily:
@@ -1412,7 +1415,6 @@ namespace svgio
}
case SVGTokenFontSizeAdjust:
{
- bool bBla = true;
break;
}
case SVGTokenFontStretch:
@@ -1586,12 +1588,10 @@ namespace svgio
}
case SVGTokenDirection:
{
- bool bBla = true;
break;
}
case SVGTokenLetterSpacing:
{
- bool bBla = true;
break;
}
case SVGTokenTextDecoration:
@@ -1629,12 +1629,10 @@ namespace svgio
}
case SVGTokenUnicodeBidi:
{
- bool bBla = true;
break;
}
case SVGTokenWordSpacing:
{
- bool bBla = true;
break;
}
case SVGTokenTextAnchor:
@@ -1755,6 +1753,10 @@ namespace svgio
readLocalUrl(aContent, maMarkerEndXLink);
break;
}
+ default:
+ {
+ break;
+ }
}
}
@@ -2046,7 +2048,7 @@ namespace svgio
return SvgNumber(0.0);
}
- const StrokeLinecap SvgStyleAttributes::getStrokeLinecap() const
+ StrokeLinecap SvgStyleAttributes::getStrokeLinecap() const
{
if(maStrokeLinecap != StrokeLinecap_notset)
{
@@ -2064,7 +2066,7 @@ namespace svgio
return StrokeLinecap_butt;
}
- const StrokeLinejoin SvgStyleAttributes::getStrokeLinejoin() const
+ StrokeLinejoin SvgStyleAttributes::getStrokeLinejoin() const
{
if(maStrokeLinejoin != StrokeLinejoin_notset)
{
@@ -2154,7 +2156,7 @@ namespace svgio
return SvgNumber(12.0);
}
- const FontStretch SvgStyleAttributes::getFontStretch() const
+ FontStretch SvgStyleAttributes::getFontStretch() const
{
if(maFontStretch != FontStretch_notset)
{
@@ -2186,7 +2188,7 @@ namespace svgio
return FontStretch_normal;
}
- const FontStyle SvgStyleAttributes::getFontStyle() const
+ FontStyle SvgStyleAttributes::getFontStyle() const
{
if(maFontStyle != FontStyle_notset)
{
@@ -2204,7 +2206,7 @@ namespace svgio
return FontStyle_normal;
}
- const FontWeight SvgStyleAttributes::getFontWeight() const
+ FontWeight SvgStyleAttributes::getFontWeight() const
{
if(maFontWeight != FontWeight_notset)
{
@@ -2236,7 +2238,7 @@ namespace svgio
return FontWeight_400;
}
- const TextAlign SvgStyleAttributes::getTextAlign() const
+ TextAlign SvgStyleAttributes::getTextAlign() const
{
if(maTextAlign != TextAlign_notset)
{
@@ -2272,7 +2274,7 @@ namespace svgio
return 0;
}
- const TextDecoration SvgStyleAttributes::getTextDecoration() const
+ TextDecoration SvgStyleAttributes::getTextDecoration() const
{
const SvgStyleAttributes* pDefining = getTextDecorationDefiningSvgStyleAttributes();
@@ -2287,7 +2289,7 @@ namespace svgio
}
}
- const TextAnchor SvgStyleAttributes::getTextAnchor() const
+ TextAnchor SvgStyleAttributes::getTextAnchor() const
{
if(maTextAnchor != TextAnchor_notset)
{
diff --git a/svgio/source/svgreader/svgstylenode.cxx b/svgio/source/svgreader/svgstylenode.cxx
index e670f4137a8f..5b0bbc092ff6 100644
--- a/svgio/source/svgreader/svgstylenode.cxx
+++ b/svgio/source/svgreader/svgstylenode.cxx
@@ -70,6 +70,10 @@ namespace svgio
}
break;
}
+ default:
+ {
+ break;
+ }
}
}
diff --git a/svgio/source/svgreader/svgsvgnode.cxx b/svgio/source/svgreader/svgsvgnode.cxx
index eadbe7705772..826e299c6eb2 100644
--- a/svgio/source/svgreader/svgsvgnode.cxx
+++ b/svgio/source/svgreader/svgsvgnode.cxx
@@ -153,6 +153,10 @@ namespace svgio
}
break;
}
+ default:
+ {
+ break;
+ }
}
}
diff --git a/svgio/source/svgreader/svgsymbolnode.cxx b/svgio/source/svgreader/svgsymbolnode.cxx
index 39da059285f4..fdbb4c89a62b 100644
--- a/svgio/source/svgreader/svgsymbolnode.cxx
+++ b/svgio/source/svgreader/svgsymbolnode.cxx
@@ -83,6 +83,10 @@ namespace svgio
setSvgAspectRatio(readSvgAspectRatio(aContent));
break;
}
+ default:
+ {
+ break;
+ }
}
}
diff --git a/svgio/source/svgreader/svgtextnode.cxx b/svgio/source/svgreader/svgtextnode.cxx
index 903a485016f5..2ea6e6674f04 100644
--- a/svgio/source/svgreader/svgtextnode.cxx
+++ b/svgio/source/svgreader/svgtextnode.cxx
@@ -89,6 +89,10 @@ namespace svgio
}
break;
}
+ default:
+ {
+ break;
+ }
}
}
@@ -227,7 +231,7 @@ namespace svgio
}
}
- void SvgTextNode::decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const
+ void SvgTextNode::decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool /*bReferenced`*/) const
{
// text has a group of child nodes, allowed are SVGTokenCharacter, SVGTokenTspan,
// SVGTokenTref and SVGTokenTextPath. These increase a given current text position
diff --git a/svgio/source/svgreader/svgtextpathnode.cxx b/svgio/source/svgreader/svgtextpathnode.cxx
index b84ba940236e..5d464c7ad913 100644
--- a/svgio/source/svgreader/svgtextpathnode.cxx
+++ b/svgio/source/svgreader/svgtextpathnode.cxx
@@ -165,7 +165,7 @@ namespace svgio
freeB2DCubicBezierHelper();
}
- bool pathTextBreakupHelper::allowChange(sal_uInt32 nCount, basegfx::B2DHomMatrix& rNewTransform, sal_uInt32 nIndex, sal_uInt32 nLength)
+ bool pathTextBreakupHelper::allowChange(sal_uInt32 /*nCount*/, basegfx::B2DHomMatrix& rNewTransform, sal_uInt32 nIndex, sal_uInt32 nLength)
{
bool bRetval(false);
@@ -368,6 +368,10 @@ namespace svgio
}
break;
}
+ default:
+ {
+ break;
+ }
}
}
diff --git a/svgio/source/svgreader/svgtools.cxx b/svgio/source/svgreader/svgtools.cxx
index 597decfdee08..7eb18025135d 100644
--- a/svgio/source/svgreader/svgtools.cxx
+++ b/svgio/source/svgreader/svgtools.cxx
@@ -118,6 +118,7 @@ namespace svgio
fTransX = fFreeSpace;
break;
}
+ default: break;
}
// evaluate vertical alignment
@@ -144,6 +145,7 @@ namespace svgio
fTransY = fFreeSpace;
break;
}
+ default: break;
}
// add target translation
@@ -190,6 +192,7 @@ namespace svgio
case Unit_cm: fRetval *= 35.43307; break;
case Unit_mm: fRetval *= 3.543307; break;
case Unit_in: fRetval *= 90.0; break;
+ default: break;
}
return fRetval;
@@ -239,6 +242,10 @@ namespace svgio
return fRetval;
break;
}
+ default:
+ {
+ break;
+ }
}
}
@@ -834,8 +841,8 @@ namespace svgio
if(nPos < nLen)
{
- const sal_Unicode aChar(rCandidate[nPos]);
- const bool bIsPercent(sal_Unicode('%') == aChar);
+ const sal_Unicode aPercentChar(rCandidate[nPos]);
+ const bool bIsPercent(sal_Unicode('%') == aPercentChar);
double fG(0.0);
if(bIsPercent)
@@ -1327,6 +1334,10 @@ namespace svgio
bChanged = true;
break;
}
+ default:
+ {
+ break;
+ }
}
}
diff --git a/svgio/source/svgreader/svgtrefnode.cxx b/svgio/source/svgreader/svgtrefnode.cxx
index fb0d04143e8f..bc497cd17128 100644
--- a/svgio/source/svgreader/svgtrefnode.cxx
+++ b/svgio/source/svgreader/svgtrefnode.cxx
@@ -75,6 +75,10 @@ namespace svgio
}
break;
}
+ default:
+ {
+ break;
+ }
}
}
diff --git a/svgio/source/svgreader/svgtspannode.cxx b/svgio/source/svgreader/svgtspannode.cxx
index 8c66a9eecd99..69243e1c5edc 100644
--- a/svgio/source/svgreader/svgtspannode.cxx
+++ b/svgio/source/svgreader/svgtspannode.cxx
@@ -67,6 +67,10 @@ namespace svgio
maSvgStyleAttributes.readStyle(aContent);
break;
}
+ default:
+ {
+ break;
+ }
}
}
diff --git a/svgio/source/svgreader/svgusenode.cxx b/svgio/source/svgreader/svgusenode.cxx
index c697f93b3b5e..9e5acf3357e4 100644
--- a/svgio/source/svgreader/svgusenode.cxx
+++ b/svgio/source/svgreader/svgusenode.cxx
@@ -137,10 +137,14 @@ namespace svgio
}
break;
}
+ default:
+ {
+ break;
+ }
}
}
- void SvgUseNode::decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const
+ void SvgUseNode::decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool /*bReferenced*/) const
{
// try to access link to content
const SvgNode* mpXLink = getDocument().findSvgNodeById(maXLink);