From 2fc4a8c8113b1bf78258845ed06662a07996a6af Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Wed, 1 Apr 2015 12:48:44 +0200
Subject: Add support for cppu::UnoType<void>

Change-Id: I88259ffaffc73979c240721d2db166c79d3085f1
---
 ucb/source/core/ucbcmds.cxx                       |  2 +-
 ucb/source/ucp/cmis/cmis_content.cxx              | 10 ++++----
 ucb/source/ucp/cmis/cmis_repo_content.cxx         |  4 ++--
 ucb/source/ucp/ext/ucpext_content.cxx             |  4 ++--
 ucb/source/ucp/file/shell.cxx                     |  4 ++--
 ucb/source/ucp/ftp/ftpcontentcaps.cxx             |  4 ++--
 ucb/source/ucp/gio/gio_content.cxx                |  4 ++--
 ucb/source/ucp/gvfs/gvfs_content.cxx              |  4 ++--
 ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx | 28 +++++++++++------------
 ucb/source/ucp/package/pkgcontentcaps.cxx         | 20 ++++++++--------
 ucb/source/ucp/tdoc/tdoc_contentcaps.cxx          | 24 +++++++++----------
 ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx  |  8 +++----
 ucb/source/ucp/webdav/webdavcontentcaps.cxx       |  8 +++----
 13 files changed, 62 insertions(+), 62 deletions(-)

(limited to 'ucb')

diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx
index 670325fe0df2..e0974e1d46d4 100644
--- a/ucb/source/core/ucbcmds.cxx
+++ b/ucb/source/core/ucbcmds.cxx
@@ -236,7 +236,7 @@ CommandProcessorInfo::CommandProcessorInfo()
         = ucb::CommandInfo(
             OUString( GETCOMMANDINFO_NAME ), // Name
             GETCOMMANDINFO_HANDLE, // Handle
-            cppu::UnoType<cppu::UnoVoidType>::get() ); // ArgType
+            cppu::UnoType<void>::get() ); // ArgType
     (*m_pInfo)[ 1 ]
         = ucb::CommandInfo(
             OUString( GLOBALTRANSFER_NAME ), // Name
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx
index adcd6b4c19f8..6b542e6d47eb 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -1569,10 +1569,10 @@ namespace cmis
             // Required commands
             ucb::CommandInfo
             ( OUString( "getCommandInfo" ),
-              -1, cppu::UnoType<cppu::UnoVoidType>::get() ),
+              -1, cppu::UnoType<void>::get() ),
             ucb::CommandInfo
             ( OUString( "getPropertySetInfo" ),
-              -1, cppu::UnoType<cppu::UnoVoidType>::get() ),
+              -1, cppu::UnoType<void>::get() ),
             ucb::CommandInfo
             ( OUString( "getPropertyValues" ),
               -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ),
@@ -1592,11 +1592,11 @@ namespace cmis
               -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ),
 
             // Mandatory CMIS-only commands
-            ucb::CommandInfo ( OUString( "checkout" ), -1, cppu::UnoType<cppu::UnoVoidType>::get() ),
-            ucb::CommandInfo ( OUString( "cancelCheckout" ), -1, cppu::UnoType<cppu::UnoVoidType>::get() ),
+            ucb::CommandInfo ( OUString( "checkout" ), -1, cppu::UnoType<void>::get() ),
+            ucb::CommandInfo ( OUString( "cancelCheckout" ), -1, cppu::UnoType<void>::get() ),
             ucb::CommandInfo ( OUString( "checkIn" ), -1,
                     cppu::UnoType<ucb::TransferInfo>::get() ),
-            ucb::CommandInfo ( OUString( "updateProperties" ), -1, cppu::UnoType<cppu::UnoVoidType>::get() ),
+            ucb::CommandInfo ( OUString( "updateProperties" ), -1, cppu::UnoType<void>::get() ),
             ucb::CommandInfo
             ( OUString( "getAllVersions" ),
               -1, cppu::UnoType<uno::Sequence< document::CmisVersion >>::get() ),
diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx b/ucb/source/ucp/cmis/cmis_repo_content.cxx
index bccca5a5cfac..86be92cd8865 100644
--- a/ucb/source/ucp/cmis/cmis_repo_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx
@@ -268,10 +268,10 @@ namespace cmis
             // Required commands
             ucb::CommandInfo
             ( OUString( "getCommandInfo" ),
-              -1, cppu::UnoType<cppu::UnoVoidType>::get() ),
+              -1, cppu::UnoType<void>::get() ),
             ucb::CommandInfo
             ( OUString( "getPropertySetInfo" ),
-              -1, cppu::UnoType<cppu::UnoVoidType>::get() ),
+              -1, cppu::UnoType<void>::get() ),
             ucb::CommandInfo
             ( OUString( "getPropertyValues" ),
               -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ),
diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx
index 59a827ddd49e..3ee8ad6a4018 100644
--- a/ucb/source/ucp/ext/ucpext_content.cxx
+++ b/ucb/source/ucp/ext/ucpext_content.cxx
@@ -554,12 +554,12 @@ namespace ucb { namespace ucp { namespace ext
             CommandInfo(
                 OUString(  "getCommandInfo"  ),
                 -1,
-                cppu::UnoType<cppu::UnoVoidType>::get()
+                cppu::UnoType<void>::get()
             ),
             CommandInfo(
                 OUString(  "getPropertySetInfo"  ),
                 -1,
-                cppu::UnoType<cppu::UnoVoidType>::get()
+                cppu::UnoType<void>::get()
             ),
             CommandInfo(
                 OUString(  "getPropertyValues"  ),
diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx
index 8b9c7001aee6..7e880e00589b 100644
--- a/ucb/source/ucp/file/shell.cxx
+++ b/ucb/source/ucp/file/shell.cxx
@@ -352,11 +352,11 @@ shell::shell( const uno::Reference< uno::XComponentContext >& rxContext,
     // Commands
     m_sCommandInfo[0].Name = "getCommandInfo";
     m_sCommandInfo[0].Handle = -1;
-    m_sCommandInfo[0].ArgType = cppu::UnoType<cppu::UnoVoidType>::get();
+    m_sCommandInfo[0].ArgType = cppu::UnoType<void>::get();
 
     m_sCommandInfo[1].Name = "getPropertySetInfo";
     m_sCommandInfo[1].Handle = -1;
-    m_sCommandInfo[1].ArgType = cppu::UnoType<cppu::UnoVoidType>::get();
+    m_sCommandInfo[1].ArgType = cppu::UnoType<void>::get();
 
     m_sCommandInfo[2].Name = "getPropertyValues";
     m_sCommandInfo[2].Handle = -1;
diff --git a/ucb/source/ucp/ftp/ftpcontentcaps.cxx b/ucb/source/ucp/ftp/ftpcontentcaps.cxx
index 3446b3a4ea51..42dd98e863d2 100644
--- a/ucb/source/ucp/ftp/ftpcontentcaps.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentcaps.cxx
@@ -125,12 +125,12 @@ uno::Sequence< ucb::CommandInfo > FTPContent::getCommands(
         ucb::CommandInfo(
             OUString( "getCommandInfo" ),
             -1,
-            cppu::UnoType<cppu::UnoVoidType>::get()
+            cppu::UnoType<void>::get()
         ),
         ucb::CommandInfo(
             OUString( "getPropertySetInfo" ),
             -1,
-            cppu::UnoType<cppu::UnoVoidType>::get()
+            cppu::UnoType<void>::get()
         ),
         ucb::CommandInfo(
             OUString( "getPropertyValues" ),
diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx
index c2ead85c4d49..f86ee345ded5 100644
--- a/ucb/source/ucp/gio/gio_content.cxx
+++ b/ucb/source/ucp/gio/gio_content.cxx
@@ -1304,10 +1304,10 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( const uno::Reference< uc
         // Required commands
         ucb::CommandInfo
         ( OUString(  "getCommandInfo"  ),
-          -1, cppu::UnoType<cppu::UnoVoidType>::get() ),
+          -1, cppu::UnoType<void>::get() ),
         ucb::CommandInfo
         ( OUString(  "getPropertySetInfo"  ),
-          -1, cppu::UnoType<cppu::UnoVoidType>::get() ),
+          -1, cppu::UnoType<void>::get() ),
         ucb::CommandInfo
         ( OUString(  "getPropertyValues"  ),
           -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ),
diff --git a/ucb/source/ucp/gvfs/gvfs_content.cxx b/ucb/source/ucp/gvfs/gvfs_content.cxx
index 14fade31f1cd..6a22e9affca8 100644
--- a/ucb/source/ucp/gvfs/gvfs_content.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_content.cxx
@@ -1356,10 +1356,10 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
         // Required commands
         ucb::CommandInfo
         ( OUString(  "getCommandInfo"  ),
-          -1, cppu::UnoType<cppu::UnoVoidType>::get() ),
+          -1, cppu::UnoType<void>::get() ),
         ucb::CommandInfo
         ( OUString(  "getPropertySetInfo"  ),
-          -1, cppu::UnoType<cppu::UnoVoidType>::get() ),
+          -1, cppu::UnoType<void>::get() ),
         ucb::CommandInfo
         ( OUString(  "getPropertyValues"  ),
           -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ),
diff --git a/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx b/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx
index f646a18dd3b3..8595d7284c30 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx
@@ -406,12 +406,12 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands(
                 ucb::CommandInfo(
                     OUString( "getCommandInfo" ),
                     -1,
-                    cppu::UnoType<cppu::UnoVoidType>::get()
+                    cppu::UnoType<void>::get()
                 ),
                 ucb::CommandInfo(
                     OUString( "getPropertySetInfo" ),
                     -1,
-                    cppu::UnoType<cppu::UnoVoidType>::get()
+                    cppu::UnoType<void>::get()
                 ),
                 ucb::CommandInfo(
                     OUString( "getPropertyValues" ),
@@ -443,12 +443,12 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands(
                 ucb::CommandInfo(
                     OUString( "getCommandInfo" ),
                     -1,
-                    cppu::UnoType<cppu::UnoVoidType>::get()
+                    cppu::UnoType<void>::get()
                 ),
                 ucb::CommandInfo(
                     OUString( "getPropertySetInfo" ),
                     -1,
-                    cppu::UnoType<cppu::UnoVoidType>::get()
+                    cppu::UnoType<void>::get()
                 ),
                 ucb::CommandInfo(
                     OUString( "getPropertyValues" ),
@@ -471,7 +471,7 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands(
                 ucb::CommandInfo(
                     OUString( "insert" ),
                     -1,
-                    cppu::UnoType<cppu::UnoVoidType>::get()
+                    cppu::UnoType<void>::get()
                 )
 
                 // New commands
@@ -498,12 +498,12 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands(
                 ucb::CommandInfo(
                     OUString( "getCommandInfo" ),
                     -1,
-                    cppu::UnoType<cppu::UnoVoidType>::get()
+                    cppu::UnoType<void>::get()
                 ),
                 ucb::CommandInfo(
                     OUString( "getPropertySetInfo" ),
                     -1,
-                    cppu::UnoType<cppu::UnoVoidType>::get()
+                    cppu::UnoType<void>::get()
                 ),
                 ucb::CommandInfo(
                     OUString( "getPropertyValues" ),
@@ -539,12 +539,12 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands(
                 ucb::CommandInfo(
                     OUString( "getCommandInfo" ),
                     -1,
-                    cppu::UnoType<cppu::UnoVoidType>::get()
+                    cppu::UnoType<void>::get()
                 ),
                 ucb::CommandInfo(
                     OUString( "getPropertySetInfo" ),
                     -1,
-                    cppu::UnoType<cppu::UnoVoidType>::get()
+                    cppu::UnoType<void>::get()
                 ),
                 ucb::CommandInfo(
                     OUString( "getPropertyValues" ),
@@ -567,7 +567,7 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands(
                 ucb::CommandInfo(
                     OUString( "insert" ),
                     -1,
-                    cppu::UnoType<cppu::UnoVoidType>::get()
+                    cppu::UnoType<void>::get()
                 ),
                 ucb::CommandInfo(
                     OUString( "open" ),
@@ -609,12 +609,12 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands(
                 ucb::CommandInfo(
                     OUString( "getCommandInfo" ),
                     -1,
-                    cppu::UnoType<cppu::UnoVoidType>::get()
+                    cppu::UnoType<void>::get()
                 ),
                 ucb::CommandInfo(
                     OUString( "getPropertySetInfo" ),
                     -1,
-                    cppu::UnoType<cppu::UnoVoidType>::get()
+                    cppu::UnoType<void>::get()
                 ),
                 ucb::CommandInfo(
                     OUString( "getPropertyValues" ),
@@ -650,12 +650,12 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands(
                 ucb::CommandInfo(
                     OUString( "getCommandInfo" ),
                     -1,
-                    cppu::UnoType<cppu::UnoVoidType>::get()
+                    cppu::UnoType<void>::get()
                 ),
                 ucb::CommandInfo(
                     OUString( "getPropertySetInfo" ),
                     -1,
-                    cppu::UnoType<cppu::UnoVoidType>::get()
+                    cppu::UnoType<void>::get()
                 ),
                 ucb::CommandInfo(
                     OUString( "getPropertyValues" ),
diff --git a/ucb/source/ucp/package/pkgcontentcaps.cxx b/ucb/source/ucp/package/pkgcontentcaps.cxx
index f6a64ab492d1..45acf60af2d5 100644
--- a/ucb/source/ucp/package/pkgcontentcaps.cxx
+++ b/ucb/source/ucp/package/pkgcontentcaps.cxx
@@ -333,12 +333,12 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
                 ucb::CommandInfo(
                     OUString( "getCommandInfo" ),
                     -1,
-                    cppu::UnoType<cppu::UnoVoidType>::get()
+                    cppu::UnoType<void>::get()
                 ),
                 ucb::CommandInfo(
                     OUString( "getPropertySetInfo" ),
                     -1,
-                    cppu::UnoType<cppu::UnoVoidType>::get()
+                    cppu::UnoType<void>::get()
                 ),
                 ucb::CommandInfo(
                     OUString( "getPropertyValues" ),
@@ -374,7 +374,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
                 ucb::CommandInfo(
                     OUString( "flush" ),
                     -1,
-                    cppu::UnoType<cppu::UnoVoidType>::get()
+                    cppu::UnoType<void>::get()
                 )
             };
 
@@ -396,12 +396,12 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
                 ucb::CommandInfo(
                     OUString( "getCommandInfo" ),
                     -1,
-                    cppu::UnoType<cppu::UnoVoidType>::get()
+                    cppu::UnoType<void>::get()
                 ),
                 ucb::CommandInfo(
                     OUString( "getPropertySetInfo" ),
                     -1,
-                    cppu::UnoType<cppu::UnoVoidType>::get()
+                    cppu::UnoType<void>::get()
                 ),
                 ucb::CommandInfo(
                     OUString( "getPropertyValues" ),
@@ -424,7 +424,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
                 ucb::CommandInfo(
                     OUString( "insert" ),
                     -1,
-                    cppu::UnoType<cppu::UnoVoidType>::get()
+                    cppu::UnoType<void>::get()
                 ),
                 ucb::CommandInfo(
                     OUString( "open" ),
@@ -447,7 +447,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
                 ucb::CommandInfo(
                     OUString( "flush" ),
                     -1,
-                    cppu::UnoType<cppu::UnoVoidType>::get()
+                    cppu::UnoType<void>::get()
                 )
             };
 
@@ -470,12 +470,12 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
             ucb::CommandInfo(
                 OUString( "getCommandInfo" ),
                 -1,
-                cppu::UnoType<cppu::UnoVoidType>::get()
+                cppu::UnoType<void>::get()
             ),
             ucb::CommandInfo(
                 OUString( "getPropertySetInfo" ),
                 -1,
-                cppu::UnoType<cppu::UnoVoidType>::get()
+                cppu::UnoType<void>::get()
             ),
             ucb::CommandInfo(
                 OUString( "getPropertyValues" ),
@@ -498,7 +498,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
             ucb::CommandInfo(
                 OUString( "insert" ),
                 -1,
-                cppu::UnoType<cppu::UnoVoidType>::get()
+                cppu::UnoType<void>::get()
             ),
             ucb::CommandInfo(
                 OUString( "open" ),
diff --git a/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx b/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx
index 6c5fca976628..7cc288203be6 100644
--- a/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx
@@ -374,12 +374,12 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
                 ucb::CommandInfo(
                     OUString( "getCommandInfo" ),
                     -1,
-                    cppu::UnoType<cppu::UnoVoidType>::get()
+                    cppu::UnoType<void>::get()
                 ),
                 ucb::CommandInfo(
                     OUString( "getPropertySetInfo" ),
                     -1,
-                    cppu::UnoType<cppu::UnoVoidType>::get()
+                    cppu::UnoType<void>::get()
                 ),
                 ucb::CommandInfo(
                     OUString( "getPropertyValues" ),
@@ -425,12 +425,12 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
             ucb::CommandInfo(
                 OUString( "getCommandInfo" ),
                 -1,
-                cppu::UnoType<cppu::UnoVoidType>::get()
+                cppu::UnoType<void>::get()
             ),
             ucb::CommandInfo(
                 OUString( "getPropertySetInfo" ),
                 -1,
-                cppu::UnoType<cppu::UnoVoidType>::get()
+                cppu::UnoType<void>::get()
             ),
             ucb::CommandInfo(
                 OUString( "getPropertyValues" ),
@@ -453,7 +453,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
             ucb::CommandInfo(
                 OUString( "insert" ),
                 -1,
-                cppu::UnoType<cppu::UnoVoidType>::get()
+                cppu::UnoType<void>::get()
             ),
             ucb::CommandInfo(
                 OUString( "open" ),
@@ -482,12 +482,12 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
             ucb::CommandInfo(
                 OUString( "getCommandInfo" ),
                 -1,
-                cppu::UnoType<cppu::UnoVoidType>::get()
+                cppu::UnoType<void>::get()
             ),
             ucb::CommandInfo(
                 OUString( "getPropertySetInfo" ),
                 -1,
-                cppu::UnoType<cppu::UnoVoidType>::get()
+                cppu::UnoType<void>::get()
             ),
             ucb::CommandInfo(
                 OUString( "getPropertyValues" ),
@@ -510,7 +510,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
             ucb::CommandInfo(
                 OUString( "insert" ),
                 -1,
-                cppu::UnoType<cppu::UnoVoidType>::get()
+                cppu::UnoType<void>::get()
             ),
             ucb::CommandInfo(
                 OUString( "open" ),
@@ -549,12 +549,12 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
             ucb::CommandInfo(
                 OUString( "getCommandInfo" ),
                 -1,
-                cppu::UnoType<cppu::UnoVoidType>::get()
+                cppu::UnoType<void>::get()
             ),
             ucb::CommandInfo(
                 OUString( "getPropertySetInfo" ),
                 -1,
-                cppu::UnoType<cppu::UnoVoidType>::get()
+                cppu::UnoType<void>::get()
             ),
             ucb::CommandInfo(
                 OUString( "getPropertyValues" ),
@@ -608,12 +608,12 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
             ucb::CommandInfo(
                 OUString( "getCommandInfo" ),
                 -1,
-                cppu::UnoType<cppu::UnoVoidType>::get()
+                cppu::UnoType<void>::get()
             ),
             ucb::CommandInfo(
                 OUString( "getPropertySetInfo" ),
                 -1,
-                cppu::UnoType<cppu::UnoVoidType>::get()
+                cppu::UnoType<void>::get()
             ),
             ucb::CommandInfo(
                 OUString( "getPropertyValues" ),
diff --git a/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx b/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx
index 356e592cad33..31561a1da330 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx
@@ -524,12 +524,12 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
             ucb::CommandInfo(
                 OUString( "getCommandInfo" ),
                 -1,
-                cppu::UnoType<cppu::UnoVoidType>::get() );
+                cppu::UnoType<void>::get() );
     aCmdInfo[ 1 ] =
             ucb::CommandInfo(
                 OUString( "getPropertySetInfo" ),
                 -1,
-                cppu::UnoType<cppu::UnoVoidType>::get() );
+                cppu::UnoType<void>::get() );
     aCmdInfo[ 2 ] =
             ucb::CommandInfo(
                 OUString( "getPropertyValues" ),
@@ -632,13 +632,13 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
             ucb::CommandInfo(
                 OUString( "lock" ),
                 -1,
-                cppu::UnoType<cppu::UnoVoidType>::get() );
+                cppu::UnoType<void>::get() );
         nPos++;
         aCmdInfo[ nPos ] =
             ucb::CommandInfo(
                 OUString( "unlock" ),
                 -1,
-                cppu::UnoType<cppu::UnoVoidType>::get() );
+                cppu::UnoType<void>::get() );
         nPos++;
     }
     return aCmdInfo;
diff --git a/ucb/source/ucp/webdav/webdavcontentcaps.cxx b/ucb/source/ucp/webdav/webdavcontentcaps.cxx
index cb77cf3dd60f..cb85c40851c4 100644
--- a/ucb/source/ucp/webdav/webdavcontentcaps.cxx
+++ b/ucb/source/ucp/webdav/webdavcontentcaps.cxx
@@ -499,12 +499,12 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
             ucb::CommandInfo(
                 OUString( "getCommandInfo" ),
                 -1,
-                cppu::UnoType<cppu::UnoVoidType>::get() );
+                cppu::UnoType<void>::get() );
     aCmdInfo[ 1 ] =
             ucb::CommandInfo(
                 OUString( "getPropertySetInfo" ),
                 -1,
-                cppu::UnoType<cppu::UnoVoidType>::get() );
+                cppu::UnoType<void>::get() );
     aCmdInfo[ 2 ] =
             ucb::CommandInfo(
                 OUString( "getPropertyValues" ),
@@ -607,13 +607,13 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
             ucb::CommandInfo(
                 OUString( "lock" ),
                 -1,
-                cppu::UnoType<cppu::UnoVoidType>::get() );
+                cppu::UnoType<void>::get() );
         nPos++;
         aCmdInfo[ nPos ] =
             ucb::CommandInfo(
                 OUString( "unlock" ),
                 -1,
-                cppu::UnoType<cppu::UnoVoidType>::get() );
+                cppu::UnoType<void>::get() );
         nPos++;
     }
     return aCmdInfo;
-- 
cgit