[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - xmloff/source

[Lionel Elie Mamane]

 xmloff/source/draw/shapeexport.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d279684b59c6067d8530fa890fd4fe78a386769f
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Fri Dec 19 23:29:07 2014 +0100

    survive "TextBox" having no value
    
    Change-Id: Iebed41cfcc5899387e3defb8d8a0792276349098
    Reviewed-on: https://gerrit.libreoffice.org/13560
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 92a4243..6439659 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -355,7 +355,7 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap
             }
         }
 
-        if (aParentName.isEmpty() && xPropertySetInfo->hasPropertyByName("TextBox") && xPropSet->getPropertyValue("TextBox").get<bool>())
+        if (aParentName.isEmpty() && xPropertySetInfo->hasPropertyByName("TextBox") && xPropSet->getPropertyValue("TextBox").hasValue() && xPropSet->getPropertyValue("TextBox").get<bool>())
         {
             // Shapes with a Writer TextBox always have a parent style.
             // If there would be none, then just assign the first available.