[Libreoffice-commits] core.git: 2 commits - desktop/source offapi/com

[Michael Meeks (via logerrit)]

 desktop/source/lib/lokclipboard.hxx                 |    2 +-
 offapi/com/sun/star/datatransfer/XTransferable2.idl |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 6a3c5b418437ae928553530b938f4b7b3e5ea9e0
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Fri Aug 2 13:58:48 2019 -0400
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Fri Aug 2 14:00:30 2019 -0400

    clipboard: elide string constructor.
    
    Change-Id: I18c01e77e0ddf4b86f2f5ba610509555160f96c3

diff --git a/desktop/source/lib/lokclipboard.hxx b/desktop/source/lib/lokclipboard.hxx
index 6c0509265db4..7da5f3ef3900 100644
--- a/desktop/source/lib/lokclipboard.hxx
+++ b/desktop/source/lib/lokclipboard.hxx
@@ -54,7 +54,7 @@ public:
         const css::uno::Reference<css::datatransfer::XTransferable>& xTransferable,
         const css::uno::Reference<css::datatransfer::clipboard::XClipboardOwner>& xClipboardOwner)
         override;
-    OUString SAL_CALL getName() override { return OUString("CLIPBOARD"); }
+    OUString SAL_CALL getName() override { return "CLIPBOARD"; }
 
     // XClipboardEx
     sal_Int8 SAL_CALL getRenderingCapabilities() override { return 0; }
commit e5e26b83e722bc49727c434ea5c775a97f737566
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Fri Aug 2 13:13:51 2019 -0400
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Fri Aug 2 14:00:30 2019 -0400

    XTransferable2 - add missing 'since' tag on isComplex.
    
    Change-Id: Ib8165edb4d87fb5bbb115fe26b8dbbe5a70bd59a

diff --git a/offapi/com/sun/star/datatransfer/XTransferable2.idl b/offapi/com/sun/star/datatransfer/XTransferable2.idl
index a6b53f0671e2..9fb99e600177 100644
--- a/offapi/com/sun/star/datatransfer/XTransferable2.idl
+++ b/offapi/com/sun/star/datatransfer/XTransferable2.idl
@@ -34,6 +34,8 @@ interface XTransferable2 : com::sun::star::datatransfer::XTransferable
 
     /**
      * Returns true if the selection contains embedded objects or is a large text blob.
+     *
+     * @since LibreOffice 6.4
      */
     boolean isComplex();
 };