[Libreoffice-commits] .: chart2/source sc/source

Thomas Arnhold tarnhold at kemper.freedesktop.org
Sat Feb 26 01:47:07 PST 2011


 chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx |    4 ++--
 sc/source/ui/docshell/impex.cxx                                             |    2 +-
 sc/source/ui/drawfunc/fuins2.cxx                                            |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit f5a46069ff7d073da30f76d7757d92c66cd2d9c1
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Sat Feb 26 10:47:20 2011 +0100

    Move bogus OSL_ASSERT(msg) to OSL_FAIL(msg)

diff --git a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx
index 0b037cb..93b0229 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx
@@ -122,12 +122,12 @@ beans::PropertyState WrappedCharacterHeightProperty_Base::getPropertyState( cons
 
 Any WrappedCharacterHeightProperty_Base::convertInnerToOuterValue( const Any& rInnerValue ) const
 {
-    OSL_ASSERT("should not be used: WrappedCharacterHeightProperty_Base::convertInnerToOuterValue - check if you miss data");
+    OSL_FAIL("should not be used: WrappedCharacterHeightProperty_Base::convertInnerToOuterValue - check if you miss data");
     return rInnerValue;
 }
 Any WrappedCharacterHeightProperty_Base::convertOuterToInnerValue( const Any& rOuterValue ) const
 {
-    OSL_ASSERT("should not be used: WrappedCharacterHeightProperty_Base::convertOuterToInnerValue - check if you miss data");
+    OSL_FAIL("should not be used: WrappedCharacterHeightProperty_Base::convertOuterToInnerValue - check if you miss data");
     return rOuterValue;
 }
 
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 1faa21c..50e304d 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -2052,7 +2052,7 @@ class ScFormatFilterMissing : public ScFormatFilterPlugin {
   public:
     ScFormatFilterMissing()
     {
-      OSL_ASSERT ("Missing file filters");
+      OSL_FAIL("Missing file filters");
     }
     virtual FltError ScImportLotus123( SfxMedium&, ScDocument*, CharSet ) RETURN_ERROR
     virtual FltError ScImportQuattroPro( SfxMedium &, ScDocument * ) RETURN_ERROR
diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index ff12660..e601160 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -441,7 +441,7 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pVie
         }
         catch( uno::Exception& )
         {
-            OSL_ASSERT( "May need error handling here!\n" );
+            OSL_FAIL( "May need error handling here!\n" );
         }
     }
     else
@@ -763,7 +763,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
                             }
                             catch( uno::Exception& )
                             {
-                                OSL_ASSERT( "Chart wizard couldn't be positioned automatically\n" );
+                                OSL_FAIL( "Chart wizard couldn't be positioned automatically\n" );
                             }
                         }
 


More information about the Libreoffice-commits mailing list