removetooltypes01: Rebase to DEV300m99

1 files changed, 12 insertions, 0 deletions

diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index 7115ffa5636c..200c87a729b3 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -704,6 +704,18 @@ void OGenericUnoController::InvalidateFeature_Impl()
 // -----------------------------------------------------------------------
 void OGenericUnoController::ImplInvalidateFeature( sal_Int32 _nId, const Reference< XStatusListener >& _xListener, sal_Bool _bForceBroadcast )
 {
+#if OSL_DEBUG_LEVEL > 0
+    if ( _nId != -1 )
+    {
+        SupportedFeatures::iterator aFeaturePos = ::std::find_if(
+            m_aSupportedFeatures.begin(),
+            m_aSupportedFeatures.end(),
+            ::std::bind2nd( CompareFeatureById(), _nId )
+        );
+        OSL_ENSURE( aFeaturePos != m_aSupportedFeatures.end(), "OGenericUnoController::ImplInvalidateFeature: invalidating an unsupported feature is suspicious, at least!" );
+    }
+#endif
+
     FeatureListener aListener;
     aListener.nId               = _nId;
     aListener.xListener         = _xListener;