diff options
| author | Olivier Hallot <olivier.hallot@documentfoundation.org> | 2012-01-01 12:55:53 -0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2012-01-02 19:17:17 +0100 |
| commit | 6af59644d6508049409a03d1c4a598ea2bef521e (patch) | |
| tree | 6897eaf76372c606a487ebb0135962e6c7e52cb7 /oox/source/drawingml/shapepropertymap.cxx | |
| parent | 93d2a2eb4dd13d81b9be4f087653baecb33ead67 (diff) | |
Fix for fdo43460 Part XXV getLength() to isEmpty()
Please find attached a partial fix for Easy Hack FDO43460
Part XXI
Module
oox
Diffstat (limited to 'oox/source/drawingml/shapepropertymap.cxx')
| -rw-r--r-- | oox/source/drawingml/shapepropertymap.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/oox/source/drawingml/shapepropertymap.cxx b/oox/source/drawingml/shapepropertymap.cxx index fe625230416c..f05153c74dba 100644 --- a/oox/source/drawingml/shapepropertymap.cxx +++ b/oox/source/drawingml/shapepropertymap.cxx @@ -130,7 +130,7 @@ bool ShapePropertyMap::setAnyProperty( ShapePropertyId ePropId, const Any& rValu bool ShapePropertyMap::setLineMarker( sal_Int32 nPropId, const Any& rValue ) { NamedValue aNamedMarker; - if( (rValue >>= aNamedMarker) && (aNamedMarker.Name.getLength() > 0) ) + if( (rValue >>= aNamedMarker) && !aNamedMarker.Name.isEmpty() ) { // push line marker explicitly if( !maShapePropInfo.mbNamedLineMarker ) @@ -154,7 +154,7 @@ bool ShapePropertyMap::setLineDash( sal_Int32 nPropId, const Any& rValue ) if( rValue.has< LineDash >() ) { OUString aDashName = mrModelObjHelper.insertLineDash( rValue.get< LineDash >() ); - return (aDashName.getLength() > 0) && setProperty( nPropId, aDashName ); + return !aDashName.isEmpty() && setProperty( nPropId, aDashName ); } return false; @@ -170,7 +170,7 @@ bool ShapePropertyMap::setFillGradient( sal_Int32 nPropId, const Any& rValue ) if( rValue.has< Gradient >() ) { OUString aGradientName = mrModelObjHelper.insertFillGradient( rValue.get< Gradient >() ); - return (aGradientName.getLength() > 0) && setProperty( nPropId, aGradientName ); + return !aGradientName.isEmpty() && setProperty( nPropId, aGradientName ); } return false; @@ -182,7 +182,7 @@ bool ShapePropertyMap::setGradientTrans( sal_Int32 nPropId, const Any& rValue ) if( rValue.has< Gradient >() ) { OUString aGradientName = mrModelObjHelper.insertTransGrandient( rValue.get< Gradient >() ); - return ( aGradientName.getLength() > 0 ) && setProperty( nPropId, aGradientName ); + return !aGradientName.isEmpty() && setProperty( nPropId, aGradientName ); } return false; @@ -198,7 +198,7 @@ bool ShapePropertyMap::setFillBitmapUrl( sal_Int32 nPropId, const Any& rValue ) if( rValue.has< OUString >() ) { OUString aBitmapUrlName = mrModelObjHelper.insertFillBitmapUrl( rValue.get< OUString >() ); - return (aBitmapUrlName.getLength() > 0) && setProperty( nPropId, aBitmapUrlName ); + return !aBitmapUrlName.isEmpty() && setProperty( nPropId, aBitmapUrlName ); } return false; |