From 574d02a7a81f99d08512410fcd3262b41db8c209 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 14 Jun 2018 12:05:10 +0100 Subject: do setPreviewsToSamePlace at SfxTabDialogController display time MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ia38c1a577b7d054ab4e7e70a8f2cbce16a3573f5 Reviewed-on: https://gerrit.libreoffice.org/55793 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- include/sfx2/tabdlg.hxx | 2 ++ include/vcl/layout.hxx | 8 -------- include/vcl/vclenum.hxx | 7 +++++++ include/vcl/weld.hxx | 9 +++++++++ 4 files changed, 18 insertions(+), 8 deletions(-) (limited to 'include') diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index bdae835ffca2..163693d9fe9b 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -239,6 +239,7 @@ private: std::unique_ptr m_xUserBtn; std::unique_ptr m_xCancelBtn; std::unique_ptr m_xResetBtn; + std::unique_ptr m_xSizeGroup; SfxItemSet* m_pSet; std::unique_ptr m_pOutSet; @@ -250,6 +251,7 @@ private: DECL_DLLPRIVATE_LINK(DeactivatePageHdl, const OString&, bool); SAL_DLLPRIVATE void Init_Impl(bool bFmtFlag); SAL_DLLPRIVATE void CreatePages(); + SAL_DLLPRIVATE void setPreviewsToSamePlace(); protected: virtual short Ok(); diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx index d2fefe01f875..298601da6e8f 100644 --- a/include/vcl/layout.hxx +++ b/include/vcl/layout.hxx @@ -564,14 +564,6 @@ public: virtual void Command(const CommandEvent& rCEvt) override; }; -enum class VclSizeGroupMode -{ - NONE, - Horizontal, - Vertical, - Both -}; - class VCL_DLLPUBLIC VclSizeGroup { private: diff --git a/include/vcl/vclenum.hxx b/include/vcl/vclenum.hxx index 8697465af32d..0de6703f6aba 100644 --- a/include/vcl/vclenum.hxx +++ b/include/vcl/vclenum.hxx @@ -242,6 +242,13 @@ enum class VclMessageType Error }; +enum class VclSizeGroupMode +{ + NONE, + Horizontal, + Vertical, + Both +}; #endif // INCLUDED_VCL_VCLENUM_HXX diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx index 86718d52a642..d0c5c220f375 100644 --- a/include/vcl/weld.hxx +++ b/include/vcl/weld.hxx @@ -864,6 +864,14 @@ public: virtual ~Menu() {} }; +class VCL_DLLPUBLIC SizeGroup +{ +public: + virtual void add_widget(weld::Widget* pWidget) = 0; + virtual void set_mode(VclSizeGroupMode eMode) = 0; + virtual ~SizeGroup() {} +}; + class VCL_DLLPUBLIC Builder { private: @@ -914,6 +922,7 @@ public: void* pUserData = nullptr, bool bTakeOwnership = false) = 0; virtual Menu* weld_menu(const OString& id, bool bTakeOwnership = true) = 0; + virtual SizeGroup* create_size_group() = 0; virtual ~Builder() {} }; -- cgit