summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2006-10-12 13:22:51 +0000
committerOliver Bolte <obo@openoffice.org>2006-10-12 13:22:51 +0000
commit4b82c908b454af3ed9fb6fff9b8d07e5c1b9ecb5 (patch)
tree9993744a03cc2c41a5ea0fdcff408efd8bd2d515
parentaf0151a6a292c138f497f76e614bc02703619414 (diff)
INTEGRATION: CWS sb59 (1.23.24); FILE MERGED
2006/08/11 15:04:24 sb 1.23.24.1: #i67487# Made code warning-free (wntmsci10).
-rw-r--r--basic/source/app/msgedit.cxx32
1 files changed, 26 insertions, 6 deletions
diff --git a/basic/source/app/msgedit.cxx b/basic/source/app/msgedit.cxx
index bdf79083e0..a04cbde17d 100644
--- a/basic/source/app/msgedit.cxx
+++ b/basic/source/app/msgedit.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: msgedit.cxx,v $
*
- * $Revision: 1.24 $
+ * $Revision: 1.25 $
*
- * last change: $Author: obo $ $Date: 2006-09-17 09:56:59 $
+ * last change: $Author: obo $ $Date: 2006-10-12 14:22:51 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -327,8 +327,13 @@ void MsgEdit::AddWarning( String aMsg, TTDebugData aDebugData )
aEditTree.ShowEntry( pThisEntry );
}
- while ( !aEditTree.IsEntryVisible( pThisEntry ) && ( pThisEntry = aEditTree.GetParent( pThisEntry ) ) )
+ while ( !aEditTree.IsEntryVisible( pThisEntry ) )
+ {
+ pThisEntry = aEditTree.GetParent( pThisEntry );
+ if ( pThisEntry == NULL )
+ break;
aEditTree.InvalidateEntry( pThisEntry );
+ }
}
void MsgEdit::AddAssertion( String aMsg, TTDebugData aDebugData )
@@ -357,8 +362,13 @@ void MsgEdit::AddAssertion( String aMsg, TTDebugData aDebugData )
pCurrentAssertion = pThisEntry;
- while ( !aEditTree.IsEntryVisible( pThisEntry ) && ( pThisEntry = aEditTree.GetParent( pThisEntry ) ) )
+ while ( !aEditTree.IsEntryVisible( pThisEntry ) )
+ {
+ pThisEntry = aEditTree.GetParent( pThisEntry );
+ if ( pThisEntry == NULL )
+ break;
aEditTree.InvalidateEntry( pThisEntry );
+ }
}
void MsgEdit::AddAssertionStack( String aMsg, TTDebugData aDebugData )
@@ -381,8 +391,13 @@ void MsgEdit::AddAssertionStack( String aMsg, TTDebugData aDebugData )
aEditTree.ShowEntry( pThisEntry );
}
- while ( !aEditTree.IsEntryVisible( pThisEntry ) && ( pThisEntry = aEditTree.GetParent( pThisEntry ) ) )
+ while ( !aEditTree.IsEntryVisible( pThisEntry ) )
+ {
+ pThisEntry = aEditTree.GetParent( pThisEntry );
+ if ( pThisEntry == NULL )
+ break;
aEditTree.InvalidateEntry( pThisEntry );
+ }
}
void MsgEdit::AddQAError( String aMsg, TTDebugData aDebugData )
@@ -403,8 +418,13 @@ void MsgEdit::AddQAError( String aMsg, TTDebugData aDebugData )
aEditTree.ShowEntry( pThisEntry );
}
- while ( !aEditTree.IsEntryVisible( pThisEntry ) && ( pThisEntry = aEditTree.GetParent( pThisEntry ) ) )
+ while ( !aEditTree.IsEntryVisible( pThisEntry ) )
+ {
+ pThisEntry = aEditTree.GetParent( pThisEntry );
+ if ( pThisEntry == NULL )
+ break;
aEditTree.InvalidateEntry( pThisEntry );
+ }
}
/*