Move OSL_ENSURE(sal_False,...) to OSL_FAIL(...)

4 files changed, 57 insertions, 57 deletions

diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx
index c4e2f8bb113e..f927c658d426 100755
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -74,7 +74,7 @@ if( !m_aCache.hasRow( nRow ) )                          \
 {                                                       \
         if( !m_xFetchProvider.is() )                    \
         {                                               \
-            OSL_ENSURE( sal_False, "broadcaster was disposed already" );    \
+            OSL_FAIL( "broadcaster was disposed already" ); \
             throw SQLException();                       \
         }                                               \
         aGuard.clear();                                 \
@@ -469,7 +469,7 @@ CCRS_PropertySetInfo::CCRS_PropertySetInfo(
     }
     else
     {
-        OSL_ENSURE( sal_False, "The received XPropertySetInfo doesn't contain required properties" );
+        OSL_FAIL( "The received XPropertySetInfo doesn't contain required properties" );
         m_pProperties = new Sequence<Property>;
     }
 
@@ -630,7 +630,7 @@ sal_Int32 SAL_CALL CCRS_PropertySetInfo
 
     if( !m_pProperties )
     {
-        OSL_ENSURE( sal_False, "Properties not initialized yet" );
+        OSL_FAIL( "Properties not initialized yet" );
         return nHandle;
     }
     sal_Bool bFound = sal_True;
@@ -727,7 +727,7 @@ sal_Bool SAL_CALL CachedContentResultSet
     OSL_ENSURE( nRow >= 0, "only positive values supported" );
     if( !m_xResultSetOrigin.is() )
     {
-        OSL_ENSURE( sal_False, "broadcaster was disposed already" );
+        OSL_FAIL( "broadcaster was disposed already" );
         return sal_False;
     }
 //  OSL_ENSURE( nRow <= m_nKnownCount, "don't step into regions you don't know with this method" );
@@ -995,7 +995,7 @@ void SAL_CALL CachedContentResultSet
 
     if( !getPropertySetInfo().is() )
     {
-        OSL_ENSURE( sal_False, "broadcaster was disposed already" );
+        OSL_FAIL( "broadcaster was disposed already" );
         throw UnknownPropertyException();
     }
 
@@ -1086,7 +1086,7 @@ void SAL_CALL CachedContentResultSet
             osl::Guard< osl::Mutex > aGuard( m_aMutex );
             if( !m_xPropertySetOrigin.is() )
             {
-                OSL_ENSURE( sal_False, "broadcaster was disposed already" );
+                OSL_FAIL( "broadcaster was disposed already" );
                 return;
             }
         }
@@ -1106,7 +1106,7 @@ Any SAL_CALL CachedContentResultSet
 
     if( !getPropertySetInfo().is() )
     {
-        OSL_ENSURE( sal_False, "broadcaster was disposed already" );
+        OSL_FAIL( "broadcaster was disposed already" );
         throw UnknownPropertyException();
     }
 
@@ -1145,7 +1145,7 @@ Any SAL_CALL CachedContentResultSet
             osl::Guard< osl::Mutex > aGuard( m_aMutex );
             if( !m_xPropertySetOrigin.is() )
             {
-                OSL_ENSURE( sal_False, "broadcaster was disposed already" );
+                OSL_FAIL( "broadcaster was disposed already" );
                 throw UnknownPropertyException();
             }
         }
@@ -1204,7 +1204,7 @@ void SAL_CALL CachedContentResultSet
             sal_Int32 nNew = 0;
             if( !( aEvt.NewValue >>= nNew ) )
             {
-                OSL_ENSURE( sal_False, "PropertyChangeEvent contains wrong data" );
+                OSL_FAIL( "PropertyChangeEvent contains wrong data" );
                 return;
             }
 
@@ -1218,7 +1218,7 @@ void SAL_CALL CachedContentResultSet
             sal_Bool bNew = sal_False;
             if( !( aEvt.NewValue >>= bNew ) )
             {
-                OSL_ENSURE( sal_False, "PropertyChangeEvent contains wrong data" );
+                OSL_FAIL( "PropertyChangeEvent contains wrong data" );
                 return;
             }
             impl_changeIsRowCountFinal( m_bFinalCount, bNew );
