[Libreoffice-commits] core.git: svgio/source
Stephan Bergmann (via logerrit)
logerrit at kemper.freedesktop.org
Thu Jul 2 06:50:04 UTC 2020
svgio/source/svgreader/svgtoken.cxx | 264 ++++++++++++++++++------------------
svgio/source/svguno/svguno.cxx | 2
2 files changed, 133 insertions(+), 133 deletions(-)
New commits:
commit 5b2f04d2f864ea0ef5d0c28d2891d87f1545b9d5
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Jul 2 07:14:20 2020 +0200
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Jul 2 08:49:29 2020 +0200
Upcoming improved loplugin:staticanonymous -> redundantstatic: svgio
Change-Id: I7373cec6d8d03e5fc0ac30b54e5b5077232c2f83
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97694
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/svgio/source/svgreader/svgtoken.cxx b/svgio/source/svgreader/svgtoken.cxx
index 78c35888ac3e..3bb517d42021 100644
--- a/svgio/source/svgreader/svgtoken.cxx
+++ b/svgio/source/svgreader/svgtoken.cxx
@@ -22,146 +22,146 @@
namespace svgio::svgreader
{
- static const char aSVGStrWidth[] = "width";
- static const char aSVGStrHeight[] = "height";
- static const char aSVGStrViewBox[] = "viewBox";
- static const char aSVGStrTransform[] = "transform";
- static const char aSVGStrStyle[] = "style";
- static const char aSVGStrDisplay[] = "display"; // #i121656#
- static const char aSVGStrD[] = "d";
- static const char aSVGStrX[] = "x";
- static const char aSVGStrY[] = "y";
- static const char aSVGStrXmlns[] = "xmlns";
- static const char aSVGStrVersion[] = "version";
- static const char aSVGStrId[] = "id";
- static const char aSVGStrRx[] = "rx";
- static const char aSVGStrRy[] = "ry";
- static const char aSVGStrPoints[] = "points";
- static const char aSVGStrDx[] = "dx";
- static const char aSVGStrDy[] = "dy";
- static const char aSVGStrRotate[] = "rotate";
- static const char aSVGStrTextLength[] = "textLength";
- static const char aSVGStrLengthAdjust[] = "lengthAdjust";
- static const char aSVGStrFont[] = "font";
- static const char aSVGStrFontFamily[] = "font-family";
- static const char aSVGStrFontSize[] = "font-size";
- static const char aSVGStrFontSizeAdjust[] = "font-size-adjust";
- static const char aSVGStrFontStretch[] = "font-stretch";
- static const char aSVGStrFontStyle[] = "font-style";
- static const char aSVGStrFontVariant[] = "font-variant";
- static const char aSVGStrFontWeight[] = "font-weight";
- static const char aSVGStrDirection[] = "direction";
- static const char aSVGStrLetterSpacing[] = "letter-spacing";
- static const char aSVGStrTextDecoration[] = "text-decoration";
- static const char aSVGStrUnicodeBidi[] = "unicode-bidi";
- static const char aSVGStrWordSpacing[] = "word-spacing";
- static const char aSVGStrTspan[] = "tspan";
- static const char aSVGStrTref[] = "tref";
- static const char aSVGStrTextPath[] = "textPath";
- static const char aSVGStrStartOffset[] = "startOffset";
- static const char aSVGStrMethod[] = "method";
- static const char aSVGStrSpacing[] = "spacing";
- static const char aSVGStrTextAlign[] = "text-align";
- static const char aSVGStrPathLength[] = "pathLength";
- static const char aSVGStrType[] = "type";
- static const char aSVGStrClass[] = "class";
- static const char aSVGStrTextAnchor[] = "text-anchor";
- static const char aSVGStrXmlSpace[] = "xml:space";
- static const char aSVGStrColor[] = "color";
- static const char aSVGStrClipPathNode[] = "clipPath";
- static const char aSVGStrClipPathProperty[] = "clip-path";
- static const char aSVGStrMask[] = "mask";
- static const char aSVGStrClipPathUnits[] = "clipPathUnits";
- static const char aSVGStrMaskUnits[] = "maskUnits";
- static const char aSVGStrMaskContentUnits[] = "maskContentUnits";
- static const char aSVGStrClipRule[] = "clip-rule";
- static const char aSVGStrMarker[] = "marker";
- static const char aSVGStrMarkerStart[] = "marker-start";
- static const char aSVGStrMarkerMid[] = "marker-mid";
- static const char aSVGStrMarkerEnd[] = "marker-end";
- static const char aSVGStrRefX[] = "refX";
- static const char aSVGStrRefY[] = "refY";
- static const char aSVGStrMarkerUnits[] = "markerUnits";
- static const char aSVGStrMarkerWidth[] = "markerWidth";
- static const char aSVGStrMarkerHeight[] = "markerHeight";
- static const char aSVGStrOrient[] = "orient";
- static const char aSVGStrPattern[] = "pattern";
- static const char aSVGStrPatternUnits[] = "patternUnits";
- static const char aSVGStrPatternContentUnits[] = "patternContentUnits";
- static const char aSVGStrPatternTransform[] = "patternTransform";
- static const char aSVGStrOpacity[] = "opacity";
- static const char aSVGStrVisibility[] = "visibility";
- static const char aSVGStrTitle[] = "title";
- static const char aSVGStrDesc[] = "desc";
+ const char aSVGStrWidth[] = "width";
+ const char aSVGStrHeight[] = "height";
+ const char aSVGStrViewBox[] = "viewBox";
+ const char aSVGStrTransform[] = "transform";
+ const char aSVGStrStyle[] = "style";
+ const char aSVGStrDisplay[] = "display"; // #i121656#
+ const char aSVGStrD[] = "d";
+ const char aSVGStrX[] = "x";
+ const char aSVGStrY[] = "y";
+ const char aSVGStrXmlns[] = "xmlns";
+ const char aSVGStrVersion[] = "version";
+ const char aSVGStrId[] = "id";
+ const char aSVGStrRx[] = "rx";
+ const char aSVGStrRy[] = "ry";
+ const char aSVGStrPoints[] = "points";
+ const char aSVGStrDx[] = "dx";
+ const char aSVGStrDy[] = "dy";
+ const char aSVGStrRotate[] = "rotate";
+ const char aSVGStrTextLength[] = "textLength";
+ const char aSVGStrLengthAdjust[] = "lengthAdjust";
+ const char aSVGStrFont[] = "font";
+ const char aSVGStrFontFamily[] = "font-family";
+ const char aSVGStrFontSize[] = "font-size";
+ const char aSVGStrFontSizeAdjust[] = "font-size-adjust";
+ const char aSVGStrFontStretch[] = "font-stretch";
+ const char aSVGStrFontStyle[] = "font-style";
+ const char aSVGStrFontVariant[] = "font-variant";
+ const char aSVGStrFontWeight[] = "font-weight";
+ const char aSVGStrDirection[] = "direction";
+ const char aSVGStrLetterSpacing[] = "letter-spacing";
+ const char aSVGStrTextDecoration[] = "text-decoration";
+ const char aSVGStrUnicodeBidi[] = "unicode-bidi";
+ const char aSVGStrWordSpacing[] = "word-spacing";
+ const char aSVGStrTspan[] = "tspan";
+ const char aSVGStrTref[] = "tref";
+ const char aSVGStrTextPath[] = "textPath";
+ const char aSVGStrStartOffset[] = "startOffset";
+ const char aSVGStrMethod[] = "method";
+ const char aSVGStrSpacing[] = "spacing";
+ const char aSVGStrTextAlign[] = "text-align";
+ const char aSVGStrPathLength[] = "pathLength";
+ const char aSVGStrType[] = "type";
+ const char aSVGStrClass[] = "class";
+ const char aSVGStrTextAnchor[] = "text-anchor";
+ const char aSVGStrXmlSpace[] = "xml:space";
+ const char aSVGStrColor[] = "color";
+ const char aSVGStrClipPathNode[] = "clipPath";
+ const char aSVGStrClipPathProperty[] = "clip-path";
+ const char aSVGStrMask[] = "mask";
+ const char aSVGStrClipPathUnits[] = "clipPathUnits";
+ const char aSVGStrMaskUnits[] = "maskUnits";
+ const char aSVGStrMaskContentUnits[] = "maskContentUnits";
+ const char aSVGStrClipRule[] = "clip-rule";
+ const char aSVGStrMarker[] = "marker";
+ const char aSVGStrMarkerStart[] = "marker-start";
+ const char aSVGStrMarkerMid[] = "marker-mid";
+ const char aSVGStrMarkerEnd[] = "marker-end";
+ const char aSVGStrRefX[] = "refX";
+ const char aSVGStrRefY[] = "refY";
+ const char aSVGStrMarkerUnits[] = "markerUnits";
+ const char aSVGStrMarkerWidth[] = "markerWidth";
+ const char aSVGStrMarkerHeight[] = "markerHeight";
+ const char aSVGStrOrient[] = "orient";
+ const char aSVGStrPattern[] = "pattern";
+ const char aSVGStrPatternUnits[] = "patternUnits";
+ const char aSVGStrPatternContentUnits[] = "patternContentUnits";
+ const char aSVGStrPatternTransform[] = "patternTransform";
+ const char aSVGStrOpacity[] = "opacity";
+ const char aSVGStrVisibility[] = "visibility";
+ const char aSVGStrTitle[] = "title";
+ const char aSVGStrDesc[] = "desc";
- static const char aSVGStrPreserveAspectRatio[] = "preserveAspectRatio";
- static const char aSVGStrDefer[] = "defer";
- static const char aSVGStrNone[] = "none";
- static const char aSVGStrXMinYMin[] = "xMinYMin";
- static const char aSVGStrXMidYMin[] = "xMidYMin";
- static const char aSVGStrXMaxYMin[] = "xMaxYMin";
- static const char aSVGStrXMinYMid[] = "xMinYMid";
- static const char aSVGStrXMidYMid[] = "xMidYMid";
- static const char aSVGStrXMaxYMid[] = "xMaxYMid";
- static const char aSVGStrXMinYMax[] = "xMinYMax";
- static const char aSVGStrXMidYMax[] = "xMidYMax";
- static const char aSVGStrXMaxYMax[] = "xMaxYMax";
- static const char aSVGStrMeet[] = "meet";
- static const char aSVGStrSlice[] = "slice";
+ const char aSVGStrPreserveAspectRatio[] = "preserveAspectRatio";
+ const char aSVGStrDefer[] = "defer";
+ const char aSVGStrNone[] = "none";
+ const char aSVGStrXMinYMin[] = "xMinYMin";
+ const char aSVGStrXMidYMin[] = "xMidYMin";
+ const char aSVGStrXMaxYMin[] = "xMaxYMin";
+ const char aSVGStrXMinYMid[] = "xMinYMid";
+ const char aSVGStrXMidYMid[] = "xMidYMid";
+ const char aSVGStrXMaxYMid[] = "xMaxYMid";
+ const char aSVGStrXMinYMax[] = "xMinYMax";
+ const char aSVGStrXMidYMax[] = "xMidYMax";
+ const char aSVGStrXMaxYMax[] = "xMaxYMax";
+ const char aSVGStrMeet[] = "meet";
+ const char aSVGStrSlice[] = "slice";
- static const char aSVGStrDefs[] = "defs";
- static const char aSVGStrG[] = "g";
- static const char aSVGStrSvg[] = "svg";
- static const char aSVGStrSymbol[] = "symbol";
- static const char aSVGStrUse[] = "use";
- static const char aSVGStrA[] = "a";
+ const char aSVGStrDefs[] = "defs";
+ const char aSVGStrG[] = "g";
+ const char aSVGStrSvg[] = "svg";
+ const char aSVGStrSymbol[] = "symbol";
+ const char aSVGStrUse[] = "use";
+ const char aSVGStrA[] = "a";
- static const char aSVGStrCircle[] = "circle";
- static const char aSVGStrEllipse[] = "ellipse";
- static const char aSVGStrLine[] = "line";
- static const char aSVGStrPath[] = "path";
- static const char aSVGStrPolygon[] = "polygon";
- static const char aSVGStrPolyline[] = "polyline";
- static const char aSVGStrRect[] = "rect";
- static const char aSVGStrImage[] = "image";
+ const char aSVGStrCircle[] = "circle";
+ const char aSVGStrEllipse[] = "ellipse";
+ const char aSVGStrLine[] = "line";
+ const char aSVGStrPath[] = "path";
+ const char aSVGStrPolygon[] = "polygon";
+ const char aSVGStrPolyline[] = "polyline";
+ const char aSVGStrRect[] = "rect";
+ const char aSVGStrImage[] = "image";
- static const char aSVGStrLinearGradient[] = "linearGradient";
- static const char aSVGStrRadialGradient[] = "radialGradient";
- static const char aSVGStrStop[] = "stop";
- static const char aSVGStrOffset[] = "offset";
- static const char aSVGStrX1[] = "x1";
- static const char aSVGStrY1[] = "y1";
- static const char aSVGStrX2[] = "x2";
- static const char aSVGStrY2[] = "y2";
- static const char aSVGStrCx[] = "cx";
- static const char aSVGStrCy[] = "cy";
- static const char aSVGStrFx[] = "fx";
- static const char aSVGStrFy[] = "fy";
- static const char aSVGStrR[] = "r";
- static const char aSVGStrGradientUnits[] = "gradientUnits";
- static const char aSVGStrGradientTransform[] = "gradientTransform";
- static const char aSVGStrSpreadMethod[] = "spreadMethod";
- static const char aSVGStrXlinkHref[] = "xlink:href";
- static const char aSVGStrStopColor[] = "stop-color";
- static const char aSVGStrStopOpacity[] = "stop-opacity";
+ const char aSVGStrLinearGradient[] = "linearGradient";
+ const char aSVGStrRadialGradient[] = "radialGradient";
+ const char aSVGStrStop[] = "stop";
+ const char aSVGStrOffset[] = "offset";
+ const char aSVGStrX1[] = "x1";
+ const char aSVGStrY1[] = "y1";
+ const char aSVGStrX2[] = "x2";
+ const char aSVGStrY2[] = "y2";
+ const char aSVGStrCx[] = "cx";
+ const char aSVGStrCy[] = "cy";
+ const char aSVGStrFx[] = "fx";
+ const char aSVGStrFy[] = "fy";
+ const char aSVGStrR[] = "r";
+ const char aSVGStrGradientUnits[] = "gradientUnits";
+ const char aSVGStrGradientTransform[] = "gradientTransform";
+ const char aSVGStrSpreadMethod[] = "spreadMethod";
+ const char aSVGStrXlinkHref[] = "xlink:href";
+ const char aSVGStrStopColor[] = "stop-color";
+ const char aSVGStrStopOpacity[] = "stop-opacity";
- static const char aSVGStrFill[] = "fill";
- static const char aSVGStrFillOpacity[] = "fill-opacity";
- static const char aSVGStrFillRule[] = "fill-rule";
+ const char aSVGStrFill[] = "fill";
+ const char aSVGStrFillOpacity[] = "fill-opacity";
+ const char aSVGStrFillRule[] = "fill-rule";
- static const char aSVGStrStroke[] = "stroke";
- static const char aSVGStrStrokeDasharray[] = "stroke-dasharray";
- static const char aSVGStrStrokeDashoffset[] = "stroke-dashoffset";
- static const char aSVGStrStrokeLinecap[] = "stroke-linecap";
- static const char aSVGStrStrokeLinejoin[] = "stroke-linejoin";
- static const char aSVGStrStrokeMiterlimit[] = "stroke-miterlimit";
- static const char aSVGStrStrokeOpacity[] = "stroke-opacity";
- static const char aSVGStrStrokeWidth[] = "stroke-width";
+ const char aSVGStrStroke[] = "stroke";
+ const char aSVGStrStrokeDasharray[] = "stroke-dasharray";
+ const char aSVGStrStrokeDashoffset[] = "stroke-dashoffset";
+ const char aSVGStrStrokeLinecap[] = "stroke-linecap";
+ const char aSVGStrStrokeLinejoin[] = "stroke-linejoin";
+ const char aSVGStrStrokeMiterlimit[] = "stroke-miterlimit";
+ const char aSVGStrStrokeOpacity[] = "stroke-opacity";
+ const char aSVGStrStrokeWidth[] = "stroke-width";
- static const char aSVGStrText[] = "text";
- static const char aSVGStrBaselineShift[] = "baseline-shift";
+ const char aSVGStrText[] = "text";
+ const char aSVGStrBaselineShift[] = "baseline-shift";
- static const char aSVGStrFlowRoot[] = "flowRoot";
+ const char aSVGStrFlowRoot[] = "flowRoot";
SVGToken StrToSVGToken(const OUString& rStr, bool bCaseIndependent)
{
diff --git a/svgio/source/svguno/svguno.cxx b/svgio/source/svguno/svguno.cxx
index 05baa2cb6e35..be777b95bc0a 100644
--- a/svgio/source/svguno/svguno.cxx
+++ b/svgio/source/svguno/svguno.cxx
@@ -27,7 +27,7 @@
namespace {
-static cppu::ImplementationEntry const services[] = {
+cppu::ImplementationEntry const services[] = {
{ &svgio::svgreader::XSvgParser_createInstance,
&svgio::svgreader::XSvgParser_getImplementationName,
&svgio::svgreader::XSvgParser_getSupportedServiceNames,
More information about the Libreoffice-commits
mailing list