1 files changed, 12 insertions, 18 deletions
diff --git a/ucb/source/ucp/webdav/webdavcontentcaps.cxx b/ucb/source/ucp/webdav/webdavcontentcaps.cxx
index a8691d063b25..cb77cf3dd60f 100644
--- a/ucb/source/ucp/webdav/webdavcontentcaps.cxx
+++ b/ucb/source/ucp/webdav/webdavcontentcaps.cxx
@@ -73,7 +73,7 @@ bool ContentProvider::getProperty(
                 beans::Property(
                     OUString( "IsDocument" ),
                     -1,
-                    getCppuBooleanType(),
+                    cppu::UnoType<bool>::get(),
                     beans::PropertyAttribute::BOUND
                         | beans::PropertyAttribute::READONLY ) );
 
@@ -81,7 +81,7 @@ bool ContentProvider::getProperty(
                 beans::Property(
                     OUString( "IsFolder" ),
                     -1,
-                    getCppuBooleanType(),
+                    cppu::UnoType<bool>::get(),
                     beans::PropertyAttribute::BOUND
                         | beans::PropertyAttribute::READONLY ) );
 
@@ -139,8 +139,7 @@ bool ContentProvider::getProperty(
                     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 ) );
 
@@ -205,8 +204,7 @@ bool ContentProvider::getProperty(
                 beans::Property(
                     DAVProperties::LOCKDISCOVERY,
                     -1,
-                    getCppuType( static_cast<
-                                    const uno::Sequence< ucb::Lock > * >( 0 ) ),
+                    cppu::UnoType<uno::Sequence< ucb::Lock >>::get(),
                     beans::PropertyAttribute::BOUND
                         | beans::PropertyAttribute::READONLY ) );
 
@@ -222,9 +220,7 @@ bool ContentProvider::getProperty(
                 beans::Property(
                     DAVProperties::SUPPORTEDLOCK,
                     -1,
-                    getCppuType( static_cast<
-                                    const uno::Sequence<
-                                        ucb::LockEntry > * >( 0 ) ),
+                    cppu::UnoType<uno::Sequence< ucb::LockEntry >>::get(),
                     beans::PropertyAttribute::BOUND
                         | beans::PropertyAttribute::READONLY ) );
 
@@ -503,24 +499,22 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
             ucb::CommandInfo(
                 OUString( "getCommandInfo" ),
                 -1,
-                getCppuVoidType() );
+                cppu::UnoType<cppu::UnoVoidType>::get() );
     aCmdInfo[ 1 ] =
             ucb::CommandInfo(
                 OUString( "getPropertySetInfo" ),
                 -1,
-                getCppuVoidType() );
+                cppu::UnoType<cppu::UnoVoidType>::get() );
     aCmdInfo[ 2 ] =
             ucb::CommandInfo(
                 OUString( "getPropertyValues" ),
                 -1,
-                getCppuType( static_cast<
-                                uno::Sequence< beans::Property > * >( 0 ) ) );
+                cppu::UnoType<uno::Sequence< beans::Property >>::get());
     aCmdInfo[ 3 ] =
             ucb::CommandInfo(
                 OUString( "setPropertyValues" ),
                 -1,
-                getCppuType( static_cast<
-                    uno::Sequence< beans::PropertyValue > * >( 0 ) ) );
+                cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get());
 
 
     // Optional standard commands
@@ -530,7 +524,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
             ucb::CommandInfo(
                 OUString( "delete" ),
                 -1,
-                getCppuBooleanType() );
+                cppu::UnoType<bool>::get() );
     aCmdInfo[ 5 ] =
             ucb::CommandInfo(
                 OUString( "insert" ),
@@ -613,13 +607,13 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
             ucb::CommandInfo(
                 OUString( "lock" ),
                 -1,
-                getCppuVoidType() );
+                cppu::UnoType<cppu::UnoVoidType>::get() );
         nPos++;
         aCmdInfo[ nPos ] =
             ucb::CommandInfo(
                 OUString( "unlock" ),
                 -1,
-                getCppuVoidType() );
+                cppu::UnoType<cppu::UnoVoidType>::get() );
         nPos++;
     }
     return aCmdInfo;