summaryrefslogtreecommitdiff
path: root/vcl/unx
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2008-02-27 09:32:55 +0000
committerOliver Bolte <obo@openoffice.org>2008-02-27 09:32:55 +0000
commita51db1b15ab1d304c1f22e28cf7beac7a01cba15 (patch)
tree384876c2e6f40c90bfec9f516fa23f605277c093 /vcl/unx
parentfdfb84e126987bafb3cf120d741c80500ed91352 (diff)
INTEGRATION: CWS vclshowstop15_DEV300 (1.54.154); FILE MERGED
2008/02/25 16:25:31 pl 1.54.154.1: #i86327# fix an Xerror in drawAlphaRect, handle xerror in ImplCreate more specific
Diffstat (limited to 'vcl/unx')
-rw-r--r--vcl/unx/source/app/saldata.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/vcl/unx/source/app/saldata.cxx b/vcl/unx/source/app/saldata.cxx
index bf0700c997db..bd91b773f9da 100644
--- a/vcl/unx/source/app/saldata.cxx
+++ b/vcl/unx/source/app/saldata.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: saldata.cxx,v $
*
- * $Revision: 1.54 $
+ * $Revision: 1.55 $
*
- * last change: $Author: kz $ $Date: 2007-10-09 15:04:16 $
+ * last change: $Author: obo $ $Date: 2008-02-27 10:32:55 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -416,6 +416,7 @@ void SalXLib::PushXErrorLevel( bool bIgnore )
XErrorStackEntry& rEnt = m_aXErrorHandlerStack.back();
rEnt.m_bWas = false;
rEnt.m_bIgnore = bIgnore;
+ rEnt.m_nLastErrorRequest = 0;
rEnt.m_aHandler = XSetErrorHandler( (XErrorHandler)X11SalData::XErrorHdl );
}