diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-11-04 10:04:25 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-11-04 16:44:54 +0100 |
| commit | 57aa9ea3a6d178fcea016fadb005dfbcc2ca2e8d (patch) | |
| tree | 6407cb0a354b9a14731a4ab3a9c8eb80ec7a7a01 /framework | |
| parent | f7f47654787c8fd1764a8d827bb6a84b17fe3882 (diff) | |
readme not a sufficient indicator
Change-Id: Idd5cd004b873280e202b16c182356977045bdab4
Reviewed-on: https://gerrit.libreoffice.org/81993
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/inc/uielement/FixedImageToolbarController.hxx | 6 | ||||
| -rw-r--r-- | framework/source/uielement/FixedImageToolbarController.cxx | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/framework/inc/uielement/FixedImageToolbarController.hxx b/framework/inc/uielement/FixedImageToolbarController.hxx index 2fa55e4e8cc5..bfe197bb44a6 100644 --- a/framework/inc/uielement/FixedImageToolbarController.hxx +++ b/framework/inc/uielement/FixedImageToolbarController.hxx @@ -26,7 +26,7 @@ #include <uielement/complextoolbarcontroller.hxx> class ToolBox; -class ImageControl; +class FixedImage; namespace framework { @@ -49,11 +49,11 @@ protected: DECL_LINK(MiscOptionsChanged, LinkParamNone*, void); private: - VclPtr<ImageControl> m_pFixedImageControl; + VclPtr<FixedImage> m_pFixedImageControl; sal_Int16 m_eSymbolSize; }; } // namespace framework #endif // INCLUDED_FRAMEWORK_INC_UIELEMENT_FIXEDIMAGETOOLBARCONTROLLER_HXX -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/FixedImageToolbarController.cxx b/framework/source/uielement/FixedImageToolbarController.cxx index 6338287a8dd9..b90f24abfe6e 100644 --- a/framework/source/uielement/FixedImageToolbarController.cxx +++ b/framework/source/uielement/FixedImageToolbarController.cxx @@ -25,7 +25,7 @@ #include <vcl/svapp.hxx> #include <vcl/window.hxx> #include <vcl/toolbox.hxx> -#include <vcl/toolkit/imgctrl.hxx> +#include <vcl/fixed.hxx> #include <svtools/miscopt.hxx> #include <svtools/imgdef.hxx> #include <framework/sfxhelperfunctions.hxx> @@ -47,7 +47,7 @@ FixedImageToolbarController::FixedImageToolbarController( : ComplexToolbarController(rxContext, rFrame, pToolbar, nID, aCommand) , m_eSymbolSize(SvtMiscOptions().GetCurrentSymbolsSize()) { - m_pFixedImageControl = VclPtr<ImageControl>::Create(m_pToolbar, 0); + m_pFixedImageControl = VclPtr<FixedImage>::Create(m_pToolbar, 0); m_pToolbar->SetItemWindow(m_nID, m_pFixedImageControl); bool bBigImages(SvtMiscOptions().AreCurrentSymbolsLarge()); |