unroll IL_VALUES ImageList

Change-Id: Id03606deaf207f579ee3c56437b37f4981538d12

icon-themes/breeze/links.txt

@@ -1299,26 +1299,25 @@ sw/res/sf03.png cmd/sc_diagramarea.png
 sw/res/sf04.png cmd/sc_showsinglepage.png
 sw/res/sf05.png cmd/sc_defaultbullet.png
 
-sw/imglst/sr20000.png cmd/sc_downsearch.png
-sw/imglst/sr20001.png cmd/sc_upsearch.png
-sw/imglst/sr20002.png cmd/sc_inserttable.png
-sw/imglst/sr20003.png cmd/sc_insertframe.png
-sw/imglst/sr20004.png cmd/sc_showsinglepage.png
-sw/imglst/sr20005d.png cmd/sc_inserthyperlink.png
-sw/imglst/sr20005.png cmd/sc_editdoc.png
-sw/imglst/sr20007.png sw/res/nc20006.png
-sw/imglst/sr20008.png cmd/sc_insertbookmark.png
-sw/imglst/sr20009.png cmd/sc_toggleobjectbeziermode.png
-sw/imglst/sr20010.png cmd/sc_drawchart.png
-sw/imglst/sr20011.png sw/res/nc20000.png
-sw/imglst/sr20012.png cmd/sc_insertreferencefield.png
-sw/imglst/sr20013.png cmd/sc_insertfootnote.png
-sw/imglst/sr20014.png dbaccess/res/exwarning.png
-sw/imglst/sr20015.png cmd/sc_insertbookmark.png
-sw/imglst/sr20016.png cmd/sc_recsearch.png
-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/res/sr20000.png cmd/sc_downsearch.png
+sw/res/sr20001.png cmd/sc_upsearch.png
+sw/res/sr20002.png cmd/sc_inserttable.png
+sw/res/sr20003.png cmd/sc_insertframe.png
+sw/res/sr20004.png cmd/sc_showsinglepage.png
+sw/res/sr20005.png cmd/sc_editdoc.png
+sw/res/sr20007.png sw/res/nc20006.png
+sw/res/sr20008.png cmd/sc_insertbookmark.png
+sw/res/sr20009.png cmd/sc_toggleobjectbeziermode.png
+sw/res/sr20010.png cmd/sc_drawchart.png
+sw/res/sr20011.png sw/res/nc20000.png
+sw/res/sr20012.png cmd/sc_insertreferencefield.png
+sw/res/sr20013.png cmd/sc_insertfootnote.png
+sw/res/sr20014.png dbaccess/res/exwarning.png
+sw/res/sr20015.png cmd/sc_insertbookmark.png
+sw/res/sr20016.png cmd/sc_recsearch.png
+sw/res/sr20017.png cmd/sc_insertindexesentry.png
+sw/res/sr20018.png cmd/sc_inserttable.png
+sw/res/sr20019.png cmd/sc_remove.png
 
 sw/res/sx03.png cmd/sc_dbqueryedit.png
 

icon-themes/breeze_dark/links.txt

@@ -1295,26 +1295,25 @@ sw/res/sf03.png cmd/sc_diagramarea.png
 sw/res/sf04.png cmd/sc_showsinglepage.png
 sw/res/sf05.png cmd/sc_defaultbullet.png
 
