CWS-TOOLING: integrate CWS vcl96

2008-11-27 15:56:56 +0100 pl  r264499 : #i95488# fix a snafu
2008-11-17 12:05:23 +0100 pl  r263713 : #158795# catch bad_alloc
2008-11-14 17:26:25 +0100 pl  r263687 : #i93018# new msgbox images
2008-11-14 17:00:28 +0100 pl  r263686 : #i95488# treat chinese font heights like korean
2008-11-14 14:59:17 +0100 pl  r263677 : #i92102# RTL fixes: toolbox selection, popup menus
2008-11-14 11:40:22 +0100 pl  r263669 : #i75035# move tear off panels correctly also in RTL case (thanks ayaniger)
2008-11-13 18:15:51 +0100 pl  r263658 : #i93018# message box images, add hc version
2008-11-13 15:49:41 +0100 pl  r263647 : #b6726794# add: UNC paths (windows specific)
2008-11-13 12:51:37 +0100 pl  r263632 : #i95803# do not dereference empty interface
2008-11-12 18:13:55 +0100 pl  r263609 : #b6727144# fix and speed up xor mode for special case invert on MacOSX
2008-11-12 15:07:47 +0100 pl  r263599 : #i95392# add csv to calc mimetypes (thanks cmc)
2008-11-12 14:52:13 +0100 pl  r263598 : #i87633# paste strings larger than 64k in the hope that each contained line is shorter
2008-11-12 13:37:29 +0100 pl  r263594 : #i96141# fix if statement (thanks cmc)
2008-11-12 13:06:22 +0100 pl  r263588 : #i93831# remove windows from static set again
2008-11-11 18:15:06 +0100 pl  r263571 : #i96089# fix some wrong parentheses (thanks cmc)
2008-11-04 20:50:40 +0100 pl  r263336 : #i95388# do not confuse imageable area and margin
2008-11-03 18:39:25 +0100 pl  r263304 : CWS-TOOLING: rebase CWS vcl96 to trunk@263288 (milestone: DEV300:m35)
2008-11-03 16:18:48 +0100 pl  r263290 : #i92701# truncation warning only on paste
2008-11-03 15:53:42 +0100 pl  r263289 : #i95296# use gtk plugin in more cases
2008-10-31 11:15:34 +0100 pl  r262858 : #i94258# fix some PDF/A compatibility issues (thanks beppec56)
2008-10-30 14:24:24 +0100 pl  r262825 : #i62033# do not read imcomplete resources (again)
2008-10-29 17:21:29 +0100 pl  r262821 : #i95536# do not use deprecated gtk_draw_expander function
2008-10-21 18:00:29 +0200 pl  r262574 : #i95220# use large icons for nicer display on KDE as well as Gnome taskbar
2008-10-17 16:01:43 +0200 pl  r262290 : #i92822# build warning free on MacOSX 10.5

2 files changed, 24 insertions, 18 deletions

diff --git a/dtrans/source/X11/X11_selection.cxx b/dtrans/source/X11/X11_selection.cxx
index 582dd10d041e..2a424984850a 100644
--- a/dtrans/source/X11/X11_selection.cxx
+++ b/dtrans/source/X11/X11_selection.cxx
@@ -2073,10 +2073,14 @@ bool SelectionManager::handleSelectionNotify( XSelectionEvent& rNotify )
 #endif
     ::std::hash_map< Atom, Selection* >::iterator it =
           m_aSelections.find( rNotify.selection );
-    if( ( rNotify.requestor == m_aWindow || rNotify.requestor == m_aCurrentDropWindow )     &&
-        it != m_aSelections.end()           &&
-        ( it->second->m_eState == Selection::WaitingForResponse ) ||
-        ( it->second->m_eState == Selection::WaitingForData ) )
+    if (
+        (rNotify.requestor == m_aWindow || rNotify.requestor == m_aCurrentDropWindow) &&
+        it != m_aSelections.end() &&
+        (
+         (it->second->m_eState == Selection::WaitingForResponse) ||
+         (it->second->m_eState == Selection::WaitingForData)
+        )
+       )
     {
         bHandled = true;
         if( it->second->m_aRequestedType == m_nMULTIPLEAtom )
diff --git a/dtrans/source/aqua/aqua_clipboard.cxx b/dtrans/source/aqua/aqua_clipboard.cxx
index 166afa686478..d0b821099ea0 100644
--- a/dtrans/source/aqua/aqua_clipboard.cxx
+++ b/dtrans/source/aqua/aqua_clipboard.cxx
@@ -191,28 +191,30 @@ Reference<XTransferable> SAL_CALL AquaClipboard::getContents() throw(RuntimeExce
 
 
 void SAL_CALL AquaClipboard::setContents(const Reference<XTransferable>& xTransferable,
-                                         const Reference<XClipboardOwner>& xClipboardOwner)
-  throw( RuntimeException )
+    const Reference<XClipboardOwner>& xClipboardOwner)
+        throw( RuntimeException )
 {
-  ClearableMutexGuard aGuard(m_aMutex);
+    ClearableMutexGuard aGuard(m_aMutex);
 
-  Reference<XClipboardOwner> oldOwner(mXClipboardOwner);
-  mXClipboardOwner = xClipboardOwner;
+    Reference<XClipboardOwner> oldOwner(mXClipboardOwner);
+    mXClipboardOwner = xClipboardOwner;
 
-  Reference<XTransferable> oldContent(mXClipboardContent);
-  mXClipboardContent = xTransferable;
+    Reference<XTransferable> oldContent(mXClipboardContent);
+    mXClipboardContent = xTransferable;
 
-  NSArray* types = mpDataFlavorMapper->flavorSequenceToTypesArray(mXClipboardContent->getTransferDataFlavors());
-  mPasteboardChangeCount = [mPasteboard declareTypes: types owner: mEventListener];
+    NSArray* types = mXClipboardContent.is() ?
+        mpDataFlavorMapper->flavorSequenceToTypesArray(mXClipboardContent->getTransferDataFlavors()) :
+        [NSArray array];
+    mPasteboardChangeCount = [mPasteboard declareTypes: types owner: mEventListener];
 
-  // if we are already the owner of the clipboard
-  // then fire lost ownership event
-  if (oldOwner.is())
+    // if we are already the owner of the clipboard
+    // then fire lost ownership event
+    if (oldOwner.is())
     {
-      fireLostClipboardOwnershipEvent(oldOwner, oldContent);
+        fireLostClipboardOwnershipEvent(oldOwner, oldContent);
     }
 
-  fireClipboardChangedEvent();
+    fireClipboardChangedEvent();
 }