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

comphelper: simplify deprecated XTypeProvider.getImplementationId

Browse Source 
Change-Id: I8da24ffd5eb1ac1fe6a6d2312ddc4ab13828bf07
This commit is contained in:
Stephan Bergmann
2014-03-10 11:21:26 +01:00
parent f7dca81251
commit 2726f2a785
3 changed files with 3 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
comphelper/source/property/genericpropertyset.cxx
View File

@@ -31,9 +31,6 @@
#include <comphelper/genericpropertyset.hxx> #include <comphelper/genericpropertyset.hxx>
#include <comphelper/propertysetinfo.hxx> #include <comphelper/propertysetinfo.hxx>
#include <comphelper/servicehelper.hxx> #include <comphelper/servicehelper.hxx>
#include <rtl/uuid.h>
using namespace ::rtl; using namespace ::rtl;
using namespace ::osl; using namespace ::osl;
@@ -242,15 +239,10 @@ uno::Sequence< uno::Type > SAL_CALL GenericPropertySet::getTypes()
return aTypes; return aTypes;
} }
namespace
{
class theGenericPropertySetImplmentationId : public rtl::Static< UnoTunnelIdInit, theGenericPropertySetImplmentationId > {};
}
uno::Sequence< sal_Int8 > SAL_CALL GenericPropertySet::getImplementationId() uno::Sequence< sal_Int8 > SAL_CALL GenericPropertySet::getImplementationId()
throw (uno::RuntimeException, std::exception) throw (uno::RuntimeException, std::exception)
{ {
return theGenericPropertySetImplmentationId::get().getSeq(); return css::uno::Sequence<sal_Int8>();
} }
// XServiceInfo // XServiceInfo

8
comphelper/source/property/propstate.cxx
View File

@@ -21,8 +21,6 @@
#include <com/sun/star/uno/genfunc.h> #include <com/sun/star/uno/genfunc.h>
#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/queryinterface.hxx>
#include <comphelper/sequence.hxx> #include <comphelper/sequence.hxx>
#include <rtl/instance.hxx>
namespace comphelper namespace comphelper
{ {
@@ -203,13 +201,9 @@ namespace comphelper
); );
} }
namespace { struct lcl_ImplId : public rtl::Static< ::cppu::OImplementationId, lcl_ImplId > {}; }
Sequence< sal_Int8 > SAL_CALL OStatefulPropertySet::getImplementationId() throw(RuntimeException, std::exception) Sequence< sal_Int8 > SAL_CALL OStatefulPropertySet::getImplementationId() throw(RuntimeException, std::exception)
{ {
::cppu::OImplementationId &rID = lcl_ImplId::get(); return css::uno::Sequence<sal_Int8>();
return rID.getImplementationId();
} }

6
include/comphelper/uno3.hxx
View File

@@ -189,13 +189,9 @@ namespace comphelper
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
#define IMPLEMENT_GET_IMPLEMENTATION_ID( classname ) \ #define IMPLEMENT_GET_IMPLEMENTATION_ID( classname ) \
namespace \
{ \
class the##classname##ImplementationId : public rtl::Static< ::cppu::OImplementationId, the##classname##ImplementationId> {}; \
} \
::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL classname::getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception) \ ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL classname::getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception) \
{ \ { \
return the##classname##ImplementationId::get().getImplementationId(); \ return css::uno::Sequence<sal_Int8>(); \
} }
#define IMPLEMENT_FORWARD_XTYPEPROVIDER2( classname, baseclass1, baseclass2 ) \ #define IMPLEMENT_FORWARD_XTYPEPROVIDER2( classname, baseclass1, baseclass2 ) \