svn commit: r1594864 - in /openoffice/trunk/main: sc/source/ui/view/drawview.cxx sd/source/ui/view/DocumentRenderer.cxx shell/source/backends/macbe/macbackend.cxx

[hdu]

Author: hdu
Date: Thu May 15 11:14:25 2014
New Revision: 1594864

URL: http://svn.apache.org/r1594864
Log:
#i124422# fix implicit conversions to pointer from bool/int32

implicit conversions from bool or int32 to pointer types are not a good idea
and clang>=3.4 or xcode>=5.1 now report errors for such code. The errors break
the build and so they have to be fixed.

Modified:
    openoffice/trunk/main/sc/source/ui/view/drawview.cxx
    openoffice/trunk/main/sd/source/ui/view/DocumentRenderer.cxx
    openoffice/trunk/main/shell/source/backends/macbe/macbackend.cxx

Modified: openoffice/trunk/main/sc/source/ui/view/drawview.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/view/drawview.cxx?rev=1594864&r1=1594863&r2=1594864&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/ui/view/drawview.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/view/drawview.cxx Thu May 15 11:14:25 
2014
@@ -1011,7 +1011,7 @@ SdrObject* ScDrawView::ApplyGraphicToObj
         return &rHitObject;
     }
 
-    return false;
+    return NULL;
 }
 
 // eof

Modified: openoffice/trunk/main/sd/source/ui/view/DocumentRenderer.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sd/source/ui/view/DocumentRenderer.cxx?rev=1594864&r1=1594863&r2=1594864&view=diff
==============================================================================
--- openoffice/trunk/main/sd/source/ui/view/DocumentRenderer.cxx (original)
+++ openoffice/trunk/main/sd/source/ui/view/DocumentRenderer.cxx Thu May 15 
11:14:25 2014
@@ -115,7 +115,7 @@ namespace {
 
         bool IsHandoutHorizontal (void) const
         {
-            return GetBoolValue("SlidesPerPageOrder", sal_Int32(0), true);
+            return GetBoolValue("SlidesPerPageOrder", NULL, true);
         }
 
         sal_Int32 GetHandoutPageCount (void) const

Modified: openoffice/trunk/main/shell/source/backends/macbe/macbackend.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/shell/source/backends/macbe/macbackend.cxx?rev=1594864&r1=1594863&r2=1594864&view=diff
==============================================================================
--- openoffice/trunk/main/shell/source/backends/macbe/macbackend.cxx (original)
+++ openoffice/trunk/main/shell/source/backends/macbe/macbackend.cxx Thu May 15 
11:14:25 2014
@@ -412,7 +412,7 @@ css::uno::Any MacOSXBackend::getProperty
         CFDictionaryRef rProxyDict = SCDynamicStoreCopyProxies(NULL);
 
         if (!rProxyDict)
-            rExceptionsList = false;
+            rExceptionsList = nil;
         else
             rExceptionsList = (CFArrayRef) CFDictionaryGetValue(rProxyDict, 
kSCPropNetProxiesExceptionsList);