diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-11-02 18:21:20 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-11-04 17:33:06 +0100 |
| commit | 4d83c24cdd433d5c63800290e2da6317ae12111c (patch) | |
| tree | bfd4c863f0f79d40ac1671812fef1976ca4a9c85 /sfx2/source/inc | |
| parent | 628e96ce1fce194b30a5c2912feb8b7ec0328db0 (diff) | |
reweld SwWordCountFloatDlg
fixing up the bit that failed the last time
Change-Id: I235f8f92cbc0c3e31837e01a9b094580c6f5aecf
Reviewed-on: https://gerrit.libreoffice.org/62786
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sfx2/source/inc')
| -rw-r--r-- | sfx2/source/inc/workwin.hxx | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx index 7b37d065afa4..38c41653dfdb 100644 --- a/sfx2/source/inc/workwin.hxx +++ b/sfx2/source/inc/workwin.hxx @@ -84,6 +84,7 @@ namespace o3tl struct SfxChild_Impl { VclPtr<vcl::Window> pWin; + std::shared_ptr<SfxModelessDialogController> xController; Size aSize; SfxChildAlignment eAlign; SfxChildVisibility nVisible; @@ -97,6 +98,14 @@ struct SfxChild_Impl { nVisible = bIsVisible ? SfxChildVisibility::VISIBLE : SfxChildVisibility::NOT_VISIBLE; } + + SfxChild_Impl(std::shared_ptr<SfxModelessDialogController>& rChild, + SfxChildAlignment eAlignment): + pWin(nullptr), xController(rChild), eAlign(eAlignment), bResize(false), + bSetFocus( false ) + { + nVisible = xController->getDialog()->get_visible() ? SfxChildVisibility::VISIBLE : SfxChildVisibility::NOT_VISIBLE; + } }; struct SfxChildWin_Impl @@ -239,7 +248,9 @@ public: // Methods for all Child windows void DataChanged_Impl(); void ReleaseChild_Impl( vcl::Window& rWindow ); + void ReleaseChild_Impl(SfxModelessDialogController&); SfxChild_Impl* RegisterChild_Impl( vcl::Window& rWindow, SfxChildAlignment eAlign ); + SfxChild_Impl* RegisterChild_Impl(std::shared_ptr<SfxModelessDialogController>& rController, SfxChildAlignment eAlign); void ShowChildren_Impl(); void HideChildren_Impl(); bool PrepareClose_Impl(); |