diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-01 08:43:18 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-01 08:43:18 +0200 |
| commit | 6dbcb1a3d1abd2c7909fe0d447e434657d9a5187 (patch) | |
| tree | 43ff84e2015e7cd48f412b9a6a3cb9f5d8215d05 /vcl/osx | |
| parent | 0ca607e0674d35dec1412ed470d213a5097d33f0 (diff) | |
Replace remaining getCppuType et al with cppu::UnoType
Change-Id: I3269d005634c66929e092d6a8fb33d71819b6971
Diffstat (limited to 'vcl/osx')
| -rw-r--r-- | vcl/osx/DataFlavorMapping.cxx | 8 | ||||
| -rw-r--r-- | vcl/osx/DropTarget.cxx | 4 | ||||
| -rw-r--r-- | vcl/osx/OSXTransferable.cxx | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/vcl/osx/DataFlavorMapping.cxx b/vcl/osx/DataFlavorMapping.cxx index 26e8885f6802..60804fee90cd 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()))); + return ((len > 0) && ((dtype == cppu::UnoType<Sequence<sal_Int8>>::get()) || (dtype == cppu::UnoType<OUString>::get()))); } OUString NSStringToOUString( const NSString* cfString) @@ -132,7 +132,7 @@ namespace // private inline bool isByteSequenceType(const Type& theType) { - return (theType == getCppuType((Sequence<sal_Int8>*)0)); + return (theType == cppu::UnoType<Sequence<sal_Int8>>::get()); } inline bool isOUStringType(const Type& theType) @@ -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() : getCppuType((Sequence<sal_Int8>*)0); + oOOFlavor.DataType = flavorMap[i].DataTypeOUString ? cppu::UnoType<OUString>::get() : cppu::UnoType<Sequence<sal_Int8>>::get(); return oOOFlavor; } } // for @@ -498,7 +498,7 @@ DataFlavor DataFlavorMapper::systemToOpenOfficeFlavor( const NSString* systemDat { oOOFlavor.MimeType = aTryFlavor; oOOFlavor.HumanPresentableName.clear(); - oOOFlavor.DataType = getCppuType((Sequence<sal_Int8>*)0); + oOOFlavor.DataType = cppu::UnoType<Sequence<sal_Int8>>::get(); } return oOOFlavor; diff --git a/vcl/osx/DropTarget.cxx b/vcl/osx/DropTarget.cxx index a6721a6cd235..28843b2ca544 100644 --- a/vcl/osx/DropTarget.cxx +++ b/vcl/osx/DropTarget.cxx @@ -375,13 +375,13 @@ void SAL_CALL DropTarget::initialize(const Sequence< Any >& aArguments) void SAL_CALL DropTarget::addDropTargetListener(const uno::Reference<XDropTargetListener>& dtl) throw(RuntimeException, std::exception) { - rBHelper.addListener(::getCppuType(&dtl), dtl); + rBHelper.addListener(cppu::UnoType<decltype(dtl)>::get(), dtl); } void SAL_CALL DropTarget::removeDropTargetListener(const uno::Reference<XDropTargetListener>& dtl) throw(RuntimeException, std::exception) { - rBHelper.removeListener(::getCppuType(&dtl), dtl); + rBHelper.removeListener(cppu::UnoType<decltype(dtl)>::get(), dtl); } sal_Bool SAL_CALL DropTarget::isActive( ) throw(RuntimeException, std::exception) diff --git a/vcl/osx/OSXTransferable.cxx b/vcl/osx/OSXTransferable.cxx index 4b235dea3b9e..05eebfc4d36a 100644 --- a/vcl/osx/OSXTransferable.cxx +++ b/vcl/osx/OSXTransferable.cxx @@ -39,7 +39,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()))); + return ((len > 0) && ((dtype == cppu::UnoType<Sequence<sal_Int8>>::get()) || (dtype == cppu::UnoType<OUString>::get()))); } } // namespace private |