[Libreoffice-commits] .: framework/inc

[Caolán McNamara]

 framework/inc/macros/debug/assertion.hxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 2718b9b11afbac56ff39967317fb06bdb1298820
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 5 09:42:24 2011 +0100

    tweak assert

diff --git a/framework/inc/macros/debug/assertion.hxx b/framework/inc/macros/debug/assertion.hxx
index 5f4e309..b13505e 100644
--- a/framework/inc/macros/debug/assertion.hxx
+++ b/framework/inc/macros/debug/assertion.hxx
@@ -97,7 +97,7 @@
                         _sAssertBuffer.append( "\n\t\""         );                                              \
                         _sAssertBuffer.append( STEXT            );                                              \
                         _sAssertBuffer.append( "\"\n"           );                                              \
-                        WRITE_LOGFILE( LOGFILE_ASSERTIONS, _sAssertBuffer.makeStringAndClear() )                \
+                        WRITE_LOGFILE( LOGFILE_ASSERTIONS, _sAssertBuffer.getStr() )                \
                     }
 
     #endif
@@ -128,7 +128,7 @@
                         _sAssertBuffer.append( "\n\t\""         );                                              \
                         _sAssertBuffer.append( STEXT            );                                              \
                         _sAssertBuffer.append( "\"\n"           );                                              \
-                        WRITE_LOGFILE( LOGFILE_ASSERTIONS, _sAssertBuffer.makeStringAndClear() )                \
+                        WRITE_LOGFILE( LOGFILE_ASSERTIONS, _sAssertBuffer.getStr() )                \
                         exit(-1);                                                                               \
                     }
 
@@ -155,7 +155,7 @@
                         _sAssertBuffer.append( "\n\t\""         );                                              \
                         _sAssertBuffer.append( STEXT            );                                              \
                         _sAssertBuffer.append( "\"\n"           );                                              \
-                        OSL_ENSURE( !( BCONDITION ), _sAssertBuffer.makeStringAndClear() );                     \
+                        OSL_ENSURE( !( BCONDITION ), _sAssertBuffer.getStr() );                     \
                     }
 
     #endif
@@ -205,7 +205,7 @@
                     _sAssertBuffer2.append( SOWNMESSAGE             );                                          \
                     _sAssertBuffer2.append( "\n"                    );                                          \
                     _sAssertBuffer2.append( U2B(SEXCEPTIONMESSAGE)  );                                          \
-                    LOG_ERROR( SMETHOD, _sAssertBuffer2.makeStringAndClear() )                                  \
+                    LOG_ERROR( SMETHOD, _sAssertBuffer2.getStr() )                                  \
                 }
 
     /*_____________________________________________________________________________________________________________