diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-01-07 22:27:41 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-01-07 22:27:41 +0100 |
| commit | eda0cec9ac990020e9da804ec3ed38e2cbfeeb77 (patch) | |
| tree | ce01afe125d3868a9677004b2aa5ef47b67aefaf /filter | |
| parent | Fix type SMPT->SMTP (diff) | |
| download | core-eda0cec9ac990020e9da804ec3ed38e2cbfeeb77.tar.gz core-eda0cec9ac990020e9da804ec3ed38e2cbfeeb77.zip | |
Revert "dummy commit (WIP)"
This reverts commit 6eb0522395c236ae6930a300992ad092449f9592.
It does not compile and the message and contents suggest it probably wasn't
meant to be pushed.
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/svg/svgreader.cxx | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx index 51a0860c8bfb..5e9e994de348 100644 --- a/filter/source/svg/svgreader.cxx +++ b/filter/source/svg/svgreader.cxx @@ -179,6 +179,7 @@ struct AnnotatingVisitor case XML_LINEARGRADIENT: { const sal_Int32 nNumAttrs( xAttributes->getLength() ); + rtl::OUString sAttributeValue; maGradientVector.push_back(Gradient(Gradient::LINEAR)); // do we have a reference to a parent gradient? parse @@ -216,6 +217,7 @@ struct AnnotatingVisitor case XML_RADIALGRADIENT: { const sal_Int32 nNumAttrs( xAttributes->getLength() ); + rtl::OUString sAttributeValue; maGradientVector.push_back(Gradient(Gradient::RADIAL)); // do we have a reference to a parent gradient? parse @@ -253,6 +255,7 @@ struct AnnotatingVisitor case XML_STOP: { const sal_Int32 nNumAttrs( xAttributes->getLength() ); + rtl::OUString sAttributeValue; maGradientStopVector.push_back(GradientStop()); maGradientVector.back().maStops.push_back(maGradientStopVector.size()-1); for( sal_Int32 i=0; i<nNumAttrs; ++i ) @@ -515,8 +518,7 @@ struct AnnotatingVisitor double rRotate, rShearX; if( rState.maFillGradient.maTransform.decompose(rScale, rTranslate, rRotate, rShearX) ) xAttrs->AddAttribute( "draw:angle", - rtl::OUString::valueOf(rRotate*1800.0/M_PI + 900) ); - SAL_INFO("svg", "maStops " << rState.maFillGradient.maStops[0] << " " << rState.maFillGradient.maStops[1] ); + rtl::OUString::valueOf(rRotate*1800.0/M_PI ) ); xAttrs->AddAttribute( "draw:start-color", getOdfColor( maGradientStopVector[ @@ -811,11 +813,6 @@ struct AnnotatingVisitor const sal_Int32 nTokenId, const rtl::OUString& sValue ) { - rtl::OString aValueUtf8( sValue.getStr(), - sValue.getLength(), - RTL_TEXTENCODING_UTF8 ); - - SAL_INFO("svg", "nTokenId " << nTokenId); switch(nTokenId) { case XML_HREF: @@ -839,18 +836,7 @@ struct AnnotatingVisitor case XML_STYLE: parseStyle( sValue ); break; - case XML_STOP_COLOR: - parseColor( aValueUtf8.getStr(), io_rGradientStop.maStopColor ); - break; - case XML_STOP_OPACITY: - io_rGradientStop.maStopColor.a = sValue.toDouble(); - if (io_rGradientStop.maStopColor.a < 0) - io_rGradientStop.maStopColor.a = 0; - else if (io_rGradientStop.maStopColor.a > 1) - io_rGradientStop.maStopColor.a = 1; - break; default: - SAL_INFO("svg", "nTokenId unknown " << getTokenName(nTokenId)); break; } } @@ -1045,11 +1031,9 @@ struct AnnotatingVisitor parseTextAlign(maCurrState,aValueUtf8.getStr()); break; case XML_STOP_COLOR: - SAL_INFO("svg", "XML_STOP_COLOR1"); if( maGradientVector.empty() || maGradientVector.back().maStops.empty() ) break; - SAL_INFO("svg", "XML_STOP_COLOR2"); parseColor( aValueUtf8.getStr(), maGradientStopVector[ maGradientVector.back().maStops.back()].maStopColor ); |