diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-08-17 09:03:59 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-08-17 09:03:59 +0000 |
| commit | cdb75d3365860c9377011e2072b77b1c7880f056 (patch) | |
| tree | 56bc1e0fe2f9d47351bc6a48f1567fc4f7599be9 /vcl/unx/source | |
| parent | b5c961c3693eb24d30bb30bd6cf07d301111d12b (diff) | |
#i100000# pInstance_ renamed to m_pInstance
Diffstat (limited to 'vcl/unx/source')
| -rw-r--r-- | vcl/unx/source/app/saldisp.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vcl/unx/source/app/saldisp.cxx b/vcl/unx/source/app/saldisp.cxx index caa960970d92..0ba82e971c4d 100644 --- a/vcl/unx/source/app/saldisp.cxx +++ b/vcl/unx/source/app/saldisp.cxx @@ -4,9 +4,9 @@ * * $RCSfile: saldisp.cxx,v $ * - * $Revision: 1.79 $ + * $Revision: 1.80 $ * - * last change: $Author: hr $ $Date: 2006-08-11 17:49:41 $ + * last change: $Author: vg $ $Date: 2006-08-17 10:03:59 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -562,7 +562,7 @@ extern "C" { SnErrorTrapPush( SnDisplay *display, Display *xdisplay ) { - SalXLib *pXLib = GetSalData()->GetLib(); + SalXLib *pXLib = GetX11SalData()->GetLib(); if (pXLib) pXLib->PushErrorTrap(); } @@ -571,7 +571,7 @@ extern "C" { SnErrorTrapPop( SnDisplay *display, Display *xdisplay ) { - SalXLib *pXLib = GetSalData()->GetLib(); + SalXLib *pXLib = GetX11SalData()->GetLib(); XSync( xdisplay, False ); // flush error queue @@ -2412,7 +2412,7 @@ void SalX11Display::Yield() return; XEvent aEvent; - DBG_ASSERT( static_cast<SalYieldMutex*>(GetSalData()->pInstance_->GetYieldMutex())->GetThreadId() == + DBG_ASSERT( static_cast<SalYieldMutex*>(GetSalData()->m_pInstance->GetYieldMutex())->GetThreadId() == NAMESPACE_VOS(OThread)::getCurrentIdentifier(), "will crash soon since solar mutex not locked in SalDisplay::Yield" ); |