diff options
| author | Jacobo Aragunde Pérez <jaragunde@igalia.com> | 2014-01-27 14:26:47 +0100 |
|---|---|---|
| committer | Jacobo Aragunde Pérez <jaragunde@igalia.com> | 2014-01-27 15:52:14 +0100 |
| commit | 5e2b865cf4cfe7ee0cba0d778b50d394ad5e1338 (patch) | |
| tree | 8bb20c26753924e709d194115a1691989a020b7a /oox | |
| parent | eb70c0993daf02513182b5d9a53d552622a8a6f1 (diff) | |
ooxml: fix import of custDash shape line attribute
A LineProperties object can contain some preset dash defined by the
shape style and some custom dash defined by the shape properties. In
that case, the custom dash must be used.
The existing code only used the custom dash if no preset dash was
present.
Change-Id: I6254d95184312360e8782dba7329d5ec2f5441fa
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/lineproperties.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/oox/source/drawingml/lineproperties.cxx b/oox/source/drawingml/lineproperties.cxx index d26fe31b1a2a..df0ce89ac689 100644 --- a/oox/source/drawingml/lineproperties.cxx +++ b/oox/source/drawingml/lineproperties.cxx @@ -373,13 +373,13 @@ void LineProperties::pushToPropMap( ShapePropertyMap& rPropMap, sal_Int32 nLineWidth = convertEmuToHmm( moLineWidth.get( 0 ) ); // create line dash from preset dash token (not for invisible line) - if( (eLineStyle != drawing::LineStyle_NONE) && (moPresetDash.differsFrom( XML_solid ) || (!moPresetDash && !maCustomDash.empty())) ) + if( (eLineStyle != drawing::LineStyle_NONE) && (moPresetDash.differsFrom( XML_solid ) || !maCustomDash.empty()) ) { LineDash aLineDash; aLineDash.Style = lclGetDashStyle( moLineCap.get( XML_rnd ) ); // convert preset dash or custom dash - if( moPresetDash.has() ) + if( moPresetDash.differsFrom( XML_solid ) ) lclConvertPresetDash( aLineDash, moPresetDash.get() ); else lclConvertCustomDash( aLineDash, maCustomDash ); |