2 files changed, 12 insertions, 26 deletions
diff --git a/toolkit/source/controls/table/AccessibleGridControlBase.cxx b/toolkit/source/controls/table/AccessibleGridControlBase.cxx
index df9edea866ab..bafb961f6e56 100644
--- a/toolkit/source/controls/table/AccessibleGridControlBase.cxx
+++ b/toolkit/source/controls/table/AccessibleGridControlBase.cxx
@@ -392,20 +392,16 @@ sal_Int32 SAL_CALL AccessibleGridControlBase::getForeground(  )
     ensureIsAlive();
 
     Color nColor;
-    vcl::Window* pInst = m_aTable.GetWindowInstance();
-    if ( pInst )
+    if (m_aTable.IsControlForeground())
+        nColor = m_aTable.GetControlForeground();
+    else
     {
-        if ( pInst->IsControlForeground() )
-            nColor = pInst->GetControlForeground();
+        vcl::Font aFont;
+        if (m_aTable.IsControlFont() )
+            aFont = m_aTable.GetControlFont();
         else
-        {
-            vcl::Font aFont;
-            if ( pInst->IsControlFont() )
-                aFont = pInst->GetControlFont();
-            else
-                aFont = pInst->GetFont();
-            nColor = aFont.GetColor();
-        }
+            aFont = m_aTable.GetFont();
+        nColor = aFont.GetColor();
     }
     return sal_Int32(nColor);
 }
@@ -416,14 +412,10 @@ sal_Int32 SAL_CALL AccessibleGridControlBase::getBackground(  )
 
     ensureIsAlive();
     Color nColor;
-    vcl::Window* pInst = m_aTable.GetWindowInstance();
-    if ( pInst )
-    {
-        if ( pInst->IsControlBackground() )
-            nColor = pInst->GetControlBackground();
-        else
-            nColor = pInst->GetBackground().GetColor();
-    }
+    if (m_aTable.IsControlBackground())
+        nColor = m_aTable.GetControlBackground();
+    else
+        nColor = m_aTable.GetBackground().GetColor();
     return sal_Int32(nColor);
 }
 
diff --git a/toolkit/source/controls/table/tablecontrol.cxx b/toolkit/source/controls/table/tablecontrol.cxx
index 14cdd539f6f8..61062df11739 100644
--- a/toolkit/source/controls/table/tablecontrol.cxx
+++ b/toolkit/source/controls/table/tablecontrol.cxx
@@ -516,12 +516,6 @@ namespace svt::table
             m_pImpl->commitTableEvent( i_eventID, i_newValue, i_oldValue );
     }
 
-    vcl::Window* TableControl::GetWindowInstance()
-    {
-        return this;
-    }
-
-
     bool TableControl::HasRowHeader()
     {
         return GetModel()->hasRowHeaders();