mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#54938: Convert starmath to use cppu::supportsService

Browse Source 
Change-Id: If5ba86d421ce876071df39ce8dec1bebe7ebae81
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Marcos Paulo de Souza
2013-12-05 12:51:11 -02:00
committed by Stephan Bergmann
parent ad0a87f71e
commit b4b623c10c
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
starmath/source/accessibility.cxx
View File

@@ -26,12 +26,12 @@
#include <com/sun/star/awt/XFocusListener.hpp>
#include <unotools/accessiblerelationsethelper.hxx>
#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
#include <com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp>
#include <com/sun/star/i18n/WordType.hpp>
#include <unotools/accessiblestatesethelper.hxx>
#include <comphelper/accessibleeventnotifier.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <osl/diagnose.h>
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
@@ -794,10 +794,7 @@ sal_Bool SAL_CALL SmGraphicAccessible::supportsService(
const OUString& rServiceName )
throw (RuntimeException)
{
return rServiceName == "com::sun::star::accessibility::Accessible" ||
rServiceName == "com::sun::star::accessibility::AccessibleComponent" ||
rServiceName == "com::sun::star::accessibility::AccessibleContext" ||
rServiceName == "com::sun::star::accessibility::AccessibleText";
return cppu::supportsService(this, rServiceName);
}
Sequence< OUString > SAL_CALL SmGraphicAccessible::getSupportedServiceNames()
@@ -1945,9 +1942,7 @@ sal_Bool SAL_CALL SmEditAccessible::supportsService(
const OUString& rServiceName )
throw (RuntimeException)
{
return rServiceName == "com::sun::star::accessibility::Accessible" ||
rServiceName == "com::sun::star::accessibility::AccessibleComponent" ||
rServiceName == "com::sun::star::accessibility::AccessibleContext";
return cppu::supportsService(this, rServiceName);
}
Sequence< OUString > SAL_CALL SmEditAccessible::getSupportedServiceNames()

6
starmath/source/unomodel.cxx
View File

@@ -37,6 +37,7 @@
#include <rtl/ustrbuf.hxx>
#include <comphelper/propertysetinfo.hxx>
#include <comphelper/servicehelper.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <unotools/moduleoptions.hxx>
#include <unomodel.hxx>
@@ -416,10 +417,7 @@ OUString SmModel::getImplementationName_Static()
sal_Bool SmModel::supportsService(const OUString& rServiceName) throw( uno::RuntimeException )
{
return (
rServiceName == "com.sun.star.document.OfficeDocument" ||
rServiceName == "com.sun.star.formula.FormulaProperties"
);
return cppu::supportsService(this, rServiceName);
}
uno::Sequence< OUString > SmModel::getSupportedServiceNames(void) throw( uno::RuntimeException )