[Libreoffice-commits] .: reportdesign/source

[Thomas Arnhold]

 reportdesign/source/filter/xml/xmlStyleImport.cxx     |    2 +-
 reportdesign/source/ui/inspection/GeometryHandler.cxx |    2 +-
 reportdesign/source/ui/misc/FunctionHelper.cxx        |    2 +-
 reportdesign/source/ui/report/propbrw.cxx             |    8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit dc02f815566ca53cc917c32671164bfc5c627850
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Sat Feb 26 10:45:02 2011 +0100

    Move bogus OSL_ASSERT(msg) to OSL_FAIL(msg)

diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx b/reportdesign/source/filter/xml/xmlStyleImport.cxx
index 32c3a5f..9317ed5 100644
--- a/reportdesign/source/filter/xml/xmlStyleImport.cxx
+++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx
@@ -129,7 +129,7 @@ void OControlStyleContext::FillPropertySet(const Reference< XPropertySet > & rPr
                         pStyle = PTR_CAST(SvXMLNumFormatContext,pMyStyles->
                             FindStyleChildContext(XML_STYLE_FAMILY_DATA_STYLE, m_sDataStyleName, sal_True));
                     else {
-                        OSL_ASSERT("not possible to get style");
+                        OSL_FAIL("not possible to get style");
                     }
                 }
                 if ( pStyle )
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index b9ca263..e4b1c53 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -2077,7 +2077,7 @@ void GeometryHandler::impl_initFieldList_nothrow( uno::Sequence< ::rtl::OUString
     }
     catch (uno::Exception&)
     {
-        OSL_ASSERT( "GeometryHandler::impl_initFieldList_nothrow: caught an exception!" );
+        OSL_FAIL( "GeometryHandler::impl_initFieldList_nothrow: caught an exception!" );
     }
 }
 // -----------------------------------------------------------------------------
diff --git a/reportdesign/source/ui/misc/FunctionHelper.cxx b/reportdesign/source/ui/misc/FunctionHelper.cxx
index 797cf47..0c81a42 100644
--- a/reportdesign/source/ui/misc/FunctionHelper.cxx
+++ b/reportdesign/source/ui/misc/FunctionHelper.cxx
@@ -194,7 +194,7 @@ xub_StrLen FunctionDescription::getSuppressedArgumentCount() const
     }
     catch(const uno::Exception&)
     {
-        OSL_ASSERT("Exception caught!");
+        OSL_FAIL("Exception caught!");
     }
     return sFormula;
 }
diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx
index f0d22d5..b0e2e88 100644
--- a/reportdesign/source/ui/report/propbrw.cxx
+++ b/reportdesign/source/ui/report/propbrw.cxx
@@ -126,7 +126,7 @@ PropBrw::PropBrw(const Reference< XMultiServiceFactory >&	_xORB,Window* pParent,
     }
     catch (Exception&)
     {
-        OSL_ASSERT("PropBrw::PropBrw: could not create/initialize my frame!");
+        OSL_FAIL("PropBrw::PropBrw: could not create/initialize my frame!");
         m_xMeAsFrame.clear();
     }
 
@@ -179,7 +179,7 @@ PropBrw::PropBrw(const Reference< XMultiServiceFactory >&	_xORB,Window* pParent,
         }
         catch (Exception&)
         {
-            OSL_ASSERT("PropBrw::PropBrw: could not create/initialize the browser controller!");
+            OSL_FAIL("PropBrw::PropBrw: could not create/initialize the browser controller!");
             try
             {
                 ::comphelper::disposeComponent(m_xBrowserController);
@@ -562,7 +562,7 @@ void PropBrw::Update( OSectionView* pNewView )
     }
     catch ( Exception& )
     {
-        OSL_ASSERT( "PropBrw::Update: Exception occurred!" );
+        OSL_FAIL( "PropBrw::Update: Exception occurred!" );
     }
 }
 //----------------------------------------------------------------------------
@@ -584,7 +584,7 @@ void PropBrw::Update( const uno::Reference< uno::XInterface>& _xReportComponent)
         }
         catch ( Exception& )
         {
-            OSL_ASSERT( "PropBrw::Update: Exception occurred!" );
+            OSL_FAIL( "PropBrw::Update: Exception occurred!" );
         }
     }
 }