diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-01-24 14:42:46 +0000 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2017-01-27 17:40:59 +0000 |
| commit | 0cfda5204184fa937a948b3d273ac1083896bcc7 (patch) | |
| tree | 46d7f82b68e7ca32f8bf2d3bc1aab60107853c29 /sfx2 | |
| parent | 739353bcb420c18df6116cd645cc2226782e13cc (diff) | |
Resolves: tdf#105450 calc navigator gets 0 height on toggle off/on when docked
Change-Id: Icd346cdf0a208ccaeddd77e6803f4f906361324c
(cherry picked from commit b37ac48935621fcc7b71f81a8b892f24e85e5b6f)
Reviewed-on: https://gerrit.libreoffice.org/33498
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/childwin.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index a637818b227a..e08141e7e303 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -519,22 +519,22 @@ SfxChildWindowContext::~SfxChildWindowContext() pWindow.disposeAndClear(); } -FloatingWindow* SfxChildWindowContext::GetFloatingWindow() const +FloatingWindow* SfxChildWindowContext::GetFloatingWindow(vcl::Window *pParent) { - vcl::Window *pParent = pWindow->GetParent(); if (pParent->GetType() == WINDOW_DOCKINGWINDOW || pParent->GetType() == WINDOW_TOOLBOX) { return static_cast<DockingWindow*>(pParent)->GetFloatingWindow(); } - else if (pParent->GetType() == WINDOW_FLOATINGWINDOW) + if (pParent->GetType() == WINDOW_FLOATINGWINDOW) { return static_cast<FloatingWindow*>(pParent); } - else - { - OSL_FAIL("No FloatingWindow-Context!"); - return nullptr; - } + return nullptr; +} + +FloatingWindow* SfxChildWindowContext::GetFloatingWindow() const +{ + return SfxChildWindowContext::GetFloatingWindow(pWindow->GetParent()); } void SfxChildWindow::SetFactory_Impl( SfxChildWinFactory *pF ) |