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 /sw/inc/viewsh.hxx | |
| 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 'sw/inc/viewsh.hxx')
| -rw-r--r-- | sw/inc/viewsh.hxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx index db92346bc587..fe904ffcd36e 100644 --- a/sw/inc/viewsh.hxx +++ b/sw/inc/viewsh.hxx @@ -170,7 +170,7 @@ class SW_DLLPUBLIC SwViewShell : public sw::Ring<SwViewShell> protected: static ShellResource* mpShellRes; ///< Resources for the Shell. static vcl::DeleteOnDeinit< VclPtr<vcl::Window> > mpCareWindow; ///< Avoid this window. - static vcl::DeleteOnDeinit< std::shared_ptr<weld::Dialog> > mpCareDialog; ///< Avoid this window. + static vcl::DeleteOnDeinit< std::shared_ptr<weld::Window> > mpCareDialog; ///< Avoid this window. SwRect maVisArea; ///< The modern version of VisArea. rtl::Reference<SwDoc> mxDoc; ///< The document; never 0. @@ -432,12 +432,12 @@ public: static ShellResource* GetShellRes(); static void SetCareWin( vcl::Window* pNew ); - static vcl::Window* GetCareWin(SwViewShell const & rVSh) - { return (*mpCareWindow.get()) ? mpCareWindow.get()->get() : CareChildWin(rVSh); } - static vcl::Window* CareChildWin(SwViewShell const & rVSh); - static void SetCareDialog(const std::shared_ptr<weld::Dialog>& rNew); - static weld::Dialog* GetCareDialog() - { return (*mpCareDialog.get()) ? mpCareDialog.get()->get() : nullptr; } + static vcl::Window* GetCareWin() + { return (*mpCareWindow.get()) ? mpCareWindow.get()->get() : nullptr; } + static weld::Window* CareChildWin(SwViewShell const & rVSh); + static void SetCareDialog(const std::shared_ptr<weld::Window>& rNew); + static weld::Window* GetCareDialog(SwViewShell const & rVSh) + { return (*mpCareDialog.get()) ? mpCareDialog.get()->get() : CareChildWin(rVSh); } SfxViewShell *GetSfxViewShell() const { return mpSfxViewShell; } void SetSfxViewShell(SfxViewShell *pNew) { mpSfxViewShell = pNew; } |