Attachment 53851 Details for Bug 39950 – quick demo hack, force old partial clone

[patch] quick demo hack, force old partial clone

hack.it.to.original.patch (text/plain), 1.71 KB, created by Caolán McNamara on 2011-11-25 08:55:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Caolán McNamara

Created: 2011-11-25 08:55:38 UTC

Size: 1.71 KB

patch

obsolete

>diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx
>index 09bf340..9ed700e 100644
>--- a/reportdesign/source/core/sdr/RptObject.cxx
>+++ b/reportdesign/source/core/sdr/RptObject.cxx
>@@ -944,15 +944,18 @@ uno::Reference< uno::XInterface > OUnoObject::getUnoShape()
> // -----------------------------------------------------------------------------
> OUnoObject* OUnoObject::Clone() const
> {
>-    OUnoObject* pClone = CloneHelper< OUnoObject >();
>+    SdrObject* pClone = SdrObjFactory::MakeNewObject(GetObjInventor(),GetObjIdentifier(), NULL);
>+
>     if ( pClone )
>     {
>+        *pClone = *this;
>+
>         Reference<XPropertySet> xSource(const_cast<OUnoObject*>(this)->getUnoShape(),uno::UNO_QUERY);
>         Reference<XPropertySet> xDest(pClone->getUnoShape(),uno::UNO_QUERY);
>         if ( xSource.is() && xDest.is() )
>             comphelper::copyProperties(xSource.get(),xDest.get());
>     }
>-    return pClone;
>+    return static_cast<OUnoObject*>(pClone);
> }
> //----------------------------------------------------------------------------
> // OOle2Obj
>@@ -1158,7 +1161,10 @@ uno::Reference< chart2::data::XDatabaseDataProvider > lcl_getDataProvider(const
> // Clone() soll eine komplette Kopie des Objektes erzeugen.
> OOle2Obj* OOle2Obj::Clone() const
> {
>-    OOle2Obj* pObj = CloneHelper< OOle2Obj >();
>+    SdrObject* pFoo = SdrObjFactory::MakeNewObject(GetObjInventor(),GetObjIdentifier(), NULL);
>+    *pFoo = *this;
>+    OOle2Obj* pObj = static_cast<OOle2Obj*>(pFoo);
>+
>     OReportModel* pRptModel = static_cast<OReportModel*>(GetModel());
>     svt::EmbeddedObjectRef::TryRunningState( pObj->GetObjRef() );
>     pObj->impl_createDataProvider_nothrow(pRptModel->getReportDefinition().get());

Actions: View | Splinter Review

Attachments on bug 39950: 50055 | 50056 | 50484 | 53841 | 53851 | 53904 | 54182

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.