[Libreoffice-commits] .: writerfilter/source

David Tardon dtardon at kemper.freedesktop.org
Sat Feb 26 07:23:06 PST 2011


 writerfilter/source/dmapper/DomainMapper.cxx         |    2 +-
 writerfilter/source/filter/WriterFilterDetection.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3ad7cafd7e6e9ff92430a3de6bbef23e16f6ae8b
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Feb 26 15:59:51 2011 +0100

    OSL_ASSERT takes a condition, not a message

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index beaa003..c1b12f1 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -840,7 +840,7 @@ void DomainMapper::attribute(Id nName, Value & val)
         case NS_rtf::LN_cellLeftColor:
         case NS_rtf::LN_cellBottomColor:
         case NS_rtf::LN_cellRightColor:
-            OSL_ASSERT("handled by DomainMapperTableManager");
+            OSL_FAIL("handled by DomainMapperTableManager");
         break;
 
         case NS_rtf::LN_LISTTABLE:
diff --git a/writerfilter/source/filter/WriterFilterDetection.cxx b/writerfilter/source/filter/WriterFilterDetection.cxx
index d0c8bf7..eb7c137 100644
--- a/writerfilter/source/filter/WriterFilterDetection.cxx
+++ b/writerfilter/source/filter/WriterFilterDetection.cxx
@@ -138,7 +138,7 @@ OUString WriterFilterDetection::detect( uno::Sequence< beans::PropertyValue >& r
     }
     catch(const uno::Exception&)
     {
-        OSL_ASSERT("exception while opening storage");
+        OSL_FAIL("exception while opening storage");
     }
     if( !bWord )
         sTypeName = ::rtl::OUString();


More information about the Libreoffice-commits mailing list