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

Miklos Vajna (via logerrit) logerrit at kemper.freedesktop.org
Fri May 7 07:29:52 UTC 2021


 desktop/source/lib/lokclipboard.cxx |    5 ++---
 desktop/source/lib/lokclipboard.hxx |    2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit e23200dcb47ee64589e464b1c03a6f2ddc2d5ee5
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Thu May 6 21:06:34 2021 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Fri May 7 09:29:16 2021 +0200

    desktop, lokclipboard: avoid repeating the return type from the declaration
    
    Change-Id: I8c3d5f4dcd442c680823a60d6b5b93137a7adc7f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115213
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/desktop/source/lib/lokclipboard.cxx b/desktop/source/lib/lokclipboard.cxx
index 7efaca9abd78..c70c8f0ed750 100644
--- a/desktop/source/lib/lokclipboard.cxx
+++ b/desktop/source/lib/lokclipboard.cxx
@@ -62,8 +62,7 @@ void LOKClipboardFactory::releaseClipboardForView(int nViewId)
 uno::Reference<uno::XInterface>
     SAL_CALL LOKClipboardFactory::createInstanceWithArguments(const Sequence<Any>& /* rArgs */)
 {
-    return uno::Reference<uno::XInterface>(
-        static_cast<cppu::OWeakObject*>(getClipboardForCurView().get()));
+    return { static_cast<cppu::OWeakObject*>(getClipboardForCurView().get()) };
 }
 
 LOKClipboard::LOKClipboard()
@@ -211,7 +210,7 @@ uno::Any SAL_CALL LOKTransferable::getTransferData(const datatransfer::DataFlavo
             return m_aContent[i];
         }
     }
-    return uno::Any();
+    return {};
 }
 
 uno::Sequence<datatransfer::DataFlavor> SAL_CALL LOKTransferable::getTransferDataFlavors()
diff --git a/desktop/source/lib/lokclipboard.hxx b/desktop/source/lib/lokclipboard.hxx
index 911f38727838..699830756acb 100644
--- a/desktop/source/lib/lokclipboard.hxx
+++ b/desktop/source/lib/lokclipboard.hxx
@@ -36,7 +36,7 @@ public:
     /// get an XInterface easily.
     css::uno::Reference<css::uno::XInterface> getXI()
     {
-        return css::uno::Reference<css::uno::XInterface>(static_cast<cppu::OWeakObject*>(this));
+        return { static_cast<cppu::OWeakObject*>(this) };
     }
 
     // XServiceInfo


More information about the Libreoffice-commits mailing list