diff options
| author | Noel Grandin <noel@peralex.com> | 2016-08-23 11:53:22 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-08-24 08:47:57 +0200 |
| commit | 44b2afa192fbf78d337cf18840c26b7d04e91a4e (patch) | |
| tree | 7e317015cada10da03f4395b265dd0bd68b75684 /svx | |
| parent | c33a1d47de07c327013979b1165f72298eaded45 (diff) | |
convert ShapeProperty to scoped enum
Change-Id: I2e0dc3aaefb174c8960bb6b8ce9a4ad830626ba4
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdobj.cxx | 4 | ||||
| -rw-r--r-- | svx/source/unodraw/shapepropertynotifier.cxx | 4 | ||||
| -rw-r--r-- | svx/source/unodraw/unoshape.cxx | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index b940c562cfdd..f534933ca456 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -2799,10 +2799,10 @@ void SdrObject::SendUserCall(SdrUserCallType eUserCall, const Rectangle& rBoundR switch ( eUserCall ) { case SdrUserCallType::Resize: - notifyShapePropertyChange( svx::eShapeSize ); + notifyShapePropertyChange( svx::ShapeProperty::Size ); SAL_FALLTHROUGH; // RESIZE might also imply a change of the position case SdrUserCallType::MoveOnly: - notifyShapePropertyChange( svx::eShapePosition ); + notifyShapePropertyChange( svx::ShapeProperty::Position ); break; default: // not interested in diff --git a/svx/source/unodraw/shapepropertynotifier.cxx b/svx/source/unodraw/shapepropertynotifier.cxx index 5d1ed99b4054..9ad56aed42b9 100644 --- a/svx/source/unodraw/shapepropertynotifier.cxx +++ b/svx/source/unodraw/shapepropertynotifier.cxx @@ -102,7 +102,7 @@ namespace svx void PropertyChangeNotifier::registerProvider(const ShapeProperty _eProperty, const std::shared_ptr<IPropertyValueProvider>& _rProvider) { - ENSURE_OR_THROW( _eProperty != eInvalidShapeProperty, "Illegal ShapeProperty value!" ); + ENSURE_OR_THROW( _eProperty != ShapeProperty::Invalid, "Illegal ShapeProperty value!" ); ENSURE_OR_THROW( !!_rProvider, "NULL factory not allowed." ); OSL_ENSURE( m_xData->m_aProviders.find( _eProperty ) == m_xData->m_aProviders.end(), @@ -113,7 +113,7 @@ namespace svx void PropertyChangeNotifier::notifyPropertyChange( const ShapeProperty _eProperty ) const { - ENSURE_OR_THROW( _eProperty != eInvalidShapeProperty, "Illegal ShapeProperty value!" ); + ENSURE_OR_THROW( _eProperty != ShapeProperty::Invalid, "Illegal ShapeProperty value!" ); PropertyProviders::const_iterator provPos = m_xData->m_aProviders.find( _eProperty ); OSL_ENSURE( provPos != m_xData->m_aProviders.end(), "PropertyChangeNotifier::notifyPropertyChange: no factory!" ); diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 1b6e627a0ea0..4b2037352c62 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -327,9 +327,9 @@ svx::PropertyChangeNotifier& SvxShape::getShapePropertyChangeNotifier() void SvxShape::impl_construct() { - mpImpl->maPropertyNotifier.registerProvider( svx::eShapePosition, + mpImpl->maPropertyNotifier.registerProvider( svx::ShapeProperty::Position, std::shared_ptr<svx::IPropertyValueProvider>( new ShapePositionProvider( *mpImpl ) ) ); - mpImpl->maPropertyNotifier.registerProvider( svx::eShapeSize, + mpImpl->maPropertyNotifier.registerProvider( svx::ShapeProperty::Size, std::shared_ptr<svx::IPropertyValueProvider>( new ShapeSizeProvider( *mpImpl ) ) ); if ( mpObj.is() ) |