#i12587# Inserting/editing arbitrary text objects in chart

1 files changed, 7 insertions, 6 deletions

diff --git a/chart2/source/controller/main/SelectionHelper.hxx b/chart2/source/controller/main/SelectionHelper.hxx
index 2e9016261e29..c4613443cb77 100644
--- a/chart2/source/controller/main/SelectionHelper.hxx
+++ b/chart2/source/controller/main/SelectionHelper.hxx
@@ -31,6 +31,7 @@
 #define _CHART2_SELECTIONHELPER_HXX
 
 #include "DrawViewWrapper.hxx"
+#include "ObjectIdentifier.hxx"
 
 class SdrObject;
 // header for enum SdrDragMode
@@ -89,12 +90,9 @@ private: //member
     //the content of m_xSelectedShape is ignored in that case
     //the strings are used for autogenerated chart specific objects
     //the shape reference is used for additional shapes
-    ::rtl::OUString     m_aSelectedObjectCID;//only single object selection so far
-    ::rtl::OUString     m_aSelectedObjectCID_beforeMouseDown;
-    ::rtl::OUString     m_aSelectedObjectCID_selectOnlyIfNoDoubleClickIsFollowing;
-
-    ::com::sun::star::uno::Reference<
-                    ::com::sun::star::drawing::XShape > m_xSelectAdditionalShape;
+    ObjectIdentifier    m_aSelectedOID; //only single object selection so far
+    ObjectIdentifier    m_aSelectedOID_beforeMouseDown;
+    ObjectIdentifier    m_aSelectedOID_selectOnlyIfNoDoubleClickIsFollowing;
 };
 
 class SelectionHelper : public MarkHandleProvider
@@ -103,6 +101,9 @@ public:
     static bool             findNamedParent( SdrObject*& pInOutObject
                                 , rtl::OUString& rOutName
                                 , bool bGivenObjectMayBeResult );
+    static bool             findNamedParent( SdrObject*& pInOutObject
+                                , ObjectIdentifier& rOutObject
+                                , bool bGivenObjectMayBeResult );
     static SdrObject*       getMarkHandlesObject( SdrObject* pObj );
     static E3dScene*        getSceneToRotate( SdrObject* pObj );
     static bool             isDragableObjectHitTwice( const Point& rMPos