diff options
author | Caolán McNamara <caolanm@redhat.com> | 2020-04-26 15:43:25 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2020-04-29 09:46:08 +0200 |
commit | fe9a13dc0e6d1384416c2a2343223b33925fc925 (patch) | |
tree | a43a8ea0cc46407b8932dced64cf34d595f3b3e9 /sd | |
parent | cf36fe5eb41910c26d58fb25e54ccf2e0ee01365 (diff) |
weld SfxTemplatePanelControl
Change-Id: Ib3f6d01ddec37afc3987423dc15ab84ad6475f37
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92942
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/animations/CustomAnimationList.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationList.hxx | 1 | ||||
-rw-r--r-- | sd/source/ui/app/sdmod2.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/inc/sdtreelb.hxx | 1 | ||||
-rw-r--r-- | sd/source/ui/sidebar/LayoutMenu.hxx | 1 | ||||
-rw-r--r-- | sd/source/ui/sidebar/MasterPagesSelector.hxx | 1 |
6 files changed, 7 insertions, 3 deletions
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index 3b4c3b3afaa6..e6ccb0c3c721 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -438,7 +438,7 @@ CustomAnimationList::CustomAnimationList(std::unique_ptr<weld::TreeView> xTreeVi mxTreeView->connect_drag_begin(LINK(this, CustomAnimationList, DragBeginHdl)); mxTreeView->connect_custom_get_size(LINK(this, CustomAnimationList, CustomGetSizeHdl)); mxTreeView->connect_custom_render(LINK(this, CustomAnimationList, CustomRenderHdl)); - mxTreeView->set_column_custom_renderer(0); + mxTreeView->set_column_custom_renderer(0, true); } CustomAnimationListDropTarget::CustomAnimationListDropTarget(CustomAnimationList& rTreeView) diff --git a/sd/source/ui/animations/CustomAnimationList.hxx b/sd/source/ui/animations/CustomAnimationList.hxx index 3da6b350dce6..95ee309c5f0f 100644 --- a/sd/source/ui/animations/CustomAnimationList.hxx +++ b/sd/source/ui/animations/CustomAnimationList.hxx @@ -30,6 +30,7 @@ namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } } +struct ImplSVEvent; class VclBuilder; namespace sd { diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index 427228c0a7d5..b94015b942af 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -802,12 +802,12 @@ std::unique_ptr<SfxStyleFamilies> SdModule::CreateStyleFamilies() pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Para, SdResId(STR_GRAPHICS_STYLE_FAMILY), - Image(StockImage::Yes, BMP_STYLES_FAMILY_GRAPHICS), + BMP_STYLES_FAMILY_GRAPHICS, RID_GRAPHICSTYLEFAMILY, SD_MOD()->GetResLocale())); pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Pseudo, SdResId(STR_PRESENTATIONS_STYLE_FAMILY), - Image(StockImage::Yes, BMP_STYLES_FAMILY_PRESENTATIONS), + BMP_STYLES_FAMILY_PRESENTATIONS, RID_PRESENTATIONSTYLEFAMILY, SD_MOD()->GetResLocale())); return pStyleFamilies; diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index c9fce345c986..43bdbffded40 100644 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -37,6 +37,7 @@ class SdrObject; class SdrObjList; class SdPage; class SvTreeListEntry; +struct ImplSVEvent; namespace sd { class ViewShell; diff --git a/sd/source/ui/sidebar/LayoutMenu.hxx b/sd/source/ui/sidebar/LayoutMenu.hxx index 368b5c8cfd31..92de46a93b9c 100644 --- a/sd/source/ui/sidebar/LayoutMenu.hxx +++ b/sd/source/ui/sidebar/LayoutMenu.hxx @@ -24,6 +24,7 @@ #include <sfx2/sidebar/PanelLayout.hxx> #include <svtools/valueset.hxx> +#include <vcl/menu.hxx> #include <vcl/transfer.hxx> #include <sfx2/request.hxx> #include <xmloff/autolayout.hxx> diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx b/sd/source/ui/sidebar/MasterPagesSelector.hxx index f00e85493d34..266b5dd0a5c0 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx @@ -26,6 +26,7 @@ #include "PreviewValueSet.hxx" #include <sfx2/sidebar/ILayoutableWindow.hxx> #include <sfx2/sidebar/PanelLayout.hxx> +#include <vcl/menu.hxx> #include <osl/mutex.hxx> |