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

[Julien Nabet]

 vcl/osx/DataFlavorMapping.cxx |    6 +++---
 vcl/osx/OSXTransferable.cxx   |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 592b61e17c2ef5181211396123f18c501362b31d
Author: Julien Nabet <serval2...@yahoo.fr>
Date:   Sun May 11 10:57:54 2014 +0200

    Fix previous commit (vcl/MacOsX part)
    
    Change-Id: I65998bbbba01943eeb41fd8ee4f1ed5fe2eb91b1

diff --git a/vcl/osx/DataFlavorMapping.cxx b/vcl/osx/DataFlavorMapping.cxx
index f54b28a..95584bb 100644
--- a/vcl/osx/DataFlavorMapping.cxx
+++ b/vcl/osx/DataFlavorMapping.cxx
@@ -53,7 +53,7 @@ namespace // private
   {
     size_t len = aFlavor.MimeType.getLength();
     Type dtype = aFlavor.DataType;
-    return ((len > 0) && ((dtype == getCppuType((Sequence<sal_Int8>*)0)) || 
(dtype == cppu::UnoType<OUString>::get()0 ))));
+    return ((len > 0) && ((dtype == getCppuType((Sequence<sal_Int8>*)0)) || 
(dtype == cppu::UnoType<OUString>::get())));
   }
 
   OUString NSStringToOUString( const NSString* cfString)
@@ -137,7 +137,7 @@ namespace // private
 
   inline bool isOUStringType(const Type& theType)
   {
-    return (theType == cppu::UnoType<OUString>::get()0 ));
+    return (theType == cppu::UnoType<OUString>::get() );
   }
 
 } // namespace private
@@ -486,7 +486,7 @@ DataFlavor DataFlavorMapper::systemToOpenOfficeFlavor( 
const NSString* systemDat
         {
           oOOFlavor.MimeType = 
OUString::createFromAscii(flavorMap[i].OOoFlavor);
           oOOFlavor.HumanPresentableName = 
OUString::createFromAscii(flavorMap[i].HumanPresentableName);
-          oOOFlavor.DataType = flavorMap[i].DataTypeOUString ? 
cppu::UnoType<OUString>::get()0 ) : getCppuType((Sequence<sal_Int8>*)0);
+          oOOFlavor.DataType = flavorMap[i].DataTypeOUString ? 
cppu::UnoType<OUString>::get() : getCppuType((Sequence<sal_Int8>*)0);
           return oOOFlavor;
         }
     } // for
diff --git a/vcl/osx/OSXTransferable.cxx b/vcl/osx/OSXTransferable.cxx
index 2eb0236..289f548 100644
--- a/vcl/osx/OSXTransferable.cxx
+++ b/vcl/osx/OSXTransferable.cxx
@@ -38,7 +38,7 @@ namespace // private
     {
       size_t len = aFlavor.MimeType.getLength();
       Type dtype = aFlavor.DataType;
-      return ((len > 0) && ((dtype == getCppuType((Sequence<sal_Int8>*)0)) || 
(dtype == cppu::UnoType<OUString>::get()0))));
+      return ((len > 0) && ((dtype == getCppuType((Sequence<sal_Int8>*)0)) || 
(dtype == cppu::UnoType<OUString>::get())));
     }
 
 } // namespace private
@@ -98,7 +98,7 @@ Any SAL_CALL OSXTransferable::getTransferData( const 
DataFlavor& aFlavor )
 
 bool OSXTransferable::isUnicodeText(const DataFlavor& flavor)
 {
-  return (flavor.DataType == cppu::UnoType<OUString>::get()0));
+  return (flavor.DataType == cppu::UnoType<OUString>::get());
 }
 
 Sequence< DataFlavor > SAL_CALL OSXTransferable::getTransferDataFlavors(  )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits