diff options
| -rw-r--r-- | svtools/inc/svtools/table/tabledatawindow.hxx | 6 | ||||
| -rw-r--r-- | svtools/source/table/tabledatawindow.cxx | 15 | ||||
| -rwxr-xr-x | svtools/source/uno/svtxgridcontrol.cxx | 6 |
3 files changed, 18 insertions, 9 deletions
diff --git a/svtools/inc/svtools/table/tabledatawindow.hxx b/svtools/inc/svtools/table/tabledatawindow.hxx index b577d4e611e7..9a6ece489119 100644 --- a/svtools/inc/svtools/table/tabledatawindow.hxx +++ b/svtools/inc/svtools/table/tabledatawindow.hxx @@ -74,9 +74,11 @@ namespace svt { namespace table virtual void CaptureMouse(); virtual void ReleaseMouse(); virtual long Notify(NotifyEvent& rNEvt); - virtual void SetBackground(const Color& rColor); virtual void SetControlBackground(const Color& rColor); - virtual Color GetControlBackground(); + virtual void SetControlBackground(); + + void SetBackground(const Wallpaper& rColor); + void SetBackground(); }; //........................................................................ } } // namespace svt::table diff --git a/svtools/source/table/tabledatawindow.cxx b/svtools/source/table/tabledatawindow.cxx index 51311efd6ad1..71410fee4e2a 100644 --- a/svtools/source/table/tabledatawindow.cxx +++ b/svtools/source/table/tabledatawindow.cxx @@ -55,19 +55,24 @@ namespace svt { namespace table m_rTableControl.doPaintContent( rUpdateRect ); } //-------------------------------------------------------------------- - void TableDataWindow::SetBackground( const Color& rColor ) + void TableDataWindow::SetBackground( const Wallpaper& rColor ) { - Window::SetBackground( rColor ); + SetBackground( rColor ); } //-------------------------------------------------------------------- void TableDataWindow::SetControlBackground( const Color& rColor ) { - Window::SetControlBackground( rColor ); + SetControlBackground( rColor ); } //-------------------------------------------------------------------- - Color TableDataWindow::GetControlBackground() + void TableDataWindow::SetBackground() { - return Window::GetControlBackground(); + SetBackground(); + } + //-------------------------------------------------------------------- + void TableDataWindow::SetControlBackground() + { + SetControlBackground(); } //-------------------------------------------------------------------- void TableDataWindow::MouseMove( const MouseEvent& rMEvt ) diff --git a/svtools/source/uno/svtxgridcontrol.cxx b/svtools/source/uno/svtxgridcontrol.cxx index 8586d9fe8da1..72da2274af3a 100755 --- a/svtools/source/uno/svtxgridcontrol.cxx +++ b/svtools/source/uno/svtxgridcontrol.cxx @@ -226,10 +226,12 @@ void SVTXGridControl::setProperty( const ::rtl::OUString& PropertyName, const An case BASEPROPERTY_BACKGROUNDCOLOR: { sal_Int32 color = 0xFFFFFF; + Color color1 = pTable->GetSettings().GetStyleSettings().GetFieldColor(); if( aValue >>= color ) { - pTable->getDataWindow()->SetBackground( color ); - pTable->getDataWindow()->SetControlBackground( color ); + color1 = color; + pTable->getDataWindow()->SetBackground( color1 ); + pTable->getDataWindow()->SetControlBackground( color1 ); } break; } |