diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-03-04 08:57:28 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-03-05 12:12:26 +0100 |
| commit | 191f85df5851473af270be486f95f940e3091fef (patch) | |
| tree | 753d9513ccda8ee2a132bdad74eedc47bd71b179 /sdext | |
| parent | 983566119c926d0e2478f74548f00a789de55c15 (diff) | |
re-land "new loplugin typedefparam""
This reverts commit c9bb48386bad7d2a40e6958883328145ae439cad,
and adds a bunch more fixes.
Change-Id: Ib584d302a73125528eba85fa1e722cb6fc41538a
Reviewed-on: https://gerrit.libreoffice.org/68680
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sdext')
| -rw-r--r-- | sdext/source/presenter/PresenterBitmapContainer.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sdext/source/presenter/PresenterBitmapContainer.cxx b/sdext/source/presenter/PresenterBitmapContainer.cxx index fcd0613c3f22..148bf24131ea 100644 --- a/sdext/source/presenter/PresenterBitmapContainer.cxx +++ b/sdext/source/presenter/PresenterBitmapContainer.cxx @@ -100,7 +100,7 @@ PresenterBitmapContainer::~PresenterBitmapContainer() maIconContainer.clear(); } -SharedBitmapDescriptor PresenterBitmapContainer::GetBitmap ( +std::shared_ptr<PresenterBitmapContainer::BitmapDescriptor> PresenterBitmapContainer::GetBitmap ( const OUString& rsName) const { BitmapContainer::const_iterator iSet (maIconContainer.find(rsName)); @@ -140,12 +140,12 @@ void PresenterBitmapContainer::LoadBitmaps ( } } -SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap ( +std::shared_ptr<PresenterBitmapContainer::BitmapDescriptor> PresenterBitmapContainer::LoadBitmap ( const css::uno::Reference<css::container::XHierarchicalNameAccess>& rxNode, const OUString& rsPath, const css::uno::Reference<css::drawing::XPresenterHelper>& rxPresenterHelper, const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, - const SharedBitmapDescriptor& rpDefault) + const std::shared_ptr<BitmapDescriptor>& rpDefault) { SharedBitmapDescriptor pBitmap; @@ -187,11 +187,11 @@ void PresenterBitmapContainer::ProcessBitmap ( SharedBitmapDescriptor()); } -SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap ( +std::shared_ptr<PresenterBitmapContainer::BitmapDescriptor> PresenterBitmapContainer::LoadBitmap ( const Reference<beans::XPropertySet>& rxProperties, const css::uno::Reference<css::drawing::XPresenterHelper>& rxPresenterHelper, const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, - const SharedBitmapDescriptor& rpDefault) + const std::shared_ptr<BitmapDescriptor>& rpDefault) { OSL_ASSERT(rxCanvas.is()); OSL_ASSERT(rxPresenterHelper.is()); |