diff options
author | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2014-03-21 10:06:33 +0100 |
---|---|---|
committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2014-03-21 10:08:22 +0100 |
commit | 258c8cc66ac5a91e4779d47bc3b3eafc7287332a (patch) | |
tree | fcec0a544eae9c02cc99ffdf1770232e1d5ba9f6 /oox | |
parent | a547f865e0ce7731e1b3998b06ecba505e1c27ca (diff) |
oox: don't fill CharInteropGrabBag if the property doesn't exist
Change-Id: Ic7d543a8155cfe5ec39d34c8cd7133f14f8f3cc9
Diffstat (limited to 'oox')
-rw-r--r-- | oox/source/drawingml/textcharacterproperties.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/oox/source/drawingml/textcharacterproperties.cxx b/oox/source/drawingml/textcharacterproperties.cxx index bb7b227c91f0..6f64f2ab55e5 100644 --- a/oox/source/drawingml/textcharacterproperties.cxx +++ b/oox/source/drawingml/textcharacterproperties.cxx @@ -163,6 +163,8 @@ void TextCharacterProperties::pushToPropMap( PropertyMap& rPropMap, const XmlFil void pushToGrabBag( PropertySet& rPropSet, const std::vector<PropertyValue>& aVectorOfProperyValues ) { + if (!rPropSet.hasProperty(PROP_CharInteropGrabBag) || aVectorOfProperyValues.empty()) + return; Sequence<PropertyValue> aGrabBag; Any aAnyGrabBag = rPropSet.getAnyProperty(PROP_CharInteropGrabBag); aAnyGrabBag >>= aGrabBag; |