From 0b23eec200c8c12db5778405df44f4bf8e38e4ad Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 26 May 2016 16:02:39 +0200 Subject: teach refcounting clang plugin about uno::Reference uno::Reference is only allowed to used with classes that have a ::static_type member. So convert all those places to rtl::Reference. Maybe we need some LIBO_INTERNAL_ONLY constructors on rtl::Reference and uno::Reference to make this a little smoother? Change-Id: Icdcb35d71ca40a87b1dc474096776412adbfc7e3 Reviewed-on: https://gerrit.libreoffice.org/25516 Tested-by: Jenkins Reviewed-by: Noel Grandin --- extensions/source/scanner/sanedlg.cxx | 2 +- extensions/source/update/feed/updatefeed.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'extensions/source') diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx index eb3f6f5c6efc..df077f8431eb 100644 --- a/extensions/source/scanner/sanedlg.cxx +++ b/extensions/source/scanner/sanedlg.cxx @@ -897,7 +897,7 @@ void SaneDlg::AcquirePreview() else mrSane.SetOptionValue( nOption, true ); - Reference xTransporter(new BitmapTransporter); + rtl::Reference xTransporter(new BitmapTransporter); if( ! mrSane.Start( *xTransporter.get() ) ) { ScopedVclPtrInstance< MessageDialog > aErrorBox(this, SaneResId(STR_ERROR_SCAN)); diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx index 13fdcda2d978..155b0ff862df 100644 --- a/extensions/source/update/feed/updatefeed.cxx +++ b/extensions/source/update/feed/updatefeed.cxx @@ -225,7 +225,7 @@ class UpdateInformationEnumeration : public ::cppu::WeakImplHelper< container::X { public: UpdateInformationEnumeration(const uno::Reference< xml::dom::XNodeList >& xNodeList, - const uno::Reference< UpdateInformationProvider >& xUpdateInformationProvider) : + const rtl::Reference< UpdateInformationProvider >& xUpdateInformationProvider) : m_xUpdateInformationProvider(xUpdateInformationProvider), m_xNodeList(xNodeList), m_nNodes(xNodeList.is() ? xNodeList->getLength() : 0), @@ -280,7 +280,7 @@ public: } private: - const uno::Reference< UpdateInformationProvider > m_xUpdateInformationProvider; + const rtl::Reference< UpdateInformationProvider > m_xUpdateInformationProvider; const uno::Reference< xml::dom::XNodeList > m_xNodeList; const sal_Int32 m_nNodes; sal_Int32 m_nCount; -- cgit