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 /include/svx | |
parent | f9f045e7830d184497554e0e438cc478fa990eb6 (diff) |
remove svx bitmaps from .src files
Change-Id: Ie3795870484648e62dea483f9976af31cd1be167
Reviewed-on: https://gerrit.libreoffice.org/37006
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/svx')
-rw-r--r-- | include/svx/dialogs.hrc | 134 | ||||
-rw-r--r-- | include/svx/dlgctrl.hxx | 4 | ||||
-rw-r--r-- | include/svx/fmresids.hrc | 32 | ||||
-rw-r--r-- | include/svx/galmisc.hxx | 2 | ||||
-rw-r--r-- | include/svx/svdstr.hrc | 14 |
5 files changed, 5 insertions, 181 deletions
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: */ |