Author: alg
Date: Wed Jan 23 10:34:29 2013
New Revision: 1437329
URL: http://svn.apache.org/viewvc?rev=1437329&view=rev
Log:
#121656# removed const for return-by-value
Modified:
openoffice/trunk/main/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
openoffice/trunk/main/svgio/source/svgreader/svgstyleattributes.cxx
Modified: openoffice/trunk/main/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svgio/inc/svgio/svgreader/svgstyleattributes.hxx?rev=1437329&r1=1437328&r2=1437329&view=diff
==============================================================================
--- openoffice/trunk/main/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
(original)
+++ openoffice/trunk/main/svgio/inc/svgio/svgreader/svgstyleattributes.hxx Wed
Jan 23 10:34:29 2013
@@ -290,11 +290,11 @@ namespace svgio
void setStopColor(const SvgPaint& rStopColor) { maStopColor =
rStopColor; }
/// stroke-width content
- const SvgNumber getStrokeWidth() const;
+ SvgNumber getStrokeWidth() const;
void setStrokeWidth(const SvgNumber& rStrokeWidth = SvgNumber()) {
maStrokeWidth = rStrokeWidth; }
/// stop opacity content
- const SvgNumber getStopOpacity() const;
+ SvgNumber getStopOpacity() const;
void setStopOpacity(const SvgNumber& rStopOpacity = SvgNumber()) {
maStopOpacity = rStopOpacity; }
/// access to evtl. set fill gradient
@@ -314,11 +314,11 @@ namespace svgio
void setSvgPatternNodeStroke(const SvgPatternNode* pNew) {
mpSvgPatternNodeStroke = pNew; }
/// fill opacity content
- const SvgNumber getFillOpacity() const;
+ SvgNumber getFillOpacity() const;
void setFillOpacity(const SvgNumber& rFillOpacity = SvgNumber()) {
maFillOpacity = rFillOpacity; }
/// fill rule content
- const FillRule getFillRule() const;
+ FillRule getFillRule() const;
void setFillRule(const FillRule aFillRule = FillRule_notset) {
maFillRule = aFillRule; }
/// fill StrokeDasharray content
@@ -326,27 +326,27 @@ namespace svgio
void setStrokeDasharray(const SvgNumberVector& rStrokeDasharray =
SvgNumberVector()) { maStrokeDasharray = rStrokeDasharray; }
/// #121221# StrokeDasharray needs a set state, it *may* be set to
empty by purpose
- const bool getStrokeDasharraySet() const { return
mbStrokeDasharraySet; }
+ bool getStrokeDasharraySet() const { return mbStrokeDasharraySet; }
void setStrokeDasharraySet(bool bNew) { mbStrokeDasharraySet =
bNew; }
/// StrokeDashOffset content
- const SvgNumber getStrokeDashOffset() const;
+ SvgNumber getStrokeDashOffset() const;
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
- const SvgNumber getStrokeMiterLimit() const;
+ SvgNumber getStrokeMiterLimit() const;
void setStrokeMiterLimit(const SvgNumber& rStrokeMiterLimit =
SvgNumber()) { maStrokeMiterLimit = rStrokeMiterLimit; }
/// StrokeOpacity content
- const SvgNumber getStrokeOpacity() const;
+ SvgNumber getStrokeOpacity() const;
void setStrokeOpacity(const SvgNumber& rStrokeOpacity =
SvgNumber()) { maStrokeOpacity = rStrokeOpacity; }
/// Font content
@@ -354,36 +354,36 @@ namespace svgio
void setFontFamily(const SvgStringVector& rSvgStringVector =
SvgStringVector()) { maFontFamily = rSvgStringVector; }
/// FontSize content
- const SvgNumber getFontSize() const;
+ SvgNumber getFontSize() const;
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
@@ -391,7 +391,7 @@ namespace svgio
void setColor(const SvgPaint& rColor) { maColor = rColor; }
/// Opacity content
- const SvgNumber getOpacity() const { return maOpacity; }
+ SvgNumber getOpacity() const { return maOpacity; }
void setOpacity(const SvgNumber& rOpacity = SvgNumber()) {
maOpacity = rOpacity; }
// Title content
@@ -411,17 +411,17 @@ namespace svgio
void setMaskXLink(const rtl::OUString& rNew) { maMaskXLink = rNew;
}
// MarkerStartXLink content
- const rtl::OUString getMarkerStartXLink() const;
+ rtl::OUString getMarkerStartXLink() const;
const SvgMarkerNode* accessMarkerStartXLink() const;
void setMarkerStartXLink(const rtl::OUString& rNew) {
maMarkerStartXLink = rNew; }
// MarkerMidXLink content
- const rtl::OUString getMarkerMidXLink() const;
+ rtl::OUString getMarkerMidXLink() const;
const SvgMarkerNode* accessMarkerMidXLink() const;
void setMarkerMidXLink(const rtl::OUString& rNew) {
maMarkerMidXLink = rNew; }
// MarkerEndXLink content
- const rtl::OUString getMarkerEndXLink() const;
+ rtl::OUString getMarkerEndXLink() const;
const SvgMarkerNode* accessMarkerEndXLink() const;
void setMarkerEndXLink(const rtl::OUString& rNew) {
maMarkerEndXLink = rNew; }
Modified: openoffice/trunk/main/svgio/source/svgreader/svgstyleattributes.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svgio/source/svgreader/svgstyleattributes.cxx?rev=1437329&r1=1437328&r2=1437329&view=diff
==============================================================================
--- openoffice/trunk/main/svgio/source/svgreader/svgstyleattributes.cxx
(original)
+++ openoffice/trunk/main/svgio/source/svgreader/svgstyleattributes.cxx Wed Jan
23 10:34:29 2013
@@ -1961,7 +1961,7 @@ namespace svgio
return 0;
}
- const SvgNumber SvgStyleAttributes::getStrokeWidth() const
+ SvgNumber SvgStyleAttributes::getStrokeWidth() const
{
if(mbIsClipPathContent)
{
@@ -1983,7 +1983,7 @@ namespace svgio
return SvgNumber(1.0);
}
- const SvgNumber SvgStyleAttributes::getStopOpacity() const
+ SvgNumber SvgStyleAttributes::getStopOpacity() const
{
if(maStopOpacity.isSet())
{
@@ -1994,7 +1994,7 @@ namespace svgio
return SvgNumber(1.0);
}
- const SvgNumber SvgStyleAttributes::getFillOpacity() const
+ SvgNumber SvgStyleAttributes::getFillOpacity() const
{
if(mbIsClipPathContent)
{
@@ -2016,7 +2016,7 @@ namespace svgio
return SvgNumber(1.0);
}
- const FillRule SvgStyleAttributes::getFillRule() const
+ FillRule SvgStyleAttributes::getFillRule() const
{
if(FillRule_notset != maFillRule)
{
@@ -2057,7 +2057,7 @@ namespace svgio
return maStrokeDasharray;
}
- const SvgNumber SvgStyleAttributes::getStrokeDashOffset() const
+ SvgNumber SvgStyleAttributes::getStrokeDashOffset() const
{
if(maStrokeDashOffset.isSet())
{
@@ -2075,7 +2075,7 @@ namespace svgio
return SvgNumber(0.0);
}
- const StrokeLinecap SvgStyleAttributes::getStrokeLinecap() const
+ StrokeLinecap SvgStyleAttributes::getStrokeLinecap() const
{
if(maStrokeLinecap != StrokeLinecap_notset)
{
@@ -2093,7 +2093,7 @@ namespace svgio
return StrokeLinecap_butt;
}
- const StrokeLinejoin SvgStyleAttributes::getStrokeLinejoin() const
+ StrokeLinejoin SvgStyleAttributes::getStrokeLinejoin() const
{
if(maStrokeLinejoin != StrokeLinejoin_notset)
{
@@ -2111,7 +2111,7 @@ namespace svgio
return StrokeLinejoin_miter;
}
- const SvgNumber SvgStyleAttributes::getStrokeMiterLimit() const
+ SvgNumber SvgStyleAttributes::getStrokeMiterLimit() const
{
if(maStrokeMiterLimit.isSet())
{
@@ -2129,7 +2129,7 @@ namespace svgio
return SvgNumber(4.0);
}
- const SvgNumber SvgStyleAttributes::getStrokeOpacity() const
+ SvgNumber SvgStyleAttributes::getStrokeOpacity() const
{
if(maStrokeOpacity.isSet())
{
@@ -2165,7 +2165,7 @@ namespace svgio
return maFontFamily;
}
- const SvgNumber SvgStyleAttributes::getFontSize() const
+ SvgNumber SvgStyleAttributes::getFontSize() const
{
if(maFontSize.isSet())
{
@@ -2183,7 +2183,7 @@ namespace svgio
return SvgNumber(12.0);
}
- const FontStretch SvgStyleAttributes::getFontStretch() const
+ FontStretch SvgStyleAttributes::getFontStretch() const
{
if(maFontStretch != FontStretch_notset)
{
@@ -2215,7 +2215,7 @@ namespace svgio
return FontStretch_normal;
}
- const FontStyle SvgStyleAttributes::getFontStyle() const
+ FontStyle SvgStyleAttributes::getFontStyle() const
{
if(maFontStyle != FontStyle_notset)
{
@@ -2233,7 +2233,7 @@ namespace svgio
return FontStyle_normal;
}
- const FontWeight SvgStyleAttributes::getFontWeight() const
+ FontWeight SvgStyleAttributes::getFontWeight() const
{
if(maFontWeight != FontWeight_notset)
{
@@ -2265,7 +2265,7 @@ namespace svgio
return FontWeight_400;
}
- const TextAlign SvgStyleAttributes::getTextAlign() const
+ TextAlign SvgStyleAttributes::getTextAlign() const
{
if(maTextAlign != TextAlign_notset)
{
@@ -2301,7 +2301,7 @@ namespace svgio
return 0;
}
- const TextDecoration SvgStyleAttributes::getTextDecoration() const
+ TextDecoration SvgStyleAttributes::getTextDecoration() const
{
const SvgStyleAttributes* pDefining =
getTextDecorationDefiningSvgStyleAttributes();
@@ -2316,7 +2316,7 @@ namespace svgio
}
}
- const TextAnchor SvgStyleAttributes::getTextAnchor() const
+ TextAnchor SvgStyleAttributes::getTextAnchor() const
{
if(maTextAnchor != TextAnchor_notset)
{
@@ -2361,7 +2361,7 @@ namespace svgio
return 0;
}
- const rtl::OUString SvgStyleAttributes::getMarkerStartXLink() const
+ rtl::OUString SvgStyleAttributes::getMarkerStartXLink() const
{
if(maMarkerStartXLink.getLength())
{
@@ -2393,7 +2393,7 @@ namespace svgio
return mpMarkerStartXLink;
}
- const rtl::OUString SvgStyleAttributes::getMarkerMidXLink() const
+ rtl::OUString SvgStyleAttributes::getMarkerMidXLink() const
{
if(maMarkerMidXLink.getLength())
{
@@ -2425,7 +2425,7 @@ namespace svgio
return mpMarkerMidXLink;
}
- const rtl::OUString SvgStyleAttributes::getMarkerEndXLink() const
+ rtl::OUString SvgStyleAttributes::getMarkerEndXLink() const
{
if(maMarkerEndXLink.getLength())
{
