From 2171077c0c3c43a61546ab2c0ae68ba63c5112f7 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 14 Sep 2012 19:27:00 +0200 Subject: Introduce cppu::supportsService helper, adapt some call-sites ...more to follow (easy hack?) Change-Id: Icb02626495701a3905c124c7368b98c3258e91b2 --- accessibility/source/standard/accessiblemenubasecomponent.cxx | 10 ++-------- accessibility/source/standard/vclxaccessiblelistitem.cxx | 9 ++------- accessibility/source/standard/vclxaccessiblestatusbaritem.cxx | 10 ++-------- accessibility/source/standard/vclxaccessibletabpage.cxx | 10 ++-------- accessibility/source/standard/vclxaccessibletoolboxitem.cxx | 9 ++------- 5 files changed, 10 insertions(+), 38 deletions(-) (limited to 'accessibility/source/standard') diff --git a/accessibility/source/standard/accessiblemenubasecomponent.cxx b/accessibility/source/standard/accessiblemenubasecomponent.cxx index ceda5edb56a4..48118edfc48e 100644 --- a/accessibility/source/standard/accessiblemenubasecomponent.cxx +++ b/accessibility/source/standard/accessiblemenubasecomponent.cxx @@ -27,7 +27,7 @@ #include #include #include - +#include #include #include #include @@ -724,13 +724,7 @@ void OAccessibleMenuBaseComponent::disposing() sal_Bool OAccessibleMenuBaseComponent::supportsService( const OUString& rServiceName ) throw (RuntimeException) { - Sequence< OUString > aNames( getSupportedServiceNames() ); - const OUString* pNames = aNames.getConstArray(); - const OUString* pEnd = pNames + aNames.getLength(); - for ( ; pNames != pEnd && !pNames->equals( rServiceName ); ++pNames ) - ; - - return pNames != pEnd; + return cppu::supportsService(this, rServiceName); } // ----------------------------------------------------------------------------- diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx b/accessibility/source/standard/vclxaccessiblelistitem.cxx index cf7c8a5f0f96..af2a57c94d0c 100644 --- a/accessibility/source/standard/vclxaccessiblelistitem.cxx +++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include @@ -227,13 +228,7 @@ OUString VCLXAccessibleListItem::getImplementationName() throw (RuntimeException // ----------------------------------------------------------------------------- sal_Bool VCLXAccessibleListItem::supportsService( const OUString& rServiceName ) throw (RuntimeException) { - Sequence< OUString > aNames( getSupportedServiceNames() ); - const OUString* pNames = aNames.getConstArray(); - const OUString* pEnd = pNames + aNames.getLength(); - for ( ; pNames != pEnd && !pNames->equals( rServiceName ); ++pNames ) - ; - - return pNames != pEnd; + return cppu::supportsService(this, rServiceName); } // ----------------------------------------------------------------------------- Sequence< OUString > VCLXAccessibleListItem::getSupportedServiceNames() throw (RuntimeException) diff --git a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx index 1d2184b035d7..889e25b96dbe 100644 --- a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx +++ b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx @@ -36,7 +36,7 @@ #include #include #include - +#include #include #include #include @@ -249,13 +249,7 @@ OUString VCLXAccessibleStatusBarItem::getImplementationName() throw (RuntimeExce sal_Bool VCLXAccessibleStatusBarItem::supportsService( const OUString& rServiceName ) throw (RuntimeException) { - Sequence< OUString > aNames( getSupportedServiceNames() ); - const OUString* pNames = aNames.getConstArray(); - const OUString* pEnd = pNames + aNames.getLength(); - for ( ; pNames != pEnd && !pNames->equals( rServiceName ); ++pNames ) - ; - - return pNames != pEnd; + return cppu::supportsService(this, rServiceName); } // ----------------------------------------------------------------------------- diff --git a/accessibility/source/standard/vclxaccessibletabpage.cxx b/accessibility/source/standard/vclxaccessibletabpage.cxx index 738dabffefb0..7a1f1545ad25 100644 --- a/accessibility/source/standard/vclxaccessibletabpage.cxx +++ b/accessibility/source/standard/vclxaccessibletabpage.cxx @@ -36,7 +36,7 @@ #include #include #include - +#include #include #include #include @@ -281,13 +281,7 @@ OUString VCLXAccessibleTabPage::getImplementationName() throw (RuntimeException) sal_Bool VCLXAccessibleTabPage::supportsService( const OUString& rServiceName ) throw (RuntimeException) { - Sequence< OUString > aNames( getSupportedServiceNames() ); - const OUString* pNames = aNames.getConstArray(); - const OUString* pEnd = pNames + aNames.getLength(); - for ( ; pNames != pEnd && !pNames->equals( rServiceName ); ++pNames ) - ; - - return pNames != pEnd; + return cppu::supportsService(this, rServiceName); } // ----------------------------------------------------------------------------- diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx index b5f6e9aa5208..347fcf1548d7 100644 --- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx +++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include @@ -283,13 +284,7 @@ OUString VCLXAccessibleToolBoxItem::getImplementationName() throw (RuntimeExcept // ----------------------------------------------------------------------------- sal_Bool VCLXAccessibleToolBoxItem::supportsService( const OUString& rServiceName ) throw (RuntimeException) { - Sequence< OUString > aNames( getSupportedServiceNames() ); - const OUString* pNames = aNames.getConstArray(); - const OUString* pEnd = pNames + aNames.getLength(); - for ( ; pNames != pEnd && !pNames->equals( rServiceName ); ++pNames ) - ; - - return pNames != pEnd; + return cppu::supportsService(this, rServiceName); } // ----------------------------------------------------------------------------- Sequence< OUString > VCLXAccessibleToolBoxItem::getSupportedServiceNames() throw (RuntimeException) -- cgit