diff options
author | Noel Grandin <noelgrandin@gmail.com> | 2021-11-28 16:16:37 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-11-28 21:07:13 +0100 |
commit | 134cbe4c3b94a5ec46849abd1eef2c3acb5f789e (patch) | |
tree | 8cbddc095f8dd6edcf37e428801020ac60804575 /svx | |
parent | 6762aff78bd346ebf816ead77e73b6fa9d8ea7d8 (diff) |
use more OInterfaceContainerHelper3 in SvxShapeCollection
which requires adding a getInterface method to OInterfaceContainerHelper3
Change-Id: I0962aa42c19859d7b78c998b8b4448a7ebfc19e4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125981
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/unodraw/unoshcol.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx index 450de874753b..80ad53cc1f88 100644 --- a/svx/source/unodraw/unoshcol.cxx +++ b/svx/source/unodraw/unoshcol.cxx @@ -26,7 +26,7 @@ #include <cppuhelper/implbase3.hxx> #include <cppuhelper/interfacecontainer.hxx> -#include <comphelper/interfacecontainer2.hxx> +#include <comphelper/interfacecontainer3.hxx> #include <cppuhelper/supportsservice.hxx> #include <osl/mutex.hxx> #include <sal/log.hxx> @@ -47,7 +47,7 @@ class SvxShapeCollection : public SvxShapeCollectionMutex { private: - comphelper::OInterfaceContainerHelper2 maShapeContainer; + comphelper::OInterfaceContainerHelper3<drawing::XShape> maShapeContainer; cppu::OBroadcastHelper mrBHelper; @@ -213,8 +213,8 @@ uno::Any SAL_CALL SvxShapeCollection::getByIndex( sal_Int32 Index ) if( Index < 0 || Index >= getCount() ) throw lang::IndexOutOfBoundsException(); - Reference< uno::XInterface> xInterface = maShapeContainer.getInterface(Index); - return uno::makeAny( Reference< drawing::XShape>(static_cast< drawing::XShape* >( xInterface.get())) ); + Reference<drawing::XShape> xShape = maShapeContainer.getInterface(Index); + return uno::makeAny( xShape ); } // XElementAccess |