dev/null |binary
icon-themes/crystal/sw/res/lc20556.png |binary
icon-themes/crystal/sw/res/lc20557.png |binary
icon-themes/crystal/sw/res/lc20558.png |binary
icon-themes/crystal/sw/res/sc20556.png |binary
icon-themes/crystal/sw/res/sc20557.png |binary
icon-themes/crystal/sw/res/sc20558.png |binary
icon-themes/galaxy/sw/res/lc20556.png |binary
icon-themes/galaxy/sw/res/lc20557.png |binary
icon-themes/galaxy/sw/res/lc20558.png |binary
icon-themes/galaxy/sw/res/sc20556.png |binary
icon-themes/galaxy/sw/res/sc20557.png |binary
icon-themes/galaxy/sw/res/sc20558.png |binary
icon-themes/hicontrast/sw/res/lc20556.png |binary
icon-themes/hicontrast/sw/res/lc20557.png |binary
icon-themes/hicontrast/sw/res/lc20558.png |binary
icon-themes/hicontrast/sw/res/sc20556.png |binary
icon-themes/hicontrast/sw/res/sc20557.png |binary
icon-themes/hicontrast/sw/res/sc20558.png |binary
icon-themes/oxygen/sw/res/lc20556.png |binary
icon-themes/oxygen/sw/res/lc20557.png |binary
icon-themes/oxygen/sw/res/lc20558.png |binary
icon-themes/oxygen/sw/res/sc20556.png |binary
icon-themes/oxygen/sw/res/sc20557.png |binary
icon-themes/oxygen/sw/res/sc20558.png |binary
icon-themes/sifr/sw/res/lc20557.png |binary
icon-themes/sifr/sw/res/sc20557.png |binary
sw/inc/dbui.hrc | 6 ++---
sw/source/ui/app/app.src | 27 ----------------------
sw/source/ui/config/mailconfigpage.cxx | 7 ++---
sw/source/ui/dbui/mmoutputtypepage.cxx | 5 +---
sw/source/ui/frmdlg/wrap.cxx | 15 ++----------
sw/source/ui/inc/mmresultdialogs.hxx | 2 -
sw/source/uibase/dbui/mailmergechildwindow.src | 20 ++++++++++------
sw/source/uibase/inc/inputwin.hxx | 2 -
sw/source/uibase/inc/wrap.hxx | 3 --
sw/source/uibase/ribbar/inputwin.cxx | 26 +++------------------
sw/source/uibase/sidebar/WrapPropertyPanel.cxx | 30 ++++++-------------------
sw/source/uibase/sidebar/WrapPropertyPanel.hxx | 3 --
sw/source/uibase/utlui/navipi.cxx | 6 -----
40 files changed, 36 insertions(+), 116 deletions(-)
New commits:
commit f8513683bb2eb4c4d0573334df998aea634e5257
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Dec 20 21:12:04 2016 +0000
rename ApplyImageList
Change-Id: I0af692fe338c487b6ade62c2f8558fb9fd97f558
diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx
index 68266e2..e29a814 100644
--- a/sw/source/ui/frmdlg/wrap.cxx
+++ b/sw/source/ui/frmdlg/wrap.cxx
@@ -128,7 +128,7 @@ SwWrapTabPage::SwWrapTabPage(vcl::Window *pParent, const
SfxItemSet &rSet)
m_pWrapParallelRB->SetClickHdl(aLk2);
m_pWrapThroughRB->SetClickHdl(aLk2);
m_pIdealWrapRB->SetClickHdl(aLk2);
- ApplyImageList();
+ SetImages();
m_pWrapOutlineCB->SetClickHdl(LINK(this, SwWrapTabPage, ContourHdl));
}
@@ -640,20 +640,11 @@ IMPL_LINK_NOARG(SwWrapTabPage, ContourHdl, Button*, void)
if (bEnable == m_bContourImage) // so that it doesn't always flicker
{
m_bContourImage = !bEnable;
- ApplyImageList();
+ SetImages();
}
}
-void SwWrapTabPage::DataChanged( const DataChangedEvent& rDCEvt )
-{
- if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) &&
- (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) )
- ApplyImageList();
-
- SfxTabPage::DataChanged( rDCEvt );
-}
-
-void SwWrapTabPage::ApplyImageList()
+void SwWrapTabPage::SetImages()
{
m_pWrapThroughRB->SetModeRadioImage(get<FixedImage>("imgthrough")->GetImage());
bool bWrapOutline = !m_pWrapOutlineCB->IsChecked();
diff --git a/sw/source/uibase/inc/wrap.hxx b/sw/source/uibase/inc/wrap.hxx
index b596dc5..254a9a6 100644
--- a/sw/source/uibase/inc/wrap.hxx
+++ b/sw/source/uibase/inc/wrap.hxx
@@ -80,10 +80,9 @@ class SwWrapTabPage: public SfxTabPage
virtual ~SwWrapTabPage() override;
virtual void dispose() override;
- void ApplyImageList();
+ void SetImages();
virtual void ActivatePage(const SfxItemSet& rSet) override;
virtual DeactivateRC DeactivatePage(SfxItemSet *pSet) override;
- virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
DECL_LINK( RangeModifyHdl, SpinField&, void );
DECL_LINK( RangeLoseFocusHdl, Control&, void );
commit 026ce884754f1be33bec2de48d173134625f622d
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Dec 20 21:09:35 2016 +0000
strange use of an ImageList
remove the middle man here
Change-Id: I76eab37b66205768fe2a1c6ffc317bfba9ef4fd9
diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
index a81222e..08e5f93 100644
--- a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
+++ b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
@@ -76,7 +76,6 @@ WrapPropertyPanel::WrapPropertyPanel(
, nRight(0)
// resources
, aCustomEntry()
- , aWrapIL()
// controller items
, maSwNoWrapControl(FN_FRAME_NOWRAP, *pBindings, *this)
, maSwWrapLeftControl(FN_FRAME_WRAP, *pBindings, *this)
@@ -149,33 +148,20 @@ void WrapPropertyPanel::Initialize()
mpEnableContour->SetClickHdl(EnableContourLink);
mpSpacingLB->SetSelectHdl(LINK(this, WrapPropertyPanel, SpacingLBHdl));
- aWrapIL.AddImage( UNO_WRAPOFF,
- ::GetImage( mxFrame, UNO_WRAPOFF, false ) );
- aWrapIL.AddImage( UNO_WRAPLEFT,
- ::GetImage( mxFrame, UNO_WRAPLEFT, false ) );
- aWrapIL.AddImage( UNO_WRAPRIGHT,
- ::GetImage( mxFrame, UNO_WRAPRIGHT, false ) );
- aWrapIL.AddImage( UNO_WRAPON,
- ::GetImage( mxFrame, UNO_WRAPON, false ) );
- aWrapIL.AddImage( UNO_WRAPTHROUGH,
- ::GetImage( mxFrame, UNO_WRAPTHROUGH, false ) );
- aWrapIL.AddImage( UNO_WRAPIDEAL,
- ::GetImage( mxFrame, UNO_WRAPIDEAL, false ) );
-
- mpRBNoWrap->SetModeRadioImage( aWrapIL.GetImage(UNO_WRAPOFF) );
+ mpRBNoWrap->SetModeRadioImage(::GetImage(mxFrame, UNO_WRAPOFF, false));
if ( AllSettings::GetLayoutRTL() )
{
- mpRBWrapLeft->SetModeRadioImage( aWrapIL.GetImage(UNO_WRAPRIGHT) );
- mpRBWrapRight->SetModeRadioImage( aWrapIL.GetImage(UNO_WRAPLEFT) );
+ mpRBWrapLeft->SetModeRadioImage(::GetImage(mxFrame, UNO_WRAPRIGHT,
false));
+ mpRBWrapRight->SetModeRadioImage(::GetImage(mxFrame, UNO_WRAPLEFT,
false));
}
else
{
- mpRBWrapLeft->SetModeRadioImage( aWrapIL.GetImage(UNO_WRAPLEFT) );
- mpRBWrapRight->SetModeRadioImage( aWrapIL.GetImage(UNO_WRAPRIGHT) );
+ mpRBWrapLeft->SetModeRadioImage(::GetImage(mxFrame, UNO_WRAPLEFT,
false));
+ mpRBWrapRight->SetModeRadioImage(::GetImage(mxFrame, UNO_WRAPRIGHT,
false));
}
- mpRBWrapParallel->SetModeRadioImage( aWrapIL.GetImage(UNO_WRAPON) );
- mpRBWrapThrough->SetModeRadioImage( aWrapIL.GetImage(UNO_WRAPTHROUGH) );
- mpRBIdealWrap->SetModeRadioImage( aWrapIL.GetImage(UNO_WRAPIDEAL) );
+ mpRBWrapParallel->SetModeRadioImage(::GetImage(mxFrame, UNO_WRAPON,
false));
+ mpRBWrapThrough->SetModeRadioImage(::GetImage(mxFrame, UNO_WRAPTHROUGH,
false));
+ mpRBIdealWrap->SetModeRadioImage(::GetImage(mxFrame, UNO_WRAPIDEAL,
false));
aCustomEntry = mpCustomEntry->GetText();
diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.hxx
b/sw/source/uibase/sidebar/WrapPropertyPanel.hxx
index 55d0026..8ce00d6 100644
--- a/sw/source/uibase/sidebar/WrapPropertyPanel.hxx
+++ b/sw/source/uibase/sidebar/WrapPropertyPanel.hxx
@@ -78,9 +78,6 @@ namespace sw { namespace sidebar {
//custom entry
OUString aCustomEntry;
- //Image resource.
- ImageList aWrapIL;
-
// Controller Items
::sfx2::sidebar::ControllerItem maSwNoWrapControl;
::sfx2::sidebar::ControllerItem maSwWrapLeftControl;
commit 8d3dba130464bff588a3f27ecd25f65d7430f670
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Dec 20 21:03:07 2016 +0000
unused ImageList
Change-Id: I15b707749454ceae3d69692e1c08106ec470bf18
diff --git a/sw/source/ui/inc/mmresultdialogs.hxx
b/sw/source/ui/inc/mmresultdialogs.hxx
index 031fc38..435eee9 100644
--- a/sw/source/ui/inc/mmresultdialogs.hxx
+++ b/sw/source/ui/inc/mmresultdialogs.hxx
@@ -189,8 +189,6 @@ class SwSendMailDialog : public ModelessDialog
//SfxModalDialog
bool m_bCancel;
bool m_bDesctructionEnabled;
- ImageList m_aImageList;
-
SwSendMailDialog_Impl* m_pImpl;
SwMailMergeConfigItem* m_pConfigItem;
sal_Int32 m_nStatusHeight;
commit 778a178da5cb033d3a1c63559aaa8973aabd6383
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Dec 20 21:01:47 2016 +0000
drop SfxImageManager::GetImageManager use in sw
Change-Id: I02df63a37082ca8f0b9e15865dbd070a14f9eea0
diff --git a/sw/source/uibase/utlui/navipi.cxx
b/sw/source/uibase/utlui/navipi.cxx
index 7ca4a7a..30075f1 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -704,9 +704,6 @@ SwNavigationPI::SwNavigationPI(SfxBindings* _pBindings,
StartListening(*SfxGetpApp());
if ( m_pCreateView )
StartListening(*m_pCreateView);
- SfxImageManager* pImgMan = SfxImageManager::GetImageManager(*SW_MOD());
- pImgMan->RegisterToolBox(m_aContentToolBox.get(),
SfxToolboxFlags::CHANGEOUTSTYLE);
- pImgMan->RegisterToolBox(m_aGlobalToolBox.get(),
SfxToolboxFlags::CHANGEOUTSTYLE);
sal_uInt16 nNavId = m_aContentToolBox->GetItemId("navigation");
m_aContentToolBox->SetItemBits(nNavId,
m_aContentToolBox->GetItemBits(nNavId) | ToolBoxItemBits::DROPDOWNONLY );
@@ -763,9 +760,6 @@ void SwNavigationPI::dispose()
EndListening(*SfxGetpApp());
- SfxImageManager* pImgMan = SfxImageManager::GetImageManager(*SW_MOD());
- pImgMan->ReleaseToolBox(m_aContentToolBox.get());
- pImgMan->ReleaseToolBox(m_aGlobalToolBox.get());
m_aContentToolBox->GetItemWindow(FN_PAGENUMBER)->disposeOnce();
m_aContentToolBox->Clear();
if (m_pxObjectShell)
commit fdf57121acb3e74ee227a578e097dd6a4d5bfb08
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Dec 20 20:34:47 2016 +0000
unwind ILIST ImageList
Change-Id: I260f4263db35f708891e26fa943c1fd6af402366
diff --git a/icon-themes/oxygen/sw/imglst/lc20556.png
b/icon-themes/crystal/sw/res/lc20556.png
similarity index 100%
rename from icon-themes/oxygen/sw/imglst/lc20556.png
rename to icon-themes/crystal/sw/res/lc20556.png
diff --git a/icon-themes/oxygen/sw/imglst/lc20557.png
b/icon-themes/crystal/sw/res/lc20557.png
similarity index 100%
rename from icon-themes/oxygen/sw/imglst/lc20557.png
rename to icon-themes/crystal/sw/res/lc20557.png
diff --git a/icon-themes/oxygen/sw/imglst/lc20558.png
b/icon-themes/crystal/sw/res/lc20558.png
similarity index 100%
rename from icon-themes/oxygen/sw/imglst/lc20558.png
rename to icon-themes/crystal/sw/res/lc20558.png
diff --git a/icon-themes/oxygen/sw/imglst/sc20556.png
b/icon-themes/crystal/sw/res/sc20556.png
similarity index 100%
rename from icon-themes/oxygen/sw/imglst/sc20556.png
rename to icon-themes/crystal/sw/res/sc20556.png
diff --git a/icon-themes/oxygen/sw/imglst/sc20557.png
b/icon-themes/crystal/sw/res/sc20557.png
similarity index 100%
rename from icon-themes/oxygen/sw/imglst/sc20557.png
rename to icon-themes/crystal/sw/res/sc20557.png
diff --git a/icon-themes/oxygen/sw/imglst/sc20558.png
b/icon-themes/crystal/sw/res/sc20558.png
similarity index 100%
rename from icon-themes/oxygen/sw/imglst/sc20558.png
rename to 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
similarity index 100%
rename from icon-themes/galaxy/sw/imglst/lc20556.png
rename to 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
similarity index 100%
rename from icon-themes/galaxy/sw/imglst/lc20557.png
rename to 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
similarity index 100%
rename from icon-themes/galaxy/sw/imglst/lc20558.png
rename to 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
similarity index 100%
rename from icon-themes/galaxy/sw/imglst/sc20556.png
rename to 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
similarity index 100%
rename from icon-themes/galaxy/sw/imglst/sc20557.png
rename to 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
similarity index 100%
rename from icon-themes/galaxy/sw/imglst/sc20558.png
rename to 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
similarity index 100%
rename from icon-themes/hicontrast/sw/imglst/lc20556.png
rename to 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
similarity index 100%
rename from icon-themes/hicontrast/sw/imglst/lc20557.png
rename to 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
similarity index 100%
rename from icon-themes/hicontrast/sw/imglst/lc20558.png
rename to 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
similarity index 100%
rename from icon-themes/hicontrast/sw/imglst/sc20556.png
rename to 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
similarity index 100%
rename from icon-themes/hicontrast/sw/imglst/sc20557.png
rename to 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
similarity index 100%
rename from icon-themes/hicontrast/sw/imglst/sc20558.png
rename to icon-themes/hicontrast/sw/res/sc20558.png
diff --git a/icon-themes/crystal/sw/imglst/lc20556.png
b/icon-themes/oxygen/sw/res/lc20556.png
similarity index 100%
rename from icon-themes/crystal/sw/imglst/lc20556.png
rename to icon-themes/oxygen/sw/res/lc20556.png
diff --git a/icon-themes/crystal/sw/imglst/lc20557.png
b/icon-themes/oxygen/sw/res/lc20557.png
similarity index 100%
rename from icon-themes/crystal/sw/imglst/lc20557.png
rename to icon-themes/oxygen/sw/res/lc20557.png
diff --git a/icon-themes/crystal/sw/imglst/lc20558.png
b/icon-themes/oxygen/sw/res/lc20558.png
similarity index 100%
rename from icon-themes/crystal/sw/imglst/lc20558.png
rename to icon-themes/oxygen/sw/res/lc20558.png
diff --git a/icon-themes/crystal/sw/imglst/sc20556.png
b/icon-themes/oxygen/sw/res/sc20556.png
similarity index 100%
rename from icon-themes/crystal/sw/imglst/sc20556.png
rename to icon-themes/oxygen/sw/res/sc20556.png
diff --git a/icon-themes/crystal/sw/imglst/sc20557.png
b/icon-themes/oxygen/sw/res/sc20557.png
similarity index 100%
rename from icon-themes/crystal/sw/imglst/sc20557.png
rename to icon-themes/oxygen/sw/res/sc20557.png
diff --git a/icon-themes/crystal/sw/imglst/sc20558.png
b/icon-themes/oxygen/sw/res/sc20558.png
similarity index 100%
rename from icon-themes/crystal/sw/imglst/sc20558.png
rename to 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
similarity index 100%
rename from icon-themes/sifr/sw/imglst/lc20557.png
rename to 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
similarity index 100%
rename from icon-themes/sifr/sw/imglst/sc20557.png
rename to icon-themes/sifr/sw/res/sc20557.png
diff --git a/sw/inc/dbui.hrc b/sw/inc/dbui.hrc
index 5557fa3..45418f5 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 5989ed3..9b41464 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 c25da7b..8c2a72b 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 aa84a12..e0f9337 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 f8b3ec2..8ce4e49 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 8f1249d..18f3408 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 e45cb05..64f7a6a 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();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