@@ -1270,7 +1270,7 @@ if( !m_aCache##XXX.hasRow( nRow ) )                         \
 {                                                           \
         if( !m_xFetchProviderForContentAccess.is() )        \
         {                                                   \
-            OSL_ENSURE( sal_False, "broadcaster was disposed already" );\
+            OSL_FAIL( "broadcaster was disposed already" );\
             throw RuntimeException();                       \
         }                                                   \
         aGuard.clear();                                     \
@@ -1423,7 +1423,7 @@ sal_Bool SAL_CALL CachedContentResultSet
 
     if( !m_xResultSetOrigin.is() )
     {
-        OSL_ENSURE( sal_False, "broadcaster was disposed already" );
+        OSL_FAIL( "broadcaster was disposed already" );
         return sal_False;
     }
     if( row < 0 )
@@ -1635,7 +1635,7 @@ sal_Bool SAL_CALL CachedContentResultSet
     //unknown position
     if( !m_xResultSetOrigin.is() )
     {
-        OSL_ENSURE( sal_False, "broadcaster was disposed already" );
+        OSL_FAIL( "broadcaster was disposed already" );
         return sal_False;
     }
     aGuard.clear();
@@ -1713,7 +1713,7 @@ sal_Bool SAL_CALL CachedContentResultSet
 
     if( !m_xResultSetOrigin.is() )
     {
-        OSL_ENSURE( sal_False, "broadcaster was disposed already" );
+        OSL_FAIL( "broadcaster was disposed already" );
         return sal_False;
     }
     aGuard.clear();
@@ -1748,7 +1748,7 @@ sal_Bool SAL_CALL CachedContentResultSet
 
     if( !m_xResultSetOrigin.is() )
     {
-        OSL_ENSURE( sal_False, "broadcaster was disposed already" );
+        OSL_FAIL( "broadcaster was disposed already" );
         return sal_False;
     }
     aGuard.clear();
@@ -1922,7 +1922,7 @@ sal_Bool SAL_CALL CachedContentResultSet
             return m_bLastCachedReadWasNull;
         if( !m_xRowOrigin.is() )
         {
-            OSL_ENSURE( sal_False, "broadcaster was disposed already" );
+            OSL_FAIL( "broadcaster was disposed already" );
             return sal_False;
         }
     }
@@ -2078,7 +2078,7 @@ Any SAL_CALL CachedContentResultSet
         {
             if( !m_xFetchProvider.is() )
             {
-                OSL_ENSURE( sal_False, "broadcaster was disposed already" );
+                OSL_FAIL( "broadcaster was disposed already" );
                 return Any();
             }
             aGuard.clear();
diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx b/ucb/source/cacher/cachedcontentresultsetstub.cxx
index a381911d53da..dd43d8680261 100755
--- a/ucb/source/cacher/cachedcontentresultsetstub.cxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx
@@ -187,7 +187,7 @@ XSERVICEINFO_NOFACTORY_IMPL_1( CachedContentResultSetStub,
 impl_EnsureNotDisposed(); \
 if( !m_xResultSetOrigin.is() ) \
 { \
-    OSL_ENSURE( sal_False, "broadcaster was disposed already" ); \
+    OSL_FAIL( "broadcaster was disposed already" ); \
     throw RuntimeException(); \
 } \
 impl_propagateFetchSizeAndDirection( nRowCount, bDirection ); \
@@ -325,7 +325,7 @@ sal_Int32 SAL_CALL CachedContentResultSetStub
         }
         catch( SQLException& )
         {
-            OSL_ENSURE( sal_False, "couldn't determine the column count" );
+            OSL_FAIL( "couldn't determine the column count" );
             nCount = 0;
         }
     }
diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx b/ucb/source/cacher/contentresultsetwrapper.cxx
index 60a824c8351c..a66c288276e2 100755
--- a/ucb/source/cacher/contentresultsetwrapper.cxx
+++ b/ucb/source/cacher/contentresultsetwrapper.cxx
@@ -327,7 +327,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper
         impl_init_xPropertySetOrigin();
         if( !m_xPropertySetOrigin.is() )
         {
-            OSL_ENSURE( sal_False, "broadcaster was disposed already" );
+            OSL_FAIL( "broadcaster was disposed already" );
             m_nForwardOnly = 0;
             return m_nForwardOnly;
         }
@@ -388,7 +388,7 @@ void SAL_CALL ContentResultSetWrapper
         }
         catch( Exception& )
         {
-            OSL_ENSURE( sal_False, "could not remove PropertyChangeListener" );
+            OSL_FAIL( "could not remove PropertyChangeListener" );
         }
         try
         {
@@ -397,7 +397,7 @@ void SAL_CALL ContentResultSetWrapper
         }
         catch( Exception& )
         {
-            OSL_ENSURE( sal_False, "could not remove VetoableChangeListener" );
+            OSL_FAIL( "could not remove VetoableChangeListener" );
         }
 
         Reference< XComponent > xComponentOrigin( m_xResultSetOrigin, UNO_QUERY );
