[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sw/source

[Tor Lillqvist (via logerrit)]

 sw/source/uibase/uiview/view0.cxx |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit 3280ef1815339cd46a66b77244121d9e245c8620
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Mar 25 17:46:13 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Tue Aug 13 14:21:52 2019 +0200

    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
    (cherry picked from commit 5eb0e0afbe70a0c9e0bdb0d1864e7ae7589098e0)
    Reviewed-on: https://gerrit.libreoffice.org/77401
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/sw/source/uibase/uiview/view0.cxx b/sw/source/uibase/uiview/view0.cxx
index a51e3c5cbd1c..a47b720dcbcb 100644
--- a/sw/source/uibase/uiview/view0.cxx
+++ b/sw/source/uibase/uiview/view0.cxx
@@ -88,7 +88,6 @@ SFX_IMPL_INTERFACE(SwView, SfxViewShell)
 
 void SwView::InitInterface_Impl()
 {
-#if HAVE_FEATURE_DESKTOP
     GetStaticInterface()->RegisterChildWindow(SID_NAVIGATOR, true);
 
     GetStaticInterface()->RegisterChildWindow(::sfx2::sidebar::SidebarChildWindow::GetChildWindowId());
@@ -108,7 +107,6 @@ void SwView::InitInterface_Impl()
 
     GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_TOOLS, SfxVisibilityFlags::Standard|SfxVisibilityFlags::Server,
                                             ToolbarId::Tools_Toolbox);
-#endif
 }