diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2012-08-13 15:04:39 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-08-14 10:39:13 +0200 |
| commit | ed93117447a3217fab0e2425f8761e24423024b5 (patch) | |
| tree | 2e178188bef319d1a1e5594acd5732e9959e35a8 /extensions | |
| parent | 9272ce4e6f54bc283bbbe6106f66fd48c4ce8d82 (diff) | |
fdo#53061: Fix for C++11 #define NULL nullptr
Change-Id: Ia1805aab4bec7fef02c96ec4e7a7a0ed9991d3c3
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/resource/ResourceIndexAccess.cxx | 4 | ||||
| -rw-r--r-- | extensions/source/resource/ResourceIndexAccess.hxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/extensions/source/resource/ResourceIndexAccess.cxx b/extensions/source/resource/ResourceIndexAccess.cxx index 7b99e83ef5af..66c263df941c 100644 --- a/extensions/source/resource/ResourceIndexAccess.cxx +++ b/extensions/source/resource/ResourceIndexAccess.cxx @@ -94,7 +94,7 @@ namespace virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XElementAccessBase virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException) - { return ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)); }; + { return ::getCppuType(static_cast< ::rtl::OUString*>(0)); }; }; class ResourceStringListIndexAccess : public ResourceIndexAccessBase @@ -106,7 +106,7 @@ namespace virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XElementAccessBase virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException) - { return ::getCppuType(reinterpret_cast<Sequence<PropertyValue> * >(NULL)); }; + { return ::getCppuType(static_cast<Sequence<PropertyValue> * >(0)); }; }; } diff --git a/extensions/source/resource/ResourceIndexAccess.hxx b/extensions/source/resource/ResourceIndexAccess.hxx index e5675ab58f49..036c03f6bc61 100644 --- a/extensions/source/resource/ResourceIndexAccess.hxx +++ b/extensions/source/resource/ResourceIndexAccess.hxx @@ -58,7 +58,7 @@ namespace extensions { namespace resource virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException) - { return ::getCppuType(reinterpret_cast< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>*>(NULL)); }; + { return ::getCppuType(static_cast< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>*>(0)); }; virtual ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException) { return static_cast<bool>(m_pResMgr.get()); }; |