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

Thu May 31 08:15:42 UTC 2018

include/svtools/transfer.hxx     |    1 -
 sc/source/ui/view/gridwin.cxx    |    2 +-
 svtools/source/misc/transfer.cxx |   13 -------------
 3 files changed, 1 insertion(+), 15 deletions(-)

New commits:
commit 78bed16e17f5128d3523413255d95de85c0ebf36
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed May 30 14:02:33 2018 +0100

    drop last use of TransferableHelper::GetSystemClipboard
    
    Change-Id: I405b0cac0db5f08aa2f9fb73927c4c21f0250988
    Reviewed-on: https://gerrit.libreoffice.org/55076
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx
index 5bc3f7a86320..4091a8f087d1 100644
--- a/include/svtools/transfer.hxx
+++ b/include/svtools/transfer.hxx
@@ -251,7 +251,6 @@ public:
 
     static void         ClearSelection( vcl::Window *pWindow );
 
-    static css::uno::Reference< css::datatransfer::clipboard::XClipboard > GetSystemClipboard();
     static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId();
 
 public:
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 96a3f7e16239..018367bfdb51 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -3168,7 +3168,7 @@ void ScGridWindow::KeyInput(const KeyEvent& rKEvt)
 
         // Clear clipboard content.
         uno::Reference<datatransfer::clipboard::XClipboard> xSystemClipboard =
-            TransferableHelper::GetSystemClipboard();
+            GetClipboard();
         if (xSystemClipboard.is())
         {
             xSystemClipboard->setContents(
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 7f6d83dee5a7..49d08ef3d979 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -991,7 +991,6 @@ void TransferableHelper::StartDrag( vcl::Window* pWindow, sal_Int8 nDnDSourceAct
     }
 }
 
-
 void TransferableHelper::ClearSelection( vcl::Window *pWindow )
 {
     DBG_ASSERT( pWindow, "Window pointer is NULL" );
@@ -1001,17 +1000,6 @@ void TransferableHelper::ClearSelection( vcl::Window *pWindow )
         xSelection->setContents( nullptr, nullptr );
 }
 
-
-Reference< XClipboard> TransferableHelper::GetSystemClipboard()
-{
-    vcl::Window *pFocusWindow = Application::GetFocusWindow();
-
-    if( pFocusWindow )
-        return pFocusWindow->GetClipboard();
-
-    return  Reference< XClipboard > ();
-}
-
 namespace
 {
     class theTransferableHelperUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theTransferableHelperUnoTunnelId > {};
@@ -1022,7 +1010,6 @@ const Sequence< sal_Int8 >& TransferableHelper::getUnoTunnelId()
     return theTransferableHelperUnoTunnelId::get().getSeq();
 }
 
-
 class TransferableClipboardNotifier : public ::cppu::WeakImplHelper< XClipboardListener >
 {
 private:
