commit bcccbf1a8d8891b7dc60122a380cf648d2998995
author Caolán McNamara <caolanm@redhat.com> Mon Jul 12 11:12:47 2021 +0100
committer Michael Stahl <michael.stahl@allotropia.de> Fri Jul 16 17:12:51 2021 +0200
tree cddbe54818a2c7049963d6bdcc43f4c127e26b1f
parent cf12ce9224c2f4142e777a5c65a04e48b1bab0a6

tdf#143257 like graphics defer creating transfer data for drawings until needed

don't create when a drawing is selected, wait until its actually dropped
into something (I experimented with dropping into gimp)

Change-Id: I3edaf79537d5723565adf8c45d6f7408026a93e3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118725
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>

sw/source/uibase/dochdl/swdtflvr.cxx

diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index 772889b..67f8f32 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -487,7 +487,7 @@ bool SwTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo
        const bool bPending(m_pWrtShell->ActionPend());

        // SEL_GRF is from ContentType of editsh
        if(bPending || ((SelectionType::Graphic | SelectionType::DbForm) & nSelectionType))
        if(bPending || ((SelectionType::Graphic | SelectionType::DrawObject | SelectionType::DbForm) & nSelectionType))
        {
            m_pClpGraphic.reset(new Graphic);
            if( !m_pWrtShell->GetDrawObjGraphic( SotClipboardFormatId::GDIMETAFILE, *m_pClpGraphic ))
@@ -3605,13 +3605,6 @@ void SwTransferable::SetDataForDragAndDrop( const Point& rSttPos )
            }
            m_eBufferType = TransferBufferType::Graphic | m_eBufferType;

            m_pClpGraphic.reset(new Graphic);
            if( !m_pWrtShell->GetDrawObjGraphic( SotClipboardFormatId::GDIMETAFILE, *m_pClpGraphic ))
                m_pOrigGraphic = m_pClpGraphic.get();
            m_pClpBitmap.reset(new Graphic);
            if( !m_pWrtShell->GetDrawObjGraphic( SotClipboardFormatId::BITMAP, *m_pClpBitmap ))
                m_pOrigGraphic = m_pClpBitmap.get();

            // is it a URL-Button ?
            OUString sURL;
            OUString sDesc;