diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2017-04-23 15:04:36 +0300 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2017-04-23 19:50:15 +0300 |
| commit | fb698d5e81c8b4149c092305506d40e2f7ef7f5d (patch) | |
| tree | 7d4cc743d6fe75f628e974a1144379a7f6c563c9 /sc | |
| parent | 94490fdf76ff9aec05774a6dbbb0b42d87812969 (diff) | |
Replace GetImage with CommandInfoProvider::GetImageForCommand
And move ToolBoxButtonSize->ImageType mapping code to a
common place.
Change-Id: If158f4b6f2750054fcf64491c2941706e7d3a329
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/miscdlgs/optsolver.cxx | 9 | ||||
| -rw-r--r-- | sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx | 1 |
2 files changed, 2 insertions, 8 deletions
diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx index 2d62a3308b37..8296542b6440 100644 --- a/sc/source/ui/miscdlgs/optsolver.cxx +++ b/sc/source/ui/miscdlgs/optsolver.cxx @@ -20,9 +20,9 @@ #include "rangelst.hxx" #include "scitems.hxx" #include <sfx2/bindings.hxx> -#include <sfx2/imagemgr.hxx> #include <svl/zforlist.hxx> #include <vcl/builderfactory.hxx> +#include <vcl/commandinfoprovider.hxx> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> @@ -349,13 +349,8 @@ void ScOptSolverDlg::dispose() void ScOptSolverDlg::Init(const ScAddress& rCursorPos) { - // Get the "Delete Rows" commandimagelist images from sfx instead of - // adding a second copy to sc (see ScTbxInsertCtrl::StateChanged) - - OUString aSlotURL( "slot:" ); - aSlotURL += OUString::number( SID_DEL_ROWS ); uno::Reference<frame::XFrame> xFrame = GetBindings().GetActiveFrame(); - Image aDelNm = ::GetImage( xFrame, aSlotURL, false ); + Image aDelNm = vcl::CommandInfoProvider::GetImageForCommand(".uno:DeleteRows", xFrame); for (VclPtr<PushButton> & pButton : mpDelButton) { diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx index b35720c8f72a..937387ec2ece 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx @@ -23,7 +23,6 @@ #include "scresid.hxx" #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> -#include <sfx2/imagemgr.hxx> #include <vcl/fixed.hxx> #include <vcl/lstbox.hxx> #include <vcl/field.hxx> |