diff options
| author | Philipp Lohmann [pl] <Philipp.Lohmann@Sun.COM> | 2010-04-26 11:14:03 +0200 |
|---|---|---|
| committer | Philipp Lohmann [pl] <Philipp.Lohmann@Sun.COM> | 2010-04-26 11:14:03 +0200 |
| commit | 96176d231f3737ef4eb96f2e08a5cfd958a12dcb (patch) | |
| tree | fafaf4d0b38b6c09b4cbbcd118b5937cdde27538 /vcl/unx/source/app/saldata.cxx | |
| parent | fbce9358c049499cf0fc142e259493034fc6355c (diff) | |
vcl111: #i111106# simplify XIOErrorHandler (thanks cmc)
Diffstat (limited to 'vcl/unx/source/app/saldata.cxx')
| -rw-r--r-- | vcl/unx/source/app/saldata.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/unx/source/app/saldata.cxx b/vcl/unx/source/app/saldata.cxx index 4155887a9875..c337dc14a6f8 100644 --- a/vcl/unx/source/app/saldata.cxx +++ b/vcl/unx/source/app/saldata.cxx @@ -352,8 +352,9 @@ SalXLib::SalXLib() nFDs_ = m_pTimeoutFDS[0] + 1; } - PushXErrorLevel( !!getenv( "SAL_IGNOREXERRORS" ) ); m_bHaveSystemChildFrames = false; + m_aOrigXIOErrorHandler = XSetIOErrorHandler ( (XIOErrorHandler)X11SalData::XIOErrorHdl ); + PushXErrorLevel( !!getenv( "SAL_IGNOREXERRORS" ) ); } SalXLib::~SalXLib() @@ -363,6 +364,7 @@ SalXLib::~SalXLib() close (m_pTimeoutFDS[1]); PopXErrorLevel(); + XSetIOErrorHandler (m_aOrigXIOErrorHandler); } void SalXLib::PushXErrorLevel( bool bIgnore ) @@ -458,8 +460,6 @@ void SalXLib::Init() exit(0); } - XSetIOErrorHandler ( (XIOErrorHandler)X11SalData::XIOErrorHdl ); - SalDisplay *pSalDisplay = new SalX11Display( pDisp ); pInputMethod->CreateMethod( pDisp ); |