Resolves: tdf#154535 create the OXFormsDescriptor on-demand

so we don't cause an unwanted Binding to be created unless we are forced
to.

Change-Id: Id78cbbb72ebd4e78b82a1ba614bbcb6488d04ce4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150769
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/svx/source/fmcomp/xmlexchg.cxx b/svx/source/fmcomp/xmlexchg.cxx
index 1f8d44ee7d3a..86bc1bbf46b9 100644
--- a/svx/source/fmcomp/xmlexchg.cxx
+++ b/svx/source/fmcomp/xmlexchg.cxx
@@ -27,8 +27,8 @@ namespace svx
 
     using namespace ::com::sun::star::datatransfer;
 
-    OXFormsTransferable::OXFormsTransferable( const OXFormsDescriptor &rhs ) :
-        m_aDescriptor(rhs)
+    OXFormsTransferable::OXFormsTransferable(const std::function<OXFormsDescriptor()>& getDescriptorFunc) :
+        m_getDescriptorFunc(getDescriptorFunc)
     {
     }
 
@@ -47,13 +47,13 @@ namespace svx
         return false;
     }
 
-    const OXFormsDescriptor &OXFormsTransferable::extractDescriptor( const TransferableDataHelper &_rData ) {
-
+    OXFormsDescriptor OXFormsTransferable::extractDescriptor( const TransferableDataHelper &_rData )
+    {
         using namespace ::com::sun::star::uno;
         Reference<XTransferable> &transfer = const_cast<Reference<XTransferable> &>(_rData.GetTransferable());
         XTransferable *pInterface = transfer.get();
         OXFormsTransferable& rThis = dynamic_cast<OXFormsTransferable&>(*pInterface);
-        return rThis.m_aDescriptor;
+        return rThis.m_getDescriptorFunc();
     }
 
 }