@@ -545,7 +545,7 @@ void SAL_CALL ContentResultSetWrapper
     impl_init_xPropertySetOrigin();
     if( !m_xPropertySetOrigin.is() )
     {
-        OSL_ENSURE( sal_False, "broadcaster was disposed already" );
+        OSL_FAIL( "broadcaster was disposed already" );
         throw UnknownPropertyException();
     }
     m_xPropertySetOrigin->setPropertyValue( rPropertyName, rValue );
@@ -563,7 +563,7 @@ Any SAL_CALL ContentResultSetWrapper
     impl_init_xPropertySetOrigin();
     if( !m_xPropertySetOrigin.is() )
     {
-        OSL_ENSURE( sal_False, "broadcaster was disposed already" );
+        OSL_FAIL( "broadcaster was disposed already" );
         throw UnknownPropertyException();
     }
     return m_xPropertySetOrigin->getPropertyValue( rPropertyName );
@@ -583,7 +583,7 @@ void SAL_CALL ContentResultSetWrapper
 
     if( !getPropertySetInfo().is() )
     {
-        OSL_ENSURE( sal_False, "broadcaster was disposed already" );
+        OSL_FAIL( "broadcaster was disposed already" );
         throw UnknownPropertyException();
     }
 
@@ -604,7 +604,7 @@ void SAL_CALL ContentResultSetWrapper
             osl::Guard< osl::Mutex > aGuard( m_aMutex );
             if( !m_xPropertySetOrigin.is() )
             {
-                OSL_ENSURE( sal_False, "broadcaster was disposed already" );
+                OSL_FAIL( "broadcaster was disposed already" );
                 return;
             }
         }
@@ -635,7 +635,7 @@ void SAL_CALL ContentResultSetWrapper
 
     if( !getPropertySetInfo().is() )
     {
-        OSL_ENSURE( sal_False, "broadcaster was disposed already" );
+        OSL_FAIL( "broadcaster was disposed already" );
         throw UnknownPropertyException();
     }
     if( rPropertyName.getLength() )
@@ -655,7 +655,7 @@ void SAL_CALL ContentResultSetWrapper
             osl::Guard< osl::Mutex > aGuard( m_aMutex );
             if( !m_xPropertySetOrigin.is() )
             {
-                OSL_ENSURE( sal_False, "broadcaster was disposed already" );
+                OSL_FAIL( "broadcaster was disposed already" );
                 return;
             }
         }
@@ -715,7 +715,7 @@ void SAL_CALL ContentResultSetWrapper
             osl::Guard< osl::Mutex > aGuard( m_aMutex );
             if( !m_xPropertySetOrigin.is() )
             {
-                OSL_ENSURE( sal_False, "broadcaster was disposed already" );
+                OSL_FAIL( "broadcaster was disposed already" );
                 return;
             }
         }
@@ -726,7 +726,7 @@ void SAL_CALL ContentResultSetWrapper
         }
         catch( Exception& )
         {
-            OSL_ENSURE( sal_False, "could not remove PropertyChangeListener" );
+            OSL_FAIL( "could not remove PropertyChangeListener" );
         }
     }
 }
@@ -774,7 +774,7 @@ void SAL_CALL ContentResultSetWrapper
             osl::Guard< osl::Mutex > aGuard( m_aMutex );
             if( !m_xPropertySetOrigin.is() )
             {
-                OSL_ENSURE( sal_False, "broadcaster was disposed already" );
+                OSL_FAIL( "broadcaster was disposed already" );
                 return;
             }
         }
@@ -785,7 +785,7 @@ void SAL_CALL ContentResultSetWrapper
         }
         catch( Exception& )
         {
-            OSL_ENSURE( sal_False, "could not remove VetoableChangeListener" );
+            OSL_FAIL( "could not remove VetoableChangeListener" );
         }
     }
 }
@@ -860,7 +860,7 @@ OUString SAL_CALL ContentResultSetWrapper
     impl_init_xContentAccessOrigin();
     if( !m_xContentAccessOrigin.is() )
     {
-        OSL_ENSURE( sal_False, "broadcaster was disposed already" );
+        OSL_FAIL( "broadcaster was disposed already" );
         throw RuntimeException();
     }
     return m_xContentAccessOrigin->queryContentIdentifierString();
