You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by al...@apache.org on 2011/12/22 14:15:20 UTC
svn commit: r1222214 - in
/incubator/ooo/branches/alg/svgreplacement/main/svgio: inc/svgio/svgreader/
source/svgreader/
Author: alg
Date: Thu Dec 22 13:15:19 2011
New Revision: 1222214
URL: http://svn.apache.org/viewvc?rev=1222214&view=rev
Log:
svg: WaE changes for newer Linux Gcc (4.6.1)
Modified:
incubator/ooo/branches/alg/svgreplacement/main/svgio/inc/svgio/svgreader/svgnode.hxx
incubator/ooo/branches/alg/svgreplacement/main/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgcharacternode.cxx
incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgcirclenode.cxx
incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgclippathnode.cxx
incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgdocumenthandler.cxx
incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgellipsenode.cxx
incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svggnode.cxx
incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svggradientnode.cxx
incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svggradientstopnode.cxx
incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgimagenode.cxx
incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svglinenode.cxx
incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgmarkernode.cxx
incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgmasknode.cxx
incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgnode.cxx
incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgpathnode.cxx
incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgpatternnode.cxx
incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgpolynode.cxx
incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgrectnode.cxx
incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgstyleattributes.cxx
incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgstylenode.cxx
incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgsvgnode.cxx
incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgsymbolnode.cxx
incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgtextnode.cxx
incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgtextpathnode.cxx
incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgtools.cxx
incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgtrefnode.cxx
incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgtspannode.cxx
incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgusenode.cxx
Modified: incubator/ooo/branches/alg/svgreplacement/main/svgio/inc/svgio/svgreader/svgnode.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/svgio/inc/svgio/svgreader/svgnode.hxx?rev=1222214&r1=1222213&r2=1222214&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/svgio/inc/svgio/svgreader/svgnode.hxx (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/svgio/inc/svgio/svgreader/svgnode.hxx Thu Dec 22 13:15:19 2011
@@ -92,7 +92,7 @@ namespace svgio
virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const;
/// basic data read access
- const SVGToken getType() const { return maType; }
+ SVGToken getType() const { return maType; }
const SvgDocument& getDocument() const { return mrDocument; }
const SvgNode* getParent() const { if(mpAlternativeParent) return mpAlternativeParent; return mpParent; }
const SvgNodeVector& getChildren() const { return maChildren; }
Modified: incubator/ooo/branches/alg/svgreplacement/main/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/svgio/inc/svgio/svgreader/svgstyleattributes.hxx?rev=1222214&r1=1222213&r2=1222214&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/svgio/inc/svgio/svgreader/svgstyleattributes.hxx (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/svgio/inc/svgio/svgreader/svgstyleattributes.hxx Thu Dec 22 13:15:19 2011
@@ -317,11 +317,11 @@ namespace svgio
void setStrokeDashOffset(const SvgNumber& rStrokeDashOffset = SvgNumber()) { maStrokeDashOffset = rStrokeDashOffset; }
/// StrokeLinecap content
- const StrokeLinecap getStrokeLinecap() const;
+ StrokeLinecap getStrokeLinecap() const;
void setStrokeLinecap(const StrokeLinecap aStrokeLinecap = StrokeLinecap_notset) { maStrokeLinecap = aStrokeLinecap; }
/// StrokeLinejoin content
- const StrokeLinejoin getStrokeLinejoin() const;
+ StrokeLinejoin getStrokeLinejoin() const;
void setStrokeLinejoin(const StrokeLinejoin aStrokeLinejoin = StrokeLinejoin_notset) { maStrokeLinejoin = aStrokeLinejoin; }
/// StrokeMiterLimit content
@@ -341,32 +341,32 @@ namespace svgio
void setFontSize(const SvgNumber& rFontSize = SvgNumber()) { maFontSize = rFontSize; }
/// FontStretch content
- const FontStretch getFontStretch() const;
+ FontStretch getFontStretch() const;
void setFontStretch(const FontStretch aFontStretch = FontStretch_notset) { maFontStretch = aFontStretch; }
/// FontStyle content
- const FontStyle getFontStyle() const;
+ FontStyle getFontStyle() const;
void setFontStyle(const FontStyle aFontStyle = FontStyle_notset) { maFontStyle = aFontStyle; }
/// FontVariant content
- const FontVariant getFontVariant() const;
+ FontVariant getFontVariant() const;
void setFontVariant(const FontVariant aFontVariant = FontVariant_notset) { maFontVariant = aFontVariant; }
/// FontWeight content
- const FontWeight getFontWeight() const;
+ FontWeight getFontWeight() const;
void setFontWeight(const FontWeight aFontWeight = FontWeight_notset) { maFontWeight = aFontWeight; }
/// TextAlign content
- const TextAlign getTextAlign() const;
+ TextAlign getTextAlign() const;
void setTextAlign(const TextAlign aTextAlign = TextAlign_notset) { maTextAlign = aTextAlign; }
/// TextDecoration content
const SvgStyleAttributes* getTextDecorationDefiningSvgStyleAttributes() const;
- const TextDecoration getTextDecoration() const;
+ TextDecoration getTextDecoration() const;
void setTextDecoration(const TextDecoration aTextDecoration = TextDecoration_notset) { maTextDecoration = aTextDecoration; }
/// TextAnchor content
- const TextAnchor getTextAnchor() const;
+ TextAnchor getTextAnchor() const;
void setTextAnchor(const TextAnchor aTextAnchor = TextAnchor_notset) { maTextAnchor = aTextAnchor; }
/// Color content
Modified: incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgcharacternode.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgcharacternode.cxx?rev=1222214&r1=1222213&r2=1222214&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgcharacternode.cxx (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgcharacternode.cxx Thu Dec 22 13:15:19 2011
@@ -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;
+ }
}
}
Modified: incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgcirclenode.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgcirclenode.cxx?rev=1222214&r1=1222213&r2=1222214&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgcirclenode.cxx (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgcirclenode.cxx Thu Dec 22 13:15:19 2011
@@ -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();
Modified: incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgclippathnode.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgclippathnode.cxx?rev=1222214&r1=1222213&r2=1222214&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgclippathnode.cxx (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgclippathnode.cxx Thu Dec 22 13:15:19 2011
@@ -98,6 +98,10 @@ namespace svgio
}
break;
}
+ default:
+ {
+ break;
+ }
}
}
Modified: incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgdocumenthandler.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgdocumenthandler.cxx?rev=1222214&r1=1222213&r2=1222214&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgdocumenthandler.cxx (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgdocumenthandler.cxx Thu Dec 22 13:15:19 2011
@@ -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
Modified: incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgellipsenode.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgellipsenode.cxx?rev=1222214&r1=1222213&r2=1222214&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgellipsenode.cxx (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgellipsenode.cxx Thu Dec 22 13:15:19 2011
@@ -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();
Modified: incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svggnode.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svggnode.cxx?rev=1222214&r1=1222213&r2=1222214&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svggnode.cxx (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svggnode.cxx Thu Dec 22 13:15:19 2011
@@ -82,6 +82,10 @@ namespace svgio
}
break;
}
+ default:
+ {
+ break;
+ }
}
}
Modified: incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svggradientnode.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svggradientnode.cxx?rev=1222214&r1=1222213&r2=1222214&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svggradientnode.cxx (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svggradientnode.cxx Thu Dec 22 13:15:19 2011
@@ -242,6 +242,10 @@ namespace svgio
}
break;
}
+ default:
+ {
+ break;
+ }
}
}
Modified: incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svggradientstopnode.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svggradientstopnode.cxx?rev=1222214&r1=1222213&r2=1222214&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svggradientstopnode.cxx (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svggradientstopnode.cxx Thu Dec 22 13:15:19 2011
@@ -77,6 +77,10 @@ namespace svgio
}
break;
}
+ default:
+ {
+ break;
+ }
}
}
Modified: incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgimagenode.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgimagenode.cxx?rev=1222214&r1=1222213&r2=1222214&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgimagenode.cxx (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgimagenode.cxx Thu Dec 22 13:15:19 2011
@@ -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();
Modified: incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svglinenode.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svglinenode.cxx?rev=1222214&r1=1222213&r2=1222214&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svglinenode.cxx (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svglinenode.cxx Thu Dec 22 13:15:19 2011
@@ -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();
Modified: incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgmarkernode.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgmarkernode.cxx?rev=1222214&r1=1222213&r2=1222214&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgmarkernode.cxx (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgmarkernode.cxx Thu Dec 22 13:15:19 2011
@@ -180,6 +180,10 @@ namespace svgio
}
break;
}
+ default:
+ {
+ break;
+ }
}
}
Modified: incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgmasknode.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgmasknode.cxx?rev=1222214&r1=1222213&r2=1222214&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgmasknode.cxx (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgmasknode.cxx Thu Dec 22 13:15:19 2011
@@ -168,6 +168,10 @@ namespace svgio
}
break;
}
+ default:
+ {
+ break;
+ }
}
}
Modified: incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgnode.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgnode.cxx?rev=1222214&r1=1222213&r2=1222214&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgnode.cxx (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgnode.cxx Thu Dec 22 13:15:19 2011
@@ -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;
+ }
}
}
Modified: incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgpathnode.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgpathnode.cxx?rev=1222214&r1=1222213&r2=1222214&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgpathnode.cxx (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgpathnode.cxx Thu Dec 22 13:15:19 2011
@@ -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();
Modified: incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgpatternnode.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgpatternnode.cxx?rev=1222214&r1=1222213&r2=1222214&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgpatternnode.cxx (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgpatternnode.cxx Thu Dec 22 13:15:19 2011
@@ -203,6 +203,10 @@ namespace svgio
}
break;
}
+ default:
+ {
+ break;
+ }
}
}
Modified: incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgpolynode.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgpolynode.cxx?rev=1222214&r1=1222213&r2=1222214&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgpolynode.cxx (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgpolynode.cxx Thu Dec 22 13:15:19 2011
@@ -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();
Modified: incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgrectnode.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgrectnode.cxx?rev=1222214&r1=1222213&r2=1222214&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgrectnode.cxx (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgrectnode.cxx Thu Dec 22 13:15:19 2011
@@ -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();
Modified: incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgstyleattributes.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgstyleattributes.cxx?rev=1222214&r1=1222213&r2=1222214&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgstyleattributes.cxx (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgstyleattributes.cxx Thu Dec 22 13:15:19 2011
@@ -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)
{
Modified: incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgstylenode.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgstylenode.cxx?rev=1222214&r1=1222213&r2=1222214&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgstylenode.cxx (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgstylenode.cxx Thu Dec 22 13:15:19 2011
@@ -70,6 +70,10 @@ namespace svgio
}
break;
}
+ default:
+ {
+ break;
+ }
}
}
Modified: incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgsvgnode.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgsvgnode.cxx?rev=1222214&r1=1222213&r2=1222214&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgsvgnode.cxx (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgsvgnode.cxx Thu Dec 22 13:15:19 2011
@@ -153,6 +153,10 @@ namespace svgio
}
break;
}
+ default:
+ {
+ break;
+ }
}
}
Modified: incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgsymbolnode.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgsymbolnode.cxx?rev=1222214&r1=1222213&r2=1222214&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgsymbolnode.cxx (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgsymbolnode.cxx Thu Dec 22 13:15:19 2011
@@ -83,6 +83,10 @@ namespace svgio
setSvgAspectRatio(readSvgAspectRatio(aContent));
break;
}
+ default:
+ {
+ break;
+ }
}
}
Modified: incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgtextnode.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgtextnode.cxx?rev=1222214&r1=1222213&r2=1222214&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgtextnode.cxx (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgtextnode.cxx Thu Dec 22 13:15:19 2011
@@ -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
Modified: incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgtextpathnode.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgtextpathnode.cxx?rev=1222214&r1=1222213&r2=1222214&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgtextpathnode.cxx (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgtextpathnode.cxx Thu Dec 22 13:15:19 2011
@@ -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;
+ }
}
}
Modified: incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgtools.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgtools.cxx?rev=1222214&r1=1222213&r2=1222214&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgtools.cxx (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgtools.cxx Thu Dec 22 13:15:19 2011
@@ -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;
+ }
}
}
Modified: incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgtrefnode.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgtrefnode.cxx?rev=1222214&r1=1222213&r2=1222214&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgtrefnode.cxx (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgtrefnode.cxx Thu Dec 22 13:15:19 2011
@@ -75,6 +75,10 @@ namespace svgio
}
break;
}
+ default:
+ {
+ break;
+ }
}
}
Modified: incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgtspannode.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgtspannode.cxx?rev=1222214&r1=1222213&r2=1222214&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgtspannode.cxx (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgtspannode.cxx Thu Dec 22 13:15:19 2011
@@ -67,6 +67,10 @@ namespace svgio
maSvgStyleAttributes.readStyle(aContent);
break;
}
+ default:
+ {
+ break;
+ }
}
}
Modified: incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgusenode.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgusenode.cxx?rev=1222214&r1=1222213&r2=1222214&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgusenode.cxx (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/svgio/source/svgreader/svgusenode.cxx Thu Dec 22 13:15:19 2011
@@ -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);