From 48e64ea4a8201a43457e46422a07f14f697eb91e Mon Sep 17 00:00:00 2001 From: Maxim Monastirsky Date: Wed, 25 Oct 2017 01:34:13 +0300 Subject: tdf#107569 Fix missing res/colorslider.png Change-Id: I83c719594a29cde8385a22793f17812e7d5c12bb Reviewed-on: https://gerrit.libreoffice.org/43796 Tested-by: Jenkins Reviewed-by: Maxim Monastirsky --- cui/inc/bitmaps.hlst | 1 + cui/source/dialogs/colorpicker.cxx | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cui/inc/bitmaps.hlst b/cui/inc/bitmaps.hlst index 2cefabd14611..dc1ce4a6a9e4 100644 --- a/cui/inc/bitmaps.hlst +++ b/cui/inc/bitmaps.hlst @@ -63,6 +63,7 @@ #define RID_SVXBMP_FILEOPEN "res/fileopen.png" #define RID_SVXBMP_TARGET "res/target.png" #define RID_SVXBMP_NEWDOC "res/newdoc.png" +#define RID_SVXBMP_COLORSLIDER "res/colorslider.png" #define RID_SVXBMP_COLLAPSEDNODE "res/sx18002.png" #define RID_SVXBMP_EXPANDEDNODE "res/sx18003.png" diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index 504a65ddd7a8..5546573e0645 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include @@ -906,7 +907,7 @@ ColorPickerDialog::ColorPickerDialog( vcl::Window* pParent, sal_Int32 nColor, sa : ModalDialog( pParent, "ColorPicker", "cui/ui/colorpickerdialog.ui" ) , mnDialogMode( nMode ) , meMode( DefaultMode ) -, maSliderImage( FixedImage::loadThemeImage("res/colorslider.png") ) +, maSliderImage( BitmapEx( RID_SVXBMP_COLORSLIDER ) ) { get(mpColorField, "colorField"); get(mpColorSlider, "colorSlider"); -- cgit