1 files changed, 9 insertions, 12 deletions
diff --git a/ucb/source/ucp/ftp/ftpcontentcaps.cxx b/ucb/source/ucp/ftp/ftpcontentcaps.cxx
index 8b6cb3fed130..3446b3a4ea51 100644
--- a/ucb/source/ucp/ftp/ftpcontentcaps.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentcaps.cxx
@@ -50,14 +50,14 @@ uno::Sequence< beans::Property > FTPContent::getProperties(
         beans::Property(
             OUString( "IsDocument" ),
             -1,
-            getCppuBooleanType(),
+            cppu::UnoType<bool>::get(),
             beans::PropertyAttribute::BOUND
             | beans::PropertyAttribute::READONLY
         ),
         beans::Property(
             OUString( "IsFolder" ),
             -1,
-            getCppuBooleanType(),
+            cppu::UnoType<bool>::get(),
             beans::PropertyAttribute::BOUND
             | beans::PropertyAttribute::READONLY
         ),
@@ -85,7 +85,7 @@ uno::Sequence< beans::Property > FTPContent::getProperties(
         beans::Property(
             OUString( "IsReadOnly" ),
             -1,
-            getCppuBooleanType(),
+            cppu::UnoType<bool>::get(),
             beans::PropertyAttribute::BOUND
             | beans::PropertyAttribute::READONLY
         ),
@@ -93,8 +93,7 @@ uno::Sequence< beans::Property > FTPContent::getProperties(
             OUString(
                 "CreatableContentsInfo" ),
             -1,
-            getCppuType(
-                static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ),
+            cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(),
             beans::PropertyAttribute::BOUND
             | beans::PropertyAttribute::READONLY
         )
@@ -126,24 +125,22 @@ uno::Sequence< ucb::CommandInfo > FTPContent::getCommands(
         ucb::CommandInfo(
             OUString( "getCommandInfo" ),
             -1,
-            getCppuVoidType()
+            cppu::UnoType<cppu::UnoVoidType>::get()
         ),
         ucb::CommandInfo(
             OUString( "getPropertySetInfo" ),
             -1,
-            getCppuVoidType()
+            cppu::UnoType<cppu::UnoVoidType>::get()
         ),
         ucb::CommandInfo(
             OUString( "getPropertyValues" ),
             -1,
-            getCppuType(
-                static_cast< uno::Sequence< beans::Property > * >( 0 ) )
+            cppu::UnoType<uno::Sequence< beans::Property >>::get()
         ),
         ucb::CommandInfo(
             OUString( "setPropertyValues" ),
             -1,
-            getCppuType(
-                static_cast< uno::Sequence< beans::PropertyValue > * >( 0 ) )
+            cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get()
         ),
         ucb::CommandInfo(
             OUString( "open" ),
@@ -158,7 +155,7 @@ uno::Sequence< ucb::CommandInfo > FTPContent::getCommands(
         ucb::CommandInfo(
             OUString( "delete" ),
             -1,
-            getCppuBooleanType()
+            cppu::UnoType<bool>::get()
         ),
         ucb::CommandInfo(
             OUString( "createNewContent" ),