diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-06-14 12:05:10 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-06-14 16:43:24 +0200 |
| commit | 574d02a7a81f99d08512410fcd3262b41db8c209 (patch) | |
| tree | 3fdeacdebcca37187a1e817bda3566a0d5ee36b7 /include | |
| parent | 5615b7d643da3ba5319e9e9acaa5e943ffbbcf7e (diff) | |
do setPreviewsToSamePlace at SfxTabDialogController display time
Change-Id: Ia38c1a577b7d054ab4e7e70a8f2cbce16a3573f5
Reviewed-on: https://gerrit.libreoffice.org/55793
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/tabdlg.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/layout.hxx | 8 | ||||
| -rw-r--r-- | include/vcl/vclenum.hxx | 7 | ||||
| -rw-r--r-- | include/vcl/weld.hxx | 9 |
4 files changed, 18 insertions, 8 deletions
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<weld::Button> m_xUserBtn; std::unique_ptr<weld::Button> m_xCancelBtn; std::unique_ptr<weld::Button> m_xResetBtn; + std::unique_ptr<weld::SizeGroup> m_xSizeGroup; SfxItemSet* m_pSet; std::unique_ptr<SfxItemSet> 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() {} }; |