[Libreoffice-commits] core.git: vcl/win

[Mike Kaganski (via logerrit)]

 vcl/win/dtrans/DOTransferable.cxx |   19 -------------------
 vcl/win/dtrans/DOTransferable.hxx |    7 +------
 2 files changed, 1 insertion(+), 25 deletions(-)

New commits:
commit 818a84c4b232518780ff12415a6dad50b3625d5d
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Sat Mar 6 13:04:24 2021 +0100
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Mon Mar 8 09:06:22 2021 +0100

    [API CHANGE] Remove unused XSystemTransferable interface from CDOTransferable
    
    This interface is only implemented on Windows' transferable; it is
    not used anywhere in the codebase, and its implementation is wrong:
    it passes COM interface pointer as 32-bit integer (thus truncating
    64-bit pointers on Win64) to different processes, where the pointer
    has no value.
    
    This reverts commit 772fb7b3e482d537482437f5cd898093522d3fb5.
    
    Change-Id: I828c6595ac3f7836a3c72d5498efb279938407ea
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112072
    Tested-by: Mike Kaganski <mike.kaganski at collabora.com>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/vcl/win/dtrans/DOTransferable.cxx b/vcl/win/dtrans/DOTransferable.cxx
index 029a21402bac..61edcb9a9348 100644
--- a/vcl/win/dtrans/DOTransferable.cxx
+++ b/vcl/win/dtrans/DOTransferable.cxx
@@ -575,23 +575,4 @@ bool CDOTransferable::compareDataFlavors(
     return bRet;
 }
 
-css::uno::Any SAL_CALL CDOTransferable::getData( const Sequence< sal_Int8>& aProcessId  )
-{
-    Any retVal;
-
-    sal_Int8 const * arProcCaller= aProcessId.getConstArray();
-    sal_uInt8 arId[16];
-    rtl_getGlobalProcessId(arId);
-    if( ! memcmp( arId, arProcCaller,16))
-    {
-        if (m_rDataObject.is())
-        {
-            IDataObject* pObj= m_rDataObject.get();
-            pObj->AddRef();
-            retVal.setValue( &pObj, cppu::UnoType<sal_uInt32>::get());
-        }
-    }
-    return retVal;
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/win/dtrans/DOTransferable.hxx b/vcl/win/dtrans/DOTransferable.hxx
index 0e652f9b6a0d..e42555ce6143 100644
--- a/vcl/win/dtrans/DOTransferable.hxx
+++ b/vcl/win/dtrans/DOTransferable.hxx
@@ -37,8 +37,7 @@
 class CFormatEtc;
 
 class CDOTransferable : public ::cppu::WeakImplHelper<
-                            css::datatransfer::XTransferable,
-                            css::datatransfer::XSystemTransferable>
+                            css::datatransfer::XTransferable>
 {
 public:
     typedef css::uno::Sequence< sal_Int8 > ByteSequence_t;
@@ -51,10 +50,6 @@ public:
 
     virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) override;
 
-    // XSystemTransferable
-
-    virtual css::uno::Any SAL_CALL getData( const css::uno::Sequence<sal_Int8>& aProcessId  ) override;
-
     explicit CDOTransferable(
         const css::uno::Reference< css::uno::XComponentContext >& rxContext,
         const css::uno::Reference<css::datatransfer::clipboard::XClipboard>& xClipboard,