From c288b17cc5a1d5051325e02a29aa40df5be6f016 Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Wed, 14 May 2014 23:17:17 +0200 Subject: Prefer cppu::UnoType::get() to ::getCppuType((T*)0) part12 Change-Id: I7c514b7a1d86f52d77672b826b1f08b825fd7aa7 --- reportdesign/source/core/api/FixedLine.cxx | 2 +- reportdesign/source/core/api/FixedText.cxx | 2 +- reportdesign/source/core/api/FormattedField.cxx | 2 +- reportdesign/source/core/api/Functions.cxx | 2 +- reportdesign/source/core/api/Groups.cxx | 2 +- reportdesign/source/core/api/ImageControl.cxx | 2 +- reportdesign/source/core/api/Section.cxx | 2 +- reportdesign/source/core/api/Shape.cxx | 2 +- reportdesign/source/filter/xml/xmlControlProperty.cxx | 14 +++++++------- 9 files changed, 15 insertions(+), 15 deletions(-) (limited to 'reportdesign/source') diff --git a/reportdesign/source/core/api/FixedLine.cxx b/reportdesign/source/core/api/FixedLine.cxx index e982787c18af..42df349e9998 100644 --- a/reportdesign/source/core/api/FixedLine.cxx +++ b/reportdesign/source/core/api/FixedLine.cxx @@ -458,7 +458,7 @@ void SAL_CALL OFixedLine::removeContainerListener( const uno::Reference< contain // XElementAccess uno::Type SAL_CALL OFixedLine::getElementType( ) throw (uno::RuntimeException, std::exception) { - return ::getCppuType(static_cast< uno::Reference*>(NULL)); + return cppu::UnoType::get(); } sal_Bool SAL_CALL OFixedLine::hasElements( ) throw (uno::RuntimeException, std::exception) diff --git a/reportdesign/source/core/api/FixedText.cxx b/reportdesign/source/core/api/FixedText.cxx index 00862ab08947..a64edfb08b2a 100644 --- a/reportdesign/source/core/api/FixedText.cxx +++ b/reportdesign/source/core/api/FixedText.cxx @@ -256,7 +256,7 @@ void SAL_CALL OFixedText::removeContainerListener( const uno::Reference< contain // XElementAccess uno::Type SAL_CALL OFixedText::getElementType( ) throw (uno::RuntimeException, std::exception) { - return ::getCppuType(static_cast< uno::Reference*>(NULL)); + return cppu::UnoType::get(); } sal_Bool SAL_CALL OFixedText::hasElements( ) throw (uno::RuntimeException, std::exception) diff --git a/reportdesign/source/core/api/FormattedField.cxx b/reportdesign/source/core/api/FormattedField.cxx index 5d4bc79fe941..eefc18b4a774 100644 --- a/reportdesign/source/core/api/FormattedField.cxx +++ b/reportdesign/source/core/api/FormattedField.cxx @@ -299,7 +299,7 @@ void SAL_CALL OFormattedField::removeContainerListener( const uno::Reference< co // XElementAccess uno::Type SAL_CALL OFormattedField::getElementType( ) throw (uno::RuntimeException, std::exception) { - return ::getCppuType(static_cast< uno::Reference*>(NULL)); + return cppu::UnoType::get(); } sal_Bool SAL_CALL OFormattedField::hasElements( ) throw (uno::RuntimeException, std::exception) diff --git a/reportdesign/source/core/api/Functions.cxx b/reportdesign/source/core/api/Functions.cxx index 3a188e510378..1ad9ed3ab96b 100644 --- a/reportdesign/source/core/api/Functions.cxx +++ b/reportdesign/source/core/api/Functions.cxx @@ -150,7 +150,7 @@ uno::Any SAL_CALL OFunctions::getByIndex( ::sal_Int32 Index ) throw (lang::Index // XElementAccess uno::Type SAL_CALL OFunctions::getElementType( ) throw (uno::RuntimeException, std::exception) { - return ::getCppuType(static_cast< uno::Reference*>(NULL)); + return cppu::UnoType::get(); } sal_Bool SAL_CALL OFunctions::hasElements( ) throw (uno::RuntimeException, std::exception) diff --git a/reportdesign/source/core/api/Groups.cxx b/reportdesign/source/core/api/Groups.cxx index bd19c41d208a..e7cd7b7d94e9 100644 --- a/reportdesign/source/core/api/Groups.cxx +++ b/reportdesign/source/core/api/Groups.cxx @@ -163,7 +163,7 @@ uno::Any SAL_CALL OGroups::getByIndex( ::sal_Int32 Index ) throw (lang::IndexOut // XElementAccess uno::Type SAL_CALL OGroups::getElementType( ) throw (uno::RuntimeException, std::exception) { - return ::getCppuType(static_cast< uno::Reference*>(NULL)); + return cppu::UnoType::get(); } sal_Bool SAL_CALL OGroups::hasElements( ) throw (uno::RuntimeException, std::exception) diff --git a/reportdesign/source/core/api/ImageControl.cxx b/reportdesign/source/core/api/ImageControl.cxx index 20593b19e8e4..36355d0d53ae 100644 --- a/reportdesign/source/core/api/ImageControl.cxx +++ b/reportdesign/source/core/api/ImageControl.cxx @@ -392,7 +392,7 @@ void SAL_CALL OImageControl::removeContainerListener( const uno::Reference< cont // XElementAccess uno::Type SAL_CALL OImageControl::getElementType( ) throw (uno::RuntimeException, std::exception) { - return ::getCppuType(static_cast< uno::Reference*>(NULL)); + return cppu::UnoType::get(); } sal_Bool SAL_CALL OImageControl::hasElements( ) throw (uno::RuntimeException, std::exception) diff --git a/reportdesign/source/core/api/Section.cxx b/reportdesign/source/core/api/Section.cxx index 747e30b7815a..a287bc1cf8fb 100644 --- a/reportdesign/source/core/api/Section.cxx +++ b/reportdesign/source/core/api/Section.cxx @@ -509,7 +509,7 @@ void SAL_CALL OSection::removeContainerListener( const uno::Reference< container // XElementAccess uno::Type SAL_CALL OSection::getElementType( ) throw (uno::RuntimeException, std::exception) { - return ::getCppuType(static_cast< uno::Reference*>(NULL)); + return cppu::UnoType::get(); } sal_Bool SAL_CALL OSection::hasElements( ) throw (uno::RuntimeException, std::exception) diff --git a/reportdesign/source/core/api/Shape.cxx b/reportdesign/source/core/api/Shape.cxx index 17f67f9685d2..ac5796ee4850 100644 --- a/reportdesign/source/core/api/Shape.cxx +++ b/reportdesign/source/core/api/Shape.cxx @@ -359,7 +359,7 @@ void SAL_CALL OShape::removeContainerListener( const uno::Reference< container:: // XElementAccess uno::Type SAL_CALL OShape::getElementType( ) throw (uno::RuntimeException, std::exception) { - return ::getCppuType(static_cast< uno::Reference*>(NULL)); + return cppu::UnoType::get(); } sal_Bool SAL_CALL OShape::hasElements( ) throw (uno::RuntimeException, std::exception) diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx b/reportdesign/source/filter/xml/xmlControlProperty.cxx index 36bc3ef921d8..5545bb26c6eb 100644 --- a/reportdesign/source/filter/xml/xmlControlProperty.cxx +++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx @@ -85,13 +85,13 @@ OXMLControlProperty::OXMLControlProperty( ORptFilter& rImport if (s_aTypeNameMap.empty()) { s_aTypeNameMap[GetXMLToken( XML_BOOLEAN)] = ::getBooleanCppuType(); - s_aTypeNameMap[GetXMLToken( XML_FLOAT)] = ::cppu::UnoType::get(); - s_aTypeNameMap[GetXMLToken( XML_DOUBLE)] = ::cppu::UnoType::get(); - s_aTypeNameMap[GetXMLToken( XML_STRING)] = ::cppu::UnoType::get(); - s_aTypeNameMap[GetXMLToken( XML_INT)] = ::cppu::UnoType::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) ); + s_aTypeNameMap[GetXMLToken( XML_FLOAT)] = cppu::UnoType::get(); + s_aTypeNameMap[GetXMLToken( XML_DOUBLE)] = cppu::UnoType::get(); + s_aTypeNameMap[GetXMLToken( XML_STRING)] = cppu::UnoType::get(); + s_aTypeNameMap[GetXMLToken( XML_INT)] = cppu::UnoType::get(); + s_aTypeNameMap[GetXMLToken( XML_SHORT)] = cppu::UnoType::get(); + s_aTypeNameMap[GetXMLToken( XML_DATE)] = cppu::UnoType::get(); + s_aTypeNameMap[GetXMLToken( XML_TIME)] = cppu::UnoType::get(); s_aTypeNameMap[GetXMLToken( XML_VOID)] = ::getVoidCppuType(); } -- cgit