summaryrefslogtreecommitdiff
path: root/basic
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2006-04-07 13:00:59 +0000
committerVladimir Glazounov <vg@openoffice.org>2006-04-07 13:00:59 +0000
commit028c35a613758432f08cbaf9bb1c45b9157d7341 (patch)
treeaf6fce4255901ab42677b09116b3a2803eb09460 /basic
parentc90fc5d25ef1696a8be57f022eb57ef4dcb2a3a9 (diff)
INTEGRATION: CWS ab19 (1.23.40); FILE MERGED
2006/03/21 12:55:13 ab 1.23.40.3: #i17806# StarBASIC::MakeErrorText(): Clear error text in case of no valid error code 2006/03/03 10:35:48 ab 1.23.40.2: RESYNC: (1.23-1.26); FILE MERGED 2005/08/18 12:08:25 ab 1.23.40.1: #i17806# Fixed error text creation for Error Id 0
Diffstat (limited to 'basic')
-rw-r--r--basic/source/classes/sb.cxx8
1 files changed, 5 insertions, 3 deletions
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index b869e2d14991..83b8b331a6ab 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: sb.cxx,v $
*
- * $Revision: 1.26 $
+ * $Revision: 1.27 $
*
- * last change: $Author: hr $ $Date: 2005-09-29 16:10:50 $
+ * last change: $Author: vg $ $Date: 2006-04-07 14:00:59 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -1243,13 +1243,15 @@ void StarBASIC::MakeErrorText( SbError nId, const String& aMsg )
}
GetSbData()->aErrMsg = aMsg1;
}
- else
+ else if( nOldID != 0 )
{
String aStdMsg( RTL_CONSTASCII_USTRINGPARAM("Fehler ") );
aStdMsg += String::CreateFromInt32( nOldID);
aStdMsg += String( RTL_CONSTASCII_USTRINGPARAM(": Kein Fehlertext verfuegbar!") );
GetSbData()->aErrMsg = aStdMsg;
}
+ else
+ GetSbData()->aErrMsg = String::EmptyString();
}
BOOL StarBASIC::CError