INTEGRATION: CWS rpt23fix01 (1.2.2); FILE MERGED

2007/07/16 12:37:02 fs 1.2.2.2: #i79659# +ensureSdrObjectOwnership
2007/07/11 09:58:17 oj 1.2.2.1: #i78520# allowd to add control with keyboard

reportdesign/inc/RptObject.hxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: RptObject.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2007-07-09 11:56:02 $
+ *  last change: $Author: hr $ $Date: 2007-08-02 14:27:28 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -114,8 +114,8 @@ class REPORTDESIGN_DLLPUBLIC OObjectBase
 {
 public:
     typedef ::comphelper::ImplementationReference<OPropertyMediator,::com::sun::star::beans::XPropertyChangeListener> TMediator;
-protected:
 
+protected:
     mutable TMediator                                                                           m_xMediator;
     mutable ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener> m_xPropertyChangeListener;
     //mutable ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener>
@@ -146,6 +146,10 @@ protected:
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
             getUnoShapeOf( SdrObject& _rSdrObject );
 
+private:
+    static void    ensureSdrObjectOwnership(
+                    const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxShape );
+
 public:
     void StartListening();
     void EndListening(sal_Bool bRemoveListener = sal_True);
@@ -178,9 +182,14 @@ public:
 class REPORTDESIGN_DLLPUBLIC OCustomShape: public SdrObjCustomShape , public OObjectBase
 {
     friend class OReportPage;
-    friend class OObjectBase;
     friend class DlgEdFactory;
 
+public:
+    static OCustomShape* Create( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent )
+    {
+        return new OCustomShape( _xComponent );
+    }
+
 protected:
     OCustomShape(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent);
     OCustomShape(const ::rtl::OUString& _sComponentName);
@@ -217,8 +226,6 @@ class REPORTDESIGN_DLLPUBLIC OUnoObject: public SdrUnoObj , public OObjectBase
     friend class DlgEdFactory;
 
     sal_uInt16   m_nObjectType;
-
-    ::rtl::OUString GetDefaultName() const;
 protected:
     OUnoObject(  const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent
                 ,const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& _xControlModel
@@ -257,6 +264,8 @@ public:
 
     inline sal_uInt16 getObjectId() const { return m_nObjectType; }
 
+    static ::rtl::OUString GetDefaultName(const OUnoObject* _pObj);
+
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getUnoShape();
 };