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

[Boris Dušek]

 vcl/aqua/source/a11y/aqua11ywrapper.mm |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 1c068a7a772ab903af627236ee93b0a1804be844
Author: Boris Dušek <me at dusek.me>
Date:   Sat Aug 24 14:55:41 2013 +0200

    Fix a11y logging with 10.6 SDK
    
    The compiler in 10.6 SDK complains about ambiguous overload
    for operator<<. Compilers in newer SDKs don't.
    
    Change-Id: Id0b710a8668021d15754fa6eaea492a91557e34e
    Reviewed-on: https://gerrit.libreoffice.org/5604
    Reviewed-by: Tor Lillqvist <tml at iki.fi>
    Tested-by: Tor Lillqvist <tml at iki.fi>

diff --git a/vcl/aqua/source/a11y/aqua11ywrapper.mm b/vcl/aqua/source/a11y/aqua11ywrapper.mm
index 8de6f5c..672fad5 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrapper.mm
@@ -843,7 +843,7 @@ static std::ostream &operator<<(std::ostream &s, NSPoint point) {
 }
 
 -(id)accessibilityAttributeValue:(NSString *)attribute forParameter:(id)parameter {
-    SAL_INFO("vcl.a11y", "[" << self << " accessibilityAttributeValue:" << attribute << " forParameter:" << parameter << "]");
+    SAL_INFO("vcl.a11y", "[" << self << " accessibilityAttributeValue:" << attribute << " forParameter:" << ((NSObject*)parameter) << "]");
     SEL methodSelector = [ self selectorForAttribute: attribute asGetter: YES withGetterParameter: YES ];
     if ( [ self respondsToSelector: methodSelector ] ) {
         return [ self performSelector: methodSelector withObject: parameter ];
@@ -853,14 +853,14 @@ static std::ostream &operator<<(std::ostream &s, NSPoint point) {
 
 -(BOOL)accessibilitySetOverrideValue:(id)value forAttribute:(NSString *)attribute
 {
-    SAL_INFO("vcl.a11y", "[" << self << " accessibilitySetOverrideValue:" << value << " forAttribute:" << attribute << "]");
+    SAL_INFO("vcl.a11y", "[" << self << " accessibilitySetOverrideValue:" << ((NSObject*)value) << " forAttribute:" << attribute << "]");
     (void)value;
     (void)attribute;
     return NO; // TODO
 }
 
 -(void)accessibilitySetValue:(id)value forAttribute:(NSString *)attribute {
-    SAL_INFO("vcl.a11y", "[" << self << " accessibilitySetValue:" << value << " forAttribute:" << attribute << "]");
+    SAL_INFO("vcl.a11y", "[" << self << " accessibilitySetValue:" << ((NSObject*)value) << " forAttribute:" << attribute << "]");
     SEL methodSelector = [ self selectorForAttribute: attribute asGetter: NO withGetterParameter: NO ];
     if ( [ AquaA11yComponentWrapper respondsToSelector: methodSelector ] ) {
         [ AquaA11yComponentWrapper performSelector: methodSelector withObject: self withObject: value ];