remove sw bitmaps from .src files

Change-Id: I9ccd69662f9d3a77d1921b3433b0e2f541960a90
Reviewed-on: https://gerrit.libreoffice.org/37020
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

10 files changed, 28 insertions, 269 deletions

diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index 84ba7d3b33b0..ab383e24ec29 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -134,36 +134,6 @@ StringArray RID_TABLESTYLEFAMILY
     };
 };
 
-Bitmap BMP_STYLES_FAMILY_PARA
-{
-    File = "sf01.png" ;
-};
-
-Bitmap BMP_STYLES_FAMILY_CHAR
-{
-    File = "sf02.png" ;
-};
-
-Bitmap BMP_STYLES_FAMILY_FRAME
-{
-    File = "sf03.png" ;
-};
-
-Bitmap BMP_STYLES_FAMILY_PAGE
-{
-    File = "sf04.png" ;
-};
-
-Bitmap BMP_STYLES_FAMILY_LIST
-{
-    File = "sf05.png" ;
-};
-
-Bitmap BMP_STYLES_FAMILY_TABLE
-{
-    File = "sf06.png" ;
-};
-
 String STR_ENV_TITLE
 {
     Text [ en-US ] = "Envelope" ;
@@ -347,16 +317,6 @@ String STR_STATSTR_SWGPRTOLENOTIFY
     Text [ en-US ] = "Adapt Objects...";
 };
 
