diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2021-04-07 14:54:22 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-04-07 15:39:31 +0200 |
| commit | c89bfbc0d6491c02acfc391372750f787c17531b (patch) | |
| tree | 6a95731e564ec50a27c50009e62892e7dc2d6344 | |
| parent | 4079d59c01e68cd7ceb04adf27cb2ab426bc32f0 (diff) | |
rtl::Static -> function local static also for UNO3_GETIMPLEMENTATION*_IMPL
Follow-up to 07fd90cc7d85a89b9f74efba7ddc9ac457110ce3
Change-Id: I788607fe14fe12db015bf023dfac5bdc196b52ea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113730
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
| -rw-r--r-- | include/comphelper/servicehelper.hxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/comphelper/servicehelper.hxx b/include/comphelper/servicehelper.hxx index 435a4c4ff5b7..2fe01bc5255c 100644 --- a/include/comphelper/servicehelper.hxx +++ b/include/comphelper/servicehelper.hxx @@ -77,13 +77,10 @@ inline bool isUnoTunnelId(const css::uno::Sequence< sal_Int8 >& rId) virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override; #define UNO3_GETIMPLEMENTATION_BASE_IMPL( classname ) \ -namespace \ -{ \ - class the##classname##UnoTunnelId : public rtl::Static< UnoTunnelIdInit, the##classname##UnoTunnelId> {}; \ -} \ const css::uno::Sequence< sal_Int8 > & classname::getUnoTunnelId() throw() \ { \ - return the##classname##UnoTunnelId::get().getSeq(); \ + static const UnoTunnelIdInit aId; \ + return aId.getSeq(); \ } #define UNO3_GETIMPLEMENTATION_IMPL( classname )\ |