dev/null |binary icon-themes/breeze/links.txt | 2 - icon-themes/breeze_dark/links.txt | 2 - icon-themes/breeze_svg/links.txt | 2 - icon-themes/elementary/sw/res/sx01.png |binary icon-themes/elementary/sw/res/sx02.png |binary icon-themes/elementary/sw/res/sx03.png |binary icon-themes/galaxy/sw/res/sx01.png |binary icon-themes/galaxy/sw/res/sx02.png |binary icon-themes/galaxy/sw/res/sx03.png |binary icon-themes/hicontrast/sw/res/sx01.png |binary icon-themes/hicontrast/sw/res/sx02.png |binary icon-themes/hicontrast/sw/res/sx03.png |binary icon-themes/oxygen/sw/res/sx02.png |binary icon-themes/oxygen/sw/res/sx03.png |binary include/tools/multisel.hxx | 1 svtools/source/brwbox/brwbox1.cxx | 2 - sw/source/ui/fldui/changedb.cxx | 10 ++++----- sw/source/ui/utlui/utlui.src | 34 ++++++++++++++++++++++----------- 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 ++++--------- tools/source/memtools/multisel.cxx | 8 +++++++ 24 files changed, 53 insertions(+), 41 deletions(-)
New commits: commit b61565ebb088add81fd582a0a6aaff67c4b40a14 Author: Caolán McNamara <[email protected]> Date: Mon Dec 12 10:22:02 2016 +0000 remove another imagelist Change-Id: Ica62a13b19134030c6f0e2eeaf41df3c0f1294a4 diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt index 67acc1c..ecb04e2 100644 --- a/icon-themes/breeze/links.txt +++ b/icon-themes/breeze/links.txt @@ -1320,7 +1320,7 @@ sw/imglst/sr20017.png cmd/sc_insertindexesentry.png sw/imglst/sr20018.png cmd/sc_inserttable.png sw/imglst/sr20019.png cmd/sc_remove.png -sw/imglst/sx03.png cmd/sc_dbqueryedit.png +sw/res/sx03.png cmd/sc_dbqueryedit.png # res sw/res/all_left.png cmd/sc_firstrecord.png diff --git a/icon-themes/breeze_dark/links.txt b/icon-themes/breeze_dark/links.txt index a4b8e3b..e4785ce 100644 --- a/icon-themes/breeze_dark/links.txt +++ b/icon-themes/breeze_dark/links.txt @@ -1316,7 +1316,7 @@ sw/imglst/sr20017.png cmd/sc_insertindexesentry.png sw/imglst/sr20018.png cmd/sc_inserttable.png sw/imglst/sr20019.png cmd/sc_remove.png -sw/imglst/sx03.png cmd/sc_dbqueryedit.png +sw/res/sx03.png cmd/sc_dbqueryedit.png # res sw/res/all_left.png cmd/sc_firstrecord.png diff --git a/icon-themes/breeze_svg/links.txt b/icon-themes/breeze_svg/links.txt index 48d2ddb..16ce0d4 100644 --- a/icon-themes/breeze_svg/links.txt +++ b/icon-themes/breeze_svg/links.txt @@ -1282,7 +1282,7 @@ sw/imglst/sr20017.png cmd/sc_insertindexesentry.png sw/imglst/sr20018.png cmd/sc_inserttable.png sw/imglst/sr20019.png cmd/sc_remove.png -sw/imglst/sx03.png cmd/sc_dbqueryedit.png +sw/res/sx03.png cmd/sc_dbqueryedit.png # res sw/res/all_left.png cmd/sc_firstrecord.png diff --git a/icon-themes/galaxy/sw/imglst/sx01.png b/icon-themes/elementary/sw/res/sx01.png similarity index 100% rename from icon-themes/galaxy/sw/imglst/sx01.png rename to icon-themes/elementary/sw/res/sx01.png diff --git a/icon-themes/elementary/sw/imglst/sx02.png b/icon-themes/elementary/sw/res/sx02.png similarity index 100% rename from icon-themes/elementary/sw/imglst/sx02.png rename to icon-themes/elementary/sw/res/sx02.png diff --git a/icon-themes/galaxy/sw/imglst/sx03.png b/icon-themes/elementary/sw/res/sx03.png similarity index 100% rename from icon-themes/galaxy/sw/imglst/sx03.png rename to icon-themes/elementary/sw/res/sx03.png diff --git a/icon-themes/elementary/sw/imglst/sx01.png b/icon-themes/galaxy/sw/res/sx01.png similarity index 100% rename from icon-themes/elementary/sw/imglst/sx01.png rename to icon-themes/galaxy/sw/res/sx01.png diff --git a/icon-themes/galaxy/sw/imglst/sx02.png b/icon-themes/galaxy/sw/res/sx02.png similarity index 100% rename from icon-themes/galaxy/sw/imglst/sx02.png rename to icon-themes/galaxy/sw/res/sx02.png diff --git a/icon-themes/elementary/sw/imglst/sx03.png b/icon-themes/galaxy/sw/res/sx03.png similarity index 100% rename from icon-themes/elementary/sw/imglst/sx03.png rename to icon-themes/galaxy/sw/res/sx03.png diff --git a/icon-themes/hicontrast/sw/imglst/sx01.png b/icon-themes/hicontrast/sw/res/sx01.png similarity index 100% rename from icon-themes/hicontrast/sw/imglst/sx01.png rename to icon-themes/hicontrast/sw/res/sx01.png diff --git a/icon-themes/hicontrast/sw/imglst/sx02.png b/icon-themes/hicontrast/sw/res/sx02.png similarity index 100% rename from icon-themes/hicontrast/sw/imglst/sx02.png rename to icon-themes/hicontrast/sw/res/sx02.png diff --git a/icon-themes/hicontrast/sw/imglst/sx03.png b/icon-themes/hicontrast/sw/res/sx03.png similarity index 100% rename from icon-themes/hicontrast/sw/imglst/sx03.png rename to icon-themes/hicontrast/sw/res/sx03.png diff --git a/icon-themes/oxygen/sw/imglst/sx02.png b/icon-themes/oxygen/sw/res/sx02.png similarity index 100% rename from icon-themes/oxygen/sw/imglst/sx02.png rename to icon-themes/oxygen/sw/res/sx02.png diff --git a/icon-themes/oxygen/sw/imglst/sx03.png b/icon-themes/oxygen/sw/res/sx03.png similarity index 100% rename from icon-themes/oxygen/sw/imglst/sx03.png rename to icon-themes/oxygen/sw/res/sx03.png diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx index bba5bd6..576fa65 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 0b83f80..37207f4 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 0b27125..d4d786a 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 49f5759..0a12334 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 fb94bc5..a9a43b5 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 843eba4..9a0b7c7 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 commit 554ff8ef0f734cbc33644a075c83cc840fb770ab Author: Caolán McNamara <[email protected]> Date: Mon Dec 12 10:02:23 2016 +0000 coverity#1371265 Missing move assignment operator Change-Id: I5b7c6992e92e4d096b8230774ed8f4bfaaad5831 diff --git a/include/tools/multisel.hxx b/include/tools/multisel.hxx index 42ae85d..7e54c4d 100644 --- a/include/tools/multisel.hxx +++ b/include/tools/multisel.hxx @@ -66,6 +66,7 @@ public: void SetTotalRange( const Range& rTotRange ); void Insert( long nIndex, long nCount = 1 ); void Remove( long nIndex ); + void Reset(); const Range& GetTotalRange() const { return aTotRange; } long FirstSelected(); diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx index e78e654..915e0e4 100644 --- a/svtools/source/brwbox/brwbox1.cxx +++ b/svtools/source/brwbox/brwbox1.cxx @@ -1069,7 +1069,7 @@ void BrowseBox::Clear() if(bMultiSelection) { assert(uRow.pSel); - *uRow.pSel = MultiSelection(); + uRow.pSel->Reset(); } else uRow.nSel = BROWSER_ENDOFSELECTION; diff --git a/tools/source/memtools/multisel.cxx b/tools/source/memtools/multisel.cxx index bcb2336..903b1ff 100644 --- a/tools/source/memtools/multisel.cxx +++ b/tools/source/memtools/multisel.cxx @@ -72,6 +72,14 @@ MultiSelection::MultiSelection(): { } +void MultiSelection::Reset() +{ + aTotRange = Range(0, -1); + bCurValid = false; + // clear the old sub selections + ImplClear(); +} + MultiSelection::MultiSelection( const MultiSelection& rOrig ) : aTotRange(rOrig.aTotRange), nSelCount(rOrig.nSelCount),
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
