Date: prev next · Thread: first prev next last
2011 Archives by date, by thread · List index


In a previous commit, OSL_ASSERT were changed into OSL_FAIL but 2 of them
created the build fail.
From 6a1c81ffb1bfdb5361cf885a89d29b8fcb362e2d Mon Sep 17 00:00:00 2001
From: Xisco Fauli <anistenis@gmail.com>
Date: Sun, 27 Feb 2011 21:12:58 +0100
Subject: [PATCH] Revert 2 OSL_FAIL

---
 sfx2/source/doc/guisaveas.cxx |    2 +-
 sfx2/source/doc/objstor.cxx   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 940e3e9..aa68646 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -230,7 +230,7 @@ public:
             }
             catch( uno::Exception& )
             {
-                OSL_FAIL( "Unexpected exception!" );
+                OSL_ASSERT( "Unexpected exception!" );
             }
         }
     }
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index e6cb611..eb45ce0 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -1605,7 +1605,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl
                         {
                             // it should not happen, the copies signature is invalid!
                             // throw the changes away
-                            OSL_FAIL( "An invalid signature was copied!" );
+                            OSL_ASSERT( "An invalid signature was copied!" );
                         }
                     }
                 }
-- 
1.7.1


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.