[Libreoffice-commits] .: odk/examples unodevtools/source

Thomas Arnhold tarnhold at kemper.freedesktop.org
Sun Mar 13 08:52:45 PDT 2011


 odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.cxx             |    2 +-
 odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx |    2 +-
 unodevtools/source/unodevtools/typeblob.cxx                                            |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit f35cf85512e9cc07996fe8e3b708bcd70d255514
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Sat Mar 12 12:09:32 2011 +0100

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

diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.cxx
index 8b9558b..20543d5 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.cxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.cxx
@@ -878,7 +878,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference(
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& typeNamePattern, const Sequence< sal_Int32 >& types ) throw(SQLException, RuntimeException)
 {
-    OSL_ENSURE(0,"Not implemented yet!");
+    OSL_FAIL("Not implemented yet!");
     throw SQLException();
     return NULL;
 }
diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
index fc840b2..1361e16 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
+++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
@@ -179,7 +179,7 @@ sal_Bool XFlatXml::importer(
     catch( Exception &exc)
     {
         // something went wrong
-        OSL_ENSURE(0, exc.Message);
+        OSL_FAIL(exc.Message);
         return sal_False;
     }
 
diff --git a/unodevtools/source/unodevtools/typeblob.cxx b/unodevtools/source/unodevtools/typeblob.cxx
index 4baf0b3..cf53d59 100644
--- a/unodevtools/source/unodevtools/typeblob.cxx
+++ b/unodevtools/source/unodevtools/typeblob.cxx
@@ -136,7 +136,7 @@ void writeConstantData(typereg::Writer& rWriter, sal_uInt16 fieldIndex,
     }
     break;
     default:
-        OSL_ENSURE( 0, "unsupported constant type" );
+        OSL_FAIL( "unsupported constant type" );
         break;
     }
     
@@ -798,7 +798,7 @@ void* getTypeBlob(Reference< XHierarchicalNameAccess > xTDmgr,
     }
     break;
     default:
-        OSL_ENSURE( 0, "unsupported type" );
+        OSL_FAIL( "unsupported type" );
         break;
     }
     


More information about the Libreoffice-commits mailing list