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 | |
| 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>
68 files changed, 564 insertions, 1496 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 diff --git a/cui/inc/bitmaps.hlst b/cui/inc/bitmaps.hlst index 075e05e94d10..2cefabd14611 100644 --- a/cui/inc/bitmaps.hlst +++ b/cui/inc/bitmaps.hlst @@ -64,6 +64,9 @@ #define RID_SVXBMP_TARGET "res/target.png" #define RID_SVXBMP_NEWDOC "res/newdoc.png" +#define RID_SVXBMP_COLLAPSEDNODE "res/sx18002.png" +#define RID_SVXBMP_EXPANDEDNODE "res/sx18003.png" + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx index 55635acd8449..aae8305378fb 100644 --- a/cui/source/customize/selector.cxx +++ b/cui/source/customize/selector.cxx @@ -211,8 +211,8 @@ SvxConfigGroupListBox::SvxConfigGroupListBox(vcl::Window* pParent, WinBits nStyl , m_sProdMacros(CUI_RESSTR(RID_SVXSTR_PRODMACROS)) { SetNodeBitmaps( - Image(BitmapEx(SVX_RES(RID_SVXBMP_COLLAPSEDNODE))), - Image(BitmapEx(SVX_RES(RID_SVXBMP_EXPANDEDNODE))) + Image(BitmapEx(RID_SVXBMP_COLLAPSEDNODE)), + Image(BitmapEx(RID_SVXBMP_EXPANDEDNODE)) ); } 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()); } diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc index dc7d59043353..536e4b35dba2 100644 --- a/include/svx/dialogs.hrc +++ b/include/svx/dialogs.hrc @@ -132,78 +132,13 @@ // ResIds for dialogs from StarDraw #define RID_SVXSW_FRAMEPOSITIONS (RID_SVX_START + 289) -#define RID_SVXBMP_LAMP_ON (RID_SVX_START + 210) -#define RID_SVXBMP_LAMP_OFF (RID_SVX_START + 211) - #define RID_SVXFLOAT3D_FAVORITE (RID_SVX_START + 73) #define RID_SVXFLOAT3D_FIX_R (RID_SVX_START + 77) #define RID_SVXFLOAT3D_FIX_G (RID_SVX_START + 78) #define RID_SVXFLOAT3D_FIX_B (RID_SVX_START + 84) -#define RID_SVXBMP_SLIDERBUTTON (RID_SVX_START + 66) -#define RID_SVXBMP_SLIDERDECREASE (RID_SVX_START + 67) -#define RID_SVXBMP_SLIDERINCREASE (RID_SVX_START + 68) - -#define RID_SVXBMP_ELEMENT (RID_SVX_START + 71) -#define RID_SVXBMP_ATTRIBUTE (RID_SVX_START + 72) -#define RID_SVXBMP_TEXT (RID_SVX_START + 73) -#define RID_SVXBMP_OTHER (RID_SVX_START + 74) - -#define RID_SVXBMP_FRAME1 (RID_SVX_START + 75) -#define RID_SVXBMP_FRAME2 (RID_SVX_START + 76) -#define RID_SVXBMP_FRAME3 (RID_SVX_START + 77) -#define RID_SVXBMP_FRAME4 (RID_SVX_START + 78) -#define RID_SVXBMP_FRAME5 (RID_SVX_START + 79) -#define RID_SVXBMP_FRAME6 (RID_SVX_START + 80) -#define RID_SVXBMP_FRAME7 (RID_SVX_START + 81) -#define RID_SVXBMP_FRAME8 (RID_SVX_START + 82) -#define RID_SVXBMP_FRAME9 (RID_SVX_START + 83) -#define RID_SVXBMP_FRAME10 (RID_SVX_START + 84) -#define RID_SVXBMP_FRAME11 (RID_SVX_START + 85) -#define RID_SVXBMP_FRAME12 (RID_SVX_START + 86) - -#define RID_SVXBMP_ADD (RID_SVX_START + 87) -#define RID_SVXBMP_ADD_ELEMENT (RID_SVX_START + 88) -#define RID_SVXBMP_ADD_ATTRIBUTE (RID_SVX_START + 89) -#define RID_SVXBMP_EDIT (RID_SVX_START + 90) -#define RID_SVXBMP_REMOVE (RID_SVX_START + 91) - #define RID_SVXSTR_FRMSEL_TEXTS (RID_SVX_START + 93) #define RID_SVXSTR_FRMSEL_DESCRIPTIONS (RID_SVX_START + 94) -#define RID_SVXBMP_FRMSEL_ARROW1 (RID_SVX_START + 95) -#define RID_SVXBMP_FRMSEL_ARROW2 (RID_SVX_START + 96) -#define RID_SVXBMP_FRMSEL_ARROW3 (RID_SVX_START + 97) -#define RID_SVXBMP_FRMSEL_ARROW4 (RID_SVX_START + 98) -#define RID_SVXBMP_FRMSEL_ARROW5 (RID_SVX_START + 99) -#define RID_SVXBMP_FRMSEL_ARROW6 (RID_SVX_START + 100) -#define RID_SVXBMP_FRMSEL_ARROW7 (RID_SVX_START + 101) -#define RID_SVXBMP_FRMSEL_ARROW8 (RID_SVX_START + 102) -#define RID_SVXBMP_FRMSEL_ARROW9 (RID_SVX_START + 103) -#define RID_SVXBMP_FRMSEL_ARROW10 (RID_SVX_START + 104) -#define RID_SVXBMP_FRMSEL_ARROW11 (RID_SVX_START + 105) -#define RID_SVXBMP_FRMSEL_ARROW12 (RID_SVX_START + 106) -#define RID_SVXBMP_FRMSEL_ARROW13 (RID_SVX_START + 107) -#define RID_SVXBMP_FRMSEL_ARROW14 (RID_SVX_START + 108) -#define RID_SVXBMP_FRMSEL_ARROW15 (RID_SVX_START + 109) -#define RID_SVXBMP_FRMSEL_ARROW16 (RID_SVX_START + 110) - -// ResId for position and size bitmap -#define RID_SVXBMP_POSITION (RID_SVX_START + 111) -#define RID_SVXBMP_SIZE (RID_SVX_START + 112) - -#define RID_SVXBMP_SIGNET (RID_SVX_START + 113) -#define RID_SVXBMP_SIGNET_BROKEN (RID_SVX_START + 114) -#define RID_SVXBMP_SIGNET_NOTVALIDATED (RID_SVX_START + 115) - -#define RID_SVXCTRL_RECTBTNS (RID_SVX_START + 226) - -// ResId's for Starone impl. bitmaps -#define RID_UNODRAW_OBJECTS (RID_SVX_START + 233) -#define RID_UNODRAW_OLE2 (RID_SVX_START + 234) -#define RID_UNODRAW_GRAPHICS (RID_SVX_START + 235) - -#define RID_SVXBMP_NOTCHECKED (RID_SVX_START + 243) -#define RID_SVXBMP_CHECKED (RID_SVX_START + 244) #define RID_SIDEBAR_EMPTY_PANEL_TEXT (RID_SVX_START + 321) @@ -247,9 +182,6 @@ #define RID_SVXSTR_OVERWRITE_HELPTEXT (RID_SVX_START + 211) #define RID_SVXSTR_OVERWRITE_TEXT (RID_SVX_START + 212) -// Strings for the selection mode -#define RID_SVXBMP_SELECTION (RID_SVX_START + 215) - #define RID_SVXSTR_XMLSEC_SIG_OK (RID_SVX_START + 222) #define RID_SVXSTR_XMLSEC_SIG_OK_NO_VERIFY (RID_SVX_START + 223) #define RID_SVXSTR_XMLSEC_SIG_NOT_OK (RID_SVX_START + 224) @@ -313,21 +245,6 @@ #define RID_SVX_CONTOUR_START (RID_SVX_START + 461) // RID_SVX_CONTOUR_END (RID_SVX_START + 471) -#define RID_SVXBMP_GRAF_RED (RID_SVX_START + 472) -#define RID_SVXBMP_GRAF_GREEN (RID_SVX_START + 473) -#define RID_SVXBMP_GRAF_BLUE (RID_SVX_START + 474) -#define RID_SVXBMP_GRAF_LUMINANCE (RID_SVX_START + 475) -#define RID_SVXBMP_GRAF_CONTRAST (RID_SVX_START + 476) -#define RID_SVXBMP_GRAF_GAMMA (RID_SVX_START + 477) -#define RID_SVXBMP_GRAF_TRANSPARENCE (RID_SVX_START + 478) - -#define RID_SVXBMP_DEPTH_INFINITY (RID_SVX_START + 482) -#define RID_SVXBMP_DEPTH_0 (RID_SVX_START + 483) -#define RID_SVXBMP_DEPTH_1 (RID_SVX_START + 484) -#define RID_SVXBMP_DEPTH_2 (RID_SVX_START + 485) -#define RID_SVXBMP_DEPTH_3 (RID_SVX_START + 486) -#define RID_SVXBMP_DEPTH_4 (RID_SVX_START + 487) - // Defines for the 3D engine #define RID_SVX_3D_UNDO_EXCHANGE_PASTE (RID_SVX_START + 489) #define RID_SVX_3D_UNDO_ROTATE (RID_SVX_START + 495) @@ -341,11 +258,6 @@ #define RID_SVXSTR_GRAFMODE_MONO (RID_SVX_START + 522) #define RID_SVXSTR_GRAFMODE_WATERMARK (RID_SVX_START + 523) -#define RID_SVXBMP_WIRE_FRAME (RID_SVX_START + 532) -#define RID_SVXBMP_MATTE (RID_SVX_START + 533) -#define RID_SVXBMP_PLASTIC (RID_SVX_START + 534) -#define RID_SVXBMP_METAL (RID_SVX_START + 535) - // BM: some additional standard colors #define RID_SVXSTR_COLOR_VIOLET (RID_SVX_START + 540) #define RID_SVXSTR_COLOR_BORDEAUX (RID_SVX_START + 541) @@ -910,40 +822,14 @@ // ooo-build specific resources #define SVX_OOO_BUILD_START (RID_SVX_START + 1230) -#define RID_SVXBMP_DOC_MODIFIED_YES (SVX_OOO_BUILD_START + 1) // 1231 -#define RID_SVXBMP_DOC_MODIFIED_NO (SVX_OOO_BUILD_START + 2) // 1232 -#define RID_SVXBMP_DOC_MODIFIED_FEEDBACK (SVX_OOO_BUILD_START + 3) // 1233 #define RID_SVXSTR_DOC_MODIFIED_YES (SVX_OOO_BUILD_START + 4) // 1234 #define RID_SVXSTR_DOC_MODIFIED_NO (SVX_OOO_BUILD_START + 5) // 1235 #define RID_SVXSTR_DOC_LOAD (SVX_OOO_BUILD_START + 6) // 1236 #define RID_SVXSTR_ERR_OLD_PASSWD (SVX_OOO_BUILD_START + 7) // 1237 #define RID_SVXSTR_ERR_REPEAT_PASSWD (SVX_OOO_BUILD_START + 8) // 1238 -#define RID_SVXBMP_ZOOM_PAGE (SVX_OOO_BUILD_START + 9) // 1239 #define RID_SVXSTR_FIT_SLIDE (SVX_OOO_BUILD_START + 10) // 1240 #define RID_SVXSTR_WARN_MISSING_SMARTART (SVX_OOO_BUILD_START + 11) // 1241 -// sidebar-related resources -#define RID_SVX_SIDEBAR_BEGIN (RID_SVX_START + 1242) -#define BMP_NONE_ICON (RID_SVX_SIDEBAR_BEGIN + 21) -#define BMP_WIDTH1_ICON (RID_SVX_SIDEBAR_BEGIN + 22) -#define BMP_WIDTH2_ICON (RID_SVX_SIDEBAR_BEGIN + 23) -#define BMP_WIDTH3_ICON (RID_SVX_SIDEBAR_BEGIN + 24) -#define BMP_WIDTH4_ICON (RID_SVX_SIDEBAR_BEGIN + 25) -#define BMP_WIDTH5_ICON (RID_SVX_SIDEBAR_BEGIN + 26) -#define BMP_WIDTH6_ICON (RID_SVX_SIDEBAR_BEGIN + 27) -#define BMP_WIDTH7_ICON (RID_SVX_SIDEBAR_BEGIN + 28) -#define BMP_WIDTH8_ICON (RID_SVX_SIDEBAR_BEGIN + 29) -#define BMP_AXIAL (RID_SVX_SIDEBAR_BEGIN + 30) -#define BMP_ELLI (RID_SVX_SIDEBAR_BEGIN + 31) -#define BMP_QUAD (RID_SVX_SIDEBAR_BEGIN + 32) -#define BMP_RADIAL (RID_SVX_SIDEBAR_BEGIN + 33) -#define BMP_SQUARE (RID_SVX_SIDEBAR_BEGIN + 34) -#define BMP_LINEAR (RID_SVX_SIDEBAR_BEGIN + 35) -#define RID_SVX_SIDEBAR_END (RID_SVX_START + 1279) - -#define RID_SVXBMP_GREENCHECK (RID_SVX_START + 1280) -#define RID_SVXBMP_YELLOWCHECK (RID_SVX_START + 1281) -#define RID_SVXBMP_REDCROSS (RID_SVX_START + 1282) #define RID_SVXSTR_SUCCESSRECOV (RID_SVX_START + 1283) #define RID_SVXSTR_ORIGDOCRECOV (RID_SVX_START + 1284) #define RID_SVXSTR_RECOVFAILED (RID_SVX_START + 1285) @@ -968,35 +854,17 @@ #define RID_SVXSTR_CHARS_SPACING_VERY_LOOSE (RID_SVX_START + 1305) #define RID_SVXSTR_CHARS_SPACING_CUSTOM (RID_SVX_START + 1306) #define RID_SVXSTR_CHARS_SPACING_KERN_PAIRS (RID_SVX_START + 1307) -#define RID_SVXBMP_DIRECTION (RID_SVX_START + 1308) // needs 10 resource ids -#define RID_SVXBMP_PERSPECTIVE (RID_SVX_START + 1318) -#define RID_SVXBMP_PARALLEL (RID_SVX_START + 1319) #define RID_SVXSTR_DIRECTION (RID_SVX_START + 1320) // needs 10 resource ids #define RID_SVXSTR_PERSPECTIVE (RID_SVX_START + 1330) #define RID_SVXSTR_PARALLEL (RID_SVX_START + 1331) #define RID_SVXSTR_BRIGHT (RID_SVX_START + 1332) #define RID_SVXSTR_NORMAL (RID_SVX_START + 1333) #define RID_SVXSTR_DIM (RID_SVX_START + 1334) -#define RID_SVXBMP_LIGHT_OFF (RID_SVX_START + 1335) // needs 10 resource ids -#define RID_SVXBMP_LIGHT_ON (RID_SVX_START + 1345) // needs 10 resource ids -#define RID_SVXBMP_LIGHT_PREVIEW (RID_SVX_START + 1355) // needs 10 resource ids -#define RID_SVXBMP_LIGHTING_BRIGHT (RID_SVX_START + 1365) -#define RID_SVXBMP_LIGHTING_NORMAL (RID_SVX_START + 1366) -#define RID_SVXBMP_LIGHTING_DIM (RID_SVX_START + 1367) #define RID_SVXSTR_ALIGN_LEFT (RID_SVX_START + 1368) #define RID_SVXSTR_ALIGN_CENTER (RID_SVX_START + 1369) #define RID_SVXSTR_ALIGN_RIGHT (RID_SVX_START + 1370) #define RID_SVXSTR_ALIGN_WORD (RID_SVX_START + 1371) #define RID_SVXSTR_ALIGN_STRETCH (RID_SVX_START + 1372) -#define RID_SVXBMP_FONTWORK_ALIGN_LEFT (RID_SVX_START + 1373) -#define RID_SVXBMP_FONTWORK_ALIGN_CENTER (RID_SVX_START + 1374) -#define RID_SVXBMP_FONTWORK_ALIGN_RIGHT (RID_SVX_START + 1375) -#define RID_SVXBMP_FONTWORK_ALIGN_WORD (RID_SVX_START + 1376) -#define RID_SVXBMP_FONTWORK_ALIGN_STRETCH (RID_SVX_START + 1377) -#define RID_SVXBMP_SHADOW_ANGLE (RID_SVX_START + 1378) -#define RID_SVXBMP_SHADOW_SIZE (RID_SVX_START + 1379) -#define RID_SVXBMP_SHADOW_XDIST (RID_SVX_START + 1380) -#define RID_SVXBMP_SHADOW_YDIST (RID_SVX_START + 1381) #define RID_SVXSTR_ZOOM_25 (RID_SVX_START + 1382) #define RID_SVXSTR_ZOOM_50 (RID_SVX_START + 1383) #define RID_SVXSTR_ZOOM_75 (RID_SVX_START + 1384) @@ -1009,8 +877,6 @@ #define RID_SVXSTR_WIDTH_LAST_CUSTOM (RID_SVX_START + 1391) #define RID_SVXSTR_PT (RID_SVX_START + 1392) -#define RID_SVXBMP_WIDTH_CUSTOM (RID_SVX_START + 1393) -#define RID_SVXBMP_WIDTH_CUSTOM_GRAY (RID_SVX_START + 1394) #define RID_SVXSTRARY_PAPERSIZE_STD (RID_SVX_START + 1395) #define RID_SVXSTRARY_PAPERSIZE_DRAW (RID_SVX_START + 1396) #define RID_SVXSTRARY_NUMBERINGTYPE (RID_SVX_START + 1397) diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx index 2cb800216f39..fd96b1ce247a 100644 --- a/include/svx/dlgctrl.hxx +++ b/include/svx/dlgctrl.hxx @@ -75,7 +75,7 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxRectCtl : public Control private: SVX_DLLPRIVATE void InitSettings(vcl::RenderContext& rRenderContext); SVX_DLLPRIVATE void InitRectBitmap(); - SVX_DLLPRIVATE Bitmap& GetRectBitmap(); + SVX_DLLPRIVATE BitmapEx& GetRectBitmap(); SVX_DLLPRIVATE void Resize_Impl(); protected: @@ -88,7 +88,7 @@ protected: Point aPtLB, aPtMB, aPtRB; Point aPtNew; RectPoint eRP, eDefRP; - Bitmap* pBitmap; + BitmapEx* pBitmap; CTL_STATE m_nState; bool mbCompleteDisable : 1; diff --git a/include/svx/fmresids.hrc b/include/svx/fmresids.hrc index a9603635309b..499d2913de5b 100644 --- a/include/svx/fmresids.hrc +++ b/include/svx/fmresids.hrc @@ -21,38 +21,6 @@ #include <svl/solar.hrc> -// Image-Id's ----------------------------------------------------------- -#define RID_SVXBMP_FORM (RID_FORMS_START + 1) -#define RID_SVXBMP_CONTROL (RID_FORMS_START + 2) -#define RID_SVXBMP_COLLAPSEDNODE (RID_FORMS_START + 3) -#define RID_SVXBMP_EXPANDEDNODE (RID_FORMS_START + 4) -#define RID_SVXBMP_BUTTON (RID_FORMS_START + 5) -#define RID_SVXBMP_RADIOBUTTON (RID_FORMS_START + 6) -#define RID_SVXBMP_CHECKBOX (RID_FORMS_START + 7) -#define RID_SVXBMP_FIXEDTEXT (RID_FORMS_START + 8) -#define RID_SVXBMP_GROUPBOX (RID_FORMS_START + 9) -#define RID_SVXBMP_EDITBOX (RID_FORMS_START + 10) -#define RID_SVXBMP_LISTBOX (RID_FORMS_START + 11) -#define RID_SVXBMP_COMBOBOX (RID_FORMS_START + 12) -#define RID_SVXBMP_FORMS (RID_FORMS_START + 13) -#define RID_SVXBMP_IMAGEBUTTON (RID_FORMS_START + 14) -#define RID_SVXBMP_IMAGECONTROL (RID_FORMS_START + 15) -#define RID_SVXBMP_FILECONTROL (RID_FORMS_START + 16) -#define RID_SVXBMP_DATEFIELD (RID_FORMS_START + 17) -#define RID_SVXBMP_TIMEFIELD (RID_FORMS_START + 18) -#define RID_SVXBMP_NUMERICFIELD (RID_FORMS_START + 19) -#define RID_SVXBMP_CURRENCYFIELD (RID_FORMS_START + 20) -#define RID_SVXBMP_PATTERNFIELD (RID_FORMS_START + 21) -#define RID_SVXBMP_HIDDEN (RID_FORMS_START + 22) -#define RID_SVXBMP_GRID (RID_FORMS_START + 23) -#define RID_SVXBMP_FORMATTEDFIELD (RID_FORMS_START + 24) -#define RID_SVXBMP_FILTER (RID_FORMS_START + 25) -#define RID_SVXBMP_DATE_N_TIME_FIELDS (RID_FORMS_START + 26) -#define RID_SVXBMP_FIELD (RID_FORMS_START + 27) -#define RID_SVXBMP_SCROLLBAR (RID_FORMS_START + 28) -#define RID_SVXBMP_SPINBUTTON (RID_FORMS_START + 29) -#define RID_SVXBMP_NAVIGATIONBAR (RID_FORMS_START + 30) - // Toolbars ------------------------------------------------------------ #define RID_SVXTBX_FORM_NAVIGATION (RID_FORMS_START + 1) #define RID_SVXTBX_FORM_FILTER (RID_FORMS_START + 2) diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx index 98e908bab515..3fb3929b154d 100644 --- a/include/svx/galmisc.hxx +++ b/include/svx/galmisc.hxx @@ -97,7 +97,7 @@ bool FileExists( const INetURLObject& rURL ); bool CreateDir( const INetURLObject& rURL ); bool CopyFile( const INetURLObject& rSrcURL, const INetURLObject& rDstURL ); bool KillFile( const INetURLObject& rURL ); -BitmapEx GalleryResGetBitmapEx( sal_uInt32 nId ); +BitmapEx GalleryResGetBitmapEx(const OUString& rId); class SgaIMapInfo : public SdrObjUserData, public SfxListener { diff --git a/include/svx/svdstr.hrc b/include/svx/svdstr.hrc index 2762571491cc..6051502f923c 100644 --- a/include/svx/svdstr.hrc +++ b/include/svx/svdstr.hrc @@ -342,14 +342,10 @@ #define STR_ItemValCIRC_SECT (STR_ItemValBegin + 50) #define STR_ItemValCIRC_CUT (STR_ItemValBegin + 51) #define STR_ItemValCIRC_ARC (STR_ItemValBegin + 52) -#define STR_ItemValEnd (STR_ItemValCIRC_ARC) - -#define BMAP_Begin (STR_ItemValEnd+1) -#define BMAP_GrafikEi (BMAP_Begin +0) -#define BMAP_End (BMAP_GrafikEi) +#define STR_ItemValEnd (STR_ItemValCIRC_ARC) // Strings for the template dialog -#define SIP_Begin (BMAP_End) +#define SIP_Begin (STR_ItemValEnd+1) #define SIP_UNKNOWN_ATTR (SIP_Begin + 0) #define SIP_XA_LINESTYLE (SIP_Begin + 1) @@ -553,11 +549,6 @@ #define SIP_SA_GRAFMODE (SIP_Begin + 252) #define SIP_SA_GRAFCROP (SIP_Begin + 253) -#define SIP_SA_MARKERS (SIP_Begin + 258) -#define SIP_SA_PAGESHADOW35X35 (SIP_Begin + 259) - -#define BMP_SVXOLEOBJ (SIP_Begin + 261) - #define STR_TABLE_INSCOL (SIP_Begin + 265) #define STR_TABLE_INSROW (SIP_Begin + 266) #define STR_UNDO_COL_DELETE (SIP_Begin + 267) @@ -569,7 +560,6 @@ #define STR_TABLE_DISTRIBUTE_COLUMNS (SIP_Begin + 273) #define STR_TABLE_STYLE (SIP_Begin + 274) #define STR_TABLE_STYLE_SETTINGS (SIP_Begin + 275) -#define SIP_SA_CROP_MARKERS (SIP_Begin + 276) #define STR_TABLE_DELETE_CELL_CONTENTS (SIP_Begin + 277) /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk index 1f503ece96a1..a63f5e7aeb0c 100644 --- a/postprocess/CustomTarget_images.mk +++ b/postprocess/CustomTarget_images.mk @@ -65,6 +65,7 @@ $(packimages_DIR)/sourceimagelist.ilst : \ $(SRCDIR)/sd/inc/bitmaps.hlst \ $(SRCDIR)/sfx2/inc/bitmaps.hlst \ $(SRCDIR)/svtools/inc/bitmaps.hlst \ + $(SRCDIR)/svx/inc/bitmaps.hlst \ $(SRCDIR)/vcl/inc/bitmaps.hlst \ $(SRCDIR)/xmlsecurity/inc/bitmaps.hlst grep res $^ | cut -d'"' -f2 | sed "s/^/%MODULE%\//" | sed "s/%MODULE%.res/%GLOBALRES%/g" > $@ diff --git a/sc/inc/bitmaps.hlst b/sc/inc/bitmaps.hlst index 58a91c184503..c87a47b000e7 100644 --- a/sc/inc/bitmaps.hlst +++ b/sc/inc/bitmaps.hlst @@ -121,6 +121,10 @@ #define BMP_ICON_SET_POSITIVE_YELLOW_SMILIE "sc/res/icon-set-positive-yellow-smilie.png" #define BMP_ICON_SET_NEGATIVE_YELLOW_SMILIE "sc/res/icon-set-negative-yellow-smilie.png" +#define RID_SVXBMP_SLIDERBUTTON "svx/res/slidezoombutton_10.png" +#define RID_SVXBMP_SLIDERDECREASE "svx/res/slidezoomout_10.png" +#define RID_SVXBMP_SLIDERINCREASE "svx/res/slidezoomin_10.png" + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx index 15d0e88d44d6..77124b7f178e 100644 --- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx +++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx @@ -34,6 +34,7 @@ #include "stlpool.hxx" #include "scitems.hxx" #include "printfun.hxx" +#include "bitmaps.hlst" // class ScZoomSliderControl --------------------------------------- @@ -221,9 +222,9 @@ ScZoomSliderWnd::ScZoomSliderWnd( vcl::Window* pParent, aLogicalSize( 115, 40 ), m_xDispatchProvider( rDispatchProvider ) { - mpImpl->maSliderButton = Image(BitmapEx(SVX_RES(RID_SVXBMP_SLIDERBUTTON))); - mpImpl->maIncreaseButton = Image(BitmapEx(SVX_RES(RID_SVXBMP_SLIDERINCREASE))); - mpImpl->maDecreaseButton = Image(BitmapEx(SVX_RES(RID_SVXBMP_SLIDERDECREASE))); + mpImpl->maSliderButton = Image(BitmapEx(RID_SVXBMP_SLIDERBUTTON)); + mpImpl->maIncreaseButton = Image(BitmapEx(RID_SVXBMP_SLIDERINCREASE)); + mpImpl->maDecreaseButton = Image(BitmapEx(RID_SVXBMP_SLIDERDECREASE)); Size aSliderSize = LogicToPixel( Size( aLogicalSize), MapMode( MapUnit::Map10thMM ) ); SetSizePixel( Size( aSliderSize.Width() * nSliderWidth-1, aSliderSize.Height() + nSliderHeight ) ); } diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk index 2fcc11325f51..5ff57a54ea65 100644 --- a/svx/AllLangResTarget_svx.mk +++ b/svx/AllLangResTarget_svx.mk @@ -60,12 +60,9 @@ $(eval $(call gb_SrsTarget_add_files,svx/res,\ svx/source/engine3d/float3d.src \ svx/source/engine3d/string3d.src \ svx/source/form/datanavi.src \ - svx/source/form/fmexpl.src \ svx/source/form/fmstring.src \ svx/source/items/svxerr.src \ svx/source/items/svxitems.src \ - svx/source/sidebar/area/AreaPropertyPanel.src \ - svx/source/sidebar/line/LinePropertyPanel.src \ svx/source/stbctrls/stbctrls.src \ svx/source/svdraw/svdstr.src \ svx/source/table/table.src \ @@ -80,9 +77,4 @@ $(eval $(call gb_SrsTarget_add_files,svx/res,\ svx/source/toolbars/fontworkbar.src \ )) -$(eval $(call gb_SrsTarget_add_nonlocalizable_files,svx/res,\ - svx/source/dialog/langbox.src \ - svx/source/unodraw/unodraw.src \ -)) - # vim: set noet sw=4 ts=4: diff --git a/svx/inc/bitmaps.hlst b/svx/inc/bitmaps.hlst new file mode 100644 index 000000000000..7fee73590cae --- /dev/null +++ b/svx/inc/bitmaps.hlst @@ -0,0 +1,225 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#ifndef INCLUDED_SVX_INC_BITMAPS_HRC +#define INCLUDED_SVX_INC_BITMAPS_HRC + +#define RID_SVXCTRL_RECTBTNS "svx/res/rectbtns.png" + +#define RID_SVXBMP_FRMSEL_ARROW1 "svx/res/frmsel1.png" +#define RID_SVXBMP_FRMSEL_ARROW2 "svx/res/frmsel2.png" +#define RID_SVXBMP_FRMSEL_ARROW3 "svx/res/frmsel3.png" +#define RID_SVXBMP_FRMSEL_ARROW4 "svx/res/frmsel4.png" +#define RID_SVXBMP_FRMSEL_ARROW5 "svx/res/frmsel5.png" +#define RID_SVXBMP_FRMSEL_ARROW6 "svx/res/frmsel6.png" +#define RID_SVXBMP_FRMSEL_ARROW7 "svx/res/frmsel7.png" +#define RID_SVXBMP_FRMSEL_ARROW8 "svx/res/frmsel8.png" +#define RID_SVXBMP_FRMSEL_ARROW9 "svx/res/frmsel9.png" +#define RID_SVXBMP_FRMSEL_ARROW10 "svx/res/frmsel10.png" +#define RID_SVXBMP_FRMSEL_ARROW11 "svx/res/frmsel11.png" +#define RID_SVXBMP_FRMSEL_ARROW12 "svx/res/frmsel12.png" +#define RID_SVXBMP_FRMSEL_ARROW13 "svx/res/frmsel13.png" +#define RID_SVXBMP_FRMSEL_ARROW14 "svx/res/frmsel14.png" +#define RID_SVXBMP_FRMSEL_ARROW15 "svx/res/frmsel15.png" +#define RID_SVXBMP_FRMSEL_ARROW16 "svx/res/frmsel16.png" + +#define RID_SVXBMP_NOTCHECKED "svx/res/notcheck.png" +#define RID_SVXBMP_CHECKED "svx/res/lngcheck.png" + +#define RID_SVXBMP_GREENCHECK "svx/res/nu01.png" +#define RID_SVXBMP_YELLOWCHECK "svx/res/nu04.png" +#define RID_SVXBMP_REDCROSS "svx/res/nu02.png" +#define RID_SVXBMP_SHADOW_ANGLE "svx/res/fw018.png" +#define RID_SVXBMP_SHADOW_SIZE "svx/res/fw019.png" +#define RID_SVXBMP_SHADOW_XDIST "svx/res/fw016.png" +#define RID_SVXBMP_SHADOW_YDIST "svx/res/fw017.png" + +#define RID_SVXBMP_DIRECTION_DIRECTION_NW "svx/res/directionnorthwest_22.bmp" +#define RID_SVXBMP_DIRECTION_DIRECTION_N "svx/res/directionnorth_22.bmp" +#define RID_SVXBMP_DIRECTION_DIRECTION_NE "svx/res/directionnortheast_22.bmp" +#define RID_SVXBMP_DIRECTION_DIRECTION_W "svx/res/directionwest_22.bmp" +#define RID_SVXBMP_DIRECTION_DIRECTION_NONE "svx/res/directionstraight_22.bmp" +#define RID_SVXBMP_DIRECTION_DIRECTION_E "svx/res/directioneast_22.bmp" +#define RID_SVXBMP_DIRECTION_DIRECTION_SW "svx/res/directionsouthwest_22.bmp" +#define RID_SVXBMP_DIRECTION_DIRECTION_S "svx/res/directionsouth_22.bmp" +#define RID_SVXBMP_DIRECTION_DIRECTION_SE "svx/res/directionsoutheast_22.bmp" +#define RID_SVXBMP_PERSPECTIVE "svx/res/perspective_16.bmp" +#define RID_SVXBMP_PARALLEL "svx/res/parallel_16.bmp" +#define RID_SVXBMP_LIGHT_OFF_FROM_TOP_LEFT "svx/res/lightofffromtopleft_22.bmp" +#define RID_SVXBMP_LIGHT_OFF_FROM_TOP "svx/res/lightofffromtop_22.bmp" +#define RID_SVXBMP_LIGHT_OFF_FROM_TOP_RIGHT "svx/res/lightofffromtopright_22.bmp" +#define RID_SVXBMP_LIGHT_OFF_FROM_LEFT "svx/res/lightofffromleft_22.bmp" +#define RID_SVXBMP_LIGHT_OFF_FROM_RIGHT "svx/res/lightofffromright_22.bmp" +#define RID_SVXBMP_LIGHT_OFF_FROM_BOTTOM_LEFT "svx/res/lightofffrombottomleft_22.bmp" +#define RID_SVXBMP_LIGHT_OFF_FROM_BOTTOM "svx/res/lightofffrombottom_22.bmp" +#define RID_SVXBMP_LIGHT_OFF_FROM_BOTTOM_RIGHT "svx/res/lightofffrombottomright_22.bmp" +#define RID_SVXBMP_LIGHT_ON_FROM_TOP_LEFT "svx/res/lightonfromtopleft_22.bmp" +#define RID_SVXBMP_LIGHT_ON_FROM_TOP "svx/res/lightonfromtop_22.bmp" +#define RID_SVXBMP_LIGHT_ON_FROM_TOP_RIGHT "svx/res/lightonfromtopright_22.bmp" +#define RID_SVXBMP_LIGHT_ON_FROM_LEFT "svx/res/lightonfromleft_22.bmp" +#define RID_SVXBMP_LIGHT_ON_FROM_RIGHT "svx/res/lightonfromright_22.bmp" +#define RID_SVXBMP_LIGHT_ON_FROM_BOTTOM_LEFT "svx/res/lightonfrombottomleft_22.bmp" +#define RID_SVXBMP_LIGHT_ON_FROM_BOTTOM "svx/res/lightonfrombottom_22.bmp" +#define RID_SVXBMP_LIGHT_ON_FROM_BOTTOM_RIGHT "svx/res/lightonfrombottomright_22.bmp" +#define RID_SVXBMP_LIGHT_PREVIEW_FROM_TOP_LEFT "svx/res/lightfromtopleft_22.bmp" +#define RID_SVXBMP_LIGHT_PREVIEW_FROM_TOP "svx/res/lightfromtop_22.bmp" +#define RID_SVXBMP_LIGHT_PREVIEW_FROM_TOP_RIGHT "svx/res/lightfromtopright_22.bmp" +#define RID_SVXBMP_LIGHT_PREVIEW_FROM_LEFT "svx/res/lightfromleft_22.bmp" +#define RID_SVXBMP_LIGHT_PREVIEW_FROM_RIGHT "svx/res/lightfromright_22.bmp" +#define RID_SVXBMP_LIGHT_PREVIEW_FROM_FRONT "svx/res/lightfromfront_22.bmp" +#define RID_SVXBMP_LIGHT_PREVIEW_FROM_BOTTOM_LEFT "svx/res/lightfrombottomleft_22.bmp" +#define RID_SVXBMP_LIGHT_PREVIEW_FROM_BOTTOM "svx/res/lightfrombottom_22.bmp" +#define RID_SVXBMP_LIGHT_PREVIEW_FROM_BOTTOM_RIGHT "svx/res/lightfrombottomright_22.bmp" +#define RID_SVXBMP_LIGHTING_BRIGHT "svx/res/brightlit_16.png" +#define RID_SVXBMP_LIGHTING_NORMAL "svx/res/normallit_16.png" +#define RID_SVXBMP_LIGHTING_DIM "svx/res/dimlit_16.png" +#define RID_SVXBMP_WIRE_FRAME "svx/res/wireframe_16.bmp" +#define RID_SVXBMP_MATTE "svx/res/matte_16.bmp" +#define RID_SVXBMP_PLASTIC "svx/res/plastic_16.bmp" +#define RID_SVXBMP_METAL "svx/res/metal_16.bmp" +#define RID_SVXBMP_DEPTH_0 "svx/res/extrusion0inch_16.bmp" +#define RID_SVXBMP_DEPTH_1 "svx/res/extrusion05inch_16.bmp" +#define RID_SVXBMP_DEPTH_2 "svx/res/extrusion1inch_16.bmp" +#define RID_SVXBMP_DEPTH_3 "svx/res/extrusion2inch_16.bmp" +#define RID_SVXBMP_DEPTH_4 "svx/res/extrusion4inch_16.bmp" +#define RID_SVXBMP_DEPTH_INFINITY "svx/res/extrusioninfinity_16.bmp" + +#define RID_SVXBMP_LAMP_ON "svx/res/lighton.png" +#define RID_SVXBMP_LAMP_OFF "svx/res/light.bmp" + +#define RID_SVXBMP_ADD "res/tb01.png" +#define RID_SVXBMP_ADD_ELEMENT "res/tb02.png" +#define RID_SVXBMP_ADD_ATTRIBUTE "res/tb03.png" +#define RID_SVXBMP_EDIT "res/tb04.png" +#define RID_SVXBMP_REMOVE "res/tb05.png" +#define RID_SVXBMP_ELEMENT "res/da03.png" +#define RID_SVXBMP_ATTRIBUTE "res/da04.png" +#define RID_SVXBMP_TEXT "res/da05.png" +#define RID_SVXBMP_OTHER "res/da06.png" + +#define RID_SVXBMP_FORM "res/sx10593.png" +#define RID_SVXBMP_CONTROL "res/sx10144.png" +#define RID_SVXBMP_COLLAPSEDNODE "res/sx18002.png" +#define RID_SVXBMP_EXPANDEDNODE "res/sx18003.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_FORMS "res/sx18013.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_HIDDEN "res/sx18022.png" +#define RID_SVXBMP_GRID "res/sx10603.png" +#define RID_SVXBMP_FORMATTEDFIELD "res/sx10728.png" +#define RID_SVXBMP_FILTER "res/sx10715.png" +#define RID_SVXBMP_DATE_N_TIME_FIELDS "res/sx10757.png" +#define RID_SVXBMP_FIELD "res/sx18027.png" +#define RID_SVXBMP_SCROLLBAR "res/sx10768.png" +#define RID_SVXBMP_SPINBUTTON "res/sx10769.png" +#define RID_SVXBMP_NAVIGATIONBAR "res/sx10607.png" + +#define RID_SVXBMP_THEME_NORMAL "svx/res/galnors.png" +#define RID_SVXBMP_THEME_READONLY "svx/res/galrdos.png" +#define RID_SVXBMP_THEME_DEFAULT "svx/res/galdefs.png" +#define RID_SVXBMP_GALLERY_MEDIA "svx/res/galmedia.png" +#define RID_SVXBMP_GALLERY_SOUND_1 "svx/res/galsnd1.png" +#define RID_SVXBMP_GALLERY_SOUND_2 "svx/res/galsnd2.png" +#define RID_SVXBMP_GALLERY_SOUND_3 "svx/res/galsnd3.png" +#define RID_SVXBMP_GALLERY_SOUND_4 "svx/res/galsnd4.png" +#define RID_SVXBMP_GALLERY_SOUND_5 "svx/res/galsnd5.png" +#define RID_SVXBMP_GALLERY_SOUND_6 "svx/res/galsnd6.png" +#define RID_SVXBMP_GALLERY_SOUND_7 "svx/res/galsnd7.png" +#define RID_SVXBMP_GALLERY_VIEW_ICON "svx/res/galicon.png" +#define RID_SVXBMP_GALLERY_VIEW_LIST "svx/res/gallist.png" + +#define BMP_NONE_ICON "svx/res/symphony/blank.png" +#define BMP_WIDTH1_ICON "svx/res/symphony/width1.png" +#define BMP_WIDTH2_ICON "svx/res/symphony/width2.png" +#define BMP_WIDTH3_ICON "svx/res/symphony/width3.png" +#define BMP_WIDTH4_ICON "svx/res/symphony/width4.png" +#define BMP_WIDTH5_ICON "svx/res/symphony/width5.png" +#define BMP_WIDTH6_ICON "svx/res/symphony/width6.png" +#define BMP_WIDTH7_ICON "svx/res/symphony/width7.png" +#define BMP_WIDTH8_ICON "svx/res/symphony/width8.png" +#define RID_SVXBMP_WIDTH_CUSTOM "svx/res/symphony/last_custom_common.png" +#define RID_SVXBMP_WIDTH_CUSTOM_GRAY "svx/res/symphony/last_custom_common_grey.png" + +#define BMP_AXIAL "svx/res/symphony/axial.png" +#define BMP_ELLI "svx/res/symphony/ellipsoid.png" +#define BMP_QUAD "svx/res/symphony/Quadratic.png" +#define BMP_RADIAL "svx/res/symphony/radial.png" +#define BMP_SQUARE "svx/res/symphony/Square.png" +#define BMP_LINEAR "svx/res/symphony/linear.png" + +#define RID_SVXBMP_SELECTION "svx/res/selection_10x22.png" +#define RID_SVXBMP_POSITION "res/sc10223.png" +#define RID_SVXBMP_SIZE "res/sc10224.png" +#define RID_SVXBMP_SIGNET "svx/res/signet_11x16.png" +#define RID_SVXBMP_SIGNET_BROKEN "svx/res/caution_11x16.png" +#define RID_SVXBMP_SIGNET_NOTVALIDATED "svx/res/notcertificate_16.png" +#define RID_SVXBMP_SLIDERBUTTON "svx/res/slidezoombutton_10.png" +#define RID_SVXBMP_SLIDERDECREASE "svx/res/slidezoomout_10.png" +#define RID_SVXBMP_SLIDERINCREASE "svx/res/slidezoomin_10.png" +#define RID_SVXBMP_DOC_MODIFIED_YES "svx/res/doc_modified_yes_14.png" +#define RID_SVXBMP_DOC_MODIFIED_NO "svx/res/doc_modified_no_14.png" +#define RID_SVXBMP_DOC_MODIFIED_FEEDBACK "svx/res/doc_modified_feedback.png" +#define RID_SVXBMP_ZOOM_PAGE "svx/res/zoom_page_statusbar.png" + +#define BMAP_GrafikEi "res/grafikei.png" +#define SIP_SA_PAGESHADOW35X35 "svx/res/pageshadow35x35.png" +#define SIP_SA_MARKERS "svx/res/markers.png" +#define BMP_SVXOLEOBJ "res/oleobj.png" +#define SIP_SA_CROP_MARKERS "svx/res/cropmarkers.png" + +#define RID_SVXBMP_FONTWORK_ALIGN_LEFT "svx/res/fontworkalignleft_16.png" +#define RID_SVXBMP_FONTWORK_ALIGN_CENTER "svx/res/fontworkaligncentered_16.png" +#define RID_SVXBMP_FONTWORK_ALIGN_RIGHT "svx/res/fontworkalignright_16.png" +#define RID_SVXBMP_FONTWORK_ALIGN_WORD "svx/res/fontworkalignjustified_16.png" +#define RID_SVXBMP_FONTWORK_ALIGN_STRETCH "svx/res/fontworkalignstretch_16.png" + +/* + * Bitmaps for SvxFrameWindow + */ +#define RID_SVXBMP_FRAME1 "svx/res/fr01.png" +#define RID_SVXBMP_FRAME2 "svx/res/fr02.png" +#define RID_SVXBMP_FRAME3 "svx/res/fr03.png" +#define RID_SVXBMP_FRAME4 "svx/res/fr04.png" +#define RID_SVXBMP_FRAME5 "svx/res/fr05.png" +#define RID_SVXBMP_FRAME6 "svx/res/fr06.png" +#define RID_SVXBMP_FRAME7 "svx/res/fr07.png" +#define RID_SVXBMP_FRAME8 "svx/res/fr08.png" +#define RID_SVXBMP_FRAME9 "svx/res/fr09.png" +#define RID_SVXBMP_FRAME10 "svx/res/fr010.png" +#define RID_SVXBMP_FRAME11 "svx/res/fr011.png" +#define RID_SVXBMP_FRAME12 "svx/res/fr012.png" +#define RID_SVXBMP_GRAF_RED "res/sc10865.png" +#define RID_SVXBMP_GRAF_GREEN "res/sc10866.png" +#define RID_SVXBMP_GRAF_BLUE "res/sc10867.png" +#define RID_SVXBMP_GRAF_LUMINANCE "res/sc10863.png" +#define RID_SVXBMP_GRAF_CONTRAST "res/sc10864.png" +#define RID_SVXBMP_GRAF_GAMMA "res/sc10868.png" +#define RID_SVXBMP_GRAF_TRANSPARENCE "res/sc10869.png" + +#define RID_UNODRAW_OBJECTS "svx/res/objects.png" +#define RID_UNODRAW_OLE2 "svx/res/ole.png" +#define RID_UNODRAW_GRAPHICS "svx/res/graphic.png" + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/svx/inc/gallery.hrc b/svx/inc/gallery.hrc index dcba6fb87260..79415e4ba177 100644 --- a/svx/inc/gallery.hrc +++ b/svx/inc/gallery.hrc @@ -31,23 +31,6 @@ #define RID_SVXSTR_GALLERY_ICONVIEW (RID_SVX_GALLERY_START + 86) #define RID_SVXSTR_GALLERY_LISTVIEW (RID_SVX_GALLERY_START + 87) -// Images -#define RID_SVXBMP_THEME_NORMAL (RID_SVX_GALLERY_START + 48) -#define RID_SVXBMP_THEME_READONLY (RID_SVX_GALLERY_START + 52) -#define RID_SVXBMP_THEME_DEFAULT (RID_SVX_GALLERY_START + 54) -#define RID_SVXBMP_GALLERY_VIEW_ICON (RID_SVX_GALLERY_START + 56) -#define RID_SVXBMP_GALLERY_VIEW_LIST (RID_SVX_GALLERY_START + 57) - -// Gallery-Bitmaps for Sounds -#define RID_SVXBMP_GALLERY_SOUND_1 (RID_SVX_GALLERY_START + 62) -#define RID_SVXBMP_GALLERY_SOUND_2 (RID_SVX_GALLERY_START + 63) -#define RID_SVXBMP_GALLERY_SOUND_3 (RID_SVX_GALLERY_START + 64) -#define RID_SVXBMP_GALLERY_SOUND_4 (RID_SVX_GALLERY_START + 65) -#define RID_SVXBMP_GALLERY_SOUND_5 (RID_SVX_GALLERY_START + 66) -#define RID_SVXBMP_GALLERY_SOUND_6 (RID_SVX_GALLERY_START + 67) -#define RID_SVXBMP_GALLERY_SOUND_7 (RID_SVX_GALLERY_START + 68) -#define RID_SVXBMP_GALLERY_MEDIA (RID_SVX_GALLERY_START + 71) - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index dd00bf2ab0ea..25e6f36006d9 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -25,6 +25,7 @@ #include <svx/xpool.hxx> #include <svx/dialogs.hrc> #include <accessibility.hrc> +#include "bitmaps.hlst" #include <svx/dlgctrl.hxx> #include <svx/dialmgr.hxx> #include <tools/poly.hxx> @@ -59,7 +60,7 @@ using namespace ::com::sun::star::accessibility; // Control for display and selection of the corner points and // mid point of an object -Bitmap& SvxRectCtl::GetRectBitmap() +BitmapEx& SvxRectCtl::GetRectBitmap() { if( !pBitmap ) InitRectBitmap(); @@ -140,7 +141,6 @@ void SvxRectCtl::Resize_Impl() Invalidate(); } - void SvxRectCtl::InitRectBitmap() { delete pBitmap; @@ -148,7 +148,7 @@ void SvxRectCtl::InitRectBitmap() const StyleSettings& rStyles = Application::GetSettings().GetStyleSettings(); svtools::ColorConfig aColorConfig; - pBitmap = new Bitmap(SVX_RES(RID_SVXCTRL_RECTBTNS)); + pBitmap = new BitmapEx(RID_SVXCTRL_RECTBTNS); // set bitmap-colors Color aColorAry1[7]; @@ -395,35 +395,35 @@ void SvxRectCtl::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangl bool bNoHorz = bool(m_nState & CTL_STATE::NOHORZ); bool bNoVert = bool(m_nState & CTL_STATE::NOVERT); - Bitmap& rBitmap = GetRectBitmap(); + BitmapEx& rBitmap = GetRectBitmap(); // CompletelyDisabled() added to have a disabled state for SvxRectCtl if (IsCompletelyDisabled()) { - rRenderContext.DrawBitmap(aPtLT - aToCenter, aDstBtnSize, aBtnPnt3, aBtnSize, rBitmap); - rRenderContext.DrawBitmap(aPtMT - aToCenter, aDstBtnSize, aBtnPnt3, aBtnSize, rBitmap); - rRenderContext.DrawBitmap(aPtRT - aToCenter, aDstBtnSize, aBtnPnt3, aBtnSize, rBitmap); - rRenderContext.DrawBitmap(aPtLM - aToCenter, aDstBtnSize, aBtnPnt3, aBtnSize, rBitmap); - rRenderContext.DrawBitmap(aPtMM - aToCenter, aDstBtnSize, aBtnPnt3, aBtnSize, rBitmap); - rRenderContext.DrawBitmap(aPtRM - aToCenter, aDstBtnSize, aBtnPnt3, aBtnSize, rBitmap); - rRenderContext.DrawBitmap(aPtLB - aToCenter, aDstBtnSize, aBtnPnt3, aBtnSize, rBitmap); - rRenderContext.DrawBitmap(aPtMB - aToCenter, aDstBtnSize, aBtnPnt3, aBtnSize, rBitmap); - rRenderContext.DrawBitmap(aPtRB - aToCenter, aDstBtnSize, aBtnPnt3, aBtnSize, rBitmap); + rRenderContext.DrawBitmap(aPtLT - aToCenter, aDstBtnSize, aBtnPnt3, aBtnSize, rBitmap.GetBitmap()); + rRenderContext.DrawBitmap(aPtMT - aToCenter, aDstBtnSize, aBtnPnt3, aBtnSize, rBitmap.GetBitmap()); + rRenderContext.DrawBitmap(aPtRT - aToCenter, aDstBtnSize, aBtnPnt3, aBtnSize, rBitmap.GetBitmap()); + rRenderContext.DrawBitmap(aPtLM - aToCenter, aDstBtnSize, aBtnPnt3, aBtnSize, rBitmap.GetBitmap()); + rRenderContext.DrawBitmap(aPtMM - aToCenter, aDstBtnSize, aBtnPnt3, aBtnSize, rBitmap.GetBitmap()); + rRenderContext.DrawBitmap(aPtRM - aToCenter, aDstBtnSize, aBtnPnt3, aBtnSize, rBitmap.GetBitmap()); + rRenderContext.DrawBitmap(aPtLB - aToCenter, aDstBtnSize, aBtnPnt3, aBtnSize, rBitmap.GetBitmap()); + rRenderContext.DrawBitmap(aPtMB - aToCenter, aDstBtnSize, aBtnPnt3, aBtnSize, rBitmap.GetBitmap()); + rRenderContext.DrawBitmap(aPtRB - aToCenter, aDstBtnSize, aBtnPnt3, aBtnSize, rBitmap.GetBitmap()); } else { - rRenderContext.DrawBitmap(aPtLT - aToCenter, aDstBtnSize, (bNoHorz || bNoVert)?aBtnPnt3:aBtnPnt1, aBtnSize, rBitmap); - rRenderContext.DrawBitmap(aPtMT - aToCenter, aDstBtnSize, bNoVert?aBtnPnt3:aBtnPnt1, aBtnSize, rBitmap); - rRenderContext.DrawBitmap(aPtRT - aToCenter, aDstBtnSize, (bNoHorz || bNoVert)?aBtnPnt3:aBtnPnt1, aBtnSize, rBitmap); - rRenderContext.DrawBitmap(aPtLM - aToCenter, aDstBtnSize, bNoHorz?aBtnPnt3:aBtnPnt1, aBtnSize, rBitmap); + rRenderContext.DrawBitmap(aPtLT - aToCenter, aDstBtnSize, (bNoHorz || bNoVert)?aBtnPnt3:aBtnPnt1, aBtnSize, rBitmap.GetBitmap()); + rRenderContext.DrawBitmap(aPtMT - aToCenter, aDstBtnSize, bNoVert?aBtnPnt3:aBtnPnt1, aBtnSize, rBitmap.GetBitmap()); + rRenderContext.DrawBitmap(aPtRT - aToCenter, aDstBtnSize, (bNoHorz || bNoVert)?aBtnPnt3:aBtnPnt1, aBtnSize, rBitmap.GetBitmap()); + rRenderContext.DrawBitmap(aPtLM - aToCenter, aDstBtnSize, bNoHorz?aBtnPnt3:aBtnPnt1, aBtnSize, rBitmap.GetBitmap()); // Center for rectangle and line - rRenderContext.DrawBitmap(aPtMM - aToCenter, aDstBtnSize, aBtnPnt1, aBtnSize, rBitmap); + rRenderContext.DrawBitmap(aPtMM - aToCenter, aDstBtnSize, aBtnPnt1, aBtnSize, rBitmap.GetBitmap()); - rRenderContext.DrawBitmap(aPtRM - aToCenter, aDstBtnSize, bNoHorz?aBtnPnt3:aBtnPnt1, aBtnSize, rBitmap); - rRenderContext.DrawBitmap(aPtLB - aToCenter, aDstBtnSize, (bNoHorz || bNoVert)?aBtnPnt3:aBtnPnt1, aBtnSize, rBitmap); - rRenderContext.DrawBitmap(aPtMB - aToCenter, aDstBtnSize, bNoVert?aBtnPnt3:aBtnPnt1, aBtnSize, rBitmap); - rRenderContext.DrawBitmap(aPtRB - aToCenter, aDstBtnSize, (bNoHorz || bNoVert)?aBtnPnt3:aBtnPnt1, aBtnSize, rBitmap); + rRenderContext.DrawBitmap(aPtRM - aToCenter, aDstBtnSize, bNoHorz?aBtnPnt3:aBtnPnt1, aBtnSize, rBitmap.GetBitmap()); + rRenderContext.DrawBitmap(aPtLB - aToCenter, aDstBtnSize, (bNoHorz || bNoVert)?aBtnPnt3:aBtnPnt1, aBtnSize, rBitmap.GetBitmap()); + rRenderContext.DrawBitmap(aPtMB - aToCenter, aDstBtnSize, bNoVert?aBtnPnt3:aBtnPnt1, aBtnSize, rBitmap.GetBitmap()); + rRenderContext.DrawBitmap(aPtRB - aToCenter, aDstBtnSize, (bNoHorz || bNoVert)?aBtnPnt3:aBtnPnt1, aBtnSize, rBitmap.GetBitmap()); } // draw active button, avoid center pos for angle @@ -435,7 +435,7 @@ void SvxRectCtl::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangl Point aCenterPt(aPtNew); aCenterPt -= aToCenter; - rRenderContext.DrawBitmap(aCenterPt, aDstBtnSize, aBtnPnt2, aBtnSize, rBitmap); + rRenderContext.DrawBitmap(aCenterPt, aDstBtnSize, aBtnPnt2, aBtnSize, rBitmap.GetBitmap()); } } } diff --git a/svx/source/dialog/dlgctrl.src b/svx/source/dialog/dlgctrl.src index b391a36ef6b0..20e8d3ecec6a 100644 --- a/svx/source/dialog/dlgctrl.src +++ b/svx/source/dialog/dlgctrl.src @@ -19,10 +19,6 @@ #include <svx/dialogs.hrc> -Bitmap RID_SVXCTRL_RECTBTNS -{ - File = "rectbtns.bmp" ; -}; String STR_SWITCH { Text [ en-US ] = "Switch" ; diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index 7d48d705438d..90fd4805b660 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -23,6 +23,7 @@ #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> +#include "bitmaps.hlst" #include "docrecovery.hxx" #include <comphelper/processfactory.hxx> @@ -803,9 +804,9 @@ void RecovDocListEntry::Paint(const Point& aPos, SvTreeListBox& aDevice, vcl::Re RecovDocList::RecovDocList(SvSimpleTableContainer& rParent, ResMgr &rResMgr) : SvSimpleTable ( rParent ) - , m_aGreenCheckImg (BitmapEx(ResId(RID_SVXBMP_GREENCHECK, rResMgr))) - , m_aYellowCheckImg (BitmapEx(ResId(RID_SVXBMP_YELLOWCHECK, rResMgr))) - , m_aRedCrossImg (BitmapEx(ResId(RID_SVXBMP_REDCROSS, rResMgr))) + , m_aGreenCheckImg (BitmapEx(RID_SVXBMP_GREENCHECK)) + , m_aYellowCheckImg (BitmapEx(RID_SVXBMP_YELLOWCHECK)) + , m_aRedCrossImg (BitmapEx(RID_SVXBMP_REDCROSS)) , m_aSuccessRecovStr ( ResId(RID_SVXSTR_SUCCESSRECOV, rResMgr ) ) , m_aOrigDocRecovStr ( ResId(RID_SVXSTR_ORIGDOCRECOV, rResMgr ) ) , m_aRecovFailedStr ( ResId(RID_SVXSTR_RECOVFAILED, rResMgr ) ) diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx index 16b37123dbdb..d86fe1f4d88b 100644 --- a/svx/source/dialog/fontwork.cxx +++ b/svx/source/dialog/fontwork.cxx @@ -31,6 +31,7 @@ #include "svx/dlgutil.hxx" #include <svx/dialogs.hrc> +#include "bitmaps.hlst" #include <svx/fontwork.hxx> #include <editeng/outlobj.hxx> #include <basegfx/polygon/b2dpolygon.hxx> @@ -803,13 +804,13 @@ void SvxFontWorkDialog::ApplyImageList() { if (nLastShadowTbxId == nShadowSlantId) { - m_pFbShadowX->SetImage(Image(BitmapEx(SVX_RES(RID_SVXBMP_SHADOW_ANGLE)))); - m_pFbShadowY->SetImage(Image(BitmapEx(SVX_RES(RID_SVXBMP_SHADOW_SIZE)))); + m_pFbShadowX->SetImage(Image(BitmapEx(RID_SVXBMP_SHADOW_ANGLE))); + m_pFbShadowY->SetImage(Image(BitmapEx(RID_SVXBMP_SHADOW_SIZE))); } else { - m_pFbShadowX->SetImage(Image(BitmapEx(SVX_RES(RID_SVXBMP_SHADOW_XDIST)))); - m_pFbShadowY->SetImage(Image(BitmapEx(SVX_RES(RID_SVXBMP_SHADOW_YDIST)))); + m_pFbShadowX->SetImage(Image(BitmapEx(RID_SVXBMP_SHADOW_XDIST))); + m_pFbShadowY->SetImage(Image(BitmapEx(RID_SVXBMP_SHADOW_YDIST))); } } diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx index 0a281acc2c07..c2bdd0c6d655 100644 --- a/svx/source/dialog/frmsel.cxx +++ b/svx/source/dialog/frmsel.cxx @@ -30,6 +30,7 @@ #include <vcl/settings.hxx> #include <svx/dialogs.hrc> +#include "bitmaps.hlst" #include <tools/rcid.h> @@ -300,7 +301,7 @@ void FrameSelectorImpl::InitColors() maHCLineCol = rSettings.GetLabelTextColor(); } -static const sal_uInt16 aImageIds[] = +static const OUStringLiteral aImageIds[] = { RID_SVXBMP_FRMSEL_ARROW1, RID_SVXBMP_FRMSEL_ARROW2, @@ -337,7 +338,7 @@ void FrameSelectorImpl::InitArrowImageList() assert(SAL_N_ELEMENTS(aImageIds) == 16); for (size_t i = 0; i < SAL_N_ELEMENTS(aImageIds); ++i) { - BitmapEx aBmpEx(SVX_RES(aImageIds[i])); + BitmapEx aBmpEx(aImageIds[i]); aBmpEx.Replace(pColorAry1, pColorAry2, 3); maArrows.push_back(Image(aBmpEx)); } diff --git a/svx/source/dialog/frmsel.src b/svx/source/dialog/frmsel.src index ea5526776b12..5b5541399ff5 100644 --- a/svx/source/dialog/frmsel.src +++ b/svx/source/dialog/frmsel.src @@ -51,84 +51,4 @@ StringArray RID_SVXSTR_FRMSEL_DESCRIPTIONS }; }; -Bitmap RID_SVXBMP_FRMSEL_ARROW1 -{ - File = "frmsel1.png"; -}; - -Bitmap RID_SVXBMP_FRMSEL_ARROW2 -{ - File = "frmsel2.png"; -}; - -Bitmap RID_SVXBMP_FRMSEL_ARROW3 -{ - File = "frmsel3.png"; -}; - -Bitmap RID_SVXBMP_FRMSEL_ARROW4 -{ - File = "frmsel4.png"; -}; - -Bitmap RID_SVXBMP_FRMSEL_ARROW5 -{ - File = "frmsel5.png"; -}; - -Bitmap RID_SVXBMP_FRMSEL_ARROW6 -{ - File = "frmsel6.png"; -}; - -Bitmap RID_SVXBMP_FRMSEL_ARROW7 -{ - File = "frmsel7.png"; -}; - -Bitmap RID_SVXBMP_FRMSEL_ARROW8 -{ - File = "frmsel8.png"; -}; - -Bitmap RID_SVXBMP_FRMSEL_ARROW9 -{ - File = "frmsel9.png"; -}; - -Bitmap RID_SVXBMP_FRMSEL_ARROW10 -{ - File = "frmsel10.png"; -}; - -Bitmap RID_SVXBMP_FRMSEL_ARROW11 -{ - File = "frmsel11.png"; -}; - -Bitmap RID_SVXBMP_FRMSEL_ARROW12 -{ - File = "frmsel12.png"; -}; - -Bitmap RID_SVXBMP_FRMSEL_ARROW13 -{ - File = "frmsel13.png"; -}; - -Bitmap RID_SVXBMP_FRMSEL_ARROW14 -{ - File = "frmsel14.png"; -}; - -Bitmap RID_SVXBMP_FRMSEL_ARROW15 -{ - File = "frmsel15.png"; -}; - -Bitmap RID_SVXBMP_FRMSEL_ARROW16 -{ - File = "frmsel16.png"; -}; - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index d4fe8611f1b3..b6bd8a1422b4 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -31,6 +31,7 @@ #include <svx/langbox.hxx> #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> +#include "bitmaps.hlst" #include <vcl/builderfactory.hxx> #include <vcl/i18nhelp.hxx> @@ -146,8 +147,8 @@ SvxLanguageBoxBase::SvxLanguageBoxBase() void SvxLanguageBoxBase::ImplLanguageBoxBaseInit() { - m_aNotCheckedImage = Image(BitmapEx(SVX_RES(RID_SVXBMP_NOTCHECKED))); - m_aCheckedImage = Image(BitmapEx(SVX_RES(RID_SVXBMP_CHECKED))); + m_aNotCheckedImage = Image(BitmapEx(RID_SVXBMP_NOTCHECKED)); + m_aCheckedImage = Image(BitmapEx(RID_SVXBMP_CHECKED)); m_aAllString = SVX_RESSTR( RID_SVXSTR_LANGUAGE_ALL ); m_nLangList = SvxLanguageListFlags::EMPTY; m_bHasLangNone = false; diff --git a/svx/source/dialog/langbox.src b/svx/source/dialog/langbox.src deleted file mode 100644 index 133dc1f557d2..000000000000 --- a/svx/source/dialog/langbox.src +++ /dev/null @@ -1,32 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <svx/dialogs.hrc> - -Bitmap RID_SVXBMP_NOTCHECKED -{ - File = "notcheck.png"; -}; - -Bitmap RID_SVXBMP_CHECKED -{ - File = "lngcheck.png"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/sdstring.src b/svx/source/dialog/sdstring.src index 4c9547385269..2142f7840d75 100644 --- a/svx/source/dialog/sdstring.src +++ b/svx/source/dialog/sdstring.src @@ -2235,41 +2235,6 @@ String RID_SVXSTR_GALLERY_PREVIEW Text [ en-US ] = "Preview"; }; -Bitmap RID_SVXBMP_GREENCHECK -{ - File = "nu01.png"; -}; - -Bitmap RID_SVXBMP_YELLOWCHECK -{ - File = "nu04.png"; -}; - -Bitmap RID_SVXBMP_REDCROSS -{ - File = "nu02.png"; -}; - -Bitmap RID_SVXBMP_SHADOW_ANGLE -{ - File = "fw018.png"; -}; - -Bitmap RID_SVXBMP_SHADOW_SIZE -{ - File = "fw019.png"; -}; - -Bitmap RID_SVXBMP_SHADOW_XDIST -{ - File = "fw016.png"; -}; - -Bitmap RID_SVXBMP_SHADOW_YDIST -{ - File = "fw017.png"; -}; - String RID_SVXSTR_SUCCESSRECOV { Text[ en-US ] = "Successfully recovered"; diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index 7b239d7f16f6..a5e285ee1416 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -52,6 +52,7 @@ #include <svx/float3d.hxx> #include "float3d.hrc" +#include "bitmaps.hlst" using namespace com::sun::star; @@ -86,8 +87,8 @@ namespace { Svx3DWin::Svx3DWin(SfxBindings* pInBindings, SfxChildWindow *pCW, vcl::Window* pParent) : SfxDockingWindow (pInBindings, pCW, pParent, "Docking3DEffects", "svx/ui/docking3deffects.ui") - , aImgLightOn(BitmapEx(SVX_RES(RID_SVXBMP_LAMP_ON))) - , aImgLightOff(BitmapEx(SVX_RES(RID_SVXBMP_LAMP_OFF))) + , aImgLightOn(BitmapEx(RID_SVXBMP_LAMP_ON)) + , aImgLightOff(BitmapEx(RID_SVXBMP_LAMP_OFF)) , bUpdate(false) , eViewType(ViewType3D::Geo) , pModel(nullptr) diff --git a/svx/source/engine3d/float3d.src b/svx/source/engine3d/float3d.src index 8c15a5a45b93..f8d12a88f99e 100644 --- a/svx/source/engine3d/float3d.src +++ b/svx/source/engine3d/float3d.src @@ -21,16 +21,6 @@ #include "float3d.hrc" #include <svx/svxcommands.h> -Bitmap RID_SVXBMP_LAMP_ON -{ - File = "lighton.png"; -}; - -Bitmap RID_SVXBMP_LAMP_OFF -{ - File = "light.bmp"; -}; - String RID_SVXFLOAT3D_FAVORITE { Text [ en-US ] = "Favorite"; diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index a58ce67209a4..cd52829e1bcb 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -33,6 +33,7 @@ #include "svx/fmgridcl.hxx" #include "svx/svxdlg.hxx" #include "svx/svxids.hrc" +#include "bitmaps.hlst" #include <com/sun/star/form/XConfirmDeleteListener.hpp> #include <com/sun/star/form/XFormComponent.hpp> @@ -97,9 +98,10 @@ struct FmGridHeaderData Reference< XInterface > xDroppedResultSet; }; -void SetMenuItem(sal_uInt16 nImgID, const OString &rID, Menu& rMenu, bool bDesignMode) +void SetMenuItem(const OUString& rImgID, const OString &rID, Menu& rMenu, bool bDesignMode) { - Image aImage(BitmapEx(SVX_RES(nImgID))); + BitmapEx aBitmap(rImgID); + Image aImage(aBitmap); sal_uInt16 nID = rMenu.GetItemId(rID); rMenu.SetItemImage(nID, aImage); rMenu.EnableItem(nID, bDesignMode); @@ -413,7 +415,7 @@ IMPL_LINK_NOARG( FmGridHeader, OnAsyncExecuteDrop, void*, void ) // Create Column based on type, default textfield std::vector<OString> aPossibleTypes; - std::vector<sal_uInt16> aImgResId; + std::vector<OUString> aImgResId; switch (nDataType) { case DataType::BIT: @@ -498,7 +500,7 @@ IMPL_LINK_NOARG( FmGridHeader, OnAsyncExecuteDrop, void*, void ) PopupMenu* pTypeMenu = aInsertMenu->GetPopupMenu(aInsertMenu->GetItemId("insert")); pTypeMenu->ShowItem(pTypeMenu->GetItemId("dateandtimefield")); std::vector<OString>::const_iterator iter; - std::vector<sal_uInt16>::const_iterator imgiter; + std::vector<OUString>::const_iterator imgiter; for (iter = aPossibleTypes.begin(), imgiter = aImgResId.begin(); iter != aPossibleTypes.end(); ++iter, ++imgiter) { diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index fffdcba33636..7862c8f1ea5b 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -26,6 +26,7 @@ #include "fmservs.hxx" #include "fmhelp.hrc" +#include "bitmaps.hlst" #include <svx/svxids.hrc> #include <tools/rcid.h> #include <tools/diagnose_ex.h> @@ -344,11 +345,11 @@ namespace svxform m_pItemList->SetToolBoxItemIds(m_nAddId, m_nAddElementId, m_nAddAttributeId, m_nEditId, m_nRemoveId); m_pToolBox->InsertSeparator(4,5); - m_pToolBox->SetItemImage(m_nAddId, Image(BitmapEx(SVX_RES(RID_SVXBMP_ADD)))); - m_pToolBox->SetItemImage(m_nAddElementId, Image(BitmapEx(SVX_RES(RID_SVXBMP_ADD_ELEMENT)))); - m_pToolBox->SetItemImage(m_nAddAttributeId, Image(BitmapEx(SVX_RES(RID_SVXBMP_ADD_ATTRIBUTE)))); - m_pToolBox->SetItemImage(m_nEditId, Image(BitmapEx(SVX_RES(RID_SVXBMP_EDIT)))); - m_pToolBox->SetItemImage(m_nRemoveId, Image(BitmapEx(SVX_RES(RID_SVXBMP_REMOVE)))); + m_pToolBox->SetItemImage(m_nAddId, Image(BitmapEx(RID_SVXBMP_ADD))); + m_pToolBox->SetItemImage(m_nAddElementId, Image(BitmapEx(RID_SVXBMP_ADD_ELEMENT))); + m_pToolBox->SetItemImage(m_nAddAttributeId, Image(BitmapEx(RID_SVXBMP_ADD_ATTRIBUTE))); + m_pToolBox->SetItemImage(m_nEditId, Image(BitmapEx(RID_SVXBMP_EDIT))); + m_pToolBox->SetItemImage(m_nRemoveId, Image(BitmapEx(RID_SVXBMP_REMOVE))); if ( DGTInstance == m_eGroup ) m_pToolBox->RemoveItem( m_pToolBox->GetItemPos( m_nAddId ) ); @@ -432,16 +433,16 @@ namespace svxform switch ( eChildType ) { case css::xml::dom::NodeType_ATTRIBUTE_NODE: - aExpImg = aCollImg = Image(BitmapEx(SVX_RES(RID_SVXBMP_ATTRIBUTE))); + aExpImg = aCollImg = Image(BitmapEx(RID_SVXBMP_ATTRIBUTE)); break; case css::xml::dom::NodeType_ELEMENT_NODE: - aExpImg = aCollImg = Image(BitmapEx(SVX_RES(RID_SVXBMP_ELEMENT))); + aExpImg = aCollImg = Image(BitmapEx(RID_SVXBMP_ELEMENT)); break; case css::xml::dom::NodeType_TEXT_NODE: - aExpImg = aCollImg = Image(BitmapEx(SVX_RES(RID_SVXBMP_TEXT))); + aExpImg = aCollImg = Image(BitmapEx(RID_SVXBMP_TEXT)); break; default: - aExpImg = aCollImg = Image(BitmapEx(SVX_RES(RID_SVXBMP_OTHER))); + aExpImg = aCollImg = Image(BitmapEx(RID_SVXBMP_OTHER)); } OUString sName = m_xUIHelper->getNodeDisplayName( xChild, bShowDetails ); @@ -455,7 +456,7 @@ namespace svxform Reference< css::xml::dom::XNamedNodeMap > xMap = xChild->getAttributes(); if ( xMap.is() ) { - aExpImg = aCollImg = Image(BitmapEx(SVX_RES(RID_SVXBMP_ATTRIBUTE))); + aExpImg = aCollImg = Image(BitmapEx(RID_SVXBMP_ATTRIBUTE)); sal_Int32 j, nMapLen = xMap->getLength(); for ( j = 0; j < nMapLen; ++j ) { @@ -796,7 +797,7 @@ namespace svxform SvTreeListEntry* XFormsPage::AddEntry( ItemNode* _pNewNode, bool _bIsElement ) { SvTreeListEntry* pParent = m_pItemList->FirstSelected(); - Image aImage(BitmapEx(SVX_RES(_bIsElement ? RID_SVXBMP_ELEMENT : RID_SVXBMP_ATTRIBUTE))); + Image aImage(BitmapEx(_bIsElement ? OUString(RID_SVXBMP_ELEMENT) : OUString(RID_SVXBMP_ATTRIBUTE))); OUString sName; try { @@ -814,7 +815,7 @@ namespace svxform SvTreeListEntry* XFormsPage::AddEntry( const Reference< XPropertySet >& _rEntry ) { SvTreeListEntry* pEntry = nullptr; - Image aImage(BitmapEx(SVX_RES(RID_SVXBMP_ELEMENT))); + Image aImage(BitmapEx(RID_SVXBMP_ELEMENT)); ItemNode* pNode = new ItemNode( _rEntry ); OUString sTemp; @@ -1163,7 +1164,7 @@ namespace svxform Reference < XEnumeration > xNum = xNumAccess->createEnumeration(); if ( xNum.is() && xNum->hasMoreElements() ) { - Image aImage(BitmapEx(SVX_RES(RID_SVXBMP_ELEMENT))); + Image aImage(BitmapEx(RID_SVXBMP_ELEMENT)); OUString sDelim( ": " ); while ( xNum->hasMoreElements() ) { diff --git a/svx/source/form/datanavi.src b/svx/source/form/datanavi.src index 429b48fc38e2..cca33a4c7bf1 100644 --- a/svx/source/form/datanavi.src +++ b/svx/source/form/datanavi.src @@ -21,51 +21,6 @@ #include "svx/fmresids.hrc" #include "fmhelp.hrc" -Bitmap RID_SVXBMP_ADD -{ - File = "tb01.png"; -}; - -Bitmap RID_SVXBMP_ADD_ELEMENT -{ - File = "tb02.png"; -}; - -Bitmap RID_SVXBMP_ADD_ATTRIBUTE -{ - File = "tb03.png"; -}; - -Bitmap RID_SVXBMP_EDIT -{ - File = "tb04.png"; -}; - -Bitmap RID_SVXBMP_REMOVE -{ - File = "tb05.png"; -}; - -Bitmap RID_SVXBMP_ELEMENT -{ - File = "da03.png"; -}; - -Bitmap RID_SVXBMP_ATTRIBUTE -{ - File = "da04.png"; -}; - -Bitmap RID_SVXBMP_TEXT -{ - File = "da05.png"; -}; - -Bitmap RID_SVXBMP_OTHER -{ - File = "da06.png"; -}; - String RID_STR_QRY_REMOVE_MODEL { Text [ en-US ] = "Deleting the model '$MODELNAME' affects all controls currently bound to this model.\nDo you really want to delete this model?" ; diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 85b2a11184d0..d0953d49ed5d 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -57,6 +57,8 @@ #include "svtools/treelistentry.hxx" #include "svtools/viewdataentry.hxx" +#include "bitmaps.hlst" + #include <functional> #define DROP_ACTION_TIMER_INITIAL_TICKS 10 @@ -145,7 +147,7 @@ FmParentData::~FmParentData() Image FmFormItem::GetImage() const { - return Image(BitmapEx(SVX_RES(RID_SVXBMP_FORM))); + return Image(BitmapEx(RID_SVXBMP_FORM)); } FmFilterItem* FmFilterItems::Find( const ::sal_Int32 _nFilterComponentIndex ) const @@ -165,7 +167,7 @@ FmFilterItem* FmFilterItems::Find( const ::sal_Int32 _nFilterComponentIndex ) co Image FmFilterItems::GetImage() const { - return Image(BitmapEx(SVX_RES(RID_SVXBMP_FILTER))); + return Image(BitmapEx(RID_SVXBMP_FILTER)); } FmFilterItem::FmFilterItem( FmFilterItems* pParent, @@ -180,7 +182,7 @@ FmFilterItem::FmFilterItem( FmFilterItems* pParent, Image FmFilterItem::GetImage() const { - return Image(BitmapEx(SVX_RES(RID_SVXBMP_FIELD))); + return Image(BitmapEx(RID_SVXBMP_FIELD)); } // Hints for communication between model and view @@ -1083,8 +1085,8 @@ FmFilterNavigator::FmFilterNavigator( vcl::Window* pParent ) SetHelpId( HID_FILTER_NAVIGATOR ); SetNodeBitmaps( - Image(BitmapEx(SVX_RES(RID_SVXBMP_COLLAPSEDNODE))), - Image(BitmapEx(SVX_RES(RID_SVXBMP_EXPANDEDNODE))) + Image(BitmapEx(RID_SVXBMP_COLLAPSEDNODE)), + Image(BitmapEx(RID_SVXBMP_EXPANDEDNODE)) ); m_pModel = new FmFilterModel(); @@ -1951,5 +1953,4 @@ FmFilterNavigatorWinMgr::FmFilterNavigatorWinMgr( vcl::Window *_pParent, sal_uIn } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx index f079bfdc46b6..95363b05ce84 100644 --- a/svx/source/form/fmexpl.cxx +++ b/svx/source/form/fmexpl.cxx @@ -32,6 +32,7 @@ #include <svx/svxids.hrc> #include "fmprop.hrc" +#include "bitmaps.hlst" #include <svx/dialmgr.hxx> #include "svx/svditer.hxx" #include <svx/svdouno.hxx> @@ -253,7 +254,7 @@ FmFormData::FmFormData(const Reference< XForm >& _rxForm, FmFormData* _pParent) , m_xForm(_rxForm) { // Images setzen - m_aNormalImage = Image(BitmapEx(SVX_RES(RID_SVXBMP_FORM))); + m_aNormalImage = Image(RID_SVXBMP_FORM); // Titel setzen if (m_xForm.is()) @@ -338,7 +339,7 @@ FmEntryData* FmControlData::Clone() Image FmControlData::GetImage() const { // Default-Image - Image aImage(BitmapEx(SVX_RES(RID_SVXBMP_CONTROL))); + Image aImage(BitmapEx(RID_SVXBMP_CONTROL)); Reference< XServiceInfo > xInfo( m_xFormComponent, UNO_QUERY ); if (!m_xFormComponent.is()) @@ -350,91 +351,91 @@ Image FmControlData::GetImage() const switch (nObjectType) { case OBJ_FM_BUTTON: - aImage = Image(BitmapEx(SVX_RES(RID_SVXBMP_BUTTON))); + aImage = Image(BitmapEx(RID_SVXBMP_BUTTON)); break; case OBJ_FM_FIXEDTEXT: - aImage = Image(BitmapEx(SVX_RES(RID_SVXBMP_FIXEDTEXT))); + aImage = Image(BitmapEx(RID_SVXBMP_FIXEDTEXT)); break; case OBJ_FM_EDIT: - aImage = Image(BitmapEx(SVX_RES(RID_SVXBMP_EDITBOX))); + aImage = Image(BitmapEx(RID_SVXBMP_EDITBOX)); break; case OBJ_FM_RADIOBUTTON: - aImage = Image(BitmapEx(SVX_RES(RID_SVXBMP_RADIOBUTTON))); + aImage = Image(BitmapEx(RID_SVXBMP_RADIOBUTTON)); break; case OBJ_FM_CHECKBOX: - aImage = Image(BitmapEx(SVX_RES(RID_SVXBMP_CHECKBOX))); + aImage = Image(BitmapEx(RID_SVXBMP_CHECKBOX)); break; case OBJ_FM_LISTBOX: - aImage = Image(BitmapEx(SVX_RES(RID_SVXBMP_LISTBOX))); + aImage = Image(BitmapEx(RID_SVXBMP_LISTBOX)); break; case OBJ_FM_COMBOBOX: - aImage = Image(BitmapEx(SVX_RES(RID_SVXBMP_COMBOBOX))); + aImage = Image(BitmapEx(RID_SVXBMP_COMBOBOX)); break; case OBJ_FM_NAVIGATIONBAR: - aImage = Image(BitmapEx(SVX_RES(RID_SVXBMP_NAVIGATIONBAR))); + aImage = Image(BitmapEx(RID_SVXBMP_NAVIGATIONBAR)); break; case OBJ_FM_GROUPBOX: - aImage = Image(BitmapEx(SVX_RES(RID_SVXBMP_GROUPBOX))); + aImage = Image(BitmapEx(RID_SVXBMP_GROUPBOX)); break; case OBJ_FM_IMAGEBUTTON: - aImage = Image(BitmapEx(SVX_RES(RID_SVXBMP_IMAGEBUTTON))); + aImage = Image(BitmapEx(RID_SVXBMP_IMAGEBUTTON)); break; case OBJ_FM_FILECONTROL: - aImage = Image(BitmapEx(SVX_RES(RID_SVXBMP_FILECONTROL))); + aImage = Image(BitmapEx(RID_SVXBMP_FILECONTROL)); break; case OBJ_FM_HIDDEN: - aImage = Image(BitmapEx(SVX_RES(RID_SVXBMP_HIDDEN))); + aImage = Image(BitmapEx(RID_SVXBMP_HIDDEN)); break; case OBJ_FM_DATEFIELD: - aImage = Image(BitmapEx(SVX_RES(RID_SVXBMP_DATEFIELD))); + aImage = Image(BitmapEx(RID_SVXBMP_DATEFIELD)); break; case OBJ_FM_TIMEFIELD: - aImage = Image(BitmapEx(SVX_RES(RID_SVXBMP_TIMEFIELD))); + aImage = Image(BitmapEx(RID_SVXBMP_TIMEFIELD)); break; case OBJ_FM_NUMERICFIELD: - aImage = Image(BitmapEx(SVX_RES(RID_SVXBMP_NUMERICFIELD))); + aImage = Image(BitmapEx(RID_SVXBMP_NUMERICFIELD)); break; case OBJ_FM_CURRENCYFIELD: - aImage = Image(BitmapEx(SVX_RES(RID_SVXBMP_CURRENCYFIELD))); + aImage = Image(BitmapEx(RID_SVXBMP_CURRENCYFIELD)); break; case OBJ_FM_PATTERNFIELD: - aImage = Image(BitmapEx(SVX_RES(RID_SVXBMP_PATTERNFIELD))); + aImage = Image(BitmapEx(RID_SVXBMP_PATTERNFIELD)); break; case OBJ_FM_IMAGECONTROL: - aImage = Image(BitmapEx(SVX_RES(RID_SVXBMP_IMAGECONTROL))); + aImage = Image(BitmapEx(RID_SVXBMP_IMAGECONTROL)); break; case OBJ_FM_FORMATTEDFIELD: - aImage = Image(BitmapEx(SVX_RES(RID_SVXBMP_FORMATTEDFIELD))); + aImage = Image(BitmapEx(RID_SVXBMP_FORMATTEDFIELD)); break; case OBJ_FM_GRID: - aImage = Image(BitmapEx(SVX_RES(RID_SVXBMP_GRID))); + aImage = Image(BitmapEx(RID_SVXBMP_GRID)); break; case OBJ_FM_SCROLLBAR: - aImage = Image(BitmapEx(SVX_RES(RID_SVXBMP_SCROLLBAR))); + aImage = Image(BitmapEx(RID_SVXBMP_SCROLLBAR)); break; case OBJ_FM_SPINBUTTON: - aImage = Image(BitmapEx(SVX_RES(RID_SVXBMP_SPINBUTTON))); + aImage = Image(BitmapEx(RID_SVXBMP_SPINBUTTON)); break; } diff --git a/svx/source/form/fmexpl.src b/svx/source/form/fmexpl.src deleted file mode 100644 index 2513a80eda60..000000000000 --- a/svx/source/form/fmexpl.src +++ /dev/null @@ -1,175 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <svx/svxids.hrc> -#include "svx/fmresids.hrc" -#include <svx/svxcommands.h> -#include "fmhelp.hrc" - -Bitmap RID_SVXBMP_FORM -{ - File = "sx10593.png"; -}; - -Bitmap RID_SVXBMP_CONTROL -{ - File = "sx10144.png"; -}; - -Bitmap RID_SVXBMP_COLLAPSEDNODE -{ - File = "sx18002.png"; -}; - -Bitmap RID_SVXBMP_EXPANDEDNODE -{ - File = "sx18003.png"; -}; - -Bitmap RID_SVXBMP_BUTTON -{ - File = "sx10594.png"; -}; - -Bitmap RID_SVXBMP_RADIOBUTTON -{ - File = "sx10595.png"; -}; - -Bitmap RID_SVXBMP_CHECKBOX -{ - File = "sx10596.png"; -}; - -Bitmap RID_SVXBMP_FIXEDTEXT -{ - File = "sx10597.png"; -}; - -Bitmap RID_SVXBMP_GROUPBOX -{ - File = "sx10598.png"; -}; - -Bitmap RID_SVXBMP_EDITBOX -{ - File = "sx10599.png"; -}; - -Bitmap RID_SVXBMP_LISTBOX -{ - File = "sx10600.png"; -}; - -Bitmap RID_SVXBMP_COMBOBOX -{ - File = "sx10600.png"; -}; - -Bitmap RID_SVXBMP_FORMS -{ - File = "sx18013.png"; -}; - -Bitmap RID_SVXBMP_IMAGEBUTTON -{ - File = "sx10604.png"; -}; - -Bitmap RID_SVXBMP_IMAGECONTROL -{ - File = "sx10710.png"; -}; - -Bitmap RID_SVXBMP_FILECONTROL -{ - File = "sx10605.png"; -}; - -Bitmap RID_SVXBMP_DATEFIELD -{ - File = "sx10704.png"; -}; - -Bitmap RID_SVXBMP_TIMEFIELD -{ - File = "sx10705.png"; -}; - -Bitmap RID_SVXBMP_NUMERICFIELD -{ - File = "sx10706.png"; -}; - -Bitmap RID_SVXBMP_CURRENCYFIELD -{ - File = "sx10707.png"; -}; - -Bitmap RID_SVXBMP_PATTERNFIELD -{ - File = "sx10708.png"; -}; - -Bitmap RID_SVXBMP_HIDDEN -{ - File = "sx18022.png"; -}; - -Bitmap RID_SVXBMP_GRID -{ - File = "sx10603.png"; -}; - -Bitmap RID_SVXBMP_FORMATTEDFIELD -{ - File = "sx10728.png"; -}; - -Bitmap RID_SVXBMP_FILTER -{ - File = "sx10715.png"; -}; - -Bitmap RID_SVXBMP_DATE_N_TIME_FIELDS -{ - File = "sx10757.png"; -}; - -Bitmap RID_SVXBMP_FIELD -{ - File = "sx18027.png"; -}; - -Bitmap RID_SVXBMP_SCROLLBAR -{ - File = "sx10768.png"; -}; - -Bitmap RID_SVXBMP_SPINBUTTON -{ - File = "sx10769.png"; -}; - -Bitmap RID_SVXBMP_NAVIGATIONBAR -{ - File = "sx10607.png"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 358832f8f375..039be85edc82 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -45,6 +45,7 @@ #include "svx/svdpagv.hxx" #include "svx/svxdlg.hxx" #include "svx/svxids.hrc" +#include "bitmaps.hlst" #include <com/sun/star/awt/XWindow2.hpp> #include <com/sun/star/awt/XCheckBox.hpp> @@ -203,7 +204,7 @@ static const char* aConvertSlots[] = "ConvertToNavigationBar" }; -static const sal_Int16 nImgIds[] = +static const OUStringLiteral aImgIds[] = { RID_SVXBMP_EDITBOX, RID_SVXBMP_BUTTON, @@ -1035,7 +1036,7 @@ VclBuilder* FmXFormShell::GetConversionMenu() for (size_t i = 0; i < SAL_N_ELEMENTS(aConvertSlots); ++i) { // das entsprechende Image dran - pNewMenu->SetItemImage(pNewMenu->GetItemId(aConvertSlots[i]), Image(BitmapEx(SVX_RES(nImgIds[i])))); + pNewMenu->SetItemImage(pNewMenu->GetItemId(aConvertSlots[i]), Image(BitmapEx(aImgIds[i]))); } return pBuilder; } diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index be74e6ea1caf..d1983f657108 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -51,6 +51,7 @@ #include <svx/svxdlg.hxx> #include <svx/dialogs.hrc> +#include "bitmaps.hlst" #include "svtools/treelistentry.hxx" namespace svxform @@ -136,8 +137,8 @@ namespace svxform SetHelpId( HID_FORM_NAVIGATOR ); SetNodeBitmaps( - Image(BitmapEx(SVX_RES(RID_SVXBMP_COLLAPSEDNODE))), - Image(BitmapEx(SVX_RES(RID_SVXBMP_EXPANDEDNODE))) + Image(BitmapEx(RID_SVXBMP_COLLAPSEDNODE)), + Image(BitmapEx(RID_SVXBMP_EXPANDEDNODE)) ); SetDragDropMode(DragDropMode::ALL); @@ -370,12 +371,12 @@ namespace svxform // 'New'\'Form' under the same terms const sal_uInt16 nFormId = pSubMenuNew->GetItemId("form"); pSubMenuNew->EnableItem(nFormId, bSingleSelection && (m_nFormsSelected || m_bRootSelected)); - pSubMenuNew->SetItemImage(nFormId, Image(BitmapEx(SVX_RES(RID_SVXBMP_FORM)))); + pSubMenuNew->SetItemImage(nFormId, Image(BitmapEx(RID_SVXBMP_FORM))); // 'New'\'hidden...', if exactly one form is selected const sal_uInt16 nHiddenId = pSubMenuNew->GetItemId("hidden"); pSubMenuNew->EnableItem(nHiddenId, bSingleSelection && m_nFormsSelected); - pSubMenuNew->SetItemImage(nHiddenId, Image(BitmapEx(SVX_RES(RID_SVXBMP_HIDDEN)))); + pSubMenuNew->SetItemImage(nHiddenId, Image(BitmapEx(RID_SVXBMP_HIDDEN))); // 'Delete': everything which is not root can be removed aContextMenu->EnableItem(aContextMenu->GetItemId("delete"), !m_bRootSelected); @@ -583,7 +584,7 @@ namespace svxform SvTreeListBox::Clear(); // default-entry "Forms" - Image aRootImage(BitmapEx(SVX_RES(RID_SVXBMP_FORMS))); + Image aRootImage(BitmapEx(RID_SVXBMP_FORMS)); m_pRootEntry = InsertEntry( SVX_RESSTR(RID_STR_FORMS), aRootImage, aRootImage, nullptr, false, 0 ); } diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index 52135ea65540..93ee81d1b7a3 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -39,7 +39,7 @@ #include <svx/svxdlg.hxx> #include <memory> - +#include "bitmaps.hlst" using namespace ::com::sun::star; diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index a09b0436d9be..332e414ad3c0 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -48,6 +48,7 @@ #include <svx/svxdlg.hxx> #include <svx/dialogs.hrc> #include "GalleryControl.hxx" +#include "bitmaps.hlst" #include <svx/svxcommands.h> #include <svx/galleryitem.hxx> @@ -1266,8 +1267,8 @@ IMPL_LINK_NOARG(GalleryBrowser2, MiscHdl, LinkParamNone*, void) { maViewBox->SetOutStyle( maMiscOptions.GetToolboxStyle() ); - BitmapEx aIconBmpEx(GAL_RES(RID_SVXBMP_GALLERY_VIEW_ICON)); - BitmapEx aListBmpEx(GAL_RES(RID_SVXBMP_GALLERY_VIEW_LIST)); + BitmapEx aIconBmpEx(RID_SVXBMP_GALLERY_VIEW_ICON); + BitmapEx aListBmpEx(RID_SVXBMP_GALLERY_VIEW_LIST); if( maMiscOptions.AreCurrentSymbolsLarge() ) { diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx index 6260869d827b..ce43b484ad47 100644 --- a/svx/source/gallery2/galctrl.cxx +++ b/svx/source/gallery2/galctrl.cxx @@ -35,6 +35,7 @@ #include <vcl/graphicfilter.hxx> #include <vcl/settings.hxx> #include <vcl/builderfactory.hxx> +#include "bitmaps.hlst" #define GALLERY_BRWBOX_TITLE 1 @@ -61,7 +62,7 @@ bool GalleryPreview::SetGraphic( const INetURLObject& _aURL ) Graphic aGraphic; if( ::avmedia::MediaWindow::isMediaURL( _aURL.GetMainURL( INetURLObject::DecodeMechanism::Unambiguous ), "" ) ) { - aGraphic = BitmapEx( GAL_RES( RID_SVXBMP_GALLERY_MEDIA ) ); + aGraphic = BitmapEx(RID_SVXBMP_GALLERY_MEDIA); } else { diff --git a/svx/source/gallery2/gallery.src b/svx/source/gallery2/gallery.src index 304477076504..5c1275e898e8 100644 --- a/svx/source/gallery2/gallery.src +++ b/svx/source/gallery2/gallery.src @@ -46,69 +46,4 @@ String RID_SVXSTR_GALLERY_LISTVIEW Text [ en-US ] = "Detailed View"; }; -Bitmap RID_SVXBMP_THEME_NORMAL -{ - File = "galnors.png" ; -}; - -Bitmap RID_SVXBMP_THEME_READONLY -{ - File = "galrdos.png" ; -}; - -Bitmap RID_SVXBMP_THEME_DEFAULT -{ - File = "galdefs.png" ; -}; - -Bitmap RID_SVXBMP_GALLERY_MEDIA -{ - File = "galmedia.png"; -}; - -Bitmap RID_SVXBMP_GALLERY_SOUND_1 -{ - File = "galsnd1.png"; -}; - -Bitmap RID_SVXBMP_GALLERY_SOUND_2 -{ - File = "galsnd2.png"; -}; - -Bitmap RID_SVXBMP_GALLERY_SOUND_3 -{ - File = "galsnd3.png"; -}; - -Bitmap RID_SVXBMP_GALLERY_SOUND_4 -{ - File = "galsnd4.png"; -}; - -Bitmap RID_SVXBMP_GALLERY_SOUND_5 -{ - File = "galsnd5.png"; -}; - -Bitmap RID_SVXBMP_GALLERY_SOUND_6 -{ - File = "galsnd6.png"; -}; - -Bitmap RID_SVXBMP_GALLERY_SOUND_7 -{ - File = "galsnd7.png"; -}; - -Bitmap RID_SVXBMP_GALLERY_VIEW_ICON -{ - File = "galicon.png"; -}; - -Bitmap RID_SVXBMP_GALLERY_VIEW_LIST -{ - File = "gallist.png"; -}; - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index 5ad2f181f822..b06ff79c1dc0 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -66,12 +66,13 @@ ResMgr* GetGalleryResMgr() return pGalleryResMgr; } -BitmapEx GalleryResGetBitmapEx( sal_uInt32 nId ) +BitmapEx GalleryResGetBitmapEx(const OUString &rId) { - BitmapEx aBmpEx( GAL_RES( nId ) ); + BitmapEx aBmpEx(rId); - if( !aBmpEx.IsTransparent() ) - aBmpEx = BitmapEx( aBmpEx.GetBitmap(), COL_LIGHTMAGENTA ); + //TODO, check if any of these have no transparency layer + if (!aBmpEx.IsTransparent()) + aBmpEx = BitmapEx(aBmpEx.GetBitmap(), COL_LIGHTMAGENTA); return aBmpEx; } diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx index a8e1596122fd..5f829bd19dbf 100644 --- a/svx/source/gallery2/galobj.cxx +++ b/svx/source/gallery2/galobj.cxx @@ -41,6 +41,7 @@ #include <vcl/dibtools.hxx> #include "gallerydrawmodel.hxx" #include <memory> +#include "bitmaps.hlst" using namespace ::com::sun::star; @@ -58,7 +59,7 @@ BitmapEx SgaObject::createPreviewBitmapEx(const Size& rSizePixel) const { if(SgaObjKind::Sound == GetObjKind()) { - aRetval = GAL_RES(RID_SVXBMP_GALLERY_MEDIA); + aRetval = BitmapEx(RID_SVXBMP_GALLERY_MEDIA); } else if(IsThumbBitmap()) { @@ -340,25 +341,25 @@ SgaObjectSound::~SgaObjectSound() BitmapEx SgaObjectSound::GetThumbBmp() const { - sal_uInt16 nId; + OUString sId; switch( eSoundType ) { - case SOUND_COMPUTER: nId = RID_SVXBMP_GALLERY_SOUND_1; break; - case SOUND_MISC: nId = RID_SVXBMP_GALLERY_SOUND_2; break; - case SOUND_MUSIC: nId = RID_SVXBMP_GALLERY_SOUND_3; break; - case SOUND_NATURE: nId = RID_SVXBMP_GALLERY_SOUND_4; break; - case SOUND_SPEECH: nId = RID_SVXBMP_GALLERY_SOUND_5; break; - case SOUND_TECHNIC: nId = RID_SVXBMP_GALLERY_SOUND_6; break; - case SOUND_ANIMAL: nId = RID_SVXBMP_GALLERY_SOUND_7; break; + case SOUND_COMPUTER: sId = RID_SVXBMP_GALLERY_SOUND_1; break; + case SOUND_MISC: sId = RID_SVXBMP_GALLERY_SOUND_2; break; + case SOUND_MUSIC: sId = RID_SVXBMP_GALLERY_SOUND_3; break; + case SOUND_NATURE: sId = RID_SVXBMP_GALLERY_SOUND_4; break; + case SOUND_SPEECH: sId = RID_SVXBMP_GALLERY_SOUND_5; break; + case SOUND_TECHNIC: sId = RID_SVXBMP_GALLERY_SOUND_6; break; + case SOUND_ANIMAL: sId = RID_SVXBMP_GALLERY_SOUND_7; break; // standard default: - nId = RID_SVXBMP_GALLERY_MEDIA; + sId = RID_SVXBMP_GALLERY_MEDIA; break; } - const BitmapEx aBmpEx( GAL_RES( nId ) ); + const BitmapEx aBmpEx(sId); return aBmpEx; } diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx index 991a9b1667f8..02f711943a67 100644 --- a/svx/source/sdr/contact/viewcontactofgraphic.cxx +++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx @@ -46,6 +46,7 @@ #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> #include "eventhandler.hxx" +#include "bitmaps.hlst" namespace sdr { @@ -192,7 +193,7 @@ namespace sdr aTranslate.setY(aTranslate.getY() + fDistance); // draw a draft bitmap - const Bitmap aDraftBitmap(ResId(BMAP_GrafikEi, *ImpGetResMgr())); + const BitmapEx aDraftBitmap(BMAP_GrafikEi); if(!aDraftBitmap.IsEmpty()) { diff --git a/svx/source/sdr/contact/viewcontactofsdrpage.cxx b/svx/source/sdr/contact/viewcontactofsdrpage.cxx index 5c452a62108f..d85f54f80c18 100644 --- a/svx/source/sdr/contact/viewcontactofsdrpage.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrpage.cxx @@ -40,6 +40,7 @@ #include <svdglob.hxx> #include <drawinglayer/primitive2d/discreteshadowprimitive2d.hxx> #include <drawinglayer/attribute/sdrfillattribute.hxx> +#include "bitmaps.hlst" namespace sdr { namespace contact { @@ -138,10 +139,7 @@ drawinglayer::primitive2d::Primitive2DContainer ViewContactOfPageShadow::createV { static vcl::DeleteOnDeinit< drawinglayer::primitive2d::DiscreteShadow > aDiscreteShadow( new drawinglayer::primitive2d::DiscreteShadow( - BitmapEx( - ResId( - SIP_SA_PAGESHADOW35X35, - *ImpGetResMgr())))); + BitmapEx(SIP_SA_PAGESHADOW35X35))); if(aDiscreteShadow.get()) { diff --git a/svx/source/sidebar/area/AreaPropertyPanel.src b/svx/source/sidebar/area/AreaPropertyPanel.src deleted file mode 100644 index 2b066f5165ff..000000000000 --- a/svx/source/sidebar/area/AreaPropertyPanel.src +++ /dev/null @@ -1,53 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <svx/dialogs.hrc> -#include "helpid.hrc" - -Bitmap BMP_AXIAL -{ - File = "symphony/axial.png"; -}; - -Bitmap BMP_ELLI -{ - File = "symphony/ellipsoid.png"; -}; - -Bitmap BMP_QUAD -{ - File = "symphony/Quadratic.png"; -}; - -Bitmap BMP_RADIAL -{ - File = "symphony/radial.png"; -}; - -Bitmap BMP_SQUARE -{ - File = "symphony/Square.png"; -}; - -Bitmap BMP_LINEAR -{ - File = "symphony/linear.png"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx index 036375806806..7e19f32dfac4 100644 --- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx @@ -37,8 +37,8 @@ #include <svtools/toolbarmenu.hxx> #include <svx/tbcontrl.hxx> #include "sfx2/opengrf.hxx" - #include <o3tl/make_unique.hxx> +#include "bitmaps.hlst" using namespace css; using namespace css::uno; @@ -85,12 +85,12 @@ AreaPropertyPanelBase::AreaPropertyPanelBase( mpFillGradientItem(), mpHatchItem(), mpBitmapItem(), - maImgAxial(BitmapEx(SVX_RES(BMP_AXIAL))), - maImgElli(BitmapEx(SVX_RES(BMP_ELLI))), - maImgQuad(BitmapEx(SVX_RES(BMP_QUAD))), - maImgRadial(BitmapEx(SVX_RES(BMP_RADIAL))), - maImgSquare(BitmapEx(SVX_RES(BMP_SQUARE))), - maImgLinear(BitmapEx(SVX_RES(BMP_LINEAR))), + maImgAxial(BitmapEx(BMP_AXIAL)), + maImgElli(BitmapEx(BMP_ELLI)), + maImgQuad(BitmapEx(BMP_QUAD)), + maImgRadial(BitmapEx(BMP_RADIAL)), + maImgSquare(BitmapEx(BMP_SQUARE)), + maImgLinear(BitmapEx(BMP_LINEAR)), mpFloatTransparenceItem(), mpTransparanceItem() { diff --git a/svx/source/sidebar/line/LinePropertyPanel.src b/svx/source/sidebar/line/LinePropertyPanel.src deleted file mode 100644 index 2860e706ad6d..000000000000 --- a/svx/source/sidebar/line/LinePropertyPanel.src +++ /dev/null @@ -1,78 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <svx/dialogs.hrc> -#include "helpid.hrc" - -Bitmap BMP_NONE_ICON -{ - File = "symphony/blank.png"; -}; - -Bitmap BMP_WIDTH1_ICON -{ - File = "symphony/width1.png"; -}; - -Bitmap BMP_WIDTH2_ICON -{ - File = "symphony/width2.png"; -}; - -Bitmap BMP_WIDTH3_ICON -{ - File = "symphony/width3.png"; -}; - -Bitmap BMP_WIDTH4_ICON -{ - File = "symphony/width4.png"; -}; - -Bitmap BMP_WIDTH5_ICON -{ - File = "symphony/width5.png"; -}; - -Bitmap BMP_WIDTH6_ICON -{ - File = "symphony/width6.png"; -}; - -Bitmap BMP_WIDTH7_ICON -{ - File = "symphony/width7.png"; -}; - -Bitmap BMP_WIDTH8_ICON -{ - File = "symphony/width8.png"; -}; - -Bitmap RID_SVXBMP_WIDTH_CUSTOM -{ - File = "symphony/last_custom_common.png"; -}; - -Bitmap RID_SVXBMP_WIDTH_CUSTOM_GRAY -{ - File = "symphony/last_custom_common_grey.png"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx b/svx/source/sidebar/line/LinePropertyPanelBase.cxx index 158b6810817d..7ff47c173011 100644 --- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx +++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx @@ -45,6 +45,7 @@ #include <svx/xlnedit.hxx> #include <svx/xlncapit.hxx> #include <svx/xlinjoit.hxx> +#include "bitmaps.hlst" using namespace css; using namespace css::uno; @@ -170,7 +171,7 @@ LinePropertyPanelBase::LinePropertyPanelBase( mpStartItem(), mpEndItem(), mxLineWidthPopup(VclPtr<LineWidthPopup>::Create(*this)), - maIMGNone(BitmapEx(SVX_RES(BMP_NONE_ICON))), + maIMGNone(BitmapEx(BMP_NONE_ICON)), mpIMGWidthIcon(), mbWidthValuable(true), mbArrowSupported(true) @@ -222,14 +223,14 @@ void LinePropertyPanelBase::dispose() void LinePropertyPanelBase::Initialize() { mpIMGWidthIcon.reset(new Image[8]); - mpIMGWidthIcon[0] = Image(BitmapEx(SVX_RES(BMP_WIDTH1_ICON))); - mpIMGWidthIcon[1] = Image(BitmapEx(SVX_RES(BMP_WIDTH2_ICON))); - mpIMGWidthIcon[2] = Image(BitmapEx(SVX_RES(BMP_WIDTH3_ICON))); - mpIMGWidthIcon[3] = Image(BitmapEx(SVX_RES(BMP_WIDTH4_ICON))); - mpIMGWidthIcon[4] = Image(BitmapEx(SVX_RES(BMP_WIDTH5_ICON))); - mpIMGWidthIcon[5] = Image(BitmapEx(SVX_RES(BMP_WIDTH6_ICON))); - mpIMGWidthIcon[6] = Image(BitmapEx(SVX_RES(BMP_WIDTH7_ICON))); - mpIMGWidthIcon[7] = Image(BitmapEx(SVX_RES(BMP_WIDTH8_ICON))); + mpIMGWidthIcon[0] = Image(BitmapEx(BMP_WIDTH1_ICON)); + mpIMGWidthIcon[1] = Image(BitmapEx(BMP_WIDTH2_ICON)); + mpIMGWidthIcon[2] = Image(BitmapEx(BMP_WIDTH3_ICON)); + mpIMGWidthIcon[3] = Image(BitmapEx(BMP_WIDTH4_ICON)); + mpIMGWidthIcon[4] = Image(BitmapEx(BMP_WIDTH5_ICON)); + mpIMGWidthIcon[5] = Image(BitmapEx(BMP_WIDTH6_ICON)); + mpIMGWidthIcon[6] = Image(BitmapEx(BMP_WIDTH7_ICON)); + mpIMGWidthIcon[7] = Image(BitmapEx(BMP_WIDTH8_ICON)); FillLineStyleList(); SelectLineStyle(); diff --git a/svx/source/sidebar/line/LineWidthPopup.cxx b/svx/source/sidebar/line/LineWidthPopup.cxx index 5dee2ed4aada..5bc0619f950b 100644 --- a/svx/source/sidebar/line/LineWidthPopup.cxx +++ b/svx/source/sidebar/line/LineWidthPopup.cxx @@ -24,6 +24,7 @@ #include <unotools/viewoptions.hxx> #include <vcl/svapp.hxx> #include "LineWidthValueSet.hxx" +#include "bitmaps.hlst" namespace svx { namespace sidebar { @@ -38,8 +39,8 @@ LineWidthPopup::LineWidthPopup(LinePropertyPanelBase& rParent) , m_bCloseByEdit(false) , m_nCustomWidth(0) , m_nTmpCustomWidth(0) - , m_aIMGCus(BitmapEx(SVX_RES(RID_SVXBMP_WIDTH_CUSTOM))) - , m_aIMGCusGray(BitmapEx(SVX_RES(RID_SVXBMP_WIDTH_CUSTOM_GRAY))) + , m_aIMGCus(BitmapEx(RID_SVXBMP_WIDTH_CUSTOM)) + , m_aIMGCusGray(BitmapEx(RID_SVXBMP_WIDTH_CUSTOM_GRAY)) { get(m_xMFWidth, "spin"); diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx index 2f4eb634f68d..247d0dc62f06 100644 --- a/svx/source/stbctrls/modctrl.cxx +++ b/svx/source/stbctrls/modctrl.cxx @@ -30,6 +30,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include "modctrl_internal.hxx" +#include "bitmaps.hlst" using ::com::sun::star::uno::Sequence; using ::com::sun::star::beans::PropertyValue; @@ -54,9 +55,9 @@ struct SvxModifyControl::ImplData ImplData(): mnModState(MODIFICATION_STATE_NO) { - maImages[MODIFICATION_STATE_NO] = Image(BitmapEx(SVX_RES(RID_SVXBMP_DOC_MODIFIED_NO))); - maImages[MODIFICATION_STATE_YES] = Image(BitmapEx(SVX_RES(RID_SVXBMP_DOC_MODIFIED_YES))); - maImages[MODIFICATION_STATE_FEEDBACK] = Image(BitmapEx(SVX_RES(RID_SVXBMP_DOC_MODIFIED_FEEDBACK))); + maImages[MODIFICATION_STATE_NO] = Image(BitmapEx(RID_SVXBMP_DOC_MODIFIED_NO)); + maImages[MODIFICATION_STATE_YES] = Image(BitmapEx(RID_SVXBMP_DOC_MODIFIED_YES)); + maImages[MODIFICATION_STATE_FEEDBACK] = Image(BitmapEx(RID_SVXBMP_DOC_MODIFIED_FEEDBACK)); maIdle.SetPriority(TaskPriority::LOWEST); } diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index c19f02cb3114..f009e3e8af50 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -42,6 +42,7 @@ #include "stbctrls.h" #include <svx/dialogs.hrc> +#include "bitmaps.hlst" #include <unotools/localedatawrapper.hxx> #include <comphelper/processfactory.hxx> @@ -221,8 +222,8 @@ SvxPosSizeStatusBarControl::SvxPosSizeStatusBarControl( sal_uInt16 _nSlotId, pImpl->bTable = false; pImpl->bHasMenu = false; pImpl->nFunctionSet = 0; - pImpl->aPosImage = Image(BitmapEx(ResId(RID_SVXBMP_POSITION, DIALOG_MGR()))); - pImpl->aSizeImage = Image(BitmapEx(ResId(RID_SVXBMP_SIZE, DIALOG_MGR()))); + pImpl->aPosImage = Image(BitmapEx(RID_SVXBMP_POSITION)); + pImpl->aSizeImage = Image(BitmapEx(RID_SVXBMP_SIZE)); addStatusListener( STR_POSITION); // SID_ATTR_POSITION addStatusListener( STR_TABLECELL); // SID_TABLE_CELL diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx index a98ed9e29f1e..fd73a7418b8a 100644 --- a/svx/source/stbctrls/selctrl.cxx +++ b/svx/source/stbctrls/selctrl.cxx @@ -29,6 +29,7 @@ #include <svx/dialogs.hrc> #include "stbctrls.h" +#include "bitmaps.hlst" SFX_IMPL_STATUSBAR_CONTROL(SvxSelectionModeControl, SfxUInt16Item); @@ -82,7 +83,7 @@ SvxSelectionModeControl::SvxSelectionModeControl( sal_uInt16 _nSlotId, StatusBar& rStb ) : SfxStatusBarControl( _nSlotId, _nId, rStb ), mnState( 0 ), - maImage(BitmapEx(SVX_RES(RID_SVXBMP_SELECTION))) + maImage(BitmapEx(RID_SVXBMP_SELECTION)) { GetStatusBar().SetItemText( GetId(), "" ); } diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src index f68fbf243795..7c58b4bbc9a2 100644 --- a/svx/source/stbctrls/stbctrls.src +++ b/svx/source/stbctrls/stbctrls.src @@ -36,11 +36,6 @@ String RID_SVXSTR_OVERWRITE_TEXT Text [ en-US ] = "Overwrite" ; }; -Bitmap RID_SVXBMP_SELECTION -{ - File = "selection_10x22.png" ; -}; - String RID_SVXSTR_XMLSEC_SIG_OK { Text [ en-US ] = "Digital Signature: The document signature is OK."; @@ -155,65 +150,4 @@ String RID_SIDEBAR_EMPTY_PANEL_TEXT { Text [ en-US ] = "Properties for the task that you are performing are not available for the current selection" ; }; - -Bitmap RID_SVXBMP_POSITION -{ - File = "sc10223.png" ; -}; - -Bitmap RID_SVXBMP_SIZE -{ - File = "sc10224.png" ; -}; - -Bitmap RID_SVXBMP_SIGNET -{ - File = "signet_11x16.png" ; -}; - -Bitmap RID_SVXBMP_SIGNET_BROKEN -{ - File = "caution_11x16.png" ; -}; - -Bitmap RID_SVXBMP_SIGNET_NOTVALIDATED -{ - File = "notcertificate_16.png" ; -}; - -Bitmap RID_SVXBMP_SLIDERBUTTON -{ - File = "slidezoombutton_10.png" ; -}; - -Bitmap RID_SVXBMP_SLIDERDECREASE -{ - File = "slidezoomout_10.png" ; -}; - -Bitmap RID_SVXBMP_SLIDERINCREASE -{ - File = "slidezoomin_10.png" ; -}; - -Bitmap RID_SVXBMP_DOC_MODIFIED_YES -{ - File = "doc_modified_yes_14.png" ; -}; - -Bitmap RID_SVXBMP_DOC_MODIFIED_NO -{ - File = "doc_modified_no_14.png" ; -}; - -Bitmap RID_SVXBMP_DOC_MODIFIED_FEEDBACK -{ - File = "doc_modified_feedback.png" ; -}; - -Bitmap RID_SVXBMP_ZOOM_PAGE -{ - File = "zoom_page_statusbar.png" ; -}; - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx index 42f94aeeefba..327b36425407 100644 --- a/svx/source/stbctrls/xmlsecctrl.cxx +++ b/svx/source/stbctrls/xmlsecctrl.cxx @@ -37,6 +37,7 @@ #include <svx/dialmgr.hxx> #include "svx/xmlsecctrl.hxx" #include <tools/urlobj.hxx> +#include "bitmaps.hlst" SFX_IMPL_STATUSBAR_CONTROL( XmlSecStatusBarControl, SfxUInt16Item ); @@ -55,9 +56,9 @@ XmlSecStatusBarControl::XmlSecStatusBarControl( sal_uInt16 _nSlotId, sal_uInt16 { mpImpl->mnState = SignatureState::UNKNOWN; - mpImpl->maImage = Image(BitmapEx(SVX_RES(RID_SVXBMP_SIGNET))); - mpImpl->maImageBroken = Image(BitmapEx(SVX_RES(RID_SVXBMP_SIGNET_BROKEN))); - mpImpl->maImageNotValidated = Image(BitmapEx(SVX_RES(RID_SVXBMP_SIGNET_NOTVALIDATED))); + mpImpl->maImage = Image(BitmapEx(RID_SVXBMP_SIGNET)); + mpImpl->maImageBroken = Image(BitmapEx(RID_SVXBMP_SIGNET_BROKEN)); + mpImpl->maImageNotValidated = Image(BitmapEx(RID_SVXBMP_SIGNET_NOTVALIDATED)); } XmlSecStatusBarControl::~XmlSecStatusBarControl() diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx index e93740e9deb9..31073cad96d9 100644 --- a/svx/source/stbctrls/zoomctrl.cxx +++ b/svx/source/stbctrls/zoomctrl.cxx @@ -34,6 +34,7 @@ #include "stbctrls.h" #include <svx/dialmgr.hxx> #include "modctrl_internal.hxx" +#include "bitmaps.hlst" SFX_IMPL_STATUSBAR_CONTROL(SvxZoomStatusBarControl,SvxZoomItem); @@ -181,7 +182,7 @@ SFX_IMPL_STATUSBAR_CONTROL(SvxZoomPageStatusBarControl,SfxVoidItem); SvxZoomPageStatusBarControl::SvxZoomPageStatusBarControl(sal_uInt16 _nSlotId, sal_uInt16 _nId, StatusBar& rStb) : SfxStatusBarControl(_nSlotId, _nId, rStb) - , maImage(BitmapEx(SVX_RES(RID_SVXBMP_ZOOM_PAGE))) + , maImage(BitmapEx(RID_SVXBMP_ZOOM_PAGE)) { GetStatusBar().SetQuickHelpText(GetId(), SVX_RESSTR(RID_SVXSTR_FIT_SLIDE)); } diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx index b137bf37a201..01fb793e9359 100644 --- a/svx/source/stbctrls/zoomsliderctrl.cxx +++ b/svx/source/stbctrls/zoomsliderctrl.cxx @@ -27,6 +27,7 @@ #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> #include <basegfx/tools/zoomtools.hxx> +#include "bitmaps.hlst" #include <set> @@ -156,9 +157,9 @@ SvxZoomSliderControl::SvxZoomSliderControl( sal_uInt16 _nSlotId, sal_uInt16 _nI SfxStatusBarControl( _nSlotId, _nId, rStatusBar ), mxImpl( new SvxZoomSliderControl_Impl ) { - mxImpl->maSliderButton = Image(BitmapEx(SVX_RES(RID_SVXBMP_SLIDERBUTTON))); - mxImpl->maIncreaseButton = Image(BitmapEx(SVX_RES(RID_SVXBMP_SLIDERINCREASE))); - mxImpl->maDecreaseButton = Image(BitmapEx(SVX_RES(RID_SVXBMP_SLIDERDECREASE))); + mxImpl->maSliderButton = Image(BitmapEx(RID_SVXBMP_SLIDERBUTTON)); + mxImpl->maIncreaseButton = Image(BitmapEx(RID_SVXBMP_SLIDERINCREASE)); + mxImpl->maDecreaseButton = Image(BitmapEx(RID_SVXBMP_SLIDERDECREASE)); } SvxZoomSliderControl::~SvxZoomSliderControl() diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index 74d2345c3548..1bc9783c7540 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -67,8 +67,7 @@ #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx> #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> #include <memory> - - +#include "bitmaps.hlst" // #i15222# // Due to the resource problems in Win95/98 with bitmap resources I @@ -101,7 +100,7 @@ public: #define INDIVIDUAL_COUNT (5) SdrHdlBitmapSet::SdrHdlBitmapSet() - : maMarkersBitmap(ResId(SIP_SA_MARKERS, *ImpGetResMgr())), + : maMarkersBitmap(SIP_SA_MARKERS), // 15 kinds (BitmapMarkerKind) use index [0..5] + 5 extra maRealMarkers((KIND_COUNT * INDEX_COUNT) + INDIVIDUAL_COUNT) { @@ -2364,7 +2363,7 @@ void SdrCropHdl::CreateB2dIAObject() const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); int nHdlSize = pHdlList->GetHdlSize(); - const BitmapEx aHandlesBitmap( ResId(SIP_SA_CROP_MARKERS, *ImpGetResMgr()) ); + const BitmapEx aHandlesBitmap(SIP_SA_CROP_MARKERS); BitmapEx aBmpEx1( GetBitmapForHandle( aHandlesBitmap, nHdlSize ) ); for(sal_uInt32 b(0L); b < pPageView->PageWindowCount(); b++) diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index 149b81c88567..c276224d87e9 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -86,6 +86,7 @@ #include <editeng/outlobj.hxx> #include <svx/svdpage.hxx> #include <rtl/ref.hxx> +#include "bitmaps.hlst" using namespace ::com::sun::star; @@ -2074,7 +2075,7 @@ bool SdrOle2Obj::AddOwnLightClient() Graphic SdrOle2Obj::GetEmptyOLEReplacementGraphic() { - return Graphic(BitmapEx(ResId(BMP_SVXOLEOBJ, *ImpGetResMgr()))); + return Graphic(BitmapEx(BMP_SVXOLEOBJ)); } void SdrOle2Obj::SetWindow(const css::uno::Reference < css::awt::XWindow >& _xWindow) diff --git a/svx/source/svdraw/svdstr.src b/svx/source/svdraw/svdstr.src index fb67cb2a8775..515528707fa2 100644 --- a/svx/source/svdraw/svdstr.src +++ b/svx/source/svdraw/svdstr.src @@ -1159,9 +1159,6 @@ String STR_ItemValCIRC_ARC Text [ en-US ] = "Arc" ; }; - // Now: bitmaps: -Bitmap BMAP_GrafikEi { File = "grafikei.png" ; }; - // Strings for the templates dialog String SIP_UNKNOWN_ATTR { @@ -2156,22 +2153,6 @@ String SIP_SA_GRAFCROP }; -Bitmap SIP_SA_PAGESHADOW35X35 -{ - File = "pageshadow35x35.png"; -}; - - -Bitmap SIP_SA_MARKERS -{ - File = "markers.png"; -}; - -Bitmap BMP_SVXOLEOBJ -{ - File = "oleobj.png" ; -}; - String STR_ObjNameSingulMEDIA { Text [ en-US ] = "Media object" ; @@ -2246,11 +2227,6 @@ String STR_ObjNamePluralTable Text [ en-US ] = "Tables"; }; -Bitmap SIP_SA_CROP_MARKERS -{ - File = "cropmarkers.png"; -}; - String STR_ObjNameSingulFONTWORK { Text [ en-US ] = "Font work" ; diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index aac78aaa9495..cbfd1bb7c5c7 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -44,6 +44,8 @@ #include "extrusioncontrols.hrc" #include "extrusiondepthdialog.hxx" +#include "bitmaps.hlst" + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; @@ -57,18 +59,70 @@ static const sal_Int32 gSkewList[] = { 135, 90, 45, 180, 0, -360, -135, -90, -45 static const char g_sExtrusionDirection[] = ".uno:ExtrusionDirection"; static const char g_sExtrusionProjection[] = ".uno:ExtrusionProjection"; +static const OUStringLiteral aLightOffBmps[] = +{ + RID_SVXBMP_LIGHT_OFF_FROM_TOP_LEFT, + RID_SVXBMP_LIGHT_OFF_FROM_TOP, + RID_SVXBMP_LIGHT_OFF_FROM_TOP_RIGHT, + RID_SVXBMP_LIGHT_OFF_FROM_LEFT, + "", + RID_SVXBMP_LIGHT_OFF_FROM_RIGHT, + RID_SVXBMP_LIGHT_OFF_FROM_BOTTOM_LEFT, + RID_SVXBMP_LIGHT_OFF_FROM_BOTTOM, + RID_SVXBMP_LIGHT_OFF_FROM_BOTTOM_RIGHT +}; + +static const OUStringLiteral aLightOnBmps[] = +{ + RID_SVXBMP_LIGHT_ON_FROM_TOP_LEFT, + RID_SVXBMP_LIGHT_ON_FROM_TOP, + RID_SVXBMP_LIGHT_ON_FROM_TOP_RIGHT, + RID_SVXBMP_LIGHT_ON_FROM_LEFT, + "", + RID_SVXBMP_LIGHT_ON_FROM_RIGHT, + RID_SVXBMP_LIGHT_ON_FROM_BOTTOM_LEFT, + RID_SVXBMP_LIGHT_ON_FROM_BOTTOM, + RID_SVXBMP_LIGHT_ON_FROM_BOTTOM_RIGHT +}; + +static const OUStringLiteral aLightPreviewBmps[] = +{ + RID_SVXBMP_LIGHT_PREVIEW_FROM_TOP_LEFT, + RID_SVXBMP_LIGHT_PREVIEW_FROM_TOP, + RID_SVXBMP_LIGHT_PREVIEW_FROM_TOP_RIGHT, + RID_SVXBMP_LIGHT_PREVIEW_FROM_LEFT, + RID_SVXBMP_LIGHT_PREVIEW_FROM_RIGHT, + RID_SVXBMP_LIGHT_PREVIEW_FROM_FRONT, + RID_SVXBMP_LIGHT_PREVIEW_FROM_BOTTOM_LEFT, + RID_SVXBMP_LIGHT_PREVIEW_FROM_BOTTOM, + RID_SVXBMP_LIGHT_PREVIEW_FROM_BOTTOM_RIGHT +}; + +static const OUStringLiteral aDirectionBmps[] = +{ + RID_SVXBMP_DIRECTION_DIRECTION_NW, + RID_SVXBMP_DIRECTION_DIRECTION_N, + RID_SVXBMP_DIRECTION_DIRECTION_NE, + RID_SVXBMP_DIRECTION_DIRECTION_W, + RID_SVXBMP_DIRECTION_DIRECTION_NONE, + RID_SVXBMP_DIRECTION_DIRECTION_E, + RID_SVXBMP_DIRECTION_DIRECTION_SW, + RID_SVXBMP_DIRECTION_DIRECTION_S, + RID_SVXBMP_DIRECTION_DIRECTION_SE +}; + ExtrusionDirectionWindow::ExtrusionDirectionWindow( svt::ToolboxController& rController, vcl::Window* pParentWindow ) : ToolbarMenu(rController.getFrameInterface(), pParentWindow, WB_STDPOPUP) , mrController(rController) - , maImgPerspective(BitmapEx(SVX_RES(RID_SVXBMP_PERSPECTIVE))) - , maImgParallel(BitmapEx(SVX_RES(RID_SVXBMP_PARALLEL))) + , maImgPerspective(BitmapEx(RID_SVXBMP_PERSPECTIVE)) + , maImgParallel(BitmapEx(RID_SVXBMP_PARALLEL)) { - for(sal_uInt16 i = DIRECTION_NW; i <= DIRECTION_SE; ++i) + for (sal_uInt16 i = DIRECTION_NW; i <= DIRECTION_SE; ++i) { - maImgDirection[i] = Image(BitmapEx(SVX_RES(RID_SVXBMP_DIRECTION + i))); + maImgDirection[i] = Image(BitmapEx(aDirectionBmps[i])); } SetSelectHdl( LINK( this, ExtrusionDirectionWindow, SelectToolbarMenuHdl ) ); @@ -321,12 +375,12 @@ ExtrusionDepthWindow::ExtrusionDepthWindow( vcl::Window* pParentWindow ) : ToolbarMenu( rController.getFrameInterface(), pParentWindow, WB_STDPOPUP ) , mrController( rController ) - , maImgDepth0(BitmapEx(SVX_RES(RID_SVXBMP_DEPTH_0))) - , maImgDepth1(BitmapEx(SVX_RES(RID_SVXBMP_DEPTH_1))) - , maImgDepth2(BitmapEx(SVX_RES(RID_SVXBMP_DEPTH_2))) - , maImgDepth3(BitmapEx(SVX_RES(RID_SVXBMP_DEPTH_3))) - , maImgDepth4(BitmapEx(SVX_RES(RID_SVXBMP_DEPTH_4))) - , maImgDepthInfinity(BitmapEx(SVX_RES(RID_SVXBMP_DEPTH_INFINITY))) + , maImgDepth0(BitmapEx(RID_SVXBMP_DEPTH_0)) + , maImgDepth1(BitmapEx(RID_SVXBMP_DEPTH_1)) + , maImgDepth2(BitmapEx(RID_SVXBMP_DEPTH_2)) + , maImgDepth3(BitmapEx(RID_SVXBMP_DEPTH_3)) + , maImgDepth4(BitmapEx(RID_SVXBMP_DEPTH_4)) + , maImgDepthInfinity(BitmapEx(RID_SVXBMP_DEPTH_INFINITY)) , meUnit(FUNIT_NONE) , mfDepth( -1.0 ) , msExtrusionDepth( ".uno:ExtrusionDepth" ) @@ -526,9 +580,9 @@ ExtrusionLightingWindow::ExtrusionLightingWindow(svt::ToolboxController& rContro vcl::Window* pParentWindow) : ToolbarMenu(rController.getFrameInterface(), pParentWindow, WB_STDPOPUP) , mrController(rController) - , maImgBright(BitmapEx(SVX_RES(RID_SVXBMP_LIGHTING_BRIGHT))) - , maImgNormal(BitmapEx(SVX_RES(RID_SVXBMP_LIGHTING_NORMAL))) - , maImgDim(BitmapEx(SVX_RES(RID_SVXBMP_LIGHTING_DIM))) + , maImgBright(BitmapEx(RID_SVXBMP_LIGHTING_BRIGHT)) + , maImgNormal(BitmapEx(RID_SVXBMP_LIGHTING_NORMAL)) + , maImgDim(BitmapEx(RID_SVXBMP_LIGHTING_DIM)) , mnLevel(0) , mbLevelEnabled(false) , mnDirection(FROM_FRONT) @@ -538,10 +592,10 @@ ExtrusionLightingWindow::ExtrusionLightingWindow(svt::ToolboxController& rContro { if( i != FROM_FRONT ) { - maImgLightingOff[i] = Image(BitmapEx(SVX_RES(RID_SVXBMP_LIGHT_OFF + i))); - maImgLightingOn[i] = Image(BitmapEx(SVX_RES(RID_SVXBMP_LIGHT_ON + i))); + maImgLightingOff[i] = Image(BitmapEx(aLightOffBmps[i])); + maImgLightingOn[i] = Image(BitmapEx(aLightOnBmps[i])); } - maImgLightingPreview[i] = Image(BitmapEx(SVX_RES(RID_SVXBMP_LIGHT_PREVIEW + i))); + maImgLightingPreview[i] = Image(BitmapEx(aLightPreviewBmps[i])); } SetSelectHdl( LINK( this, ExtrusionLightingWindow, SelectToolbarMenuHdl ) ); @@ -794,10 +848,10 @@ ExtrusionSurfaceWindow::ExtrusionSurfaceWindow( vcl::Window* pParentWindow) : ToolbarMenu(rController.getFrameInterface(), pParentWindow, WB_STDPOPUP) , mrController(rController) - , maImgSurface1(BitmapEx(SVX_RES(RID_SVXBMP_WIRE_FRAME))) - , maImgSurface2(BitmapEx(SVX_RES(RID_SVXBMP_MATTE))) - , maImgSurface3(BitmapEx(SVX_RES(RID_SVXBMP_PLASTIC))) - , maImgSurface4(BitmapEx(SVX_RES(RID_SVXBMP_METAL))) + , maImgSurface1(BitmapEx(RID_SVXBMP_WIRE_FRAME)) + , maImgSurface2(BitmapEx(RID_SVXBMP_MATTE)) + , maImgSurface3(BitmapEx(RID_SVXBMP_PLASTIC)) + , maImgSurface4(BitmapEx(RID_SVXBMP_METAL)) { SetSelectHdl( LINK( this, ExtrusionSurfaceWindow, SelectHdl ) ); diff --git a/svx/source/tbxctrls/extrusioncontrols.src b/svx/source/tbxctrls/extrusioncontrols.src index 80d53459fb3a..a0d896e2e9f0 100644 --- a/svx/source/tbxctrls/extrusioncontrols.src +++ b/svx/source/tbxctrls/extrusioncontrols.src @@ -20,61 +20,6 @@ #include <svx/dialogs.hrc> #include "extrusioncontrols.hrc" -Bitmap RID_SVXBMP_DIRECTION + DIRECTION_NW -{ - File = "directionnorthwest_22.bmp"; -}; - -Bitmap RID_SVXBMP_DIRECTION + DIRECTION_N -{ - File = "directionnorth_22.bmp"; -}; - -Bitmap RID_SVXBMP_DIRECTION + DIRECTION_NE -{ - File = "directionnortheast_22.bmp"; -}; - -Bitmap RID_SVXBMP_DIRECTION + DIRECTION_W -{ - File = "directionwest_22.bmp"; -}; - -Bitmap RID_SVXBMP_DIRECTION + DIRECTION_NONE -{ - File = "directionstraight_22.bmp"; -}; - -Bitmap RID_SVXBMP_DIRECTION + DIRECTION_E -{ - File = "directioneast_22.bmp"; -}; - -Bitmap RID_SVXBMP_DIRECTION + DIRECTION_SW -{ - File = "directionsouthwest_22.bmp"; -}; - -Bitmap RID_SVXBMP_DIRECTION + DIRECTION_S -{ - File = "directionsouth_22.bmp"; -}; - -Bitmap RID_SVXBMP_DIRECTION + DIRECTION_SE -{ - File = "directionsoutheast_22.bmp"; -}; - -Bitmap RID_SVXBMP_PERSPECTIVE -{ - File = "perspective_16.bmp"; -}; - -Bitmap RID_SVXBMP_PARALLEL -{ - File = "parallel_16.bmp"; -}; - String RID_SVXSTR_PERSPECTIVE { Text [ en-US ] = "~Perspective" ; @@ -129,147 +74,6 @@ String RID_SVXSTR_DIRECTION + DIRECTION_SE { Text [ en-US ] = "Extrusion South-East"; }; - -Bitmap RID_SVXBMP_LIGHT_OFF + FROM_TOP_LEFT -{ - File = "lightofffromtopleft_22.bmp"; -}; - -Bitmap RID_SVXBMP_LIGHT_OFF + FROM_TOP -{ - File = "lightofffromtop_22.bmp"; -}; - -Bitmap RID_SVXBMP_LIGHT_OFF + FROM_TOP_RIGHT -{ - File = "lightofffromtopright_22.bmp"; -}; - -Bitmap RID_SVXBMP_LIGHT_OFF + FROM_LEFT -{ - File = "lightofffromleft_22.bmp"; -}; - -Bitmap RID_SVXBMP_LIGHT_OFF + FROM_RIGHT -{ - File = "lightofffromright_22.bmp"; -}; - -Bitmap RID_SVXBMP_LIGHT_OFF + FROM_BOTTOM_LEFT -{ - File = "lightofffrombottomleft_22.bmp"; -}; - -Bitmap RID_SVXBMP_LIGHT_OFF + FROM_BOTTOM -{ - File = "lightofffrombottom_22.bmp"; -}; - -Bitmap RID_SVXBMP_LIGHT_OFF + FROM_BOTTOM_RIGHT -{ - File = "lightofffrombottomright_22.bmp"; -}; - -Bitmap RID_SVXBMP_LIGHT_ON + FROM_TOP_LEFT -{ - File = "lightonfromtopleft_22.bmp"; -}; - -Bitmap RID_SVXBMP_LIGHT_ON + FROM_TOP -{ - File = "lightonfromtop_22.bmp"; -}; - -Bitmap RID_SVXBMP_LIGHT_ON + FROM_TOP_RIGHT -{ - File = "lightonfromtopright_22.bmp"; -}; - -Bitmap RID_SVXBMP_LIGHT_ON + FROM_LEFT -{ - File = "lightonfromleft_22.bmp"; -}; - -Bitmap RID_SVXBMP_LIGHT_ON + FROM_RIGHT -{ - File = "lightonfromright_22.bmp"; -}; - -Bitmap RID_SVXBMP_LIGHT_ON + FROM_BOTTOM_LEFT -{ - File = "lightonfrombottomleft_22.bmp"; -}; - -Bitmap RID_SVXBMP_LIGHT_ON + FROM_BOTTOM -{ - File = "lightonfrombottom_22.bmp"; -}; - -Bitmap RID_SVXBMP_LIGHT_ON + FROM_BOTTOM_RIGHT -{ - File = "lightonfrombottomright_22.bmp"; -}; - -Bitmap RID_SVXBMP_LIGHT_PREVIEW + FROM_TOP_LEFT -{ - File = "lightfromtopleft_22.bmp"; -}; - -Bitmap RID_SVXBMP_LIGHT_PREVIEW + FROM_TOP -{ - File = "lightfromtop_22.bmp"; -}; - -Bitmap RID_SVXBMP_LIGHT_PREVIEW + FROM_TOP_RIGHT -{ - File = "lightfromtopright_22.bmp"; -}; - -Bitmap RID_SVXBMP_LIGHT_PREVIEW + FROM_LEFT -{ - File = "lightfromleft_22.bmp"; -}; - -Bitmap RID_SVXBMP_LIGHT_PREVIEW + FROM_RIGHT -{ - File = "lightfromright_22.bmp"; -}; - -Bitmap RID_SVXBMP_LIGHT_PREVIEW + FROM_FRONT -{ - File = "lightfromfront_22.bmp"; -}; - -Bitmap RID_SVXBMP_LIGHT_PREVIEW + FROM_BOTTOM_LEFT -{ - File = "lightfrombottomleft_22.bmp"; -}; - -Bitmap RID_SVXBMP_LIGHT_PREVIEW + FROM_BOTTOM -{ - File = "lightfrombottom_22.bmp"; -}; - -Bitmap RID_SVXBMP_LIGHT_PREVIEW + FROM_BOTTOM_RIGHT -{ - File = "lightfrombottomright_22.bmp"; -}; - -Bitmap RID_SVXBMP_LIGHTING_BRIGHT -{ - File = "brightlit_16.png"; -}; - -Bitmap RID_SVXBMP_LIGHTING_NORMAL -{ - File = "normallit_16.png"; -}; - -Bitmap RID_SVXBMP_LIGHTING_DIM -{ - File = "dimlit_16.png"; -}; - String RID_SVXSTR_BRIGHT { Text [ en-US ] = "~Bright"; @@ -305,56 +109,6 @@ String RID_SVXSTR_METAL Text [ en-US ] = "Me~tal"; }; -Bitmap RID_SVXBMP_WIRE_FRAME -{ - File = "wireframe_16.bmp"; -}; - -Bitmap RID_SVXBMP_MATTE -{ - File = "matte_16.bmp"; -}; - -Bitmap RID_SVXBMP_PLASTIC -{ - File = "plastic_16.bmp"; -}; - -Bitmap RID_SVXBMP_METAL -{ - File = "metal_16.bmp"; -}; - -Bitmap RID_SVXBMP_DEPTH_0 -{ - File = "extrusion0inch_16.bmp"; -}; - -Bitmap RID_SVXBMP_DEPTH_1 -{ - File = "extrusion05inch_16.bmp"; -}; - -Bitmap RID_SVXBMP_DEPTH_2 -{ - File = "extrusion1inch_16.bmp"; -}; - -Bitmap RID_SVXBMP_DEPTH_3 -{ - File = "extrusion2inch_16.bmp"; -}; - -Bitmap RID_SVXBMP_DEPTH_4 -{ - File = "extrusion4inch_16.bmp"; -}; - -Bitmap RID_SVXBMP_DEPTH_INFINITY -{ - File = "extrusioninfinity_16.bmp"; -}; - String RID_SVXSTR_DEPTH_0 { Text [ en-US ] = "~0 cm"; diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index 9b93bc22d008..479c8effcbb6 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -54,6 +54,7 @@ #include <memory> #include "helpid.hrc" +#include "bitmaps.hlst" using ::svtools::ToolbarMenu; @@ -268,11 +269,11 @@ private: FontworkAlignmentWindow::FontworkAlignmentWindow(svt::ToolboxController& rController, vcl::Window* pParentWindow) : ToolbarMenu(rController.getFrameInterface(), pParentWindow, WB_STDPOPUP) , mrController(rController) - , maImgAlgin1(BitmapEx(SVX_RES(RID_SVXBMP_FONTWORK_ALIGN_LEFT))) - , maImgAlgin2(BitmapEx(SVX_RES(RID_SVXBMP_FONTWORK_ALIGN_CENTER))) - , maImgAlgin3(BitmapEx(SVX_RES(RID_SVXBMP_FONTWORK_ALIGN_RIGHT))) - , maImgAlgin4(BitmapEx(SVX_RES(RID_SVXBMP_FONTWORK_ALIGN_WORD))) - , maImgAlgin5(BitmapEx(SVX_RES(RID_SVXBMP_FONTWORK_ALIGN_STRETCH))) + , maImgAlgin1(BitmapEx(RID_SVXBMP_FONTWORK_ALIGN_LEFT)) + , maImgAlgin2(BitmapEx(RID_SVXBMP_FONTWORK_ALIGN_CENTER)) + , maImgAlgin3(BitmapEx(RID_SVXBMP_FONTWORK_ALIGN_RIGHT)) + , maImgAlgin4(BitmapEx(RID_SVXBMP_FONTWORK_ALIGN_WORD)) + , maImgAlgin5(BitmapEx(RID_SVXBMP_FONTWORK_ALIGN_STRETCH)) , msFontworkAlignment(".uno:FontworkAlignment") { SetSelectHdl( LINK( this, FontworkAlignmentWindow, SelectHdl ) ); diff --git a/svx/source/tbxctrls/fontworkgallery.src b/svx/source/tbxctrls/fontworkgallery.src index 6b61f89dc3f2..246d1f411ffa 100644 --- a/svx/source/tbxctrls/fontworkgallery.src +++ b/svx/source/tbxctrls/fontworkgallery.src @@ -45,31 +45,6 @@ String RID_SVXSTR_ALIGN_STRETCH Text [ en-US ] = "S~tretch Justify"; }; -Bitmap RID_SVXBMP_FONTWORK_ALIGN_LEFT -{ - File = "fontworkalignleft_16.png"; -}; - -Bitmap RID_SVXBMP_FONTWORK_ALIGN_CENTER -{ - File = "fontworkaligncentered_16.png"; -}; - -Bitmap RID_SVXBMP_FONTWORK_ALIGN_RIGHT -{ - File = "fontworkalignright_16.png"; -}; - -Bitmap RID_SVXBMP_FONTWORK_ALIGN_WORD -{ - File = "fontworkalignjustified_16.png"; -}; - -Bitmap RID_SVXBMP_FONTWORK_ALIGN_STRETCH -{ - File = "fontworkalignstretch_16.png"; -}; - String RID_SVXSTR_CHARS_SPACING_VERY_TIGHT { Text [ en-US ] = "~Very Tight"; diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index a66609ec79af..92d7a7593df8 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -51,6 +51,7 @@ #include <svx/svdtrans.hxx> #include "svx/grafctrl.hxx" #include "svx/tbxcolor.hxx" +#include "bitmaps.hlst" using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; @@ -183,10 +184,10 @@ void ImplGrafMetricField::Update( const SfxPoolItem* pItem ) struct CommandToRID { const char* pCommand; - sal_uInt16 nResId; + const char* sResId; }; -static sal_uInt16 ImplGetRID( const OUString& aCommand ) +static OUString ImplGetRID( const OUString& aCommand ) { static const CommandToRID aImplCommandToResMap[] = { @@ -197,23 +198,23 @@ static sal_uInt16 ImplGetRID( const OUString& aCommand ) { ".uno:GrafContrast", RID_SVXBMP_GRAF_CONTRAST }, { ".uno:GrafGamma", RID_SVXBMP_GRAF_GAMMA }, { ".uno:GrafTransparence", RID_SVXBMP_GRAF_TRANSPARENCE }, - { nullptr, 0 } + { nullptr, "" } }; - sal_uInt16 nRID = 0; + OUString sRID; sal_Int32 i( 0 ); while ( aImplCommandToResMap[ i ].pCommand ) { if ( aCommand.equalsAscii( aImplCommandToResMap[ i ].pCommand )) { - nRID = aImplCommandToResMap[ i ].nResId; + sRID = OUString::createFromAscii(aImplCommandToResMap[i].sResId); break; } ++i; } - return nRID; + return sRID; } class ImplGrafControl : public Control @@ -246,8 +247,8 @@ ImplGrafControl::ImplGrafControl( , maImage( VclPtr<FixedImage>::Create(this) ) , maField( VclPtr<ImplGrafMetricField>::Create(this, rCmd, rFrame) ) { - ResId aResId( ImplGetRID( rCmd ), DIALOG_MGR() ) ; - BitmapEx aBitmapEx(aResId); + OUString sResId(ImplGetRID(rCmd)); + BitmapEx aBitmapEx(sResId); Size aImgSize(aBitmapEx.GetSizePixel()); Size aFldSize(maField->GetSizePixel()); diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 4eb42448dd37..83519cbe57c9 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -105,7 +105,7 @@ #include <cppu/unotype.hxx> #include <officecfg/Office/Common.hxx> #include <o3tl/typed_flags_set.hxx> - +#include "bitmaps.hlst" #define MAX_MRU_FONTNAME_ENTRIES 5 @@ -1952,18 +1952,18 @@ void SvxFrameWindow_Impl::CalcSizeValueSet() void SvxFrameWindow_Impl::InitImageList() { aImgVec.clear(); - aImgVec.push_back(BitmapEx(SVX_RES(RID_SVXBMP_FRAME1))); - aImgVec.push_back(BitmapEx(SVX_RES(RID_SVXBMP_FRAME2))); - aImgVec.push_back(BitmapEx(SVX_RES(RID_SVXBMP_FRAME3))); - aImgVec.push_back(BitmapEx(SVX_RES(RID_SVXBMP_FRAME4))); - aImgVec.push_back(BitmapEx(SVX_RES(RID_SVXBMP_FRAME5))); - aImgVec.push_back(BitmapEx(SVX_RES(RID_SVXBMP_FRAME6))); - aImgVec.push_back(BitmapEx(SVX_RES(RID_SVXBMP_FRAME7))); - aImgVec.push_back(BitmapEx(SVX_RES(RID_SVXBMP_FRAME8))); - aImgVec.push_back(BitmapEx(SVX_RES(RID_SVXBMP_FRAME9))); - aImgVec.push_back(BitmapEx(SVX_RES(RID_SVXBMP_FRAME10))); - aImgVec.push_back(BitmapEx(SVX_RES(RID_SVXBMP_FRAME11))); - aImgVec.push_back(BitmapEx(SVX_RES(RID_SVXBMP_FRAME12))); + aImgVec.push_back(BitmapEx(RID_SVXBMP_FRAME1)); + aImgVec.push_back(BitmapEx(RID_SVXBMP_FRAME2)); + aImgVec.push_back(BitmapEx(RID_SVXBMP_FRAME3)); + aImgVec.push_back(BitmapEx(RID_SVXBMP_FRAME4)); + aImgVec.push_back(BitmapEx(RID_SVXBMP_FRAME5)); + aImgVec.push_back(BitmapEx(RID_SVXBMP_FRAME6)); + aImgVec.push_back(BitmapEx(RID_SVXBMP_FRAME7)); + aImgVec.push_back(BitmapEx(RID_SVXBMP_FRAME8)); + aImgVec.push_back(BitmapEx(RID_SVXBMP_FRAME9)); + aImgVec.push_back(BitmapEx(RID_SVXBMP_FRAME10)); + aImgVec.push_back(BitmapEx(RID_SVXBMP_FRAME11)); + aImgVec.push_back(BitmapEx(RID_SVXBMP_FRAME12)); if (GetParent()->GetDPIScaleFactor() > 1) { diff --git a/svx/source/tbxctrls/tbcontrl.src b/svx/source/tbxctrls/tbcontrl.src index 18bab3e22a08..5b8e14e06640 100644 --- a/svx/source/tbxctrls/tbcontrl.src +++ b/svx/source/tbxctrls/tbcontrl.src @@ -20,70 +20,6 @@ #include <svx/dialogs.hrc> #include <helpid.hrc> -/* - * Bitmaps for SvxFrameWindow - */ - -Bitmap RID_SVXBMP_FRAME1 -{ - File = "fr01.png"; -}; - -Bitmap RID_SVXBMP_FRAME2 -{ - File = "fr02.png"; -}; - -Bitmap RID_SVXBMP_FRAME3 -{ - File = "fr03.png"; -}; - -Bitmap RID_SVXBMP_FRAME4 -{ - File = "fr04.png"; -}; - -Bitmap RID_SVXBMP_FRAME5 -{ - File = "fr05.png"; -}; - -Bitmap RID_SVXBMP_FRAME6 -{ - File = "fr06.png"; -}; - -Bitmap RID_SVXBMP_FRAME7 -{ - File = "fr07.png"; -}; - -Bitmap RID_SVXBMP_FRAME8 -{ - File = "fr08.png"; -}; - -Bitmap RID_SVXBMP_FRAME9 -{ - File = "fr09.png"; -}; - -Bitmap RID_SVXBMP_FRAME10 -{ - File = "fr010.png"; -}; - -Bitmap RID_SVXBMP_FRAME11 -{ - File = "fr011.png"; -}; - -Bitmap RID_SVXBMP_FRAME12 -{ - File = "fr012.png"; -}; - String RID_SVXSTR_NOFILL { Text [ en-US ] = "No Fill" ; @@ -124,41 +60,6 @@ String RID_SVXSTR_PAGES Text [ en-US ] = "Pages"; }; -Bitmap RID_SVXBMP_GRAF_RED -{ - File = "sc10865.png"; -}; - -Bitmap RID_SVXBMP_GRAF_GREEN -{ - File = "sc10866.png"; -}; - -Bitmap RID_SVXBMP_GRAF_BLUE -{ - File = "sc10867.png"; -}; - -Bitmap RID_SVXBMP_GRAF_LUMINANCE -{ - File = "sc10863.png"; -}; - -Bitmap RID_SVXBMP_GRAF_CONTRAST -{ - File = "sc10864.png"; -}; - -Bitmap RID_SVXBMP_GRAF_GAMMA -{ - File = "sc10868.png"; -}; - -Bitmap RID_SVXBMP_GRAF_TRANSPARENCE -{ - File = "sc10869.png"; -}; - String RID_SVXSTR_CLEARFORM { Text [ en-US ] = "Clear formatting"; diff --git a/svx/source/unodraw/unodraw.src b/svx/source/unodraw/unodraw.src deleted file mode 100644 index 965bdb5415bd..000000000000 --- a/svx/source/unodraw/unodraw.src +++ /dev/null @@ -1,35 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <svx/dialogs.hrc> - -Bitmap RID_UNODRAW_OBJECTS -{ - File = "objects.bmp" ; -}; -Bitmap RID_UNODRAW_OLE2 -{ - File = "ole.bmp" ; -}; -Bitmap RID_UNODRAW_GRAPHICS -{ - File = "graphic.bmp" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index acb0783dc0b2..96f2792408c0 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -97,6 +97,9 @@ #include <memory> #include <vector> #include <iostream> + +#include "bitmaps.hlst" + using namespace ::osl; using namespace ::cppu; using namespace ::com::sun::star; @@ -2605,22 +2608,22 @@ bool SvxShape::getPropertyValueImpl( const OUString&, const SfxItemPropertySimpl case OWN_ATTR_LDBITMAP: { - sal_uInt16 nId; + OUString sId; if( mpObj->GetObjInventor() == SdrInventor::Default && mpObj->GetObjIdentifier() == OBJ_OLE2 ) { - nId = RID_UNODRAW_OLE2; + sId = RID_UNODRAW_OLE2; } else if( mpObj->GetObjInventor() == SdrInventor::Default && mpObj->GetObjIdentifier() == OBJ_GRAF ) { - nId = RID_UNODRAW_GRAPHICS; + sId = RID_UNODRAW_GRAPHICS; } else { - nId = RID_UNODRAW_OBJECTS; + sId = RID_UNODRAW_OBJECTS; } - BitmapEx aBmp( SVX_RES(nId) ); - Reference< awt::XBitmap > xBmp( VCLUnoHelper::CreateBitmap( aBmp ) ); + BitmapEx aBmp(sId); + Reference<awt::XBitmap> xBmp(VCLUnoHelper::CreateBitmap(aBmp)); rValue <<= xBmp; break; |