[Libreoffice-commits] .: Branch 'libreoffice-3-3' - 6 commits - vcl/aqua vcl/source

[Jan Holesovsky]

 vcl/aqua/source/app/vclnsapp.mm           |    3 +++
 vcl/aqua/source/dtrans/aqua_clipboard.cxx |   30 +++++++++++++++++-------------
 vcl/source/gdi/outdev.cxx                 |    6 +++---
 3 files changed, 23 insertions(+), 16 deletions(-)

New commits:
commit 1b2ea84af9d575c6246df1512b1393970d4d6b69
Merge: 6fbfcb7... 36ef734...
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Tue Nov 16 09:00:43 2010 +0100

    Merge commit 'ooo/OOO330_m15' into libreoffice-3-3

commit 36ef734fd1f84bf94d7c4d27f22274940efd5373
Merge: 6b215da... 981263e...
Author: obo <obo at openoffice.org>
Date:   Fri Nov 12 08:08:56 2010 +0100

    CWS-TOOLING: integrate CWS sw33bf12

commit 6b215da7a888c0d156b83d134c86fe20428c3e5a
Merge: c09c529... 15d8d30...
Author: obo <obo at openoffice.org>
Date:   Fri Nov 12 07:50:26 2010 +0100

    CWS-TOOLING: integrate CWS calc63

commit 15d8d30beb72c25ecbd8095ab0c4a4a540021709
Author: Philipp Lohmann [pl] <Philipp.Lohmann at Oracle.COM>
Date:   Thu Nov 11 13:57:44 2010 +0100

    calc63: #i115504# cleanup image tree to prevent static destructor troubles

diff --git a/vcl/aqua/source/app/vclnsapp.mm b/vcl/aqua/source/app/vclnsapp.mm
index f33599f..4264f88 100755
--- a/vcl/aqua/source/app/vclnsapp.mm
+++ b/vcl/aqua/source/app/vclnsapp.mm
@@ -39,6 +39,8 @@
 #include "vcl/cmdevt.hxx"
 #include "rtl/ustrbuf.hxx"
 
+#include "vcl/impimagetree.hxx"
+
 #include "premac.h"
 #import "Carbon/Carbon.h"
 #import "apple_remote/RemoteControl.h"
@@ -416,6 +418,7 @@
     #else // the clean version follows
     return pSalData->maFrames.front()->CallCallback( SALEVENT_SHUTDOWN, NULL ) ? NSTerminateCancel : NSTerminateNow;
     #endif
+    ImplImageTreeSingletonRef()->shutDown();
     return NSTerminateNow;
 }
 
commit 981263e8fa2daa6c906bb60c4d72121152a852fd
Author: Oliver-Rainer Wittmann <od at openoffice.org>
Date:   Wed Nov 10 14:04:55 2010 +0100

    sw33bf12: #i115437# method <OutputDevice::DrawLine(..)> - correct initialisation of LineColor Pen for fat or dashed lines - patch provided by AW

diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx
index 7038b29..b9cc003 100644
--- a/vcl/source/gdi/outdev.cxx
+++ b/vcl/source/gdi/outdev.cxx
@@ -2495,6 +2495,9 @@ void OutputDevice::DrawLine( const Point& rStartPt, const Point& rEndPt,
     const bool bDashUsed(LINE_DASH == aInfo.GetStyle());
     const bool bLineWidthUsed(aInfo.GetWidth() > 1);
 
+    if ( mbInitLineColor )
+        ImplInitLineColor();
+
     if(bDashUsed || bLineWidthUsed)
     {
         basegfx::B2DPolygon aLinePolygon;
@@ -2505,9 +2508,6 @@ void OutputDevice::DrawLine( const Point& rStartPt, const Point& rEndPt,
     }
     else
     {
-        if ( mbInitLineColor )
-            ImplInitLineColor();
-
         mpGraphics->DrawLine( aStartPt.X(), aStartPt.Y(), aEndPt.X(), aEndPt.Y(), this );
     }
 
commit 4e9689b67987a6257167173946d10ec4d8989f79
Author: Philipp Lohmann [pl] <Philipp.Lohmann at Oracle.COM>
Date:   Mon Aug 30 17:59:59 2010 +0200

    vcl115: #163153# we need to release the clipboard after flush and ignore further requests for data.

diff --git a/vcl/aqua/source/dtrans/aqua_clipboard.cxx b/vcl/aqua/source/dtrans/aqua_clipboard.cxx
index 9b21923..c3d209c 100644
--- a/vcl/aqua/source/dtrans/aqua_clipboard.cxx
+++ b/vcl/aqua/source/dtrans/aqua_clipboard.cxx
@@ -322,14 +322,17 @@ void AquaClipboard::fireLostClipboardOwnershipEvent(Reference<XClipboardOwner> o
 
 void AquaClipboard::provideDataForType(NSPasteboard* sender, NSString* type)
 {
-  DataProviderPtr_t dp = mpDataFlavorMapper->getDataProvider(type, mXClipboardContent);
-  NSData* pBoardData = NULL;
-  
-  if (dp.get() != NULL)
-  {
-      pBoardData = (NSData*)dp->getSystemData();      
-      [sender setData: pBoardData forType: type];
-  }
+    if( mXClipboardContent.is() )
+    {
+        DataProviderPtr_t dp = mpDataFlavorMapper->getDataProvider(type, mXClipboardContent);
+        NSData* pBoardData = NULL;
+        
+        if (dp.get() != NULL)
+        {
+            pBoardData = (NSData*)dp->getSystemData();      
+            [sender setData: pBoardData forType: type];
+        }
+    }
 }
 
 
@@ -340,20 +343,21 @@ void AquaClipboard::provideDataForType(NSPasteboard* sender, NSString* type)
 void SAL_CALL AquaClipboard::flushClipboard() 
   throw(RuntimeException)
 {
-  if (mXClipboardContent.is())
+    if (mXClipboardContent.is())
     {
           Sequence<DataFlavor> flavorList = mXClipboardContent->getTransferDataFlavors();	
         sal_uInt32 nFlavors = flavorList.getLength();
         
         for (sal_uInt32 i = 0; i < nFlavors; i++)
-          {
+        {
             NSString* sysType = mpDataFlavorMapper->openOfficeToSystemFlavor(flavorList[i]);
             
             if (sysType != NULL)
-              {
+            {
                 provideDataForType(mPasteboard, sysType);
-              }
-          }
+            }
+        }
+        mXClipboardContent.clear();
     }
 }