summaryrefslogtreecommitdiffstats
path: root/sdext/source/presenter/PresenterBitmapContainer.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sdext/source/presenter/PresenterBitmapContainer.cxx')
-rw-r--r--sdext/source/presenter/PresenterBitmapContainer.cxx10
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());