[Libreoffice-commits] core.git: svgio/inc svgio/source
Noel Grandin
noel.grandin at collabora.co.uk
Thu Oct 20 06:14:45 UTC 2016
svgio/inc/svgcirclenode.hxx | 3 --
svgio/inc/svgellipsenode.hxx | 4 --
svgio/inc/svggradientnode.hxx | 9 ------
svgio/inc/svggradientstopnode.hxx | 1
svgio/inc/svgimagenode.hxx | 8 -----
svgio/inc/svglinenode.hxx | 4 --
svgio/inc/svgmarkernode.hxx | 6 ----
svgio/inc/svgmasknode.hxx | 6 ----
svgio/inc/svgpathnode.hxx | 1
svgio/inc/svgpatternnode.hxx | 5 ---
svgio/inc/svgpolynode.hxx | 4 --
svgio/inc/svgrectnode.hxx | 6 ----
svgio/inc/svgstyleattributes.hxx | 20 -------------
svgio/inc/svgsvgnode.hxx | 8 -----
svgio/inc/svgsymbolnode.hxx | 3 --
svgio/inc/svgtextnode.hxx | 3 --
svgio/inc/svgtextpathnode.hxx | 1
svgio/inc/svgusenode.hxx | 7 ----
svgio/source/svgreader/svgcirclenode.cxx | 6 ++--
svgio/source/svgreader/svgellipsenode.cxx | 8 ++---
svgio/source/svgreader/svggradientnode.cxx | 18 ++++++------
svgio/source/svgreader/svggradientstopnode.cxx | 2 -
svgio/source/svgreader/svgimagenode.cxx | 12 ++++----
svgio/source/svgreader/svglinenode.cxx | 8 ++---
svgio/source/svgreader/svgmarkernode.cxx | 12 ++++----
svgio/source/svgreader/svgmasknode.cxx | 12 ++++----
svgio/source/svgreader/svgpathnode.cxx | 2 -
svgio/source/svgreader/svgpatternnode.cxx | 10 +++---
svgio/source/svgreader/svgpolynode.cxx | 6 ++--
svgio/source/svgreader/svgrectnode.cxx | 12 ++++----
svgio/source/svgreader/svgstyleattributes.cxx | 36 ++++++++++++-------------
svgio/source/svgreader/svgsvgnode.cxx | 12 ++++----
svgio/source/svgreader/svgsymbolnode.cxx | 2 -
svgio/source/svgreader/svgtextnode.cxx | 2 -
svgio/source/svgreader/svgtextpathnode.cxx | 2 -
svgio/source/svgreader/svgusenode.cxx | 8 ++---
36 files changed, 85 insertions(+), 184 deletions(-)
New commits:
commit 58072c5a7f409cd500ecdc4e81a8f536aa3dda59
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed Oct 19 12:21:42 2016 +0200
loplugin:expandablemethodds in svgio
Change-Id: Iac2aa6dae56d96819589d198be5875ecfe14f26f
Reviewed-on: https://gerrit.libreoffice.org/30056
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/svgio/inc/svgcirclenode.hxx b/svgio/inc/svgcirclenode.hxx
index edb0523..cd19de4 100644
--- a/svgio/inc/svgcirclenode.hxx
+++ b/svgio/inc/svgcirclenode.hxx
@@ -51,15 +51,12 @@ namespace svgio
/// Cx content, set if found in current context
const SvgNumber& getCx() const { return maCx; }
- void setCx(const SvgNumber& rCx) { maCx = rCx; }
/// Cy content, set if found in current context
const SvgNumber& getCy() const { return maCy; }
- void setCy(const SvgNumber& rCy) { maCy = rCy; }
/// R content, set if found in current context
const SvgNumber& getR() const { return maR; }
- void setR(const SvgNumber& rR) { maR = rR; }
/// transform content, set if found in current context
const basegfx::B2DHomMatrix* getTransform() const { return mpaTransform; }
diff --git a/svgio/inc/svgellipsenode.hxx b/svgio/inc/svgellipsenode.hxx
index d0ad622..ad7d223 100644
--- a/svgio/inc/svgellipsenode.hxx
+++ b/svgio/inc/svgellipsenode.hxx
@@ -52,19 +52,15 @@ namespace svgio
/// Cx content, set if found in current context
const SvgNumber& getCx() const { return maCx; }
- void setCx(const SvgNumber& rCx) { maCx = rCx; }
/// Cy content, set if found in current context
const SvgNumber& getCy() const { return maCy; }
- void setCy(const SvgNumber& rCy) { maCy = rCy; }
/// Rx content, set if found in current context
const SvgNumber& getRx() const { return maRx; }
- void setRx(const SvgNumber& rRx) { maRx = rRx; }
/// Ry content, set if found in current context
const SvgNumber& getRy() const { return maRy; }
- void setRy(const SvgNumber& rRy) { maRy = rRy; }
/// transform content, set if found in current context
const basegfx::B2DHomMatrix* getTransform() const { return mpaTransform; }
diff --git a/svgio/inc/svggradientnode.hxx b/svgio/inc/svggradientnode.hxx
index 3a10ed7..cffd427 100644
--- a/svgio/inc/svggradientnode.hxx
+++ b/svgio/inc/svggradientnode.hxx
@@ -76,39 +76,30 @@ namespace svgio
/// x1 content
const SvgNumber getX1() const;
- void setX1(const SvgNumber& rX1) { maX1 = rX1; }
/// y1 content
const SvgNumber getY1() const;
- void setY1(const SvgNumber& rY1) { maY1 = rY1; }
/// x2 content
const SvgNumber getX2() const;
- void setX2(const SvgNumber& rX2) { maX2 = rX2; }
/// y2 content
const SvgNumber getY2() const;
- void setY2(const SvgNumber& rY2) { maY2 = rY2; }
/// Cx content
const SvgNumber getCx() const;
- void setCx(const SvgNumber& rCx) { maCx = rCx; }
/// Cy content
const SvgNumber getCy() const;
- void setCy(const SvgNumber& rCy) { maCy = rCy; }
/// R content
const SvgNumber getR() const;
- void setR(const SvgNumber& rR) { maR = rR; }
/// Fx content
const SvgNumber* getFx() const;
- void setFx(const SvgNumber& rFx) { maFx = rFx; }
/// Fy content
const SvgNumber* getFy() const;
- void setFy(const SvgNumber& rFy) { maFy = rFy; }
/// gradientUnits content
SvgUnits getGradientUnits() const { return maGradientUnits; }
diff --git a/svgio/inc/svggradientstopnode.hxx b/svgio/inc/svggradientstopnode.hxx
index 00b33d6..89f519b 100644
--- a/svgio/inc/svggradientstopnode.hxx
+++ b/svgio/inc/svggradientstopnode.hxx
@@ -47,7 +47,6 @@ namespace svgio
/// offset content
const SvgNumber& getOffset() const { return maOffset; }
- void setOffset(const SvgNumber& rOffset) { maOffset = rOffset; }
};
} // end of namespace svgreader
} // end of namespace svgio
diff --git a/svgio/inc/svgimagenode.hxx b/svgio/inc/svgimagenode.hxx
index 3be9012..bba54d5 100644
--- a/svgio/inc/svgimagenode.hxx
+++ b/svgio/inc/svgimagenode.hxx
@@ -57,29 +57,21 @@ namespace svgio
virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) override;
virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DContainer& rTarget, bool bReferenced) const override;
- /// SvgAspectRatio content
- const SvgAspectRatio& getSvgAspectRatio() const { return maSvgAspectRatio; }
- void setSvgAspectRatio(const SvgAspectRatio& rSvgAspectRatio) { maSvgAspectRatio = rSvgAspectRatio; }
-
/// transform content, set if found in current context
const basegfx::B2DHomMatrix* getTransform() const { return mpaTransform; }
void setTransform(const basegfx::B2DHomMatrix* pMatrix) { if(mpaTransform) delete mpaTransform; mpaTransform = nullptr; if(pMatrix) mpaTransform = new basegfx::B2DHomMatrix(*pMatrix); }
/// x content, set if found in current context
const SvgNumber& getX() const { return maX; }
- void setX(const SvgNumber& rX) { maX = rX; }
/// y content, set if found in current context
const SvgNumber& getY() const { return maY; }
- void setY(const SvgNumber& rY) { maY = rY; }
/// width content, set if found in current context
const SvgNumber& getWidth() const { return maWidth; }
- void setWidth(const SvgNumber& rWidth) { maWidth = rWidth; }
/// height content, set if found in current context
const SvgNumber& getHeight() const { return maHeight; }
- void setHeight(const SvgNumber& rHeight) { maHeight = rHeight; }
};
} // end of namespace svgreader
} // end of namespace svgio
diff --git a/svgio/inc/svglinenode.hxx b/svgio/inc/svglinenode.hxx
index 8fc0544..5f59588 100644
--- a/svgio/inc/svglinenode.hxx
+++ b/svgio/inc/svglinenode.hxx
@@ -52,19 +52,15 @@ namespace svgio
/// X1 content, set if found in current context
const SvgNumber& getX1() const { return maX1; }
- void setX1(const SvgNumber& rX1) { maX1 = rX1; }
/// Y1 content, set if found in current context
const SvgNumber& getY1() const { return maY1; }
- void setY1(const SvgNumber& rY1) { maY1 = rY1; }
/// X2 content, set if found in current context
const SvgNumber& getX2() const { return maX2; }
- void setX2(const SvgNumber& rX2) { maX2 = rX2; }
/// Y2 content, set if found in current context
const SvgNumber& getY2() const { return maY2; }
- void setY2(const SvgNumber& rY2) { maY2 = rY2; }
/// transform content, set if found in current context
const basegfx::B2DHomMatrix* getTransform() const { return mpaTransform; }
diff --git a/svgio/inc/svgmarkernode.hxx b/svgio/inc/svgmarkernode.hxx
index 719edce..e993961 100644
--- a/svgio/inc/svgmarkernode.hxx
+++ b/svgio/inc/svgmarkernode.hxx
@@ -76,15 +76,12 @@ namespace svgio
/// SvgAspectRatio content
const SvgAspectRatio& getSvgAspectRatio() const { return maSvgAspectRatio; }
- void setSvgAspectRatio(const SvgAspectRatio& rSvgAspectRatio) { maSvgAspectRatio = rSvgAspectRatio; }
/// RefX content, set if found in current context
const SvgNumber& getRefX() const { return maRefX; }
- void setRefX(const SvgNumber& rRefX) { maRefX = rRefX; }
/// RefY content, set if found in current context
const SvgNumber& getRefY() const { return maRefY; }
- void setRefY(const SvgNumber& rRefY) { maRefY = rRefY; }
/// MarkerUnits content
MarkerUnits getMarkerUnits() const { return maMarkerUnits; }
@@ -92,11 +89,9 @@ namespace svgio
/// MarkerWidth content, set if found in current context
const SvgNumber& getMarkerWidth() const { return maMarkerWidth; }
- void setMarkerWidth(const SvgNumber& rMarkerWidth) { maMarkerWidth = rMarkerWidth; }
/// MarkerHeight content, set if found in current context
const SvgNumber& getMarkerHeight() const { return maMarkerHeight; }
- void setMarkerHeight(const SvgNumber& rMarkerHeight) { maMarkerHeight = rMarkerHeight; }
/// Angle content, set if found in current context
double getAngle() const { return mfAngle; }
@@ -104,7 +99,6 @@ namespace svgio
/// OrientAuto content, set if found in current context
bool getOrientAuto() const { return mbOrientAuto; }
- void setOrientAuto() { mbOrientAuto = true; }
};
} // end of namespace svgreader
diff --git a/svgio/inc/svgmasknode.hxx b/svgio/inc/svgmasknode.hxx
index 492ac57..43a213a 100644
--- a/svgio/inc/svgmasknode.hxx
+++ b/svgio/inc/svgmasknode.hxx
@@ -59,30 +59,24 @@ namespace svgio
/// x content, set if found in current context
const SvgNumber& getX() const { return maX; }
- void setX(const SvgNumber& rX) { maX = rX; }
/// y content, set if found in current context
const SvgNumber& getY() const { return maY; }
- void setY(const SvgNumber& rY) { maY = rY; }
/// width content, set if found in current context
const SvgNumber& getWidth() const { return maWidth; }
- void setWidth(const SvgNumber& rWidth) { maWidth = rWidth; }
/// height content, set if found in current context
const SvgNumber& getHeight() const { return maHeight; }
- void setHeight(const SvgNumber& rHeight) { maHeight = rHeight; }
/// transform content
const basegfx::B2DHomMatrix* getTransform() const { return mpaTransform; }
void setTransform(const basegfx::B2DHomMatrix* pMatrix) { if(mpaTransform) delete mpaTransform; mpaTransform = nullptr; if(pMatrix) mpaTransform = new basegfx::B2DHomMatrix(*pMatrix); }
/// MaskUnits content
- SvgUnits getMaskUnits() const { return maMaskUnits; }
void setMaskUnits(const SvgUnits aMaskUnits) { maMaskUnits = aMaskUnits; }
/// MaskContentUnits content
- SvgUnits getMaskContentUnits() const { return maMaskContentUnits; }
void setMaskContentUnits(const SvgUnits aMaskContentUnits) { maMaskContentUnits = aMaskContentUnits; }
};
} // end of namespace svgreader
diff --git a/svgio/inc/svgpathnode.hxx b/svgio/inc/svgpathnode.hxx
index 52818c4..9681e7e 100644
--- a/svgio/inc/svgpathnode.hxx
+++ b/svgio/inc/svgpathnode.hxx
@@ -60,7 +60,6 @@ namespace svgio
/// PathLength content
const SvgNumber& getPathLength() const { return maPathLength; }
- void setPathLength(const SvgNumber& rPathLength) { maPathLength = rPathLength; }
};
} // end of namespace svgreader
} // end of namespace svgio
diff --git a/svgio/inc/svgpatternnode.hxx b/svgio/inc/svgpatternnode.hxx
index 11faad0..73d3c12 100644
--- a/svgio/inc/svgpatternnode.hxx
+++ b/svgio/inc/svgpatternnode.hxx
@@ -80,23 +80,18 @@ namespace svgio
/// SvgAspectRatio content
const SvgAspectRatio& getSvgAspectRatio() const;
- void setSvgAspectRatio(const SvgAspectRatio& rSvgAspectRatio) { maSvgAspectRatio = rSvgAspectRatio; }
/// X content, set if found in current context
const SvgNumber& getX() const;
- void setX(const SvgNumber& rX) { maX = rX; }
/// Y content, set if found in current context
const SvgNumber& getY() const;
- void setY(const SvgNumber& rY) { maY = rY; }
/// Width content, set if found in current context
const SvgNumber& getWidth() const;
- void setWidth(const SvgNumber& rWidth) { maWidth = rWidth; }
/// Height content, set if found in current context
const SvgNumber& getHeight() const;
- void setHeight(const SvgNumber& rHeight) { maHeight = rHeight; }
/// PatternUnits content
const SvgUnits* getPatternUnits() const;
diff --git a/svgio/inc/svgpolynode.hxx b/svgio/inc/svgpolynode.hxx
index fdd7a50..bf3ae40 100644
--- a/svgio/inc/svgpolynode.hxx
+++ b/svgio/inc/svgpolynode.hxx
@@ -51,11 +51,7 @@ namespace svgio
virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) override;
virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DContainer& rTarget, bool bReferenced) const override;
- /// type read access
- bool isPolyline() const { return mbIsPolyline; }
-
/// Polygon content, set if found in current context
- const basegfx::B2DPolygon* getPolygon() const { return mpPolygon; }
void setPolygon(const basegfx::B2DPolygon* pPolygon) { if(mpPolygon) delete mpPolygon; mpPolygon = nullptr; if(pPolygon) mpPolygon = new basegfx::B2DPolygon(*pPolygon); }
/// transform content, set if found in current context
diff --git a/svgio/inc/svgrectnode.hxx b/svgio/inc/svgrectnode.hxx
index 3dbf68b..362b2c9 100644
--- a/svgio/inc/svgrectnode.hxx
+++ b/svgio/inc/svgrectnode.hxx
@@ -54,27 +54,21 @@ namespace svgio
/// x content, set if found in current context
const SvgNumber& getX() const { return maX; }
- void setX(const SvgNumber& rX) { maX = rX; }
/// y content, set if found in current context
const SvgNumber& getY() const { return maY; }
- void setY(const SvgNumber& rY) { maY = rY; }
/// width content, set if found in current context
const SvgNumber& getWidth() const { return maWidth; }
- void setWidth(const SvgNumber& rWidth) { maWidth = rWidth; }
/// height content, set if found in current context
const SvgNumber& getHeight() const { return maHeight; }
- void setHeight(const SvgNumber& rHeight) { maHeight = rHeight; }
/// Rx content, set if found in current context
const SvgNumber& getRx() const { return maRx; }
- void setRx(const SvgNumber& rRx) { maRx = rRx; }
/// Ry content, set if found in current context
const SvgNumber& getRy() const { return maRy; }
- void setRy(const SvgNumber& rRy) { maRy = rRy; }
/// transform content, set if found in current context
const basegfx::B2DHomMatrix* getTransform() const { return mpaTransform; }
diff --git a/svgio/inc/svgstyleattributes.hxx b/svgio/inc/svgstyleattributes.hxx
index e69affe..360335a 100644
--- a/svgio/inc/svgstyleattributes.hxx
+++ b/svgio/inc/svgstyleattributes.hxx
@@ -318,50 +318,36 @@ namespace svgio
/// stroke content
const basegfx::BColor* getStroke() const;
- void setStroke(const SvgPaint& rStroke) { maStroke = rStroke; }
/// stop color content
const basegfx::BColor& getStopColor() const;
- void setStopColor(const SvgPaint& rStopColor) { maStopColor = rStopColor; }
/// stroke-width content
SvgNumber getStrokeWidth() const;
- void setStrokeWidth(const SvgNumber& rStrokeWidth) { maStrokeWidth = rStrokeWidth; }
/// stop opacity content
SvgNumber getStopOpacity() const;
- void setStopOpacity(const SvgNumber& rStopOpacity) { maStopOpacity = rStopOpacity; }
/// access to evtl. set fill gradient
const SvgGradientNode* getSvgGradientNodeFill() const;
- void setSvgGradientNodeFill(const SvgGradientNode* pNew) { mpSvgGradientNodeFill = pNew; }
/// access to evtl. set fill pattern
const SvgPatternNode* getSvgPatternNodeFill() const;
- void setSvgPatternNodeFill(const SvgPatternNode* pNew) { mpSvgPatternNodeFill = pNew; }
/// access to evtl. set stroke gradient
const SvgGradientNode* getSvgGradientNodeStroke() const;
- void setSvgGradientNodeStroke(const SvgGradientNode* pNew) { mpSvgGradientNodeStroke = pNew; }
/// access to evtl. set stroke pattern
const SvgPatternNode* getSvgPatternNodeStroke() const;
- void setSvgPatternNodeStroke(const SvgPatternNode* pNew) { mpSvgPatternNodeStroke = pNew; }
/// fill opacity content
SvgNumber getFillOpacity() const;
- void setFillOpacity(const SvgNumber& rFillOpacity) { maFillOpacity = rFillOpacity; }
/// fill rule content
FillRule getFillRule() const;
/// fill StrokeDasharray content
const SvgNumberVector& getStrokeDasharray() const;
- void setStrokeDasharray(const SvgNumberVector& rStrokeDasharray) { maStrokeDasharray = rStrokeDasharray; }
-
- /// #121221# StrokeDasharray needs a set state, it *may* be set to empty by purpose
- bool getStrokeDasharraySet() const { return mbStrokeDasharraySet; }
- void setStrokeDasharraySet(bool bNew) { mbStrokeDasharraySet = bNew; }
/// StrokeDashOffset content
SvgNumber getStrokeDashOffset() const;
@@ -381,15 +367,12 @@ namespace svgio
/// StrokeOpacity content
SvgNumber getStrokeOpacity() const;
- void setStrokeOpacity(const SvgNumber& rStrokeOpacity) { maStrokeOpacity = rStrokeOpacity; }
/// Font content
const SvgStringVector& getFontFamily() const;
- void setFontFamily(const SvgStringVector& rSvgStringVector) { maFontFamily = rSvgStringVector; }
/// FontSize content
void setFontSize(const FontSize aFontSize) { maFontSize = aFontSize; }
- void setFontSizeNumber(const SvgNumber& rFontSize) { maFontSizeNumber = rFontSize; }
SvgNumber getFontSizeNumber() const;
/// FontStretch content
@@ -422,7 +405,6 @@ namespace svgio
/// Color content
const basegfx::BColor* getColor() const;
- void setColor(const SvgPaint& rColor) { maColor = rColor; }
/// Resolve current color (defaults to black if no color is specified)
const basegfx::BColor* getCurrentColor() const;
@@ -437,11 +419,9 @@ namespace svgio
// Title content
const OUString& getTitle() const { return maTitle; }
- void setTitle(const OUString& rNew) { maTitle = rNew; }
// Desc content
const OUString& getDesc() const { return maDesc; }
- void setDesc(const OUString& rNew) { maDesc = rNew; }
// ClipPathXLink content
OUString getClipPathXLink() const;
diff --git a/svgio/inc/svgsvgnode.hxx b/svgio/inc/svgsvgnode.hxx
index a8276da..10204ee 100644
--- a/svgio/inc/svgsvgnode.hxx
+++ b/svgio/inc/svgsvgnode.hxx
@@ -75,26 +75,18 @@ namespace svgio
/// SvgAspectRatio content
const SvgAspectRatio& getSvgAspectRatio() const { return maSvgAspectRatio; }
- void setSvgAspectRatio(const SvgAspectRatio& rSvgAspectRatio) { maSvgAspectRatio = rSvgAspectRatio; }
/// x content
const SvgNumber& getX() const { return maX; }
- void setX(const SvgNumber& rX) { maX = rX; }
/// y content
const SvgNumber& getY() const { return maY; }
- void setY(const SvgNumber& rY) { maY = rY; }
/// width content
const SvgNumber& getWidth() const { return maWidth; }
- void setWidth(const SvgNumber& rWidth) { maWidth = rWidth; }
/// height content
const SvgNumber& getHeight() const { return maHeight; }
- void setHeight(const SvgNumber& rHeight) { maHeight = rHeight; }
-
- /// version content
- void setVersion(const SvgNumber& rVersion) { maVersion = rVersion; }
};
} // end of namespace svgreader
} // end of namespace svgio
diff --git a/svgio/inc/svgsymbolnode.hxx b/svgio/inc/svgsymbolnode.hxx
index 98b404e..a6458fe 100644
--- a/svgio/inc/svgsymbolnode.hxx
+++ b/svgio/inc/svgsymbolnode.hxx
@@ -47,9 +47,6 @@ namespace svgio
/// viewBox content
void setViewBox(const basegfx::B2DRange* pViewBox) { if(mpViewBox) delete mpViewBox; mpViewBox = nullptr; if(pViewBox) mpViewBox = new basegfx::B2DRange(*pViewBox); }
-
- /// SvgAspectRatio content
- void setSvgAspectRatio(const SvgAspectRatio& rSvgAspectRatio) { maSvgAspectRatio = rSvgAspectRatio; }
};
} // end of namespace svgreader
} // end of namespace svgio
diff --git a/svgio/inc/svgtextnode.hxx b/svgio/inc/svgtextnode.hxx
index 35116d8..e3bd310 100644
--- a/svgio/inc/svgtextnode.hxx
+++ b/svgio/inc/svgtextnode.hxx
@@ -63,9 +63,6 @@ namespace svgio
/// transform content, set if found in current context
const basegfx::B2DHomMatrix* getTransform() const { return mpaTransform; }
void setTransform(const basegfx::B2DHomMatrix* pMatrix) { if(mpaTransform) delete mpaTransform; mpaTransform = nullptr; if(pMatrix) mpaTransform = new basegfx::B2DHomMatrix(*pMatrix); }
-
- /// access to SvgTextPositions
- const SvgTextPositions& getSvgTextPositions() const { return maSvgTextPositions; }
};
} // end of namespace svgreader
} // end of namespace svgio
diff --git a/svgio/inc/svgtextpathnode.hxx b/svgio/inc/svgtextpathnode.hxx
index 42fd096..3987651 100644
--- a/svgio/inc/svgtextpathnode.hxx
+++ b/svgio/inc/svgtextpathnode.hxx
@@ -60,7 +60,6 @@ namespace svgio
/// StartOffset content
const SvgNumber& getStartOffset() const { return maStartOffset; }
- void setStartOffset(const SvgNumber& rStartOffset) { maStartOffset = rStartOffset; }
/// Method content
void setMethod(bool bNew) { mbMethod = bNew; }
diff --git a/svgio/inc/svgusenode.hxx b/svgio/inc/svgusenode.hxx
index 237fa39..a6eccaa 100644
--- a/svgio/inc/svgusenode.hxx
+++ b/svgio/inc/svgusenode.hxx
@@ -60,17 +60,10 @@ namespace svgio
/// x content
const SvgNumber& getX() const { return maX; }
- void setX(const SvgNumber& rX) { maX = rX; }
/// y content
const SvgNumber& getY() const { return maY; }
- void setY(const SvgNumber& rY) { maY = rY; }
- /// width content
- void setWidth(const SvgNumber& rWidth) { maWidth = rWidth; }
-
- /// height content
- void setHeight(const SvgNumber& rHeight) { maHeight = rHeight; }
};
} // end of namespace svgreader
} // end of namespace svgio
diff --git a/svgio/source/svgreader/svgcirclenode.cxx b/svgio/source/svgreader/svgcirclenode.cxx
index 2bbbffb..d950632 100644
--- a/svgio/source/svgreader/svgcirclenode.cxx
+++ b/svgio/source/svgreader/svgcirclenode.cxx
@@ -69,7 +69,7 @@ namespace svgio
if(readSingleNumber(aContent, aNum))
{
- setCx(aNum);
+ maCx = aNum;
}
break;
}
@@ -79,7 +79,7 @@ namespace svgio
if(readSingleNumber(aContent, aNum))
{
- setCy(aNum);
+ maCy = aNum;
}
break;
}
@@ -91,7 +91,7 @@ namespace svgio
{
if(aNum.isPositive())
{
- setR(aNum);
+ maR = aNum;
}
}
break;
diff --git a/svgio/source/svgreader/svgellipsenode.cxx b/svgio/source/svgreader/svgellipsenode.cxx
index 9fab415..1a021ac 100644
--- a/svgio/source/svgreader/svgellipsenode.cxx
+++ b/svgio/source/svgreader/svgellipsenode.cxx
@@ -70,7 +70,7 @@ namespace svgio
if(readSingleNumber(aContent, aNum))
{
- setCx(aNum);
+ maCx = aNum;
}
break;
}
@@ -80,7 +80,7 @@ namespace svgio
if(readSingleNumber(aContent, aNum))
{
- setCy(aNum);
+ maCy = aNum;
}
break;
}
@@ -92,7 +92,7 @@ namespace svgio
{
if(aNum.isPositive())
{
- setRx(aNum);
+ maRx = aNum;
}
}
break;
@@ -105,7 +105,7 @@ namespace svgio
{
if(aNum.isPositive())
{
- setRy(aNum);
+ maRy = aNum;
}
}
break;
diff --git a/svgio/source/svgreader/svggradientnode.cxx b/svgio/source/svgreader/svggradientnode.cxx
index 8137ac3f..0af85b4 100644
--- a/svgio/source/svgreader/svggradientnode.cxx
+++ b/svgio/source/svgreader/svggradientnode.cxx
@@ -95,7 +95,7 @@ namespace svgio
if(readSingleNumber(aContent, aNum))
{
- setX1(aNum);
+ maX1 = aNum;
}
break;
}
@@ -105,7 +105,7 @@ namespace svgio
if(readSingleNumber(aContent, aNum))
{
- setY1(aNum);
+ maY1 = aNum;
}
break;
}
@@ -115,7 +115,7 @@ namespace svgio
if(readSingleNumber(aContent, aNum))
{
- setX2(aNum);
+ maX2 = aNum;
}
break;
}
@@ -125,7 +125,7 @@ namespace svgio
if(readSingleNumber(aContent, aNum))
{
- setY2(aNum);
+ maY2 = aNum;
}
break;
}
@@ -135,7 +135,7 @@ namespace svgio
if(readSingleNumber(aContent, aNum))
{
- setCx(aNum);
+ maCx = aNum;
}
break;
}
@@ -145,7 +145,7 @@ namespace svgio
if(readSingleNumber(aContent, aNum))
{
- setCy(aNum);
+ maCy = aNum;
}
break;
}
@@ -155,7 +155,7 @@ namespace svgio
if(readSingleNumber(aContent, aNum))
{
- setFx(aNum);
+ maFx = aNum;
}
break;
}
@@ -165,7 +165,7 @@ namespace svgio
if(readSingleNumber(aContent, aNum))
{
- setFy(aNum);
+ maFy = aNum;
}
break;
}
@@ -177,7 +177,7 @@ namespace svgio
{
if(aNum.isPositive())
{
- setR(aNum);
+ maR = aNum;
}
}
break;
diff --git a/svgio/source/svgreader/svggradientstopnode.cxx b/svgio/source/svgreader/svggradientstopnode.cxx
index f2f10d8..34ed913 100644
--- a/svgio/source/svgreader/svggradientstopnode.cxx
+++ b/svgio/source/svgreader/svggradientstopnode.cxx
@@ -67,7 +67,7 @@ namespace svgio
{
if(aNum.isPositive())
{
- setOffset(aNum);
+ maOffset = aNum;
}
}
break;
diff --git a/svgio/source/svgreader/svgimagenode.cxx b/svgio/source/svgreader/svgimagenode.cxx
index 5d7735f..e1033df 100644
--- a/svgio/source/svgreader/svgimagenode.cxx
+++ b/svgio/source/svgreader/svgimagenode.cxx
@@ -83,7 +83,7 @@ namespace svgio
}
case SVGTokenPreserveAspectRatio:
{
- setSvgAspectRatio(readSvgAspectRatio(aContent));
+ maSvgAspectRatio = readSvgAspectRatio(aContent);
break;
}
case SVGTokenTransform:
@@ -102,7 +102,7 @@ namespace svgio
if(readSingleNumber(aContent, aNum))
{
- setX(aNum);
+ maX = aNum;
}
break;
}
@@ -112,7 +112,7 @@ namespace svgio
if(readSingleNumber(aContent, aNum))
{
- setY(aNum);
+ maY = aNum;
}
break;
}
@@ -124,7 +124,7 @@ namespace svgio
{
if(aNum.isPositive())
{
- setWidth(aNum);
+ maWidth = aNum;
}
}
break;
@@ -137,7 +137,7 @@ namespace svgio
{
if(aNum.isPositive())
{
- setHeight(aNum);
+ maHeight = aNum;
}
}
break;
@@ -322,7 +322,7 @@ namespace svgio
else
{
// create mapping
- const SvgAspectRatio& rRatio = getSvgAspectRatio();
+ const SvgAspectRatio& rRatio = maSvgAspectRatio;
// even when ratio is not set, use the defaults
// let mapping be created from SvgAspectRatio
diff --git a/svgio/source/svgreader/svglinenode.cxx b/svgio/source/svgreader/svglinenode.cxx
index 2bbcadb..3720fb0 100644
--- a/svgio/source/svgreader/svglinenode.cxx
+++ b/svgio/source/svgreader/svglinenode.cxx
@@ -70,7 +70,7 @@ namespace svgio
if(readSingleNumber(aContent, aNum))
{
- setX1(aNum);
+ maX1 = aNum;
}
break;
}
@@ -80,7 +80,7 @@ namespace svgio
if(readSingleNumber(aContent, aNum))
{
- setY1(aNum);
+ maY1 = aNum;
}
break;
}
@@ -90,7 +90,7 @@ namespace svgio
if(readSingleNumber(aContent, aNum))
{
- setX2(aNum);
+ maX2 = aNum;
}
break;
}
@@ -100,7 +100,7 @@ namespace svgio
if(readSingleNumber(aContent, aNum))
{
- setY2(aNum);
+ maY2 = aNum;
}
break;
}
diff --git a/svgio/source/svgreader/svgmarkernode.cxx b/svgio/source/svgreader/svgmarkernode.cxx
index 5c8ecd2..110b4b8 100644
--- a/svgio/source/svgreader/svgmarkernode.cxx
+++ b/svgio/source/svgreader/svgmarkernode.cxx
@@ -79,7 +79,7 @@ namespace svgio
}
case SVGTokenPreserveAspectRatio:
{
- setSvgAspectRatio(readSvgAspectRatio(aContent));
+ maSvgAspectRatio = readSvgAspectRatio(aContent);
break;
}
case SVGTokenRefX:
@@ -88,7 +88,7 @@ namespace svgio
if(readSingleNumber(aContent, aNum))
{
- setRefX(aNum);
+ maRefX = aNum;
}
break;
}
@@ -98,7 +98,7 @@ namespace svgio
if(readSingleNumber(aContent, aNum))
{
- setRefY(aNum);
+ maRefY = aNum;
}
break;
}
@@ -125,7 +125,7 @@ namespace svgio
{
if(aNum.isPositive())
{
- setMarkerWidth(aNum);
+ maMarkerWidth = aNum;
}
}
break;
@@ -138,7 +138,7 @@ namespace svgio
{
if(aNum.isPositive())
{
- setMarkerHeight(aNum);
+ maMarkerHeight = aNum;
}
}
break;
@@ -151,7 +151,7 @@ namespace svgio
{
if(aContent.startsWith("auto"))
{
- setOrientAuto();
+ mbOrientAuto = true;
}
else
{
diff --git a/svgio/source/svgreader/svgmasknode.cxx b/svgio/source/svgreader/svgmasknode.cxx
index 4879e7e..34f8faa 100644
--- a/svgio/source/svgreader/svgmasknode.cxx
+++ b/svgio/source/svgreader/svgmasknode.cxx
@@ -78,7 +78,7 @@ namespace svgio
if(readSingleNumber(aContent, aNum))
{
- setX(aNum);
+ maX = aNum;
}
break;
}
@@ -88,7 +88,7 @@ namespace svgio
if(readSingleNumber(aContent, aNum))
{
- setY(aNum);
+ maY = aNum;
}
break;
}
@@ -100,7 +100,7 @@ namespace svgio
{
if(aNum.isPositive())
{
- setWidth(aNum);
+ maWidth = aNum;
}
}
break;
@@ -113,7 +113,7 @@ namespace svgio
{
if(aNum.isPositive())
{
- setHeight(aNum);
+ maHeight = aNum;
}
}
break;
@@ -215,7 +215,7 @@ namespace svgio
// create OffscreenBufferRange
basegfx::B2DRange aOffscreenBufferRange;
- if(objectBoundingBox == getMaskUnits())
+ if(objectBoundingBox == maMaskUnits)
{
// fractions or percentages of the bounding box of the element to which the mask is applied
const double fX(Unit_percent == getX().getUnit() ? getX().getNumber() * 0.01 : getX().getNumber());
@@ -241,7 +241,7 @@ namespace svgio
fY + (getHeight().isSet() ? getHeight().solve(*this, ycoordinate) : 0.0));
}
- if(objectBoundingBox == getMaskContentUnits())
+ if(objectBoundingBox == maMaskContentUnits)
{
// mask is object-relative, embed in content transformation
const drawinglayer::primitive2d::Primitive2DReference xTransform(
diff --git a/svgio/source/svgreader/svgpathnode.cxx b/svgio/source/svgreader/svgpathnode.cxx
index 9ba2469..5b36890 100644
--- a/svgio/source/svgreader/svgpathnode.cxx
+++ b/svgio/source/svgreader/svgpathnode.cxx
@@ -91,7 +91,7 @@ namespace svgio
if(readSingleNumber(aContent, aNum))
{
- setPathLength(aNum);
+ maPathLength = aNum;
}
break;
}
diff --git a/svgio/source/svgreader/svgpatternnode.cxx b/svgio/source/svgreader/svgpatternnode.cxx
index 6338f96..52511b6 100644
--- a/svgio/source/svgreader/svgpatternnode.cxx
+++ b/svgio/source/svgreader/svgpatternnode.cxx
@@ -93,7 +93,7 @@ namespace svgio
}
case SVGTokenPreserveAspectRatio:
{
- setSvgAspectRatio(readSvgAspectRatio(aContent));
+ maSvgAspectRatio = readSvgAspectRatio(aContent);
break;
}
case SVGTokenX:
@@ -102,7 +102,7 @@ namespace svgio
if(readSingleNumber(aContent, aNum))
{
- setX(aNum);
+ maX = aNum;
}
break;
}
@@ -112,7 +112,7 @@ namespace svgio
if(readSingleNumber(aContent, aNum))
{
- setY(aNum);
+ maY = aNum;
}
break;
}
@@ -124,7 +124,7 @@ namespace svgio
{
if(aNum.isPositive())
{
- setWidth(aNum);
+ maWidth = aNum;
}
}
break;
@@ -137,7 +137,7 @@ namespace svgio
{
if(aNum.isPositive())
{
- setHeight(aNum);
+ maHeight = aNum;
}
}
break;
diff --git a/svgio/source/svgreader/svgpolynode.cxx b/svgio/source/svgreader/svgpolynode.cxx
index 378f4c7..026f9d6 100644
--- a/svgio/source/svgreader/svgpolynode.cxx
+++ b/svgio/source/svgreader/svgpolynode.cxx
@@ -73,7 +73,7 @@ namespace svgio
{
if(aPath.count())
{
- if(!isPolyline())
+ if(!mbIsPolyline)
{
aPath.setClosed(true);
}
@@ -104,11 +104,11 @@ namespace svgio
{
const SvgStyleAttributes* pStyle = getSvgStyleAttributes();
- if(pStyle && getPolygon())
+ if(pStyle && mpPolygon)
{
drawinglayer::primitive2d::Primitive2DContainer aNewTarget;
- pStyle->add_path(basegfx::B2DPolyPolygon(*getPolygon()), aNewTarget, nullptr);
+ pStyle->add_path(basegfx::B2DPolyPolygon(*mpPolygon), aNewTarget, nullptr);
if(!aNewTarget.empty())
{
diff --git a/svgio/source/svgreader/svgrectnode.cxx b/svgio/source/svgreader/svgrectnode.cxx
index ee10be2..50df6c5 100644
--- a/svgio/source/svgreader/svgrectnode.cxx
+++ b/svgio/source/svgreader/svgrectnode.cxx
@@ -72,7 +72,7 @@ namespace svgio
if(readSingleNumber(aContent, aNum))
{
- setX(aNum);
+ maX = aNum;
}
break;
}
@@ -82,7 +82,7 @@ namespace svgio
if(readSingleNumber(aContent, aNum))
{
- setY(aNum);
+ maY = aNum;
}
break;
}
@@ -94,7 +94,7 @@ namespace svgio
{
if(aNum.isPositive())
{
- setWidth(aNum);
+ maWidth = aNum;
}
}
break;
@@ -107,7 +107,7 @@ namespace svgio
{
if(aNum.isPositive())
{
- setHeight(aNum);
+ maHeight = aNum;
}
}
break;
@@ -120,7 +120,7 @@ namespace svgio
{
if(aNum.isPositive())
{
- setRx(aNum);
+ maRx = aNum;
}
}
break;
@@ -133,7 +133,7 @@ namespace svgio
{
if(aNum.isPositive())
{
- setRy(aNum);
+ maRy = aNum;
}
}
break;
diff --git a/svgio/source/svgreader/svgstyleattributes.cxx b/svgio/source/svgreader/svgstyleattributes.cxx
index cc66af5a..6a92c42e7 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -1301,11 +1301,11 @@ namespace svgio
{
if(SVGTokenLinearGradient == pNode->getType() || SVGTokenRadialGradient == pNode->getType())
{
- setSvgGradientNodeFill(static_cast< const SvgGradientNode* >(pNode));
+ mpSvgGradientNodeFill = static_cast< const SvgGradientNode* >(pNode);
}
else if(SVGTokenPattern == pNode->getType())
{
- setSvgPatternNodeFill(static_cast< const SvgPatternNode* >(pNode));
+ mpSvgPatternNodeFill = static_cast< const SvgPatternNode* >(pNode);
}
}
}
@@ -1317,7 +1317,7 @@ namespace svgio
if(readSingleNumber(aContent, aNum))
{
- setFillOpacity(SvgNumber(basegfx::clamp(aNum.getNumber(), 0.0, 1.0), aNum.getUnit(), aNum.isSet()));
+ maFillOpacity = SvgNumber(basegfx::clamp(aNum.getNumber(), 0.0, 1.0), aNum.getUnit(), aNum.isSet());
}
break;
}
@@ -1344,7 +1344,7 @@ namespace svgio
if(readSvgPaint(aContent, aSvgPaint, aURL, bCaseIndependent, aOpacity))
{
- setStroke(aSvgPaint);
+ maStroke = aSvgPaint;
if(aOpacity.isSet())
{
setOpacity(SvgNumber(basegfx::clamp(aOpacity.getNumber(), 0.0, 1.0)));
@@ -1358,11 +1358,11 @@ namespace svgio
{
if(SVGTokenLinearGradient == pNode->getType() || SVGTokenRadialGradient == pNode->getType())
{
- setSvgGradientNodeStroke(static_cast< const SvgGradientNode* >(pNode));
+ mpSvgGradientNodeStroke = static_cast< const SvgGradientNode* >(pNode);
}
else if(SVGTokenPattern == pNode->getType())
{
- setSvgPatternNodeStroke(static_cast< const SvgPatternNode* >(pNode));
+ mpSvgPatternNodeStroke = static_cast< const SvgPatternNode* >(pNode);
}
}
}
@@ -1380,11 +1380,11 @@ namespace svgio
// in the sense that *when* it is set, the parent shall not
// be used. Before this was only dependent on the array being
// empty
- setStrokeDasharraySet(true);
+ mbStrokeDasharraySet = true;
}
else if(readSvgNumberVector(aContent, aVector))
{
- setStrokeDasharray(aVector);
+ maStrokeDasharray = aVector;
}
}
break;
@@ -1460,7 +1460,7 @@ namespace svgio
if(readSingleNumber(aContent, aNum))
{
- setStrokeOpacity(SvgNumber(basegfx::clamp(aNum.getNumber(), 0.0, 1.0), aNum.getUnit(), aNum.isSet()));
+ maStrokeOpacity = SvgNumber(basegfx::clamp(aNum.getNumber(), 0.0, 1.0), aNum.getUnit(), aNum.isSet());
}
break;
}
@@ -1472,7 +1472,7 @@ namespace svgio
{
if(aNum.isPositive())
{
- setStrokeWidth(aNum);
+ maStrokeWidth = aNum;
}
}
break;
@@ -1485,7 +1485,7 @@ namespace svgio
if(readSvgPaint(aContent, aSvgPaint, aURL, bCaseIndependent, aOpacity))
{
- setStopColor(aSvgPaint);
+ maStopColor = aSvgPaint;
if(aOpacity.isSet())
{
setOpacity(SvgNumber(basegfx::clamp(aOpacity.getNumber(), 0.0, 1.0)));
@@ -1501,7 +1501,7 @@ namespace svgio
{
if(aNum.isPositive())
{
- setStopOpacity(aNum);
+ maStopOpacity = aNum;
}
}
break;
@@ -1516,7 +1516,7 @@ namespace svgio
if(readSvgStringVector(aContent, aSvgStringVector))
{
- setFontFamily(aSvgStringVector);
+ maFontFamily = aSvgStringVector;
}
break;
}
@@ -1570,7 +1570,7 @@ namespace svgio
if(readSingleNumber(aContent, aNum))
{
- setFontSizeNumber(aNum);
+ maFontSizeNumber = aNum;
}
}
}
@@ -1809,7 +1809,7 @@ namespace svgio
if(readSvgPaint(aContent, aSvgPaint, aURL, bCaseIndependent, aOpacity))
{
- setColor(aSvgPaint);
+ maColor = aSvgPaint;
if(aOpacity.isSet())
{
setOpacity(SvgNumber(basegfx::clamp(aOpacity.getNumber(), 0.0, 1.0)));
@@ -1852,12 +1852,12 @@ namespace svgio
}
case SVGTokenTitle:
{
- setTitle(aContent);
+ maTitle = aContent;
break;
}
case SVGTokenDesc:
{
- setDesc(aContent);
+ maDesc = aContent;
break;
}
case SVGTokenClipPathProperty:
@@ -2256,7 +2256,7 @@ namespace svgio
{
return maStrokeDasharray;
}
- else if(getStrokeDasharraySet())
+ else if(mbStrokeDasharraySet)
{
// #121221# is set to empty *by purpose*, do not visit parent styles
return maStrokeDasharray;
diff --git a/svgio/source/svgreader/svgsvgnode.cxx b/svgio/source/svgreader/svgsvgnode.cxx
index 81dfd24..91b3579 100644
--- a/svgio/source/svgreader/svgsvgnode.cxx
+++ b/svgio/source/svgreader/svgsvgnode.cxx
@@ -143,7 +143,7 @@ namespace svgio
}
case SVGTokenPreserveAspectRatio:
{
- setSvgAspectRatio(readSvgAspectRatio(aContent));
+ maSvgAspectRatio = readSvgAspectRatio(aContent);
break;
}
case SVGTokenX:
@@ -152,7 +152,7 @@ namespace svgio
if(readSingleNumber(aContent, aNum))
{
- setX(aNum);
+ maX = aNum;
}
break;
}
@@ -162,7 +162,7 @@ namespace svgio
if(readSingleNumber(aContent, aNum))
{
- setY(aNum);
+ maY = aNum;
}
break;
}
@@ -174,7 +174,7 @@ namespace svgio
{
if(aNum.isPositive())
{
- setWidth(aNum);
+ maWidth = aNum;
}
}
break;
@@ -187,7 +187,7 @@ namespace svgio
{
if(aNum.isPositive())
{
- setHeight(aNum);
+ maHeight = aNum;
}
}
break;
@@ -198,7 +198,7 @@ namespace svgio
if(readSingleNumber(aContent, aNum))
{
- setVersion(aNum);
+ maVersion = aNum;
}
break;
}
diff --git a/svgio/source/svgreader/svgsymbolnode.cxx b/svgio/source/svgreader/svgsymbolnode.cxx
index 85f1ea5..66264f81 100644
--- a/svgio/source/svgreader/svgsymbolnode.cxx
+++ b/svgio/source/svgreader/svgsymbolnode.cxx
@@ -73,7 +73,7 @@ namespace svgio
}
case SVGTokenPreserveAspectRatio:
{
- setSvgAspectRatio(readSvgAspectRatio(aContent));
+ maSvgAspectRatio = readSvgAspectRatio(aContent);
break;
}
default:
diff --git a/svgio/source/svgreader/svgtextnode.cxx b/svgio/source/svgreader/svgtextnode.cxx
index d789129..5c44ce0 100644
--- a/svgio/source/svgreader/svgtextnode.cxx
+++ b/svgio/source/svgreader/svgtextnode.cxx
@@ -233,7 +233,7 @@ namespace svgio
if(fOpacity > 0.0)
{
- SvgTextPosition aSvgTextPosition(nullptr, *this, getSvgTextPositions());
+ SvgTextPosition aSvgTextPosition(nullptr, *this, maSvgTextPositions);
drawinglayer::primitive2d::Primitive2DContainer aNewTarget;
const SvgNodeVector& rChildren = getChildren();
const sal_uInt32 nCount(rChildren.size());
diff --git a/svgio/source/svgreader/svgtextpathnode.cxx b/svgio/source/svgreader/svgtextpathnode.cxx
index 408d0fb..0608a71 100644
--- a/svgio/source/svgreader/svgtextpathnode.cxx
+++ b/svgio/source/svgreader/svgtextpathnode.cxx
@@ -290,7 +290,7 @@ namespace svgio
{
if(aNum.isPositive())
{
- setStartOffset(aNum);
+ maStartOffset = aNum;
}
}
break;
diff --git a/svgio/source/svgreader/svgusenode.cxx b/svgio/source/svgreader/svgusenode.cxx
index 6a055d0..7495c2b 100644
--- a/svgio/source/svgreader/svgusenode.cxx
+++ b/svgio/source/svgreader/svgusenode.cxx
@@ -81,7 +81,7 @@ namespace svgio
if(readSingleNumber(aContent, aNum))
{
- setX(aNum);
+ maX = aNum;
}
break;
}
@@ -91,7 +91,7 @@ namespace svgio
if(readSingleNumber(aContent, aNum))
{
- setY(aNum);
+ maY = aNum;
}
break;
}
@@ -103,7 +103,7 @@ namespace svgio
{
if(aNum.isPositive())
{
- setWidth(aNum);
+ maWidth = aNum;
}
}
break;
@@ -116,7 +116,7 @@ namespace svgio
{
if(aNum.isPositive())
{
- setHeight(aNum);
+ maHeight = aNum;
}
}
break;
More information about the Libreoffice-commits
mailing list