[Libreoffice-commits] core.git: oox/source

[Tomaž Vajngerl]

 oox/source/drawingml/textcharacterproperties.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 258c8cc66ac5a91e4779d47bc3b3eafc7287332a
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.com>
Date:   Fri Mar 21 10:06:33 2014 +0100

    oox: don't fill CharInteropGrabBag if the property doesn't exist
    
    Change-Id: Ic7d543a8155cfe5ec39d34c8cd7133f14f8f3cc9

diff --git a/oox/source/drawingml/textcharacterproperties.cxx b/oox/source/drawingml/textcharacterproperties.cxx
index bb7b227..6f64f2a 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;