diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-12-09 13:04:04 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-01-23 15:29:31 +0100 |
| commit | e5e337fb77cff58436dd943b1e623811d3a11bd3 (patch) | |
| tree | 8c4e5e367b1fa9b9f6853aeefd0c927fe2ae5e53 /sw | |
| parent | 66ed51712bb323bba7d1a0b0d21b256e5f5f9ccf (diff) | |
weld SvxFontWorkDialog
Change-Id: If9da7ad6a834d22f1bcab8d41ce7fe1f80168946
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/84774
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/uibase/inc/navipi.hxx | 1 | ||||
| -rw-r--r-- | sw/source/uibase/misc/redlndlg.cxx | 6 | ||||
| -rw-r--r-- | sw/source/uibase/sidebar/ThemePanel.cxx | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx index 00bc0160e47b..2c14d9aea412 100644 --- a/sw/source/uibase/inc/navipi.hxx +++ b/sw/source/uibase/inc/navipi.hxx @@ -20,6 +20,7 @@ #define INCLUDED_SW_SOURCE_UIBASE_INC_NAVIPI_HXX #include <vcl/lstbox.hxx> +#include <vcl/layout.hxx> #include <vcl/toolbox.hxx> #include <vcl/idle.hxx> #include <svl/lstner.hxx> diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx index 86da5fa73df2..d3159a43eb0f 100644 --- a/sw/source/uibase/misc/redlndlg.cxx +++ b/sw/source/uibase/misc/redlndlg.cxx @@ -60,9 +60,9 @@ SwRedlineAcceptChild::SwRedlineAcceptChild(vcl::Window* _pParent, SfxChildWinInfo* pInfo) : SwChildWinWrapper(_pParent, nId) { - SetController(std::make_shared<SwModelessRedlineAcceptDlg>(pBindings, this, _pParent->GetFrameWeld())); - - static_cast<SwModelessRedlineAcceptDlg*>(GetController().get())->Initialize(pInfo); + auto xDlg = std::make_shared<SwModelessRedlineAcceptDlg>(pBindings, this, _pParent->GetFrameWeld()); + SetController(xDlg); + xDlg->Initialize(pInfo); } // newly initialise dialog after document switch diff --git a/sw/source/uibase/sidebar/ThemePanel.cxx b/sw/source/uibase/sidebar/ThemePanel.cxx index b3f044d7ca36..7f3b81f512f1 100644 --- a/sw/source/uibase/sidebar/ThemePanel.cxx +++ b/sw/source/uibase/sidebar/ThemePanel.cxx @@ -17,6 +17,8 @@ #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <editeng/fontitem.hxx> +#include <vcl/bitmapex.hxx> +#include <vcl/image.hxx> #include <vcl/svapp.hxx> #include <vcl/virdev.hxx> #include <charatr.hxx> |