Add support for cppu::UnoType<void>

Change-Id: I88259ffaffc73979c240721d2db166c79d3085f1

51 files changed, 119 insertions, 115 deletions

diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx
index f298e42c1007..281ee8d3b906 100644
--- a/basic/source/classes/propacc.cxx
+++ b/basic/source/classes/propacc.cxx
@@ -231,7 +231,7 @@ SbPropertySetInfo::SbPropertySetInfo( const SbPropertyValueArr_Impl &rPropVals )
         const PropertyValue &rPropVal = rPropVals[n];
         rProp.Name = rPropVal.Name;
         rProp.Handle = rPropVal.Handle;
-        rProp.Type = cppu::UnoType<cppu::UnoVoidType>::get();
+        rProp.Type = cppu::UnoType<void>::get();
         rProp.Attributes = 0;
     }
 }
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 13da041c26fe..9c39792d25d1 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -831,7 +831,7 @@ void unoToSbxValue( SbxVariable* pVar, const Any& aValue )
 // Deliver the reflection for Sbx types
 Type getUnoTypeForSbxBaseType( SbxDataType eType )
 {
-    Type aRetType = cppu::UnoType<UnoVoidType>::get();
+    Type aRetType = cppu::UnoType<void>::get();
     switch( eType )
     {
         case SbxNULL:       aRetType = cppu::UnoType<XInterface>::get(); break;
@@ -867,7 +867,7 @@ Type getUnoTypeForSbxBaseType( SbxDataType eType )
 // Converting of Sbx to Uno without a know target class for TypeClass_ANY
 Type getUnoTypeForSbxValue( const SbxValue* pVal )
 {
-    Type aRetType = cppu::UnoType<cppu::UnoVoidType>::get();
+    Type aRetType = cppu::UnoType<void>::get();
     if( !pVal )
         return aRetType;
 
diff --git a/binaryurp/source/incomingrequest.cxx b/binaryurp/source/incomingrequest.cxx
index a239a09bd843..e9c70583e316 100644
--- a/binaryurp/source/incomingrequest.cxx
+++ b/binaryurp/source/incomingrequest.cxx
@@ -125,8 +125,7 @@ bool IncomingRequest::execute_throw(
     OSL_ASSERT(
         returnValue != 0 &&
         returnValue->getType().equals(
-            css::uno::TypeDescription(
-                cppu::UnoType< cppu::UnoVoidType >::get())) &&
+            css::uno::TypeDescription(cppu::UnoType<void>::get())) &&
         outArguments != 0 && outArguments->empty());
     bool isExc = false;
     switch (functionId_) {
diff --git a/bridges/source/jni_uno/jni_info.cxx b/bridges/source/jni_uno/jni_info.cxx
index d4b95be6b442..fc49ea4a1855 100644
--- a/bridges/source/jni_uno/jni_info.cxx
+++ b/bridges/source/jni_uno/jni_info.cxx
@@ -489,7 +489,7 @@ JNI_info::JNI_info(
             .get())->ppMembers[ 0 ] ) ),
       m_Exception_type(cppu::UnoType<css::uno::Exception>::get()),
       m_RuntimeException_type(cppu::UnoType<css::uno::RuntimeException>::get()),
-      m_void_type(cppu::UnoType<cppu::UnoVoidType>::get()),
+      m_void_type(cppu::UnoType<void>::get()),
       m_XInterface_type_info( 0 )
 {
     JNI_context jni( this, jni_env, class_loader ); // !no proper jni_info!
diff --git a/cli_ure/source/uno_bridge/cli_proxy.cxx b/cli_ure/source/uno_bridge/cli_proxy.cxx
index 06bd195dae2b..e017bcb4c6dc 100644
--- a/cli_ure/source/uno_bridge/cli_proxy.cxx
+++ b/cli_ure/source/uno_bridge/cli_proxy.cxx
@@ -524,7 +524,7 @@ srrm::IMessage^ UnoInterfaceProxy::Invoke(srrm::IMessage^ callmsg)
                             System::Object^ pExc = nullptr;
                             m_bridge->call_uno(
                                 info->m_unoI, member_td.get(),
-                                cppu::UnoType<cppu::UnoVoidType>::get().getTypeLibType(),
+                                cppu::UnoType<void>::get().getTypeLibType(),
                                 1, &param, args, nullptr, &pExc);
                             return constructReturnMessage(nullptr, nullptr, NULL,
                                                           callmsg, pExc);
diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx
index 1fff9fe76cd0..a97a6825e96f 100644
--- a/configmgr/source/access.cxx
+++ b/configmgr/source/access.cxx
@@ -327,9 +327,9 @@ css::uno::Type Access::getElementType() throw (css::uno::RuntimeException, std::
         //TODO: Should a specific type be returned for a non-extensible group
         // with homogeneous members or for an extensible group that currently
         // has only homegeneous members?
-        return cppu::UnoType< cppu::UnoVoidType >::get();
+        return cppu::UnoType<void>::get();
     case Node::KIND_SET:
-        return cppu::UnoType< cppu::UnoVoidType >::get(); //TODO: correct?
+        return cppu::UnoType<void>::get(); //TODO: correct?
     default:
         assert(false);
         throw css::uno::RuntimeException(
diff --git a/cppu/qa/test_any.cxx b/cppu/qa/test_any.cxx
index f90a95fb3cf1..3a0352b3c59f 100644
--- a/cppu/qa/test_any.cxx
+++ b/cppu/qa/test_any.cxx
@@ -225,7 +225,7 @@ public:
 
 void Test::testVoid() {
     css::uno::Any a;
-    CPPUNIT_ASSERT(a.getValueType() == cppu::UnoType<cppu::UnoVoidType>::get());
+    CPPUNIT_ASSERT(a.getValueType() == cppu::UnoType<void>::get());
     {
         bool b = true;
         CPPUNIT_ASSERT_MESSAGE("bool", !(a >>= b) && b);
diff --git a/cppu/qa/test_unotype.cxx b/cppu/qa/test_unotype.cxx
index 9ba079958971..053b155628f1 100644
--- a/cppu/qa/test_unotype.cxx
+++ b/cppu/qa/test_unotype.cxx
@@ -102,6 +102,7 @@ void Test::testUnoType() {
     CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_VOID, +t.getTypeClass());
     CPPUNIT_ASSERT_EQUAL(
         ::rtl::OUString("void"), t.getTypeName());
+    CPPUNIT_ASSERT(cppu::UnoType<void>::get() == t);
     t = ::cppu::UnoType< bool >::get();
     CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_BOOLEAN, +t.getTypeClass());
     CPPUNIT_ASSERT_EQUAL(
diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx
index cdb7c793bdfc..f44bac2ee2ce 100644
--- a/cppuhelper/source/component_context.cxx
+++ b/cppuhelper/source/component_context.cxx
@@ -494,7 +494,7 @@ sal_Bool ComponentContext::hasByName( OUString const & name )
 
 Type ComponentContext::getElementType() throw (RuntimeException, std::exception)
 {
-    return cppu::UnoType<cppu::UnoVoidType>::get();
+    return cppu::UnoType<void>::get();
 }
 
 
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx
index 847c02e925a7..72129d42922f 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.hxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx
@@ -94,7 +94,7 @@ struct AsciiPropertyValue
     AsciiPropertyValue()
         :DefaultValue( )
         ,AsciiName( NULL )
-        ,ValueType( ::cppu::UnoType< ::cppu::UnoVoidType >::get() )
+        ,ValueType( ::cppu::UnoType<void>::get() )
     {
     }
 
diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
index abf40abf022e..c547560983f3 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
@@ -48,7 +48,7 @@ OXMLDataSourceSetting::OXMLDataSourceSetting( ODBFilter& rImport
     ,m_bIsList(false)
 {
 
-    m_aPropType = cppu::UnoType<cppu::UnoVoidType>::get();
+    m_aPropType = cppu::UnoType<void>::get();
 
     OSL_ENSURE(_xAttrList.is(),"Attribute list is NULL!");
     const SvXMLNamespaceMap& rMap = rImport.GetNamespaceMap();
@@ -80,7 +80,7 @@ OXMLDataSourceSetting::OXMLDataSourceSetting( ODBFilter& rImport
                         s_aTypeNameMap[GetXMLToken( XML_STRING)]    = ::cppu::UnoType<OUString>::get();
                         s_aTypeNameMap[GetXMLToken( XML_INT)]       = ::cppu::UnoType<sal_Int32>::get();
                         s_aTypeNameMap[GetXMLToken( XML_SHORT)]     = ::cppu::UnoType<sal_Int16>::get();
-                        s_aTypeNameMap[GetXMLToken( XML_VOID)]      = cppu::UnoType<cppu::UnoVoidType>::get();
+                        s_aTypeNameMap[GetXMLToken( XML_VOID)]      = cppu::UnoType<void>::get();
                     }
 
                     const std::map< OUString, css::uno::Type >::const_iterator aTypePos = s_aTypeNameMap.find(sValue);
diff --git a/extensions/test/ole/OleClient/funcs.cxx b/extensions/test/ole/OleClient/funcs.cxx
index 58cf6e7c01aa..584f958dff51 100644
--- a/extensions/test/ole/OleClient/funcs.cxx
+++ b/extensions/test/ole/OleClient/funcs.cxx
@@ -122,7 +122,7 @@ bool checkOutArgs(const Sequence<Any> & outArgs,
     //iterate over all parameters. i represents the parameter index
     for (int i = 0; i < values.getLength(); i++)
     {
-        if (values[i].getValueType() == cppu::UnoType<cppu::UnoVoidType>::get())
+        if (values[i].getValueType() == cppu::UnoType<void>::get())
             continue;
         //out parameter
         //Based on the parameter index find the correspondent out value
diff --git a/include/com/sun/star/uno/Type.hxx b/include/com/sun/star/uno/Type.hxx
index 5eab3fecda07..6b22224c4e4a 100644
--- a/include/com/sun/star/uno/Type.hxx
+++ b/include/com/sun/star/uno/Type.hxx
@@ -100,11 +100,11 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARA
 
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuVoidType()
 {
-    return ::cppu::UnoType< ::cppu::UnoVoidType >::get();
+    return ::cppu::UnoType<void>::get();
 }
 inline const ::com::sun::star::uno::Type & SAL_CALL getVoidCppuType()
 {
-    return ::cppu::UnoType< ::cppu::UnoVoidType >::get();
+    return ::cppu::UnoType<void>::get();
 }
 
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuBooleanType()
diff --git a/include/cppu/unotype.hxx b/include/cppu/unotype.hxx
index 4c7e5a758b79..4d6194f00212 100644
--- a/include/cppu/unotype.hxx
+++ b/include/cppu/unotype.hxx
@@ -257,7 +257,7 @@ namespace cppu {
    C++ types that are unambiguously derived from one C++ type that represents a
    UNO type.)  In addition to those C++ types that are mappings of UNO types
    (except for sal_uInt16 and sal_Unicode, see below), the following C++ types
-   are appropriate as template arguments: cppu::UnoVoidType, bool,
+   are appropriate as template arguments: void, cppu::UnoVoidType, bool,
    cppu::UnoUnsignedShortType, cppu::UnoCharType, cppu::UnoSequenceType with any
    appropriate template argument (the latter three to unambiguously specify UNO
    types, as the UNO types UNSIGNED SHORT and CHAR map to the same C++ type),
@@ -284,6 +284,10 @@ private:
     void operator =(UnoType &) SAL_DELETED_FUNCTION;
 };
 
+template<> css::uno::Type inline const & UnoType<void>::get() {
+    return cppu::UnoType<cppu::UnoVoidType>::get();
+}
+
 /**
    A working replacement for getCppuType (see there).
 
diff --git a/io/test/stm/datatest.cxx b/io/test/stm/datatest.cxx
index 55a13c2433fe..ee378cf7066c 100644
--- a/io/test/stm/datatest.cxx
+++ b/io/test/stm/datatest.cxx
@@ -805,8 +805,8 @@ sal_Bool compareMyPropertySet( Reference< XPropertySet > &r1 , Reference < XProp
 {
     sal_Bool b = sal_True;
 
-    if( r1->getPropertyValue("long").getValueType() == cppu::UnoType<cppu::UnoVoidType>::get() ||
-        r2->getPropertyValue("long").getValueType() == cppu::UnoType<cppu::UnoVoidType>::get() ) {
+    if( r1->getPropertyValue("long").getValueType() == cppu::UnoType<void>::get() ||
+        r2->getPropertyValue("long").getValueType() == cppu::UnoType<void>::get() ) {
 
         // one of the objects is not the correct propertyset !
         fprintf( stderr, "compareMyPropertySet: 1\n" );
diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx b/reportdesign/source/filter/xml/xmlControlProperty.cxx
index 0c50c2e77b03..da9647fa54c5 100644
--- a/reportdesign/source/filter/xml/xmlControlProperty.cxx
+++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx
@@ -57,7 +57,7 @@ OXMLControlProperty::OXMLControlProperty( ORptFilter& rImport
     ,m_pContainer(_pContainer)
     ,m_bIsList(false)
 {
-    m_aPropType = cppu::UnoType<cppu::UnoVoidType>::get();
+    m_aPropType = cppu::UnoType<void>::get();
 
     OSL_ENSURE(_xAttrList.is(),"Attribute list is NULL!");
     OSL_ENSURE(m_xControl.is(),"Control is NULL!");
@@ -93,7 +93,7 @@ OXMLControlProperty::OXMLControlProperty( ORptFilter& rImport
                         s_aTypeNameMap[GetXMLToken( XML_SHORT)]     = cppu::UnoType<sal_Int16>::get();
                         s_aTypeNameMap[GetXMLToken( XML_DATE)]      = cppu::UnoType<com::sun::star::util::Date>::get();
                         s_aTypeNameMap[GetXMLToken( XML_TIME)]      = cppu::UnoType<com::sun::star::util::Time>::get();
-                        s_aTypeNameMap[GetXMLToken( XML_VOID)]      = cppu::UnoType<cppu::UnoVoidType>::get();
+                        s_aTypeNameMap[GetXMLToken( XML_VOID)]      = cppu::UnoType<void>::get();
                     }
 
                     const std::map< OUString, css::uno::Type >::const_iterator aTypePos = s_aTypeNameMap.find(sValue);
diff --git a/sfx2/source/control/sfxstatuslistener.cxx b/sfx2/source/control/sfxstatuslistener.cxx
index 56b9aecdc6a5..cc75699e6c2a 100644
--- a/sfx2/source/control/sfxstatuslistener.cxx
+++ b/sfx2/source/control/sfxstatuslistener.cxx
@@ -170,7 +170,7 @@ throw( RuntimeException, std::exception )
         eState = SfxItemState::DEFAULT;
         ::com::sun::star::uno::Type pType = rEvent.State.getValueType();
 
-        if ( pType == ::cppu::UnoType< ::cppu::UnoVoidType >::get() )
+        if ( pType == ::cppu::UnoType<void>::get() )
         {
             pItem = new SfxVoidItem( m_nSlotID );
             eState = SfxItemState::UNKNOWN;
diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index 6b55a7b13b92..03dd0c1946ac 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/sfx2/source/sidebar/Theme.cxx
@@ -831,7 +831,7 @@ css::uno::Type Theme::GetCppuType (const PropertyType eType)
             return cppu::UnoType<sal_uInt32>::get();
 
         case PT_Paint:
-            return cppu::UnoType<cppu::UnoVoidType>::get();
+            return cppu::UnoType<void>::get();
 
         case PT_Integer:
             return cppu::UnoType<sal_Int32>::get();
@@ -844,7 +844,7 @@ css::uno::Type Theme::GetCppuType (const PropertyType eType)
 
         case PT_Invalid:
         default:
-            return cppu::UnoType<cppu::UnoVoidType>::get();
+            return cppu::UnoType<void>::get();
     }
 }
 
diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx
index bd3a3969eac4..da1f7e269818 100644
--- a/sfx2/source/statbar/stbitem.cxx
+++ b/sfx2/source/statbar/stbitem.cxx
@@ -257,7 +257,7 @@ throw ( ::com::sun::star::uno::RuntimeException, std::exception )
                 eState = SfxItemState::DEFAULT;
                 uno::Type pType = rEvent.State.getValueType();
 
-                if ( pType == cppu::UnoType<cppu::UnoVoidType>::get() )
+                if ( pType == cppu::UnoType<void>::get() )
                 {
                     pItem = new SfxVoidItem( nSlotID );
                     eState = SfxItemState::UNKNOWN;
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index a16c0bbf4674..0643e78aae18 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -515,7 +515,7 @@ throw ( ::com::sun::star::uno::RuntimeException, std::exception )
                 eState = SfxItemState::DEFAULT;
                 ::com::sun::star::uno::Type pType = rEvent.State.getValueType();
 
-                if ( pType == cppu::UnoType<cppu::UnoVoidType>::get() )
+                if ( pType == cppu::UnoType<void>::get() )
                 {
                     pItem = new SfxVoidItem( nSlotId );
                     eState = SfxItemState::UNKNOWN;
@@ -1069,7 +1069,7 @@ throw ( ::com::sun::star::uno::RuntimeException, std::exception )
                 eState = SfxItemState::DEFAULT;
                 ::com::sun::star::uno::Type pType = rEvent.State.getValueType();
 
-                if ( pType == cppu::UnoType<cppu::UnoVoidType>::get() )
+                if ( pType == cppu::UnoType<void>::get() )
                 {
                     pItem = new SfxVoidItem( nSlotId );
                     eState = SfxItemState::UNKNOWN;
diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx
index f30043bc650d..c5d68e0fd8ad 100644
--- a/stoc/source/inspect/introspection.cxx
+++ b/stoc/source/inspect/introspection.cxx
@@ -2320,7 +2320,7 @@ css::uno::Reference<css::beans::XIntrospectionAccess> Implementation::inspect(
                             css::uno::Reference<css::reflection::XIdlClass>
                                 xListenerClass(
                                     reflection_->forName(
-                                        cppu::UnoType<cppu::UnoVoidType>::get()
+                                        cppu::UnoType<void>::get()
                                         .getTypeName()));
                             // ALT: Reference<XIdlClass> xListenerClass = Void_getReflection()->getIdlClass();
 
diff --git a/stoc/test/testconv.cxx b/stoc/test/testconv.cxx
index 66ecd6473600..950a9129f59b 100644
--- a/stoc/test/testconv.cxx
+++ b/stoc/test/testconv.cxx
@@ -632,7 +632,7 @@ static void test_Conversion( const Reference< XMultiServiceFactory > & xMgr )
         convertTo( cppu::UnoType<Sequence< sal_Int16 >>::get(), rVal, rBlock._toSeqINT16 );
         convertTo( cppu::UnoType<Sequence< Any >>::get(), rVal, rBlock._toSeqAny );
 
-        convertTo( cppu::UnoType<cppu::UnoVoidType>::get(), rVal, sal_True ); // anything converts to void
+        convertTo( cppu::UnoType<void>::get(), rVal, sal_True ); // anything converts to void
     }
     s_xConverter.clear();
 
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index dc4bff3edb5a..f5ef9eb7d34b 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -1237,7 +1237,7 @@ void FmSearchEngine::StartOverSpecial(bool _bSearchForNull)
 
 void FmSearchEngine::InvalidatePreviousLoc()
 {
-    m_aPreviousLocBookmark.setValue(0,cppu::UnoType<cppu::UnoVoidType>::get());
+    m_aPreviousLocBookmark.setValue(0,cppu::UnoType<void>::get());
     m_iterPreviousLocField = m_arrUsedFields.end();
 }
 
diff --git a/sw/source/core/doc/docbasic.cxx b/sw/source/core/doc/docbasic.cxx
index 1c96f144efa7..e7519bf2caef 100644
--- a/sw/source/core/doc/docbasic.cxx
+++ b/sw/source/core/doc/docbasic.cxx
@@ -63,7 +63,7 @@ static Sequence<Any> *lcl_docbasic_convertArgs( SbxArray& rArgs )
                 pUnoArgs[i] <<= (sal_Int32)pVar->GetLong();
                 break;
             default:
-                pUnoArgs[i].setValue(0, cppu::UnoType<cppu::UnoVoidType>::get());
+                pUnoArgs[i].setValue(0, cppu::UnoType<void>::get());
                 break;
             }
         }
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index ad6abd3e88ff..34d147b9aa7f 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -1061,7 +1061,7 @@ OUString SwDocInfoField::Expand() const
             uno::Any aAny;
             if( xSetInfo->hasPropertyByName( aName ) )
                 aAny = xSet->getPropertyValue( aName );
-            if ( aAny.getValueType() != cppu::UnoType<cppu::UnoVoidType>::get() )
+            if ( aAny.getValueType() != cppu::UnoType<void>::get() )
             {
                 // "void" type means that the property has not been inserted until now
                 if ( !IsFixed() )
diff --git a/sw/source/core/unocore/unobkm.cxx b/sw/source/core/unocore/unobkm.cxx
index f3cba345bcd1..64e4bdbb7a0f 100644
--- a/sw/source/core/unocore/unobkm.cxx
+++ b/sw/source/core/unocore/unobkm.cxx
@@ -543,7 +543,7 @@ sal_Bool SwXFieldmarkParameters::hasByName(const OUString& aName)
 uno::Type SwXFieldmarkParameters::getElementType()
     throw (uno::RuntimeException, std::exception)
 {
-    return ::cppu::UnoType< ::cppu::UnoVoidType>::get();
+    return ::cppu::UnoType<void>::get();
 }
 
 sal_Bool SwXFieldmarkParameters::hasElements()
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx
index b783fc9d8b5e..47d9dce0b151 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -872,7 +872,7 @@ void setNumberingProperty(const Any& rValue, SwPaM& rPam)
             }
         }
     }
-    else if ( rValue.getValueType() == cppu::UnoType<cppu::UnoVoidType>::get() )
+    else if ( rValue.getValueType() == cppu::UnoType<void>::get() )
     {
         rPam.GetDoc()->DelNumRules(rPam);
     }
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index 3c0386c58a07..372c297dc34c 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -3117,9 +3117,9 @@ void SAL_CALL SwXTextFrame::release(  )throw()
     throw (uno::RuntimeException, std::exception)
 {
     ::uno::Any aRet = SwXFrame::queryInterface(aType);
-    if(aRet.getValueType() == cppu::UnoType<cppu::UnoVoidType>::get())
+    if(aRet.getValueType() == cppu::UnoType<void>::get())
         aRet = SwXText::queryInterface(aType);
-    if(aRet.getValueType() == cppu::UnoType<cppu::UnoVoidType>::get())
+    if(aRet.getValueType() == cppu::UnoType<void>::get())
         aRet = SwXTextFrameBaseClass::queryInterface(aType);
     return aRet;
 }
@@ -3401,7 +3401,7 @@ void SAL_CALL SwXTextGraphicObject::release(  )throw()
     throw(uno::RuntimeException, std::exception)
 {
     ::uno::Any aRet = SwXFrame::queryInterface(aType);
-    if(aRet.getValueType() == cppu::UnoType<cppu::UnoVoidType>::get())
+    if(aRet.getValueType() == cppu::UnoType<void>::get())
         aRet = SwXTextGraphicObjectBaseClass::queryInterface(aType);
     return aRet;
 }
@@ -3533,7 +3533,7 @@ void SAL_CALL SwXTextEmbeddedObject::release()throw()
     throw( uno::RuntimeException, std::exception)
 {
     ::uno::Any aRet = SwXFrame::queryInterface(aType);;
-    if(aRet.getValueType() == cppu::UnoType<cppu::UnoVoidType>::get())
+    if(aRet.getValueType() == cppu::UnoType<void>::get())
         aRet = SwXTextEmbeddedObjectBaseClass::queryInterface(aType);
     return aRet;
 }
diff --git a/sw/source/core/unocore/unoftn.cxx b/sw/source/core/unocore/unoftn.cxx
index 990b6c79390d..2cd8b2440f57 100644
--- a/sw/source/core/unocore/unoftn.cxx
+++ b/sw/source/core/unocore/unoftn.cxx
@@ -232,7 +232,7 @@ SwXFootnote::queryInterface(const uno::Type& rType)
 throw (uno::RuntimeException, std::exception)
 {
     const uno::Any ret = SwXFootnote_Base::queryInterface(rType);
-    return (ret.getValueType() == cppu::UnoType<cppu::UnoVoidType>::get())
+    return (ret.getValueType() == cppu::UnoType<void>::get())
         ?   SwXText::queryInterface(rType)
         :   ret;
 }
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index 887149b3097e..444763fa2b1e 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -477,7 +477,7 @@ SwUnoCursorHelper::SetCursorPropertyValue(
 throw (lang::IllegalArgumentException, uno::RuntimeException, uno::DeploymentException)
 {
     if (!(rEntry.nFlags & beans::PropertyAttribute::MAYBEVOID) &&
-        (rValue.getValueType() == cppu::UnoType<cppu::UnoVoidType>::get()))
+        (rValue.getValueType() == cppu::UnoType<void>::get()))
     {
         return false;
     }
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 8986268d449c..e3253e3701f0 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -882,7 +882,7 @@ uno::Any SAL_CALL SwXCell::queryInterface( const uno::Type& aType )
     throw (uno::RuntimeException, std::exception)
 {
     uno::Any aRet = SwXCellBaseClass::queryInterface(aType);
-    if(aRet.getValueType() == cppu::UnoType<cppu::UnoVoidType>::get())
+    if(aRet.getValueType() == cppu::UnoType<void>::get())
         aRet = SwXText::queryInterface(aType);
     return aRet;
 }
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index 0382c4c2b8f1..6d6c74233013 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -2416,7 +2416,7 @@ throw (uno::RuntimeException, std::exception)
     {
         aRet = SwXText::queryInterface( rType );
     }
-    if(aRet.getValueType() == cppu::UnoType<cppu::UnoVoidType>::get())
+    if(aRet.getValueType() == cppu::UnoType<void>::get())
     {
         aRet = OWeakAggObject::queryAggregation( rType );
     }
@@ -2442,7 +2442,7 @@ SwXBodyText::queryInterface(const uno::Type& rType)
 throw (uno::RuntimeException, std::exception)
 {
     const uno::Any ret = SwXText::queryInterface(rType);
-    return (ret.getValueType() == cppu::UnoType<cppu::UnoVoidType>::get())
+    return (ret.getValueType() == cppu::UnoType<void>::get())
         ?   SwXBodyText_Base::queryInterface(rType)
         :   ret;
 }
@@ -2718,7 +2718,7 @@ SwXHeadFootText::queryInterface(const uno::Type& rType)
 throw (uno::RuntimeException, std::exception)
 {
     const uno::Any ret = SwXHeadFootText_Base::queryInterface(rType);
-    return (ret.getValueType() == cppu::UnoType<cppu::UnoVoidType>::get())
+    return (ret.getValueType() == cppu::UnoType<void>::get())
         ?   SwXText::queryInterface(rType)
         :   ret;
 }
diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx
index f3ec09a87a79..d11447bf8a28 100644
--- a/sw/source/filter/html/htmlforw.cxx
+++ b/sw/source/filter/html/htmlforw.cxx
@@ -844,7 +844,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
                 }
 
                 aTmp = xPropSet->getPropertyValue( "HScroll" );
-                if( aTmp.getValueType() == cppu::UnoType<cppu::UnoVoidType>::get() ||
+                if( aTmp.getValueType() == cppu::UnoType<void>::get() ||
                     (aTmp.getValueType() == cppu::UnoType<bool>::get() &&
                     !*static_cast<sal_Bool const *>(aTmp.getValue())) )
                 {
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index 55e4c0a86c43..15b9a96a1091 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -1163,7 +1163,7 @@ void SwXTextDocument::printPages(const Sequence< beans::PropertyValue >& xOption
                     FileBase::getSystemPathFromFileURL ( sFileURL, sSystemPath );
                     aReq.AppendItem(SfxStringItem( SID_FILE_NAME, sSystemPath ) );
                 }
-                else if ( rProp.Value.getValueType() != cppu::UnoType<cppu::UnoVoidType>::get() )
+                else if ( rProp.Value.getValueType() != cppu::UnoType<void>::get() )
                     throw IllegalArgumentException();
             }
 
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;
diff --git a/ucbhelper/source/provider/resultsetmetadata.cxx b/ucbhelper/source/provider/resultsetmetadata.cxx
index 30a142203207..ef2b2ae0c457 100644
--- a/ucbhelper/source/provider/resultsetmetadata.cxx
+++ b/ucbhelper/source/provider/resultsetmetadata.cxx
@@ -405,7 +405,7 @@ sal_Int32 SAL_CALL ResultSetMetaData::getColumnType( sal_Int32 column )
         return DataType::SQLNULL;
 
     if ( m_aProps.getConstArray()[ column - 1 ].Type
-            == cppu::UnoType<cppu::UnoVoidType>::get() )
+            == cppu::UnoType<void>::get() )
     {
         // No type given. Try UCB's Properties Manager...
 
diff --git a/xmlhelp/source/cxxhelp/inc/tvread.hxx b/xmlhelp/source/cxxhelp/inc/tvread.hxx
index 09090e2d615f..70449f8a1f65 100644
--- a/xmlhelp/source/cxxhelp/inc/tvread.hxx
+++ b/xmlhelp/source/cxxhelp/inc/tvread.hxx
@@ -79,7 +79,7 @@ namespace treeview {
         getElementType(  )
             throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE
         {
-            return cppu::UnoType<cppu::UnoVoidType>::get();
+            return cppu::UnoType<void>::get();
         }
 
         virtual sal_Bool SAL_CALL hasElements()
diff --git a/xmlhelp/source/cxxhelp/provider/contentcaps.cxx b/xmlhelp/source/cxxhelp/provider/contentcaps.cxx
index 3314b83af618..15ad6ba6af76 100644
--- a/xmlhelp/source/cxxhelp/provider/contentcaps.cxx
+++ b/xmlhelp/source/cxxhelp/provider/contentcaps.cxx
@@ -167,12 +167,12 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
         ucb::CommandInfo(
             "getCommandInfo",
             -1,
-            cppu::UnoType<cppu::UnoVoidType>::get()
+            cppu::UnoType<void>::get()
         ),
         ucb::CommandInfo(
             "getPropertySetInfo",
             -1,
-            cppu::UnoType<cppu::UnoVoidType>::get()
+            cppu::UnoType<void>::get()
         ),
         ucb::CommandInfo(
             "getPropertyValues",
diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx
index ceda8bde9e4a..3aa6200f2976 100644
--- a/xmloff/source/forms/propertyimport.cxx
+++ b/xmloff/source/forms/propertyimport.cxx
@@ -234,7 +234,7 @@ Any PropertyConversion::convertString( const ::com::sun::star::uno::Type& _rExpe
 
 Type PropertyConversion::xmlTypeToUnoType( const OUString& _rType )
 {
-    Type aUnoType( cppu::UnoType<cppu::UnoVoidType>::get() );
+    Type aUnoType( cppu::UnoType<void>::get() );
 
     static std::map< OUString, css::uno::Type > s_aTypeNameMap;
     if ( s_aTypeNameMap.empty() )
@@ -247,7 +247,7 @@ Type PropertyConversion::xmlTypeToUnoType( const OUString& _rType )
         // C++ type "float" to "double" makes absolute sense
         s_aTypeNameMap[ token::GetXMLToken( token::XML_FLOAT )   ] = ::cppu::UnoType<double>::get();
         s_aTypeNameMap[ token::GetXMLToken( token::XML_STRING )  ] = ::cppu::UnoType<OUString>::get();
-        s_aTypeNameMap[ token::GetXMLToken( token::XML_VOID )    ] = cppu::UnoType<cppu::UnoVoidType>::get();
+        s_aTypeNameMap[ token::GetXMLToken( token::XML_VOID )    ] = cppu::UnoType<void>::get();
     }
 
     const std::map< OUString, css::uno::Type >::iterator aTypePos = s_aTypeNameMap.find( _rType );