-sw/imglst/sr20000.png cmd/sc_downsearch.png
-sw/imglst/sr20001.png cmd/sc_upsearch.png
-sw/imglst/sr20002.png cmd/sc_inserttable.png
-sw/imglst/sr20003.png cmd/sc_insertframe.png
-sw/imglst/sr20004.png cmd/sc_showsinglepage.png
-sw/imglst/sr20005d.png cmd/sc_inserthyperlink.png
-sw/imglst/sr20005.png cmd/sc_editdoc.png
-sw/imglst/sr20007.png sw/res/nc20006.png
-sw/imglst/sr20008.png cmd/sc_insertbookmark.png
-sw/imglst/sr20009.png cmd/sc_toggleobjectbeziermode.png
-sw/imglst/sr20010.png cmd/sc_drawchart.png
-sw/imglst/sr20011.png sw/res/nc20000.png
-sw/imglst/sr20012.png cmd/sc_insertreferencefield.png
-sw/imglst/sr20013.png cmd/sc_insertfootnote.png
-sw/imglst/sr20014.png dbaccess/res/exwarning.png
-sw/imglst/sr20015.png cmd/sc_insertbookmark.png
-sw/imglst/sr20016.png cmd/sc_recsearch.png
-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/res/sr20000.png cmd/sc_downsearch.png
+sw/res/sr20001.png cmd/sc_upsearch.png
+sw/res/sr20002.png cmd/sc_inserttable.png
+sw/res/sr20003.png cmd/sc_insertframe.png
+sw/res/sr20004.png cmd/sc_showsinglepage.png
+sw/res/sr20005.png cmd/sc_editdoc.png
+sw/res/sr20007.png sw/res/nc20006.png
+sw/res/sr20008.png cmd/sc_insertbookmark.png
+sw/res/sr20009.png cmd/sc_toggleobjectbeziermode.png
+sw/res/sr20010.png cmd/sc_drawchart.png
+sw/res/sr20011.png sw/res/nc20000.png
+sw/res/sr20012.png cmd/sc_insertreferencefield.png
+sw/res/sr20013.png cmd/sc_insertfootnote.png
+sw/res/sr20014.png dbaccess/res/exwarning.png
+sw/res/sr20015.png cmd/sc_insertbookmark.png
+sw/res/sr20016.png cmd/sc_recsearch.png
+sw/res/sr20017.png cmd/sc_insertindexesentry.png
+sw/res/sr20018.png cmd/sc_inserttable.png
+sw/res/sr20019.png cmd/sc_remove.png
 
 sw/res/sx03.png cmd/sc_dbqueryedit.png
 

icon-themes/breeze_svg/links.txt

@@ -1261,26 +1261,25 @@ sw/res/sf03.png cmd/sc_diagramarea.png
 sw/res/sf04.png cmd/sc_showsinglepage.png
 sw/res/sf05.png cmd/sc_defaultbullet.png
 
-sw/imglst/sr20000.png cmd/sc_downsearch.png
-sw/imglst/sr20001.png cmd/sc_upsearch.png
-sw/imglst/sr20002.png cmd/sc_inserttable.png
-sw/imglst/sr20003.png cmd/sc_insertframe.png
-sw/imglst/sr20004.png cmd/sc_showsinglepage.png
-sw/imglst/sr20005d.png cmd/sc_inserthyperlink.png
-sw/imglst/sr20005.png cmd/sc_editdoc.png
-sw/imglst/sr20007.png sw/res/nc20006.png
-sw/imglst/sr20008.png cmd/sc_insertbookmark.png
-sw/imglst/sr20009.png cmd/sc_toggleobjectbeziermode.png
-sw/imglst/sr20010.png cmd/sc_drawchart.png
-sw/imglst/sr20011.png sw/res/nc20000.png
-sw/imglst/sr20012.png cmd/sc_insertreferencefield.png
-sw/imglst/sr20013.png cmd/sc_insertfootnote.png
-sw/imglst/sr20014.png dbaccess/res/exwarning.png
-sw/imglst/sr20015.png cmd/sc_insertbookmark.png
-sw/imglst/sr20016.png cmd/sc_recsearch.png
-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/res/sr20000.png cmd/sc_downsearch.png
+sw/res/sr20001.png cmd/sc_upsearch.png
+sw/res/sr20002.png cmd/sc_inserttable.png
+sw/res/sr20003.png cmd/sc_insertframe.png
+sw/res/sr20004.png cmd/sc_showsinglepage.png
+sw/res/sr20005.png cmd/sc_editdoc.png
+sw/res/sr20007.png sw/res/nc20006.png
+sw/res/sr20008.png cmd/sc_insertbookmark.png
+sw/res/sr20009.png cmd/sc_toggleobjectbeziermode.png
+sw/res/sr20010.png cmd/sc_drawchart.png
+sw/res/sr20011.png sw/res/nc20000.png
+sw/res/sr20012.png cmd/sc_insertreferencefield.png
+sw/res/sr20013.png cmd/sc_insertfootnote.png
+sw/res/sr20014.png dbaccess/res/exwarning.png
+sw/res/sr20015.png cmd/sc_insertbookmark.png
+sw/res/sr20016.png cmd/sc_recsearch.png
+sw/res/sr20017.png cmd/sc_insertindexesentry.png
+sw/res/sr20018.png cmd/sc_inserttable.png
+sw/res/sr20019.png cmd/sc_remove.png
 
 sw/res/sx03.png cmd/sc_dbqueryedit.png
 

icon-themes/elementary/links.txt

