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

Stephan Bergmann sbergman at redhat.com
Thu Jan 22 13:07:03 PST 2015


 vcl/osx/DragSource.cxx |    2 +-
 vcl/osx/salmenu.cxx    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6c6c5cd1a2ae57b1944beb6edc2a9d75b0d91bc5
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Jan 22 22:06:15 2015 +0100

    Why is Objective C such an ill-specified mess?
    
    Change-Id: I2a6b4ba10d303a6a4ce5bc4582e68a73c2ae331e

diff --git a/vcl/osx/DragSource.cxx b/vcl/osx/DragSource.cxx
index 5cf1602..7adeff8 100644
--- a/vcl/osx/DragSource.cxx
+++ b/vcl/osx/DragSource.cxx
@@ -192,7 +192,7 @@ void SAL_CALL DragSource::initialize(const Sequence< Any >& aArguments)
       throw Exception("DragSource::initialize: Provided view is not attached to a vcl frame",
                       static_cast<OWeakObject*>(this));
   }
-  mpFrame = static_cast<AquaSalFrame*>([pWin performSelector: @selector(getSalFrame)]);
+  mpFrame = reinterpret_cast<AquaSalFrame*>([pWin performSelector: @selector(getSalFrame)]);
 
   mDragSourceHelper = [[DragSourceHelper alloc] initWithDragSource: this];
 
diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx
index a69d884..b1e652e 100644
--- a/vcl/osx/salmenu.cxx
+++ b/vcl/osx/salmenu.cxx
@@ -246,7 +246,7 @@ AquaSalMenu::AquaSalMenu( bool bMenuBar ) :
     if( ! mbMenuBar )
     {
         mpMenu = [[SalNSMenu alloc] initWithMenu: this];
-        [mpMenu setDelegate: static_cast<id<NSMenuDelegate>>(mpMenu)];
+        [mpMenu setDelegate: reinterpret_cast< id<NSMenuDelegate> >(mpMenu)];
     }
     else
     {


More information about the Libreoffice-commits mailing list