@@ -876,7 +876,7 @@ Reference< XContentIdentifier > SAL_CALL ContentResultSetWrapper
     impl_init_xContentAccessOrigin();
     if( !m_xContentAccessOrigin.is() )
     {
-        OSL_ENSURE( sal_False, "broadcaster was disposed already" );
+        OSL_FAIL( "broadcaster was disposed already" );
         throw RuntimeException();
     }
     return m_xContentAccessOrigin->queryContentIdentifier();
@@ -892,7 +892,7 @@ Reference< XContent > SAL_CALL ContentResultSetWrapper
     impl_init_xContentAccessOrigin();
     if( !m_xContentAccessOrigin.is() )
     {
-        OSL_ENSURE( sal_False, "broadcaster was disposed already" );
+        OSL_FAIL( "broadcaster was disposed already" );
         throw RuntimeException();
     }
     return m_xContentAccessOrigin->queryContent();
@@ -912,7 +912,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper
 
     if( !m_xResultSetOrigin.is() )
     {
-        OSL_ENSURE( sal_False, "broadcaster was disposed already" );
+        OSL_FAIL( "broadcaster was disposed already" );
         throw RuntimeException();
     }
     return m_xResultSetOrigin->next();
@@ -928,7 +928,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper
 
     if( !m_xResultSetOrigin.is() )
     {
-        OSL_ENSURE( sal_False, "broadcaster was disposed already" );
+        OSL_FAIL( "broadcaster was disposed already" );
         throw RuntimeException();
     }
     return m_xResultSetOrigin->previous();
@@ -944,7 +944,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper
 
     if( !m_xResultSetOrigin.is() )
     {
-        OSL_ENSURE( sal_False, "broadcaster was disposed already" );
+        OSL_FAIL( "broadcaster was disposed already" );
         throw RuntimeException();
     }
     return m_xResultSetOrigin->absolute( row );
@@ -960,7 +960,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper
 
     if( !m_xResultSetOrigin.is() )
     {
-        OSL_ENSURE( sal_False, "broadcaster was disposed already" );
+        OSL_FAIL( "broadcaster was disposed already" );
         throw RuntimeException();
     }
     return m_xResultSetOrigin->relative( rows );
@@ -977,7 +977,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper
 
     if( !m_xResultSetOrigin.is() )
     {
-        OSL_ENSURE( sal_False, "broadcaster was disposed already" );
+        OSL_FAIL( "broadcaster was disposed already" );
         throw RuntimeException();
     }
     return m_xResultSetOrigin->first();
@@ -993,7 +993,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper
 
     if( !m_xResultSetOrigin.is() )
     {
-        OSL_ENSURE( sal_False, "broadcaster was disposed already" );
+        OSL_FAIL( "broadcaster was disposed already" );
         throw RuntimeException();
     }
     return m_xResultSetOrigin->last();
@@ -1009,7 +1009,7 @@ void SAL_CALL ContentResultSetWrapper
 
     if( !m_xResultSetOrigin.is() )
     {
-        OSL_ENSURE( sal_False, "broadcaster was disposed already" );
+        OSL_FAIL( "broadcaster was disposed already" );
         throw RuntimeException();
     }
     m_xResultSetOrigin->beforeFirst();
@@ -1025,7 +1025,7 @@ void SAL_CALL ContentResultSetWrapper
 
     if( !m_xResultSetOrigin.is() )
     {
-        OSL_ENSURE( sal_False, "broadcaster was disposed already" );
+        OSL_FAIL( "broadcaster was disposed already" );
         throw RuntimeException();
     }
     m_xResultSetOrigin->afterLast();
@@ -1041,7 +1041,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper
 
     if( !m_xResultSetOrigin.is() )
     {
-        OSL_ENSURE( sal_False, "broadcaster was disposed already" );
+        OSL_FAIL( "broadcaster was disposed already" );
         throw RuntimeException();
     }
     return m_xResultSetOrigin->isAfterLast();
@@ -1057,7 +1057,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper
 
     if( !m_xResultSetOrigin.is() )
     {
-        OSL_ENSURE( sal_False, "broadcaster was disposed already" );
+        OSL_FAIL( "broadcaster was disposed already" );
         throw RuntimeException();
     }
     return m_xResultSetOrigin->isBeforeFirst();
@@ -1073,7 +1073,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper
 
     if( !m_xResultSetOrigin.is() )
     {
-        OSL_ENSURE( sal_False, "broadcaster was disposed already" );
+        OSL_FAIL( "broadcaster was disposed already" );
         throw RuntimeException();
     }
     return m_xResultSetOrigin->isFirst();
