33 files changed, 24 insertions, 69 deletions

diff --git a/icon-themes/crystal/sw/imglst/lc20556.png b/icon-themes/crystal/sw/res/lc20556.png
index fd0d4ac33d25..fd0d4ac33d25 100644
--- a/icon-themes/crystal/sw/imglst/lc20556.png
+++ b/icon-themes/crystal/sw/res/lc20556.png
diff --git a/icon-themes/crystal/sw/imglst/lc20557.png b/icon-themes/crystal/sw/res/lc20557.png
index 695df610b5ae..695df610b5ae 100644
--- a/icon-themes/crystal/sw/imglst/lc20557.png
+++ b/icon-themes/crystal/sw/res/lc20557.png
diff --git a/icon-themes/crystal/sw/imglst/lc20558.png b/icon-themes/crystal/sw/res/lc20558.png
index 56c10d1038a5..56c10d1038a5 100644
--- a/icon-themes/crystal/sw/imglst/lc20558.png
+++ b/icon-themes/crystal/sw/res/lc20558.png
diff --git a/icon-themes/crystal/sw/imglst/sc20556.png b/icon-themes/crystal/sw/res/sc20556.png
index 1ef6c4acb896..1ef6c4acb896 100644
--- a/icon-themes/crystal/sw/imglst/sc20556.png
+++ b/icon-themes/crystal/sw/res/sc20556.png
diff --git a/icon-themes/crystal/sw/imglst/sc20557.png b/icon-themes/crystal/sw/res/sc20557.png
index 5f7a162e72b6..5f7a162e72b6 100644
--- a/icon-themes/crystal/sw/imglst/sc20557.png
+++ b/icon-themes/crystal/sw/res/sc20557.png
diff --git a/icon-themes/crystal/sw/imglst/sc20558.png b/icon-themes/crystal/sw/res/sc20558.png
index 38db62bac905..38db62bac905 100644
--- a/icon-themes/crystal/sw/imglst/sc20558.png
+++ b/icon-themes/crystal/sw/res/sc20558.png
diff --git a/icon-themes/galaxy/sw/imglst/lc20556.png b/icon-themes/galaxy/sw/res/lc20556.png
index fc638557a14d..fc638557a14d 100644
--- a/icon-themes/galaxy/sw/imglst/lc20556.png
+++ b/icon-themes/galaxy/sw/res/lc20556.png
diff --git a/icon-themes/galaxy/sw/imglst/lc20557.png b/icon-themes/galaxy/sw/res/lc20557.png
index 9d0a13dc7c28..9d0a13dc7c28 100644
--- a/icon-themes/galaxy/sw/imglst/lc20557.png
+++ b/icon-themes/galaxy/sw/res/lc20557.png
diff --git a/icon-themes/galaxy/sw/imglst/lc20558.png b/icon-themes/galaxy/sw/res/lc20558.png
index db24f4f2e70a..db24f4f2e70a 100644
--- a/icon-themes/galaxy/sw/imglst/lc20558.png
+++ b/icon-themes/galaxy/sw/res/lc20558.png
diff --git a/icon-themes/galaxy/sw/imglst/sc20556.png b/icon-themes/galaxy/sw/res/sc20556.png
index cc775bc27e48..cc775bc27e48 100644
--- a/icon-themes/galaxy/sw/imglst/sc20556.png
+++ b/icon-themes/galaxy/sw/res/sc20556.png
diff --git a/icon-themes/galaxy/sw/imglst/sc20557.png b/icon-themes/galaxy/sw/res/sc20557.png
index 00302086bfcb..00302086bfcb 100644
--- a/icon-themes/galaxy/sw/imglst/sc20557.png
+++ b/icon-themes/galaxy/sw/res/sc20557.png
diff --git a/icon-themes/galaxy/sw/imglst/sc20558.png b/icon-themes/galaxy/sw/res/sc20558.png
index 9c7dba06e981..9c7dba06e981 100644
--- a/icon-themes/galaxy/sw/imglst/sc20558.png
+++ b/icon-themes/galaxy/sw/res/sc20558.png
diff --git a/icon-themes/hicontrast/sw/imglst/lc20556.png b/icon-themes/hicontrast/sw/res/lc20556.png
index f6b5b508c480..f6b5b508c480 100644
--- a/icon-themes/hicontrast/sw/imglst/lc20556.png
+++ b/icon-themes/hicontrast/sw/res/lc20556.png
diff --git a/icon-themes/hicontrast/sw/imglst/lc20557.png b/icon-themes/hicontrast/sw/res/lc20557.png
index ed3d8f3b68e3..ed3d8f3b68e3 100644
--- a/icon-themes/hicontrast/sw/imglst/lc20557.png
+++ b/icon-themes/hicontrast/sw/res/lc20557.png
diff --git a/icon-themes/hicontrast/sw/imglst/lc20558.png b/icon-themes/hicontrast/sw/res/lc20558.png
index ac65e8fea6fa..ac65e8fea6fa 100644
--- a/icon-themes/hicontrast/sw/imglst/lc20558.png
+++ b/icon-themes/hicontrast/sw/res/lc20558.png
diff --git a/icon-themes/hicontrast/sw/imglst/sc20556.png b/icon-themes/hicontrast/sw/res/sc20556.png
index bedf5a1cb1ab..bedf5a1cb1ab 100644
--- a/icon-themes/hicontrast/sw/imglst/sc20556.png
+++ b/icon-themes/hicontrast/sw/res/sc20556.png
diff --git a/icon-themes/hicontrast/sw/imglst/sc20557.png b/icon-themes/hicontrast/sw/res/sc20557.png
index aacdc837bdf2..aacdc837bdf2 100644
--- a/icon-themes/hicontrast/sw/imglst/sc20557.png
+++ b/icon-themes/hicontrast/sw/res/sc20557.png
diff --git a/icon-themes/hicontrast/sw/imglst/sc20558.png b/icon-themes/hicontrast/sw/res/sc20558.png
index 9d9c0489e4d7..9d9c0489e4d7 100644
--- a/icon-themes/hicontrast/sw/imglst/sc20558.png
+++ b/icon-themes/hicontrast/sw/res/sc20558.png
diff --git a/icon-themes/oxygen/sw/imglst/lc20556.png b/icon-themes/oxygen/sw/res/lc20556.png
index fd0d4ac33d25..fd0d4ac33d25 100644
--- a/icon-themes/oxygen/sw/imglst/lc20556.png
+++ b/icon-themes/oxygen/sw/res/lc20556.png
diff --git a/icon-themes/oxygen/sw/imglst/lc20557.png b/icon-themes/oxygen/sw/res/lc20557.png
index 695df610b5ae..695df610b5ae 100644
--- a/icon-themes/oxygen/sw/imglst/lc20557.png
+++ b/icon-themes/oxygen/sw/res/lc20557.png
diff --git a/icon-themes/oxygen/sw/imglst/lc20558.png b/icon-themes/oxygen/sw/res/lc20558.png
index 56c10d1038a5..56c10d1038a5 100644
--- a/icon-themes/oxygen/sw/imglst/lc20558.png
+++ b/icon-themes/oxygen/sw/res/lc20558.png
diff --git a/icon-themes/oxygen/sw/imglst/sc20556.png b/icon-themes/oxygen/sw/res/sc20556.png
index 1ef6c4acb896..1ef6c4acb896 100644
--- a/icon-themes/oxygen/sw/imglst/sc20556.png
+++ b/icon-themes/oxygen/sw/res/sc20556.png
diff --git a/icon-themes/oxygen/sw/imglst/sc20557.png b/icon-themes/oxygen/sw/res/sc20557.png
index 5f7a162e72b6..5f7a162e72b6 100644
--- a/icon-themes/oxygen/sw/imglst/sc20557.png
+++ b/icon-themes/oxygen/sw/res/sc20557.png
diff --git a/icon-themes/oxygen/sw/imglst/sc20558.png b/icon-themes/oxygen/sw/res/sc20558.png
index 38db62bac905..38db62bac905 100644
--- a/icon-themes/oxygen/sw/imglst/sc20558.png
+++ b/icon-themes/oxygen/sw/res/sc20558.png
diff --git a/icon-themes/sifr/sw/imglst/lc20557.png b/icon-themes/sifr/sw/res/lc20557.png
index 91b4ecf26ed0..91b4ecf26ed0 100644
--- a/icon-themes/sifr/sw/imglst/lc20557.png
+++ b/icon-themes/sifr/sw/res/lc20557.png
diff --git a/icon-themes/sifr/sw/imglst/sc20557.png b/icon-themes/sifr/sw/res/sc20557.png
index 9e0d3b4f863b..9e0d3b4f863b 100644
--- a/icon-themes/sifr/sw/imglst/sc20557.png
+++ b/icon-themes/sifr/sw/res/sc20557.png
diff --git a/sw/inc/dbui.hrc b/sw/inc/dbui.hrc
index 5557fa379612..45418f50c5b4 100644
--- a/sw/inc/dbui.hrc
+++ b/sw/inc/dbui.hrc
@@ -82,9 +82,9 @@
 #define ST_FINISH               (RC_DBUI_BEGIN + 57)
 #define ST_ADDRESSLIST          (RC_DBUI_BEGIN + 58)
 #define ST_EXCLUDE              (RC_DBUI_BEGIN + 59)