@@ -595,23 +595,23 @@ sw/imglst/sc20249.png cmd/sc_navigator.png
 sw/imglst/sc20556.png cmd/sc_insertformula.png
 sw/imglst/sc20557.png cmd/sc_cancel.png
 sw/imglst/sc20558.png cmd/sc_ok.png
-sw/imglst/sr20000.png cmd/sc_downsearch.png
-sw/imglst/sr20001.png cmd/sc_upsearch.png
-sw/imglst/sr20002.png cmd/sc_inserttable.png
-sw/imglst/sr20003.png cmd/sc_text.png
-sw/imglst/sr20004.png sd/res/page.png
-sw/imglst/sr20005.png cmd/sc_insertdraw.png
-sw/imglst/sr20006.png cmd/sc_choosecontrols.png
-sw/imglst/sr20007.png cmd/sc_insertsection.png
-sw/imglst/sr20008.png cmd/sc_insertbookmark.png
-sw/imglst/sr20009.png cmd/sc_insertgraphic.png
-sw/imglst/sr20010.png cmd/sc_drawchart.png
-sw/imglst/sr20011.png sw/res/nc20000.png
-sw/imglst/sr20013.png cmd/sc_insertfootnote.png
-sw/imglst/sr20014.png sw/imglst/sc20183.png
-sw/imglst/sr20015.png cmd/sc_insertannotation.png
-sw/imglst/sr20016.png cmd/sc_searchdialog.png
-sw/imglst/sr20017.png cmd/sc_insertindexesentry.png
+sw/res/sr20000.png cmd/sc_downsearch.png
+sw/res/sr20001.png cmd/sc_upsearch.png
+sw/res/sr20002.png cmd/sc_inserttable.png
+sw/res/sr20003.png cmd/sc_text.png
+sw/res/sr20004.png sd/res/page.png
+sw/res/sr20005.png cmd/sc_insertdraw.png
+sw/res/sr20006.png cmd/sc_choosecontrols.png
+sw/res/sr20007.png cmd/sc_insertsection.png
+sw/res/sr20008.png cmd/sc_insertbookmark.png
+sw/res/sr20009.png cmd/sc_insertgraphic.png
+sw/res/sr20010.png cmd/sc_drawchart.png
+sw/res/sr20011.png sw/res/nc20000.png
+sw/res/sr20013.png cmd/sc_insertfootnote.png
+sw/res/sr20014.png sw/imglst/sc20183.png
+sw/res/sr20015.png cmd/sc_insertannotation.png
+sw/res/sr20016.png cmd/sc_searchdialog.png
+sw/res/sr20017.png cmd/sc_insertindexesentry.png
 sw/res/all_left.png cmd/sc_firstpage.png
 sw/res/all_right.png cmd/sc_lastpage.png
 sw/res/one_left.png cmd/sc_navigateback.png

icon-themes/sifr/links.txt

@@ -28,22 +28,22 @@ sw/res/sf01.png cmd/sc_controlcodes.png
 sw/res/sf02.png cmd/sc_bold.png
 sw/res/sf04.png cmd/sc_adddirect.png
 sw/res/sf05.png cmd/sc_defaultbullet.png
-sw/imglst/sr20000.png cmd/sc_downsearch.png
-sw/imglst/sr20001.png cmd/sc_upsearch.png
-sw/imglst/sr20002.png cmd/sc_inserttable.png
-sw/imglst/sr20003.png cmd/sc_text.png
-sw/imglst/sr20004.png cmd/sc_adddirect.png
-sw/imglst/sr20005.png cmd/sc_insertdraw.png
-sw/imglst/sr20006.png cmd/sc_choosecontrols.png
-sw/imglst/sr20007.png cmd/sc_insertsection.png
-sw/imglst/sr20008.png cmd/sc_insertbookmark.png
-sw/imglst/sr20009.png cmd/sc_insertgraphic.png
-sw/imglst/sr20010.png cmd/sc_drawchart.png
-sw/imglst/sr20015.png cmd/sc_insertannotation.png
-sw/imglst/sr20016.png cmd/sc_searchdialog.png
-sw/imglst/sr20013.png cmd/sc_insertfootnote.png
-sw/imglst/sr20014.png sw/imglst/sc20183.png
-sw/imglst/sr20017.png cmd/sc_insertindexesentry.png
+sw/res/sr20000.png cmd/sc_downsearch.png
+sw/res/sr20001.png cmd/sc_upsearch.png
+sw/res/sr20002.png cmd/sc_inserttable.png
+sw/res/sr20003.png cmd/sc_text.png
+sw/res/sr20004.png cmd/sc_adddirect.png
+sw/res/sr20005.png cmd/sc_insertdraw.png
+sw/res/sr20006.png cmd/sc_choosecontrols.png
+sw/res/sr20007.png cmd/sc_insertsection.png
+sw/res/sr20008.png cmd/sc_insertbookmark.png
+sw/res/sr20009.png cmd/sc_insertgraphic.png
+sw/res/sr20010.png cmd/sc_drawchart.png
+sw/res/sr20015.png cmd/sc_insertannotation.png
+sw/res/sr20016.png cmd/sc_searchdialog.png
+sw/res/sr20013.png cmd/sc_insertfootnote.png
+sw/res/sr20014.png sw/imglst/sc20183.png
+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

