mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#107569 Fix missing res/colorslider.png

Browse Source 
Change-Id: I83c719594a29cde8385a22793f17812e7d5c12bb
Reviewed-on: https://gerrit.libreoffice.org/43796
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
This commit is contained in:
Maxim Monastirsky
2017-10-25 01:34:13 +03:00
parent f49ba490a5
commit 48e64ea4a8
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cui/inc/bitmaps.hlst
View File

@@ -63,6 +63,7 @@
#define RID_SVXBMP_FILEOPEN "res/fileopen.png" #define RID_SVXBMP_FILEOPEN "res/fileopen.png"
#define RID_SVXBMP_TARGET "res/target.png" #define RID_SVXBMP_TARGET "res/target.png"
#define RID_SVXBMP_NEWDOC "res/newdoc.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_COLLAPSEDNODE "res/sx18002.png"
#define RID_SVXBMP_EXPANDEDNODE "res/sx18003.png" #define RID_SVXBMP_EXPANDEDNODE "res/sx18003.png"

3
cui/source/dialogs/colorpicker.cxx
View File

@@ -45,6 +45,7 @@
#include <basegfx/color/bcolortools.hxx> #include <basegfx/color/bcolortools.hxx>
#include <dialmgr.hxx> #include <dialmgr.hxx>
#include <colorpicker.hxx> #include <colorpicker.hxx>
#include <bitmaps.hlst>
#include <cmath> #include <cmath>
#include <limits> #include <limits>
#include <o3tl/typed_flags_set.hxx> #include <o3tl/typed_flags_set.hxx>
@@ -906,7 +907,7 @@ ColorPickerDialog::ColorPickerDialog( vcl::Window* pParent, sal_Int32 nColor, sa
: ModalDialog( pParent, "ColorPicker", "cui/ui/colorpickerdialog.ui" ) : ModalDialog( pParent, "ColorPicker", "cui/ui/colorpickerdialog.ui" )
, mnDialogMode( nMode ) , mnDialogMode( nMode )
, meMode( DefaultMode ) , meMode( DefaultMode )
, maSliderImage( FixedImage::loadThemeImage("res/colorslider.png") ) , maSliderImage( BitmapEx( RID_SVXBMP_COLORSLIDER ) )
{ {
get(mpColorField, "colorField"); get(mpColorField, "colorField");
get(mpColorSlider, "colorSlider"); get(mpColorSlider, "colorSlider");