bInterim is always true

Change-Id: Id9f72fdb94a766ef58a44b3653a36f22335b5718
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87676
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

7 files changed, 12 insertions, 18 deletions

diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx
index f3b4af9ffba8..217c9f962efb 100644
--- a/include/sfx2/dockwin.hxx
+++ b/include/sfx2/dockwin.hxx
@@ -82,8 +82,7 @@ public:
                         SfxDockingWindow( SfxBindings *pBindings,
                                           SfxChildWindow *pCW,
                                           vcl::Window* pParent,
-                                          const OString& rID, const OUString& rUIXMLDescription,
-                                          bool bInterim );
+                                          const OString& rID, const OUString& rUIXMLDescription );
                         virtual ~SfxDockingWindow() override;
     virtual void        dispose() override;
 
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index b3f21c63a75a..d1e6792ae773 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -123,7 +123,7 @@ const size_t AnimationWindow::EMPTY_FRAMELIST = std::numeric_limits<size_t>::max
  */
 AnimationWindow::AnimationWindow(SfxBindings* pInBindings, SfxChildWindow *pCW, vcl::Window* pParent)
     : SfxDockingWindow(pInBindings, pCW, pParent,
-        "DockingAnimation", "modules/simpress/ui/dockinganimation.ui", true)
+        "DockingAnimation", "modules/simpress/ui/dockinganimation.ui")
     , m_xCtlDisplay(new SdDisplay)
     , m_xCtlDisplayWin(new weld::CustomWeld(*m_xBuilder, "preview", *m_xCtlDisplay))
     , m_xBtnFirst(m_xBuilder->weld_button("first"))
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index 8b787fc69bd2..562585a90c5e 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -767,20 +767,15 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW,
     required because the docking is implemented in Sfx through SfxChildWindows.
 */
 SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW,
-    vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription,
-    bool bInterim)
-    : DockingWindow(pParent, bInterim ? "DockingWindow" : rID,
-                             bInterim ? "sfx/ui/dockingwindow.ui" : rUIXMLDescription)
+    vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription)
+    : DockingWindow(pParent, "DockingWindow", "sfx/ui/dockingwindow.ui")
     , pBindings(pBindinx)
     , pMgr(pCW)
 {
-    if (bInterim)
-    {
-        m_xVclContentArea = VclPtr<VclVBox>::Create(this);
-        m_xVclContentArea->Show();
-        m_xBuilder.reset(Application::CreateInterimBuilder(m_xVclContentArea, rUIXMLDescription));
-        m_xContainer = m_xBuilder->weld_container(rID);
-    }
+    m_xVclContentArea = VclPtr<VclVBox>::Create(this);
+    m_xVclContentArea->Show();
+    m_xBuilder.reset(Application::CreateInterimBuilder(m_xVclContentArea, rUIXMLDescription));
+    m_xContainer = m_xBuilder->weld_container(rID);
 
     pImpl.reset(new SfxDockingWindow_Impl(this));
 }
diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx
index 0289e78232fa..8840bcfa1b7c 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -1097,7 +1097,7 @@ sal_uInt16 SmElementsControl::itemAtPos(const Point& rPoint) const
 
 SmElementsDockingWindow::SmElementsDockingWindow(SfxBindings* pInputBindings, SfxChildWindow* pChildWindow, vcl::Window* pParent)
     : SfxDockingWindow(pInputBindings, pChildWindow, pParent, "DockingElements",
-        "modules/smath/ui/dockingelements.ui", true)
+        "modules/smath/ui/dockingelements.ui")
     , mxElementsControl(new SmElementsControl(m_xBuilder->weld_scrolled_window("scrolledwindow")))
     , mxElementsControlWin(new weld::CustomWeld(*m_xBuilder, "element_selector", *mxElementsControl))
     , mxElementListBox(m_xBuilder->weld_combo_box("listbox"))
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index 27c5d3a4de07..770adefd82ec 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -346,7 +346,7 @@ SvxBmpMaskChildWindow::SvxBmpMaskChildWindow(vcl::Window* pParent_, sal_uInt16 n
 
 SvxBmpMask::SvxBmpMask(SfxBindings *pBindinx, SfxChildWindow *pCW, vcl::Window* pParent)
     : SfxDockingWindow(pBindinx, pCW, pParent, "DockingColorReplace",
-                       "svx/ui/dockingcolorreplace.ui", true )
+                       "svx/ui/dockingcolorreplace.ui")
     , m_xTbxPipette(m_xBuilder->weld_toolbar("toolbar"))
     , m_xCtlPipette(new BmpColorWindow)
     , m_xCtlPipetteWin(new weld::CustomWeld(*m_xBuilder, "toolcolor", *m_xCtlPipette))
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index 99a4a8616a2d..33fd244bebae 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -176,7 +176,7 @@ SvxFontWorkChildWindow::SvxFontWorkChildWindow
 SvxFontWorkDialog::SvxFontWorkDialog(SfxBindings *pBindinx,
                                      SfxChildWindow *pCW,
                                      vcl::Window* _pParent)
-    : SfxDockingWindow(pBindinx, pCW, _pParent, "DockingFontwork", "svx/ui/dockingfontwork.ui", true)
+    : SfxDockingWindow(pBindinx, pCW, _pParent, "DockingFontwork", "svx/ui/dockingfontwork.ui")
     , rBindings(*pBindinx)
     , aInputIdle("SvxFontWorkDialog Input")
     , nSaveShadowX(0)
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index 5dd101a69274..9ae74ec12a8a 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -83,7 +83,7 @@ namespace {
 
 Svx3DWin::Svx3DWin(SfxBindings* pInBindings, SfxChildWindow *pCW, vcl::Window* pParent)
     : SfxDockingWindow(pInBindings, pCW, pParent,
-        "Docking3DEffects", "svx/ui/docking3deffects.ui", true)
+        "Docking3DEffects", "svx/ui/docking3deffects.ui")
 
     , m_xBtnGeo(m_xBuilder->weld_toggle_button("geometry"))
     , m_xBtnRepresentation(m_xBuilder->weld_toggle_button("representation"))