diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-05-24 08:53:08 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-05-24 08:53:08 +0000 |
| commit | 0372ee5240e3b8c80e3f82ff91a013dca0d76a63 (patch) | |
| tree | 7c2ce093b4d84d74c7a998d5939fc811ab837ba8 | |
| parent | 77a52824b50d6e937837a3fb169e305c852208a7 (diff) | |
#i10000# resolved merge problem
| -rw-r--r-- | vcl/unx/source/window/salframe.cxx | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/vcl/unx/source/window/salframe.cxx b/vcl/unx/source/window/salframe.cxx index 239b528352d2..a5846dbc4bfb 100644 --- a/vcl/unx/source/window/salframe.cxx +++ b/vcl/unx/source/window/salframe.cxx @@ -2,9 +2,9 @@ * * $RCSfile: salframe.cxx,v $ * - * $Revision: 1.176 $ + * $Revision: 1.177 $ * - * last change: $Author: kz $ $Date: 2004-05-19 10:24:50 $ + * last change: $Author: rt $ $Date: 2004-05-24 09:53:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -3419,7 +3419,7 @@ long X11SalFrame::HandleClientMessage( XClientMessageEvent *pEvent ) void X11SalFrame::SaveYourselfDone( SalFrame* pSaveFrame ) { // session save was done, inform dtwm - if( s_pSaveYourselfFrame ) + if( s_pSaveYourselfFrame && pSaveFrame ) { ByteString aExec( SessionManagerClient::getExecName(), osl_getThreadTextEncoding() ); const char* argv[2]; @@ -3434,10 +3434,17 @@ void X11SalFrame::SaveYourselfDone( SalFrame* pSaveFrame ) if( pSaveFrame != s_pSaveYourselfFrame ) { // check if it still exists - X11SalFrame* pFrame = GetSalData()->pFirstFrame_; - while( pFrame && pFrame != pSaveFrame ) - pFrame = pFrame->mpNextFrame; - if( pFrame ) + X11SalFrame* pFrame = NULL; + const std::list< SalFrame* >& rFrames = static_cast<X11SalFrame*>(pSaveFrame)->GetDisplay()->getFrames(); + std::list< SalFrame* >::const_iterator it = rFrames.begin(); + while( it != rFrames.end() ) + { + pFrame = static_cast< X11SalFrame* >(*it); + if( pFrame == pSaveFrame ) + break; + ++it; + } + if( pFrame == pSaveFrame ) { const WMAdaptor& rWMAdaptor( *pFrame->pDisplay_->getWMAdaptor() ); XChangeProperty( pFrame->GetXDisplay(), |