diff options
| author | Noel Grandin <noel@peralex.com> | 2016-05-26 16:02:39 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-31 06:25:45 +0000 |
| commit | 0b23eec200c8c12db5778405df44f4bf8e38e4ad (patch) | |
| tree | ee45856fe1781195c51f63835024865f283cdab8 /sc/source/ui/unoobj | |
| parent | 88c03cd07a171e05c7fb4dcade8baa28e7c5a770 (diff) | |
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 <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sc/source/ui/unoobj')
| -rw-r--r-- | sc/source/ui/unoobj/cellsuno.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/chart2uno.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/docuno.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/warnpassword.cxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 238da0d112e3..16f81fafac3d 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -5645,7 +5645,7 @@ void SAL_CALL ScCellRangeObj::filter( const uno::Reference<sheet::XSheetFilterDe //! wenn es schon ein ScFilterDescriptor ist, direkt per getImplementation? ScDocShell* pDocSh = GetDocShell(); - uno::Reference<ScFilterDescriptor> xImpl(new ScFilterDescriptor(pDocSh)); + rtl::Reference<ScFilterDescriptor> xImpl(new ScFilterDescriptor(pDocSh)); uno::Reference< sheet::XSheetFilterDescriptor2 > xDescriptor2( xDescriptor, uno::UNO_QUERY ); if ( xDescriptor2.is() ) { diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index afe109d3159f..784bacc89d31 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -3292,9 +3292,9 @@ uno::Reference< util::XCloneable > SAL_CALL ScChart2DataSequence::createClone() aTokensNew.push_back(p); } - uno::Reference<ScChart2DataSequence> p(new ScChart2DataSequence(m_pDocument, m_xDataProvider, std::move(aTokensNew), m_bIncludeHiddenCells)); + rtl::Reference<ScChart2DataSequence> p(new ScChart2DataSequence(m_pDocument, m_xDataProvider, std::move(aTokensNew), m_bIncludeHiddenCells)); p->CopyData(*this); - Reference< util::XCloneable > xClone(p); + Reference< util::XCloneable > xClone(p.get()); return xClone; } diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 064c8b699533..43f5897930fd 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -2025,7 +2025,7 @@ void SAL_CALL ScModelObj::consolidate( // die Daten in ein ScConsolidationDescriptor Objekt zu kopieren: //! wenn es schon ein ScConsolidationDescriptor ist, direkt per getImplementation? - uno::Reference< ScConsolidationDescriptor > xImpl(new ScConsolidationDescriptor); + rtl::Reference< ScConsolidationDescriptor > xImpl(new ScConsolidationDescriptor); xImpl->setFunction( xDescriptor->getFunction() ); xImpl->setSources( xDescriptor->getSources() ); xImpl->setStartOutputPosition( xDescriptor->getStartOutputPosition() ); diff --git a/sc/source/ui/unoobj/warnpassword.cxx b/sc/source/ui/unoobj/warnpassword.cxx index 27a197f63e1b..b35a81cd561c 100644 --- a/sc/source/ui/unoobj/warnpassword.cxx +++ b/sc/source/ui/unoobj/warnpassword.cxx @@ -49,7 +49,7 @@ bool ScWarnPassword::WarningOnPassword( SfxMedium& rMedium ) InteractionClassification_QUERY, ERRCODE_SVX_EXPORT_FILTER_CRYPT))); - Reference< ucbhelper::SimpleInteractionRequest > xRequest + rtl::Reference< ucbhelper::SimpleInteractionRequest > xRequest = new ucbhelper::SimpleInteractionRequest( aException, ucbhelper::CONTINUATION_APPROVE |