1 files changed, 29 insertions, 0 deletions
diff --git a/chart2/source/inc/ObjectIdentifier.hxx b/chart2/source/inc/ObjectIdentifier.hxx
index 7793cd57d21e..d7a535c1cec4 100644
--- a/chart2/source/inc/ObjectIdentifier.hxx
+++ b/chart2/source/inc/ObjectIdentifier.hxx
@@ -43,6 +43,7 @@
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/awt/Point.hpp>
+#include <com/sun/star/drawing/XShape.hpp>
 
 //.............................................................................
 namespace chart
@@ -79,6 +80,7 @@ enum ObjectType
     OBJECTTYPE_DATA_STOCK_RANGE,
     OBJECTTYPE_DATA_STOCK_LOSS,
     OBJECTTYPE_DATA_STOCK_GAIN,
+    OBJECTTYPE_SHAPE,
     OBJECTTYPE_UNKNOWN
 };
 
@@ -102,6 +104,17 @@ class OOO_DLLPUBLIC_CHARTTOOLS ObjectIdentifier
     //where Type: getStringForType( ObjectType eType ) or other string
 
 public:
+    ObjectIdentifier();
+    ObjectIdentifier( const ::rtl::OUString& rObjectCID );
+    ObjectIdentifier( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape );
+    ObjectIdentifier( const ::com::sun::star::uno::Any& rAny );
+    virtual ~ObjectIdentifier();
+
+    ObjectIdentifier( const ObjectIdentifier& rOID );
+    ObjectIdentifier& operator=( const ObjectIdentifier& rOID );
+    bool operator==( const ObjectIdentifier& rOID ) const;
+    bool operator<( const ObjectIdentifier& rOID ) const;
+
     static rtl::OUString createClassifiedIdentifierForObject(
           const ::com::sun::star::uno::Reference<
                     ::com::sun::star::uno::XInterface >& xObject
@@ -179,6 +192,7 @@ public:
 
     static rtl::OUString getStringForType( ObjectType eObjectType );
     static ObjectType    getObjectType( const rtl::OUString& rCID );
+    ObjectType getObjectType();
 
     static rtl::OUString createSeriesSubObjectStub( ObjectType eSubObjectType
                     , const rtl::OUString& rSeriesParticle
@@ -241,6 +255,21 @@ public:
     static TitleHelper::eTitleType getTitleTypeForCID( const ::rtl::OUString& rCID );
 
     static ::rtl::OUString getMovedSeriesCID( const ::rtl::OUString& rObjectCID, sal_Bool bForward );
+
+    bool isValid() const;
+    bool isAutoGeneratedObject() const;
+    bool isAdditionalShape() const;
+    ::rtl::OUString getObjectCID() const;
+    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > getAdditionalShape() const;
+
+private:
+    // #i12587# support for shapes in chart
+    // For autogenerated chart objects a CID is specified in m_aObjectCID,
+    // for all other objects m_xAdditionalShape is set.
+    // Note, that if m_aObjectCID is set, m_xAdditionalShape must be empty
+    // and vice versa.
+    ::rtl::OUString m_aObjectCID;
+    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > m_xAdditionalShape;
 };
 
 //.............................................................................