diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-10 11:21:26 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-10 17:39:53 +0100 |
| commit | 2726f2a7850c7c09037c5a8854df32366e8ecee7 (patch) | |
| tree | 432f8901e7fcf1560a0054ef8b15158d6863584a /comphelper | |
| parent | f7dca812510ee7f5940c82225d2eb95787ff64bd (diff) | |
comphelper: simplify deprecated XTypeProvider.getImplementationId
Change-Id: I8da24ffd5eb1ac1fe6a6d2312ddc4ab13828bf07
Diffstat (limited to 'comphelper')
| -rw-r--r-- | comphelper/source/property/genericpropertyset.cxx | 10 | ||||
| -rw-r--r-- | comphelper/source/property/propstate.cxx | 8 |
2 files changed, 2 insertions, 16 deletions
diff --git a/comphelper/source/property/genericpropertyset.cxx b/comphelper/source/property/genericpropertyset.cxx index 43714950e603..88415c4fafab 100644 --- a/comphelper/source/property/genericpropertyset.cxx +++ b/comphelper/source/property/genericpropertyset.cxx @@ -31,9 +31,6 @@ #include <comphelper/genericpropertyset.hxx> #include <comphelper/propertysetinfo.hxx> #include <comphelper/servicehelper.hxx> -#include <rtl/uuid.h> - - using namespace ::rtl; using namespace ::osl; @@ -242,15 +239,10 @@ uno::Sequence< uno::Type > SAL_CALL GenericPropertySet::getTypes() return aTypes; } -namespace -{ - class theGenericPropertySetImplmentationId : public rtl::Static< UnoTunnelIdInit, theGenericPropertySetImplmentationId > {}; -} - uno::Sequence< sal_Int8 > SAL_CALL GenericPropertySet::getImplementationId() throw (uno::RuntimeException, std::exception) { - return theGenericPropertySetImplmentationId::get().getSeq(); + return css::uno::Sequence<sal_Int8>(); } // XServiceInfo diff --git a/comphelper/source/property/propstate.cxx b/comphelper/source/property/propstate.cxx index 839b0e57f3f9..6c21c1627b84 100644 --- a/comphelper/source/property/propstate.cxx +++ b/comphelper/source/property/propstate.cxx @@ -21,8 +21,6 @@ #include <com/sun/star/uno/genfunc.h> #include <cppuhelper/queryinterface.hxx> #include <comphelper/sequence.hxx> -#include <rtl/instance.hxx> - 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) { - ::cppu::OImplementationId &rID = lcl_ImplId::get(); - return rID.getImplementationId(); + return css::uno::Sequence<sal_Int8>(); } |