diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-12-04 11:03:29 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-12-05 07:59:37 +0100 |
| commit | 001111f731038fd64c8b29c94614560e38d696ba (patch) | |
| tree | 5f3140b82e3c2fa0b54cc8b48d7a1e67e8876d99 /sc | |
| parent | a04e615e1f9371401946c7c89d7ec439ce92cfec (diff) | |
remove unused svx::ShapeProperty enum value
Change-Id: Iafc65902ed00206ff80dfc135c1ae767893abeca
Reviewed-on: https://gerrit.libreoffice.org/64566
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/inc/shapeuno.hxx | 1 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/shapeuno.cxx | 26 |
2 files changed, 1 insertions, 26 deletions
diff --git a/sc/inc/shapeuno.hxx b/sc/inc/shapeuno.hxx index e3ce7f2855d8..e4678427c762 100644 --- a/sc/inc/shapeuno.hxx +++ b/sc/inc/shapeuno.hxx @@ -70,7 +70,6 @@ private: css::uno::Reference< css::beans::XPropertySetInfo > mxPropSetInfo; bool bIsTextShape; bool bIsNoteCaption; - bool bInitializedNotifier; SdrObject* GetSdrObject() const throw(); diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx index 49ce7146ccd1..1468ef39e831 100644 --- a/sc/source/ui/unoobj/shapeuno.cxx +++ b/sc/source/ui/unoobj/shapeuno.cxx @@ -82,21 +82,11 @@ ScMacroInfo* ScShapeObj_getShapeHyperMacroInfo( const ScShapeObj* pShape, bool b return nullptr; } -namespace -{ - void lcl_initializeNotifier( SdrObject& _rSdrObj, ::cppu::OWeakObject& _rShape ) - { - std::shared_ptr<svx::IPropertyValueProvider> pProvider( new svx::PropertyValueProvider( _rShape, "Anchor" ) ); - _rSdrObj.getShapePropertyChangeNotifier().registerProvider( svx::ShapeProperty::CalcDocAnchor, pProvider ); - } -} - ScShapeObj::ScShapeObj( uno::Reference<drawing::XShape>& xShape ) : pShapePropertySet(nullptr), pShapePropertyState(nullptr), bIsTextShape(false), - bIsNoteCaption(false), - bInitializedNotifier(false) + bIsNoteCaption(false) { osl_atomic_increment( &m_refCount ); @@ -121,8 +111,6 @@ ScShapeObj::ScShapeObj( uno::Reference<drawing::XShape>& xShape ) : if ( pObj ) { bIsNoteCaption = ScDrawLayer::IsNoteCaption( pObj ); - lcl_initializeNotifier( *pObj, *this ); - bInitializedNotifier = true; } } @@ -839,18 +827,6 @@ void SAL_CALL ScShapeObj::addPropertyChangeListener( const OUString& aPropertyNa GetShapePropertySet(); if (pShapePropertySet) pShapePropertySet->addPropertyChangeListener( aPropertyName, aListener ); - - if ( !bInitializedNotifier ) - { - // here's the latest chance to initialize the property notification at the SdrObject - // (in the ctor, where we also attempt to do this, we do not necessarily have - // and SdrObject, yet) - SdrObject* pObj = GetSdrObject(); - OSL_ENSURE( pObj, "ScShapeObj::addPropertyChangeListener: no SdrObject -> no property change notification!" ); - if ( pObj ) - lcl_initializeNotifier( *pObj, *this ); - bInitializedNotifier = true; - } } void SAL_CALL ScShapeObj::removePropertyChangeListener( const OUString& aPropertyName, |