mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sb118: fixed aqua_clipboard mutex lock scope

Browse Source
This commit is contained in:
sb
2010-01-13 16:04:40 +01:00
parent 24532f0855
commit ec0f00417a
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
vcl/aqua/source/dtrans/aqua_clipboard.cxx
View File

@@ -192,6 +192,10 @@ void SAL_CALL AquaClipboard::setContents(const Reference<XTransferable>& xTransf
const Reference<XClipboardOwner>& xClipboardOwner) const Reference<XClipboardOwner>& xClipboardOwner)
throw( RuntimeException ) throw( RuntimeException )
{ {
NSArray* types = xTransferable.is() ?
mpDataFlavorMapper->flavorSequenceToTypesArray(xTransferable->getTransferDataFlavors()) :
[NSArray array];
ClearableMutexGuard aGuard(m_aMutex); ClearableMutexGuard aGuard(m_aMutex);
Reference<XClipboardOwner> oldOwner(mXClipboardOwner); Reference<XClipboardOwner> oldOwner(mXClipboardOwner);
@@ -200,11 +204,10 @@ void SAL_CALL AquaClipboard::setContents(const Reference<XTransferable>& xTransf
Reference<XTransferable> oldContent(mXClipboardContent); Reference<XTransferable> oldContent(mXClipboardContent);
mXClipboardContent = xTransferable; mXClipboardContent = xTransferable;
NSArray* types = mXClipboardContent.is() ?
mpDataFlavorMapper->flavorSequenceToTypesArray(mXClipboardContent->getTransferDataFlavors()) :
[NSArray array];
mPasteboardChangeCount = [mPasteboard declareTypes: types owner: mEventListener]; mPasteboardChangeCount = [mPasteboard declareTypes: types owner: mEventListener];
aGuard.clear();
// if we are already the owner of the clipboard // if we are already the owner of the clipboard
// then fire lost ownership event // then fire lost ownership event
if (oldOwner.is()) if (oldOwner.is())
@@ -256,7 +259,7 @@ void SAL_CALL AquaClipboard::removeClipboardListener(const Reference< XClipboard
void AquaClipboard::applicationDidBecomeActive(NSNotification* aNotification) void AquaClipboard::applicationDidBecomeActive(NSNotification* aNotification)
{ {
MutexGuard aGuard(m_aMutex); ClearableMutexGuard aGuard(m_aMutex);
int currentPboardChgCount = [mPasteboard changeCount]; int currentPboardChgCount = [mPasteboard changeCount];
@@ -273,6 +276,8 @@ void AquaClipboard::applicationDidBecomeActive(NSNotification* aNotification)
Reference<XTransferable> oldContent(mXClipboardContent); Reference<XTransferable> oldContent(mXClipboardContent);
mXClipboardContent = Reference<XTransferable>(); mXClipboardContent = Reference<XTransferable>();
aGuard.clear();
if (oldOwner.is()) if (oldOwner.is())
{ {
fireLostClipboardOwnershipEvent(oldOwner, oldContent); fireLostClipboardOwnershipEvent(oldOwner, oldContent);