summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
Diffstat (limited to 'sw')
-rw-r--r--sw/source/ui/fldui/changedb.cxx10
-rw-r--r--sw/source/ui/utlui/utlui.src34
-rw-r--r--sw/source/uibase/dbui/dbtree.cxx15
-rw-r--r--sw/source/uibase/inc/changedb.hxx2
-rw-r--r--sw/source/uibase/inc/dbtree.hxx2
-rw-r--r--sw/source/uibase/inc/utlui.hrc14
6 files changed, 40 insertions, 37 deletions
diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index bba5bd67cbc7..576fa650ab62 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@ -53,7 +53,6 @@ using namespace ::com::sun::star::uno;
SwChangeDBDlg::SwChangeDBDlg(SwView& rVw)
: SvxStandardDialog(&rVw.GetViewFrame()->GetWindow(), "ExchangeDatabasesDialog",
"modules/swriter/ui/exchangedatabases.ui")
- , aImageList(SW_RES(ILIST_DB_DLG))
, pSh(rVw.GetWrtShellPtr())
{
get(m_pUsedDBTLB, "inuselb");
@@ -71,7 +70,8 @@ SwChangeDBDlg::SwChangeDBDlg(SwView& rVw)
m_pUsedDBTLB->SetSelectionMode(SelectionMode::Multiple);
m_pUsedDBTLB->SetStyle(m_pUsedDBTLB->GetStyle()|WB_HASLINES|WB_CLIPCHILDREN|WB_SORT|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL);
m_pUsedDBTLB->SetSpaceBetweenEntries(0);
- m_pUsedDBTLB->SetNodeBitmaps( aImageList.GetImage(IMG_COLLAPSE), aImageList.GetImage(IMG_EXPAND));
+ m_pUsedDBTLB->SetNodeBitmaps(Image(BitmapEx(SW_RES(RID_BMP_COLLAPSE))),
+ Image(BitmapEx(SW_RES(RID_BMP_EXPAND))));
Link<SvTreeListBox*,void> aLink = LINK(this, SwChangeDBDlg, TreeSelectHdl);
@@ -134,9 +134,9 @@ SvTreeListEntry* SwChangeDBDlg::Insert(const OUString& rDBName)
sal_uLong nParent = 0;
sal_uLong nChild = 0;
- Image aTableImg = aImageList.GetImage(IMG_DBTABLE);
- Image aDBImg = aImageList.GetImage(IMG_DB);
- Image aQueryImg = aImageList.GetImage(IMG_DBQUERY);
+ Image aTableImg(BitmapEx(SW_RES(RID_BMP_DBTABLE)));
+ Image aDBImg(BitmapEx(SW_RES(RID_BMP_DB)));
+ Image aQueryImg(BitmapEx(SW_RES(RID_BMP_DBQUERY)));
Image& rToInsert = nCommandType ? aQueryImg : aTableImg;
while ((pParent = m_pUsedDBTLB->GetEntry(nParent++)) != nullptr)
{
diff --git a/sw/source/ui/utlui/utlui.src b/sw/source/ui/utlui/utlui.src
index 0b83f8089ab1..37207f4b775a 100644
--- a/sw/source/ui/utlui/utlui.src
+++ b/sw/source/ui/utlui/utlui.src
@@ -324,19 +324,31 @@ String STR_HYPH_TITLE
Text [ en-US ] = "Hyphenation";
};
-ImageList ILIST_DB_DLG
+Bitmap RID_BMP_COLLAPSE
{
- Prefix = "sx";
- IdList =
- {
- IMG_COLLAPSE;
- IMG_EXPAND ;
- IMG_DB ;
- IMG_DBTABLE ;
- IMG_DBQUERY ;
- };
- IdCount = 5;
+ File = "sx18002.png";
+};
+
+Bitmap RID_BMP_EXPAND
+{
+ File = "sx18003.png";
+};
+
+Bitmap RID_BMP_DB
+{
+ File = "sx01.png";
};
+
+Bitmap RID_BMP_DBTABLE
+{
+ File = "sx02.png";
+};
+
+Bitmap RID_BMP_DBQUERY
+{
+ File = "sx03.png";
+};
+
Image IMG_VIEWLAYOUT_AUTOMATIC
{
ImageBitmap = Bitmap
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<XConnection> 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<FixedText> m_pDocDBNameFT;
VclPtr<PushButton> 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
generated by cgit (git 2.34.1) at 2024-08-16 19:54:41 +0000