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/source/core/view | |
| 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/source/core/view')
| -rw-r--r-- | sw/source/core/view/viewsh.cxx | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index 4cf762870e2d..f8a805dad4a9 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -92,7 +92,6 @@ bool SwViewShell::mbLstAct = false; ShellResource *SwViewShell::mpShellRes = nullptr; -vcl::DeleteOnDeinit< VclPtr<vcl::Window> > SwViewShell::mpCareWindow(new VclPtr<vcl::Window>); vcl::DeleteOnDeinit<std::shared_ptr<weld::Window>> SwViewShell::mpCareDialog(new std::shared_ptr<weld::Window>); static bool bInSizeNotify = false; @@ -577,7 +576,7 @@ const SwRect& SwViewShell::VisArea() const void SwViewShell::MakeVisible( const SwRect &rRect ) { - if ( !VisArea().IsInside( rRect ) || IsScrollMDI( this, rRect ) || GetCareWin() || GetCareDialog(*this) ) + if ( !VisArea().IsInside( rRect ) || IsScrollMDI( this, rRect ) || GetCareDialog(*this) ) { if ( !IsViewLocked() ) { @@ -2495,11 +2494,6 @@ ShellResource* SwViewShell::GetShellRes() return mpShellRes; } -void SwViewShell::SetCareWin( vcl::Window* pNew ) -{ - (*mpCareWindow.get()) = pNew; -} - void SwViewShell::SetCareDialog(const std::shared_ptr<weld::Window>& rNew) { (*mpCareDialog.get()) = rNew; |