icon-themes/tango/links.txt

@@ -314,25 +314,25 @@ sw/imglst/sc20174.png cmd/sc_moveupsubitems.png
 sw/imglst/sc20235.png cmd/sc_inserthyperlink.png
 sw/imglst/sc20239.png cmd/sc_copy.png
 sw/imglst/sc20249.png cmd/sc_navigator.png
-sw/imglst/sr20000.png cmd/sc_downsearch.png
-sw/imglst/sr20001.png cmd/sc_upsearch.png
-sw/imglst/sr20002.png cmd/sc_inserttable.png
-sw/imglst/sr20003.png cmd/sc_text.png
-sw/imglst/sr20004.png sd/res/page.png
-sw/imglst/sr20005.png cmd/sc_insertdraw.png
-sw/imglst/sr20007.png cmd/sc_insertsection.png
-sw/imglst/sr20008.png cmd/sc_insertbookmark.png
-sw/imglst/sr20009.png cmd/sc_insertgraphic.png
-sw/imglst/sr20010.png cmd/sc_drawchart.png
-sw/imglst/sr20015.png cmd/sc_insertannotation.png
-sw/imglst/sr20016.png cmd/sc_searchdialog.png
+sw/res/sr20000.png cmd/sc_downsearch.png
+sw/res/sr20001.png cmd/sc_upsearch.png
+sw/res/sr20002.png cmd/sc_inserttable.png
+sw/res/sr20003.png cmd/sc_text.png
+sw/res/sr20004.png sd/res/page.png
+sw/res/sr20005.png cmd/sc_insertdraw.png
+sw/res/sr20007.png cmd/sc_insertsection.png
+sw/res/sr20008.png cmd/sc_insertbookmark.png
+sw/res/sr20009.png cmd/sc_insertgraphic.png
+sw/res/sr20010.png cmd/sc_drawchart.png
+sw/res/sr20015.png cmd/sc_insertannotation.png
+sw/res/sr20016.png cmd/sc_searchdialog.png
 sc/res/dropcopy.png cmd/sc_copy.png
 sc/res/dropurl.png cmd/sc_inserthyperlink.png
 sd/imglst/nv09.png sc/res/droplink.png
 sw/imglst/sc20238.png sc/res/droplink.png
-sw/imglst/sr20011.png sw/res/nc20000.png
-sw/imglst/sr20013.png cmd/sc_insertfootnote.png
-sw/imglst/sr20017.png cmd/sc_insertindexesentry.png
+sw/res/sr20011.png sw/res/nc20000.png
+sw/res/sr20013.png cmd/sc_insertfootnote.png
+sw/res/sr20017.png cmd/sc_insertindexesentry.png
 starmath/res/at21717.png cmd/lc_bold.png
 starmath/res/at21718.png cmd/lc_italic.png
 starmath/res/at21719.png cmd/lc_fontheight.png

sw/inc/globals.hrc

@@ -114,8 +114,6 @@
 #define SW_STR_READONLY             (RC_GLOBALS_BEGIN + 46)
 
 #define STR_READONLY_PATH           (RC_GLOBALS_BEGIN + 47)
-//free
-#define IL_VALUES                   (RC_GLOBALS_BEGIN + 49)
 
 // INFOBOX ------------------------------------------------------------
 

sw/inc/rcid.hrc

@@ -122,7 +122,7 @@
 //      RC_INDEX_END                (RC_INDEX + 99)
 
 #define RC_RIBBAR_BEGIN             RC_RIBBAR
-#define RC_RIBBAR_END               (RC_RIBBAR_BEGIN + 79)
+#define RC_RIBBAR_END               (RC_RIBBAR_BEGIN + 99)
 
 // Global Resources
 #define RC_GLOBALS_BEGIN            RC_GLOBALS

