diff options
Diffstat (limited to 'svx/source/unodraw')
| -rw-r--r-- | svx/source/unodraw/unoshape.cxx | 2 | ||||
| -rw-r--r-- | svx/source/unodraw/unoshcol.cxx | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 7653b263f4c9..3bbdff48a8e8 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -123,7 +123,7 @@ struct SvxShapeImpl ::tools::WeakReference< SdrObject > mpCreatedObj; // for xComponent - ::cppu::OInterfaceContainerHelper maDisposeListeners; + ::comphelper::OInterfaceContainerHelper2 maDisposeListeners; svx::PropertyChangeNotifier maPropertyNotifier; SvxShapeImpl( SvxShape& _rAntiImpl, ::osl::Mutex& _rMutex ) diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx index e28b50288056..5057ba801c9e 100644 --- a/svx/source/unodraw/unoshcol.cxx +++ b/svx/source/unodraw/unoshcol.cxx @@ -25,6 +25,7 @@ #include <cppuhelper/implbase3.hxx> #include <cppuhelper/interfacecontainer.hxx> +#include <comphelper/interfacecontainer2.hxx> #include <cppuhelper/supportsservice.hxx> #include <osl/mutex.hxx> #include <rtl/ref.hxx> @@ -46,7 +47,7 @@ class SvxShapeCollection : public SvxShapeCollectionMutex { private: - cppu::OInterfaceContainerHelper maShapeContainer; + comphelper::OInterfaceContainerHelper2 maShapeContainer; cppu::OBroadcastHelper mrBHelper; @@ -229,10 +230,10 @@ uno::Any SAL_CALL SvxShapeCollection::getByIndex( sal_Int32 Index ) if( Index < 0 || Index >= getCount() ) throw lang::IndexOutOfBoundsException(); - uno::Sequence< Reference< uno::XInterface> > xElements( maShapeContainer.getElements() ); + std::vector< Reference< uno::XInterface> > xElements( maShapeContainer.getElements() ); - return uno::makeAny( Reference< drawing::XShape>(static_cast< drawing::XShape* >( xElements.getArray()[Index].get())) ); + return uno::makeAny( Reference< drawing::XShape>(static_cast< drawing::XShape* >( xElements[Index].get())) ); } // XElementAccess |