[Libreoffice-commits] core.git: include/vcl sc/source

[Caolán McNamara (via logerrit)]

 include/vcl/transfer.hxx      |    2 +-
 sc/source/ui/app/lnktrans.cxx |    2 +-
 sc/source/ui/inc/lnktrans.hxx |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit b6546c0cbd00357f6c815e8349a12b872700c3f8
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Feb 27 15:02:36 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Feb 27 20:35:25 2020 +0100

    inherit ScLinkTransferObj from TransferDataContainer
    
    Change-Id: I04d8a673e92e847e1485f85d951172bf71a8877b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89647
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/vcl/transfer.hxx b/include/vcl/transfer.hxx
index 2a72fd6fab23..234871576031 100644
--- a/include/vcl/transfer.hxx
+++ b/include/vcl/transfer.hxx
@@ -490,7 +490,6 @@ class VCL_DLLPUBLIC TransferDataContainer : public TransferableHelper
 
     virtual void        AddSupportedFormats() override;
     virtual bool        GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) override;
-    virtual void        DragFinished( sal_Int8 nDropAction ) override;
 
 public:
 
@@ -509,6 +508,7 @@ public:
     using TransferableHelper::StartDrag;
     void                StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions,
                                    const Link<sal_Int8,void>& rCallbck );
+    virtual void        DragFinished( sal_Int8 nDropAction ) override;
 };
 
 css::uno::Reference<css::datatransfer::clipboard::XClipboard> VCL_DLLPUBLIC GetSystemClipboard();
diff --git a/sc/source/ui/app/lnktrans.cxx b/sc/source/ui/app/lnktrans.cxx
index ddc12ce692f8..1ff48e7fe705 100644
--- a/sc/source/ui/app/lnktrans.cxx
+++ b/sc/source/ui/app/lnktrans.cxx
@@ -70,7 +70,7 @@ void ScLinkTransferObj::DragFinished( sal_Int8 nDropAction )
     ScModule* pScMod = SC_MOD();
     pScMod->ResetDragObject();
 
-    TransferableHelper::DragFinished( nDropAction );
+    TransferDataContainer::DragFinished( nDropAction );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/lnktrans.hxx b/sc/source/ui/inc/lnktrans.hxx
index 9f4e3136c812..208bfaa671cf 100644
--- a/sc/source/ui/inc/lnktrans.hxx
+++ b/sc/source/ui/inc/lnktrans.hxx
@@ -23,7 +23,7 @@
 #include <vcl/transfer.hxx>
 #include <rtl/ustring.hxx>
 
-class ScLinkTransferObj : public TransferableHelper
+class ScLinkTransferObj : public TransferDataContainer
 {
 private:
     OUString  aLinkURL;