sw/source/uibase/inc/ribbar.hrc

@@ -76,7 +76,7 @@
 #define STR_IMGBTN_TBLFML_ERR_DOWN  (STR_IMGBTN_START +19)
 
 #define STR_IMGBTN_NEXT_UP          (STR_IMGBTN_START +20)
-#define STR_IMGBTN_PREV_UP      (STR_IMGBTN_START +21)
+#define STR_IMGBTN_PREV_UP          (STR_IMGBTN_START +21)
 #define STR_IMGBTN_TBL_UP           (STR_IMGBTN_START +22)
 #define STR_IMGBTN_FRM_UP           (STR_IMGBTN_START +23)
 #define STR_IMGBTN_PGE_UP           (STR_IMGBTN_START +24)
@@ -96,7 +96,28 @@
 #define STR_IMGBTN_TBLFML_UP        (STR_IMGBTN_START +38)
 #define STR_IMGBTN_TBLFML_ERR_UP    (STR_IMGBTN_START +39)
 
-#define BTN_NAVI                    (STR_IMGBTN_START +40)
+#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 BTN_NAVI                    (STR_IMGBTN_START +60)
 
 #define RC_RIBBAR_ACT_END           BTN_NAVI
 

sw/source/uibase/inc/workctrl.hxx

@@ -90,15 +90,11 @@ class SwScrollNaviPopup : public SfxPopupWindow
 {
     VclPtr<SwScrollNaviToolBox> m_pToolBox;
     VclPtr<FixedText>           m_pInfoField;
-    ImageList       aIList;
 
     OUString        sQuickHelp[2 * NID_COUNT];
 
-    void            ApplyImageList();
-
 protected:
-        DECL_LINK(SelectHdl, ToolBox*, void);
-        virtual void        DataChanged( const DataChangedEvent& rDCEvt ) override;
+    DECL_LINK(SelectHdl, ToolBox*, void);
 
 public:
     SwScrollNaviPopup( sal_uInt16 nId, const css::uno::Reference< css::frame::XFrame >& rFrame, vcl::Window *pParent );

sw/source/uibase/ribbar/workctrl.cxx

@@ -35,7 +35,7 @@
 #include <glosdoc.hxx>
 #include <gloslst.hxx>
 #include <workctrl.hxx>
-#include <workctrl.hrc>
+#include <ribbar.hrc>
 #include <cmdid.h>
 #include <helpid.h>
 #include <wrtsh.hxx>
@@ -181,6 +181,33 @@ static sal_uInt16 aNavigationInsertIds[ NAVI_ENTRIES ] =
     NID_TABLE_FORMULA_ERROR,
     NID_NEXT
 };
+
+static sal_uInt16 aNavigationImgIds[ NAVI_ENTRIES ] =
+{
+    // -- first line
+    RID_BMP_RIBBAR_TBL,
+    RID_BMP_RIBBAR_FRM,
+    RID_BMP_RIBBAR_GRF,
+    RID_BMP_RIBBAR_OLE,
+    RID_BMP_RIBBAR_PGE,
+    RID_BMP_RIBBAR_OUTL,
+    RID_BMP_RIBBAR_MARK,
+    RID_BMP_RIBBAR_DRW,
+    RID_BMP_RIBBAR_CTRL,
+    RID_BMP_RIBBAR_PREV,
+    // -- second line
+    RID_BMP_RIBBAR_REG,
+    RID_BMP_RIBBAR_BKM,
+    RID_BMP_RIBBAR_SEL,
+    RID_BMP_RIBBAR_FTN,
+    RID_BMP_RIBBAR_POSTIT,
+    RID_BMP_RIBBAR_REP,
+    RID_BMP_RIBBAR_ENTRY,
+    RID_BMP_RIBBAR_FORMULA,
+    RID_BMP_RIBBAR_ERROR,
+    RID_BMP_RIBBAR_NEXT
+};
+
 static const char* aNavigationHelpIds[ NAVI_ENTRIES ] =
 {
     // -- first line
@@ -209,8 +236,7 @@ static const char* aNavigationHelpIds[ NAVI_ENTRIES ] =
 
 SwScrollNaviPopup::SwScrollNaviPopup(sal_uInt16 nId, const Reference< XFrame >& rFrame, vcl::Window *pParent)
     : SfxPopupWindow(nId, pParent, "FloatingNavigation",
-        "modules/swriter/ui/floatingnavigation.ui", rFrame),
-    aIList(SW_RES(IL_VALUES))
+        "modules/swriter/ui/floatingnavigation.ui", rFrame)
 {
     m_pToolBox = VclPtr<SwScrollNaviToolBox>::Create(get<vcl::Window>("box"), this, 0);
     get(m_pInfoField, "label");
@@ -239,10 +265,12 @@ SwScrollNaviPopup::SwScrollNaviPopup(sal_uInt16 nId, const Reference< XFrame >&
             else if (nNaviId == NID_NEXT)
                 sText = SW_RESSTR(STR_IMGBTN_PGE_DOWN);
         }
-        m_pToolBox->InsertItem(nNaviId, sText, nTbxBits);
-        m_pToolBox->SetHelpId( nNaviId, aNavigationHelpIds[i] );
+
+        m_pToolBox->InsertItem(nNaviId, Image(BitmapEx(SW_RES(aNavigationImgIds[i]))),
+                              sText, nTbxBits);
+        m_pToolBox->SetHelpId(nNaviId, aNavigationHelpIds[i]);
     }
