[PATCH libreoffice-3-6] fdo#48056 treat report chart as draw chart

[Lionel Elie Mamane (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3770

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/70/3770/1

fdo#48056 treat report chart as draw chart

Change-Id: I0a716b4339747f1994e5c8710e15474807aea4a2
---
M comphelper/inc/comphelper/classids.hxx
M xmloff/source/draw/shapeexport.cxx
2 files changed, 8 insertions(+), 1 deletion(-)



diff --git a/comphelper/inc/comphelper/classids.hxx b/comphelper/inc/comphelper/classids.hxx
index dcfe502..a6c304a 100644
--- a/comphelper/inc/comphelper/classids.hxx
+++ b/comphelper/inc/comphelper/classids.hxx
@@ -414,6 +414,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 bec909b..22891c4 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -1091,7 +1091,8 @@
                         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;
                             }

-- 
To view, visit https://gerrit.libreoffice.org/3770
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a716b4339747f1994e5c8710e15474807aea4a2
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Lionel Elie Mamane <lionel at mamane.lu>