[Libreoffice-commits] core.git: sfx2/source vcl/unx

[Noel Grandin (via logerrit)]

 sfx2/source/doc/objxtor.cxx       |    6 +++---
 vcl/unx/gtk3/a11y/gtk3atkutil.cxx |    9 +++------
 2 files changed, 6 insertions(+), 9 deletions(-)

New commits:
commit f4e8244700adcbbf4f5c975a37520aa138ea7005
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed Apr 7 08:14:23 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Apr 7 20:10:24 2021 +0200

    rtl::Static -> function local static
    
    Change-Id: If8d2ef2066f52bc287457e03f0e57df11d5cfc85
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113714
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 6c33cc54e325..d52bf51c3eed 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -91,7 +91,7 @@ using ::basic::BasicManagerRepository;
 
 namespace {
 
-class theCurrentComponent : public rtl::Static< WeakReference< XInterface >, theCurrentComponent > {};
+WeakReference< XInterface > theCurrentComponent;
 
 #if HAVE_FEATURE_SCRIPTING
 
@@ -861,7 +861,7 @@ sal_uInt16 SfxObjectShell::GetAutoStyleFilterIndex() const
 
 void SfxObjectShell::SetCurrentComponent( const Reference< XInterface >& _rxComponent )
 {
-    WeakReference< XInterface >& rTheCurrentComponent = theCurrentComponent::get();
+    WeakReference< XInterface >& rTheCurrentComponent = theCurrentComponent;
 
     Reference< XInterface > xOldCurrentComp(rTheCurrentComponent);
     if ( _rxComponent == xOldCurrentComp )
@@ -906,7 +906,7 @@ void SfxObjectShell::SetCurrentComponent( const Reference< XInterface >& _rxComp
 
 Reference< XInterface > SfxObjectShell::GetCurrentComponent()
 {
-    return theCurrentComponent::get();
+    return theCurrentComponent;
 }
 
 
diff --git a/vcl/unx/gtk3/a11y/gtk3atkutil.cxx b/vcl/unx/gtk3/a11y/gtk3atkutil.cxx
index d1f46a8ccef7..a2c8b46b470d 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkutil.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkutil.cxx
@@ -49,10 +49,7 @@ using namespace ::com::sun::star;
 
 namespace
 {
-    struct theNextFocusObject :
-        public rtl::Static< uno::WeakReference< accessibility::XAccessible >, theNextFocusObject>
-    {
-    };
+    uno::WeakReference< accessibility::XAccessible > theNextFocusObject;
 }
 
 static guint focus_notify_handler = 0;
@@ -68,7 +65,7 @@ atk_wrapper_focus_idle_handler (gpointer data)
 
     focus_notify_handler = 0;
 
-    uno::Reference< accessibility::XAccessible > xAccessible = theNextFocusObject::get();
+    uno::Reference< accessibility::XAccessible > xAccessible = theNextFocusObject;
     if( xAccessible.get() == static_cast < accessibility::XAccessible * > (data) )
     {
         AtkObject *atk_obj = xAccessible.is() ? atk_object_wrapper_ref( xAccessible ) : nullptr;
@@ -123,7 +120,7 @@ atk_wrapper_focus_tracker_notify_when_idle( const uno::Reference< accessibility:
     if( focus_notify_handler )
         g_source_remove(focus_notify_handler);
 
-    theNextFocusObject::get() = xAccessible;
+    theNextFocusObject = xAccessible;
 
     focus_notify_handler = g_idle_add (atk_wrapper_focus_idle_handler, xAccessible.get());
 }