-Bitmap RID_GRAPHIC_REPLACEBMP
-{
-    File = "grafikei.bmp" ;
-};
-
-Bitmap RID_GRAPHIC_ERRORBMP
-{
-    File = "grafikde.bmp" ;
-};
-
 String STR_TABLE_DEFNAME
 {
     Text [ en-US ] = "Table" ;
diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx
index 5d5032c27a81..a5d2c436776e 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -35,6 +35,7 @@
 #include <globals.hrc>
 #include <config.hrc>
 #include <dbui.hrc>
+#include "bitmaps.hlst"
 #include <helpid.h>
 
 using namespace ::com::sun::star;
@@ -226,8 +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_aCompletedImg(BitmapEx(RID_BMP_FORMULA_APPLY))
+    , m_aFailedImg(BitmapEx(RID_BMP_FORMULA_CANCEL))
     , m_pParent(pParent)
     , m_bStop(false)
 {
diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx
index eaee11750ad9..c1b3ce71cfa6 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.cxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.cxx
@@ -22,6 +22,7 @@
 #include <mmconfigitem.hxx>
 #include <vcl/msgbox.hxx>
 #include <dbui.hrc>
+#include "bitmaps.hlst"
 #include <swtypes.hxx>
 
 #include <rtl/ref.hxx>
@@ -458,7 +459,7 @@ void  SwSendMailDialog::IterateMails()
     {
         if(!SwMailMergeHelper::CheckMailAddress( pCurrentMailDescriptor->sEMail ))
         {
-            Image aInsertImg(BitmapEx(SW_RES(RID_BMP_FORMULA_CANCEL)));
+            Image aInsertImg(BitmapEx(RID_BMP_FORMULA_CANCEL));
 
             OUString sMessage = m_sSendingTo;
             OUString sTmp(pCurrentMailDescriptor->sEMail);
@@ -554,7 +555,7 @@ void SwSendMailDialog::DocumentSent( uno::Reference< mail::XMailMessage> const &
         Application::PostUserEvent( LINK( this, SwSendMailDialog,
                                           StopSendMails ), this, true );
     }
-    Image aInsertImg(BitmapEx(SW_RES(bResult ? RID_BMP_FORMULA_APPLY : RID_BMP_FORMULA_CANCEL)));
+    Image aInsertImg(BitmapEx(bResult ? OUString(RID_BMP_FORMULA_APPLY) : OUString(RID_BMP_FORMULA_CANCEL)));
 
     OUString sMessage = m_sSendingTo;
     OUString sTmp(xMessage->getRecipients()[0]);
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 54afd020a52a..71f88cc83e6d 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -57,6 +57,7 @@
 #include <../../uibase/dialog/regionsw.hrc>
 #include <comcore.hrc>
 #include <globals.hrc>
+#include "bitmaps.hlst"
 #include <sfx2/bindings.hxx>
 #include <sfx2/htmlmode.hxx>
 #include <svx/dlgutil.hxx>
@@ -72,8 +73,8 @@ namespace {
 Image BuildBitmap(bool bProtect, bool bHidden)
 {
     if (bProtect)
-        return Image(BitmapEx(SW_RES(bHidden ? RID_BMP_PROT_HIDE : RID_BMP_PROT_NO_HIDE)));
-    return Image(BitmapEx(SW_RES(bHidden ? RID_BMP_HIDE : RID_BMP_NO_HIDE)));
+        return Image(BitmapEx(bHidden ? OUString(RID_BMP_PROT_HIDE) : OUString(RID_BMP_PROT_NO_HIDE)));
+    return Image(BitmapEx(bHidden ? OUString(RID_BMP_HIDE) : OUString(RID_BMP_NO_HIDE)));
 }
 
 }
diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx
index 4ed48bdf1af9..bc2a99a79d80 100644
--- a/sw/source/ui/envelp/envprt.cxx
+++ b/sw/source/ui/envelp/envprt.cxx
@@ -26,7 +26,7 @@
 #include "envlop.hxx"
 #include "uitool.hxx"
 
-#include "envprt.hrc"
+#include "bitmaps.hlst"
 
 SwEnvPrtPage::SwEnvPrtPage(vcl::Window* pParent, const SfxItemSet& rSet)
     : SfxTabPage(pParent, "EnvPrinterPage",
@@ -89,22 +89,22 @@ IMPL_LINK_NOARG(SwEnvPrtPage, ClickHdl, Button*, void)
     if (m_pBottomButton->IsChecked())
     {
         // Envelope from botton
-        m_pAlignBox->SetItemImage(m_aIds[ENV_HOR_LEFT], Image(Bitmap(SW_RES(BMP_HOR_LEFT_LOWER))));
-        m_pAlignBox->SetItemImage(m_aIds[ENV_HOR_CNTR], Image(Bitmap(SW_RES(BMP_HOR_CNTR_LOWER))));
-        m_pAlignBox->SetItemImage(m_aIds[ENV_HOR_RGHT], Image(Bitmap(SW_RES(BMP_HOR_RGHT_LOWER))));
-        m_pAlignBox->SetItemImage(m_aIds[ENV_VER_LEFT], Image(Bitmap(SW_RES(BMP_VER_LEFT_LOWER))));
-        m_pAlignBox->SetItemImage(m_aIds[ENV_VER_CNTR], Image(Bitmap(SW_RES(BMP_VER_CNTR_LOWER))));
-        m_pAlignBox->SetItemImage(m_aIds[ENV_VER_RGHT], Image(Bitmap(SW_RES(BMP_VER_RGHT_LOWER))));
+        m_pAlignBox->SetItemImage(m_aIds[ENV_HOR_LEFT], Image(BitmapEx(BMP_HOR_LEFT_LOWER)));
+        m_pAlignBox->SetItemImage(m_aIds[ENV_HOR_CNTR], Image(BitmapEx(BMP_HOR_CNTR_LOWER)));
+        m_pAlignBox->SetItemImage(m_aIds[ENV_HOR_RGHT], Image(BitmapEx(BMP_HOR_RGHT_LOWER)));
+        m_pAlignBox->SetItemImage(m_aIds[ENV_VER_LEFT], Image(BitmapEx(BMP_VER_LEFT_LOWER)));
+        m_pAlignBox->SetItemImage(m_aIds[ENV_VER_CNTR], Image(BitmapEx(BMP_VER_CNTR_LOWER)));
+        m_pAlignBox->SetItemImage(m_aIds[ENV_VER_RGHT], Image(BitmapEx(BMP_VER_RGHT_LOWER)));
     }
     else
     {
         // Envelope from top
-        m_pAlignBox->SetItemImage(m_aIds[ENV_HOR_LEFT], Image(Bitmap(SW_RES(BMP_HOR_LEFT_UPPER))));
-        m_pAlignBox->SetItemImage(m_aIds[ENV_HOR_CNTR], Image(Bitmap(SW_RES(BMP_HOR_CNTR_UPPER))));
-        m_pAlignBox->SetItemImage(m_aIds[ENV_HOR_RGHT], Image(Bitmap(SW_RES(BMP_HOR_RGHT_UPPER))));
-        m_pAlignBox->SetItemImage(m_aIds[ENV_VER_LEFT], Image(Bitmap(SW_RES(BMP_VER_LEFT_UPPER))));
-        m_pAlignBox->SetItemImage(m_aIds[ENV_VER_CNTR], Image(Bitmap(SW_RES(BMP_VER_CNTR_UPPER))));
-        m_pAlignBox->SetItemImage(m_aIds[ENV_VER_RGHT], Image(Bitmap(SW_RES(BMP_VER_RGHT_UPPER))));
+        m_pAlignBox->SetItemImage(m_aIds[ENV_HOR_LEFT], Image(BitmapEx(BMP_HOR_LEFT_UPPER)));
+        m_pAlignBox->SetItemImage(m_aIds[ENV_HOR_CNTR], Image(BitmapEx(BMP_HOR_CNTR_UPPER)));
+        m_pAlignBox->SetItemImage(m_aIds[ENV_HOR_RGHT], Image(BitmapEx(BMP_HOR_RGHT_UPPER)));
+        m_pAlignBox->SetItemImage(m_aIds[ENV_VER_LEFT], Image(BitmapEx(BMP_VER_LEFT_UPPER)));
+        m_pAlignBox->SetItemImage(m_aIds[ENV_VER_CNTR], Image(BitmapEx(BMP_VER_CNTR_UPPER)));
+        m_pAlignBox->SetItemImage(m_aIds[ENV_VER_RGHT], Image(BitmapEx(BMP_VER_RGHT_UPPER)));
     }
 }
 
diff --git a/sw/source/ui/envelp/envprt.hrc b/sw/source/ui/envelp/envprt.hrc
deleted file mode 100644
index a616dece7e8a..000000000000
--- a/sw/source/ui/envelp/envprt.hrc
+++ /dev/null
@@ -1,43 +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_UI_ENVELP_ENVPRT_HRC
-#define INCLUDED_SW_SOURCE_UI_ENVELP_ENVPRT_HRC
-
-#include "envelp.hrc"
-
-// global resources ********************************************************
-
-#define BMP_HOR_LEFT_LOWER  (RC_ENVPRT_BEGIN     )
-#define BMP_HOR_LEFT_UPPER  (RC_ENVPRT_BEGIN +  1)
-#define BMP_HOR_CNTR_LOWER  (RC_ENVPRT_BEGIN +  2)
-#define BMP_HOR_CNTR_UPPER  (RC_ENVPRT_BEGIN +  3)
-#define BMP_HOR_RGHT_LOWER  (RC_ENVPRT_BEGIN +  4)
-#define BMP_HOR_RGHT_UPPER  (RC_ENVPRT_BEGIN +  5)
-
-#define BMP_VER_LEFT_LOWER  (RC_ENVPRT_BEGIN +  6)
-#define BMP_VER_LEFT_UPPER  (RC_ENVPRT_BEGIN +  7)
-#define BMP_VER_CNTR_LOWER  (RC_ENVPRT_BEGIN +  8)
-#define BMP_VER_CNTR_UPPER  (RC_ENVPRT_BEGIN +  9)
-#define BMP_VER_RGHT_LOWER  (RC_ENVPRT_BEGIN + 10)
-#define BMP_VER_RGHT_UPPER  (RC_ENVPRT_BEGIN + 11)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/envelp/envprt.src b/sw/source/ui/envelp/envprt.src
deleted file mode 100644
index b7f9ac3ed5dc..000000000000
--- a/sw/source/ui/envelp/envprt.src
+++ /dev/null
@@ -1,74 +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 .
- */
-
-#include "envprt.hrc"
-#include "helpid.h"
-
-// Bitmaps ******************************************************************
-
-Bitmap BMP_HOR_LEFT_LOWER
-{
-    File = "envhl_l.bmp" ;
-};
-Bitmap BMP_HOR_LEFT_UPPER
-{
-    File = "envhl_u.bmp" ;
-};
-Bitmap BMP_HOR_CNTR_LOWER
-{
-    File = "envhc_l.bmp" ;
-};
-Bitmap BMP_HOR_CNTR_UPPER
-{
-    File = "envhc_u.bmp" ;
-};
-Bitmap BMP_HOR_RGHT_LOWER
-{
-    File = "envhr_l.bmp" ;
-};
-Bitmap BMP_HOR_RGHT_UPPER
-{
-    File = "envhr_u.bmp" ;
-};
-Bitmap BMP_VER_LEFT_LOWER
-{
-    File = "envvl_l.bmp" ;
-};
-Bitmap BMP_VER_LEFT_UPPER
-{
-    File = "envvl_u.bmp" ;
-};
-Bitmap BMP_VER_CNTR_LOWER
-{
-    File = "envvc_l.bmp" ;
-};
-Bitmap BMP_VER_CNTR_UPPER
-{
-    File = "envvc_u.bmp" ;
-};
-Bitmap BMP_VER_RGHT_LOWER
-{
-    File = "envvr_l.bmp" ;
-};
-Bitmap BMP_VER_RGHT_UPPER
-{
-    File = "envvr_u.bmp" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index 576fa650ab62..ab5457c89b81 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@ -41,6 +41,7 @@
 #include <fldui.hrc>
 #include <globals.hrc>
 #include <utlui.hrc>
+#include "bitmaps.hlst"
 
 #include <unomid.h>
 
@@ -70,8 +71,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(Image(BitmapEx(SW_RES(RID_BMP_COLLAPSE))),
-                                 Image(BitmapEx(SW_RES(RID_BMP_EXPAND))));
+    m_pUsedDBTLB->SetNodeBitmaps(Image(BitmapEx(RID_BMP_COLLAPSE)),
+                                 Image(BitmapEx(RID_BMP_EXPAND)));
 
     Link<SvTreeListBox*,void> aLink = LINK(this, SwChangeDBDlg, TreeSelectHdl);
 
@@ -134,9 +135,9 @@ SvTreeListEntry* SwChangeDBDlg::Insert(const OUString& rDBName)
     sal_uLong nParent = 0;
     sal_uLong nChild = 0;
 
-    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 aTableImg(BitmapEx(RID_BMP_DBTABLE));
+    Image aDBImg(BitmapEx(RID_BMP_DB));
+    Image aQueryImg(BitmapEx(RID_BMP_DBQUERY));
     Image& rToInsert = nCommandType ? aQueryImg : aTableImg;
     while ((pParent = m_pUsedDBTLB->GetEntry(nParent++)) != nullptr)
     {
diff --git a/sw/source/ui/shells/shells.src b/sw/source/ui/shells/shells.src
index f5365c5338ce..b573c47c5960 100644
--- a/sw/source/ui/shells/shells.src
+++ b/sw/source/ui/shells/shells.src
@@ -67,34 +67,6 @@ String STR_REDLINE_AUTOFMT
         Text [ en-US ] = "AutoCorrect";
 };
 
-Bitmap BMP_REDLINE_INSERTED
-{
-    File = "redline_inserted.png";
-};
-
-Bitmap BMP_REDLINE_DELETED
-{
-    File = "redline_deleted.png";
-};
-
-Bitmap BMP_REDLINE_FORMATED
-{
-    // FIXME
-    File = "redline_inserted.png";
-};
-
-Bitmap BMP_REDLINE_TABLECHG
-{
-    // FIXME
-    File = "redline_inserted.png";
-};
-
-Bitmap BMP_REDLINE_FMTCOLLSET
-{
-    // FIXME
-    File = "redline_inserted.png";
-};
-
 String STR_REDLINE_FORMATED
 {
         Text [ en-US ] = "Formats" ;
diff --git a/sw/source/ui/utlui/utlui.src b/sw/source/ui/utlui/utlui.src
index 5b3d08ba0174..c8d54c7a109d 100644
--- a/sw/source/ui/utlui/utlui.src
+++ b/sw/source/ui/utlui/utlui.src
@@ -250,64 +250,4 @@ String STR_HYPH_TITLE
     Text [ en-US ] = "Hyphenation";
 };
 
-Bitmap RID_BMP_COLLAPSE
-{
-    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";
-};
-
-Bitmap RID_BMP_VIEWLAYOUT_AUTOMATIC
-{
-    File = "twopages_10x24.png" ;
-};
-
-Bitmap RID_BMP_VIEWLAYOUT_AUTOMATIC_ACTIVE
-{
-    File = "twopages_a_10x24.png" ;
-};
-
-Bitmap RID_BMP_VIEWLAYOUT_BOOKMODE
-{
-    File = "doublepage_10x22.png" ;
-};
-
-Bitmap RID_BMP_VIEWLAYOUT_BOOKMODE_ACTIVE
-{
-    File = "doublepage_a_10x22.png" ;
-};
-
-Bitmap RID_BMP_VIEWLAYOUT_SINGLECOLUMN
-{
-    File = "emptypage_10x14.png" ;
-};
-
-Bitmap RID_BMP_VIEWLAYOUT_SINGLECOLUMN_ACTIVE
-{
-    File = "emptypage_a_10x14.png" ;
-};
-
-Bitmap RID_BMP_PAGE_BREAK
-{
-    File = "page_break.png" ;
-};
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */