Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part6

Change-Id: Ib523206d67ad13416557be1b37a58ba7a9791ca5

12 files changed, 91 insertions, 91 deletions

diff --git a/sw/source/core/fields/textapi.cxx b/sw/source/core/fields/textapi.cxx
index c5ded1779349..944b48ed384c 100644
--- a/sw/source/core/fields/textapi.cxx
+++ b/sw/source/core/fields/textapi.cxx
@@ -40,7 +40,7 @@ static const SvxItemPropertySet* ImplGetSvxTextPortionPropertySet()
         {OUString("TextField"),                 EE_FEATURE_FIELD,
             ::getCppuType((const uno::Reference< text::XTextField >*)0), beans::PropertyAttribute::READONLY, 0 },
         {OUString("TextPortionType"),           WID_PORTIONTYPE,
-            ::getCppuType((const OUString*)0), beans::PropertyAttribute::READONLY, 0 },
+            ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0 },
         {OUString("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS,
             ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0), 0, 0},
         {OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS,
diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx
index 8b89a2ef9325..446e104488ca 100644
--- a/sw/source/core/txtnode/fmtatr2.cxx
+++ b/sw/source/core/txtnode/fmtatr2.cxx
@@ -341,7 +341,7 @@ bool SwFmtINetFmt::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId  )
     else
     {
         // all string properties:
-        if(rVal.getValueType() != ::getCppuType((OUString*)0))
+        if(rVal.getValueType() != ::cppu::UnoType<OUString>::get())
             return false;
 
         switch(nMemberId)
diff --git a/sw/source/core/uibase/dbui/mailmergehelper.cxx b/sw/source/core/uibase/dbui/mailmergehelper.cxx
index 29534423fae2..1d3826ac745e 100644
--- a/sw/source/core/uibase/dbui/mailmergehelper.cxx
+++ b/sw/source/core/uibase/dbui/mailmergehelper.cxx
@@ -727,7 +727,7 @@ uno::Sequence< datatransfer::DataFlavor > SwMailTransferable::getTransferDataFla
     aRet[0].MimeType = m_aMimeType;
     if( m_bIsBody )
     {
-        aRet[0].DataType = getCppuType((OUString*)0);
+        aRet[0].DataType = cppu::UnoType<OUString>::get();
     }
     else
     {
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index 9ee4087ce328..722910248734 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -225,7 +225,7 @@ public:
     // XElemenAccess
     virtual ::com::sun::star::uno::Type SAL_CALL getElementType(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
     {
-        return ::getCppuType((const OUString*)0);
+        return ::cppu::UnoType<OUString>::get();
     }
     virtual sal_Bool SAL_CALL hasElements(  ) throw (::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE
     {
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index 8d60f0111e22..fb8fce715e7f 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -2281,7 +2281,7 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName)
         throw uno::RuntimeException();
 
     //UUUU
-    if(pEntry && pEntry->aType == ::getCppuType((const sal_Int16*)0) && pEntry->aType != aAny.getValueType())
+    if(pEntry && pEntry->aType == ::cppu::UnoType<sal_Int16>::get() && pEntry->aType != aAny.getValueType())
     {
         // since the sfx uint16 item now exports a sal_Int32, we may have to fix this here
         sal_Int32 nValue = 0;
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index 32c1c7aca76c..3b0d8ce78e0e 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -2827,7 +2827,7 @@ bool SwUnoCursorHelper::ConvertSortProperties(
             sal_uInt16 nIndex = rPropName[17];
             nIndex -= '0';
             sal_Int16 nCol = -1;
-            if (aValue.getValueType() == ::getCppuType((const sal_Int16*)0)
+            if (aValue.getValueType() == ::cppu::UnoType<sal_Int16>::get()
                 && nIndex < 3)
             {
                 aValue >>= nCol;
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index 7abf06178c8a..790b4eaaf753 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -113,18 +113,18 @@ const SfxItemPropertySet* GetFootnoteSet()
 {
     static const SfxItemPropertyMapEntry aFootnoteMap_Impl[] =
     {
-        { OUString(UNO_NAME_ANCHOR_CHAR_STYLE_NAME),WID_ANCHOR_CHARACTER_STYLE, ::getCppuType((const OUString*)0), PROPERTY_NONE,     0},
-        { OUString(UNO_NAME_BEGIN_NOTICE),          WID_BEGIN_NOTICE,       ::getCppuType((const OUString*)0), PROPERTY_NONE,     0},
-        { OUString(UNO_NAME_CHAR_STYLE_NAME),       WID_CHARACTER_STYLE,    ::getCppuType((const OUString*)0), PROPERTY_NONE,     0},
-        { OUString(UNO_NAME_END_NOTICE),            WID_END_NOTICE ,        ::getCppuType((const OUString*)0), PROPERTY_NONE,     0},
-        { OUString(UNO_NAME_FOOTNOTE_COUNTING),     WID_FOOTNOTE_COUNTING,  ::getCppuType((const sal_Int16*)0), PROPERTY_NONE,     0},
-        { OUString(UNO_NAME_NUMBERING_TYPE),        WID_NUMBERING_TYPE,     ::getCppuType((const sal_Int16*)0), PROPERTY_NONE,         0},
-        { OUString(UNO_NAME_PAGE_STYLE_NAME),       WID_PAGE_STYLE,         ::getCppuType((const OUString*)0), PROPERTY_NONE,     0},
-        { OUString(UNO_NAME_PARA_STYLE_NAME),       WID_PARAGRAPH_STYLE,    ::getCppuType((const OUString*)0), PROPERTY_NONE,     0},
+        { OUString(UNO_NAME_ANCHOR_CHAR_STYLE_NAME),WID_ANCHOR_CHARACTER_STYLE, ::cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
+        { OUString(UNO_NAME_BEGIN_NOTICE),          WID_BEGIN_NOTICE,       ::cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
+        { OUString(UNO_NAME_CHAR_STYLE_NAME),       WID_CHARACTER_STYLE,    ::cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
+        { OUString(UNO_NAME_END_NOTICE),            WID_END_NOTICE ,        ::cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
+        { OUString(UNO_NAME_FOOTNOTE_COUNTING),     WID_FOOTNOTE_COUNTING,  ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,     0},
+        { OUString(UNO_NAME_NUMBERING_TYPE),        WID_NUMBERING_TYPE,     ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,         0},
+        { OUString(UNO_NAME_PAGE_STYLE_NAME),       WID_PAGE_STYLE,         ::cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
+        { OUString(UNO_NAME_PARA_STYLE_NAME),       WID_PARAGRAPH_STYLE,    ::cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
         { OUString(UNO_NAME_POSITION_END_OF_DOC),   WID_POSITION_END_OF_DOC,::getBooleanCppuType(), PROPERTY_NONE,         0},
-        { OUString(UNO_NAME_PREFIX),                WID_PREFIX,             ::getCppuType((const OUString*)0), PROPERTY_NONE,     0},
-        { OUString(UNO_NAME_START_AT),              WID_START_AT ,          ::getCppuType((const sal_Int16*)0), PROPERTY_NONE,         0},
-        { OUString(UNO_NAME_SUFFIX),                WID_SUFFIX,             ::getCppuType((const OUString*)0), PROPERTY_NONE,     0},
+        { OUString(UNO_NAME_PREFIX),                WID_PREFIX,             ::cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
+        { OUString(UNO_NAME_START_AT),              WID_START_AT ,          ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,         0},
+        { OUString(UNO_NAME_SUFFIX),                WID_SUFFIX,             ::cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
         { OUString(), 0, css::uno::Type(), 0, 0 }
     };
     static const SfxItemPropertySet aFootnoteSet_Impl(aFootnoteMap_Impl);
@@ -135,14 +135,14 @@ const SfxItemPropertySet* GetEndnoteSet()
 {
     static const SfxItemPropertyMapEntry aEndnoteMap_Impl[] =
     {
-        { OUString(UNO_NAME_ANCHOR_CHAR_STYLE_NAME),WID_ANCHOR_CHARACTER_STYLE, ::getCppuType((const OUString*)0), PROPERTY_NONE,     0},
-        { OUString(UNO_NAME_CHAR_STYLE_NAME),       WID_CHARACTER_STYLE,    ::getCppuType((const OUString*)0), PROPERTY_NONE,     0},
-        { OUString(UNO_NAME_NUMBERING_TYPE),        WID_NUMBERING_TYPE,     ::getCppuType((const sal_Int16*)0), PROPERTY_NONE,         0},
-        { OUString(UNO_NAME_PAGE_STYLE_NAME),       WID_PAGE_STYLE,         ::getCppuType((const OUString*)0), PROPERTY_NONE,     0},
-        { OUString(UNO_NAME_PARA_STYLE_NAME),       WID_PARAGRAPH_STYLE,    ::getCppuType((const OUString*)0), PROPERTY_NONE,     0},
-        { OUString(UNO_NAME_PREFIX),                WID_PREFIX,     ::getCppuType((const OUString*)0), PROPERTY_NONE,     0},
-        { OUString(UNO_NAME_START_AT),              WID_START_AT ,          ::getCppuType((const sal_Int16*)0), PROPERTY_NONE,         0},
-        { OUString(UNO_NAME_SUFFIX),                WID_SUFFIX,     ::getCppuType((const OUString*)0), PROPERTY_NONE,     0},
+        { OUString(UNO_NAME_ANCHOR_CHAR_STYLE_NAME),WID_ANCHOR_CHARACTER_STYLE, ::cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
+        { OUString(UNO_NAME_CHAR_STYLE_NAME),       WID_CHARACTER_STYLE,    ::cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
+        { OUString(UNO_NAME_NUMBERING_TYPE),        WID_NUMBERING_TYPE,     ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,         0},
+        { OUString(UNO_NAME_PAGE_STYLE_NAME),       WID_PAGE_STYLE,         ::cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
+        { OUString(UNO_NAME_PARA_STYLE_NAME),       WID_PARAGRAPH_STYLE,    ::cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
+        { OUString(UNO_NAME_PREFIX),                WID_PREFIX,     ::cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
+        { OUString(UNO_NAME_START_AT),              WID_START_AT ,          ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE,         0},
+        { OUString(UNO_NAME_SUFFIX),                WID_SUFFIX,     ::cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
         { OUString(), 0, css::uno::Type(), 0, 0 }
     };
     static const SfxItemPropertySet aEndnoteSet_Impl(aEndnoteMap_Impl);
@@ -156,9 +156,9 @@ const SfxItemPropertySet* GetNumberingRulesSet()
         { OUString(UNO_NAME_IS_ABSOLUTE_MARGINS),       WID_IS_ABS_MARGINS, ::getBooleanCppuType(),            PROPERTY_NONE,     0},
         { OUString(UNO_NAME_IS_AUTOMATIC),              WID_IS_AUTOMATIC,   ::getBooleanCppuType(),            PROPERTY_NONE,     0},
         { OUString(UNO_NAME_IS_CONTINUOUS_NUMBERING),   WID_CONTINUOUS,     ::getBooleanCppuType(),            PROPERTY_NONE,     0},
-        { OUString(UNO_NAME_NAME),                      WID_RULE_NAME   ,   ::getCppuType((const OUString*)0), PropertyAttribute::READONLY,     0},
+        { OUString(UNO_NAME_NAME),                      WID_RULE_NAME   ,   ::cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY,     0},
         { OUString(UNO_NAME_NUMBERING_IS_OUTLINE),      WID_IS_OUTLINE, ::getBooleanCppuType(),            PROPERTY_NONE,     0},
-        { OUString(UNO_NAME_DEFAULT_LIST_ID),           WID_DEFAULT_LIST_ID, ::getCppuType((const OUString*)0), PropertyAttribute::READONLY, 0},
+        { OUString(UNO_NAME_DEFAULT_LIST_ID),           WID_DEFAULT_LIST_ID, ::cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
         { OUString(), 0, css::uno::Type(), 0, 0 }
     };
     static const SfxItemPropertySet  aNumberingRulesSet_Impl( aNumberingRulesMap_Impl );
@@ -180,17 +180,17 @@ const SfxItemPropertySet* GetLineNumberingSet()
 {
     static const SfxItemPropertyMapEntry aLineNumberingMap_Impl[] =
     {
-        { OUString(UNO_NAME_CHAR_STYLE_NAME),         WID_CHARACTER_STYLE,    ::getCppuType((const OUString*)0), PROPERTY_NONE,     0},
+        { OUString(UNO_NAME_CHAR_STYLE_NAME),         WID_CHARACTER_STYLE,    ::cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
         { OUString(UNO_NAME_COUNT_EMPTY_LINES),       WID_COUNT_EMPTY_LINES , ::getBooleanCppuType(),PROPERTY_NONE,     0},
         { OUString(UNO_NAME_COUNT_LINES_IN_FRAMES),   WID_COUNT_LINES_IN_FRAMES, ::getBooleanCppuType(),PROPERTY_NONE,     0},
-        { OUString(UNO_NAME_DISTANCE),                WID_DISTANCE       ,    ::getCppuType((const sal_Int32*)0),PROPERTY_NONE,     0},
+        { OUString(UNO_NAME_DISTANCE),                WID_DISTANCE       ,    ::cppu::UnoType<sal_Int32>::get(),PROPERTY_NONE,     0},
         { OUString(UNO_NAME_IS_ON),                   WID_NUM_ON,             ::getBooleanCppuType()  ,          PROPERTY_NONE,     0},
-        { OUString(UNO_NAME_INTERVAL),                WID_INTERVAL  ,       ::getCppuType((const sal_Int16*)0),PROPERTY_NONE,     0},
-        { OUString(UNO_NAME_SEPARATOR_TEXT),          WID_SEPARATOR_TEXT,   ::getCppuType((const OUString*)0), PROPERTY_NONE,     0},
-        { OUString(UNO_NAME_NUMBER_POSITION),         WID_NUMBER_POSITION,    ::getCppuType((const sal_Int16*)0),PROPERTY_NONE,     0},
-        { OUString(UNO_NAME_NUMBERING_TYPE),          WID_NUMBERING_TYPE ,    ::getCppuType((const sal_Int16*)0),PROPERTY_NONE,     0},
+        { OUString(UNO_NAME_INTERVAL),                WID_INTERVAL  ,       ::cppu::UnoType<sal_Int16>::get(),PROPERTY_NONE,     0},
+        { OUString(UNO_NAME_SEPARATOR_TEXT),          WID_SEPARATOR_TEXT,   ::cppu::UnoType<OUString>::get(), PROPERTY_NONE,     0},
+        { OUString(UNO_NAME_NUMBER_POSITION),         WID_NUMBER_POSITION,    ::cppu::UnoType<sal_Int16>::get(),PROPERTY_NONE,     0},
+        { OUString(UNO_NAME_NUMBERING_TYPE),          WID_NUMBERING_TYPE ,    ::cppu::UnoType<sal_Int16>::get(),PROPERTY_NONE,     0},
         { OUString(UNO_NAME_RESTART_AT_EACH_PAGE),    WID_RESTART_AT_EACH_PAGE, ::getBooleanCppuType()  ,          PROPERTY_NONE,     0},
-        { OUString(UNO_NAME_SEPARATOR_INTERVAL),      WID_SEPARATOR_INTERVAL, ::getCppuType((const sal_Int16*)0),PROPERTY_NONE,     0},
+        { OUString(UNO_NAME_SEPARATOR_INTERVAL),      WID_SEPARATOR_INTERVAL, ::cppu::UnoType<sal_Int16>::get(),PROPERTY_NONE,     0},
         { OUString(), 0, css::uno::Type(), 0, 0 }
     };
     static const SfxItemPropertySet aLineNumberingSet_Impl(aLineNumberingMap_Impl);
@@ -1340,22 +1340,22 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex(
     //adjust
     SvxAdjust eAdj = rFmt.GetNumAdjust();
     sal_Int16 nINT16 = aSvxToUnoAdjust[(sal_uInt16)eAdj];
-    PropValData* pData = new PropValData((void*)&nINT16, "Adjust", ::getCppuType((const sal_Int16*)0) );
+    PropValData* pData = new PropValData((void*)&nINT16, "Adjust", ::cppu::UnoType<sal_Int16>::get() );
     aPropertyValues.push_back(pData);
 
     //parentnumbering
     nINT16 = rFmt.GetIncludeUpperLevels();
-    pData = new PropValData((void*)&nINT16, "ParentNumbering", ::getCppuType((const sal_Int16*)0));
+    pData = new PropValData((void*)&nINT16, "ParentNumbering", ::cppu::UnoType<sal_Int16>::get());
     aPropertyValues.push_back(pData);
 
     //prefix
     OUString aUString = rFmt.GetPrefix();
-    pData = new PropValData((void*)&aUString, "Prefix", ::getCppuType((const OUString*)0));
+    pData = new PropValData((void*)&aUString, "Prefix", ::cppu::UnoType<OUString>::get());
     aPropertyValues.push_back(pData);
 
     //suffix
     aUString = rFmt.GetSuffix();
-    pData = new PropValData((void*)&aUString, "Suffix", ::getCppuType((const OUString*)0));
+    pData = new PropValData((void*)&aUString, "Suffix", ::cppu::UnoType<OUString>::get());
     aPropertyValues.push_back(pData);
 
     //char style name
@@ -1372,29 +1372,29 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex(
 
     aUString = OUString();
     SwStyleNameMapper::FillProgName( CharStyleName, aUString, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true );
-    pData = new PropValData((void*)&aUString, "CharStyleName", ::getCppuType((const OUString*)0));
+    pData = new PropValData((void*)&aUString, "CharStyleName", ::cppu::UnoType<OUString>::get());
     aPropertyValues.push_back(pData);
 
     //startvalue
     nINT16 = rFmt.GetStart();
-    pData = new PropValData((void*)&nINT16, "StartWith", ::getCppuType((const sal_Int16*)0));
+    pData = new PropValData((void*)&nINT16, "StartWith", ::cppu::UnoType<sal_Int16>::get());
     aPropertyValues.push_back(pData);
 
     if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
     {
         //leftmargin
         sal_Int32 nINT32 = convertTwipToMm100(rFmt.GetAbsLSpace());
-        pData = new PropValData((void*)&nINT32, UNO_NAME_LEFT_MARGIN, ::getCppuType((const sal_Int32*)0));
+        pData = new PropValData((void*)&nINT32, UNO_NAME_LEFT_MARGIN, ::cppu::UnoType<sal_Int32>::get());
         aPropertyValues.push_back(pData);
 
         //chartextoffset
         nINT32 = convertTwipToMm100(rFmt.GetCharTextDistance());
-        pData = new PropValData((void*)&nINT32, UNO_NAME_SYMBOL_TEXT_DISTANCE, ::getCppuType((const sal_Int32*)0));
+        pData = new PropValData((void*)&nINT32, UNO_NAME_SYMBOL_TEXT_DISTANCE, ::cppu::UnoType<sal_Int32>::get());
         aPropertyValues.push_back(pData);
 
         //firstlineoffset
         nINT32 = convertTwipToMm100(rFmt.GetFirstLineOffset());
-        pData = new PropValData((void*)&nINT32, UNO_NAME_FIRST_LINE_OFFSET, ::getCppuType((const sal_Int32*)0));
+        pData = new PropValData((void*)&nINT32, UNO_NAME_FIRST_LINE_OFFSET, ::cppu::UnoType<sal_Int32>::get());
         aPropertyValues.push_back(pData);
     }
 
@@ -1406,7 +1406,7 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex(
     }
     pData = new PropValData( (void*)&nINT16,
                              UNO_NAME_POSITION_AND_SPACE_MODE,
-                             ::getCppuType((const sal_Int16*)0) );
+                             ::cppu::UnoType<sal_Int16>::get() );
     aPropertyValues.push_back(pData);
 
     if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
@@ -1423,34 +1423,34 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex(
         }
         pData = new PropValData( (void*)&nINT16,
                                  UNO_NAME_LABEL_FOLLOWED_BY,
-                                 ::getCppuType((const sal_Int16*)0) );
+                                 ::cppu::UnoType<sal_Int16>::get() );
         aPropertyValues.push_back(pData);
 
         // ListtabStopPosition
         sal_Int32 nINT32 = convertTwipToMm100(rFmt.GetListtabPos());
         pData = new PropValData( (void*)&nINT32,
                                  UNO_NAME_LISTTAB_STOP_POSITION,
-                                 ::getCppuType((const sal_Int32*)0));
+                                 ::cppu::UnoType<sal_Int32>::get());
         aPropertyValues.push_back(pData);
 
         // FirstLineIndent
         nINT32 = convertTwipToMm100(rFmt.GetFirstLineIndent());
         pData = new PropValData( (void*)&nINT32,
                                  UNO_NAME_FIRST_LINE_INDENT,
-                                 ::getCppuType((const sal_Int32*)0));
+                                 ::cppu::UnoType<sal_Int32>::get());
         aPropertyValues.push_back(pData);
 
         // IndentAt
         nINT32 = convertTwipToMm100(rFmt.GetIndentAt());
         pData = new PropValData( (void*)&nINT32,
                                  UNO_NAME_INDENT_AT,
-                                 ::getCppuType((const sal_Int32*)0));
+                                 ::cppu::UnoType<sal_Int32>::get());
         aPropertyValues.push_back(pData);
     }
 
     //numberingtype
     nINT16 = rFmt.GetNumberingType();
-    pData = new PropValData((void*)&nINT16, "NumberingType", ::getCppuType((const sal_Int16*)0));
+    pData = new PropValData((void*)&nINT16, "NumberingType", ::cppu::UnoType<sal_Int16>::get());
     aPropertyValues.push_back(pData);
 
     if(!bChapterNum)
@@ -1459,19 +1459,19 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex(
         {
             //BulletId
             nINT16 = rFmt.GetBulletChar();
-            pData = new PropValData((void*)&nINT16, "BulletId", ::getCppuType((const sal_Int16*)0));
+            pData = new PropValData((void*)&nINT16, "BulletId", ::cppu::UnoType<sal_Int16>::get());
             aPropertyValues.push_back(pData);
 
             const Font* pFont = rFmt.GetBulletFont();
 
             //BulletChar
             aUString = OUString(rFmt.GetBulletChar());
-            pData = new PropValData((void*)&aUString, "BulletChar", ::getCppuType((const OUString*)0));
+            pData = new PropValData((void*)&aUString, "BulletChar", ::cppu::UnoType<OUString>::get());
             aPropertyValues.push_back(pData);
 
             //BulletFontName
             aUString = pFont ? pFont->GetStyleName() : OUString();
-            pData = new PropValData((void*)&aUString, "BulletFontName", ::getCppuType((const OUString*)0));
+            pData = new PropValData((void*)&aUString, "BulletFontName", ::cppu::UnoType<OUString>::get());
             aPropertyValues.push_back(pData);
 
             //BulletFont
@@ -1495,7 +1495,7 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex(
             }
             else
                 aUString = OUString();
-            pData = new PropValData((void*)&aUString, UNO_NAME_GRAPHIC_URL, ::getCppuType((const OUString*)0));
+            pData = new PropValData((void*)&aUString, UNO_NAME_GRAPHIC_URL, ::cppu::UnoType<OUString>::get());
             aPropertyValues.push_back(pData);
 
             //graphicbitmap
@@ -1519,7 +1519,7 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex(
             const SwFmtVertOrient* pOrient = rFmt.GetGraphicOrientation();
             if(pOrient)
             {
-                pData = new PropValData((void*)0, UNO_NAME_VERT_ORIENT, ::getCppuType((const sal_Int16*)0));
+                pData = new PropValData((void*)0, UNO_NAME_VERT_ORIENT, ::cppu::UnoType<sal_Int16>::get());
                 ((const SfxPoolItem*)pOrient)->QueryValue(pData->aVal, MID_VERTORIENT_ORIENT);
                 aPropertyValues.push_back(pData);
             }
@@ -1555,7 +1555,7 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex(
         aUString = OUString();
         SwStyleNameMapper::FillProgName(sValue, aUString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true);
 
-        pData = new PropValData((void*)&aUString, UNO_NAME_HEADING_STYLE_NAME, ::getCppuType((const OUString*)0));
+        pData = new PropValData((void*)&aUString, UNO_NAME_HEADING_STYLE_NAME, ::cppu::UnoType<OUString>::get());
         aPropertyValues.push_back(pData);
     }
 
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index cef2bb0ec8c5..264bb6c14d21 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -1930,7 +1930,7 @@ static void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
             if (MID_PAGEDESC_PAGEDESCNAME != nMemberId)
                 break;
             // special handling for RES_PAGEDESC
-            if(aValue.getValueType() != ::getCppuType((const OUString*)0))
+            if(aValue.getValueType() != ::cppu::UnoType<OUString>::get())
                 throw lang::IllegalArgumentException();
             SfxItemSet& rStyleSet = rBase.GetItemSet();
 
@@ -2124,7 +2124,7 @@ static void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
         {
             if( MID_DROPCAP_CHAR_STYLE_NAME == nMemberId)
             {
-                if(aValue.getValueType() == ::getCppuType((const OUString*)0))
+                if(aValue.getValueType() == ::cppu::UnoType<OUString>::get())
                 {
                     SfxItemSet& rStyleSet = rBase.GetItemSet();
 
@@ -2557,7 +2557,7 @@ static uno::Any lcl_GetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
             rPropSet.getPropertyValue(rEntry, rSet, aRet);
 
             //UUUU
-            if(rEntry.aType == ::getCppuType((const sal_Int16*)0) && rEntry.aType != aRet.getValueType())
+            if(rEntry.aType == ::cppu::UnoType<sal_Int16>::get() && rEntry.aType != aRet.getValueType())
             {
                 // since the sfx uint16 item now exports a sal_Int32, we may have to fix this here
                 sal_Int32 nValue = 0;
diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx
index 3dbf7a36b58e..3efec76032f9 100644
--- a/sw/source/filter/html/htmlforw.cxx
+++ b/sw/source/filter/html/htmlforw.cxx
@@ -418,7 +418,7 @@ void SwHTMLWriter::OutHiddenForm( const uno::Reference< form::XForm > & rForm )
             if( xPropSet->getPropertySetInfo()->hasPropertyByName( sPropName ) )
             {
                 uno::Any aAny2 = xPropSet->getPropertyValue( sPropName );
-                if( aAny2.getValueType() == ::getCppuType((sal_Int16*)0) )
+                if( aAny2.getValueType() == ::cppu::UnoType<sal_Int16>::get() )
                 {
                     if( form::FormComponentType::HIDDENCONTROL ==
                                                 *(sal_Int16*)aAny2.getValue() )
@@ -465,7 +465,7 @@ void SwHTMLWriter::OutForm( bool bOn,
 
     uno::Any aTmp = xFormPropSet->getPropertyValue(
                                     OUString("Name") );
-    if( aTmp.getValueType() == ::getCppuType((const OUString*)0) &&
+    if( aTmp.getValueType() == ::cppu::UnoType<OUString>::get() &&
         !((OUString*)aTmp.getValue())->isEmpty() )
     {
         sOut += " " + OString(OOO_STRING_SVTOOLS_HTML_O_name) + "=\"";
@@ -477,7 +477,7 @@ void SwHTMLWriter::OutForm( bool bOn,
 
     aTmp = xFormPropSet->getPropertyValue(
                     OUString("TargetURL") );
-    if( aTmp.getValueType() == ::getCppuType((const OUString*)0) &&
+    if( aTmp.getValueType() == ::cppu::UnoType<OUString>::get() &&
         !((OUString*)aTmp.getValue())->isEmpty() )
     {
         sOut += " " + OString(OOO_STRING_SVTOOLS_HTML_O_action) + "=\"";
@@ -528,7 +528,7 @@ void SwHTMLWriter::OutForm( bool bOn,
 
     aTmp = xFormPropSet->getPropertyValue(
                         OUString("TargetFrame") );
-    if( aTmp.getValueType() == ::getCppuType((const OUString*)0)&&
+    if( aTmp.getValueType() == ::cppu::UnoType<OUString>::get()&&
         !((OUString*)aTmp.getValue())->isEmpty() )
     {
         sOut += " " + OString(OOO_STRING_SVTOOLS_HTML_O_target) + "=\"";
@@ -588,7 +588,7 @@ void SwHTMLWriter::OutHiddenControls(
             continue;
 
         aTmp = xPropSet->getPropertyValue( sPropName );
-        if( aTmp.getValueType() != ::getCppuType((const sal_Int16*)0) )
+        if( aTmp.getValueType() != ::cppu::UnoType<sal_Int16>::get() )
             continue;
 
         if( form::FormComponentType::HIDDENCONTROL ==
@@ -602,7 +602,7 @@ void SwHTMLWriter::OutHiddenControls(
 
             aTmp = xPropSet->getPropertyValue(
                             OUString("Name") );
-            if( aTmp.getValueType() == ::getCppuType((const OUString*)0) &&
+            if( aTmp.getValueType() == ::cppu::UnoType<OUString>::get() &&
                 !((OUString*)aTmp.getValue())->isEmpty() )
             {
                 sOut += " " + OString(OOO_STRING_SVTOOLS_HTML_O_name) + "=\"";
@@ -613,7 +613,7 @@ void SwHTMLWriter::OutHiddenControls(
             }
             aTmp = xPropSet->getPropertyValue(
                             OUString("HiddenValue") );
-            if( aTmp.getValueType() == ::getCppuType((const OUString*)0) &&
+            if( aTmp.getValueType() == ::cppu::UnoType<OUString>::get() &&
                 !((OUString*)aTmp.getValue())->isEmpty() )
             {
                 sOut += " " + OString(OOO_STRING_SVTOOLS_HTML_O_value) + "=\"";
@@ -665,7 +665,7 @@ const SdrObject *SwHTMLWriter::GetHTMLControl( const SwDrawFrmFmt& rFmt )
         return 0;
 
     uno::Any aTmp = xPropSet->getPropertyValue( sPropName );
-    if( aTmp.getValueType() == ::getCppuType((const sal_Int16*)0)&&
+    if( aTmp.getValueType() == ::cppu::UnoType<sal_Int16>::get()&&
         lcl_html_isHTMLControl( *(sal_Int16*) aTmp.getValue() ) )
     {
         return pObj;
@@ -756,7 +756,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
                     ? TYPE_CHECKBOX : TYPE_RADIO);
         aTmp = xPropSet->getPropertyValue(
                         OUString("DefaultState") );
-        if( aTmp.getValueType() == ::getCppuType((const sal_Int16*)0) &&
+        if( aTmp.getValueType() == ::cppu::UnoType<sal_Int16>::get() &&
             TRISTATE_FALSE != *(sal_Int16*) aTmp.getValue() )
         {
             sOptions += " " + OString(OOO_STRING_SVTOOLS_HTML_O_checked);
@@ -764,7 +764,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
 
         aTmp = xPropSet->getPropertyValue(
                         OUString("RefValue") );
-        if( aTmp.getValueType() == ::getCppuType((const OUString*)0) )
+        if( aTmp.getValueType() == ::cppu::UnoType<OUString>::get() )
 
         {
             const OUString& rVal = *(OUString*)aTmp.getValue();
@@ -799,7 +799,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
 
             aTmp = xPropSet->getPropertyValue(
                             OUString("Label") );
-            if( aTmp.getValueType() == ::getCppuType((const OUString*)0) &&
+            if( aTmp.getValueType() == ::cppu::UnoType<OUString>::get() &&
                 !((OUString*)aTmp.getValue())->isEmpty() )
             {
                 sValue = *(OUString*)aTmp.getValue();
@@ -891,7 +891,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
                 if( xPropSetInfo->hasPropertyByName( sEchoChar ) )
                 {
                     aTmp = xPropSet->getPropertyValue( sEchoChar );
-                    if( aTmp.getValueType() == ::getCppuType((const sal_Int16*)0) &&
+                    if( aTmp.getValueType() == ::cppu::UnoType<sal_Int16>::get() &&
                         *(sal_Int16*)aTmp.getValue() != 0 )
                         eType = TYPE_PASSWORD;
                 }
@@ -904,7 +904,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
 
                 aTmp = xPropSet->getPropertyValue(
                             OUString("MaxTextLen") );
-                if( aTmp.getValueType() == ::getCppuType((const sal_Int16*)0) &&
+                if( aTmp.getValueType() == ::cppu::UnoType<sal_Int16>::get() &&
                     *(sal_Int16*) aTmp.getValue() != 0 )
                 {
                     sOptions += " " + OString(OOO_STRING_SVTOOLS_HTML_O_maxlength) + "=\"" +
@@ -915,7 +915,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
                 if( xPropSetInfo->hasPropertyByName( sDefaultText ) )
                 {
                     aTmp = xPropSet->getPropertyValue( sDefaultText );
-                    if( aTmp.getValueType() == ::getCppuType((const OUString*)0) &&
+                    if( aTmp.getValueType() == ::cppu::UnoType<OUString>::get() &&
                         !((OUString*)aTmp.getValue())->isEmpty() )
                     {
                         sValue = *(OUString*)aTmp.getValue();
@@ -962,7 +962,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
     }
 
     aTmp = xPropSet->getPropertyValue("Name");
-    if( aTmp.getValueType() == ::getCppuType((const OUString*)0) &&
+    if( aTmp.getValueType() == ::cppu::UnoType<OUString>::get() &&
         !((OUString*)aTmp.getValue())->isEmpty() )
     {
         sOut += " " + OString(OOO_STRING_SVTOOLS_HTML_O_name) + "=\"";
@@ -993,7 +993,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
     {
         aTmp = xPropSet->getPropertyValue(
                     OUString("ImageURL") );
-        if( aTmp.getValueType() == ::getCppuType((const OUString*)0) &&
+        if( aTmp.getValueType() == ::cppu::UnoType<OUString>::get() &&
             !((OUString*)aTmp.getValue())->isEmpty() )
         {
             sOut += " " + OString(OOO_STRING_SVTOOLS_HTML_O_src) + "=\"";
@@ -1034,7 +1034,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
 
     aTmp = xPropSet->getPropertyValue(
                     OUString("TabIndex") );
-    if( aTmp.getValueType() == ::getCppuType((const sal_Int16*)0) )
+    if( aTmp.getValueType() == ::cppu::UnoType<sal_Int16>::get() )
     {
         sal_Int16 nTabIndex = *(sal_Int16*) aTmp.getValue();
         if( nTabIndex > 0 )
@@ -1074,7 +1074,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
         if( xPropSetInfo->hasPropertyByName( sPropName ) )
         {
             aTmp = xPropSet->getPropertyValue( sPropName );
-            if( aTmp.getValueType() == ::getCppuType((const sal_Int32*)0) )
+            if( aTmp.getValueType() == ::cppu::UnoType<sal_Int32>::get() )
             {
                 Color aCol(*(sal_Int32*)aTmp .getValue());
                 aItemSet.Put( SvxBrushItem( aCol, RES_CHRATR_BACKGROUND ) );
@@ -1084,7 +1084,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
         if( xPropSetInfo->hasPropertyByName( sPropName ) )
         {
             aTmp = xPropSet->getPropertyValue( sPropName );
-            if( aTmp.getValueType() == ::getCppuType((const sal_Int32*)0) )
+            if( aTmp.getValueType() == ::cppu::UnoType<sal_Int32>::get() )
             {
                 Color aColor( *(sal_Int32*)aTmp .getValue() );
                 aItemSet.Put( SvxColorItem( aColor, RES_CHRATR_COLOR ) );
@@ -1106,7 +1106,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
         if( xPropSetInfo->hasPropertyByName( sPropName ) )
         {
             aTmp = xPropSet->getPropertyValue( sPropName );
-            if( aTmp.getValueType() == ::getCppuType((const OUString*)0) &&
+            if( aTmp.getValueType() == ::cppu::UnoType<OUString>::get() &&
                 !((OUString*)aTmp.getValue())->isEmpty() )
             {
                 Font aFixedFont( OutputDevice::GetDefaultFont(
@@ -1120,7 +1120,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
                     if( xPropSetInfo->hasPropertyByName( sPropName ) )
                     {
                         aTmp = xPropSet->getPropertyValue( sPropName );
-                        if( aTmp.getValueType() == ::getCppuType((const sal_Int16*)0))
+                        if( aTmp.getValueType() == ::cppu::UnoType<sal_Int16>::get())
                             eFamily = (FontFamily)*(sal_Int16*) aTmp.getValue();
                     }
                     SvxFontItem aItem( eFamily, aFName, aEmptyOUStr, PITCH_DONTKNOW, RTL_TEXTENCODING_DONTKNOW, RES_CHRATR_FONT );
@@ -1144,7 +1144,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
         if( xPropSetInfo->hasPropertyByName( sPropName ) )
         {
             aTmp = xPropSet->getPropertyValue( sPropName );
-            if( aTmp.getValueType() == ::getCppuType((const sal_Int16*)0))
+            if( aTmp.getValueType() == ::cppu::UnoType<sal_Int16>::get())
             {
                 FontItalic eItalic = (FontItalic)*(sal_Int16*)aTmp.getValue();
                 if( eItalic != ITALIC_DONTKNOW && eItalic != ITALIC_NONE )
@@ -1155,7 +1155,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
         if( xPropSetInfo->hasPropertyByName( sPropName ) )
         {
             aTmp = xPropSet->getPropertyValue( sPropName );
-            if( aTmp.getValueType() == ::getCppuType((const sal_Int16*)0) )
+            if( aTmp.getValueType() == ::cppu::UnoType<sal_Int16>::get() )
             {
                 FontUnderline eUnderline =
                     (FontUnderline)*(sal_Int16*)aTmp.getValue();
@@ -1168,7 +1168,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
         if( xPropSetInfo->hasPropertyByName( sPropName ) )
         {
             aTmp = xPropSet->getPropertyValue( sPropName );
-            if( aTmp.getValueType() == ::getCppuType((const sal_Int16*)0))
+            if( aTmp.getValueType() == ::cppu::UnoType<sal_Int16>::get())
             {
                 FontStrikeout eStrikeout =
                     (FontStrikeout)*(sal_Int16*)aTmp.getValue();
@@ -1275,7 +1275,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
         OUString sVal;
         aTmp = xPropSet->getPropertyValue(
         OUString("DefaultText") );
-        if( aTmp.getValueType() == ::getCppuType((const OUString*)0)&&
+        if( aTmp.getValueType() == ::cppu::UnoType<OUString>::get()&&
             !((OUString*)aTmp.getValue())->isEmpty() )
         {
             sVal = *(OUString*)aTmp.getValue();
@@ -1298,7 +1298,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
     else if( TYPE_CHECKBOX == eType || TYPE_RADIO == eType )
     {
         aTmp = xPropSet->getPropertyValue("Label");
-        if( aTmp.getValueType() == ::getCppuType((const OUString*)0) &&
+        if( aTmp.getValueType() == ::cppu::UnoType<OUString>::get() &&
             !((OUString*)aTmp.getValue())->isEmpty() )
         {
             sValue = *(OUString*)aTmp.getValue();
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 9f11d7d058ab..be5926c5bc2d 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -537,13 +537,13 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c
     comphelper::PropertyMapEntry const aInfoMap[] =
     {
         { OUString("ProgressRange"), 0,
-              ::getCppuType((sal_Int32*)0),
+              ::cppu::UnoType<sal_Int32>::get(),
               beans::PropertyAttribute::MAYBEVOID, 0},
         { OUString("ProgressMax"), 0,
-              ::getCppuType((sal_Int32*)0),
+              ::cppu::UnoType<sal_Int32>::get(),
               beans::PropertyAttribute::MAYBEVOID, 0},
         { OUString("ProgressCurrent"), 0,
-              ::getCppuType((sal_Int32*)0),
+              ::cppu::UnoType<sal_Int32>::get(),
               beans::PropertyAttribute::MAYBEVOID, 0},
         { OUString("NumberStyles"), 0,
               ::getCppuType( (uno::Reference<container::XNameContainer> *) 0),
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx
index 1a7e201c4577..4ee2f71728f0 100644
--- a/sw/source/filter/xml/wrtxml.cxx
+++ b/sw/source/filter/xml/wrtxml.cxx
@@ -105,13 +105,13 @@ sal_uInt32 SwXMLWriter::_Write( const uno::Reference < task::XStatusIndicator >&
     comphelper::PropertyMapEntry const aInfoMap[] =
     {
         { OUString("ProgressRange"), 0,
-              ::getCppuType((sal_Int32*)0),
+              ::cppu::UnoType<sal_Int32>::get(),
               beans::PropertyAttribute::MAYBEVOID, 0},
         { OUString("ProgressMax"), 0,
-              ::getCppuType((sal_Int32*)0),
+              ::cppu::UnoType<sal_Int32>::get(),
               beans::PropertyAttribute::MAYBEVOID, 0},
         { OUString("ProgressCurrent"), 0,
-              ::getCppuType((sal_Int32*)0),
+              ::cppu::UnoType<sal_Int32>::get(),
               beans::PropertyAttribute::MAYBEVOID, 0},
         { OUString("WrittenNumberStyles"), 0,
               ::getCppuType((uno::Sequence<sal_Int32> *)0),
diff --git a/sw/source/ui/vba/vbapalette.cxx b/sw/source/ui/vba/vbapalette.cxx
index dbb8e600c341..1622a389d27b 100644
--- a/sw/source/ui/vba/vbapalette.cxx
+++ b/sw/source/ui/vba/vbapalette.cxx
@@ -72,7 +72,7 @@ public:
     // Methods XElementAcess
     virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE
     {
-        return ::getCppuType( (sal_Int32*)0 );
+        return ::cppu::UnoType<sal_Int32>::get();
     }
     virtual sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE
     {