@@ -1089,7 +1089,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper
 
     if( !m_xResultSetOrigin.is() )
     {
-        OSL_ENSURE( sal_False, "broadcaster was disposed already" );
+        OSL_FAIL( "broadcaster was disposed already" );
         throw RuntimeException();
     }
     return m_xResultSetOrigin->isLast();
@@ -1106,7 +1106,7 @@ sal_Int32 SAL_CALL ContentResultSetWrapper
 
     if( !m_xResultSetOrigin.is() )
     {
-        OSL_ENSURE( sal_False, "broadcaster was disposed already" );
+        OSL_FAIL( "broadcaster was disposed already" );
         throw RuntimeException();
     }
     return m_xResultSetOrigin->getRow();
@@ -1122,7 +1122,7 @@ void SAL_CALL ContentResultSetWrapper
 
     if( !m_xResultSetOrigin.is() )
     {
-        OSL_ENSURE( sal_False, "broadcaster was disposed already" );
+        OSL_FAIL( "broadcaster was disposed already" );
         throw RuntimeException();
     }
     m_xResultSetOrigin->refreshRow();
@@ -1138,7 +1138,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper
 
     if( !m_xResultSetOrigin.is() )
     {
-        OSL_ENSURE( sal_False, "broadcaster was disposed already" );
+        OSL_FAIL( "broadcaster was disposed already" );
         throw RuntimeException();
     }
     return m_xResultSetOrigin->rowUpdated();
@@ -1153,7 +1153,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper
 
     if( !m_xResultSetOrigin.is() )
     {
-        OSL_ENSURE( sal_False, "broadcaster was disposed already" );
+        OSL_FAIL( "broadcaster was disposed already" );
         throw RuntimeException();
     }
     return m_xResultSetOrigin->rowInserted();
@@ -1169,7 +1169,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper
 
     if( !m_xResultSetOrigin.is() )
     {
-        OSL_ENSURE( sal_False, "broadcaster was disposed already" );
+        OSL_FAIL( "broadcaster was disposed already" );
         throw RuntimeException();
     }
     return m_xResultSetOrigin->rowDeleted();
@@ -1195,7 +1195,7 @@ impl_EnsureNotDisposed();                                       \
 impl_init_xRowOrigin();                                         \
 if( !m_xRowOrigin.is() )                                        \
 {                                                               \
-    OSL_ENSURE( sal_False, "broadcaster was disposed already" );\
+    OSL_FAIL( "broadcaster was disposed already" );\
     throw RuntimeException();                                   \
 }                                                               \
 return m_xRowOrigin->getXXX( columnIndex );
@@ -1210,7 +1210,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper
     impl_init_xRowOrigin();
     if( !m_xRowOrigin.is() )
     {
-        OSL_ENSURE( sal_False, "broadcaster was disposed already" );
+        OSL_FAIL( "broadcaster was disposed already" );
         throw RuntimeException();
     }
     return m_xRowOrigin->wasNull();
@@ -1359,7 +1359,7 @@ Any SAL_CALL ContentResultSetWrapper
     impl_init_xRowOrigin();
     if( !m_xRowOrigin.is() )
     {
-        OSL_ENSURE( sal_False, "broadcaster was disposed already" );
+        OSL_FAIL( "broadcaster was disposed already" );
         throw RuntimeException();
     }
     return m_xRowOrigin->getObject( columnIndex, typeMap );
diff --git a/ucb/source/cacher/dynamicresultsetwrapper.cxx b/ucb/source/cacher/dynamicresultsetwrapper.cxx
index 3574c6813da7..75d655be2f84 100755
--- a/ucb/source/cacher/dynamicresultsetwrapper.cxx
+++ b/ucb/source/cacher/dynamicresultsetwrapper.cxx
@@ -276,7 +276,7 @@ void SAL_CALL DynamicResultSetWrapper
                     }
                     else
                     {
-                        OSL_ENSURE( sal_False, "ListActionType was WELCOME but ActionInfo didn't contain a WelcomeDynamicResultSetStruct" );
+                        OSL_FAIL( "ListActionType was WELCOME but ActionInfo didn't contain a WelcomeDynamicResultSetStruct" );
                         //throw RuntimeException();
                     }
                     break;
@@ -444,7 +444,7 @@ void SAL_CALL DynamicResultSetWrapper
             return;
         }
     }
-    OSL_ENSURE( sal_False, "could not connect to cache" );
+    OSL_FAIL( "could not connect to cache" );
     throw ServiceNotFoundException();
 }