diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-09-09 09:45:14 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-09-09 17:46:35 +0200 |
| commit | bb157a42865a2d591f378577c4cfb7c731e18a08 (patch) | |
| tree | 0f95f2cb826f37e84abaecc0cf860d808feb6944 /framework/source/uiconfiguration/imagemanager.cxx | |
| parent | 390eaa736364a59e479a849598677b1a6a87f24e (diff) | |
sb140: #i116785# avoid ring-ref that keeps ref counted objects alive forever
improves over similar dbd2b6037046f0ecaa9a052ebf7c0fa84026968a "fix circular depend"
Diffstat (limited to 'framework/source/uiconfiguration/imagemanager.cxx')
| -rw-r--r-- | framework/source/uiconfiguration/imagemanager.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/framework/source/uiconfiguration/imagemanager.cxx b/framework/source/uiconfiguration/imagemanager.cxx index ba0b7fea77da..be7f16705d6c 100644 --- a/framework/source/uiconfiguration/imagemanager.cxx +++ b/framework/source/uiconfiguration/imagemanager.cxx @@ -109,7 +109,7 @@ DEFINE_INIT_SERVICE ( ImageManager, {} ) ImageManager::ImageManager( uno::Reference< XMultiServiceFactory > xServiceManager ) : ThreadHelpBase( &Application::GetSolarMutex() ) - , m_pImpl( new ImageManagerImpl(xServiceManager,this,false) ) + , m_pImpl( new ImageManagerImpl(xServiceManager,false) ) { } @@ -121,7 +121,7 @@ ImageManager::~ImageManager() // XComponent void SAL_CALL ImageManager::dispose() throw (::com::sun::star::uno::RuntimeException) { - m_pImpl->dispose(); + m_pImpl->dispose(static_cast< OWeakObject* >(this)); } void SAL_CALL ImageManager::addEventListener( const uno::Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) @@ -157,7 +157,7 @@ throw (::com::sun::star::uno::RuntimeException) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ - m_pImpl->reset(); + m_pImpl->reset(static_cast< OWeakObject* >(this)); } Sequence< ::rtl::OUString > SAL_CALL ImageManager::getAllImageNames( ::sal_Int16 nImageType ) @@ -188,7 +188,7 @@ throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException) { - m_pImpl->replaceImages(nImageType,aCommandURLSequence,aGraphicsSequence); + m_pImpl->replaceImages(static_cast< OWeakObject* >(this),nImageType,aCommandURLSequence,aGraphicsSequence); } void SAL_CALL ImageManager::removeImages( ::sal_Int16 nImageType, const Sequence< ::rtl::OUString >& aCommandURLSequence ) @@ -196,7 +196,7 @@ throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException) { - m_pImpl->removeImages(nImageType,aCommandURLSequence); + m_pImpl->removeImages(static_cast< OWeakObject* >(this),nImageType,aCommandURLSequence); } void SAL_CALL ImageManager::insertImages( ::sal_Int16 nImageType, const Sequence< ::rtl::OUString >& aCommandURLSequence, const Sequence< uno::Reference< XGraphic > >& aGraphicSequence ) @@ -205,7 +205,7 @@ throw ( ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException) { - m_pImpl->insertImages(nImageType,aCommandURLSequence,aGraphicSequence); + m_pImpl->insertImages(static_cast< OWeakObject* >(this),nImageType,aCommandURLSequence,aGraphicSequence); } // XUIConfiguration @@ -227,7 +227,7 @@ void SAL_CALL ImageManager::reload() throw ( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException ) { - m_pImpl->reload(); + m_pImpl->reload(static_cast< OWeakObject* >(this)); } void SAL_CALL ImageManager::store() |