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

[Caolán McNamara (via logerrit)]

 sc/source/ui/app/drwtrans.cxx |    4 ++--
 sc/source/ui/app/transobj.cxx |    4 ++--
 sc/source/ui/inc/drwtrans.hxx |    2 +-
 sc/source/ui/inc/transobj.hxx |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit f0cd0c7618f4463ad556ee0207ade62b6b2df962
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Mar 5 17:00:15 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Mar 6 09:55:01 2020 +0100

    Related: tdf#131157 inherit ScDrawTransferObj from TransferDataContainer
    
    Change-Id: I5119b959a6bff958582c404c03af59bd52c9497a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90051
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx
index d159243adb1a..9b6529b18601 100644
--- a/sc/source/ui/app/drwtrans.cxx
+++ b/sc/source/ui/app/drwtrans.cxx
@@ -584,7 +584,7 @@ void ScDrawTransferObj::DragFinished( sal_Int8 nDropAction )
 
     m_pDragSourceView.reset();
 
-    TransferableHelper::DragFinished( nDropAction );
+    TransferDataContainer::DragFinished( nDropAction );
 }
 
 void ScDrawTransferObj::SetDrawPersist( const SfxObjectShellRef& rRef )
@@ -755,7 +755,7 @@ sal_Int64 SAL_CALL ScDrawTransferObj::getSomething( const css::uno::Sequence< sa
         nRet = reinterpret_cast< sal_Int64 >( this );
     }
     else
-        nRet = TransferableHelper::getSomething(rId);
+        nRet = TransferDataContainer::getSomething(rId);
     return nRet;
 }
 
diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index f94f66a1f53e..912f956f930f 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -573,7 +573,7 @@ void ScTransferObj::DragFinished( sal_Int8 nDropAction )
 
     m_xDragSourceRanges = nullptr;       // don't keep source after dropping
 
-    TransferableHelper::DragFinished( nDropAction );
+    TransferDataContainer::DragFinished( nDropAction );
 }
 
 void ScTransferObj::SetDragHandlePos( SCCOL nX, SCROW nY )
@@ -932,7 +932,7 @@ sal_Int64 SAL_CALL ScTransferObj::getSomething( const css::uno::Sequence< sal_In
         nRet = reinterpret_cast< sal_Int64 >( this );
     }
     else
-        nRet = TransferableHelper::getSomething(rId);
+        nRet = TransferDataContainer::getSomething(rId);
     return nRet;
 }
 
diff --git a/sc/source/ui/inc/drwtrans.hxx b/sc/source/ui/inc/drwtrans.hxx
index 77bb377dd1bc..6fec11610e2c 100644
--- a/sc/source/ui/inc/drwtrans.hxx
+++ b/sc/source/ui/inc/drwtrans.hxx
@@ -35,7 +35,7 @@ class ScDrawView;
 class SdrOle2Obj;
 enum class ScDragSrc;
 
-class ScDrawTransferObj : public TransferableHelper
+class ScDrawTransferObj : public TransferDataContainer
 {
 private:
     std::unique_ptr<SdrModel>       m_pModel;
diff --git a/sc/source/ui/inc/transobj.hxx b/sc/source/ui/inc/transobj.hxx
index 30828fc9a52f..c492a291b1dc 100644
--- a/sc/source/ui/inc/transobj.hxx
+++ b/sc/source/ui/inc/transobj.hxx
@@ -36,7 +36,7 @@ namespace com { namespace sun { namespace star {
     }
 }}}
 
-class SAL_DLLPUBLIC_RTTI ScTransferObj : public TransferableHelper
+class SAL_DLLPUBLIC_RTTI ScTransferObj : public TransferDataContainer
 {
 private:
     ScDocumentUniquePtr             m_pDoc;