-    ApplyImageList();
+
     m_pToolBox->InsertBreak(NID_COUNT/2);
 
     // these are global strings
@@ -272,24 +300,6 @@ void SwScrollNaviPopup::dispose()
     SfxPopupWindow::dispose();
 }
 
-void SwScrollNaviPopup::DataChanged( const DataChangedEvent& rDCEvt )
-{
-    if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) &&
-         (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) )
-            ApplyImageList();
-
-    Window::DataChanged( rDCEvt );
-}
-
-void SwScrollNaviPopup::ApplyImageList()
-{
-    ImageList& rImgLst = aIList;
-    for(sal_uInt16 nNaviId : aNavigationInsertIds)
-    {
-        m_pToolBox->SetItemImage(nNaviId, rImgLst.GetImage(nNaviId));
-    }
-}
-
 IMPL_LINK(SwScrollNaviPopup, SelectHdl, ToolBox*, pSet, void)
 {
     sal_uInt16 nSet = pSet->GetCurItemId();

sw/source/uibase/ribbar/workctrl.hrc

@@ -1,50 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_SW_SOURCE_UIBASE_RIBBAR_WORKCTRL_HRC
-#define INCLUDED_SW_SOURCE_UIBASE_RIBBAR_WORKCTRL_HRC
-#include "ribbar.hrc"
-
-// duplicate entry! hrc and hxx
-// these Ids specifiy the action of the buttons below the scroll bar
-#define NID_START   20000
-#define NID_NEXT    20000
-#define NID_PREV    20001
-#define NID_TBL     20002
-#define NID_FRM     20003
-#define NID_PGE     20004
-#define NID_DRW     20005
-#define NID_CTRL    20006
-#define NID_REG     20007
-#define NID_BKM     20008
-#define NID_GRF     20009
-#define NID_OLE     20010
-#define NID_OUTL    20011
-#define NID_SEL     20012
-#define NID_FTN     20013
-#define NID_MARK    20014
-#define NID_POSTIT  20015
-#define NID_SRCH_REP 20016
-#define NID_INDEX_ENTRY  20017
-#define NID_TABLE_FORMULA   20018
-#define NID_TABLE_FORMULA_ERROR     20019
-#define NID_COUNT  20
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sw/source/uibase/ribbar/workctrl.src

@@ -19,38 +19,110 @@
 
 #include <svx/svxids.hrc>
 #include "globals.hrc"
-#include "workctrl.hrc"
+#include "ribbar.hrc"
 #include "helpid.h"
 #include "cmdid.h"
 
-ImageList IL_VALUES
+Bitmap RID_BMP_RIBBAR_NEXT
 {
-    Prefix = "sr";
-    IdList =
-    {
-        NID_NEXT ;
-        NID_PREV ;
-        NID_TBL ;
-        NID_FRM ;
-        NID_PGE ;
-        NID_DRW ;
-        NID_CTRL ;
-        NID_REG ;
-        NID_BKM ;
-        NID_GRF ;
-        NID_OLE ;
-        NID_OUTL ;
-        NID_SEL ;
-        NID_FTN ;
-        NID_MARK ;
-        NID_POSTIT ;
-        NID_SRCH_REP ;
-        NID_INDEX_ENTRY;
-        NID_TABLE_FORMULA;
-        NID_TABLE_FORMULA_ERROR;
-    };
-    IdCount = { 20 ; };
+    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" ;