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 /sw/source/uibase/sidebar | |
| parent | 94490fdf76ff9aec05774a6dbbb0b42d87812969 (diff) | |
Replace GetImage with CommandInfoProvider::GetImageForCommand
And move ToolBoxButtonSize->ImageType mapping code to a
common place.
Change-Id: If158f4b6f2750054fcf64491c2941706e7d3a329
Diffstat (limited to 'sw/source/uibase/sidebar')
| -rw-r--r-- | sw/source/uibase/sidebar/WrapPropertyPanel.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx index 08e5f9392190..d3954521b35a 100644 --- a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx +++ b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx @@ -25,8 +25,8 @@ #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/sidebar/ControlFactory.hxx> -#include <sfx2/imagemgr.hxx> #include <svl/eitem.hxx> +#include <vcl/commandinfoprovider.hxx> #include <vcl/svapp.hxx> #include <vcl/lstbox.hxx> #include <vcl/settings.hxx> @@ -148,20 +148,20 @@ void WrapPropertyPanel::Initialize() mpEnableContour->SetClickHdl(EnableContourLink); mpSpacingLB->SetSelectHdl(LINK(this, WrapPropertyPanel, SpacingLBHdl)); - mpRBNoWrap->SetModeRadioImage(::GetImage(mxFrame, UNO_WRAPOFF, false)); + mpRBNoWrap->SetModeRadioImage(vcl::CommandInfoProvider::GetImageForCommand(UNO_WRAPOFF, mxFrame)); if ( AllSettings::GetLayoutRTL() ) { - mpRBWrapLeft->SetModeRadioImage(::GetImage(mxFrame, UNO_WRAPRIGHT, false)); - mpRBWrapRight->SetModeRadioImage(::GetImage(mxFrame, UNO_WRAPLEFT, false)); + mpRBWrapLeft->SetModeRadioImage(vcl::CommandInfoProvider::GetImageForCommand(UNO_WRAPRIGHT, mxFrame)); + mpRBWrapRight->SetModeRadioImage(vcl::CommandInfoProvider::GetImageForCommand(UNO_WRAPLEFT, mxFrame)); } else { - mpRBWrapLeft->SetModeRadioImage(::GetImage(mxFrame, UNO_WRAPLEFT, false)); - mpRBWrapRight->SetModeRadioImage(::GetImage(mxFrame, UNO_WRAPRIGHT, false)); + mpRBWrapLeft->SetModeRadioImage(vcl::CommandInfoProvider::GetImageForCommand(UNO_WRAPLEFT, mxFrame)); + mpRBWrapRight->SetModeRadioImage(vcl::CommandInfoProvider::GetImageForCommand(UNO_WRAPRIGHT, mxFrame)); } - mpRBWrapParallel->SetModeRadioImage(::GetImage(mxFrame, UNO_WRAPON, false)); - mpRBWrapThrough->SetModeRadioImage(::GetImage(mxFrame, UNO_WRAPTHROUGH, false)); - mpRBIdealWrap->SetModeRadioImage(::GetImage(mxFrame, UNO_WRAPIDEAL, false)); + mpRBWrapParallel->SetModeRadioImage(vcl::CommandInfoProvider::GetImageForCommand(UNO_WRAPON, mxFrame)); + mpRBWrapThrough->SetModeRadioImage(vcl::CommandInfoProvider::GetImageForCommand(UNO_WRAPTHROUGH, mxFrame)); + mpRBIdealWrap->SetModeRadioImage(vcl::CommandInfoProvider::GetImageForCommand(UNO_WRAPIDEAL, mxFrame)); aCustomEntry = mpCustomEntry->GetText(); |