1 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 1d1108a1a88d..b31c065d6826 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -877,12 +877,12 @@ void DbGridControl::ImplInitWindow( const InitWindowFacet _eInitWhat )
     {
         GetDataWindow().SetBackground(GetControlBackground());
         GetDataWindow().SetControlBackground(GetControlBackground());
-        GetDataWindow().SetFillColor(GetControlBackground());
+        GetDataWindow().GetOutDev()->SetFillColor(GetControlBackground());
     }
     else
     {
         GetDataWindow().SetControlBackground();
-        GetDataWindow().SetFillColor(GetFillColor());
+        GetDataWindow().GetOutDev()->SetFillColor(GetOutDev()->GetFillColor());
     }
 }
 
@@ -1382,7 +1382,7 @@ void DbGridControl::setDataSource(const Reference< XRowSet >& _xCursor, DbGridCo
 
 void DbGridControl::RemoveColumns()
 {
-    if ( IsEditing() )
+    if ( !isDisposed() && IsEditing() )
         DeactivateCell();
 
     m_aColumns.clear();