diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt index 136964223b0b..98c9ee84d6d1 100644 --- a/icon-themes/breeze/links.txt +++ b/icon-themes/breeze/links.txt @@ -1049,12 +1049,12 @@ sc/res/lc26050.png cmd/lc_cancel.png sc/res/lc26051.png cmd/lc_ok.png sc/imglst/na010.png cmd/sc_selectobject.png sc/imglst/na011.png cmd/lc_ok.png -sc/imglst/nc03.png cmd/sc_viewdatasourcebrowser.png -sc/imglst/nc04.png cmd/sc_gallery.png -sc/imglst/nc05.png cmd/sc_insertobject.png -sc/imglst/nc06.png cmd/sc_showannotations.png -sc/imglst/nc07.png sc/res/droplink.png -sc/imglst/nc08.png cmd/sc_gallery.png +sc/res/nc03.png cmd/sc_viewdatasourcebrowser.png +sc/res/nc04.png cmd/sc_gallery.png +sc/res/nc05.png cmd/sc_insertobject.png +sc/res/nc06.png cmd/sc_showannotations.png +sc/res/nc07.png sc/res/droplink.png +sc/res/nc08.png cmd/sc_gallery.png sc/res/sc26047.png cmd/sc_dbviewfunctions.png sc/res/sc26048.png cmd/sc_autosum.png sc/res/sc26050.png cmd/sc_cancel.png diff --git a/icon-themes/breeze/sc/imglst/nc01.png b/icon-themes/breeze/sc/res/nc01.png similarity index 100% rename from icon-themes/breeze/sc/imglst/nc01.png rename to icon-themes/breeze/sc/res/nc01.png diff --git a/icon-themes/breeze/sc/imglst/nc02.png b/icon-themes/breeze/sc/res/nc02.png similarity index 100% rename from icon-themes/breeze/sc/imglst/nc02.png rename to icon-themes/breeze/sc/res/nc02.png diff --git a/icon-themes/breeze_dark/links.txt b/icon-themes/breeze_dark/links.txt index 5cfdd0af8d5f..bd2827063c85 100644 --- a/icon-themes/breeze_dark/links.txt +++ b/icon-themes/breeze_dark/links.txt @@ -1045,12 +1045,12 @@ sc/res/lc26050.png cmd/lc_cancel.png sc/res/lc26051.png cmd/lc_ok.png sc/imglst/na010.png cmd/sc_selectobject.png sc/imglst/na011.png cmd/lc_ok.png -sc/imglst/nc03.png cmd/sc_viewdatasourcebrowser.png -sc/imglst/nc04.png cmd/sc_gallery.png -sc/imglst/nc05.png cmd/sc_insertobject.png -sc/imglst/nc06.png cmd/sc_showannotations.png -sc/imglst/nc07.png sc/res/droplink.png -sc/imglst/nc08.png cmd/sc_gallery.png +sc/res/nc03.png cmd/sc_viewdatasourcebrowser.png +sc/res/nc04.png cmd/sc_gallery.png +sc/res/nc05.png cmd/sc_insertobject.png +sc/res/nc06.png cmd/sc_showannotations.png +sc/res/nc07.png sc/res/droplink.png +sc/res/nc08.png cmd/sc_gallery.png sc/res/sc26047.png cmd/sc_dbviewfunctions.png sc/res/sc26048.png cmd/sc_autosum.png sc/res/sc26050.png cmd/sc_cancel.png diff --git a/icon-themes/breeze_dark/sc/imglst/nc01.png b/icon-themes/breeze_dark/sc/res/nc01.png similarity index 100% rename from icon-themes/breeze_dark/sc/imglst/nc01.png rename to icon-themes/breeze_dark/sc/res/nc01.png diff --git a/icon-themes/breeze_dark/sc/imglst/nc02.png b/icon-themes/breeze_dark/sc/res/nc02.png similarity index 100% rename from icon-themes/breeze_dark/sc/imglst/nc02.png rename to icon-themes/breeze_dark/sc/res/nc02.png diff --git a/icon-themes/breeze_svg/links.txt b/icon-themes/breeze_svg/links.txt index 44d75884b0b5..adabdc3c22c1 100644 --- a/icon-themes/breeze_svg/links.txt +++ b/icon-themes/breeze_svg/links.txt @@ -1011,12 +1011,12 @@ sc/res/lc26050.png cmd/lc_cancel.png sc/res/lc26051.png cmd/lc_ok.png sc/imglst/na010.png cmd/sc_selectobject.png sc/imglst/na011.png cmd/lc_ok.png -sc/imglst/nc03.png cmd/sc_viewdatasourcebrowser.png -sc/imglst/nc04.png cmd/sc_gallery.png -sc/imglst/nc05.png cmd/sc_insertobject.png -sc/imglst/nc06.png cmd/sc_showannotations.png -sc/imglst/nc07.png sc/res/droplink.png -sc/imglst/nc08.png cmd/sc_gallery.png +sc/res/nc03.png cmd/sc_viewdatasourcebrowser.png +sc/res/nc04.png cmd/sc_gallery.png +sc/res/nc05.png cmd/sc_insertobject.png +sc/res/nc06.png cmd/sc_showannotations.png +sc/res/nc07.png sc/res/droplink.png +sc/res/nc08.png cmd/sc_gallery.png sc/res/sc26047.png cmd/sc_dbviewfunctions.png sc/res/sc26048.png cmd/sc_autosum.png sc/res/sc26050.png cmd/sc_cancel.png diff --git a/icon-themes/breeze_svg/sc/imglst/nc01.svg b/icon-themes/breeze_svg/sc/res/nc01.svg similarity index 100% rename from icon-themes/breeze_svg/sc/imglst/nc01.svg rename to icon-themes/breeze_svg/sc/res/nc01.svg diff --git a/icon-themes/breeze_svg/sc/imglst/nc02.svg b/icon-themes/breeze_svg/sc/res/nc02.svg similarity index 100% rename from icon-themes/breeze_svg/sc/imglst/nc02.svg rename to icon-themes/breeze_svg/sc/res/nc02.svg diff --git a/icon-themes/crystal/sc/imglst/nc05.png b/icon-themes/crystal/sc/res/nc05.png similarity index 100% rename from icon-themes/crystal/sc/imglst/nc05.png rename to icon-themes/crystal/sc/res/nc05.png diff --git a/icon-themes/elementary/links.txt b/icon-themes/elementary/links.txt index 30db7cd3b88e..0d43d357f122 100644 --- a/icon-themes/elementary/links.txt +++ b/icon-themes/elementary/links.txt @@ -463,11 +463,11 @@ sc/res/lc26050.png cmd/lc_cancel.png sc/res/lc26051.png cmd/lc_ok.png sc/imglst/na05.png cmd/sc_upsearch.png sc/imglst/na06.png cmd/sc_downsearch.png -sc/imglst/nc01.png cmd/sc_inserttable.png -sc/imglst/nc04.png cmd/sc_insertgraphic.png -sc/imglst/nc05.png cmd/sc_drawchart.png -sc/imglst/nc06.png cmd/sc_insertannotation.png -sc/imglst/nc08.png cmd/sc_insertdraw.png +sc/res/nc01.png cmd/sc_inserttable.png +sc/res/nc04.png cmd/sc_insertgraphic.png +sc/res/nc05.png cmd/sc_drawchart.png +sc/res/nc06.png cmd/sc_insertannotation.png +sc/res/nc08.png cmd/sc_insertdraw.png sc/res/sc26047.png cmd/sc_insertformula.png sc/res/sc26048.png cmd/sc_autosum.png sc/res/sc26050.png cmd/sc_cancel.png diff --git a/icon-themes/elementary/sc/imglst/nc02.png b/icon-themes/elementary/sc/res/nc02.png similarity index 100% rename from icon-themes/elementary/sc/imglst/nc02.png rename to icon-themes/elementary/sc/res/nc02.png diff --git a/icon-themes/elementary/sc/imglst/nc03.png b/icon-themes/elementary/sc/res/nc03.png similarity index 100% rename from icon-themes/elementary/sc/imglst/nc03.png rename to icon-themes/elementary/sc/res/nc03.png diff --git a/icon-themes/elementary/sc/imglst/nc07.png b/icon-themes/elementary/sc/res/nc07.png similarity index 100% rename from icon-themes/elementary/sc/imglst/nc07.png rename to icon-themes/elementary/sc/res/nc07.png diff --git a/icon-themes/galaxy/sc/imglst/nc01.png b/icon-themes/galaxy/sc/res/nc01.png similarity index 100% rename from icon-themes/galaxy/sc/imglst/nc01.png rename to icon-themes/galaxy/sc/res/nc01.png diff --git a/icon-themes/galaxy/sc/imglst/nc02.png b/icon-themes/galaxy/sc/res/nc02.png similarity index 100% rename from icon-themes/galaxy/sc/imglst/nc02.png rename to icon-themes/galaxy/sc/res/nc02.png diff --git a/icon-themes/galaxy/sc/imglst/nc03.png b/icon-themes/galaxy/sc/res/nc03.png similarity index 100% rename from icon-themes/galaxy/sc/imglst/nc03.png rename to icon-themes/galaxy/sc/res/nc03.png diff --git a/icon-themes/galaxy/sc/imglst/nc04.png b/icon-themes/galaxy/sc/res/nc04.png similarity index 100% rename from icon-themes/galaxy/sc/imglst/nc04.png rename to icon-themes/galaxy/sc/res/nc04.png diff --git a/icon-themes/galaxy/sc/imglst/nc05.png b/icon-themes/galaxy/sc/res/nc05.png similarity index 100% rename from icon-themes/galaxy/sc/imglst/nc05.png rename to icon-themes/galaxy/sc/res/nc05.png diff --git a/icon-themes/galaxy/sc/imglst/nc06.png b/icon-themes/galaxy/sc/res/nc06.png similarity index 100% rename from icon-themes/galaxy/sc/imglst/nc06.png rename to icon-themes/galaxy/sc/res/nc06.png diff --git a/icon-themes/galaxy/sc/imglst/nc07.png b/icon-themes/galaxy/sc/res/nc07.png similarity index 100% rename from icon-themes/galaxy/sc/imglst/nc07.png rename to icon-themes/galaxy/sc/res/nc07.png diff --git a/icon-themes/galaxy/sc/imglst/nc08.png b/icon-themes/galaxy/sc/res/nc08.png similarity index 100% rename from icon-themes/galaxy/sc/imglst/nc08.png rename to icon-themes/galaxy/sc/res/nc08.png diff --git a/icon-themes/hicontrast/sc/imglst/nc01.png b/icon-themes/hicontrast/sc/res/nc01.png similarity index 100% rename from icon-themes/hicontrast/sc/imglst/nc01.png rename to icon-themes/hicontrast/sc/res/nc01.png diff --git a/icon-themes/hicontrast/sc/imglst/nc02.png b/icon-themes/hicontrast/sc/res/nc02.png similarity index 100% rename from icon-themes/hicontrast/sc/imglst/nc02.png rename to icon-themes/hicontrast/sc/res/nc02.png diff --git a/icon-themes/hicontrast/sc/imglst/nc03.png b/icon-themes/hicontrast/sc/res/nc03.png similarity index 100% rename from icon-themes/hicontrast/sc/imglst/nc03.png rename to icon-themes/hicontrast/sc/res/nc03.png diff --git a/icon-themes/hicontrast/sc/imglst/nc04.png b/icon-themes/hicontrast/sc/res/nc04.png similarity index 100% rename from icon-themes/hicontrast/sc/imglst/nc04.png rename to icon-themes/hicontrast/sc/res/nc04.png diff --git a/icon-themes/hicontrast/sc/imglst/nc05.png b/icon-themes/hicontrast/sc/res/nc05.png similarity index 100% rename from icon-themes/hicontrast/sc/imglst/nc05.png rename to icon-themes/hicontrast/sc/res/nc05.png diff --git a/icon-themes/hicontrast/sc/imglst/nc06.png b/icon-themes/hicontrast/sc/res/nc06.png similarity index 100% rename from icon-themes/hicontrast/sc/imglst/nc06.png rename to icon-themes/hicontrast/sc/res/nc06.png diff --git a/icon-themes/hicontrast/sc/imglst/nc07.png b/icon-themes/hicontrast/sc/res/nc07.png similarity index 100% rename from icon-themes/hicontrast/sc/imglst/nc07.png rename to icon-themes/hicontrast/sc/res/nc07.png diff --git a/icon-themes/hicontrast/sc/imglst/nc08.png b/icon-themes/hicontrast/sc/res/nc08.png similarity index 100% rename from icon-themes/hicontrast/sc/imglst/nc08.png rename to icon-themes/hicontrast/sc/res/nc08.png diff --git a/icon-themes/oxygen/sc/imglst/nc01.png b/icon-themes/oxygen/sc/res/nc01.png similarity index 100% rename from icon-themes/oxygen/sc/imglst/nc01.png rename to icon-themes/oxygen/sc/res/nc01.png diff --git a/icon-themes/oxygen/sc/imglst/nc02.png b/icon-themes/oxygen/sc/res/nc02.png similarity index 100% rename from icon-themes/oxygen/sc/imglst/nc02.png rename to icon-themes/oxygen/sc/res/nc02.png diff --git a/icon-themes/oxygen/sc/imglst/nc03.png b/icon-themes/oxygen/sc/res/nc03.png similarity index 100% rename from icon-themes/oxygen/sc/imglst/nc03.png rename to icon-themes/oxygen/sc/res/nc03.png diff --git a/icon-themes/oxygen/sc/imglst/nc04.png b/icon-themes/oxygen/sc/res/nc04.png similarity index 100% rename from icon-themes/oxygen/sc/imglst/nc04.png rename to icon-themes/oxygen/sc/res/nc04.png diff --git a/icon-themes/oxygen/sc/imglst/nc05.png b/icon-themes/oxygen/sc/res/nc05.png similarity index 100% rename from icon-themes/oxygen/sc/imglst/nc05.png rename to icon-themes/oxygen/sc/res/nc05.png diff --git a/icon-themes/oxygen/sc/imglst/nc06.png b/icon-themes/oxygen/sc/res/nc06.png similarity index 100% rename from icon-themes/oxygen/sc/imglst/nc06.png rename to icon-themes/oxygen/sc/res/nc06.png diff --git a/icon-themes/oxygen/sc/imglst/nc07.png b/icon-themes/oxygen/sc/res/nc07.png similarity index 100% rename from icon-themes/oxygen/sc/imglst/nc07.png rename to icon-themes/oxygen/sc/res/nc07.png diff --git a/icon-themes/oxygen/sc/imglst/nc08.png b/icon-themes/oxygen/sc/res/nc08.png similarity index 100% rename from icon-themes/oxygen/sc/imglst/nc08.png rename to icon-themes/oxygen/sc/res/nc08.png diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt index 079d5adfaa81..a3ac5d348139 100644 --- a/icon-themes/sifr/links.txt +++ b/icon-themes/sifr/links.txt @@ -47,11 +47,11 @@ sw/res/sr20017.png cmd/sc_insertindexesentry.png # Navigator - Calc sc/imglst/na05.png cmd/sc_upsearch.png sc/imglst/na06.png cmd/sc_downsearch.png -sc/imglst/nc01.png cmd/sc_inserttable.png -sc/imglst/nc04.png cmd/sc_insertgraphic.png -sc/imglst/nc05.png cmd/sc_drawchart.png -sc/imglst/nc06.png cmd/sc_insertannotation.png -sc/imglst/nc08.png cmd/sc_insertdraw.png +sc/res/nc01.png cmd/sc_inserttable.png +sc/res/nc04.png cmd/sc_insertgraphic.png +sc/res/nc05.png cmd/sc_drawchart.png +sc/res/nc06.png cmd/sc_insertannotation.png +sc/res/nc08.png cmd/sc_insertdraw.png sc/res/table.png cmd/sc_inserttable.png # Thesaurus diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt index e77da0ea3ae3..41f509b043b7 100644 --- a/icon-themes/tango/links.txt +++ b/icon-themes/tango/links.txt @@ -279,11 +279,11 @@ svx/res/symphony/rotate_left.png cmd/sc_rotateleft.png svx/res/symphony/rotate_right.png cmd/sc_rotateright.png sc/imglst/na05.png cmd/sc_upsearch.png sc/imglst/na06.png cmd/sc_downsearch.png -sc/imglst/nc01.png cmd/sc_inserttable.png -sc/imglst/nc04.png cmd/sc_insertgraphic.png -sc/imglst/nc05.png cmd/sc_drawchart.png -sc/imglst/nc06.png cmd/sc_insertannotation.png -sc/imglst/nc08.png cmd/sc_insertdraw.png +sc/res/nc01.png cmd/sc_inserttable.png +sc/res/nc04.png cmd/sc_insertgraphic.png +sc/res/nc05.png cmd/sc_drawchart.png +sc/res/nc06.png cmd/sc_insertannotation.png +sc/res/nc08.png cmd/sc_insertdraw.png sc/res/table.png cmd/sc_inserttable.png sd/imglst/nv03.png cmd/sc_firstpage.png sd/imglst/nv04.png cmd/sc_navigateback.png diff --git a/icon-themes/tango_testing/sc/imglst/nc01.png b/icon-themes/tango_testing/sc/res/nc01.png similarity index 100% rename from icon-themes/tango_testing/sc/imglst/nc01.png rename to icon-themes/tango_testing/sc/res/nc01.png diff --git a/icon-themes/tango_testing/sc/imglst/nc02.png b/icon-themes/tango_testing/sc/res/nc02.png similarity index 100% rename from icon-themes/tango_testing/sc/imglst/nc02.png rename to icon-themes/tango_testing/sc/res/nc02.png diff --git a/icon-themes/tango_testing/sc/imglst/nc02.svg b/icon-themes/tango_testing/sc/res/nc02.svg similarity index 99% rename from icon-themes/tango_testing/sc/imglst/nc02.svg rename to icon-themes/tango_testing/sc/res/nc02.svg index 79da55326703..f0db904eb062 100644 --- a/icon-themes/tango_testing/sc/imglst/nc02.svg +++ b/icon-themes/tango_testing/sc/res/nc02.svg @@ -16,7 +16,7 @@ width="16" height="16" sodipodi:docname="nc02.svg" - inkscape:export-filename="/home/alexander/libo/icon-themes/tango_testing/sc/imglst/nc02.png" + inkscape:export-filename="/home/alexander/libo/icon-themes/tango_testing/sc/res/nc02.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90"> pParentWindow; - ImageList aEntryImages; o3tl::enumarray pRootNodes; ScContentId nRootType; // set as Root OUString aManualDoc; // Switched in Navigator (Title) diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index 5139c369dc80..9f96bd159c66 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -114,7 +114,6 @@ ScDocShell* ScContentTree::GetManualOrCurrent() ScContentTree::ScContentTree(vcl::Window* pParent, ScNavigatorDlg* pNavigatorDlg) : SvTreeListBox(pParent, WB_BORDER | WB_QUICK_SEARCH) , pParentWindow(pNavigatorDlg) - , aEntryImages(ScResId(RID_IMAGELIST_NAVCONT)) , nRootType(ScContentId::ROOT) , bHiddenDoc(false) , pHiddenDocument(nullptr) @@ -226,11 +225,11 @@ void ScContentTree::InitRoot( ScContentId nType ) return; } - const Image& rImage = aEntryImages.GetImage( (int) nType ); - OUString aName( ScResId( SCSTR_CONTENT_ROOT + (int)nType ) ); + Image aImage(BitmapEx(ScResId(RID_BMP_CONTENT_ROOT + (int)nType))); + OUString aName(ScResId(SCSTR_CONTENT_ROOT + (int)nType)); // wieder an die richtige Position: sal_uInt16 nPos = nRootType != ScContentId::ROOT ? 0 : pPosList[nType]-1; - SvTreeListEntry* pNew = InsertEntry( aName, rImage, rImage, nullptr, false, nPos ); + SvTreeListEntry* pNew = InsertEntry( aName, aImage, aImage, nullptr, false, nPos ); pRootNodes[nType] = pNew; } diff --git a/sc/source/ui/navipi/navipi.src b/sc/source/ui/navipi/navipi.src index 90e73f9ce094..58a9370d093e 100644 --- a/sc/source/ui/navipi/navipi.src +++ b/sc/source/ui/navipi/navipi.src @@ -19,22 +19,44 @@ #include "sc.hrc" -ImageList RID_IMAGELIST_NAVCONT +Bitmap RID_BMP_CONTENT_TABLE { - Prefix = "nc"; - // SC_CONTENT_... - IdList = - { - 1 ; - 2 ; - 3 ; - 4 ; - 5 ; - 6 ; - 7 ; - 8 ; - }; - IdCount = { 8 ; }; + File = "nc01.png"; +}; + +Bitmap RID_BMP_CONTENT_RANGENAME +{ + File = "nc02.png"; +}; + +Bitmap RID_BMP_CONTENT_DBAREA +{ + File = "nc03.png"; +}; + +Bitmap RID_BMP_CONTENT_GRAPHIC +{ + File = "nc04.png"; +}; + +Bitmap RID_BMP_CONTENT_OLEOBJECT +{ + File = "nc05.png"; +}; + +Bitmap RID_BMP_CONTENT_NOTE +{ + File = "nc06.png"; +}; + +Bitmap RID_BMP_CONTENT_AREALINK +{ + File = "nc07.png"; +}; + +Bitmap RID_BMP_CONTENT_DRAWING +{ + File = "nc08.png"; }; Image RID_IMG_DROP_URL diff --git a/sc/source/ui/unoobj/targuno.cxx b/sc/source/ui/unoobj/targuno.cxx index 0e080ad6d981..3180a137da08 100644 --- a/sc/source/ui/unoobj/targuno.cxx +++ b/sc/source/ui/unoobj/targuno.cxx @@ -222,9 +222,8 @@ void ScLinkTargetTypeObj::SetLinkTargetBitmap( uno::Any& rRet, sal_uInt16 nType } if (nImgId != ScContentId::ROOT) { - ImageList aEntryImages( ScResId( RID_IMAGELIST_NAVCONT ) ); - const Image& rImage = aEntryImages.GetImage( (sal_uInt16)nImgId ); - rRet <<= uno::Reference< awt::XBitmap > (VCLUnoHelper::CreateBitmap( rImage.GetBitmapEx() )); + BitmapEx aBitmapEx(ScResId(RID_BMP_CONTENT_ROOT + (int)nImgId)); + rRet <<= uno::Reference< awt::XBitmap > (VCLUnoHelper::CreateBitmap(aBitmapEx)); } }