[Libreoffice-commits] core.git: include/svx svx/source

Noel Grandin noel.grandin at collabora.co.uk
Tue Feb 14 08:01:45 UTC 2017


 include/svx/shapeproperty.hxx                |    5 +----
 svx/source/unodraw/shapepropertynotifier.cxx |    3 ---
 2 files changed, 1 insertion(+), 7 deletions(-)

New commits:
commit 36bd6f9a616881db2193aa2e38d6d1703678db39
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Mon Feb 13 14:56:57 2017 +0200

    remove unused Invalid enumerator from ShapeProperty enum
    
    Change-Id: I27f1d50cc67210ca976fd97beb9dc71b975ac98d
    Reviewed-on: https://gerrit.libreoffice.org/34240
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/svx/shapeproperty.hxx b/include/svx/shapeproperty.hxx
index aeeaa13..56a71fd 100644
--- a/include/svx/shapeproperty.hxx
+++ b/include/svx/shapeproperty.hxx
@@ -34,10 +34,7 @@ namespace svx
         // text doc shape properties
         TextDocAnchor,
         // spreadsheet doc shape properties
-        CalcDocAnchor,
-
-        // invalid, not to be used
-        Invalid
+        CalcDocAnchor
     };
 
 }
diff --git a/svx/source/unodraw/shapepropertynotifier.cxx b/svx/source/unodraw/shapepropertynotifier.cxx
index 9ad56ae..14bef23 100644
--- a/svx/source/unodraw/shapepropertynotifier.cxx
+++ b/svx/source/unodraw/shapepropertynotifier.cxx
@@ -102,7 +102,6 @@ namespace svx
 
     void PropertyChangeNotifier::registerProvider(const ShapeProperty _eProperty, const std::shared_ptr<IPropertyValueProvider>& _rProvider)
     {
-        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,8 +112,6 @@ namespace svx
 
     void PropertyChangeNotifier::notifyPropertyChange( const ShapeProperty _eProperty ) const
     {
-        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!" );
         if ( provPos == m_xData->m_aProviders.end() )


More information about the Libreoffice-commits mailing list