3 files changed, 3 insertions, 25 deletions
diff --git a/vcl/unx/gtk3/a11y/atkwrapper.cxx b/vcl/unx/gtk3/a11y/atkwrapper.cxx
index 20c978cfcd3c..2087f76ffd38 100644
--- a/vcl/unx/gtk3/a11y/atkwrapper.cxx
+++ b/vcl/unx/gtk3/a11y/atkwrapper.cxx
@@ -508,13 +508,6 @@ wrapper_ref_child( AtkObject *atk_obj,
 
     AtkObject* child = nullptr;
 
-    // see comments above atk_object_wrapper_remove_child
-    if( -1 < i && obj->index_of_child_about_to_be_removed == i )
-    {
-        g_object_ref( obj->child_about_to_be_removed );
-        return obj->child_about_to_be_removed;
-    }
-
     if( obj->mpContext.is() )
     {
         try {
@@ -967,9 +960,6 @@ atk_object_wrapper_new( const css::uno::Reference< css::accessibility::XAccessib
         pWrap = ATK_OBJECT_WRAPPER( obj );
         pWrap->mpAccessible = rxAccessible;
 
-        pWrap->index_of_child_about_to_be_removed = -1;
-        pWrap->child_about_to_be_removed = nullptr;
-
         pWrap->mpContext = xContext;
         pWrap->mpOrig = orig;
         if (pWrap->mpOrig)
@@ -1067,17 +1057,7 @@ void atk_object_wrapper_add_child(AtkObjectWrapper* wrapper, AtkObject *child, g
 
 void atk_object_wrapper_remove_child(AtkObjectWrapper* wrapper, AtkObject *child, gint index)
 {
-    /*
-     * the atk-bridge GTK+ module gets back to the event source to ref the child just
-     * vanishing, so we keep this reference because the semantic on OOo side is different.
-     */
-    wrapper->child_about_to_be_removed = child;
-    wrapper->index_of_child_about_to_be_removed = index;
-
     g_signal_emit_by_name( ATK_OBJECT( wrapper ), "children_changed::remove", index, child, nullptr );
-
-    wrapper->index_of_child_about_to_be_removed = -1;
-    wrapper->child_about_to_be_removed = nullptr;
 }
 
 /*****************************************************************************/
diff --git a/vcl/unx/gtk3/a11y/atkwrapper.hxx b/vcl/unx/gtk3/a11y/atkwrapper.hxx
index b3af41975b4d..480c4645daa3 100644
--- a/vcl/unx/gtk3/a11y/atkwrapper.hxx
+++ b/vcl/unx/gtk3/a11y/atkwrapper.hxx
@@ -72,8 +72,6 @@ struct AtkObjectWrapper
         mpTextAttributes;
     css::uno::Reference<css::accessibility::XAccessibleValue> mpValue;
 
-    AtkObject *child_about_to_be_removed;
-    gint       index_of_child_about_to_be_removed;
 //    OString * m_pKeyBindings
 };
 
diff --git a/vcl/unx/gtk3/gtkframe.cxx b/vcl/unx/gtk3/gtkframe.cxx
index b4636ed28fe5..3c96f586f57f 100644
--- a/vcl/unx/gtk3/gtkframe.cxx
+++ b/vcl/unx/gtk3/gtkframe.cxx
@@ -1370,7 +1370,7 @@ void GtkSalFrame::SetColorScheme(GVariant* variant)
     switch (MiscSettings::GetAppColorMode())
     {
         default:
-        case 0: // Auto
+        case AppearanceMode::AUTO:
         {
             if (variant)
             {
@@ -1382,10 +1382,10 @@ void GtkSalFrame::SetColorScheme(GVariant* variant)
                 color_scheme = DEFAULT;
             break;
         }
-        case 1: // Light
+        case AppearanceMode::LIGHT:
             color_scheme = PREFER_LIGHT;
             break;
-        case 2: // Dark
+        case AppearanceMode::DARK:
             color_scheme = PREFER_DARK;
             break;
     }