diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-04-18 16:49:26 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-04-27 12:41:14 +0200 |
| commit | 56dd851cfc77c362c3db5c0aae4a490c7f6782cc (patch) | |
| tree | 0f5f6564e0b9af8123f4cebfe9a2f55c1bbbba57 /sw/inc | |
| parent | 6afbe153ffd4cab27f0a7bb77f71f25923dc2e43 (diff) | |
weld cluster of change tracking dialogs
Change-Id: I42ca7acb41699df91b91a9f59fc68cd30972a397
Reviewed-on: https://gerrit.libreoffice.org/70988
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/swabstdlg.hxx | 2 | ||||
| -rw-r--r-- | sw/inc/viewsh.hxx | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index c92ab77686e9..b057b0567353 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -427,7 +427,7 @@ public: virtual VclPtr<AbstractSwRenameXNamedDlg> CreateSwRenameXNamedDlg(weld::Window* pParent, css::uno::Reference< css::container::XNamed > & xNamed, css::uno::Reference< css::container::XNameAccess > & xNameAccess) = 0; - virtual VclPtr<AbstractSwModalRedlineAcceptDlg> CreateSwModalRedlineAcceptDlg(vcl::Window *pParent) = 0; + virtual VclPtr<AbstractSwModalRedlineAcceptDlg> CreateSwModalRedlineAcceptDlg(weld::Window *pParent) = 0; virtual VclPtr<VclAbstractDialog> CreateTableMergeDialog(weld::Window* pParent, bool& rWithPrev) = 0; virtual VclPtr<SfxAbstractTabDialog> CreateFrameTabDialog(const OUString &rDialogType, diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx index 7536cda1e9fb..641cbdfba6fb 100644 --- a/sw/inc/viewsh.hxx +++ b/sw/inc/viewsh.hxx @@ -436,9 +436,6 @@ public: static void SetShellRes( ShellResource* pRes ) { mpShellRes = pRes; } static ShellResource* GetShellRes(); - static void SetCareWin( vcl::Window* pNew ); - 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) |