diff options
65 files changed, 186 insertions, 186 deletions
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index 1f598f75fda4..32986f26bf22 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -222,7 +222,7 @@ void lcl_AddPropertiesToVector( rOutProperties.push_back( Property( "NullDate", PROP_DOCUMENT_NULL_DATE, - ::getCppuType( static_cast< const ::com::sun::star::util::DateTime * >(0)), + ::cppu::UnoType<com::sun::star::util::DateTime>::get(), beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx index f459bc938ef5..5bbfa396bb96 100644 --- a/chart2/source/model/filter/XMLFilter.cxx +++ b/chart2/source/model/filter/XMLFilter.cxx @@ -335,23 +335,23 @@ sal_Int32 XMLFilter::impl_Import( comphelper::PropertyMapEntry const aImportInfoMap[] = { // necessary properties for XML progress bar at load time - { OUString("ProgressRange"), 0, ::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { OUString("ProgressMax"), 0, ::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { OUString("ProgressCurrent"), 0, ::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, + { OUString("ProgressRange"), 0, ::cppu::UnoType<sal_Int32>::get()0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, + { OUString("ProgressMax"), 0, ::cppu::UnoType<sal_Int32>::get()0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, + { OUString("ProgressCurrent"), 0, ::cppu::UnoType<sal_Int32>::get()0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, { OUString("PrivateData"), 0, ::getCppuType( (Reference<XInterface> *)0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("BaseURI"), 0, - ::getCppuType( (OUString *)0 ), + ::cppu::UnoType<OUString>::get()0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("StreamRelPath"), 0, - ::getCppuType( (OUString *)0 ), + ::cppu::UnoType<OUString>::get()0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("StreamName"), 0, - ::getCppuType( (OUString *)0 ), + ::cppu::UnoType<OUString>::get()0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("BuildId"), 0, - ::getCppuType( (OUString *)0 ), + ::cppu::UnoType<OUString>::get()0 ), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -609,9 +609,9 @@ sal_Int32 XMLFilter::impl_Export( comphelper::PropertyMapEntry const aExportInfoMap[] = { { OUString("UsePrettyPrinting"), 0, ::getBooleanCppuType(), beans::PropertyAttribute::MAYBEVOID, 0}, - { OUString("BaseURI"), 0, ::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("StreamRelPath"), 0, ::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("StreamName"), 0, ::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, + { OUString("BaseURI"), 0, ::cppu::UnoType<OUString>::get()0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, + { OUString("StreamRelPath"), 0, ::cppu::UnoType<OUString>::get()0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, + { OUString("StreamName"), 0, ::cppu::UnoType<OUString>::get()0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("ExportTableNumberList"), 0, ::getBooleanCppuType(), beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString(), 0, css::uno::Type(), 0, 0 } }; diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index f876a88d09dd..fd5689d5ee2f 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -103,7 +103,7 @@ ChartModel::ChartModel(uno::Reference<uno::XComponentContext > const & xContext) , m_xDataProvider( 0 ) , m_xInternalDataProvider( 0 ) , m_xPageBackground( new PageBackground( m_xContext ) ) - , m_xXMLNamespaceMap( createNameContainer( ::getCppuType( (const OUString*) 0 ), + , m_xXMLNamespaceMap( createNameContainer( ::cppu::UnoType<OUString>::get() 0 ), "com.sun.star.xml.NamespaceMap", "com.sun.star.comp.chart.XMLNameSpaceMap" ), uno::UNO_QUERY) , mnStart(0) , mnEnd(0) diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx index c75188645acd..eca75fc39fd8 100644 --- a/chart2/source/tools/ErrorBar.cxx +++ b/chart2/source/tools/ErrorBar.cxx @@ -60,13 +60,13 @@ const SfxItemPropertySet* GetErrorBarPropertySet() {OUString("PositiveError"),2,getCppuType((const double*)0),0,0}, {OUString("NegativeError"),3,getCppuType((const double*)0), 0, 0}, {OUString("PercentageError"),4,getCppuType((const double*)0), 0, 0}, - {OUString("ErrorBarStyle"),5,getCppuType((sal_Int32*)0),0,0}, - {OUString("ErrorBarRangePositive"),6,getCppuType((OUString*)0),0,0}, // read-only for export - {OUString("ErrorBarRangeNegative"),7,getCppuType((OUString*)0),0,0}, // read-only for export + {OUString("ErrorBarStyle"),5,cppu::UnoType<sal_Int32>::get()0),0,0}, + {OUString("ErrorBarRangePositive"),6,cppu::UnoType<OUString>::get()0),0,0}, // read-only for export + {OUString("ErrorBarRangeNegative"),7,cppu::UnoType<OUString>::get()0),0,0}, // read-only for export {OUString("Weight"),8,getCppuType((const double*)0),0,0}, {OUString("LineStyle"),9,getCppuType((com::sun::star::drawing::LineStyle*)0),0,0}, {OUString("LineDash"),10,getCppuType((drawing::LineDash*)0),0,0}, - {OUString("LineWidth"),11,getCppuType((sal_Int32*)0),0,0}, + {OUString("LineWidth"),11,cppu::UnoType<sal_Int32>::get()0),0,0}, {OUString("LineColor"),12,getCppuType((com::sun::star::util::Color*)0),0,0}, {OUString("LineTransparence"),13,getCppuType((sal_Int16*)0),0,0}, {OUString("LineJoint"),14,getCppuType((com::sun::star::drawing::LineJoint*)0),0,0}, diff --git a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx index 9455752824d0..88f843acf061 100644 --- a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx +++ b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx @@ -376,14 +376,14 @@ void Test::testFull( CPPUNIT_ASSERT_EQUAL( rtl::OUString("First"), prop.Name); CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(0), prop.Handle); - CPPUNIT_ASSERT_EQUAL(getCppuType(static_cast< sal_Int32 * >(0)), prop.Type); + CPPUNIT_ASSERT_EQUAL(cppu::UnoType<sal_Int32>::get(), prop.Type); CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int16 >(0), prop.Attributes); prop = info->getPropertyByName( rtl::OUString("Second")); CPPUNIT_ASSERT_EQUAL( rtl::OUString("Second"), prop.Name); CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(1), prop.Handle); - CPPUNIT_ASSERT_EQUAL(getCppuType(static_cast< sal_Int32 * >(0)), prop.Type); + CPPUNIT_ASSERT_EQUAL(cppu::UnoType<sal_Int32>::get(), prop.Type); CPPUNIT_ASSERT_EQUAL( static_cast< sal_Int16 >( css::beans::PropertyAttribute::MAYBEVOID @@ -403,7 +403,7 @@ void Test::testFull( CPPUNIT_ASSERT_EQUAL( rtl::OUString("Fourth"), prop.Name); CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(3), prop.Handle); - CPPUNIT_ASSERT_EQUAL(getCppuType(static_cast< sal_Int32 * >(0)), prop.Type); + CPPUNIT_ASSERT_EQUAL(cppu::UnoType<sal_Int32>::get(), prop.Type); CPPUNIT_ASSERT_EQUAL( static_cast< sal_Int16 >(css::beans::PropertyAttribute::OPTIONAL), prop.Attributes); diff --git a/cppuhelper/test/testpropshlp.cxx b/cppuhelper/test/testpropshlp.cxx index 0919146b51fa..af2bcadb80c7 100644 --- a/cppuhelper/test/testpropshlp.cxx +++ b/cppuhelper/test/testpropshlp.cxx @@ -56,7 +56,7 @@ static Property * getPropertyTable1() PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), //OUString Property( OUString("b"), 1, getCppuCharType( ) , PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), //Char - Property( OUString("c"), 2, getCppuType( (sal_Int32*)0) , + Property( OUString("c"), 2, cppu::UnoType<sal_Int32>::get()0) , PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), //sal_Int32 Property( OUString("d"), 5, getCppuType( (double*)0) , PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), //double @@ -89,7 +89,7 @@ static Property * getPropertyTable2() PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), // OUString Property( OUString("d"), 5, getCppuType( (double*)0) , PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), // Double - Property( OUString("c"), 2, getCppuType( (sal_Int32*)0), + Property( OUString("c"), 2, cppu::UnoType<sal_Int32>::get()0), PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ), // sal_Int32 Property( OUString("e"), 7, getCppuBooleanType() , PropertyAttribute::READONLY | PropertyAttribute::MAYBEVOID ) // Bool @@ -411,8 +411,8 @@ Property * getBasicProps() Property( OUString("BOOL") , PROPERTY_BOOL , getCppuBooleanType(), PropertyAttribute::READONLY ), Property( OUString("INT16") , PROPERTY_INT16, getCppuType( (sal_Int16*)0 ), PropertyAttribute::BOUND | PropertyAttribute::CONSTRAINED ), - Property( OUString("INT32") , PROPERTY_INT32, getCppuType( (sal_Int32*)0 ), PropertyAttribute::BOUND ), - Property( OUString("TEST") , 55 , getCppuType( (sal_Int32*)0), PropertyAttribute::BOUND ) + Property( OUString("INT32") , PROPERTY_INT32, cppu::UnoType<sal_Int32>::get()0 ), PropertyAttribute::BOUND ), + Property( OUString("TEST") , 55 , cppu::UnoType<sal_Int32>::get()0), PropertyAttribute::BOUND ) }; pTable = aBasicProps; } diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx index e7dfba17b3b7..ccaadc6d2ea1 100644 --- a/dbaccess/source/core/api/TableDeco.cxx +++ b/dbaccess/source/core/api/TableDeco.cxx @@ -314,7 +314,7 @@ void ODBTableDecorator::construct() } if ( bNotFound ) registerProperty(PROPERTY_PRIVILEGES, PROPERTY_ID_PRIVILEGES, PropertyAttribute::BOUND | PropertyAttribute::READONLY, - &m_nPrivileges, ::getCppuType(static_cast<sal_Int32*>(NULL))); + &m_nPrivileges, ::cppu::UnoType<sal_Int32>::get()); } ::cppu::IPropertyArrayHelper* ODBTableDecorator::createArrayHelper(sal_Int32 /*_nId*/) const diff --git a/dbaccess/source/core/api/columnsettings.cxx b/dbaccess/source/core/api/columnsettings.cxx index d6b673402646..da3ed553bc21 100644 --- a/dbaccess/source/core/api/columnsettings.cxx +++ b/dbaccess/source/core/api/columnsettings.cxx @@ -63,8 +63,8 @@ namespace dbaccess const sal_Int32 nBoundAttr = PropertyAttribute::BOUND; const sal_Int32 nMayBeVoidAttr = PropertyAttribute::MAYBEVOID | nBoundAttr; - const Type& rSalInt32Type = ::getCppuType( static_cast< sal_Int32* >( NULL ) ); - const Type& rStringType = ::getCppuType( static_cast< OUString* >( NULL ) ); + const Type& rSalInt32Type = ::cppu::UnoType<sal_Int32>::get(); + const Type& rStringType = ::cppu::UnoType<OUString>::get(); _rPropertyContainer.registerMayBeVoidProperty( PROPERTY_ALIGN, PROPERTY_ID_ALIGN, nMayBeVoidAttr, &m_aAlignment, rSalInt32Type ); _rPropertyContainer.registerMayBeVoidProperty( PROPERTY_NUMBERFORMAT, PROPERTY_ID_NUMBERFORMAT, nMayBeVoidAttr, &m_aFormatKey, rSalInt32Type ); diff --git a/dbaccess/source/core/api/datasettings.cxx b/dbaccess/source/core/api/datasettings.cxx index 8221ca4bbcb6..ebc044327e99 100644 --- a/dbaccess/source/core/api/datasettings.cxx +++ b/dbaccess/source/core/api/datasettings.cxx @@ -65,13 +65,13 @@ void ODataSettings::registerPropertiesFor(ODataSettings_Base* _pItem) &_pItem->m_aFont, ::getCppuType(&_pItem->m_aFont)); registerMayBeVoidProperty(PROPERTY_ROW_HEIGHT, PROPERTY_ID_ROW_HEIGHT, PropertyAttribute::BOUND | PropertyAttribute::MAYBEVOID, - &_pItem->m_aRowHeight, ::getCppuType(static_cast<sal_Int32*>(NULL))); + &_pItem->m_aRowHeight, ::cppu::UnoType<sal_Int32>::get()); registerMayBeVoidProperty(PROPERTY_TEXTCOLOR, PROPERTY_ID_TEXTCOLOR, PropertyAttribute::BOUND | PropertyAttribute::MAYBEVOID, - &_pItem->m_aTextColor, ::getCppuType(static_cast<sal_Int32*>(NULL))); + &_pItem->m_aTextColor, ::cppu::UnoType<sal_Int32>::get()); registerMayBeVoidProperty(PROPERTY_TEXTLINECOLOR, PROPERTY_ID_TEXTLINECOLOR, PropertyAttribute::BOUND | PropertyAttribute::MAYBEVOID, - &_pItem->m_aTextLineColor, ::getCppuType(static_cast<sal_Int32*>(NULL))); + &_pItem->m_aTextLineColor, ::cppu::UnoType<sal_Int32>::get()); registerProperty(PROPERTY_TEXTEMPHASIS, PROPERTY_ID_TEXTEMPHASIS, PropertyAttribute::BOUND, &_pItem->m_nFontEmphasis, ::getCppuType(&_pItem->m_nFontEmphasis)); diff --git a/dbaccess/source/core/api/table.cxx b/dbaccess/source/core/api/table.cxx index 048990576130..9f1661033516 100644 --- a/dbaccess/source/core/api/table.cxx +++ b/dbaccess/source/core/api/table.cxx @@ -189,16 +189,16 @@ void ODBTable::construct() &m_aFont, ::getCppuType(&m_aFont)); registerMayBeVoidProperty(PROPERTY_ROW_HEIGHT, PROPERTY_ID_ROW_HEIGHT, PropertyAttribute::BOUND | PropertyAttribute::MAYBEVOID, - &m_aRowHeight, ::getCppuType(static_cast<sal_Int32*>(NULL))); + &m_aRowHeight, ::cppu::UnoType<sal_Int32>::get()); registerMayBeVoidProperty(PROPERTY_TEXTCOLOR, PROPERTY_ID_TEXTCOLOR, PropertyAttribute::BOUND | PropertyAttribute::MAYBEVOID, - &m_aTextColor, ::getCppuType(static_cast<sal_Int32*>(NULL))); + &m_aTextColor, ::cppu::UnoType<sal_Int32>::get()); registerProperty(PROPERTY_PRIVILEGES, PROPERTY_ID_PRIVILEGES, PropertyAttribute::BOUND | PropertyAttribute::READONLY, - &m_nPrivileges, ::getCppuType(static_cast<sal_Int32*>(NULL))); + &m_nPrivileges, ::cppu::UnoType<sal_Int32>::get()); registerMayBeVoidProperty(PROPERTY_TEXTLINECOLOR, PROPERTY_ID_TEXTLINECOLOR, PropertyAttribute::BOUND | PropertyAttribute::MAYBEVOID, - &m_aTextLineColor, ::getCppuType(static_cast<sal_Int32*>(NULL))); + &m_aTextLineColor, ::cppu::UnoType<sal_Int32>::get()); registerProperty(PROPERTY_TEXTEMPHASIS, PROPERTY_ID_TEXTEMPHASIS, PropertyAttribute::BOUND, &m_nFontEmphasis, ::getCppuType(&m_nFontEmphasis)); diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx index 87e62ca36343..07331079b3ab 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.cxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx @@ -465,11 +465,11 @@ void ODatabaseModelImpl::impl_construct_nothrow() // the set of property value types in the bag is limited: Sequence< Type > aAllowedTypes(6); Type* pAllowedType = aAllowedTypes.getArray(); - *pAllowedType++ = ::getCppuType( static_cast< sal_Bool* >( NULL ) ); - *pAllowedType++ = ::getCppuType( static_cast< double* >( NULL ) ); - *pAllowedType++ = ::getCppuType( static_cast< OUString* >( NULL ) ); - *pAllowedType++ = ::getCppuType( static_cast< sal_Int32* >( NULL ) ); - *pAllowedType++ = ::getCppuType( static_cast< sal_Int16* >( NULL ) ); + *pAllowedType++ = ::cppu::UnoType<sal_Bool>::get(); + *pAllowedType++ = ::cppu::UnoType<double>::get(); + *pAllowedType++ = ::cppu::UnoType<OUString>::get(); + *pAllowedType++ = ::cppu::UnoType<sal_Int32>::get(); + *pAllowedType++ = ::cppu::UnoType<sal_Int16>::get(); *pAllowedType++ = ::getCppuType( static_cast< Sequence< Any >* >( NULL ) ); m_xSettings = PropertyBag::createWithTypes( m_aContext, aAllowedTypes, sal_False/*AllowEmptyPropertyName*/, sal_True/*AutomaticAddition*/ ); diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx index 40276e6ae5ef..17f28f8ecc34 100644 --- a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx +++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx @@ -212,7 +212,7 @@ Type SAL_CALL OBookmarkContainer::getElementType( ) throw (RuntimeException, std { MutexGuard aGuard(m_rMutex); checkValid(false); - return ::getCppuType( static_cast< OUString* >(NULL) ); + return ::cppu::UnoType<OUString>::get(); } sal_Bool SAL_CALL OBookmarkContainer::hasElements( ) throw (RuntimeException, std::exception) diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx index b448319fe53b..2b8e2cf05819 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.cxx +++ b/dbaccess/source/core/dataaccess/databasedocument.cxx @@ -482,9 +482,9 @@ namespace /** property map for import/exmport info set */ comphelper::PropertyMapEntry const aExportInfoMap[] = { - { OUString("BaseURI"), 0, ::getCppuType( (OUString *)0 ),beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("StreamName"), 0, ::getCppuType( (OUString *)0 ),beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("UsePrettyPrinting"), 0, ::getCppuType((sal_Bool*)0), beans::PropertyAttribute::MAYBEVOID, 0}, + { OUString("BaseURI"), 0, ::cppu::UnoType<OUString>::get()0 ),beans::PropertyAttribute::MAYBEVOID, 0 }, + { OUString("StreamName"), 0, ::cppu::UnoType<OUString>::get()0 ),beans::PropertyAttribute::MAYBEVOID, 0 }, + { OUString("UsePrettyPrinting"), 0, ::cppu::UnoType<sal_Bool>::get()0), beans::PropertyAttribute::MAYBEVOID, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; } diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx index 1228452da874..1c06b44da5d7 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.cxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx @@ -555,7 +555,7 @@ IPropertyArrayHelper* ODocumentDefinition::createArrayHelper( ) const Sequence< Property > aManualProps( 1 ); aManualProps[0].Name = PROPERTY_PERSISTENT_PATH; aManualProps[0].Handle = PROPERTY_ID_PERSISTENT_PATH; - aManualProps[0].Type = ::getCppuType( static_cast< const OUString* >( NULL ) ); + aManualProps[0].Type = ::cppu::UnoType<OUString>::get(); aManualProps[0].Attributes = PropertyAttribute::READONLY; return new OPropertyArrayHelper( ::comphelper::concatSequences( aProps, aManualProps ) ); diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx index b9540a49306a..5618378666a1 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx +++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx @@ -74,11 +74,11 @@ OXMLDataSourceSetting::OXMLDataSourceSetting( ODBFilter& rImport if (s_aTypeNameMap.empty()) { s_aTypeNameMap[GetXMLToken( XML_BOOLEAN)] = ::getBooleanCppuType(); - s_aTypeNameMap[GetXMLToken( XML_FLOAT)] = ::getCppuType( static_cast< double* >(NULL) ); - s_aTypeNameMap[GetXMLToken( XML_DOUBLE)] = ::getCppuType( static_cast< double* >(NULL) ); - s_aTypeNameMap[GetXMLToken( XML_STRING)] = ::getCppuType( static_cast< OUString* >(NULL) ); - s_aTypeNameMap[GetXMLToken( XML_INT)] = ::getCppuType( static_cast< sal_Int32* >(NULL) ); - s_aTypeNameMap[GetXMLToken( XML_SHORT)] = ::getCppuType( static_cast< sal_Int16* >(NULL) ); + s_aTypeNameMap[GetXMLToken( XML_FLOAT)] = ::cppu::UnoType<double>::get(); + s_aTypeNameMap[GetXMLToken( XML_DOUBLE)] = ::cppu::UnoType<double>::get(); + 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)] = ::getVoidCppuType(); } diff --git a/dbaccess/source/ui/browser/exsrcbrw.cxx b/dbaccess/source/ui/browser/exsrcbrw.cxx index e7bf020c8d06..1dbfcdb84b78 100644 --- a/dbaccess/source/ui/browser/exsrcbrw.cxx +++ b/dbaccess/source/ui/browser/exsrcbrw.cxx @@ -143,14 +143,14 @@ void SAL_CALL SbaExternalSourceBrowser::dispatch(const ::com::sun::star::util::U { if ( pArguments->Name == "ColumnType" ) { - bool bCorrectType = pArguments->Value.getValueType().equals(::getCppuType((const OUString*)0)); + bool bCorrectType = pArguments->Value.getValueType().equals(::cppu::UnoType<OUString>::get()0)); OSL_ENSURE(bCorrectType, "invalid type for argument \"ColumnType\" !"); if (bCorrectType) sControlType = ::comphelper::getString(pArguments->Value); } else if ( pArguments->Name == "ColumnPosition" ) { - bool bCorrectType = pArguments->Value.getValueType().equals(::getCppuType((const sal_Int16*)0)); + bool bCorrectType = pArguments->Value.getValueType().equals(::cppu::UnoType<sal_Int16>::get()0)); OSL_ENSURE(bCorrectType, "invalid type for argument \"ColumnPosition\" !"); if (bCorrectType) nControlPos = ::comphelper::getINT16(pArguments->Value); diff --git a/dbaccess/source/ui/uno/ColumnModel.cxx b/dbaccess/source/ui/uno/ColumnModel.cxx index 11c48483a8e7..685ab1d1eb3a 100644 --- a/dbaccess/source/ui/uno/ColumnModel.cxx +++ b/dbaccess/source/ui/uno/ColumnModel.cxx @@ -90,7 +90,7 @@ void OColumnControlModel::registerProperties() &m_xColumn, ::getCppuType( &m_xColumn ) ); registerMayBeVoidProperty( PROPERTY_TABSTOP, PROPERTY_ID_TABSTOP, PropertyAttribute::BOUND | PropertyAttribute::MAYBEVOID, - &m_aTabStop, ::getCppuType( static_cast<sal_Int16*>(NULL) ) ); + &m_aTabStop, ::cppu::UnoType<sal_Int16>::get() ); registerProperty( PROPERTY_DEFAULTCONTROL, PROPERTY_ID_DEFAULTCONTROL, PropertyAttribute::BOUND, &m_sDefaultControl, ::getCppuType( &m_sDefaultControl ) ); registerProperty( PROPERTY_ENABLED, PROPERTY_ID_ENABLED, PropertyAttribute::BOUND, diff --git a/dbaccess/source/ui/uno/unosqlmessage.cxx b/dbaccess/source/ui/uno/unosqlmessage.cxx index f13270ee7e73..9235528c52a4 100644 --- a/dbaccess/source/ui/uno/unosqlmessage.cxx +++ b/dbaccess/source/ui/uno/unosqlmessage.cxx @@ -48,7 +48,7 @@ OSQLMessageDialog::OSQLMessageDialog(const Reference< XComponentContext >& _rxOR :OSQLMessageDialogBase(_rxORB) { registerMayBeVoidProperty(PROPERTY_SQLEXCEPTION, PROPERTY_ID_SQLEXCEPTION, PropertyAttribute::TRANSIENT | PropertyAttribute::MAYBEVOID, - &m_aException, ::getCppuType(static_cast<SQLException*>(NULL))); + &m_aException, ::cppu::UnoType<SQLException>::get()); registerProperty( PROPERTY_HELP_URL, PROPERTY_ID_HELP_URL, PropertyAttribute::TRANSIENT, &m_sHelpURL, ::getCppuType( &m_sHelpURL ) ); } diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx index 53174e41b947..e8d8349b7ea2 100644 --- a/extensions/source/bibliography/toolbar.cxx +++ b/extensions/source/bibliography/toolbar.cxx @@ -172,7 +172,7 @@ void BibTBEditListener::statusChanged(const frame::FeatureStateEvent& rEvt)throw pToolBar->EnableQuery(rEvt.IsEnabled); uno::Any aState=rEvt.State; - if(aState.getValueType()==::getCppuType((const OUString*)0)) + if(aState.getValueType()==::cppu::UnoType<OUString>::get()0)) { OUString aStr = *(OUString*) aState.getValue(); pToolBar->SetQueryString(aStr); diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx index bdbe761c15b6..aaa80d3bd33f 100644 --- a/extensions/source/ole/unoconversionutilities.hxx +++ b/extensions/source/ole/unoconversionutilities.hxx @@ -1488,7 +1488,7 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANT* pVariant, Any& rAny rAny.setValue(NULL, Type()); break; case VT_I2: - rAny.setValue( & var.iVal, getCppuType( (sal_Int16*)0)); + rAny.setValue( & var.iVal, cppu::UnoType<sal_Int16>::get()0)); break; case VT_I4: rAny.setValue( & var.lVal, cppu::UnoType<sal_Int32>::get()); @@ -2403,7 +2403,7 @@ inline void reduceRange( Any& any) else if( value <= 0x7fff && value >= -0x8000) {// -32768 bis 32767 sal_Int16 shortVal= static_cast<sal_Int16>( value); - any.setValue( &shortVal, getCppuType( (sal_Int16*)0)); + any.setValue( &shortVal, cppu::UnoType<sal_Int16>::get()0)); } } #endif diff --git a/extensions/source/plugin/base/plmodel.cxx b/extensions/source/plugin/base/plmodel.cxx index f773577c5f5f..0ed2b518be39 100644 --- a/extensions/source/plugin/base/plmodel.cxx +++ b/extensions/source/plugin/base/plmodel.cxx @@ -71,12 +71,12 @@ static ::com::sun::star::beans::Property aProps[] = ::com::sun::star::beans::Property( OUString::createFromAscii( aMime ), 1, - ::getCppuType((const OUString*)0), + ::cppu::UnoType<OUString>::get()0), ::com::sun::star::beans::PropertyAttribute::BOUND ), ::com::sun::star::beans::Property( OUString::createFromAscii( aCreationURL ), 2, - ::getCppuType((const OUString*)0), + ::cppu::UnoType<OUString>::get()0), ::com::sun::star::beans::PropertyAttribute::BOUND ) }; diff --git a/extensions/source/propctrlr/buttonnavigationhandler.cxx b/extensions/source/propctrlr/buttonnavigationhandler.cxx index 9e8de62367f0..46b72ff0a729 100644 --- a/extensions/source/propctrlr/buttonnavigationhandler.cxx +++ b/extensions/source/propctrlr/buttonnavigationhandler.cxx @@ -187,7 +187,7 @@ namespace pcr if ( isNavigationCapableButton( m_xComponent ) ) { addStringPropertyDescription( aProperties, PROPERTY_TARGET_URL ); - implAddPropertyDescription( aProperties, PROPERTY_BUTTONTYPE, ::getCppuType( static_cast< sal_Int32* >( NULL ) ) ); + implAddPropertyDescription( aProperties, PROPERTY_BUTTONTYPE, ::cppu::UnoType<sal_Int32>::get() ); } if ( aProperties.empty() ) diff --git a/extensions/source/propctrlr/cellbindinghandler.cxx b/extensions/source/propctrlr/cellbindinghandler.cxx index 3b72cd1db250..5782ff8cea52 100644 --- a/extensions/source/propctrlr/cellbindinghandler.cxx +++ b/extensions/source/propctrlr/cellbindinghandler.cxx @@ -55,7 +55,7 @@ namespace pcr CellBindingPropertyHandler::CellBindingPropertyHandler( const Reference< XComponentContext >& _rxContext ) :CellBindingPropertyHandler_Base( _rxContext ) - ,m_pCellExchangeConverter( new DefaultEnumRepresentation( *m_pInfoService, ::getCppuType( static_cast< sal_Int16* >( NULL ) ), PROPERTY_ID_CELL_EXCHANGE_TYPE ) ) + ,m_pCellExchangeConverter( new DefaultEnumRepresentation( *m_pInfoService, ::cppu::UnoType<sal_Int16>::get(), PROPERTY_ID_CELL_EXCHANGE_TYPE ) ) { } @@ -466,17 +466,17 @@ namespace pcr if ( bAllowCellLinking ) { aProperties[ --nPos ] = Property( PROPERTY_BOUND_CELL, PROPERTY_ID_BOUND_CELL, - ::getCppuType( static_cast< OUString* >( NULL ) ), 0 ); + ::cppu::UnoType<OUString>::get(), 0 ); } if ( bAllowCellIntLinking ) { aProperties[ --nPos ] = Property( PROPERTY_CELL_EXCHANGE_TYPE, PROPERTY_ID_CELL_EXCHANGE_TYPE, - ::getCppuType( static_cast< sal_Int16* >( NULL ) ), 0 ); + ::cppu::UnoType<sal_Int16>::get(), 0 ); } if ( bAllowListCellRange ) { aProperties[ --nPos ] = Property( PROPERTY_LIST_CELL_RANGE, PROPERTY_ID_LIST_CELL_RANGE, - ::getCppuType( static_cast< OUString* >( NULL ) ), 0 ); + ::cppu::UnoType<OUString>::get(), 0 ); } } diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx index e51ae8a48078..d052ea3a8f1d 100644 --- a/extensions/source/propctrlr/eformspropertyhandler.cxx +++ b/extensions/source/propctrlr/eformspropertyhandler.cxx @@ -129,7 +129,7 @@ namespace pcr if ( xBindingProps.is() ) { aReturn = xBindingProps->getPropertyValue( _rPropertyName ); - DBG_ASSERT( aReturn.getValueType().equals( ::getCppuType( static_cast< OUString* >( NULL ) ) ), + DBG_ASSERT( aReturn.getValueType().equals( ::cppu::UnoType<OUString>::get() ), "EFormsPropertyHandler::getPropertyValue: invalid BindingExpression value type!" ); } else @@ -246,7 +246,7 @@ namespace pcr DBG_ASSERT( xBindingProps.is(), "EFormsPropertyHandler::setPropertyValue: how can I set a property if there's no binding?" ); if ( xBindingProps.is() ) { - DBG_ASSERT( _rValue.getValueType().equals( ::getCppuType( static_cast< OUString* >( NULL ) ) ), + DBG_ASSERT( _rValue.getValueType().equals( ::cppu::UnoType<OUString>::get() ), "EFormsPropertyHandler::setPropertyValue: invalid value type!" ); xBindingProps->setPropertyValue( _rPropertyName, _rValue ); } diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx index 9c3c98abe222..34c009944660 100644 --- a/extensions/source/propctrlr/eventhandler.cxx +++ b/extensions/source/propctrlr/eventhandler.cxx @@ -770,7 +770,7 @@ namespace pcr { aOrderedProperties[ loop->second.nId ] = Property( loop->first, loop->second.nId, - ::getCppuType( static_cast< const OUString* >( NULL ) ), + ::cppu::UnoType<OUString>::get(), PropertyAttribute::BOUND ); } diff --git a/extensions/source/propctrlr/formcontroller.cxx b/extensions/source/propctrlr/formcontroller.cxx index d47c23fc4944..fc2279c82d57 100644 --- a/extensions/source/propctrlr/formcontroller.cxx +++ b/extensions/source/propctrlr/formcontroller.cxx @@ -170,7 +170,7 @@ namespace pcr aProps[0] = Property( PROPERTY_CURRENTPAGE, OWN_PROPERTY_ID_CURRENTPAGE, - ::getCppuType( static_cast< OUString* >( NULL ) ), + ::cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT ); aProps[1] = Property( diff --git a/extensions/source/propctrlr/propertyhandler.hxx b/extensions/source/propctrlr/propertyhandler.hxx index 4aed4c7b38f8..8e8ce9adeaaa 100644 --- a/extensions/source/propctrlr/propertyhandler.hxx +++ b/extensions/source/propctrlr/propertyhandler.hxx @@ -300,37 +300,37 @@ namespace pcr inline void PropertyHandler::addStringPropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const { - implAddPropertyDescription( _rProperties, _rPropertyName, ::getCppuType( static_cast< OUString* >( NULL ) ), _nAttribs ); + implAddPropertyDescription( _rProperties, _rPropertyName, ::cppu::UnoType<OUString>::get(), _nAttribs ); } inline void PropertyHandler::addInt32PropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const { - implAddPropertyDescription( _rProperties, _rPropertyName, ::getCppuType( static_cast< sal_Int32* >( NULL ) ), _nAttribs ); + implAddPropertyDescription( _rProperties, _rPropertyName, ::cppu::UnoType<sal_Int32>::get(), _nAttribs ); } inline void PropertyHandler::addInt16PropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const { - implAddPropertyDescription( _rProperties, _rPropertyName, ::getCppuType( static_cast< sal_Int16* >( NULL ) ), _nAttribs ); + implAddPropertyDescription( _rProperties, _rPropertyName, ::cppu::UnoType<sal_Int16>::get(), _nAttribs ); } inline void PropertyHandler::addDoublePropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const { - implAddPropertyDescription( _rProperties, _rPropertyName, ::getCppuType( static_cast< double* >( NULL ) ), _nAttribs ); + implAddPropertyDescription( _rProperties, _rPropertyName, ::cppu::UnoType<double>::get(), _nAttribs ); } inline void PropertyHandler::addDatePropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const { - implAddPropertyDescription( _rProperties, _rPropertyName, ::getCppuType( static_cast< com::sun::star::util::Date* >( NULL ) ), _nAttribs ); + implAddPropertyDescription( _rProperties, _rPropertyName, ::cppu::UnoType<com::sun::star::util::Date>::get(), _nAttribs ); } inline void PropertyHandler::addTimePropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const { - implAddPropertyDescription( _rProperties, _rPropertyName, ::getCppuType( static_cast< com::sun::star::util::Time* >( NULL ) ), _nAttribs ); + implAddPropertyDescription( _rProperties, _rPropertyName, ::cppu::UnoType<com::sun::star::util::Time>::get(), _nAttribs ); } inline void PropertyHandler::addDateTimePropertyDescription( ::std::vector< ::com::sun::star::beans::Property >& _rProperties, const OUString& _rPropertyName, sal_Int16 _nAttribs ) const { - implAddPropertyDescription( _rProperties, _rPropertyName, ::getCppuType( static_cast< com::sun::star::util::DateTime* >( NULL ) ), _nAttribs ); + implAddPropertyDescription( _rProperties, _rPropertyName, ::cppu::UnoType<com::sun::star::util::DateTime>::get(), _nAttribs ); } inline OUString PropertyHandler::impl_getPropertyNameFromId_nothrow( PropertyId _nPropId ) const diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index cb8860bca9b0..894b505836f3 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -215,7 +215,7 @@ namespace pcr Type SAL_CALL OEditControl::getValueType() throw (RuntimeException, std::exception) { - return m_bIsPassword ? ::getCppuType( static_cast< sal_Int16* >( NULL ) ) : ::getCppuType( static_cast< OUString* >( NULL ) ); + return m_bIsPassword ? ::cppu::UnoType<sal_Int16>::get() : ::cppu::UnoType<OUString>::get(); } @@ -436,7 +436,7 @@ namespace pcr Type SAL_CALL OHyperlinkControl::getValueType() throw (RuntimeException, std::exception) { - return ::getCppuType( static_cast< OUString* >( NULL ) ); + return ::cppu::UnoType<OUString>::get(); } @@ -640,7 +640,7 @@ namespace pcr Type SAL_CALL ONumericControl::getValueType() throw (RuntimeException, std::exception) { - return ::getCppuType( static_cast< double* >( NULL ) ); + return ::cppu::UnoType<double>::get(); } @@ -754,7 +754,7 @@ namespace pcr Type SAL_CALL OColorControl::getValueType() throw (RuntimeException, std::exception) { - return ::getCppuType( static_cast< sal_Int32* >( NULL ) ); + return ::cppu::UnoType<sal_Int32>::get(); } @@ -823,7 +823,7 @@ namespace pcr Type SAL_CALL OListboxControl::getValueType() throw (RuntimeException, std::exception) { - return ::getCppuType( static_cast< OUString* >( NULL ) ); + return ::cppu::UnoType<OUString>::get(); } @@ -914,7 +914,7 @@ namespace pcr Type SAL_CALL OComboboxControl::getValueType() throw (RuntimeException, std::exception) { - return ::getCppuType( static_cast< OUString* >( NULL ) ); + return ::cppu::UnoType<OUString>::get(); } @@ -1412,7 +1412,7 @@ namespace pcr Type SAL_CALL OMultilineEditControl::getValueType() throw (RuntimeException, std::exception) { if ( getTypedControlWindow()->getOperationMode() == eMultiLineText ) - return ::getCppuType( static_cast< OUString* >( NULL ) ); + return ::cppu::UnoType<OUString>::get(); return ::getCppuType( static_cast< Sequence< OUString >* >( NULL ) ); } diff --git a/extensions/source/propctrlr/submissionhandler.cxx b/extensions/source/propctrlr/submissionhandler.cxx index f53037a2f8c9..04f9c1627687 100644 --- a/extensions/source/propctrlr/submissionhandler.cxx +++ b/extensions/source/propctrlr/submissionhandler.cxx @@ -269,7 +269,7 @@ namespace pcr if ( m_pHelper.get() ) { implAddPropertyDescription( aProperties, PROPERTY_SUBMISSION_ID, ::getCppuType( static_cast< Reference< submission::XSubmission > * >( NULL ) ) ); - implAddPropertyDescription( aProperties, PROPERTY_XFORMS_BUTTONTYPE, ::getCppuType( static_cast< FormButtonType* >( NULL ) ) ); + implAddPropertyDescription( aProperties, PROPERTY_XFORMS_BUTTONTYPE, ::cppu::UnoType<FormButtonType>::get() ); } if ( aProperties.empty() ) return Sequence< Property >(); @@ -369,7 +369,7 @@ namespace pcr case PROPERTY_ID_XFORMS_BUTTONTYPE: { ::rtl::Reference< IPropertyEnumRepresentation > aEnumConversion( - new DefaultEnumRepresentation( *m_pInfoService, ::getCppuType( static_cast< FormButtonType* >( NULL ) ), PROPERTY_ID_BUTTONTYPE ) ); + new DefaultEnumRepresentation( *m_pInfoService, ::cppu::UnoType<FormButtonType>::get(), PROPERTY_ID_BUTTONTYPE ) ); // TODO/UNOize: make aEnumConversion a member? aEnumConversion->getValueFromDescription( sControlValue, aPropertyValue ); } diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx index be9caab8bd3a..043535b501bf 100644 --- a/extensions/source/propctrlr/usercontrol.cxx +++ b/extensions/source/propctrlr/usercontrol.cxx @@ -162,7 +162,7 @@ namespace pcr Type SAL_CALL OFormatSampleControl::getValueType() throw (RuntimeException, std::exception) { - return ::getCppuType( static_cast< sal_Int32* >( NULL ) ); + return ::cppu::UnoType<sal_Int32>::get(); } @@ -204,7 +204,7 @@ namespace pcr Type SAL_CALL OFormattedNumericControl::getValueType() throw (RuntimeException, std::exception) { - return ::getCppuType( static_cast< double* >( NULL ) ); + return ::cppu::UnoType<double>::get(); } @@ -300,7 +300,7 @@ namespace pcr Type SAL_CALL OFileUrlControl::getValueType() throw (RuntimeException, std::exception) { - return ::getCppuType( static_cast< OUString* >( NULL ) ); + return ::cppu::UnoType<OUString>::get(); } diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index 6a4457bd340d..4d3bc94bb427 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -304,85 +304,85 @@ OStyle::OStyle() sal_Int32 i = 0; registerPropertyNoMember( PROPERTY_NAME, ++i,nBound,::getCppuType( static_cast< OUString *>(NULL) ), &sName ); - registerPropertyNoMember(PROPERTY_BACKCOLOR, ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nTransparent); + registerPropertyNoMember(PROPERTY_BACKCOLOR, ++i,nBound,::cppu::UnoType<sal_Int32>::get()0) ,&nTransparent); registerPropertyNoMember(PROPERTY_BACKGRAPHICLOCATION, ++i,nBound,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation); registerPropertyNoMember(PROPERTY_BACKTRANSPARENT, ++i,nBound,::getBooleanCppuType() ,&bTrue); - registerPropertyNoMember(SC_UNO_PAGE_BORDERDIST, ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(SC_UNO_PAGE_BORDERDIST, ++i,nBound,::cppu::UnoType<sal_Int32>::get()0) ,&nZero); registerPropertyNoMember(SC_UNO_PAGE_BOTTBORDER, ++i,nBound,::getCppuType((const table::BorderLine2*)0) ,&eBorderLine); - registerPropertyNoMember(SC_UNO_PAGE_BOTTBRDDIST, ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(PROPERTY_BOTTOMMARGIN, ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nMargin); + registerPropertyNoMember(SC_UNO_PAGE_BOTTBRDDIST, ++i,nBound,::cppu::UnoType<sal_Int32>::get()0) ,&nZero); + registerPropertyNoMember(PROPERTY_BOTTOMMARGIN, ++i,nBound,::cppu::UnoType<sal_Int32>::get()0) ,&nMargin); registerPropertyNoMember("DisplayName", ++i,nBound,::getCppuType((OUString*)0) ,&sEmpty); - registerPropertyNoMember(SC_UNO_PAGE_FTRBACKCOL, ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nTransparent); + registerPropertyNoMember(SC_UNO_PAGE_FTRBACKCOL, ++i,nBound,::cppu::UnoType<sal_Int32>::get()0) ,&nTransparent); registerPropertyNoMember(SC_UNO_PAGE_FTRGRFFILT, ++i,nBound,::getCppuType((const OUString*)0) ,&sEmpty); registerPropertyNoMember(SC_UNO_PAGE_FTRGRFLOC, ++i,nBound,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation); registerPropertyNoMember(SC_UNO_PAGE_FTRGRFURL, ++i,nBound,::getCppuType((const OUString*)0) ,&sEmpty); registerPropertyNoMember(SC_UNO_PAGE_FTRBACKTRAN, ++i,nBound,::getBooleanCppuType() ,&bTrue); - registerPropertyNoMember(SC_UNO_PAGE_FTRBODYDIST, ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(SC_UNO_PAGE_FTRBRDDIST, ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(SC_UNO_PAGE_FTRBODYDIST, ++i,nBound,::cppu::UnoType<sal_Int32>::get()0) ,&nZero); + registerPropertyNoMember(SC_UNO_PAGE_FTRBRDDIST, ++i,nBound,::cppu::UnoType<sal_Int32>::get()0) ,&nZero); registerPropertyNoMember(SC_UNO_PAGE_FTRBOTTBOR, ++i,nBound,::getCppuType((const table::BorderLine2*)0) ,&eBorderLine); - registerPropertyNoMember(SC_UNO_PAGE_FTRBOTTBDIS, ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(SC_UNO_PAGE_FTRHEIGHT, ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(SC_UNO_PAGE_FTRBOTTBDIS, ++i,nBound,::cppu::UnoType<sal_Int32>::get()0) ,&nZero); + registerPropertyNoMember(SC_UNO_PAGE_FTRHEIGHT, ++i,nBound,::cppu::UnoType<sal_Int32>::get()0) ,&nZero); registerPropertyNoMember(SC_UNO_PAGE_FTRDYNAMIC, ++i,nBound,::getBooleanCppuType() ,&bFalse); registerPropertyNoMember(SC_UNO_PAGE_FTRON, ++i,nBound,::getBooleanCppuType() ,&bFalse); registerPropertyNoMember(SC_UNO_PAGE_FTRSHARED, ++i,nBound,::getBooleanCppuType() ,&bFalse); registerPropertyNoMember(SC_UNO_PAGE_FTRLEFTBOR, ++i,nBound,::getCppuType((const table::BorderLine2*)0) ,&eBorderLine); - registerPropertyNoMember(SC_UNO_PAGE_FTRLEFTBDIS, ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(SC_UNO_PAGE_FTRLEFTMAR, ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(SC_UNO_PAGE_FTRLEFTBDIS, ++i,nBound,::cppu::UnoType<sal_Int32>::get()0) ,&nZero); + registerPropertyNoMember(SC_UNO_PAGE_FTRLEFTMAR, ++i,nBound,::cppu::UnoType<sal_Int32>::get()0) ,&nZero); registerPropertyNoMember(SC_UNO_PAGE_FTRRIGHTBOR, ++i,nBound,::getCppuType((const table::BorderLine2*)0) ,&eBorderLine); - registerPropertyNoMember(SC_UNO_PAGE_FTRRIGHTBDIS,++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(SC_UNO_PAGE_FTRRIGHTMAR, ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(SC_UNO_PAGE_FTRRIGHTBDIS,++i,nBound,::cppu::UnoType<sal_Int32>::get()0) ,&nZero); + registerPropertyNoMember(SC_UNO_PAGE_FTRRIGHTMAR, ++i,nBound,::cppu::UnoType<sal_Int32>::get()0) ,&nZero); registerPropertyNoMember(SC_UNO_PAGE_FTRSHADOW, ++i,nBound,::getCppuType((const table::ShadowFormat*)0) ,&eShadowFormat); registerPropertyNoMember(SC_UNO_PAGE_FTRTOPBOR, ++i,nBound,::getCppuType((const table::BorderLine2*)0) ,&eBorderLine); - registerPropertyNoMember(SC_UNO_PAGE_FTRTOPBDIS, ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(SC_UNO_PAGE_FTRTOPBDIS, ++i,nBound,::cppu::UnoType<sal_Int32>::get()0) ,&nZero); - registerPropertyNoMember(SC_UNO_PAGE_HDRBACKCOL, ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nTransparent); + registerPropertyNoMember(SC_UNO_PAGE_HDRBACKCOL, ++i,nBound|nMayBeVoid,::cppu::UnoType<sal_Int32>::get()0) ,&nTransparent); registerPropertyNoMember(SC_UNO_PAGE_HDRGRFFILT, ++i,nBound|nMayBeVoid,::getCppuType((const OUString*)0) ,&sEmpty); registerPropertyNoMember(SC_UNO_PAGE_HDRGRFLOC, ++i,nBound|nMayBeVoid,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation); registerPropertyNoMember(SC_UNO_PAGE_HDRGRFURL, ++i,nBound|nMayBeVoid,::getCppuType((const OUString*)0) ,&sEmpty); registerPropertyNoMember(SC_UNO_PAGE_HDRBACKTRAN, ++i,nBound|nMayBeVoid,::getBooleanCppuType() ,&bTrue); - registerPropertyNoMember(SC_UNO_PAGE_HDRBODYDIST, ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(SC_UNO_PAGE_HDRBRDDIST, ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(SC_UNO_PAGE_HDRBODYDIST, ++i,nBound|nMayBeVoid,::cppu::UnoType<sal_Int32>::get()0) ,&nZero); + registerPropertyNoMember(SC_UNO_PAGE_HDRBRDDIST, ++i,nBound|nMayBeVoid,::cppu::UnoType<sal_Int32>::get()0) ,&nZero); registerPropertyNoMember(SC_UNO_PAGE_HDRBOTTBOR, ++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine2*)0) ,&eBorderLine); - registerPropertyNoMember(SC_UNO_PAGE_HDRBOTTBDIS, ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(SC_UNO_PAGE_HDRHEIGHT, ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(SC_UNO_PAGE_HDRBOTTBDIS, ++i,nBound|nMayBeVoid,::cppu::UnoType<sal_Int32>::get()0) ,&nZero); + registerPropertyNoMember(SC_UNO_PAGE_HDRHEIGHT, ++i,nBound|nMayBeVoid,::cppu::UnoType<sal_Int32>::get()0) ,&nZero); registerPropertyNoMember(SC_UNO_PAGE_HDRDYNAMIC, ++i,nBound|nMayBeVoid,::getBooleanCppuType() ,&bFalse); registerPropertyNoMember(SC_UNO_PAGE_HDRON, ++i,nBound|nMayBeVoid,::getBooleanCppuType() ,&bFalse); registerPropertyNoMember(SC_UNO_PAGE_HDRSHARED, ++i,nBound|nMayBeVoid,::getBooleanCppuType() ,&bFalse); registerPropertyNoMember(SC_UNO_PAGE_HDRLEFTBOR, ++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine2*)0) ,&eBorderLine); - registerPropertyNoMember(SC_UNO_PAGE_HDRLEFTBDIS, ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(SC_UNO_PAGE_HDRLEFTMAR, ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(SC_UNO_PAGE_HDRLEFTBDIS, ++i,nBound|nMayBeVoid,::cppu::UnoType<sal_Int32>::get()0) ,&nZero); + registerPropertyNoMember(SC_UNO_PAGE_HDRLEFTMAR, ++i,nBound|nMayBeVoid,::cppu::UnoType<sal_Int32>::get()0) ,&nZero); registerPropertyNoMember(SC_UNO_PAGE_HDRRIGHTBOR, ++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine2*)0) ,&eBorderLine); - registerPropertyNoMember(SC_UNO_PAGE_HDRRIGHTBDIS,++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(SC_UNO_PAGE_HDRRIGHTMAR, ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(SC_UNO_PAGE_HDRRIGHTBDIS,++i,nBound|nMayBeVoid,::cppu::UnoType<sal_Int32>::get()0) ,&nZero); + registerPropertyNoMember(SC_UNO_PAGE_HDRRIGHTMAR, ++i,nBound|nMayBeVoid,::cppu::UnoType<sal_Int32>::get()0) ,&nZero); registerPropertyNoMember(SC_UNO_PAGE_HDRSHADOW, ++i,nBound|nMayBeVoid,::getCppuType((const table::ShadowFormat*)0) ,&eShadowFormat); registerPropertyNoMember(SC_UNO_PAGE_HDRTOPBOR, ++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine2*)0) ,&eBorderLine); - registerPropertyNoMember(SC_UNO_PAGE_HDRTOPBDIS, ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(SC_UNO_PAGE_HDRTOPBDIS, ++i,nBound|nMayBeVoid,::cppu::UnoType<sal_Int32>::get()0) ,&nZero); - registerProperty(PROPERTY_HEIGHT, ++i,nBound,&m_aSize.Height, ::getCppuType((const sal_Int32*)0) ); + registerProperty(PROPERTY_HEIGHT, ++i,nBound,&m_aSize.Height, ::cppu::UnoType<sal_Int32>::get()0) ); registerPropertyNoMember(PROPERTY_ISLANDSCAPE, ++i,nBound, ::getBooleanCppuType() ,&bFalse); registerPropertyNoMember(SC_UNO_PAGE_LEFTBORDER, ++i,nBound, ::getCppuType((const table::BorderLine2*)0) ,&eBorderLine); - registerPropertyNoMember(SC_UNO_PAGE_LEFTBRDDIST, ++i,nBound, ::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(PROPERTY_LEFTMARGIN, ++i,beans::PropertyAttribute::BOUND, ::getCppuType((const sal_Int32*)0) ,&nMargin); + registerPropertyNoMember(SC_UNO_PAGE_LEFTBRDDIST, ++i,nBound, ::cppu::UnoType<sal_Int32>::get()0) ,&nZero); + registerPropertyNoMember(PROPERTY_LEFTMARGIN, ++i,beans::PropertyAttribute::BOUND, ::cppu::UnoType<sal_Int32>::get()0) ,&nMargin); registerPropertyNoMember(PROPERTY_NUMBERINGTYPE, ++i,nBound,::getCppuType((const sal_Int16*)0) ,&nNummeringType); registerPropertyNoMember(SC_UNO_PAGE_SCALEVAL, ++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero); registerPropertyNoMember(PROPERTY_PAGESTYLELAYOUT, ++i,nBound,::getCppuType((const style::PageStyleLayout*)0) ,&ePageStyleLayout); const OUString sPaperTray("[From printer settings]"); registerPropertyNoMember(SC_UNO_PAGE_PAPERTRAY, ++i,nBound,::getCppuType((const OUString*)0) ,&sPaperTray); registerPropertyNoMember(SC_UNO_PAGE_RIGHTBORDER, ++i,nBound,::getCppuType((const table::BorderLine2*)0) ,&eBorderLine); - registerPropertyNoMember(SC_UNO_PAGE_RIGHTBRDDIST,++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(PROPERTY_RIGHTMARGIN, ++i,beans::PropertyAttribute::BOUND,::getCppuType((const sal_Int32*)0) ,&nMargin); + registerPropertyNoMember(SC_UNO_PAGE_RIGHTBRDDIST,++i,nBound,::cppu::UnoType<sal_Int32>::get()0) ,&nZero); + registerPropertyNoMember(PROPERTY_RIGHTMARGIN, ++i,beans::PropertyAttribute::BOUND,::cppu::UnoType<sal_Int32>::get()0) ,&nMargin); registerPropertyNoMember(SC_UNO_PAGE_SCALETOPAG, ++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero); registerPropertyNoMember(SC_UNO_PAGE_SCALETOX, ++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero); registerPropertyNoMember(SC_UNO_PAGE_SCALETOY, ++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero); registerPropertyNoMember(SC_UNO_PAGE_SHADOWFORM, ++i,nBound,::getCppuType((const table::ShadowFormat*)0) ,&eShadowFormat); registerProperty(PROPERTY_PAPERSIZE, ++i,beans::PropertyAttribute::BOUND,&m_aSize,::getCppuType((const awt::Size*)0) ); registerPropertyNoMember(SC_UNO_PAGE_TOPBORDER, ++i,nBound,::getCppuType((const table::BorderLine2*)0) ,&eBorderLine); - registerPropertyNoMember(SC_UNO_PAGE_TOPBRDDIST, ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(PROPERTY_TOPMARGIN, ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nMargin); + registerPropertyNoMember(SC_UNO_PAGE_TOPBRDDIST, ++i,nBound,::cppu::UnoType<sal_Int32>::get()0) ,&nZero); + registerPropertyNoMember(PROPERTY_TOPMARGIN, ++i,nBound,::cppu::UnoType<sal_Int32>::get()0) ,&nMargin); uno::Reference< container::XNameContainer> xAttribs = ::comphelper::NameContainer_createInstance(::getCppuType(static_cast< xml::AttributeData* >(NULL))); registerPropertyNoMember("UserDefinedAttributes", ++i,nBound,::getCppuType((uno::Reference<container::XNameContainer>*)0) ,&xAttribs); - registerProperty(PROPERTY_WIDTH, ++i,nBound,&m_aSize.Width,::getCppuType((const sal_Int32*)0) ); + registerProperty(PROPERTY_WIDTH, ++i,nBound,&m_aSize.Width,::cppu::UnoType<sal_Int32>::get()0) ); registerPropertyNoMember("PrinterName", ++i,nBound,::getCppuType((const OUString*)0),&sEmpty); uno::Sequence<sal_Int8> aSe; registerPropertyNoMember("PrinterSetup", ++i,nBound,::getCppuType((const uno::Sequence<sal_Int8>*)0),&aSe); diff --git a/reportdesign/source/filter/xml/xmlColumn.cxx b/reportdesign/source/filter/xml/xmlColumn.cxx index a893f390b2bb..7a92e7ce70b8 100644 --- a/reportdesign/source/filter/xml/xmlColumn.cxx +++ b/reportdesign/source/filter/xml/xmlColumn.cxx @@ -130,8 +130,8 @@ void OXMLRowColumn::fillStyle(const OUString& _sStyleName) PropertySetInfo* pInfo = new PropertySetInfo(); static PropertyMapEntry const pMap[] = { - {OUString(PROPERTY_WIDTH), PROPERTY_ID_WIDTH, ::getCppuType(static_cast< sal_Int32* >( NULL )) ,PropertyAttribute::BOUND,0}, - {OUString(PROPERTY_HEIGHT), PROPERTY_ID_HEIGHT, ::getCppuType(static_cast< sal_Int32* >( NULL )) ,PropertyAttribute::BOUND,0}, + {OUString(PROPERTY_WIDTH), PROPERTY_ID_WIDTH, ::cppu::UnoType<sal_Int32>::get() ,PropertyAttribute::BOUND,0}, + {OUString(PROPERTY_HEIGHT), PROPERTY_ID_HEIGHT, ::cppu::UnoType<sal_Int32>::get() ,PropertyAttribute::BOUND,0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; pInfo->add(pMap); diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx b/reportdesign/source/filter/xml/xmlControlProperty.cxx index f44d552407cc..f04e35d9a498 100644 --- a/reportdesign/source/filter/xml/xmlControlProperty.cxx +++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx @@ -85,10 +85,10 @@ OXMLControlProperty::OXMLControlProperty( ORptFilter& rImport if (s_aTypeNameMap.empty()) { s_aTypeNameMap[GetXMLToken( XML_BOOLEAN)] = ::getBooleanCppuType(); - s_aTypeNameMap[GetXMLToken( XML_FLOAT)] = ::getCppuType( static_cast< double* >(NULL) ); - s_aTypeNameMap[GetXMLToken( XML_DOUBLE)] = ::getCppuType( static_cast< double* >(NULL) ); + s_aTypeNameMap[GetXMLToken( XML_FLOAT)] = ::cppu::UnoType<double>::get(); + s_aTypeNameMap[GetXMLToken( XML_DOUBLE)] = ::cppu::UnoType<double>::get(); s_aTypeNameMap[GetXMLToken( XML_STRING)] = ::getCppuType( static_cast< OUString* >(NULL) ); - s_aTypeNameMap[GetXMLToken( XML_INT)] = ::getCppuType( static_cast< sal_Int32* >(NULL) ); + s_aTypeNameMap[GetXMLToken( XML_INT)] = ::cppu::UnoType<sal_Int32>::get(); s_aTypeNameMap[GetXMLToken( XML_SHORT)] = ::getCppuType( static_cast< sal_Int16* >(NULL) ); s_aTypeNameMap[GetXMLToken( XML_DATE)] = ::getCppuType( static_cast< com::sun::star::util::Date* >(NULL) ); s_aTypeNameMap[GetXMLToken( XML_TIME)] = ::getCppuType( static_cast< com::sun::star::util::Time* >(NULL) ); @@ -251,9 +251,9 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe case TypeClass_STRUCT: { // recognized structs: - static ::com::sun::star::uno::Type s_aDateType = ::getCppuType(static_cast< ::com::sun::star::util::Date* >(NULL)); - static ::com::sun::star::uno::Type s_aTimeType = ::getCppuType(static_cast< ::com::sun::star::util::Time* >(NULL)); - static ::com::sun::star::uno::Type s_aDateTimeType = ::getCppuType(static_cast< ::com::sun::star::util::DateTime* >(NULL)); + static ::com::sun::star::uno::Type s_aDateType = ::cppu::UnoType<com::sun::star::util::Date>::get(); + static ::com::sun::star::uno::Type s_aTimeType = ::cppu::UnoType<com::sun::star::util::Time>::get(); + static ::com::sun::star::uno::Type s_aDateTimeType = ::cppu::UnoType<com::sun::star::util::DateTime>::get(); sal_Int32 nType = 0; if ( _rExpectedType.equals(s_aDateType) ) nType = TYPE_DATE; diff --git a/reportdesign/source/filter/xml/xmlRow.cxx b/reportdesign/source/filter/xml/xmlRow.cxx index 3857a1f2e66e..317d0d16150b 100644 --- a/reportdesign/source/filter/xml/xmlRow.cxx +++ b/reportdesign/source/filter/xml/xmlRow.cxx @@ -128,8 +128,8 @@ void OXMLRow::EndElement() PropertySetInfo* pInfo = new PropertySetInfo(); static PropertyMapEntry pMap[] = { - {PROPERTY_WIDTH, static_cast<sal_uInt16>(PROPERTY_WIDTH.length), 0, &::getCppuType(static_cast< sal_Int32* >( NULL )) ,PropertyAttribute::BOUND,0}, - {PROPERTY_HEIGHT, static_cast<sal_uInt16>(PROPERTY_HEIGHT.length), 0, &::getCppuType(static_cast< sal_Int32* >( NULL )) ,PropertyAttribute::BOUND,0}, + {PROPERTY_WIDTH, static_cast<sal_uInt16>(PROPERTY_WIDTH.length), 0, &::cppu::UnoType<sal_Int32>::get() ,PropertyAttribute::BOUND,0}, + {PROPERTY_HEIGHT, static_cast<sal_uInt16>(PROPERTY_HEIGHT.length), 0, &::cppu::UnoType<sal_Int32>::get() ,PropertyAttribute::BOUND,0}, { NULL, 0, 0, NULL, 0, 0 } }; pInfo->add(pMap); diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx index 0757d8859775..03ba432e5773 100644 --- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx +++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx @@ -303,7 +303,7 @@ uno::Any SAL_CALL DataProviderHandler::convertToPropertyValue(const OUString & _ case PROPERTY_ID_PREVIEW_COUNT: try { - aPropertyValue = m_xTypeConverter->convertTo( _rControlValue, ::getCppuType((const sal_Int32*)0)); + aPropertyValue = m_xTypeConverter->convertTo( _rControlValue, ::cppu::UnoType<sal_Int32>::get()0)); } catch( const uno::Exception& ) { diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index 1f8701abde29..edeb9d199806 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -781,7 +781,7 @@ bool ScXMLImportWrapper::Export(bool bStylesOnly) { OUString("ProgressMax"), 0, ::cppu::UnoType<sal_Int32>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, { OUString("ProgressCurrent"), 0, ::cppu::UnoType<sal_Int32>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, { OUString("WrittenNumberStyles"), 0, ::getCppuType((uno::Sequence<sal_Int32>*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { OUString("UsePrettyPrinting"), 0, ::getCppuType((sal_Bool*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, + { OUString("UsePrettyPrinting"), 0, ::cppu::UnoType<sal_Bool>::get()0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, { OUString("BaseURI"), 0, ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("StreamRelPath"), 0, ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("StreamName"), 0, ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 832c06b2234d..c15fc3d007e1 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -825,7 +825,7 @@ static const SfxItemPropertySet* lcl_GetSheetPropertySet() {OUString(SC_UNONAME_CELLVJUS_METHOD), ATTR_VER_JUSTIFY_METHOD, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, {OUString(SC_UNONAME_WRITING), ATTR_WRITINGDIR, cppu::UnoType<sal_Int16>::get(), 0, 0 }, {OUString(SC_UNONAME_TABCOLOR), SC_WID_UNO_TABCOLOR, cppu::UnoType<sal_Int32>::get(), 0, 0 }, - {OUString(SC_UNO_CODENAME), SC_WID_UNO_CODENAME, getCppuType(static_cast< const OUString * >(0)), 0, 0}, + {OUString(SC_UNO_CODENAME), SC_WID_UNO_CODENAME, cppu::UnoType<OUString>::get(), 0, 0}, {OUString(SC_UNO_NAMEDRANGES), SC_WID_UNO_NAMES, getCppuType((uno::Reference<sheet::XNamedRanges>*)0), 0, 0 }, { OUString(), 0, css::uno::Type(), 0, 0 } }; diff --git a/sc/source/ui/unoobj/cellvaluebinding.cxx b/sc/source/ui/unoobj/cellvaluebinding.cxx index 21ad8622bc1a..692d8849e24b 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.cxx +++ b/sc/source/ui/unoobj/cellvaluebinding.cxx @@ -168,13 +168,13 @@ namespace calc if ( m_xCell.is() ) { // an XCell can be used to set/get "double" values - aTypes[0] = ::getCppuType( static_cast< double* >( NULL ) ); + aTypes[0] = ::cppu::UnoType<double>::get(); if ( m_xCellText.is() ) { // an XTextRange can be used to set/get "string" values - aTypes[1] = ::getCppuType( static_cast< OUString* >( NULL ) ); + aTypes[1] = ::cppu::UnoType<OUString>::get(); // and additionally, we use it to handle booleans - aTypes[2] = ::getCppuType( static_cast< sal_Bool* >( NULL ) ); + aTypes[2] = ::cppu::UnoType<sal_Bool>::get(); } // add sal_Int32 only if constructed as ListPositionCellBinding diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 9ff3544b903f..d752bea59f44 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -115,7 +115,7 @@ static const SfxItemPropertyMapEntry* lcl_GetDocOptPropertyMap() {OUString(SC_UNO_AUTOCONTFOC), 0, getBooleanCppuType(), 0, 0}, {OUString(SC_UNO_BASICLIBRARIES), 0, getCppuType((uno::Reference< script::XLibraryContainer >*)0), beans::PropertyAttribute::READONLY, 0}, {OUString(SC_UNO_DIALOGLIBRARIES), 0, getCppuType((uno::Reference< script::XLibraryContainer >*)0), beans::PropertyAttribute::READONLY, 0}, - {OUString(SC_UNO_VBAGLOBNAME), 0, getCppuType(static_cast< const OUString * >(0)), beans::PropertyAttribute::READONLY, 0}, + {OUString(SC_UNO_VBAGLOBNAME), 0, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0}, {OUString(SC_UNO_CALCASSHOWN), PROP_UNO_CALCASSHOWN, getBooleanCppuType(), 0, 0}, {OUString(SC_UNONAME_CLOCAL), 0, cppu::UnoType<lang::Locale>::get(), 0, 0}, {OUString(SC_UNO_CJK_CLOCAL), 0, cppu::UnoType<lang::Locale>::get(), 0, 0}, @@ -140,7 +140,7 @@ static const SfxItemPropertyMapEntry* lcl_GetDocOptPropertyMap() {OUString(SC_UNO_SPELLONLINE), PROP_UNO_SPELLONLINE, getBooleanCppuType(), 0, 0}, {OUString(SC_UNO_STANDARDDEC), PROP_UNO_STANDARDDEC, cppu::UnoType<sal_Int16>::get(), 0, 0}, {OUString(SC_UNO_REGEXENABLED), PROP_UNO_REGEXENABLED, getBooleanCppuType(), 0, 0}, - {OUString(SC_UNO_RUNTIMEUID), 0, getCppuType(static_cast< const OUString * >(0)), beans::PropertyAttribute::READONLY, 0}, + {OUString(SC_UNO_RUNTIMEUID), 0, cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0}, {OUString(SC_UNO_HASVALIDSIGNATURES), 0, getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0}, {OUString(SC_UNO_ISLOADED), 0, getBooleanCppuType(), 0, 0}, {OUString(SC_UNO_ISUNDOENABLED), 0, getBooleanCppuType(), 0, 0}, @@ -148,8 +148,8 @@ static const SfxItemPropertyMapEntry* lcl_GetDocOptPropertyMap() {OUString(SC_UNO_ISEXECUTELINKENABLED), 0, getBooleanCppuType(), 0, 0}, {OUString(SC_UNO_ISCHANGEREADONLYENABLED), 0, getBooleanCppuType(), 0, 0}, {OUString(SC_UNO_REFERENCEDEVICE), 0, getCppuType((uno::Reference<awt::XDevice>*)0), beans::PropertyAttribute::READONLY, 0}, - {OUString("BuildId"), 0, ::getCppuType(static_cast< const OUString * >(0)), 0, 0}, - {OUString(SC_UNO_CODENAME), 0, getCppuType(static_cast< const OUString * >(0)), 0, 0}, + {OUString("BuildId"), 0, ::cppu::UnoType<OUString>::get(), 0, 0}, + {OUString(SC_UNO_CODENAME), 0, cppu::UnoType<OUString>::get(), 0, 0}, {OUString(SC_UNO_INTEROPGRABBAG), 0, ::getCppuType((uno::Sequence< beans::PropertyValue >*)0), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx index 6fc91a8af4d1..8987fb544f93 100644 --- a/sc/source/ui/unoobj/shapeuno.cxx +++ b/sc/source/ui/unoobj/shapeuno.cxx @@ -54,7 +54,7 @@ static const SfxItemPropertyMapEntry* lcl_GetShapeMap() {OUString(SC_UNONAME_HORIPOS), 0, cppu::UnoType<sal_Int32>::get(), 0, 0 }, {OUString(SC_UNONAME_IMAGEMAP), 0, getCppuType((uno::Reference<container::XIndexContainer>*)0), 0, 0 }, {OUString(SC_UNONAME_VERTPOS), 0, cppu::UnoType<sal_Int32>::get(), 0, 0 }, - {OUString(SC_UNONAME_MOVEPROTECT), 0, getCppuType((sal_Bool*)0), 0, 0 }, + {OUString(SC_UNONAME_MOVEPROTECT), 0, cppu::UnoType<sal_Bool>::get()0), 0, 0 }, // #i66550 HLINK_FOR_SHAPES {OUString(SC_UNONAME_HYPERLINK), 0, cppu::UnoType<OUString>::get(), 0, 0 }, {OUString(SC_UNONAME_URL), 0, cppu::UnoType<OUString>::get(), 0, 0 }, diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx index c14c3c0c9746..ba214ac829e3 100644 --- a/sc/source/ui/unoobj/styleuno.cxx +++ b/sc/source/ui/unoobj/styleuno.cxx @@ -158,7 +158,7 @@ static const SfxItemPropertySet* lcl_GetCellStyleSet() {OUString(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, {OUString(SC_UNONAME_CELLVJUS_METHOD), ATTR_VER_JUSTIFY_METHOD, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, {OUString(SC_UNONAME_WRITING), ATTR_WRITINGDIR, cppu::UnoType<sal_Int16>::get(), 0, 0 }, - {OUString(SC_UNONAME_HIDDEN), ATTR_HIDDEN, getCppuType((sal_Bool*)0), 0, 0 }, + {OUString(SC_UNONAME_HIDDEN), ATTR_HIDDEN, cppu::UnoType<sal_Bool>::get()0), 0, 0 }, {OUString(SC_UNONAME_HYPERLINK), ATTR_HYPERLINK, cppu::UnoType<OUString>::get(), 0, 0 }, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -280,7 +280,7 @@ static const SfxItemPropertySet * lcl_GetPageStyleSet() {OUString(SC_UNONAME_USERDEF), ATTR_USERDEF, getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 }, {OUString(SC_UNO_PAGE_WIDTH), ATTR_PAGE_SIZE, ::cppu::UnoType<sal_Int32>::get(), 0, MID_SIZE_WIDTH | CONVERT_TWIPS }, {OUString(SC_UNONAME_WRITING), ATTR_WRITINGDIR, cppu::UnoType<sal_Int16>::get(), 0, 0 }, - {OUString(SC_UNONAME_HIDDEN), ATTR_HIDDEN, getCppuType((sal_Bool*)0), 0, 0 }, + {OUString(SC_UNONAME_HIDDEN), ATTR_HIDDEN, cppu::UnoType<sal_Bool>::get()0), 0, 0 }, { OUString(), 0, css::uno::Type(), 0, 0 } }; static SfxItemPropertySet aPageStyleSet_Impl( aPageStyleMap_Impl ); diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index 3fa5b4d12a40..9095c60dc2c8 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -3321,7 +3321,7 @@ uno::Reference< table::XCellRange > processKey( const uno::Any& Key, uno::Refere { xKeyRange.set( Key, uno::UNO_QUERY_THROW ); } - else if ( Key.getValueType() == ::getCppuType( static_cast< const OUString* >(0) ) ) + else if ( Key.getValueType() == ::cppu::UnoType<OUString>::get() ) { OUString sRangeName = ::comphelper::getString( Key ); diff --git a/scripting/source/provider/URIHelper.cxx b/scripting/source/provider/URIHelper.cxx index b6f1103986c4..b0a52049835a 100644 --- a/scripting/source/provider/URIHelper.cxx +++ b/scripting/source/provider/URIHelper.cxx @@ -86,8 +86,8 @@ ScriptingFrameworkURIHelper::initialize( throw ( uno::Exception, uno::RuntimeException, std::exception ) { if ( args.getLength() != 2 || - args[0].getValueType() != ::getCppuType((const OUString*)NULL) || - args[1].getValueType() != ::getCppuType((const OUString*)NULL) ) + args[0].getValueType() != ::cppu::UnoType<OUString>::get()NULL) || + args[1].getValueType() != ::cppu::UnoType<OUString>::get()NULL) ) { throw uno::RuntimeException( OUString( "ScriptingFrameworkURIHelper got invalid argument list" ), diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx index 0a4f35dcc269..6a3a1df73987 100644 --- a/scripting/source/vbaevents/eventhelper.cxx +++ b/scripting/source/vbaevents/eventhelper.cxx @@ -493,7 +493,7 @@ public: // XElementAccess virtual Type SAL_CALL getElementType( ) throw (RuntimeException, std::exception) SAL_OVERRIDE - { return getCppuType(static_cast< const OUString * >(0) ); } + { return cppu::UnoType<OUString>::get(); } virtual sal_Bool SAL_CALL hasElements( ) throw (RuntimeException, std::exception) SAL_OVERRIDE { return ( ( m_hEvents.size() > 0 ? sal_True : sal_False ) ); } private: diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx index 26c3aebc0c61..4b6d092c3f68 100644 --- a/sd/source/filter/xml/sdxmlwrp.cxx +++ b/sd/source/filter/xml/sdxmlwrp.cxx @@ -444,7 +444,7 @@ bool SdXMLFilter::Import( ErrCode& nError ) { OUString("ProgressRange"), 0, ::cppu::UnoType<sal_Int32>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, { OUString("ProgressMax"), 0, ::cppu::UnoType<sal_Int32>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, { OUString("ProgressCurrent"), 0, ::cppu::UnoType<sal_Int32>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { OUString("Preview"), 0, ::getCppuType((const sal_Bool*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, + { OUString("Preview"), 0, ::cppu::UnoType<sal_Bool>::get()0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, { OUString("PageLayouts"), 0, ::getCppuType((const uno::Reference< container::XNameAccess >*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, { OUString("PrivateData"), 0, ::getCppuType( (Reference<XInterface> *)0 ), diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index 99a5220c8923..7318bf2bf65e 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -1349,7 +1349,7 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con const Any aValue( pSet->getPropertyValue( nHandleSoundURL ) ); - if( aValue.getValueType() == ::getCppuType((const sal_Bool*)0) ) + if( aValue.getValueType() == ::cppu::UnoType<sal_Bool>::get()0) ) { nPos = 1; } diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 5a6967c5a439..7e3a2c894767 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -1354,7 +1354,7 @@ void CustomAnimationPane::changeSelection( STLPropertySet* pResultSet, STLProper { const Any aSoundSource( pResultSet->getPropertyValue( nHandleSoundURL ) ); - if( aSoundSource.getValueType() == ::getCppuType((const sal_Bool*)0) ) + if( aSoundSource.getValueType() == ::cppu::UnoType<sal_Bool>::get()0) ) { pEffect->setStopAudio(); bChanged = true; diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 68a916125306..a6688696cdda 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -182,7 +182,7 @@ const SvxItemPropertySet* ImplGetDrawModelPropertySet() // Attention: the first parameter HAS TO BE sorted!!! const static SfxItemPropertyMapEntry aDrawModelPropertyMap_Impl[] = { - { OUString("BuildId"), WID_MODEL_BUILDID, ::getCppuType(static_cast< const OUString * >(0)), 0, 0}, + { OUString("BuildId"), WID_MODEL_BUILDID, ::cppu::UnoType<OUString>::get(), 0, 0}, { OUString(sUNO_Prop_CharLocale), WID_MODEL_LANGUAGE, ::cppu::UnoType<lang::Locale>::get(), 0, 0}, { OUString(sUNO_Prop_TabStop), WID_MODEL_TABSTOP, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, { OUString(sUNO_Prop_VisibleArea), WID_MODEL_VISAREA, ::cppu::UnoType<awt::Rectangle>::get(), 0, 0}, @@ -192,8 +192,8 @@ const SvxItemPropertySet* ImplGetDrawModelPropertySet() { OUString(sUNO_Prop_ApplyFrmDsgnMode), WID_MODEL_DSGNMODE, ::getBooleanCppuType(), 0, 0}, { OUString("BasicLibraries"), WID_MODEL_BASICLIBS, ::getCppuType((const uno::Reference< script::XLibraryContainer > *)0), beans::PropertyAttribute::READONLY, 0}, { OUString("DialogLibraries"), WID_MODEL_DIALOGLIBS, ::getCppuType((const uno::Reference< script::XLibraryContainer > *)0), beans::PropertyAttribute::READONLY, 0}, - { OUString(sUNO_Prop_RuntimeUID), WID_MODEL_RUNTIMEUID, ::getCppuType(static_cast< const OUString * >(0)), beans::PropertyAttribute::READONLY, 0}, - { OUString(sUNO_Prop_HasValidSignatures), WID_MODEL_HASVALIDSIGNATURES, ::getCppuType(static_cast< const sal_Bool * >(0)), beans::PropertyAttribute::READONLY, 0}, + { OUString(sUNO_Prop_RuntimeUID), WID_MODEL_RUNTIMEUID, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0}, + { OUString(sUNO_Prop_HasValidSignatures), WID_MODEL_HASVALIDSIGNATURES, ::cppu::UnoType<sal_Bool>::get(), beans::PropertyAttribute::READONLY, 0}, { OUString("Fonts"), WID_MODEL_FONTS, ::getCppuType((uno::Sequence<uno::Any>*)0), beans::PropertyAttribute::READONLY, 0}, { OUString(sUNO_Prop_InteropGrabBag), WID_MODEL_INTEROPGRABBAG, ::getCppuType((uno::Sequence< beans::PropertyValue >*)0), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index ac36ad2d3778..1fa1e58ecabb 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -140,7 +140,7 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( bool bImpress, PageKind eP { OUString("DateTimeFormat"), WID_PAGE_DATETIMEFORMAT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, { OUString("TransitionType"), WID_TRANSITION_TYPE, ::cppu::UnoType<sal_Int16>::get(), 0, 0}, { OUString("TransitionSubtype"), WID_TRANSITION_SUBTYPE, ::cppu::UnoType<sal_Int16>::get(), 0, 0}, - { OUString("TransitionDirection"), WID_TRANSITION_DIRECTION, ::getCppuType((const sal_Bool*)0), 0, 0}, + { OUString("TransitionDirection"), WID_TRANSITION_DIRECTION, ::cppu::UnoType<sal_Bool>::get()0), 0, 0}, { OUString("TransitionFadeColor"), WID_TRANSITION_FADE_COLOR, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, { OUString("TransitionDuration"), WID_TRANSITION_DURATION, ::cppu::UnoType<double>::get(), 0, 0}, { OUString("LoopSound"), WID_LOOP_SOUND, ::getBooleanCppuType(), 0, 0}, diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index b4452d4b05f7..9c1362074d59 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -684,7 +684,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) rReq.AppendItem( SfxUnoAnyItem(SID_INTERACTIONHANDLER,::com::sun::star::uno::makeAny(xHandler)) ); // define rules for this handler - css::uno::Type aInteraction = ::getCppuType(static_cast< css::task::ErrorCodeRequest* >(0)); + css::uno::Type aInteraction = ::cppu::UnoType<css::task::ErrorCodeRequest>::get(); ::framework::PreventDuplicateInteraction::InteractionInfo aRule (aInteraction, 1); pHandler->addInteractionRule(aRule); diff --git a/svl/source/numbers/supservs.cxx b/svl/source/numbers/supservs.cxx index 4a7591af9a4a..d178694ec574 100644 --- a/svl/source/numbers/supservs.cxx +++ b/svl/source/numbers/supservs.cxx @@ -88,7 +88,7 @@ void SAL_CALL SvNumberFormatsSupplierServiceObject::initialize( const Sequence< SetNumberFormatter(m_pOwnFormatter); } - Type aExpectedArgType = ::getCppuType(static_cast<Locale*>(NULL)); + Type aExpectedArgType = ::cppu::UnoType<Locale>::get(); LanguageType eNewFormatterLanguage = LANGUAGE_ENGLISH_US; // the default diff --git a/svx/source/form/dataaccessdescriptor.cxx b/svx/source/form/dataaccessdescriptor.cxx index 491795491bab..2063760f98e9 100644 --- a/svx/source/form/dataaccessdescriptor.cxx +++ b/svx/source/form/dataaccessdescriptor.cxx @@ -190,16 +190,16 @@ namespace svx { OUString("ActiveConnection"), daConnection, ::getCppuType( static_cast< Reference< XConnection >* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, { OUString("BookmarkSelection"), daBookmarkSelection, ::getBooleanCppuType( ), PropertyAttribute::TRANSIENT, 0 }, { OUString("Column"), daColumnObject, ::getCppuType( static_cast< Reference< XPropertySet >* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, - { OUString("ColumnName"), daColumnName, ::getCppuType( static_cast< OUString* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, - { OUString("Command"), daCommand, ::getCppuType( static_cast< OUString* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, - { OUString("CommandType"), daCommandType, ::getCppuType( static_cast< sal_Int32* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, + { OUString("ColumnName"), daColumnName, ::cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT, 0 }, + { OUString("Command"), daCommand, ::cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT, 0 }, + { OUString("CommandType"), daCommandType, ::cppu::UnoType<sal_Int32>::get(), PropertyAttribute::TRANSIENT, 0 }, { OUString("Component"), daComponent, ::getCppuType( static_cast< Reference< XContent >* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, - { OUString("ConnectionResource"), daConnectionResource, ::getCppuType( static_cast< OUString* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, + { OUString("ConnectionResource"), daConnectionResource, ::cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT, 0 }, { OUString("Cursor"), daCursor, ::getCppuType( static_cast< Reference< XResultSet>* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, - { OUString("DataSourceName"), daDataSource, ::getCppuType( static_cast< OUString* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, - { OUString("DatabaseLocation"), daDatabaseLocation, ::getCppuType( static_cast< OUString* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, + { OUString("DataSourceName"), daDataSource, ::cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT, 0 }, + { OUString("DatabaseLocation"), daDatabaseLocation, ::cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT, 0 }, { OUString("EscapeProcessing"), daEscapeProcessing, ::getBooleanCppuType( ), PropertyAttribute::TRANSIENT, 0 }, - { OUString("Filter"), daFilter, ::getCppuType( static_cast< OUString* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, + { OUString("Filter"), daFilter, ::cppu::UnoType<OUString>::get(), PropertyAttribute::TRANSIENT, 0 }, { OUString("Selection"), daSelection, ::getCppuType( static_cast< Sequence< Any >* >(NULL) ), PropertyAttribute::TRANSIENT, 0 }, { OUString(), 0, css::uno::Type(), 0, 0 } }; diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx index 1f116e9ef874..b761d8c41b23 100644 --- a/svx/source/unogallery/unogalitem.cxx +++ b/svx/source/unogallery/unogalitem.cxx @@ -226,10 +226,10 @@ sal_Int8 SAL_CALL GalleryItem::getType() { OUString("GalleryItemType"), UNOGALLERY_GALLERYITEMTYPE, ::getCppuType( (const sal_Int8*)(0)), beans::PropertyAttribute::READONLY, 0 }, - { OUString("URL"), UNOGALLERY_URL, ::getCppuType( (const OUString*)(0)), + { OUString("URL"), UNOGALLERY_URL, ::cppu::UnoType<OUString>::get()(0)), beans::PropertyAttribute::READONLY, 0 }, - { OUString("Title"), UNOGALLERY_TITLE, ::getCppuType( (const OUString*)(0)), + { OUString("Title"), UNOGALLERY_TITLE, ::cppu::UnoType<OUString>::get()(0)), 0, 0 }, { OUString("Thumbnail"), UNOGALLERY_THUMBNAIL, ::getCppuType( (const uno::Reference< graphic::XGraphic >*)(0)), diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index 325d0e1a879a..3a1210b8434d 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -674,7 +674,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, rValue >>= m_pImpl->m_sParam1; else if(rPropertyName == UNO_NAME_VALUE) { - if(rValue.getValueType() != ::getCppuType(static_cast<const double*>(0))) + if(rValue.getValueType() != ::cppu::UnoType<double>::get()) throw lang::IllegalArgumentException(); rValue >>= m_pImpl->m_fParam1; } @@ -2209,7 +2209,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, break; case FIELD_PROP_DATE : { - if(rValue.getValueType() != ::getCppuType(static_cast<const util::Date*>(0))) + if(rValue.getValueType() != ::cppu::UnoType<util::Date>::get()) throw lang::IllegalArgumentException(); util::Date aTemp = *(const util::Date*)rValue.getValue(); @@ -2231,7 +2231,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, rValue >>= m_pImpl->m_pProps->nSHORT1; break; case FIELD_PROP_DOUBLE: - if(rValue.getValueType() != ::getCppuType(static_cast<const double*>(0))) + if(rValue.getValueType() != ::cppu::UnoType<double>::get()) throw lang::IllegalArgumentException(); rValue >>= m_pImpl->m_pProps->fDouble; break; @@ -2414,7 +2414,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, aRet.setValue(&m_pImpl->m_pProps->bBool4, ::getCppuBooleanType()); break; case FIELD_PROP_DATE : - aRet.setValue(&m_pImpl->m_pProps->aDate, ::getCppuType(static_cast<const util::Date*>(0))); + aRet.setValue(&m_pImpl->m_pProps->aDate, ::cppu::UnoType<util::Date>::get()); break; case FIELD_PROP_USHORT1: aRet <<= static_cast<sal_Int16>(m_pImpl->m_pProps->nUSHORT1); diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index fb8fce715e7f..b1e315fe146b 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -2134,7 +2134,7 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName) awt::Size aTmp; aTmp.Width = convertTwipToMm100(aActSize.Width()); aTmp.Height = convertTwipToMm100(aActSize.Height()); - aAny.setValue(&aTmp, ::getCppuType(static_cast<const awt::Size*>(0))); + aAny.setValue(&aTmp, ::cppu::UnoType<awt::Size>::get()); } } else if(FN_PARAM_LINK_DISPLAY_NAME == pEntry->nWID) @@ -3116,7 +3116,7 @@ awt::Size SwXFrame::getSize(void) throw( uno::RuntimeException, std::exception ) void SwXFrame::setSize(const awt::Size& aSize) throw( beans::PropertyVetoException, uno::RuntimeException, std::exception ) { - const ::uno::Any aVal(&aSize, ::getCppuType(static_cast<const awt::Size*>(0))); + const ::uno::Any aVal(&aSize, ::cppu::UnoType<awt::Size>::get()); setPropertyValue("Size", aVal); } diff --git a/ucbhelper/source/provider/resultset.cxx b/ucbhelper/source/provider/resultset.cxx index 421b6aa853f2..19e604cde931 100644 --- a/ucbhelper/source/provider/resultset.cxx +++ b/ucbhelper/source/provider/resultset.cxx @@ -46,7 +46,7 @@ struct PropertyInfo static const uno::Type& sal_Int32_getCppuType() { - return getCppuType( static_cast< const sal_Int32 * >( 0 ) ); + return cppu::UnoType<sal_Int32>::get(); } static const uno::Type& sal_Bool_getCppuType() diff --git a/ucbhelper/source/provider/resultsetmetadata.cxx b/ucbhelper/source/provider/resultsetmetadata.cxx index 25b6e8483502..1dffea6beab0 100644 --- a/ucbhelper/source/provider/resultsetmetadata.cxx +++ b/ucbhelper/source/provider/resultsetmetadata.cxx @@ -460,7 +460,7 @@ sal_Int32 SAL_CALL ResultSetMetaData::getColumnType( sal_Int32 column ) nType = DataType::VARCHAR; // XRow::getString else if ( rType == getCppuBooleanType() ) nType = DataType::BIT; // XRow::getBoolean - else if ( rType == getCppuType( static_cast< const sal_Int32 * >( 0 ) ) ) + else if ( rType == cppu::UnoType<sal_Int32>::get() ) nType = DataType::INTEGER; // XRow::getInt else if ( rType == getCppuType( static_cast< const sal_Int64 * >( 0 ) ) ) nType = DataType::BIGINT; // XRow::getLong diff --git a/vcl/osx/DataFlavorMapping.cxx b/vcl/osx/DataFlavorMapping.cxx index f86500ea835f..f54b28a4f47c 100644 --- a/vcl/osx/DataFlavorMapping.cxx +++ b/vcl/osx/DataFlavorMapping.cxx @@ -53,7 +53,7 @@ namespace // private { size_t len = aFlavor.MimeType.getLength(); Type dtype = aFlavor.DataType; - return ((len > 0) && ((dtype == getCppuType((Sequence<sal_Int8>*)0)) || (dtype == getCppuType( (OUString*)0 )))); + return ((len > 0) && ((dtype == getCppuType((Sequence<sal_Int8>*)0)) || (dtype == cppu::UnoType<OUString>::get()0 )))); } OUString NSStringToOUString( const NSString* cfString) @@ -137,7 +137,7 @@ namespace // private inline bool isOUStringType(const Type& theType) { - return (theType == getCppuType( (OUString*)0 )); + return (theType == cppu::UnoType<OUString>::get()0 )); } } // namespace private @@ -486,7 +486,7 @@ DataFlavor DataFlavorMapper::systemToOpenOfficeFlavor( const NSString* systemDat { oOOFlavor.MimeType = OUString::createFromAscii(flavorMap[i].OOoFlavor); oOOFlavor.HumanPresentableName = OUString::createFromAscii(flavorMap[i].HumanPresentableName); - oOOFlavor.DataType = flavorMap[i].DataTypeOUString ? getCppuType( (OUString*)0 ) : getCppuType((Sequence<sal_Int8>*)0); + oOOFlavor.DataType = flavorMap[i].DataTypeOUString ? cppu::UnoType<OUString>::get()0 ) : getCppuType((Sequence<sal_Int8>*)0); return oOOFlavor; } } // for diff --git a/vcl/osx/OSXTransferable.cxx b/vcl/osx/OSXTransferable.cxx index 1a4f5d9814ac..2eb02367210e 100644 --- a/vcl/osx/OSXTransferable.cxx +++ b/vcl/osx/OSXTransferable.cxx @@ -38,7 +38,7 @@ namespace // private { size_t len = aFlavor.MimeType.getLength(); Type dtype = aFlavor.DataType; - return ((len > 0) && ((dtype == getCppuType((Sequence<sal_Int8>*)0)) || (dtype == getCppuType((OUString*)0)))); + return ((len > 0) && ((dtype == getCppuType((Sequence<sal_Int8>*)0)) || (dtype == cppu::UnoType<OUString>::get()0)))); } } // namespace private @@ -98,7 +98,7 @@ Any SAL_CALL OSXTransferable::getTransferData( const DataFlavor& aFlavor ) bool OSXTransferable::isUnicodeText(const DataFlavor& flavor) { - return (flavor.DataType == getCppuType((OUString*)0)); + return (flavor.DataType == cppu::UnoType<OUString>::get()0)); } Sequence< DataFlavor > SAL_CALL OSXTransferable::getTransferDataFlavors( ) diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx index 0d7889b51bb4..a26b2891168f 100644 --- a/vcl/unx/generic/dtrans/X11_selection.cxx +++ b/vcl/unx/generic/dtrans/X11_selection.cxx @@ -615,7 +615,7 @@ bool SelectionManager::convertData( if( aFlavor.MimeType.getToken( 0, ';', nIndex ).equalsAscii( "text/plain" ) ) { if( aFlavor.MimeType.getToken( 0, ';', nIndex ).equalsAscii( "charset=utf-16" ) ) - aFlavor.DataType = getCppuType( (OUString *) 0 ); + aFlavor.DataType = cppu::UnoType<OUString>::get() 0 ); else aFlavor.DataType = getCppuType( (Sequence< sal_Int8 >*)0 ); } @@ -649,7 +649,7 @@ bool SelectionManager::convertData( if( aEncoding != RTL_TEXTENCODING_DONTKNOW || bCompoundText ) { aFlavor.MimeType = "text/plain;charset=utf-16"; - aFlavor.DataType = getCppuType( (OUString *) 0 ); + aFlavor.DataType = cppu::UnoType<OUString>::get() 0 ); if( xTransferable->isDataFlavorSupported( aFlavor ) ) { Any aValue( xTransferable->getTransferData( aFlavor ) ); @@ -1331,7 +1331,7 @@ bool SelectionManager::getPasteDataTypes( Atom selection, Sequence< DataFlavor > if( aToken.equalsAscii( "charset=utf-16" ) ) { bHaveUTF16 = true; - pFlavors->DataType = getCppuType( (OUString*)0 ); + pFlavors->DataType = cppu::UnoType<OUString>::get()0 ); } else if( aToken.equalsAscii( "charset=utf-8" ) ) { @@ -1356,7 +1356,7 @@ bool SelectionManager::getPasteDataTypes( Atom selection, Sequence< DataFlavor > for( i = 0; i < nNewFlavors-1; i++ ) aTemp.getArray()[i+1] = rTypes.getConstArray()[i]; aTemp.getArray()[0].MimeType = "text/plain;charset=utf-16"; - aTemp.getArray()[0].DataType = getCppuType( (OUString*)0 ); + aTemp.getArray()[0].DataType = cppu::UnoType<OUString>::get()0 ); rTypes = aTemp; std::vector< Atom > aNativeTemp( nNewFlavors ); diff --git a/vcl/unx/generic/dtrans/X11_transferable.cxx b/vcl/unx/generic/dtrans/X11_transferable.cxx index 29493126884f..59cf9ada812b 100644 --- a/vcl/unx/generic/dtrans/X11_transferable.cxx +++ b/vcl/unx/generic/dtrans/X11_transferable.cxx @@ -95,7 +95,7 @@ sal_Bool SAL_CALL X11Transferable::isDataFlavorSupported( const DataFlavor& aFla if( aFlavor.DataType != getCppuType( (Sequence< sal_Int8 >*)0 ) ) { if( ! aFlavor.MimeType.equalsIgnoreAsciiCase( "text/plain;charset=utf-16" ) && - aFlavor.DataType == getCppuType( (OUString*)0 ) ) + aFlavor.DataType == cppu::UnoType<OUString>::get()0 ) ) return false; } diff --git a/xmloff/source/forms/eventexport.cxx b/xmloff/source/forms/eventexport.cxx index e3454d5801e6..667d135dc8e8 100644 --- a/xmloff/source/forms/eventexport.cxx +++ b/xmloff/source/forms/eventexport.cxx @@ -125,7 +125,7 @@ namespace xmloff Type SAL_CALL OEventDescriptorMapper::getElementType( ) throw(RuntimeException, std::exception) { - return ::getCppuType(static_cast< PropertyValue* >(NULL)); + return ::cppu::UnoType<PropertyValue>::get(); } sal_Bool SAL_CALL OEventDescriptorMapper::hasElements( ) throw(RuntimeException, std::exception) diff --git a/xmloff/source/forms/gridcolumnproptranslator.cxx b/xmloff/source/forms/gridcolumnproptranslator.cxx index efb4ff1e5869..aebb2c578124 100644 --- a/xmloff/source/forms/gridcolumnproptranslator.cxx +++ b/xmloff/source/forms/gridcolumnproptranslator.cxx @@ -160,7 +160,7 @@ namespace xmloff { if ( aName == getParaAlignProperty() ) return Property( getParaAlignProperty(), -1, - ::getCppuType( static_cast< const ParagraphAdjust* >( NULL ) ), 0 ); + ::cppu::UnoType<ParagraphAdjust>::get(), 0 ); if ( !m_xMasterInfo.is() ) return Property(); diff --git a/xmloff/source/forms/layerimport.cxx b/xmloff/source/forms/layerimport.cxx index 3fa697193bf4..fa1ff91a3286 100644 --- a/xmloff/source/forms/layerimport.cxx +++ b/xmloff/source/forms/layerimport.cxx @@ -192,7 +192,7 @@ OFormLayerXMLImport_Impl::OFormLayerXMLImport_Impl(SvXMLImport& _rImporter) m_aAttributeMetaData.addEnumProperty( OAttributeMetaData::getDatabaseAttributeName(DA_LIST_SOURCE_TYPE), PROPERTY_LISTSOURCETYPE, ListSourceType_VALUELIST, OEnumMapper::getEnumMap(OEnumMapper::epListSourceType), - &::getCppuType( static_cast<ListSourceType*>(NULL) )); + &::cppu::UnoType<ListSourceType>::get()); m_aAttributeMetaData.addEnumProperty( OAttributeMetaData::getSpecialAttributeName(SCA_STATE), PROPERTY_DEFAULT_STATE, TRISTATE_FALSE, OEnumMapper::getEnumMap(OEnumMapper::epCheckState), @@ -215,11 +215,11 @@ OFormLayerXMLImport_Impl::OFormLayerXMLImport_Impl(SvXMLImport& _rImporter) m_aAttributeMetaData.addEnumProperty( OAttributeMetaData::getFormAttributeName(faNavigationMode), PROPERTY_NAVIGATION, NavigationBarMode_NONE, OEnumMapper::getEnumMap(OEnumMapper::epNavigationType), - &::getCppuType( static_cast<NavigationBarMode*>(NULL) )); + &::cppu::UnoType<NavigationBarMode>::get()); m_aAttributeMetaData.addEnumProperty( OAttributeMetaData::getFormAttributeName(faTabbingCycle), PROPERTY_CYCLE, TabulatorCycle_RECORDS, OEnumMapper::getEnumMap(OEnumMapper::epTabCyle), - &::getCppuType( static_cast<TabulatorCycle*>(NULL) )); + &::cppu::UnoType<TabulatorCycle>::get()); // 'initialize' m_aCurrentPageIds = m_aControlIds.end(); diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx index 50d96efb4c13..1b47bf3be147 100644 --- a/xmloff/source/forms/propertyimport.cxx +++ b/xmloff/source/forms/propertyimport.cxx @@ -241,7 +241,7 @@ Type PropertyConversion::xmlTypeToUnoType( const OUString& _rType ) if ( s_aTypeNameMap.empty() ) { s_aTypeNameMap[ token::GetXMLToken( token::XML_BOOLEAN ) ] = ::getBooleanCppuType(); - s_aTypeNameMap[ token::GetXMLToken( token::XML_FLOAT ) ] = ::getCppuType( static_cast< double* >(NULL) ); + 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 ) ] = ::getVoidCppuType(); } |