[Libreoffice-commits] core.git: include/comphelper

[Mike Kaganski (via logerrit)]

 include/comphelper/servicehelper.hxx |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit c89bfbc0d6491c02acfc391372750f787c17531b
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Wed Apr 7 14:54:22 2021 +0300
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Wed Apr 7 15:39:31 2021 +0200

    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 at collabora.com>

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 )\