-
-// ImageList
-#define ILIST                   (RC_DBUI_BEGIN + 62)
+#define RID_BMP_FORMULA_CALC    (RC_DBUI_BEGIN + 60)
+#define RID_BMP_FORMULA_APPLY   (RC_DBUI_BEGIN + 61)
+#define RID_BMP_FORMULA_CANCEL  (RC_DBUI_BEGIN + 62)
 
 // Elements -----------------------------------------------------------------
 #define MM_PART_TITLE                   0
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index 5989ed3220c0..9b41464deb91 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -40,33 +40,6 @@ String STR_PAGE_COUNT_MACRO
     Text [ en-US ] = "Changing the page count" ;
 };
 
- // Image-list ----------------------------------------------------------------
- // Don't use this image list for normal toolbar images. We have now our commandimagelist
- // folder in icon-themes/(name of theme)/cmd. This list is now only used for special toolboxes that are
- // used in floating windows.
-
-#define IMAGELIST_AND_COUNT             \
-    IdList = {                          \
-        FN_FORMULA_CALC                 ;\
-        FN_FORMULA_CANCEL               ;\
-        FN_FORMULA_APPLY                ;\
-        };                              \
-    IdCount = {                         \
-        3;                              \
-    };
-
-ImageList RID_DEFAULTIMAGELIST_SC
-{
-    Prefix = "sc";
-    IMAGELIST_AND_COUNT
-};
-
-ImageList RID_DEFAULTIMAGELIST_LC
-{
-    Prefix = "lc";
-    IMAGELIST_AND_COUNT
-};
-
 String STR_PARAGRAPHSTYLEFAMILY
 {
     Text [ en-US ] = "Paragraph Styles" ;
diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx
index c25da7b24e26..8c2a72be8b9d 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -35,6 +35,7 @@
 #include <vcl/msgbox.hxx>
 #include <globals.hrc>
 #include <config.hrc>
+#include <dbui.hrc>
 #include <helpid.h>
 
 using namespace ::com::sun::star;
@@ -226,6 +227,8 @@ IMPL_LINK_NOARG(SwMailConfigPage, TestHdl, Button*, void)
 
 SwTestAccountSettingsDialog::SwTestAccountSettingsDialog(SwMailConfigPage* pParent)
     : SfxModalDialog(pParent, "TestMailSettings", "modules/swriter/ui/testmailsettings.ui")
+    , m_aCompletedImg(BitmapEx(SW_RES(RID_BMP_FORMULA_APPLY)))
+    , m_aFailedImg(BitmapEx(SW_RES(RID_BMP_FORMULA_CANCEL)))
     , m_pParent(pParent)
     , m_bStop(false)
 {
@@ -244,10 +247,6 @@ SwTestAccountSettingsDialog::SwTestAccountSettingsDialog(SwMailConfigPage* pPare
     m_sCompleted = m_pResult1->GetText();
     m_sFailed = m_pResult2->GetText();
 
-    SfxImageManager* pManager = SfxImageManager::GetImageManager(*SW_MOD());
-    m_aFailedImg = pManager->GetImage(FN_FORMULA_CANCEL);
-    m_aCompletedImg = pManager->GetImage(FN_FORMULA_APPLY);
-
     m_pStopPB->SetClickHdl(LINK(this, SwTestAccountSettingsDialog, StopHdl));
 
     Application::PostUserEvent( LINK( this, SwTestAccountSettingsDialog, TestHdl ), this, true );
diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx
index aa84a12849f1..e0f9337ca968 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.cxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.cxx
@@ -260,7 +260,6 @@ SwSendMailDialog::SwSendMailDialog(vcl::Window *pParent, SwMailMergeConfigItem&
     m_sFailed(      SW_RES(ST_FAILED     )),
     m_bCancel(false),
     m_bDesctructionEnabled(false),
-    m_aImageList( SW_RES( ILIST ) ),
     m_pImpl(new SwSendMailDialog_Impl),
     m_pConfigItem(&rConfigItem),
     m_nSendCount(0),
@@ -459,7 +458,7 @@ void  SwSendMailDialog::IterateMails()
     {
         if(!SwMailMergeHelper::CheckMailAddress( pCurrentMailDescriptor->sEMail ))
         {
-            Image aInsertImg = m_aImageList.GetImage( FN_FORMULA_CANCEL );
+            Image aInsertImg(BitmapEx(SW_RES(RID_BMP_FORMULA_CANCEL)));
 
             OUString sMessage = m_sSendingTo;
             OUString sTmp(pCurrentMailDescriptor->sEMail);
@@ -555,7 +554,7 @@ void SwSendMailDialog::DocumentSent( uno::Reference< mail::XMailMessage> const &
         Application::PostUserEvent( LINK( this, SwSendMailDialog,
                                           StopSendMails ), this, true );
     }
-    Image aInsertImg = m_aImageList.GetImage( bResult ? FN_FORMULA_APPLY : FN_FORMULA_CANCEL );
+    Image aInsertImg(BitmapEx(SW_RES(bResult ? RID_BMP_FORMULA_APPLY : RID_BMP_FORMULA_CANCEL)));
 
     OUString sMessage = m_sSendingTo;
     OUString sTmp(xMessage->getRecipients()[0]);
diff --git a/sw/source/uibase/dbui/mailmergechildwindow.src b/sw/source/uibase/dbui/mailmergechildwindow.src
index f8b3ec20d176..8ce4e49fcc3d 100644
--- a/sw/source/uibase/dbui/mailmergechildwindow.src
+++ b/sw/source/uibase/dbui/mailmergechildwindow.src
@@ -30,15 +30,19 @@ String     ST_CONTINUE
     Text[ en-US ] = "~Continue";
 };
 
-ImageList ILIST
+Bitmap RID_BMP_FORMULA_CALC
 {
-    Prefix = "sc";
-    IdList =
-    {
-        FN_FORMULA_CANCEL ;
-        FN_FORMULA_APPLY  ;
-    };
-    IdCount = 2;
+    File = "sc20556.png";
+};
+
+Bitmap RID_BMP_FORMULA_CANCEL
+{
+    File = "sc20557.png";
+};
+
+Bitmap RID_BMP_FORMULA_APPLY
+{
+    File = "sc20558.png";
 };
 
 String ST_TASK
diff --git a/sw/source/uibase/inc/inputwin.hxx b/sw/source/uibase/inc/inputwin.hxx
index 8f1249d7800b..18f3408c4da4 100644
--- a/sw/source/uibase/inc/inputwin.hxx
+++ b/sw/source/uibase/inc/inputwin.hxx
@@ -83,8 +83,6 @@ public:
     virtual         ~SwInputWindow() override;
     virtual void    dispose() override;
 
-    virtual void    DataChanged( const DataChangedEvent& rDCEvt ) override;
-
     void            ShowWin();
 
     DECL_LINK( SelTableCellsNotify, SwWrtShell&, void );
diff --git a/sw/source/uibase/ribbar/inputwin.cxx b/sw/source/uibase/ribbar/inputwin.cxx
index e45cb059a1fb..64f7a6a8873a 100644
--- a/sw/source/uibase/ribbar/inputwin.cxx
+++ b/sw/source/uibase/ribbar/inputwin.cxx
@@ -51,6 +51,7 @@
 #include "swundo.hxx"
 #include "ribbar.hrc"
 #include "inputwin.hrc"
+#include "dbui.hrc"
 
 #include <IDocumentContentOperations.hxx>
 
@@ -78,13 +79,11 @@ SwInputWindow::SwInputWindow(vcl::Window* pParent, SfxDispatcher* pDispatcher)
     aEdit->SetSizePixel(aEdit->CalcMinimumSize());
     aPos->SetSizePixel(aPos->LogicToPixel(Size(45, 11), MapMode(MapUnit::MapAppFont)));
 
-    SfxImageManager* pManager = SfxImageManager::GetImageManager(*SW_MOD());
-    pManager->RegisterToolBox(this);
-    InsertItem(FN_FORMULA_CALC, pManager->GetImage(FN_FORMULA_CALC),
+    InsertItem(FN_FORMULA_CALC, Image(BitmapEx(SW_RES(RID_BMP_FORMULA_CALC))),
                SW_RESSTR(STR_FORMULA_CALC));
-    InsertItem(FN_FORMULA_CANCEL, pManager->GetImage(FN_FORMULA_CANCEL),
+    InsertItem(FN_FORMULA_CANCEL, Image(BitmapEx(SW_RES(RID_BMP_FORMULA_CANCEL))),
                SW_RESSTR(STR_FORMULA_CANCEL));
-    InsertItem(FN_FORMULA_APPLY, pManager->GetImage(FN_FORMULA_APPLY),
+    InsertItem(FN_FORMULA_APPLY, Image(BitmapEx(SW_RES(RID_BMP_FORMULA_APPLY))),
                SW_RESSTR(STR_FORMULA_APPLY));
 
     SetHelpId(FN_FORMULA_CALC, HID_TBX_FORMULA_CALC);
@@ -142,8 +141,6 @@ SwInputWindow::~SwInputWindow()
 
 void SwInputWindow::dispose()
 {
-    SfxImageManager::GetImageManager( *SW_MOD() )->ReleaseToolBox(this);
-
     // wake rulers
     if(pView)
     {
@@ -178,21 +175,6 @@ void SwInputWindow::CleanupUglyHackWithUndo()
     }
 }
 
-void SwInputWindow::DataChanged( const DataChangedEvent& rDCEvt )
-{
-    if ( rDCEvt.GetType() == DataChangedEventType::SETTINGS && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) )
-    {
-        // update item images
-        SwModule *pMod  = SW_MOD();
-        SfxImageManager *pImgMgr = SfxImageManager::GetImageManager(*pMod);
-        SetItemImage( FN_FORMULA_CALC,   pImgMgr->GetImage(FN_FORMULA_CALC   ));
-        SetItemImage( FN_FORMULA_CANCEL, pImgMgr->GetImage(FN_FORMULA_CANCEL ));
-        SetItemImage( FN_FORMULA_APPLY,  pImgMgr->GetImage(FN_FORMULA_APPLY  ));
-    }
-
-    ToolBox::DataChanged( rDCEvt );
-}
-
 void SwInputWindow::Resize()
 {
     ToolBox::Resize();