diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-04-26 15:55:24 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-04-27 10:50:48 +0200 |
| commit | dd1df645b4fe0d33c640a12d1596f75bd68eb928 (patch) | |
| tree | d60eaa16c4870e8eac607c054bd8c70b226e6d65 /chart2 | |
| parent | f9f045e7830d184497554e0e438cc478fa990eb6 (diff) | |
remove svx bitmaps from .src files
Change-Id: Ie3795870484648e62dea483f9976af31cd1be167
Reviewed-on: https://gerrit.libreoffice.org/37006
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/inc/bitmaps.hlst | 4 | ||||
| -rw-r--r-- | chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/chart2/inc/bitmaps.hlst b/chart2/inc/bitmaps.hlst index ac6f1d26c138..f85f49233e9f 100644 --- a/chart2/inc/bitmaps.hlst +++ b/chart2/inc/bitmaps.hlst @@ -131,6 +131,10 @@ #define BMP_REGRESSION_POWER "chart2/res/regpow.png" #define BMP_REGRESSION_POLYNOMIAL "chart2/res/regpoly.png" #define BMP_REGRESSION_MOVING_AVERAGE "chart2/res/regavg.png" + +#define RID_SVXBMP_LAMP_ON "svx/res/lighton.png" +#define RID_SVXBMP_LAMP_OFF "svx/res/light.bmp" + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx index 5068e984a8e5..188eb1409974 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx @@ -42,7 +42,7 @@ LightButton::LightButton( vcl::Window* pParent) : ImageButton( pParent) , m_bLightOn(false) { - SetModeImage(Image(BitmapEx(SVX_RES(RID_SVXBMP_LAMP_OFF)))); + SetModeImage(Image(BitmapEx(RID_SVXBMP_LAMP_OFF))); } VCL_BUILDER_FACTORY(LightButton) @@ -54,11 +54,11 @@ void LightButton::switchLightOn(bool bOn) m_bLightOn = bOn; if(m_bLightOn) { - SetModeImage(Image(BitmapEx(SVX_RES(RID_SVXBMP_LAMP_ON)))); + SetModeImage(Image(BitmapEx(RID_SVXBMP_LAMP_ON))); } else { - SetModeImage(Image(BitmapEx(SVX_RES(RID_SVXBMP_LAMP_OFF)))); + SetModeImage(Image(BitmapEx(RID_SVXBMP_LAMP_OFF))); } } @@ -97,9 +97,9 @@ void LightSourceInfo::initButtonFromSource() { if(!pButton) return; - pButton->SetModeImage(Image(BitmapEx(SVX_RES( - aLightSource.bIsEnabled ? RID_SVXBMP_LAMP_ON : RID_SVXBMP_LAMP_OFF - ) ) )); + pButton->SetModeImage(Image(BitmapEx( + aLightSource.bIsEnabled ? OUString(RID_SVXBMP_LAMP_ON) : OUString(RID_SVXBMP_LAMP_OFF) + ) ) ); } namespace |