[Libreoffice-commits] .: xmloff/source

[Libreoffice Gerrit user]

 xmloff/source/draw/shapeexport2.cxx |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 9e41982ac165092ed024b8ab318eedc7fcf4c6a9
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Dec 26 19:57:34 2012 +0100

    text:p is not allowed for chart objects, fdo#58571
    
    Change-Id: I24c485d31ea3f0540164ff65074b392be1e557e6

diff --git a/xmloff/source/draw/shapeexport2.cxx b/xmloff/source/draw/shapeexport2.cxx
index d4f1e23..2ebd96a 100644
--- a/xmloff/source/draw/shapeexport2.cxx
+++ b/xmloff/source/draw/shapeexport2.cxx
@@ -1662,8 +1662,12 @@ void XMLShapeExport::ImpExportOLE2Shape(
                 if( !sClassId.isEmpty() )
                     mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_CLASS_ID, sClassId );
 
-                // #i118485# Add text export, the draw OLE shape allows text now
-                ImpExportText( xShape );
+                if(eShapeType != XmlShapeTypePresChartShape && eShapeType != XmlShapeTypeDrawChartShape)
+                {
+                    // #i118485# Add text export, the draw OLE shape allows text now
+                    // fdo#58571 chart objects don't allow text:p
+                    ImpExportText( xShape );
+                }
 
                 if(!bExportEmbedded)
                 {