diff options
| author | Alexandre Vicenzi <vicenzi.alexandre@gmail.com> | 2014-01-31 03:39:50 -0200 |
|---|---|---|
| committer | Marcos Souza <marcos.souza.org@gmail.com> | 2014-02-05 14:29:57 +0000 |
| commit | e17cf910320848edbc3d11ec62acbf1c8f531ae5 (patch) | |
| tree | c5652289152a460c42b7e4f3e54ce006be4e52cd /comphelper/source/container | |
| parent | a7395942aecd2523ab392b09018dcc1a05527077 (diff) | |
fdo#54938 Convert comphelper and vcl to cppu::supportsService
Change-Id: I391a7324bf92208fe632dac17874943343b1f65a
Reviewed-on: https://gerrit.libreoffice.org/7757
Reviewed-by: Marcos Souza <marcos.souza.org@gmail.com>
Tested-by: Marcos Souza <marcos.souza.org@gmail.com>
Diffstat (limited to 'comphelper/source/container')
| -rw-r--r-- | comphelper/source/container/IndexedPropertyValuesContainer.cxx | 5 | ||||
| -rw-r--r-- | comphelper/source/container/NamedPropertyValuesContainer.cxx | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/comphelper/source/container/IndexedPropertyValuesContainer.cxx b/comphelper/source/container/IndexedPropertyValuesContainer.cxx index 38dca1d9ff62..ee4bc6c457bb 100644 --- a/comphelper/source/container/IndexedPropertyValuesContainer.cxx +++ b/comphelper/source/container/IndexedPropertyValuesContainer.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "comphelper_module.hxx" #include <com/sun/star/container/XIndexContainer.hpp> @@ -25,6 +24,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <cppuhelper/implbase2.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> +#include <cppuhelper/supportsservice.hxx> #include <vector> @@ -226,8 +226,7 @@ OUString SAL_CALL IndexedPropertyValuesContainer::getImplementationName_static( sal_Bool SAL_CALL IndexedPropertyValuesContainer::supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException) { - OUString aServiceName( "com.sun.star.document.IndexedPropertyValues" ); - return aServiceName == ServiceName; + return cppu::supportsService(this, ServiceName); } ::com::sun::star::uno::Sequence< OUString > SAL_CALL IndexedPropertyValuesContainer::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) diff --git a/comphelper/source/container/NamedPropertyValuesContainer.cxx b/comphelper/source/container/NamedPropertyValuesContainer.cxx index 66817f298c2b..9492944467e0 100644 --- a/comphelper/source/container/NamedPropertyValuesContainer.cxx +++ b/comphelper/source/container/NamedPropertyValuesContainer.cxx @@ -25,7 +25,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <cppuhelper/implbase2.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> - +#include <cppuhelper/supportsservice.hxx> #include <map> @@ -197,8 +197,7 @@ OUString SAL_CALL NamedPropertyValuesContainer::getImplementationName_static( ) sal_Bool SAL_CALL NamedPropertyValuesContainer::supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException) { - OUString aServiceName( "com.sun.star.document.NamedPropertyValues" ); - return aServiceName == ServiceName; + return cppu::supportsService(this, ServiceName); } ::com::sun::star::uno::Sequence< OUString > SAL_CALL NamedPropertyValuesContainer::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) @@ -206,7 +205,6 @@ sal_Bool SAL_CALL NamedPropertyValuesContainer::supportsService( const OUString& return getSupportedServiceNames_static(); } - ::com::sun::star::uno::Sequence< OUString > SAL_CALL NamedPropertyValuesContainer::getSupportedServiceNames_static( ) { const OUString aServiceName( "com.sun.star.document.NamedPropertyValues" ); |