commit 317fa411b91c7b4db4124356fc8d3bd4da1ea1e7
author Tor Lillqvist <tml@collabora.com> Mon Mar 25 17:46:13 2019 +0200
committer Tor Lillqvist <tml@collabora.com> Mon Mar 25 18:00:36 2019 +0200
tree 4440fef2377d1409f52a45d528f92dd067cf62d1
parent 8bf87fe5112fbec54db1496b5037c43e24bc76fe

tdf#124172: Remove DESKTOP ifdef as the code is needed for tunnelled dialogs

Back in the days it could be assumed that no dialog-related code would
be needed on non-DESKTOP platforms. That changed when we started using
Online-style tunnelled dialogs in the iOS app.

Change-Id: I30ea85493cbb89bdbce422e4b6bff6c42e393a2f

sw/source/uibase/uiview/view0.cxx

diff --git a/sw/source/uibase/uiview/view0.cxx b/sw/source/uibase/uiview/view0.cxx
index f902713..043c9f7 100644
--- a/sw/source/uibase/uiview/view0.cxx
+++ b/sw/source/uibase/uiview/view0.cxx
@@ -88,7 +88,6 @@

void SwView::InitInterface_Impl()
{
#if HAVE_FEATURE_DESKTOP
    GetStaticInterface()->RegisterChildWindow(SID_NAVIGATOR, true);

    GetStaticInterface()->RegisterChildWindow(::sfx2::sidebar::SidebarChildWindow::GetChildWindowId());
@@ -108,7 +107,6 @@

    GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_TOOLS, SfxVisibilityFlags::Standard|SfxVisibilityFlags::Server,
                                            ToolbarId::Tools_Toolbox);
#endif
}