desktop/source/lib/lokclipboard.hxx | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 10b457143a2848611ff4fd91c1e74ce8ba975e4e
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Wed Sep 18 23:00:27 2019 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Thu Sep 19 08:59:29 2019 +0200
desktop: various small cleanups in lokclipboard
1) virtual is redundant when override is used
2) LOKTransferable::initFlavourFromMime() had different parameter names
in the function declaration and definition
3) const-qualification on nInCount only had an effect in the function
definition, not in the declaration
Change-Id: I773f1f3cb5bac137a49c7e3b9ecb9b9bdf606268
Reviewed-on: https://gerrit.libreoffice.org/79111
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/desktop/source/lib/lokclipboard.hxx
b/desktop/source/lib/lokclipboard.hxx
index 0c237d822383..9688956c0ce6 100644
--- a/desktop/source/lib/lokclipboard.hxx
+++ b/desktop/source/lib/lokclipboard.hxx
@@ -41,9 +41,9 @@ public:
}
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() override;
- virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
override;
- virtual Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
+ OUString SAL_CALL getImplementationName() override;
+ sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+ Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
static Sequence<OUString> getSupportedServiceNames_static();
// XClipboard
@@ -72,11 +72,11 @@ class LOKTransferable : public
cppu::WeakImplHelper<css::datatransfer::XTransfer
css::uno::Sequence<css::datatransfer::DataFlavor> m_aFlavors;
std::vector<css::uno::Any> m_aContent;
- static void initFlavourFromMime(css::datatransfer::DataFlavor& rFlavor,
OUString sMimeType);
+ static void initFlavourFromMime(css::datatransfer::DataFlavor& rFlavor,
OUString aMimeType);
public:
LOKTransferable();
- LOKTransferable(const size_t nInCount, const char** pInMimeTypes, const
size_t* pInSizes,
+ LOKTransferable(size_t nInCount, const char** pInMimeTypes, const size_t*
pInSizes,
const char** pInStreams);
LOKTransferable(const OUString& sMimeType, const
css::uno::Sequence<sal_Int8>& aSequence);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
