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

[Lionel Elie Mamane]

 comphelper/inc/comphelper/classids.hxx |    6 ++++++
 xmloff/source/draw/shapeexport.cxx     |    3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit d69a05d97c8a686ff24bd6d89905dfd3aee6a1cb
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Fri May 3 18:09:15 2013 +0200

    fdo#48056 treat report chart as draw chart
    
    Change-Id: I0a716b4339747f1994e5c8710e15474807aea4a2
    Reviewed-on: https://gerrit.libreoffice.org/3767
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Miklos Vajna <vmiklos at suse.cz>

diff --git a/comphelper/inc/comphelper/classids.hxx b/comphelper/inc/comphelper/classids.hxx
index 416715b..4a16e44 100644
--- a/comphelper/inc/comphelper/classids.hxx
+++ b/comphelper/inc/comphelper/classids.hxx
@@ -405,6 +405,12 @@
 // #110743#
 #define BF_SO3_SCH_CLASSID  BF_SO3_SCH_CLASSID_50
 
+// Report chart
+
+#define SO3_RPTCH_CLASSID \
+    0x80243D39, 0x6741, 0x46C5, 0x92, 0x6E, 0x06, \
+    0x91, 0x64, 0xFF, 0x87, 0xBB
+
 /****************************************************
 * StarImage
 ****************************************************/
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index a4c71b4..c7d812b 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -1079,7 +1079,8 @@ void XMLShapeExport::ImpCalcShapeType(const uno::Reference< drawing::XShape >& x
                         rtl::OUString sCLSID;
                         if(xPropSet->getPropertyValue(OUString("CLSID")) >>= sCLSID)
                         {
-                            if (sCLSID.equals(mrExport.GetChartExport()->getChartCLSID()))
+                            if (sCLSID.equals(mrExport.GetChartExport()->getChartCLSID()) ||
+                                sCLSID.equals(rtl::OUString( SvGlobalName( SO3_RPTCH_CLASSID ).GetHexName())))
                             {
                                 eShapeType = XmlShapeTypeDrawChartShape;
                             }