[Libreoffice-commits] core.git: Branch 'ports/macosx10.5/master' - vcl/osx

[Douglas Mencken]

 vcl/osx/a11ywrapper.mm       |    4 ++--
 vcl/osx/salframeview.mm      |    4 ++--
 vcl/osx/salnativewidgets.cxx |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 97b35665ef1b0f2615cffe85cd76e2d280f0086e
Author: Douglas Mencken <dougmencken at gmail.com>
Date:   Sun Oct 26 06:38:10 2014 -0400

    vcl: fix some "cannot convert 'objc_object*' to..." issues
    
    Change-Id: I4b0e32c412937da4b2ea4bf350be32ea31362b3c

diff --git a/vcl/osx/a11ywrapper.mm b/vcl/osx/a11ywrapper.mm
index 4e19e1d..f821da7 100644
--- a/vcl/osx/a11ywrapper.mm
+++ b/vcl/osx/a11ywrapper.mm
@@ -160,7 +160,7 @@ static std::ostream &operator<<(std::ostream &s, NSPoint point) {
 // (getter with parameter)    attributeNameHereAttributeForParameter:
 // (setter)                   setAttributeNameHereAttributeForElement:to:
 -(SEL)selectorForAttribute:(NSString *)attribute asGetter:(BOOL)asGetter withGetterParameter:(BOOL)withGetterParameter {
-    SEL selector = nil;
+    SEL selector = (SEL)nil;
     NSAutoreleasePool * pool = [ [ NSAutoreleasePool alloc ] init ];
     @try {
         // step 1: create method name from attribute name
@@ -186,7 +186,7 @@ static std::ostream &operator<<(std::ostream &s, NSPoint point) {
         // step 2: create selector
         selector = NSSelectorFromString ( methodName );
     } @catch ( id exception ) {
-        selector = nil;
+        selector = (SEL)nil;
     }
     [ pool release ];
     return selector;
diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index 19dda57..4e90836 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -482,7 +482,7 @@ static AquaSalFrame* getMouseContainerFrame()
         mpFrame = pFrame;
         mMarkedRange = NSMakeRange(NSNotFound, 0);
         mSelectedRange = NSMakeRange(NSNotFound, 0);
-        mpReferenceWrapper = nil;
+        mpReferenceWrapper = (ReferenceWrapper*)nil;
         mpMouseEventListener = nil;
         mpLastSuperEvent = nil;
     }
@@ -1788,7 +1788,7 @@ private:
         // some frames never become visible ..
         ::vcl::Window *pWindow = mpFrame -> GetWindow();
         if ( ! pWindow )
-            return nil;
+            return (::com::sun::star::accessibility::XAccessibleContext*)nil;
 
         mpReferenceWrapper = new ReferenceWrapper;
         mpReferenceWrapper -> rAccessibleContext =  pWindow -> /*GetAccessibleChildWindow( 0 ) ->*/ GetAccessible() -> getAccessibleContext();
diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx
index ce3ab41..69f7753 100644
--- a/vcl/osx/salnativewidgets.cxx
+++ b/vcl/osx/salnativewidgets.cxx
@@ -558,7 +558,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
                         [NSNumber numberWithBool:NO], @"kCUIWindowFrameDrawTitleSeparatorKey",
                         [NSNumber numberWithBool:YES], @"is.flipped",
                         nil],
-                        nil);;
+                        (const __CFDictionary**)nil);;
             }
             else
             {