diff options
| author | Philipp Lohmann <pl@openoffice.org> | 2001-09-03 16:48:11 +0000 |
|---|---|---|
| committer | Philipp Lohmann <pl@openoffice.org> | 2001-09-03 16:48:11 +0000 |
| commit | 036cead1173ad7546fad7716a7a9cd115dbb481c (patch) | |
| tree | 9720bc562645ca9c9964d1cf3ae8f3c4d03e779e /dtrans/source/X11 | |
| parent | 1e2d38c2b2c8f1f8bf6758dc48ee2c164ab5ecf7 (diff) | |
#91856# free own mutex when calling on transferable
Diffstat (limited to 'dtrans/source/X11')
| -rw-r--r-- | dtrans/source/X11/X11_selection.cxx | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/dtrans/source/X11/X11_selection.cxx b/dtrans/source/X11/X11_selection.cxx index ec74c8c2f2df..45e11995b5c3 100644 --- a/dtrans/source/X11/X11_selection.cxx +++ b/dtrans/source/X11/X11_selection.cxx @@ -2,9 +2,9 @@ * * $RCSfile: X11_selection.cxx,v $ * - * $Revision: 1.38 $ + * $Revision: 1.39 $ * - * last change: $Author: pl $ $Date: 2001-07-31 10:51:37 $ + * last change: $Author: pl $ $Date: 2001-09-03 17:48:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -988,7 +988,7 @@ bool SelectionManager::getPasteDataTypes( Atom selection, Sequence< DataFlavor > void SelectionManager::handleSelectionRequest( XSelectionRequestEvent& rRequest ) { - ClearableMutexGuard aGuard( m_aMutex ); + ResettableMutexGuard aGuard( m_aMutex ); #ifdef DEBUG fprintf( stderr, "handleSelectionRequest for selection %s and target %s\n", OUStringToOString( getString( rRequest.selection ), RTL_TEXTENCODING_ISO_8859_1 ).getStr(), @@ -1012,13 +1012,15 @@ void SelectionManager::handleSelectionRequest( XSelectionRequestEvent& rRequest if( pAdaptor && XGetSelectionOwner( m_pDisplay, rRequest.selection ) == m_aWindow ) { + Reference< XTransferable > xTrans( pAdaptor->getTransferable() ); if( rRequest.target == m_nTARGETSAtom ) { // someone requests our types - Reference< XTransferable > xTrans( pAdaptor->getTransferable() ); if( xTrans.is() ) { + aGuard.clear(); Sequence< DataFlavor > aFlavors = xTrans->getTransferDataFlavors(); + aGuard.reset(); Atom* pTypes = new Atom[ aFlavors.getLength() ]; int nFormat; for( int i = 0; i < aFlavors.getLength(); i++ ) @@ -1040,7 +1042,10 @@ void SelectionManager::handleSelectionRequest( XSelectionRequestEvent& rRequest Sequence< sal_Int8 > aData; OUString aType( convertTypeFromNative( rRequest.target, rRequest.selection ) ); - if( convertData( pAdaptor->getTransferable(), aType, aData ) ) + aGuard.clear(); + bool bConverted = convertData( pAdaptor->getTransferable(), aType, aData ); + aGuard.reset(); + if( bConverted ) { // conversion succeeded int nFormat; |