diff options
author | Tomaž Vajngerl <quikee@gmail.com> | 2014-02-10 18:49:03 +0100 |
---|---|---|
committer | Tomaž Vajngerl <quikee@gmail.com> | 2014-02-10 18:54:28 +0100 |
commit | d505d2ef49a8aadb24cd254bffbf1a6b549b282c (patch) | |
tree | b7c5990eaae3f29e1ae3d89c597818d4e5bb59a0 /oox | |
parent | 6c5acfbefddeca1b2336cdc4158ec6e6f2a46858 (diff) |
Werror=maybe-uninitialized in drawingml export
Change-Id: Ib04a464483c43a999db82bfaa539193c526d5041
Diffstat (limited to 'oox')
-rw-r--r-- | oox/source/export/drawingml.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 22a1d9775dad..0058aa770772 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -204,10 +204,11 @@ void DrawingML::WriteColorTransformations( Sequence< PropertyValue > aTransforma for( sal_Int32 i = 0; i < aTransformations.getLength(); i++ ) { sal_Int32 nToken = Color::getColorTransformationToken( aTransformations[i].Name ); - sal_Int32 nValue; aTransformations[i].Value >>= nValue; - - if( nToken != XML_TOKEN_INVALID ) + if( nToken != XML_TOKEN_INVALID && aTransformations[i].Value.hasValue() ) + { + sal_Int32 nValue = aTransformations[i].Value.get<sal_Int32>(); mpFS->singleElementNS( XML_a, nToken, XML_val, I32S( nValue ), FSEND ); + } } } @@ -239,10 +240,9 @@ void DrawingML::WriteSolidFill( OUString sSchemeName, sal_Int32 nAlpha ) void DrawingML::WriteSolidFill( Reference< XPropertySet > rXPropSet ) { // get fill color - sal_uInt32 nFillColor; if ( !GetProperty( rXPropSet, "FillColor" ) ) return; - mAny >>= nFillColor; + sal_uInt32 nFillColor = mAny.get<sal_uInt32>(); // get InteropGrabBag and search the relevant attributes OUString sColorFillScheme; |