diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-09-17 12:50:05 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-09-20 21:20:51 +0200 |
| commit | 94d6fa11d086187b82adf9aa596e0f334827e095 (patch) | |
| tree | 4a44af903b2572efe89ae5e8aa67bb092644e038 /include | |
| parent | Update git submodules (diff) | |
| download | core-94d6fa11d086187b82adf9aa596e0f334827e095.tar.gz core-94d6fa11d086187b82adf9aa596e0f334827e095.zip | |
weld OfaTreeOptionsDialog
including ability to host a vcl::Window based XWindow hierarchy inside
a native widget, e.g. the dictionary extensions have option pages
Change-Id: I17d933bac12679e10164214a9045b677291a6557
Reviewed-on: https://gerrit.libreoffice.org/79070
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/sfxdlg.hxx | 2 | ||||
| -rw-r--r-- | include/sfx2/tabdlg.hxx | 6 | ||||
| -rw-r--r-- | include/vcl/abstdlg.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/weld.hxx | 7 |
4 files changed, 13 insertions, 4 deletions
diff --git a/include/sfx2/sfxdlg.hxx b/include/sfx2/sfxdlg.hxx index d47b4f219bc6..b82db9001359 100644 --- a/include/sfx2/sfxdlg.hxx +++ b/include/sfx2/sfxdlg.hxx @@ -119,7 +119,7 @@ class SFX2_DLLPUBLIC SfxAbstractDialogFactory : virtual public VclAbstractDialog public: virtual ~SfxAbstractDialogFactory() override; // needed for export of vtable static SfxAbstractDialogFactory* Create(); - virtual VclPtr<VclAbstractDialog> CreateFrameDialog(vcl::Window* pParent, const css::uno::Reference< css::frame::XFrame >& rFrame, sal_uInt32 nResId, const OUString& rParameter ) = 0; + virtual VclPtr<VclAbstractDialog> CreateFrameDialog(weld::Window* pParent, const css::uno::Reference< css::frame::XFrame >& rFrame, sal_uInt32 nResId, const OUString& rParameter) = 0; virtual VclPtr<SfxAbstractTabDialog> CreateAutoCorrTabDialog(weld::Window* pParent, const SfxItemSet* pAttrSet) = 0; virtual VclPtr<SfxAbstractTabDialog> CreateCustomizeTabDialog(weld::Window* pParent, const SfxItemSet* pAttrSet, diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index 791887059189..851b859796aa 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -196,6 +196,12 @@ public: virtual ~SfxTabPage() override; virtual void dispose() override; + void set_visible(bool bVisible) + { + m_xContainer->set_visible(bVisible); + Show(bVisible); + } + const SfxItemSet& GetItemSet() const { return *pSet; } virtual bool FillItemSet( SfxItemSet* ); diff --git a/include/vcl/abstdlg.hxx b/include/vcl/abstdlg.hxx index 0870a72fed62..864799204ae8 100644 --- a/include/vcl/abstdlg.hxx +++ b/include/vcl/abstdlg.hxx @@ -145,7 +145,7 @@ public: virtual ~VclAbstractDialogFactory(); // needed for export of vtable static VclAbstractDialogFactory* Create(); // The Id is an implementation detail of the factory - virtual VclPtr<VclAbstractDialog> CreateVclDialog(vcl::Window* pParent, sal_uInt32 nId) = 0; + virtual VclPtr<VclAbstractDialog> CreateVclDialog(weld::Window* pParent, sal_uInt32 nId) = 0; // creates instance of PasswordToOpenModifyDialog from cui virtual VclPtr<AbstractPasswordToOpenModifyDialog> CreatePasswordToOpenModifyDialog(weld::Window * pParent, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify) = 0; diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx index 8fd763e434ac..8a1f7ae43d26 100644 --- a/include/vcl/weld.hxx +++ b/include/vcl/weld.hxx @@ -256,10 +256,13 @@ public: class VCL_DLLPUBLIC Container : virtual public Widget { public: - //remove and add in one go + // remove and add in one go virtual void move(weld::Widget* pWidget, weld::Container* pNewParent) = 0; - //recursively unset has-default on any buttons in the widget hierarchy + // recursively unset has-default on any buttons in the widget hierarchy virtual void recursively_unset_default_buttons() = 0; + // create an XWindow as a child of this container. The XWindow is + // suitable to contain css::awt::XControl items + virtual css::uno::Reference<css::awt::XWindow> CreateChildFrame() = 0; }; class VCL_DLLPUBLIC ScrolledWindow : virtual public Container |