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 /framework | |
| 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 'framework')
| -rw-r--r-- | framework/inc/bitmaps.hlst | 21 | ||||
| -rw-r--r-- | framework/source/uielement/controlmenucontroller.cxx | 10 |
2 files changed, 26 insertions, 5 deletions
diff --git a/framework/inc/bitmaps.hlst b/framework/inc/bitmaps.hlst index 0ad598c8cb2c..71a3efe823d1 100644 --- a/framework/inc/bitmaps.hlst +++ b/framework/inc/bitmaps.hlst @@ -14,6 +14,27 @@ #define BMP_SAVEMODIFIED_LARGE "res/savemodified_large.png" #define BMP_SAVEMODIFIED_EXTRALARGE "res/savemodified_extralarge.png" +#define RID_SVXBMP_BUTTON "res/sx10594.png" +#define RID_SVXBMP_RADIOBUTTON "res/sx10595.png" +#define RID_SVXBMP_CHECKBOX "res/sx10596.png" +#define RID_SVXBMP_FIXEDTEXT "res/sx10597.png" +#define RID_SVXBMP_GROUPBOX "res/sx10598.png" +#define RID_SVXBMP_EDITBOX "res/sx10599.png" +#define RID_SVXBMP_LISTBOX "res/sx10600.png" +#define RID_SVXBMP_COMBOBOX "res/sx10600.png" +#define RID_SVXBMP_IMAGEBUTTON "res/sx10604.png" +#define RID_SVXBMP_IMAGECONTROL "res/sx10710.png" +#define RID_SVXBMP_FILECONTROL "res/sx10605.png" +#define RID_SVXBMP_DATEFIELD "res/sx10704.png" +#define RID_SVXBMP_TIMEFIELD "res/sx10705.png" +#define RID_SVXBMP_NUMERICFIELD "res/sx10706.png" +#define RID_SVXBMP_CURRENCYFIELD "res/sx10707.png" +#define RID_SVXBMP_PATTERNFIELD "res/sx10708.png" +#define RID_SVXBMP_FORMATTEDFIELD "res/sx10728.png" +#define RID_SVXBMP_SCROLLBAR "res/sx10768.png" +#define RID_SVXBMP_SPINBUTTON "res/sx10769.png" +#define RID_SVXBMP_NAVIGATIONBAR "res/sx10607.png" + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index 9eea3301b07c..ebbcb52b616f 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -46,7 +46,8 @@ #include <memory> #include "svx/svxids.hrc" -#include "svx/fmresids.hrc" + +#include "bitmaps.hlst" // See svx/source/form/fmshimp.cxx for other use of this .ui @@ -74,7 +75,7 @@ static const char* aCommands[] = ".uno:ConvertToNavigationBar" }; -static const sal_Int16 nImgIds[] = +static const OUStringLiteral aImgIds[] = { RID_SVXBMP_EDITBOX, RID_SVXBMP_BUTTON, @@ -184,9 +185,8 @@ void ControlMenuController::updateImagesPopupMenu( PopupMenu* pPopupMenu ) //ident is .uno:Command without .uno: OString sIdent = OString(aCommands[i]).copy(5); sal_uInt16 nId = pPopupMenu->GetItemId(sIdent); - ResId aResId(nImgIds[i], *xResMgr); - if (m_bShowMenuImages && xResMgr->IsAvailable(aResId)) - pPopupMenu->SetItemImage(nId, Image(BitmapEx(aResId))); + if (m_bShowMenuImages) + pPopupMenu->SetItemImage(nId, Image(BitmapEx(aImgIds[i]))); else pPopupMenu->SetItemImage(nId, Image()); } |