diff options
author | Caolán McNamara <caolanm@redhat.com> | 2020-11-06 14:16:21 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2020-11-08 21:49:19 +0100 |
commit | afa52f6907f6baa408a51dccee650faebb5d2d6b (patch) | |
tree | 8e6c68ce463068b7da16a42e331c83768b61bc47 /sd | |
parent | 10e0a94416094e9c73b4152989481b89afd8b141 (diff) |
only colors are in use so reduce down to just those
Change-Id: I757a0f2e7baa981ecb3cad7e0f975e3ae9c509b0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105414
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/animations/CustomAnimationPane.cxx | 6 | ||||
-rw-r--r-- | sd/source/ui/animations/SlideTransitionPane.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/sidebar/LayoutMenu.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/sidebar/MasterPagesSelector.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/sidebar/NavigatorWrapper.cxx | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 1cff8f00ef1c..2e6d511253ee 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -880,9 +880,9 @@ void CustomAnimationPane::DataChanged (const DataChangedEvent&) void CustomAnimationPane::UpdateLook() { - Wallpaper aBackground ( - ::sfx2::sidebar::Theme::GetWallpaper( - ::sfx2::sidebar::Theme::Paint_PanelBackground)); + Color aBackground ( + ::sfx2::sidebar::Theme::GetColor( + ::sfx2::sidebar::Theme::Color_PanelBackground)); SetBackground(aBackground); } diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index a796b6511ce7..f3b1f2a1f5ec 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -512,7 +512,7 @@ void SlideTransitionPane::DataChanged (const DataChangedEvent&) void SlideTransitionPane::UpdateLook() { - SetBackground(::sfx2::sidebar::Theme::GetWallpaper(::sfx2::sidebar::Theme::Paint_PanelBackground)); + SetBackground(::sfx2::sidebar::Theme::GetColor(::sfx2::sidebar::Theme::Color_PanelBackground)); } void SlideTransitionPane::onSelectionChanged() diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index 44b85a56e9ab..57835e1b848f 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -167,7 +167,7 @@ LayoutMenu::LayoutMenu ( mxLayoutValueSet->SetStyle(mxLayoutValueSet->GetStyle() | WB_ITEMBORDER | WB_FLATVALUESET | WB_TABSTOP); - mxLayoutValueSet->SetColor(sfx2::sidebar::Theme::GetColor(sfx2::sidebar::Theme::Paint_PanelBackground)); + mxLayoutValueSet->SetColor(sfx2::sidebar::Theme::GetColor(sfx2::sidebar::Theme::Color_PanelBackground)); #ifdef DEBUG SetText(OUString("sd:LayoutMenu")); @@ -755,7 +755,7 @@ void LayoutMenu::DataChanged (const DataChangedEvent& /*rEvent*/) { Fill(); mxLayoutValueSet->StyleUpdated(); - mxLayoutValueSet->SetColor(sfx2::sidebar::Theme::GetColor(sfx2::sidebar::Theme::Paint_PanelBackground)); + mxLayoutValueSet->SetColor(sfx2::sidebar::Theme::GetColor(sfx2::sidebar::Theme::Color_PanelBackground)); } } // end of namespace ::sd::sidebar diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx index 169587820579..3e176707fd06 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx @@ -82,7 +82,7 @@ MasterPagesSelector::MasterPagesSelector ( mxPreviewValueSet->SetPreviewSize(mpContainer->GetPreviewSizePixel()); mxPreviewValueSet->Show(); - mxPreviewValueSet->SetColor(sfx2::sidebar::Theme::GetColor(sfx2::sidebar::Theme::Paint_PanelBackground)); + mxPreviewValueSet->SetColor(sfx2::sidebar::Theme::GetColor(sfx2::sidebar::Theme::Color_PanelBackground)); Link<MasterPageContainerChangeEvent&,void> aChangeListener (LINK(this,MasterPagesSelector,ContainerChangeListener)); mpContainer->AddChangeListener(aChangeListener); diff --git a/sd/source/ui/sidebar/NavigatorWrapper.cxx b/sd/source/ui/sidebar/NavigatorWrapper.cxx index a9118a9250fb..cd9bd002204a 100644 --- a/sd/source/ui/sidebar/NavigatorWrapper.cxx +++ b/sd/source/ui/sidebar/NavigatorWrapper.cxx @@ -40,7 +40,7 @@ NavigatorWrapper::NavigatorWrapper ( maNavigator->SetPosSizePixel( Point(0,0), GetSizePixel()); - maNavigator->SetBackground(sfx2::sidebar::Theme::GetWallpaper(sfx2::sidebar::Theme::Paint_PanelBackground)); + maNavigator->SetBackground(sfx2::sidebar::Theme::GetColor(sfx2::sidebar::Theme::Color_PanelBackground)); maNavigator->Show(); } |