summaryrefslogtreecommitdiff
path: root/xmlsecurity/source
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2005-03-10 17:09:29 +0000
committerVladimir Glazounov <vg@openoffice.org>2005-03-10 17:09:29 +0000
commitfa37e21a84ee1438b1bb6a4f55b1486158f4a98e (patch)
treef9631ddc8b1e91f172006a5c750ef0a5f23da582 /xmlsecurity/source
parentbdce89bcfc07001cc2557ecc482d491e7bebc36c (diff)
INTEGRATION: CWS xmlsec08 (1.2.10); FILE MERGED
2005/01/27 04:46:19 mmi 1.2.10.1: chinese font displayed as squares Issue number: 41071 Submitted by: Reviewed by:
Diffstat (limited to 'xmlsecurity/source')
-rw-r--r--xmlsecurity/source/xmlsec/errorcallback.cxx12
1 files changed, 8 insertions, 4 deletions
diff --git a/xmlsecurity/source/xmlsec/errorcallback.cxx b/xmlsecurity/source/xmlsec/errorcallback.cxx
index fd60b95860ae..656a2eac5d2f 100644
--- a/xmlsecurity/source/xmlsec/errorcallback.cxx
+++ b/xmlsecurity/source/xmlsec/errorcallback.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: errorcallback.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: rt $ $Date: 2004-11-26 14:57:03 $
+ * last change: $Author: vg $ $Date: 2005-03-10 18:09:29 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -185,10 +185,14 @@ void errorCallback(const char *file,
int reason,
const char *msg)
{
- if (g_xErrorRecorder.is() && !g_bErrorRecorded && reason != XMLSEC_ERRORS_R_ASSERTION)
+ if (g_xErrorRecorder.is() && !g_bErrorRecorded)
{
g_xErrorRecorder->setStatus(getOperationStatus(reason));
- g_bErrorRecorded = true;
+
+ if ( reason != XMLSEC_ERRORS_R_ASSERTION && reason!=XMLSEC_ERRORS_R_XMLSEC_FAILED)
+ {
+ g_bErrorRecorded = true;
+ }
}
}