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

Heiko Tietze (via logerrit) logerrit at kemper.freedesktop.org
Wed Apr 22 00:32:48 UTC 2020


 cui/source/dialogs/about.cxx |   22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

New commits:
commit 8f85ca5aefcf1046d2276585b10144bb97d2a870
Author:     Heiko Tietze <tietze.heiko at gmail.com>
AuthorDate: Tue Apr 21 20:19:26 2020 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Wed Apr 22 02:32:14 2020 +0200

    Resolves build error from I4c2107b8120797a7cd532b59ca5ccb58ab61a2ae
    
    Change-Id: I2791a51104d73daae5f140ee5b396aa2a64857ff
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92656
    Tested-by: Rene Engelhard <rene at debian.org>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index e96fb2a50ee1..d04d15a3b49b 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -37,10 +37,8 @@
 #include <sfx2/app.hxx> //SfxApplication::loadBrandSvg
 #include <strings.hrc>
 
-#include <com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp>
 #include <com/sun/star/datatransfer/clipboard/SystemClipboard.hpp>
-#include <vcl/textview.hxx>
-#include <tools/diagnose_ex.h>
+#include <vcl/unohelp2.hxx>
 
 #include <config_feature_opencl.h>
 #if HAVE_FEATURE_OPENCL
@@ -252,20 +250,6 @@ IMPL_LINK_NOARG(AboutDialog, HandleClick, weld::Button &, void) {
   css::uno::Reference<css::datatransfer::clipboard::XClipboard> xClipboard =
       css::datatransfer::clipboard::SystemClipboard::create(
           comphelper::getProcessComponentContext());
-
-  if (xClipboard.is()) {
-    css::uno::Reference<css::datatransfer::XTransferable> xDataObj(
-        new TETextDataObject(m_pVersionLabel->get_label()));
-    try {
-      xClipboard->setContents(xDataObj, nullptr);
-
-      css::uno::Reference<css::datatransfer::clipboard::XFlushableClipboard>
-          xFlushableClipboard(xClipboard, css::uno::UNO_QUERY);
-      if (xFlushableClipboard.is())
-        xFlushableClipboard->flushClipboard();
-    } catch (const css::uno::Exception &) {
-      TOOLS_WARN_EXCEPTION("cui.dialogs", "Caught exception trying to copy");
-    }
-  }
+  vcl::unohelper::TextDataObject::CopyStringTo(m_pVersionLabel->get_label(), xClipboard);
 }
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file


More information about the Libreoffice-commits mailing list