From b61565ebb088add81fd582a0a6aaff67c4b40a14 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 12 Dec 2016 10:22:02 +0000 Subject: remove another imagelist Change-Id: Ica62a13b19134030c6f0e2eeaf41df3c0f1294a4 --- sw/source/uibase/dbui/dbtree.cxx | 15 +++++++-------- sw/source/uibase/inc/changedb.hxx | 2 -- sw/source/uibase/inc/dbtree.hxx | 2 -- sw/source/uibase/inc/utlui.hrc | 14 +++++--------- 4 files changed, 12 insertions(+), 21 deletions(-) (limited to 'sw/source/uibase') diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx index 0b2712510793..d4d786a74316 100644 --- a/sw/source/uibase/dbui/dbtree.cxx +++ b/sw/source/uibase/dbui/dbtree.cxx @@ -139,7 +139,6 @@ Reference SwDBTreeList_Impl::GetConnection(const OUString& rSource SwDBTreeList::SwDBTreeList(vcl::Window *pParent, WinBits nStyle) : SvTreeListBox(pParent, nStyle) - , aImageList(SW_RES(ILIST_DB_DLG)) , bInitialized(false) , bShowColumns(false) , pImpl(new SwDBTreeList_Impl) @@ -175,8 +174,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( aImageList.GetImage(IMG_COLLAPSE), - aImageList.GetImage(IMG_EXPAND ) ); + SetNodeBitmaps(Image(BitmapEx(SW_RES(RID_BMP_COLLAPSE))), + Image(BitmapEx(SW_RES(RID_BMP_EXPAND)))); SetDragDropMode(DragDropMode::APP_COPY); @@ -186,7 +185,7 @@ void SwDBTreeList::InitTreeList() const OUString* pDBNames = aDBNames.getConstArray(); long nCount = aDBNames.getLength(); - Image aImg = aImageList.GetImage(IMG_DB); + Image aImg(BitmapEx(SW_RES(RID_BMP_DB))); for(long i = 0; i < nCount; i++) { OUString sDBName(pDBNames[i]); @@ -200,9 +199,9 @@ void SwDBTreeList::InitTreeList() bInitialized = true; } -void SwDBTreeList::AddDataSource(const OUString& rSource) +void SwDBTreeList::AddDataSource(const OUString& rSource) { - Image aImg = aImageList.GetImage(IMG_DB); + Image aImg(BitmapEx(SW_RES(RID_BMP_DB))); SvTreeListEntry* pEntry = InsertEntry(rSource, aImg, aImg, nullptr, true); SvTreeListBox::Select(pEntry); } @@ -331,7 +330,7 @@ void SwDBTreeList::RequestingChildren(SvTreeListEntry* pParent) OUString sTableName; long nCount = aTableNames.getLength(); const OUString* pTableNames = aTableNames.getConstArray(); - Image aImg = aImageList.GetImage(IMG_DBTABLE); + Image aImg(BitmapEx(SW_RES(RID_BMP_DBTABLE))); for (long i = 0; i < nCount; i++) { sTableName = pTableNames[i]; @@ -349,7 +348,7 @@ void SwDBTreeList::RequestingChildren(SvTreeListEntry* pParent) OUString sQueryName; long nCount = aQueryNames.getLength(); const OUString* pQueryNames = aQueryNames.getConstArray(); - Image aImg = aImageList.GetImage(IMG_DBQUERY); + Image aImg(BitmapEx(SW_RES(RID_BMP_DBQUERY))); for (long i = 0; i < nCount; i++) { sQueryName = pQueryNames[i]; diff --git a/sw/source/uibase/inc/changedb.hxx b/sw/source/uibase/inc/changedb.hxx index 49f57594f866..0a1233420df3 100644 --- a/sw/source/uibase/inc/changedb.hxx +++ b/sw/source/uibase/inc/changedb.hxx @@ -40,8 +40,6 @@ class SwChangeDBDlg: public SvxStandardDialog VclPtr m_pDocDBNameFT; VclPtr m_pDefineBT; - ImageList aImageList; - SwWrtShell *pSh; DECL_LINK(TreeSelectHdl, SvTreeListBox*, void); diff --git a/sw/source/uibase/inc/dbtree.hxx b/sw/source/uibase/inc/dbtree.hxx index fb94bc51aa86..a9a43b59b606 100644 --- a/sw/source/uibase/inc/dbtree.hxx +++ b/sw/source/uibase/inc/dbtree.hxx @@ -29,8 +29,6 @@ class SwWrtShell; class SW_DLLPUBLIC SwDBTreeList : public SvTreeListBox { - ImageList aImageList; - OUString sDefDBName; bool bInitialized; bool bShowColumns; diff --git a/sw/source/uibase/inc/utlui.hrc b/sw/source/uibase/inc/utlui.hrc index 843eba476644..9a0b7c70ac12 100644 --- a/sw/source/uibase/inc/utlui.hrc +++ b/sw/source/uibase/inc/utlui.hrc @@ -145,8 +145,6 @@ #define RES_FRMEX_MENU (STR_AUTH_FIELD_END + 1) -#define ILIST_DB_DLG (RC_UTLUI_BEGIN + 6) - #define IMG_VIEWLAYOUT_AUTOMATIC (RC_UTLUI_BEGIN + 12) #define IMG_VIEWLAYOUT_AUTOMATIC_ACTIVE (RC_UTLUI_BEGIN + 13) #define IMG_VIEWLAYOUT_BOOKMODE (RC_UTLUI_BEGIN + 14) @@ -169,13 +167,11 @@ #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) - -//local ids of the Database ImageLists -#define IMG_COLLAPSE 18002 /*RID_SVXIMG_COLLAPSEDNODE*/ -#define IMG_EXPAND 18003 /*RID_SVXIMG_EXPANDEDNODE*/ -#define IMG_DB 1 -#define IMG_DBTABLE 2 -#define IMG_DBQUERY 3 +#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 -- cgit