[Libreoffice-commits] core.git: 3 commits - external/firebird vcl/osx

[Tor Lillqvist]

 external/firebird/firebird-macosx.patch.1 |    9 +++++++++
 vcl/osx/DropTarget.cxx                    |    6 +++---
 vcl/osx/PictToBmpFlt.cxx                  |    4 ++--
 3 files changed, 14 insertions(+), 5 deletions(-)

New commits:
commit a799d7c9a66464f33bd8ee42d535e29a976d64ae
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Jun 10 10:49:57 2015 +0300

    Fix Firebird build against OS X SDK 10.11
    
    Change-Id: I60c7540241c41f5063736f2a3d4817371411c8dc

diff --git a/external/firebird/firebird-macosx.patch.1 b/external/firebird/firebird-macosx.patch.1
index 0ad9bd9..42007d5 100644
--- a/external/firebird/firebird-macosx.patch.1
+++ b/external/firebird/firebird-macosx.patch.1
@@ -27,6 +27,15 @@
  
  PLATFORM_POSTBUILD_TARGET=darwin_postbuild_target
  
+@@ -57,7 +57,7 @@
+ 
+ LINK_TRACE = $(LIB_LINK) $(LIB_BUNDLE_OPTIONS)
+ 
+-LINK_CLIENT = $(LIB_LINK) -nodefaultlibs $(LINK_FIREBIRD_CLIENT_SYMBOLS) $(LIB_LINK_OPTIONS) $(LIB_LINK_IMPLIB)\
++LINK_CLIENT = $(LIB_LINK) $(LINK_FIREBIRD_CLIENT_SYMBOLS) $(LIB_LINK_OPTIONS) $(LIB_LINK_IMPLIB)\
+  $(LIB_CLIENT_LINK_OPTIONS) $(LIB_LINK_SONAME)
+ 
+ ifeq (@VOID_PTR_SIZE@,8)
 diff -ur firebird.org/builds/posix/postfix.darwin firebird/builds/posix/postfix.darwin
 --- firebird.org/builds/posix/postfix.darwin	2013-07-12 20:55:46.000000000 +0200
 +++ firebird/builds/posix/postfix.darwin	2013-07-15 12:07:36.000000000 +0200
commit 7bfe288dabae31ea36ce053359ffef215b0e480b
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Jun 9 13:00:46 2015 +0300

    WaE: 'convertScreenToBase:' is deprecated: first deprecated in OS X 10.7
    
    Change-Id: Ic25e9aca7a2a61ac677720427fae7a18a8a179fa

diff --git a/vcl/osx/DropTarget.cxx b/vcl/osx/DropTarget.cxx
index 8e12d97..79b1fc4 100644
--- a/vcl/osx/DropTarget.cxx
+++ b/vcl/osx/DropTarget.cxx
@@ -204,7 +204,7 @@ NSDragOperation DropTarget::draggingEntered(id sender)
         NSPoint mouseLoc = [NSEvent mouseLocation];
 
         id wnd = [mView window];
-        NSPoint dragLocation = [mView convertPoint:[wnd convertScreenToBase:mouseLoc] fromView:nil];
+        NSPoint dragLocation = [mView convertPoint:[wnd convertRectFromScreen:NSMakeRect(mouseLoc.x, mouseLoc.y, 1, 1)].origin fromView:nil];
 
         CocoaToVCL(dragLocation, bounds);
 
@@ -245,7 +245,7 @@ NSDragOperation DropTarget::draggingUpdated(id sender)
         NSPoint mouseLoc = [NSEvent mouseLocation];
 
         id wnd = [mView window];
-        NSPoint dragLocation = [mView convertPoint:[wnd convertScreenToBase:mouseLoc] fromView:nil];
+        NSPoint dragLocation = [mView convertPoint:[wnd convertRectFromScreen:NSMakeRect(mouseLoc.x, mouseLoc.y, 1, 1)].origin fromView:nil];
 
         CocoaToVCL(dragLocation, bounds);
 
@@ -311,7 +311,7 @@ BOOL DropTarget::performDragOperation()
         NSPoint mouseLoc = [NSEvent mouseLocation];
 
         id wnd = [mView window];
-        NSPoint dragLocation = [mView convertPoint:[wnd convertScreenToBase:mouseLoc] fromView:nil];
+        NSPoint dragLocation = [mView convertPoint:[wnd convertRectFromScreen:NSMakeRect(mouseLoc.x, mouseLoc.y, 1, 1)].origin fromView:nil];
 
         CocoaToVCL(dragLocation, bounds);
 
commit 6c2f65dfe08dd7acefec3be00b4f38dd5bca50a8
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Jun 9 12:47:34 2015 +0300

    WaE: null passed to a callee that requires a non-null argument
    
    Let's hope passing an empty NSDictionary works fine.
    
    Change-Id: I90a9b09d421ae8cd202b602db97b2c08b149fd07

diff --git a/vcl/osx/PictToBmpFlt.cxx b/vcl/osx/PictToBmpFlt.cxx
index 5300c99..dea5b47 100644
--- a/vcl/osx/PictToBmpFlt.cxx
+++ b/vcl/osx/PictToBmpFlt.cxx
@@ -40,7 +40,7 @@ bool ImageToPNG( com::sun::star::uno::Sequence<sal_Int8>& rImgData,
         if( !pRep)
         return false;
 
-    NSData* pOut = [pRep representationUsingType: NSPNGFileType properties: nil];
+        NSData* pOut = [pRep representationUsingType: NSPNGFileType properties: @{ }];
     if( !pOut)
         return false;
 
@@ -63,7 +63,7 @@ bool PNGToImage( com::sun::star::uno::Sequence<sal_Int8>& rPngData,
     if( !pRep)
         return false;
 
-    NSData* pOut = [pRep representationUsingType: eOutFormat properties: nil];
+    NSData* pOut = [pRep representationUsingType: eOutFormat properties: @{ }];
     if( !pOut)
         return false;