diff options
author | Szymon Kłos <szymon.klos@collabora.com> | 2020-03-09 14:11:06 +0100 |
---|---|---|
committer | Szymon Kłos <szymon.klos@collabora.com> | 2020-05-18 14:48:09 +0200 |
commit | 92e0a646f958fd149c2a0d56e684e47ae52a8b5d (patch) | |
tree | 7f70d0a16b72e0693a35d43f59173857c15bbff6 /sfx2 | |
parent | d415bd55d9b3f96a908c6f15516dc1cf234364f3 (diff) |
jsdialog: handle nested tab pages
Change-Id: I04d5df55af0df18948730fcd9ee387abce77ac27
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94339
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/dialog/tabdlg.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 8ef457dd31a7..6cc7e797d3d2 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -39,6 +39,7 @@ #include <vcl/IDialogRenderable.hxx> #include <sal/log.hxx> #include <comphelper/lok.hxx> +#include <sfx2/lokhelper.hxx> #include <sfx2/strings.hrc> #include <helpids.h> @@ -187,7 +188,8 @@ SfxTabPage::SfxTabPage(TabPageParent pParent, const OUString& rUIXMLDescription, , pSet ( rAttrSet ) , bHasExchangeSupport ( false ) , pImpl ( new TabPageImpl ) - , m_xBuilder(pParent.pPage ? Application::CreateBuilder(pParent.pPage, rUIXMLDescription) + , m_xBuilder(pParent.pPage ? Application::CreateBuilder(pParent.pPage, rUIXMLDescription, comphelper::LibreOfficeKit::isActive() + && SfxViewShell::Current() && SfxViewShell::Current()->isLOKMobilePhone()) : Application::CreateInterimBuilder(this, rUIXMLDescription)) , m_xContainer(m_xBuilder->weld_container(rID)) { |