diff options
| author | Kohei Yoshida <kohei.yoshida@suse.com> | 2012-01-31 16:16:18 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@suse.com> | 2012-01-31 21:38:58 -0500 |
| commit | 90d27afdd8e2488a9757da978d96081e35bb0e3f (patch) | |
| tree | e8cf3f4bb54a8dcf242d1ebc725aa115280441d1 /svx/source | |
| parent | c5bb73cae7c172ad0f02f8c67dd57b53337f1d78 (diff) | |
Simplified & non-inlined setUnoShape().
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/svdraw/svdobj.cxx | 5 | ||||
| -rw-r--r-- | svx/source/unodraw/unoshape.cxx | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 568b88df2923..4018e65314a5 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -3027,6 +3027,11 @@ SvxShape* SdrObject::getSvxShape() const return xShape; } +void SdrObject::setUnoShape(const uno::Reference<uno::XInterface >& _rxUnoShape) +{ + impl_setUnoShape( _rxUnoShape ); +} + ::svx::PropertyChangeNotifier& SdrObject::getShapePropertyChangeNotifier() { DBG_TESTSOLARMUTEX(); diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 6a15396a68c6..f1a3c37b4c4a 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -257,7 +257,7 @@ SvxShape::~SvxShape() throw() mpImpl->mpMaster->dispose(); if ( mpObj.is() ) - mpObj->setUnoShape( NULL, SdrObject::GrantXShapeAccess() ); + mpObj->setUnoShape(NULL); if( HasSdrObjectOwnership() && mpObj.is() ) { @@ -385,7 +385,7 @@ void SvxShape::impl_initFromSdrObject() osl_incrementInterlockedCount( &m_refCount ); { - mpObj->setUnoShape( *this, SdrObject::GrantXShapeAccess() ); + mpObj->setUnoShape(*this); } osl_decrementInterlockedCount( &m_refCount ); @@ -1382,7 +1382,7 @@ void SAL_CALL SvxShape::dispose() throw(uno::RuntimeException) } } - mpObj->setUnoShape( NULL, SdrObject::GrantXShapeAccess() ); + mpObj->setUnoShape(NULL); if ( bFreeSdrObject ) { |