diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-04-27 09:12:17 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2017-04-27 14:17:45 +0200 |
commit | 847462f75dc7bb59795aad7664d0b065a3fce866 (patch) | |
tree | 93f949c8524a00830a5ecff12216ee52e596dab7 /sw/source/uibase | |
parent | f368499b9bcc05eb70aae9914c1760d00b86a2f9 (diff) |
remove sw bitmaps from .src files
Change-Id: I9ccd69662f9d3a77d1921b3433b0e2f541960a90
Reviewed-on: https://gerrit.libreoffice.org/37020
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 'sw/source/uibase')
23 files changed, 77 insertions, 347 deletions
diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx index bdbcd5fef3a8..0b7734ac5f7a 100644 --- a/sw/source/uibase/app/swmodule.cxx +++ b/sw/source/uibase/app/swmodule.cxx @@ -124,6 +124,7 @@ #include <navsh.hxx> #include <app.hrc> +#include "bitmaps.hlst" #include <svx/xmlsecctrl.hxx> ResMgr *pSwResMgr = nullptr; bool g_bNoInterrupt = false; @@ -403,32 +404,32 @@ SfxStyleFamilies* SwModule::CreateStyleFamilies() pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Para, SW_RESSTR(STR_PARAGRAPHSTYLEFAMILY), - Image(BitmapEx(SW_RES(BMP_STYLES_FAMILY_PARA))), + Image(BitmapEx(BMP_STYLES_FAMILY_PARA)), SW_RES(RID_PARAGRAPHSTYLEFAMILY))); pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Char, SW_RESSTR(STR_CHARACTERSTYLEFAMILY), - Image(BitmapEx(SW_RES(BMP_STYLES_FAMILY_CHAR))), + Image(BitmapEx(BMP_STYLES_FAMILY_CHAR)), SW_RES(RID_CHARACTERSTYLEFAMILY))); pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Frame, SW_RESSTR(STR_FRAMESTYLEFAMILY), - Image(BitmapEx(SW_RES(BMP_STYLES_FAMILY_FRAME))), + Image(BitmapEx(BMP_STYLES_FAMILY_FRAME)), SW_RES(RID_FRAMESTYLEFAMILY))); pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Page, SW_RESSTR(STR_PAGESTYLEFAMILY), - Image(BitmapEx(SW_RES(BMP_STYLES_FAMILY_PAGE))), + Image(BitmapEx(BMP_STYLES_FAMILY_PAGE)), SW_RES(RID_PAGESTYLEFAMILY))); pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Pseudo, SW_RESSTR(STR_LISTSTYLEFAMILY), - Image(BitmapEx(SW_RES(BMP_STYLES_FAMILY_LIST))), + Image(BitmapEx(BMP_STYLES_FAMILY_LIST)), SW_RES(RID_LISTSTYLEFAMILY))); pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Table, SW_RESSTR(STR_TABLESTYLEFAMILY), - Image(BitmapEx(SW_RES(BMP_STYLES_FAMILY_TABLE))), + Image(BitmapEx(BMP_STYLES_FAMILY_TABLE)), SW_RES(RID_TABLESTYLEFAMILY))); return pStyleFamilies; diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx index 2d7a4760121d..3e2c0994de8e 100644 --- a/sw/source/uibase/dbui/dbtree.cxx +++ b/sw/source/uibase/dbui/dbtree.cxx @@ -42,6 +42,8 @@ #include <helpid.h> #include <utlui.hrc> +#include "bitmaps.hlst" +#include "bitmaps.hlst" #include <unomid.h> @@ -173,8 +175,8 @@ void SwDBTreeList::InitTreeList() SetStyle(GetStyle()|WB_HASLINES|WB_CLIPCHILDREN|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL); // don't set font, so that the Control's font is being applied! SetSpaceBetweenEntries(0); - SetNodeBitmaps(Image(BitmapEx(SW_RES(RID_BMP_COLLAPSE))), - Image(BitmapEx(SW_RES(RID_BMP_EXPAND)))); + SetNodeBitmaps(Image(BitmapEx(RID_BMP_COLLAPSE)), + Image(BitmapEx(RID_BMP_EXPAND))); SetDragDropMode(DragDropMode::APP_COPY); @@ -184,7 +186,7 @@ void SwDBTreeList::InitTreeList() const OUString* pDBNames = aDBNames.getConstArray(); long nCount = aDBNames.getLength(); - Image aImg(BitmapEx(SW_RES(RID_BMP_DB))); + Image aImg(BitmapEx(RID_BMP_DB)); for(long i = 0; i < nCount; i++) { OUString sDBName(pDBNames[i]); @@ -200,7 +202,7 @@ void SwDBTreeList::InitTreeList() void SwDBTreeList::AddDataSource(const OUString& rSource) { - Image aImg(BitmapEx(SW_RES(RID_BMP_DB))); + Image aImg(BitmapEx(RID_BMP_DB)); SvTreeListEntry* pEntry = InsertEntry(rSource, aImg, aImg, nullptr, true); SvTreeListBox::Select(pEntry); } @@ -329,7 +331,7 @@ void SwDBTreeList::RequestingChildren(SvTreeListEntry* pParent) OUString sTableName; long nCount = aTableNames.getLength(); const OUString* pTableNames = aTableNames.getConstArray(); - Image aImg(BitmapEx(SW_RES(RID_BMP_DBTABLE))); + Image aImg(BitmapEx(RID_BMP_DBTABLE)); for (long i = 0; i < nCount; i++) { sTableName = pTableNames[i]; @@ -347,7 +349,7 @@ void SwDBTreeList::RequestingChildren(SvTreeListEntry* pParent) OUString sQueryName; long nCount = aQueryNames.getLength(); const OUString* pQueryNames = aQueryNames.getConstArray(); - Image aImg(BitmapEx(SW_RES(RID_BMP_DBQUERY))); + Image aImg(BitmapEx(RID_BMP_DBQUERY)); for (long i = 0; i < nCount; i++) { sQueryName = pQueryNames[i]; diff --git a/sw/source/uibase/dbui/mailmergechildwindow.src b/sw/source/uibase/dbui/mailmergechildwindow.src index 169a08316798..067a85b5c932 100644 --- a/sw/source/uibase/dbui/mailmergechildwindow.src +++ b/sw/source/uibase/dbui/mailmergechildwindow.src @@ -25,21 +25,6 @@ String ST_CONTINUE Text[ en-US ] = "~Continue"; }; -Bitmap RID_BMP_FORMULA_CALC -{ - File = "sc20556.png"; -}; - -Bitmap RID_BMP_FORMULA_CANCEL -{ - File = "sc20557.png"; -}; - -Bitmap RID_BMP_FORMULA_APPLY -{ - File = "sc20558.png"; -}; - String ST_TASK { Text[ en-US ] = "Task"; diff --git a/sw/source/uibase/dialog/regionsw.hrc b/sw/source/uibase/dialog/regionsw.hrc index 2e49eb26ef7c..fba4caf793c2 100644 --- a/sw/source/uibase/dialog/regionsw.hrc +++ b/sw/source/uibase/dialog/regionsw.hrc @@ -27,11 +27,6 @@ #define STR_WRONG_PASSWORD (RC_REGIONSW_BEGIN+11) #define STR_WRONG_PASSWD_REPEAT (RC_REGIONSW_BEGIN+12) -#define RID_BMP_HIDE (RC_REGIONSW_BEGIN+13) -#define RID_BMP_NO_HIDE (RC_REGIONSW_BEGIN+14) -#define RID_BMP_PROT_HIDE (RC_REGIONSW_BEGIN+15) -#define RID_BMP_PROT_NO_HIDE (RC_REGIONSW_BEGIN+16) - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/dialog/regionsw.src b/sw/source/uibase/dialog/regionsw.src index ea0eb0b13e75..5692e71cb70a 100644 --- a/sw/source/uibase/dialog/regionsw.src +++ b/sw/source/uibase/dialog/regionsw.src @@ -22,26 +22,6 @@ #include "globals.hrc" #include "helpid.h" -Bitmap RID_BMP_HIDE -{ - File = "re01.png"; -}; - -Bitmap RID_BMP_NO_HIDE -{ - File = "re02.png"; -}; - -Bitmap RID_BMP_PROT_HIDE -{ - File = "re03.png"; -}; - -Bitmap RID_BMP_PROT_NO_HIDE -{ - File = "re04.png"; -}; - String STR_QUERY_CONNECT { Text[ en-US ] = "A file connection will delete the contents of the current section. Connect anyway?" ; diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx b/sw/source/uibase/docvw/PageBreakWin.cxx index 103bb496af75..1ca06e2ce527 100644 --- a/sw/source/uibase/docvw/PageBreakWin.cxx +++ b/sw/source/uibase/docvw/PageBreakWin.cxx @@ -9,6 +9,7 @@ #include <globals.hrc> #include <utlui.hrc> +#include "bitmaps.hlst" #include <cmdid.h> #include <cntfrm.hxx> @@ -171,7 +172,7 @@ void SwPageBreakWin::Paint(vcl::RenderContext& rRenderContext, const ::tools::Re aPolygon, aColor)); // Create the primitive for the image - BitmapEx aBmpEx(SW_RES(RID_BMP_PAGE_BREAK)); + BitmapEx aBmpEx(RID_BMP_PAGE_BREAK); double nImgOfstX = 3.0; if (bRtl) nImgOfstX = aRect.Right() - aBmpEx.GetSizePixel().Width() - 3.0; diff --git a/sw/source/uibase/inc/app.hrc b/sw/source/uibase/inc/app.hrc index c5dd7effd680..c337f0f63191 100644 --- a/sw/source/uibase/inc/app.hrc +++ b/sw/source/uibase/inc/app.hrc @@ -95,14 +95,8 @@ #define RID_PAGESTYLEFAMILY (RC_APP_BEGIN + 149) #define RID_LISTSTYLEFAMILY (RC_APP_BEGIN + 150) #define RID_TABLESTYLEFAMILY (RC_APP_BEGIN + 151) -#define BMP_STYLES_FAMILY_PARA (RC_APP_BEGIN + 152) -#define BMP_STYLES_FAMILY_CHAR (RC_APP_BEGIN + 153) -#define BMP_STYLES_FAMILY_FRAME (RC_APP_BEGIN + 154) -#define BMP_STYLES_FAMILY_PAGE (RC_APP_BEGIN + 155) -#define BMP_STYLES_FAMILY_LIST (RC_APP_BEGIN + 156) -#define BMP_STYLES_FAMILY_TABLE (RC_APP_BEGIN + 157) - -#define APP_ACT_END BMP_STYLES_FAMILY_TABLE + +#define APP_ACT_END RID_TABLESTYLEFAMILY #if APP_ACT_END > RC_APP_END #error Resource-Id Ueberlauf in #file, #line diff --git a/sw/source/uibase/inc/ribbar.hrc b/sw/source/uibase/inc/ribbar.hrc index 79c7cb7d46cc..5a51a490e99e 100644 --- a/sw/source/uibase/inc/ribbar.hrc +++ b/sw/source/uibase/inc/ribbar.hrc @@ -89,28 +89,7 @@ #define STR_IMGBTN_TBLFML_UP (STR_IMGBTN_START +38) #define STR_IMGBTN_TBLFML_ERR_UP (STR_IMGBTN_START +39) -#define RID_BMP_RIBBAR_NEXT (STR_IMGBTN_START +40) -#define RID_BMP_RIBBAR_PREV (STR_IMGBTN_START +41) -#define RID_BMP_RIBBAR_TBL (STR_IMGBTN_START +42) -#define RID_BMP_RIBBAR_FRM (STR_IMGBTN_START +43) -#define RID_BMP_RIBBAR_PGE (STR_IMGBTN_START +44) -#define RID_BMP_RIBBAR_DRW (STR_IMGBTN_START +45) -#define RID_BMP_RIBBAR_CTRL (STR_IMGBTN_START +46) -#define RID_BMP_RIBBAR_REG (STR_IMGBTN_START +47) -#define RID_BMP_RIBBAR_BKM (STR_IMGBTN_START +48) -#define RID_BMP_RIBBAR_GRF (STR_IMGBTN_START +49) -#define RID_BMP_RIBBAR_OLE (STR_IMGBTN_START +50) -#define RID_BMP_RIBBAR_OUTL (STR_IMGBTN_START +51) -#define RID_BMP_RIBBAR_SEL (STR_IMGBTN_START +52) -#define RID_BMP_RIBBAR_FTN (STR_IMGBTN_START +53) -#define RID_BMP_RIBBAR_MARK (STR_IMGBTN_START +54) -#define RID_BMP_RIBBAR_POSTIT (STR_IMGBTN_START +55) -#define RID_BMP_RIBBAR_REP (STR_IMGBTN_START +56) -#define RID_BMP_RIBBAR_ENTRY (STR_IMGBTN_START +57) -#define RID_BMP_RIBBAR_FORMULA (STR_IMGBTN_START +58) -#define RID_BMP_RIBBAR_ERROR (STR_IMGBTN_START +59) - -#define RC_RIBBAR_ACT_END RID_BMP_RIBBAR_ERROR +#define RC_RIBBAR_ACT_END STR_IMGBTN_TBLFML_ERR_UP #if RC_RIBBAR_ACT_END > RC_RIBBAR_END #error Resource-Id Ueberlauf in #file, #line diff --git a/sw/source/uibase/inc/shells.hrc b/sw/source/uibase/inc/shells.hrc index 3f1cbc34ff65..67ab5527da60 100644 --- a/sw/source/uibase/inc/shells.hrc +++ b/sw/source/uibase/inc/shells.hrc @@ -44,12 +44,6 @@ #define RID_OLE_TOOLBOX (RC_SHELLS_BEGIN + 22) #define RID_TOOLS_TOOLBOX (RC_SHELLS_BEGIN + 23) -#define BMP_REDLINE_INSERTED (RC_SHELLS_BEGIN + 24) -#define BMP_REDLINE_DELETED (RC_SHELLS_BEGIN + 25) -#define BMP_REDLINE_FORMATED (RC_SHELLS_BEGIN + 26) -#define BMP_REDLINE_TABLECHG (RC_SHELLS_BEGIN + 27) -#define BMP_REDLINE_FMTCOLLSET (RC_SHELLS_BEGIN + 28) - #define RID_BEZIER_TOOLBOX (RC_SHELLS_BEGIN + 33) #define STR_SWBG_PARAGRAPH (RC_SHELLS_BEGIN + 37) diff --git a/sw/source/uibase/inc/utlui.hrc b/sw/source/uibase/inc/utlui.hrc index 4ef7287428b1..45b611814616 100644 --- a/sw/source/uibase/inc/utlui.hrc +++ b/sw/source/uibase/inc/utlui.hrc @@ -141,34 +141,6 @@ #define RES_FRMEX_MENU (STR_AUTH_FIELD_END + 1) -#define RID_BMP_VIEWLAYOUT_AUTOMATIC (RC_UTLUI_BEGIN + 12) -#define RID_BMP_VIEWLAYOUT_AUTOMATIC_ACTIVE (RC_UTLUI_BEGIN + 13) -#define RID_BMP_VIEWLAYOUT_BOOKMODE (RC_UTLUI_BEGIN + 14) -#define RID_BMP_VIEWLAYOUT_BOOKMODE_ACTIVE (RC_UTLUI_BEGIN + 15) -#define RID_BMP_VIEWLAYOUT_SINGLECOLUMN (RC_UTLUI_BEGIN + 16) -#define RID_BMP_VIEWLAYOUT_SINGLECOLUMN_ACTIVE (RC_UTLUI_BEGIN + 17) -#define RID_BMP_PAGE_BREAK (RC_UTLUI_BEGIN + 18) -#define RID_BMP_NAVI_OUTLINE (RC_UTLUI_BEGIN + 19) -#define RID_BMP_NAVI_TABLE (RC_UTLUI_BEGIN + 20) -#define RID_BMP_NAVI_FRAME (RC_UTLUI_BEGIN + 21) -#define RID_BMP_NAVI_GRAPHIC (RC_UTLUI_BEGIN + 22) -#define RID_BMP_NAVI_OLE (RC_UTLUI_BEGIN + 23) -#define RID_BMP_NAVI_BOOKMARK (RC_UTLUI_BEGIN + 24) -#define RID_BMP_NAVI_REGION (RC_UTLUI_BEGIN + 25) -#define RID_BMP_NAVI_URLFIELD (RC_UTLUI_BEGIN + 26) -#define RID_BMP_NAVI_REFERENCE (RC_UTLUI_BEGIN + 27) -#define RID_BMP_NAVI_INDEX (RC_UTLUI_BEGIN + 28) -#define RID_BMP_NAVI_POSTIT (RC_UTLUI_BEGIN + 29) -#define RID_BMP_NAVI_DRAWOBJECT (RC_UTLUI_BEGIN + 30) -#define RID_BMP_DROP_REGION (RC_UTLUI_BEGIN + 31) -#define RID_BMP_DROP_LINK (RC_UTLUI_BEGIN + 32) -#define RID_BMP_DROP_COPY (RC_UTLUI_BEGIN + 33) -#define RID_BMP_COLLAPSE (RC_UTLUI_BEGIN + 34) -#define RID_BMP_EXPAND (RC_UTLUI_BEGIN + 35) -#define RID_BMP_DB (RC_UTLUI_BEGIN + 36) -#define RID_BMP_DBTABLE (RC_UTLUI_BEGIN + 37) -#define RID_BMP_DBQUERY (RC_UTLUI_BEGIN + 38) - #define UTLUI_ACT_END RES_FRMEX_MENU #if UTLUI_ACT_END > RC_UTLUI_END diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx index c375865d9365..946fa274a6db 100644 --- a/sw/source/uibase/lingu/olmenu.cxx +++ b/sw/source/uibase/lingu/olmenu.cxx @@ -29,6 +29,7 @@ #include "langhelper.hxx" #include "ndtxt.hxx" #include "olmenu.hrc" +#include "bitmaps.hlst" #include "olmenu.hxx" #include "swabstdlg.hxx" #include "swmodule.hxx" @@ -453,7 +454,7 @@ SwSpellPopup::SwSpellPopup( m_xPopupMenu->InsertSeparator(OString(), nPos++); m_xPopupMenu->InsertItem(MN_SHORT_COMMENT, aMessageText, MenuItemBits::NOSELECT, OString(), nPos++); if (bUseImagesInMenus) - m_xPopupMenu->SetItemImage(MN_SHORT_COMMENT, Image(BitmapEx(SW_RES(BMP_INFO_16)))); + m_xPopupMenu->SetItemImage(MN_SHORT_COMMENT, Image(BitmapEx(BMP_INFO_16))); // Add an item to show detailed infos if the FullCommentURL property is defined beans::PropertyValues aProperties = rResult.aErrors[ nErrorInResult ].aProperties; diff --git a/sw/source/uibase/lingu/olmenu.hrc b/sw/source/uibase/lingu/olmenu.hrc index 6d9f58c33f99..79f8373c897f 100644 --- a/sw/source/uibase/lingu/olmenu.hrc +++ b/sw/source/uibase/lingu/olmenu.hrc @@ -29,8 +29,6 @@ #define STR_RESET_TO_DEFAULT_LANGUAGE (RC_LINGU_BEGIN + 9) #define STR_EXPLANATION_LINK (RC_LINGU_BEGIN + 10) -#define BMP_INFO_16 (RC_LINGU_BEGIN + 100) - //! Don't change these values. You may break context menu modifying extensions! #define MN_IGNORE_SELECTION 201 #define MN_SHORT_COMMENT 208 diff --git a/sw/source/uibase/lingu/olmenu.src b/sw/source/uibase/lingu/olmenu.src index 36d24b73f832..ab73066c88e9 100644 --- a/sw/source/uibase/lingu/olmenu.src +++ b/sw/source/uibase/lingu/olmenu.src @@ -47,9 +47,4 @@ String STR_EXPLANATION_LINK Text [ en-US ] = "Explanations..." ; }; -Bitmap BMP_INFO_16 -{ - File = "info_16.png"; -}; - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx index 839c82ff9a53..32a9df7865b8 100644 --- a/sw/source/uibase/misc/redlndlg.cxx +++ b/sw/source/uibase/misc/redlndlg.cxx @@ -47,6 +47,7 @@ #include <vector> #include <svx/svxdlg.hxx> #include <svx/dialogs.hrc> +#include "bitmaps.hlst" #include <unomid.h> @@ -159,11 +160,11 @@ SwRedlineAcceptDlg::SwRedlineAcceptDlg(vcl::Window *pParent, VclBuilderContainer , m_bOnlyFormatedRedlines(false) , m_bRedlnAutoFormat(bAutoFormat) , m_bInhibitActivate(false) - , m_aInserted(BitmapEx(SW_RES(BMP_REDLINE_INSERTED))) - , m_aDeleted(BitmapEx(SW_RES(BMP_REDLINE_DELETED))) - , m_aFormated(BitmapEx(SW_RES(BMP_REDLINE_FORMATED))) - , m_aTableChgd(BitmapEx(SW_RES(BMP_REDLINE_TABLECHG))) - , m_aFormatCollSet(BitmapEx(SW_RES(BMP_REDLINE_FMTCOLLSET))) + , m_aInserted(BitmapEx(BMP_REDLINE_INSERTED)) + , m_aDeleted(BitmapEx(BMP_REDLINE_DELETED)) + , m_aFormated(BitmapEx(BMP_REDLINE_FORMATED)) + , m_aTableChgd(BitmapEx(BMP_REDLINE_TABLECHG)) + , m_aFormatCollSet(BitmapEx(BMP_REDLINE_FMTCOLLSET)) { m_aTabPagesCTRL->SetHelpId(HID_REDLINE_CTRL); m_pTPView = m_aTabPagesCTRL->GetViewPage(); diff --git a/sw/source/uibase/ribbar/inputwin.cxx b/sw/source/uibase/ribbar/inputwin.cxx index 81f9b0b3da4f..5c5cf145b9af 100644 --- a/sw/source/uibase/ribbar/inputwin.cxx +++ b/sw/source/uibase/ribbar/inputwin.cxx @@ -43,6 +43,7 @@ #include "edtwin.hxx" #include "helpid.h" #include "access.hrc" +#include "bitmaps.hlst" // Only for the UpdateRange: Delete the box in which the stacked cursor is positioned. #include "pam.hxx" @@ -76,11 +77,11 @@ SwInputWindow::SwInputWindow(vcl::Window* pParent, SfxDispatcher* pDispatcher) aEdit->SetSizePixel(aEdit->CalcMinimumSize()); aPos->SetSizePixel(aPos->LogicToPixel(Size(45, 11), MapMode(MapUnit::MapAppFont))); - InsertItem(FN_FORMULA_CALC, Image(BitmapEx(SW_RES(RID_BMP_FORMULA_CALC))), + InsertItem(FN_FORMULA_CALC, Image(BitmapEx(RID_BMP_FORMULA_CALC)), SW_RESSTR(STR_FORMULA_CALC)); - InsertItem(FN_FORMULA_CANCEL, Image(BitmapEx(SW_RES(RID_BMP_FORMULA_CANCEL))), + InsertItem(FN_FORMULA_CANCEL, Image(BitmapEx(RID_BMP_FORMULA_CANCEL)), SW_RESSTR(STR_FORMULA_CANCEL)); - InsertItem(FN_FORMULA_APPLY, Image(BitmapEx(SW_RES(RID_BMP_FORMULA_APPLY))), + InsertItem(FN_FORMULA_APPLY, Image(BitmapEx(RID_BMP_FORMULA_APPLY)), SW_RESSTR(STR_FORMULA_APPLY)); SetHelpId(FN_FORMULA_CALC, HID_TBX_FORMULA_CALC); diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx index f3bf91fec342..4474108a87db 100644 --- a/sw/source/uibase/ribbar/workctrl.cxx +++ b/sw/source/uibase/ribbar/workctrl.cxx @@ -48,6 +48,7 @@ #include <vcl/svapp.hxx> #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> +#include "bitmaps.hlst" // Size check #define NAVI_ENTRIES 20 @@ -181,7 +182,7 @@ static sal_uInt16 aNavigationInsertIds[ NAVI_ENTRIES ] = NID_NEXT }; -static sal_uInt16 aNavigationImgIds[ NAVI_ENTRIES ] = +static OUStringLiteral aNavigationImgIds[ NAVI_ENTRIES ] = { // -- first line RID_BMP_RIBBAR_TBL, @@ -265,7 +266,7 @@ SwScrollNaviPopup::SwScrollNaviPopup(sal_uInt16 nId, const Reference< XFrame >& sText = SW_RESSTR(STR_IMGBTN_PGE_DOWN); } - m_pToolBox->InsertItem(nNaviId, Image(BitmapEx(SW_RES(aNavigationImgIds[i]))), + m_pToolBox->InsertItem(nNaviId, Image(BitmapEx(aNavigationImgIds[i])), sText, nTbxBits); m_pToolBox->SetHelpId(nNaviId, aNavigationHelpIds[i]); } diff --git a/sw/source/uibase/ribbar/workctrl.src b/sw/source/uibase/ribbar/workctrl.src index 9054d0f33f86..3e1d2236db26 100644 --- a/sw/source/uibase/ribbar/workctrl.src +++ b/sw/source/uibase/ribbar/workctrl.src @@ -23,106 +23,6 @@ #include "helpid.h" #include "cmdid.h" -Bitmap RID_BMP_RIBBAR_NEXT -{ - File = "sr20000.png"; -}; - -Bitmap RID_BMP_RIBBAR_PREV -{ - File = "sr20001.png"; -}; - -Bitmap RID_BMP_RIBBAR_TBL -{ - File = "sr20002.png"; -}; - -Bitmap RID_BMP_RIBBAR_FRM -{ - File = "sr20003.png"; -}; - -Bitmap RID_BMP_RIBBAR_PGE -{ - File = "sr20004.png"; -}; - -Bitmap RID_BMP_RIBBAR_DRW -{ - File = "sr20005.png"; -}; - -Bitmap RID_BMP_RIBBAR_CTRL -{ - File = "sr20006.png"; -}; - -Bitmap RID_BMP_RIBBAR_REG -{ - File = "sr20007.png"; -}; - -Bitmap RID_BMP_RIBBAR_BKM -{ - File = "sr20008.png"; -}; - -Bitmap RID_BMP_RIBBAR_GRF -{ - File = "sr20009.png"; -}; - -Bitmap RID_BMP_RIBBAR_OLE -{ - File = "sr20010.png"; -}; - -Bitmap RID_BMP_RIBBAR_OUTL -{ - File = "sr20011.png"; -}; - -Bitmap RID_BMP_RIBBAR_SEL -{ - File = "sr20012.png"; -}; - -Bitmap RID_BMP_RIBBAR_FTN -{ - File = "sr20013.png"; -}; - -Bitmap RID_BMP_RIBBAR_MARK -{ - File = "sr20014.png"; -}; - -Bitmap RID_BMP_RIBBAR_POSTIT -{ - File = "sr20015.png"; -}; - -Bitmap RID_BMP_RIBBAR_REP -{ - File = "sr20016.png"; -}; - -Bitmap RID_BMP_RIBBAR_ENTRY -{ - File = "sr20017.png"; -}; - -Bitmap RID_BMP_RIBBAR_FORMULA -{ - File = "sr20018.png"; -}; - -Bitmap RID_BMP_RIBBAR_ERROR -{ - File = "sr20019.png"; -}; - String ST_TBL { Text [ en-US ] = "Table" ; diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 33eef3dc62bb..939145763a70 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -103,6 +103,7 @@ #include <modcfg.hxx> #include <ndtxt.hxx> #include <utlui.hrc> +#include "bitmaps.hlst" #include <swcont.hxx> #include <unodefaults.hxx> #include <SwXDocumentSettings.hxx> @@ -4081,26 +4082,26 @@ static Any lcl_GetDisplayBitmap(const OUString& _sLinkSuffix) OUString sLinkSuffix = _sLinkSuffix; if(!sLinkSuffix.isEmpty()) sLinkSuffix = sLinkSuffix.copy(1); - sal_uInt16 nImgId(0); + OUString sImgId; if(sLinkSuffix == "outline") - nImgId = RID_BMP_NAVI_OUTLINE; + sImgId = RID_BMP_NAVI_OUTLINE; else if(sLinkSuffix == "table") - nImgId = RID_BMP_NAVI_TABLE; + sImgId = RID_BMP_NAVI_TABLE; else if(sLinkSuffix == "frame") - nImgId = RID_BMP_NAVI_FRAME; + sImgId = RID_BMP_NAVI_FRAME; else if(sLinkSuffix == "graphic") - nImgId = RID_BMP_NAVI_GRAPHIC; + sImgId = RID_BMP_NAVI_GRAPHIC; else if(sLinkSuffix == "ole") - nImgId = RID_BMP_NAVI_OLE; + sImgId = RID_BMP_NAVI_OLE; else if(sLinkSuffix.isEmpty()) - nImgId = RID_BMP_NAVI_BOOKMARK; + sImgId = RID_BMP_NAVI_BOOKMARK; else if(sLinkSuffix == "region") - nImgId = RID_BMP_NAVI_REGION; + sImgId = RID_BMP_NAVI_REGION; - if (nImgId) + if (!sImgId.isEmpty()) { - aRet <<= VCLUnoHelper::CreateBitmap(BitmapEx(SW_RES(nImgId))); + aRet <<= VCLUnoHelper::CreateBitmap(BitmapEx(sImgId)); } return aRet; } diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index 293d0b493687..4cb03a5a7423 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -88,6 +88,7 @@ #include "swabstdlg.hxx" #include "globals.hrc" +#include "bitmaps.hlst" #include <unomid.h> #include "navmgr.hxx" @@ -1531,52 +1532,52 @@ namespace { BitmapEx GetBitmapForContentTypeId(ContentTypeId eType) { - sal_uInt16 nResId(0); + OUString sResId; switch (eType) { case ContentTypeId::OUTLINE: - nResId = RID_BMP_NAVI_OUTLINE; + sResId = RID_BMP_NAVI_OUTLINE; break; case ContentTypeId::TABLE: - nResId = RID_BMP_NAVI_TABLE; + sResId = RID_BMP_NAVI_TABLE; break; case ContentTypeId::FRAME: - nResId = RID_BMP_NAVI_FRAME; + sResId = RID_BMP_NAVI_FRAME; break; case ContentTypeId::GRAPHIC: - nResId = RID_BMP_NAVI_GRAPHIC; + sResId = RID_BMP_NAVI_GRAPHIC; break; case ContentTypeId::OLE: - nResId = RID_BMP_NAVI_OLE; + sResId = RID_BMP_NAVI_OLE; break; case ContentTypeId::BOOKMARK: - nResId = RID_BMP_NAVI_BOOKMARK; + sResId = RID_BMP_NAVI_BOOKMARK; break; case ContentTypeId::REGION: - nResId = RID_BMP_NAVI_REGION; + sResId = RID_BMP_NAVI_REGION; break; case ContentTypeId::URLFIELD: - nResId = RID_BMP_NAVI_URLFIELD; + sResId = RID_BMP_NAVI_URLFIELD; break; case ContentTypeId::REFERENCE: - nResId = RID_BMP_NAVI_REFERENCE; + sResId = RID_BMP_NAVI_REFERENCE; break; case ContentTypeId::INDEX: - nResId = RID_BMP_NAVI_INDEX; + sResId = RID_BMP_NAVI_INDEX; break; case ContentTypeId::POSTIT: - nResId = RID_BMP_NAVI_POSTIT; + sResId = RID_BMP_NAVI_POSTIT; break; case ContentTypeId::DRAWOBJECT: - nResId = RID_BMP_NAVI_DRAWOBJECT; + sResId = RID_BMP_NAVI_DRAWOBJECT; break; case ContentTypeId::UNKNOWN: SAL_WARN("sw.ui", "ContentTypeId::UNKNOWN has no bitmap preview"); break; } - return BitmapEx(SW_RES(nResId)); + return BitmapEx(sResId); }; } diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx index 0cbeb28bba74..e695ffa171e7 100644 --- a/sw/source/uibase/utlui/glbltree.cxx +++ b/sw/source/uibase/utlui/glbltree.cxx @@ -56,6 +56,7 @@ #include <utlui.hrc> #include <comcore.hrc> #include <globals.hrc> +#include "bitmaps.hlst" #include "swabstdlg.hxx" #include <memory> @@ -666,14 +667,14 @@ void SwGlobalTree::Display(bool bOnlyUpdateUserData) { const SwTOXBase* pBase = pCont->GetTOX(); sEntry = pBase->GetTitle(); - aImage = Image(Bitmap(SW_RES(RID_BMP_NAVI_INDEX))); + aImage = Image(BitmapEx(RID_BMP_NAVI_INDEX)); } break; case GLBLDOC_SECTION: { const SwSection* pSect = pCont->GetSection(); sEntry = pSect->GetSectionName(); - aImage = Image(Bitmap(SW_RES(RID_BMP_DROP_REGION))); + aImage = Image(BitmapEx(RID_BMP_DROP_REGION)); } break; } diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index 9904dd5083db..6d4df23d528e 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -54,6 +54,7 @@ #include "access.hrc" #include "globals.hrc" +#include "bitmaps.hlst" #include <unomid.h> #include <memory> @@ -1092,20 +1093,20 @@ void SwNavigationPI::SetRegionDropMode(RegionMode nNewMode) m_nRegionMode = nNewMode; m_pConfig->SetRegionMode( m_nRegionMode ); - sal_uInt16 nImageId = 0; + OUString sImageId; switch (nNewMode) { case RegionMode::NONE: - nImageId = RID_BMP_DROP_REGION; + sImageId = RID_BMP_DROP_REGION; break; case RegionMode::LINK: - nImageId = RID_BMP_DROP_LINK; + sImageId = RID_BMP_DROP_LINK; break; case RegionMode::EMBEDDED: - nImageId = RID_BMP_DROP_COPY; + sImageId = RID_BMP_DROP_COPY; break; } - m_aContentToolBox->SetItemImage(m_aContentToolBox->GetItemId("dragmode"), Image(BitmapEx(SW_RES(nImageId)))); + m_aContentToolBox->SetItemImage(m_aContentToolBox->GetItemId("dragmode"), Image(BitmapEx(sImageId))); } void SwNavigationPI::ToggleTree() diff --git a/sw/source/uibase/utlui/navipi.src b/sw/source/uibase/utlui/navipi.src index f4473ef36442..29d820afd1ec 100644 --- a/sw/source/uibase/utlui/navipi.src +++ b/sw/source/uibase/utlui/navipi.src @@ -23,81 +23,6 @@ #include "helpid.h" #include "access.hrc" -Bitmap RID_BMP_NAVI_OUTLINE -{ - File = "nc20000.png" ; -}; - -Bitmap RID_BMP_NAVI_TABLE -{ - File = "nc20001.png" ; -}; - -Bitmap RID_BMP_NAVI_FRAME -{ - File = "nc20002.png" ; -}; - -Bitmap RID_BMP_NAVI_GRAPHIC -{ - File = "nc20003.png" ; -}; - -Bitmap RID_BMP_NAVI_OLE -{ - File = "nc20004.png" ; -}; - -Bitmap RID_BMP_NAVI_BOOKMARK -{ - File = "nc20005.png" ; -}; - -Bitmap RID_BMP_NAVI_REGION -{ - File = "nc20006.png" ; -}; - -Bitmap RID_BMP_NAVI_URLFIELD -{ - File = "nc20007.png" ; -}; - -Bitmap RID_BMP_NAVI_REFERENCE -{ - File = "nc20008.png" ; -}; - -Bitmap RID_BMP_NAVI_INDEX -{ - File = "nc20009.png" ; -}; - -Bitmap RID_BMP_NAVI_POSTIT -{ - File = "nc20010.png" ; -}; - -Bitmap RID_BMP_NAVI_DRAWOBJECT -{ - File = "nc20011.png" ; -}; - -Bitmap RID_BMP_DROP_REGION -{ - File = "sc20235.png" ; -}; - -Bitmap RID_BMP_DROP_LINK -{ - File = "sc20238.png" ; -}; - -Bitmap RID_BMP_DROP_COPY -{ - File = "sc20239.png" ; -}; - String STR_ACCESS_TL_GLOBAL { Text [ en-US ] = "Global View"; diff --git a/sw/source/uibase/utlui/viewlayoutctrl.cxx b/sw/source/uibase/utlui/viewlayoutctrl.cxx index 0c7db9333786..4be0f652fe73 100644 --- a/sw/source/uibase/utlui/viewlayoutctrl.cxx +++ b/sw/source/uibase/utlui/viewlayoutctrl.cxx @@ -24,6 +24,7 @@ #include <svl/eitem.hxx> #include <svx/viewlayoutitem.hxx> #include <utlui.hrc> +#include "bitmaps.hlst" #include <swtypes.hxx> SFX_IMPL_STATUSBAR_CONTROL( SwViewLayoutControl, SvxViewLayoutItem ); @@ -45,12 +46,12 @@ SwViewLayoutControl::SwViewLayoutControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, { mpImpl->mnState = 1; - mpImpl->maImageSingleColumn = Image(BitmapEx(SW_RES(RID_BMP_VIEWLAYOUT_SINGLECOLUMN))); - mpImpl->maImageSingleColumn_Active = Image(BitmapEx(SW_RES(RID_BMP_VIEWLAYOUT_SINGLECOLUMN_ACTIVE))); - mpImpl->maImageAutomatic = Image(BitmapEx(SW_RES(RID_BMP_VIEWLAYOUT_AUTOMATIC))); - mpImpl->maImageAutomatic_Active = Image(BitmapEx(SW_RES(RID_BMP_VIEWLAYOUT_AUTOMATIC_ACTIVE))); - mpImpl->maImageBookMode = Image(BitmapEx(SW_RES(RID_BMP_VIEWLAYOUT_BOOKMODE))); - mpImpl->maImageBookMode_Active = Image(BitmapEx(SW_RES(RID_BMP_VIEWLAYOUT_BOOKMODE_ACTIVE))); + mpImpl->maImageSingleColumn = Image(BitmapEx(RID_BMP_VIEWLAYOUT_SINGLECOLUMN)); + mpImpl->maImageSingleColumn_Active = Image(BitmapEx(RID_BMP_VIEWLAYOUT_SINGLECOLUMN_ACTIVE)); + mpImpl->maImageAutomatic = Image(BitmapEx(RID_BMP_VIEWLAYOUT_AUTOMATIC)); + mpImpl->maImageAutomatic_Active = Image(BitmapEx(RID_BMP_VIEWLAYOUT_AUTOMATIC_ACTIVE)); + mpImpl->maImageBookMode = Image(BitmapEx(RID_BMP_VIEWLAYOUT_BOOKMODE)); + mpImpl->maImageBookMode_Active = Image(BitmapEx(RID_BMP_VIEWLAYOUT_BOOKMODE_ACTIVE)); } SwViewLayoutControl::~SwViewLayoutControl() |