Kaydet (Commit) 592b61e1 authored tarafından Julien Nabet's avatar Julien Nabet

Fix previous commit (vcl/MacOsX part)

Change-Id: I65998bbbba01943eeb41fd8ee4f1ed5fe2eb91b1
üst 8a725a02
...@@ -53,7 +53,7 @@ namespace // private ...@@ -53,7 +53,7 @@ namespace // private
{ {
size_t len = aFlavor.MimeType.getLength(); size_t len = aFlavor.MimeType.getLength();
Type dtype = aFlavor.DataType; 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) OUString NSStringToOUString( const NSString* cfString)
...@@ -137,7 +137,7 @@ namespace // private ...@@ -137,7 +137,7 @@ namespace // private
inline bool isOUStringType(const Type& theType) inline bool isOUStringType(const Type& theType)
{ {
return (theType == cppu::UnoType<OUString>::get()0 )); return (theType == cppu::UnoType<OUString>::get() );
} }
} // namespace private } // namespace private
...@@ -486,7 +486,7 @@ DataFlavor DataFlavorMapper::systemToOpenOfficeFlavor( const NSString* systemDat ...@@ -486,7 +486,7 @@ DataFlavor DataFlavorMapper::systemToOpenOfficeFlavor( const NSString* systemDat
{ {
oOOFlavor.MimeType = OUString::createFromAscii(flavorMap[i].OOoFlavor); oOOFlavor.MimeType = OUString::createFromAscii(flavorMap[i].OOoFlavor);
oOOFlavor.HumanPresentableName = OUString::createFromAscii(flavorMap[i].HumanPresentableName); 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; return oOOFlavor;
} }
} // for } // for
......
...@@ -38,7 +38,7 @@ namespace // private ...@@ -38,7 +38,7 @@ namespace // private
{ {
size_t len = aFlavor.MimeType.getLength(); size_t len = aFlavor.MimeType.getLength();
Type dtype = aFlavor.DataType; 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 } // namespace private
...@@ -98,7 +98,7 @@ Any SAL_CALL OSXTransferable::getTransferData( const DataFlavor& aFlavor ) ...@@ -98,7 +98,7 @@ Any SAL_CALL OSXTransferable::getTransferData( const DataFlavor& aFlavor )
bool OSXTransferable::isUnicodeText(const DataFlavor& flavor) 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( ) Sequence< DataFlavor > SAL_CALL OSXTransferable::getTransferDataFlavors( )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment