diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-07-18 08:20:02 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-07-18 08:23:28 +0200 |
| commit | 15fd36440ce049fa7a577ff198649f782dad3c1f (patch) | |
| tree | 2c8bb5a15301023df98259e93b251430bfb80edc | |
| parent | Various Clang 3.1 -Wunsued-variable, -Wconstant-conversion (diff) | |
| download | core-15fd36440ce049fa7a577ff198649f782dad3c1f.tar.gz core-15fd36440ce049fa7a577ff198649f782dad3c1f.zip | |
Un-inline use of szServiceName2_UnoControlEdit
...as it is not marked SAL_DLLPUBLIC_EXPORT unlike the class it is used in
so at least Clang would complain.
Change-Id: I59886caead24bca4cd4c0e47edb0eaac349eb213
| -rw-r--r-- | toolkit/inc/toolkit/controls/unocontrols.hxx | 3 | ||||
| -rw-r--r-- | toolkit/source/controls/unocontrols.cxx | 12 |
2 files changed, 14 insertions, 1 deletions
diff --git a/toolkit/inc/toolkit/controls/unocontrols.hxx b/toolkit/inc/toolkit/controls/unocontrols.hxx index a30ea6f6960f..132297a76236 100644 --- a/toolkit/inc/toolkit/controls/unocontrols.hxx +++ b/toolkit/inc/toolkit/controls/unocontrols.hxx @@ -183,7 +183,8 @@ public: void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - DECLIMPL_SERVICEINFO_DERIVED( UnoEditControl, UnoControlBase, szServiceName2_UnoControlEdit ) + ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); sal_Bool SAL_CALL setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& Model) throw ( ::com::sun::star::uno::RuntimeException ); }; diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx index 178e5ef3546b..f0aeec8f9129 100644 --- a/toolkit/source/controls/unocontrols.cxx +++ b/toolkit/source/controls/unocontrols.cxx @@ -484,6 +484,18 @@ void UnoEditControl::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) t Impl_getColumnsAndLines( nCols, nLines ); } +::rtl::OUString UnoEditControl::getImplementationName( ) throw(uno::RuntimeException) +{ + return ::rtl::OUString( "stardiv.Toolkit.UnoEditControl" ); +} + +uno::Sequence< ::rtl::OUString > UnoEditControl::getSupportedServiceNames() throw(uno::RuntimeException) +{ + uno::Sequence< ::rtl::OUString > aNames = UnoControlBase::getSupportedServiceNames( ); + aNames.realloc( aNames.getLength() + 1 ); + aNames[ aNames.getLength() - 1 ] = ::rtl::OUString::createFromAscii( szServiceName2_UnoControlEdit ); + return aNames; +} // ---------------------------------------------------- // class UnoControlFileControlModel |