Adding upstream version 4:24.2.0.upstream/4%24.2.0

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

14 files changed, 1721 insertions, 0 deletions

diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.cxx b/sd/source/ui/framework/module/CenterViewFocusModule.cxx
new file mode 100644
index 0000000000..2c799e04bb
--- /dev/null
+++ b/sd/source/ui/framework/module/CenterViewFocusModule.cxx
@@ -0,0 +1,149 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "CenterViewFocusModule.hxx"
+
+#include <framework/FrameworkHelper.hxx>
+#include <framework/ViewShellWrapper.hxx>
+
+#include <DrawController.hxx>
+#include <ViewShellBase.hxx>
+#include <ViewShellManager.hxx>
+#include <com/sun/star/drawing/framework/XControllerManager.hpp>
+#include <com/sun/star/drawing/framework/XConfigurationController.hpp>
+#include <comphelper/servicehelper.hxx>
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::drawing::framework;
+
+using ::sd::framework::FrameworkHelper;
+
+namespace sd::framework {
+
+//===== CenterViewFocusModule ====================================================
+
+CenterViewFocusModule::CenterViewFocusModule (rtl::Reference<sd::DrawController> const & rxController)
+    : mbValid(false),
+      mpBase(nullptr),
+      mbNewViewCreated(false)
+{
+    if (rxController.is())
+    {
+        mxConfigurationController = rxController->getConfigurationController();
+
+        // Tunnel through the controller to obtain a ViewShellBase.
+        if (rxController != nullptr)
+            mpBase = rxController->GetViewShellBase();
+
+        // Check, if all required objects do exist.
+        if (mxConfigurationController.is() && mpBase!=nullptr)
+        {
+            mbValid = true;
+        }
+    }
+
+    if (mbValid)
+    {
+        mxConfigurationController->addConfigurationChangeListener(
+            this,
+            FrameworkHelper::msConfigurationUpdateEndEvent,
+            Any());
+        mxConfigurationController->addConfigurationChangeListener(
+            this,
+            FrameworkHelper::msResourceActivationEvent,
+            Any());
+    }
+}
+
+CenterViewFocusModule::~CenterViewFocusModule()
+{
+}
+
+void CenterViewFocusModule::disposing(std::unique_lock<std::mutex>&)
+{
+    if (mxConfigurationController.is())
+        mxConfigurationController->removeConfigurationChangeListener(this);
+
+    mbValid = false;
+    mxConfigurationController = nullptr;
+    mpBase = nullptr;
+}
+
+void SAL_CALL CenterViewFocusModule::notifyConfigurationChange (
+    const ConfigurationChangeEvent& rEvent)
+{
+    if (mbValid)
+    {
+        if (rEvent.Type == FrameworkHelper::msConfigurationUpdateEndEvent)
+        {
+            HandleNewView(rEvent.Configuration);
+        }
+        else if (rEvent.Type == FrameworkHelper::msResourceActivationEvent)
+        {
+            if (rEvent.ResourceId->getResourceURL().match(FrameworkHelper::msViewURLPrefix))
+                mbNewViewCreated = true;
+        }
+    }
+}
+
+void CenterViewFocusModule::HandleNewView (
+    const Reference<XConfiguration>& rxConfiguration)
+{
+    if (!mbNewViewCreated)
+        return;
+
+    mbNewViewCreated = false;
+    // Make the center pane the active one.  Tunnel through the
+    // controller to obtain a ViewShell pointer.
+
+    Sequence<Reference<XResourceId> > xViewIds (rxConfiguration->getResources(
+        FrameworkHelper::CreateResourceId(FrameworkHelper::msCenterPaneURL),
+        FrameworkHelper::msViewURLPrefix,
+        AnchorBindingMode_DIRECT));
+    Reference<XView> xView;
+    if (xViewIds.hasElements())
+        xView.set( mxConfigurationController->getResource(xViewIds[0]),UNO_QUERY);
+    if (mpBase!=nullptr)
+    {
+        auto pViewShellWrapper = dynamic_cast<ViewShellWrapper*>(xView.get());
+        if (pViewShellWrapper != nullptr)
+        {
+            std::shared_ptr<ViewShell> pViewShell = pViewShellWrapper->GetViewShell();
+            if (pViewShell != nullptr)
+                mpBase->GetViewShellManager()->MoveToTop(*pViewShell);
+        }
+    }
+}
+
+void SAL_CALL CenterViewFocusModule::disposing (
+    const lang::EventObject& rEvent)
+{
+    if (mxConfigurationController.is())
+        if (rEvent.Source == mxConfigurationController)
+        {
+            mbValid = false;
+            mxConfigurationController = nullptr;
+            mpBase = nullptr;
+        }
+}
+
+} // end of namespace sd::framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.hxx b/sd/source/ui/framework/module/CenterViewFocusModule.hxx
new file mode 100644
index 0000000000..e721562db0
--- /dev/null
+++ b/sd/source/ui/framework/module/CenterViewFocusModule.hxx
@@ -0,0 +1,91 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#pragma once
+
+#include <com/sun/star/drawing/framework/XConfigurationChangeListener.hpp>
+#include <comphelper/compbase.hxx>
+#include <rtl/ref.hxx>
+
+namespace com::sun::star::drawing::framework
+{
+class XConfigurationController;
+}
+namespace com::sun::star::frame
+{
+class XController;
+}
+
+namespace sd
+{
+class DrawController;
+class ViewShellBase;
+}
+
+namespace sd::framework
+{
+typedef comphelper::WeakComponentImplHelper<css::drawing::framework::XConfigurationChangeListener>
+    CenterViewFocusModuleInterfaceBase;
+
+/** This module waits for new views to be created for the center pane and
+    then moves the center view to the top most place on the shell stack.  As
+    we are moving away from the shell stack this module may become obsolete
+    or has to be modified.
+*/
+class CenterViewFocusModule final : public CenterViewFocusModuleInterfaceBase
+{
+public:
+    explicit CenterViewFocusModule(rtl::Reference<sd::DrawController> const& rxController);
+    virtual ~CenterViewFocusModule() override;
+
+    virtual void disposing(std::unique_lock<std::mutex>&) override;
+
+    // XConfigurationChangeListener
+
+    virtual void SAL_CALL notifyConfigurationChange(
+        const css::drawing::framework::ConfigurationChangeEvent& rEvent) override;
+
+    // XEventListener
+
+    virtual void SAL_CALL disposing(const css::lang::EventObject& rEvent) override;
+
+private:
+    class ViewShellContainer;
+
+    bool mbValid;
+    css::uno::Reference<css::drawing::framework::XConfigurationController>
+        mxConfigurationController;
+    ViewShellBase* mpBase;
+    /** This flag indicates whether in the last configuration change cycle a
+        new view has been created and thus the center view has to be moved
+        to the top of the shell stack.
+    */
+    bool mbNewViewCreated;
+
+    /** At the end of an update of the current configuration this method
+        handles a new view in the center pane by moving the associated view
+        shell to the top of the shell stack.
+    */
+    void HandleNewView(
+        const css::uno::Reference<css::drawing::framework::XConfiguration>& rxConfiguration);
+};
+
+} // end of namespace sd::framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/framework/module/DrawModule.cxx b/sd/source/ui/framework/module/DrawModule.cxx
new file mode 100644
index 0000000000..aaa2d90bb3
--- /dev/null
+++ b/sd/source/ui/framework/module/DrawModule.cxx
@@ -0,0 +1,42 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include <framework/DrawModule.hxx>
+
+#include <framework/FrameworkHelper.hxx>
+#include "CenterViewFocusModule.hxx"
+#include "SlideSorterModule.hxx"
+#include "ToolBarModule.hxx"
+#include <DrawController.hxx>
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::uno;
+
+namespace sd::framework
+{
+void DrawModule::Initialize(rtl::Reference<sd::DrawController> const& rxController)
+{
+    new sd::framework::CenterViewFocusModule(rxController);
+    new sd::framework::SlideSorterModule(rxController, FrameworkHelper::msLeftDrawPaneURL);
+    new ToolBarModule(rxController);
+}
+
+} // end of namespace sd::framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/framework/module/ImpressModule.cxx b/sd/source/ui/framework/module/ImpressModule.cxx
new file mode 100644
index 0000000000..f89212e4a0
--- /dev/null
+++ b/sd/source/ui/framework/module/ImpressModule.cxx
@@ -0,0 +1,52 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include <framework/ImpressModule.hxx>
+
+#include <framework/FrameworkHelper.hxx>
+#include "ViewTabBarModule.hxx"
+#include "CenterViewFocusModule.hxx"
+#include "SlideSorterModule.hxx"
+#include "ToolBarModule.hxx"
+#include "ShellStackGuard.hxx"
+#include <DrawController.hxx>
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::uno;
+
+namespace sd::framework {
+
+void ImpressModule::Initialize (rtl::Reference<sd::DrawController> const & rxController)
+{
+    new CenterViewFocusModule(rxController);
+    new ViewTabBarModule(
+        rxController,
+        FrameworkHelper::CreateResourceId(
+            FrameworkHelper::msViewTabBarURL,
+            FrameworkHelper::msCenterPaneURL));
+    new SlideSorterModule(
+        rxController,
+        FrameworkHelper::msLeftImpressPaneURL);
+    new ToolBarModule(rxController);
+    new ShellStackGuard(rxController);
+}
+
+} // end of namespace sd::framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx
new file mode 100644
index 0000000000..b064eefcda
--- /dev/null
+++ b/sd/source/ui/framework/module/ModuleController.cxx
@@ -0,0 +1,160 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include <framework/ModuleController.hxx>
+#include <framework/PresentationFactory.hxx>
+#include <framework/factories/BasicPaneFactory.hxx>
+#include <framework/factories/BasicViewFactory.hxx>
+#include <framework/factories/BasicToolBarFactory.hxx>
+#include <DrawController.hxx>
+#include <com/sun/star/frame/XController.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
+
+#include <tools/ConfigurationAccess.hxx>
+#include <comphelper/processfactory.hxx>
+
+#include <comphelper/diagnose_ex.hxx>
+#include <rtl/ref.hxx>
+#include <sal/log.hxx>
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::drawing::framework;
+
+namespace sd::framework {
+
+ModuleController::ModuleController(const rtl::Reference<::sd::DrawController>& rxController)
+{
+    assert(rxController);
+
+    /** Load a list of URL to service mappings.
+        The mappings are stored in the
+        mpResourceToFactoryMap member.
+    */
+    ProcessFactory(
+        "com.sun.star.drawing.framework.BasicPaneFactory",
+        { "private:resource/pane/CenterPane",
+          "private:resource/pane/LeftImpressPane",
+          "private:resource/pane/LeftDrawPane" });
+    ProcessFactory(
+        "com.sun.star.drawing.framework.BasicViewFactory",
+        { "private:resource/view/ImpressView",
+          "private:resource/view/GraphicView",
+          "private:resource/view/OutlineView",
+          "private:resource/view/NotesView",
+          "private:resource/view/HandoutView",
+          "private:resource/view/SlideSorter",
+        "private:resource/view/PresentationView" });
+    ProcessFactory(
+        "com.sun.star.drawing.framework.BasicToolBarFactory",
+        { "private:resource/toolbar/ViewTabBar" });
+
+    try
+    {
+        mxController = rxController;
+
+        InstantiateStartupServices();
+    }
+    catch (RuntimeException&)
+    {}
+}
+
+ModuleController::~ModuleController() noexcept
+{
+}
+
+void ModuleController::disposing(std::unique_lock<std::mutex>&)
+{
+    // Break the cyclic reference back to DrawController object
+    maLoadedFactories.clear();
+    maResourceToFactoryMap.clear();
+    mxController.clear();
+}
+
+void ModuleController::ProcessFactory (const OUString& sServiceName, ::std::vector<OUString> aURLs)
+{
+    // Get all resource URLs that are created by the factory.
+
+    SAL_INFO("sd.fwk", __func__ << ": ModuleController::adding factory " << sServiceName);
+
+    // Add the resource URLs to the map.
+    for (const auto& rResource : aURLs)
+    {
+        maResourceToFactoryMap[rResource] = sServiceName;
+        SAL_INFO("sd.fwk", __func__ << ":    " << rResource);
+    }
+}
+
+void ModuleController::InstantiateStartupServices()
+{
+    try
+    {
+        // Instantiate service.
+        // Note that when the new object will be destroyed at the end of
+        // this scope when it does not register itself anywhere.
+        // Typically it will add itself as ConfigurationChangeListener
+        // at the configuration controller.
+        sd::framework::PresentationFactory::install(mxController);
+    }
+    catch (Exception&)
+    {
+        SAL_WARN("sd.fwk", "ERROR in ModuleController::InstantiateStartupServices");
+    }
+}
+
+//----- XModuleController -----------------------------------------------------
+
+void SAL_CALL ModuleController::requestResource (const OUString& rsResourceURL)
+{
+    auto iFactory = maResourceToFactoryMap.find(rsResourceURL);
+    if (iFactory == maResourceToFactoryMap.end())
+        return;
+
+    // Check that the factory has already been loaded and not been
+    // destroyed in the meantime.
+    Reference<XInterface> xFactory;
+    auto iLoadedFactory = maLoadedFactories.find(iFactory->second);
+    if (iLoadedFactory != maLoadedFactories.end())
+        xFactory.set(iLoadedFactory->second, UNO_QUERY);
+    if (  xFactory.is())
+        return;
+
+    // Create a new instance of the factory.
+    Reference<uno::XComponentContext> xContext =
+        ::comphelper::getProcessComponentContext();
+
+    // Create the factory service.
+    if (iFactory->second == "com.sun.star.drawing.framework.BasicPaneFactory")
+        xFactory = uno::Reference<css::drawing::framework::XResourceFactory>(new BasicPaneFactory(xContext, mxController));
+    else if (iFactory->second == "com.sun.star.drawing.framework.BasicViewFactory")
+        xFactory = uno::Reference<css::drawing::framework::XResourceFactory>(new BasicViewFactory(mxController));
+    else if (iFactory->second == "com.sun.star.drawing.framework.BasicToolBarFactory")
+        xFactory = uno::Reference<css::drawing::framework::XResourceFactory>(new BasicToolBarFactory(mxController));
+    else
+        throw RuntimeException("unknown factory");
+
+    // Remember that this factory has been instanced.
+    maLoadedFactories[iFactory->second] = xFactory;
+}
+
+} // end of namespace sd::framework
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/framework/module/PresentationModule.cxx b/sd/source/ui/framework/module/PresentationModule.cxx
new file mode 100644
index 0000000000..c1ff16159d
--- /dev/null
+++ b/sd/source/ui/framework/module/PresentationModule.cxx
@@ -0,0 +1,36 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include <framework/PresentationModule.hxx>
+
+#include "CenterViewFocusModule.hxx"
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::uno;
+
+namespace sd::framework
+{
+void PresentationModule::Initialize(rtl::Reference<sd::DrawController> const& rxController)
+{
+    new sd::framework::CenterViewFocusModule(rxController);
+}
+
+} // end of namespace sd::framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/framework/module/ShellStackGuard.cxx b/sd/source/ui/framework/module/ShellStackGuard.cxx
new file mode 100644
index 0000000000..d7dcfb0f29
--- /dev/null
+++ b/sd/source/ui/framework/module/ShellStackGuard.cxx
@@ -0,0 +1,147 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "ShellStackGuard.hxx"
+
+#include <framework/ConfigurationController.hxx>
+#include <framework/FrameworkHelper.hxx>
+
+#include <DrawController.hxx>
+#include <ViewShellBase.hxx>
+#include <sfx2/printer.hxx>
+#include <com/sun/star/drawing/framework/XControllerManager.hpp>
+#include <comphelper/servicehelper.hxx>
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::drawing::framework;
+
+using ::sd::framework::FrameworkHelper;
+
+namespace sd::framework {
+
+//===== CenterViewFocusModule ====================================================
+
+ShellStackGuard::ShellStackGuard (rtl::Reference<sd::DrawController> const & rxController)
+    : mpBase(nullptr),
+      maPrinterPollingIdle("sd ShellStackGuard PrinterPollingIdle")
+{
+    if (rxController.is())
+    {
+        mxConfigurationController = rxController->getConfigurationController();
+
+        // Tunnel through the controller to obtain a ViewShellBase.
+        mpBase = rxController->GetViewShellBase();
+    }
+
+    if (mxConfigurationController.is())
+    {
+        // Listen for update starts so that the following update can be
+        // prevented in case of a printing printer.
+        mxConfigurationController->addConfigurationChangeListener(
+            this,
+            FrameworkHelper::msConfigurationUpdateStartEvent,
+            Any());
+
+        // Prepare the printer polling.
+        maPrinterPollingIdle.SetInvokeHandler(LINK(this,ShellStackGuard,TimeoutHandler));
+    }
+}
+
+ShellStackGuard::~ShellStackGuard()
+{
+}
+
+void ShellStackGuard::disposing(std::unique_lock<std::mutex>&)
+{
+    if (mxConfigurationController)
+    {
+        mxConfigurationController->removeConfigurationChangeListener(this);
+        mxConfigurationController = nullptr;
+    }
+    mpBase = nullptr;
+}
+
+void SAL_CALL ShellStackGuard::notifyConfigurationChange (
+    const ConfigurationChangeEvent& rEvent)
+{
+    if (rEvent.Type == FrameworkHelper::msConfigurationUpdateStartEvent)
+    {
+        if (mpUpdateLock == nullptr && IsPrinting())
+        {
+            // Prevent configuration updates while the printer is printing.
+            mpUpdateLock.reset(new ConfigurationController::Lock(mxConfigurationController));
+
+            // Start polling for the printer having finished printing.
+            maPrinterPollingIdle.Start();
+        }
+    }
+}
+
+void SAL_CALL ShellStackGuard::disposing (
+    const lang::EventObject& rEvent)
+{
+    if (mxConfigurationController.is())
+        if (rEvent.Source == mxConfigurationController)
+        {
+            mxConfigurationController = nullptr;
+            mpBase = nullptr;
+        }
+}
+
+IMPL_LINK(ShellStackGuard, TimeoutHandler, Timer*, pIdle, void)
+{
+#ifdef DEBUG
+    OSL_ASSERT(pIdle==&maPrinterPollingIdle);
+#else
+    (void)pIdle;
+#endif
+    if (mpUpdateLock == nullptr)
+        return;
+
+    if ( ! IsPrinting())
+    {
+        // Printing finished.  Release the update lock.
+        mpUpdateLock.reset();
+    }
+    else
+    {
+        // Wait long for the printing to finish.
+        maPrinterPollingIdle.Start();
+    }
+}
+
+bool ShellStackGuard::IsPrinting() const
+{
+    if (mpBase != nullptr)
+    {
+        SfxPrinter* pPrinter = mpBase->GetPrinter();
+        if (pPrinter != nullptr
+            && pPrinter->IsPrinting())
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+} // end of namespace sd::framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/framework/module/ShellStackGuard.hxx b/sd/source/ui/framework/module/ShellStackGuard.hxx
new file mode 100644
index 0000000000..fe94037816
--- /dev/null
+++ b/sd/source/ui/framework/module/ShellStackGuard.hxx
@@ -0,0 +1,96 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#pragma once
+
+#include <framework/ConfigurationController.hxx>
+
+#include <com/sun/star/drawing/framework/XConfigurationChangeListener.hpp>
+
+#include <rtl/ref.hxx>
+#include <vcl/idle.hxx>
+#include <comphelper/compbase.hxx>
+#include <memory>
+
+namespace com::sun::star::drawing::framework
+{
+class XConfigurationController;
+}
+namespace com::sun::star::frame
+{
+class XController;
+}
+
+namespace sd
+{
+class DrawController;
+class ViewShellBase;
+}
+
+namespace sd::framework
+{
+typedef comphelper::WeakComponentImplHelper<css::drawing::framework::XConfigurationChangeListener>
+    ShellStackGuardInterfaceBase;
+
+/** This module locks updates of the current configuration in situations
+    when the shell stack must not be modified.
+
+    On every start of a configuration update the ShellStackGuard checks the
+    printer.  If it is printing the configuration update is locked.  It then
+    polls the printer and unlocks updates when printing finishes.
+
+    When in the future there are no resources left that use shells then this
+    module can be removed.
+*/
+class ShellStackGuard : public ShellStackGuardInterfaceBase
+{
+public:
+    explicit ShellStackGuard(rtl::Reference<sd::DrawController> const& rxController);
+    virtual ~ShellStackGuard() override;
+
+    virtual void disposing(std::unique_lock<std::mutex>&) override;
+
+    // XConfigurationChangeListener
+
+    virtual void SAL_CALL notifyConfigurationChange(
+        const css::drawing::framework::ConfigurationChangeEvent& rEvent) override;
+
+    // XEventListener
+
+    virtual void SAL_CALL disposing(const css::lang::EventObject& rEvent) override;
+
+private:
+    css::uno::Reference<css::drawing::framework::XConfigurationController>
+        mxConfigurationController;
+    ViewShellBase* mpBase;
+    std::unique_ptr<ConfigurationController::Lock> mpUpdateLock;
+    Idle maPrinterPollingIdle;
+
+    DECL_LINK(TimeoutHandler, Timer*, void);
+
+    /** Return <TRUE/> when the printer is printing.  Return <FALSE/> when
+        the printer is not printing, or there is no printer, or something
+        else went wrong.
+    */
+    bool IsPrinting() const;
+};
+
+} // end of namespace sd::framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/framework/module/SlideSorterModule.cxx b/sd/source/ui/framework/module/SlideSorterModule.cxx
new file mode 100644
index 0000000000..1b6bbb7f9f
--- /dev/null
+++ b/sd/source/ui/framework/module/SlideSorterModule.cxx
@@ -0,0 +1,313 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "SlideSorterModule.hxx"
+
+#include <framework/FrameworkHelper.hxx>
+#include <framework/ConfigurationController.hxx>
+#include <DrawController.hxx>
+#include <com/sun/star/drawing/framework/XTabBar.hpp>
+#include <com/sun/star/drawing/framework/TabBarButton.hpp>
+#include <com/sun/star/drawing/framework/XControllerManager.hpp>
+#include <com/sun/star/frame/XController.hpp>
+
+#include <strings.hrc>
+#include <sdresid.hxx>
+#include <svtools/slidesorterbaropt.hxx>
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::drawing::framework;
+
+using ::sd::framework::FrameworkHelper;
+
+namespace {
+    const sal_Int32 ResourceActivationRequestEvent = 0;
+    const sal_Int32 ResourceDeactivationRequestEvent = 1;
+}
+
+namespace sd::framework {
+
+//===== SlideSorterModule ==================================================
+
+SlideSorterModule::SlideSorterModule (
+    const rtl::Reference<::sd::DrawController>& rxController,
+    const OUString& rsLeftPaneURL)
+    : mxResourceId(FrameworkHelper::CreateResourceId(FrameworkHelper::msSlideSorterURL, rsLeftPaneURL)),
+      mxMainViewAnchorId(FrameworkHelper::CreateResourceId(FrameworkHelper::msCenterPaneURL)),
+      mxViewTabBarId(FrameworkHelper::CreateResourceId(
+          FrameworkHelper::msViewTabBarURL,
+          FrameworkHelper::msCenterPaneURL)),
+      mxControllerManager(rxController)
+{
+    if (mxControllerManager.is())
+    {
+        mxConfigurationController = mxControllerManager->getConfigurationController();
+
+        if (mxConfigurationController.is())
+        {
+            uno::Reference<lang::XComponent> const xComppnent(
+                    mxConfigurationController, UNO_QUERY_THROW);
+            xComppnent->addEventListener(this);
+            mxConfigurationController->addConfigurationChangeListener(
+                this,
+                FrameworkHelper::msResourceActivationRequestEvent,
+                Any(ResourceActivationRequestEvent));
+            mxConfigurationController->addConfigurationChangeListener(
+                this,
+                FrameworkHelper::msResourceDeactivationRequestEvent,
+                Any(ResourceDeactivationRequestEvent));
+        }
+    }
+    if (!mxConfigurationController.is())
+        return;
+
+    UpdateViewTabBar(nullptr);
+
+    if (SvtSlideSorterBarOptions().GetVisibleImpressView())
+        AddActiveMainView(FrameworkHelper::msImpressViewURL);
+    if (SvtSlideSorterBarOptions().GetVisibleOutlineView())
+        AddActiveMainView(FrameworkHelper::msOutlineViewURL);
+    if (SvtSlideSorterBarOptions().GetVisibleNotesView())
+        AddActiveMainView(FrameworkHelper::msNotesViewURL);
+    if (SvtSlideSorterBarOptions().GetVisibleHandoutView())
+        AddActiveMainView(FrameworkHelper::msHandoutViewURL);
+    if (SvtSlideSorterBarOptions().GetVisibleSlideSorterView())
+        AddActiveMainView(FrameworkHelper::msSlideSorterURL);
+    if (SvtSlideSorterBarOptions().GetVisibleDrawView())
+        AddActiveMainView(FrameworkHelper::msDrawViewURL);
+
+    mxConfigurationController->addConfigurationChangeListener(
+        this,
+        FrameworkHelper::msResourceActivationEvent,
+        Any());
+}
+
+SlideSorterModule::~SlideSorterModule()
+{
+}
+
+void SlideSorterModule::SaveResourceState()
+{
+    SvtSlideSorterBarOptions().SetVisibleImpressView(IsResourceActive(FrameworkHelper::msImpressViewURL));
+    SvtSlideSorterBarOptions().SetVisibleOutlineView(IsResourceActive(FrameworkHelper::msOutlineViewURL));
+    SvtSlideSorterBarOptions().SetVisibleNotesView(IsResourceActive(FrameworkHelper::msNotesViewURL));
+    SvtSlideSorterBarOptions().SetVisibleHandoutView(IsResourceActive(FrameworkHelper::msHandoutViewURL));
+    SvtSlideSorterBarOptions().SetVisibleSlideSorterView(IsResourceActive(FrameworkHelper::msSlideSorterURL));
+    SvtSlideSorterBarOptions().SetVisibleDrawView(IsResourceActive(FrameworkHelper::msDrawViewURL));
+}
+
+void SAL_CALL SlideSorterModule::notifyConfigurationChange (
+    const ConfigurationChangeEvent& rEvent)
+{
+    if (rEvent.Type == FrameworkHelper::msResourceActivationEvent)
+    {
+        if (rEvent.ResourceId->compareTo(mxViewTabBarId) == 0)
+        {
+            // Update the view tab bar because the view tab bar has just
+            // become active.
+            UpdateViewTabBar(Reference<XTabBar>(rEvent.ResourceObject,UNO_QUERY));
+        }
+        else if (rEvent.ResourceId->getResourceTypePrefix() ==
+                     FrameworkHelper::msViewURLPrefix
+                 && rEvent.ResourceId->isBoundTo(
+                        FrameworkHelper::CreateResourceId(FrameworkHelper::msCenterPaneURL),
+                        AnchorBindingMode_DIRECT))
+        {
+            // Update the view tab bar because the view in the center pane
+            // has changed.
+            UpdateViewTabBar(nullptr);
+        }
+        return;
+    }
+
+    OSL_ASSERT(rEvent.ResourceId.is());
+    sal_Int32 nEventType = 0;
+    rEvent.UserData >>= nEventType;
+    switch (nEventType)
+    {
+        case ResourceActivationRequestEvent:
+            if (rEvent.ResourceId->isBoundToURL(
+                FrameworkHelper::msCenterPaneURL,
+                AnchorBindingMode_DIRECT))
+            {
+                // A resource directly bound to the center pane has been
+                // requested.
+                if (rEvent.ResourceId->getResourceTypePrefix() ==
+                    FrameworkHelper::msViewURLPrefix)
+                {
+                    // The requested resource is a view.  Show or hide the
+                    // resource managed by this ResourceManager accordingly.
+                    HandleMainViewSwitch(
+                        rEvent.ResourceId->getResourceURL(),
+                        true);
+                }
+            }
+            else if (rEvent.ResourceId->compareTo(mxResourceId) == 0)
+            {
+                // The resource managed by this ResourceManager has been
+                // explicitly been requested (maybe by us).  Remember this
+                // setting.
+                HandleResourceRequest(true, rEvent.Configuration);
+            }
+            break;
+
+        case ResourceDeactivationRequestEvent:
+            if (rEvent.ResourceId->compareTo(mxMainViewAnchorId) == 0)
+            {
+                HandleMainViewSwitch(
+                    OUString(),
+                    false);
+            }
+            else if (rEvent.ResourceId->compareTo(mxResourceId) == 0)
+            {
+                // The resource managed by this ResourceManager has been
+                // explicitly been requested to be hidden (maybe by us).
+                // Remember this setting.
+                HandleResourceRequest(false, rEvent.Configuration);
+            }
+            break;
+    }
+}
+
+void SlideSorterModule::UpdateViewTabBar (const Reference<XTabBar>& rxTabBar)
+{
+    if ( ! mxControllerManager.is())
+        return;
+
+    Reference<XTabBar> xBar (rxTabBar);
+    if ( ! xBar.is())
+    {
+        Reference<XConfigurationController> xCC (
+            mxControllerManager->getConfigurationController());
+        if (xCC.is())
+            xBar.set(xCC->getResource(mxViewTabBarId), UNO_QUERY);
+    }
+
+    if (!xBar.is())
+        return;
+
+    TabBarButton aButtonA;
+    aButtonA.ResourceId = FrameworkHelper::CreateResourceId(
+        FrameworkHelper::msSlideSorterURL,
+        FrameworkHelper::msCenterPaneURL);
+    aButtonA.ButtonLabel = SdResId(STR_SLIDE_SORTER_MODE);
+
+    TabBarButton aButtonB;
+    aButtonB.ResourceId = FrameworkHelper::CreateResourceId(
+        FrameworkHelper::msHandoutViewURL,
+        FrameworkHelper::msCenterPaneURL);
+
+    if ( ! xBar->hasTabBarButton(aButtonA))
+        xBar->addTabBarButtonAfter(aButtonA, aButtonB);
+}
+
+void SlideSorterModule::AddActiveMainView (
+    const OUString& rsMainViewURL)
+{
+    maActiveMainViewContainer.insert(rsMainViewURL);
+}
+
+bool SlideSorterModule::IsResourceActive (
+    const OUString& rsMainViewURL)
+{
+    return (maActiveMainViewContainer.find(rsMainViewURL) != maActiveMainViewContainer.end());
+}
+
+void SlideSorterModule::disposing(std::unique_lock<std::mutex>&)
+{
+    if (mxConfigurationController.is())
+    {
+        uno::Reference<lang::XComponent> const xComponent(mxConfigurationController, UNO_QUERY);
+        if (xComponent.is())
+            xComponent->removeEventListener(this);
+
+        mxConfigurationController->removeConfigurationChangeListener(this);
+        mxConfigurationController = nullptr;
+    }
+}
+
+void SlideSorterModule::HandleMainViewSwitch (
+    const OUString& rsViewURL,
+    const bool bIsActivated)
+{
+    if (bIsActivated)
+        msCurrentMainViewURL = rsViewURL;
+    else
+        msCurrentMainViewURL.clear();
+
+    if (!mxConfigurationController.is())
+        return;
+
+    ConfigurationController::Lock aLock (mxConfigurationController);
+
+    if (maActiveMainViewContainer.find(msCurrentMainViewURL)
+           != maActiveMainViewContainer.end())
+    {
+        // Activate resource.
+        mxConfigurationController->requestResourceActivation(
+            mxResourceId->getAnchor(),
+            ResourceActivationMode_ADD);
+        mxConfigurationController->requestResourceActivation(
+            mxResourceId,
+            ResourceActivationMode_REPLACE);
+    }
+    else
+    {
+        mxConfigurationController->requestResourceDeactivation(mxResourceId);
+    }
+}
+
+void SlideSorterModule::HandleResourceRequest(
+    bool bActivation,
+    const Reference<XConfiguration>& rxConfiguration)
+{
+    Sequence<Reference<XResourceId> > aCenterViews = rxConfiguration->getResources(
+        FrameworkHelper::CreateResourceId(FrameworkHelper::msCenterPaneURL),
+        FrameworkHelper::msViewURLPrefix,
+        AnchorBindingMode_DIRECT);
+    if (aCenterViews.getLength() == 1)
+    {
+        if (bActivation)
+        {
+            maActiveMainViewContainer.insert(aCenterViews[0]->getResourceURL());
+        }
+        else
+        {
+            maActiveMainViewContainer.erase(aCenterViews[0]->getResourceURL());
+        }
+    }
+}
+
+void SAL_CALL SlideSorterModule::disposing (
+    const lang::EventObject& rEvent)
+{
+    if (mxConfigurationController.is()
+        && rEvent.Source == mxConfigurationController)
+    {
+        SaveResourceState();
+        // Without the configuration controller this class can do nothing.
+        mxConfigurationController = nullptr;
+        dispose();
+    }
+}
+
+} // end of namespace sd::framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/framework/module/SlideSorterModule.hxx b/sd/source/ui/framework/module/SlideSorterModule.hxx
new file mode 100644
index 0000000000..f56d2c8c75
--- /dev/null
+++ b/sd/source/ui/framework/module/SlideSorterModule.hxx
@@ -0,0 +1,99 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#pragma once
+
+#include <com/sun/star/drawing/framework/XConfigurationChangeListener.hpp>
+#include <comphelper/compbase.hxx>
+#include <rtl/ref.hxx>
+#include <memory>
+#include <set>
+
+namespace com::sun::star::drawing::framework { class XConfigurationController; }
+namespace com::sun::star::drawing::framework { class XControllerManager; }
+namespace com::sun::star::drawing::framework { class XTabBar; }
+namespace com::sun::star::frame { class XController; }
+namespace sd { class DrawController; }
+
+namespace sd::framework {
+
+typedef comphelper::WeakComponentImplHelper <
+    css::drawing::framework::XConfigurationChangeListener
+    > SlideSorterModuleBase;
+
+/** This module is responsible for showing the slide sorter bar and the
+    slide sorter view in the center pane.
+
+    Manage the activation state of one resource depending on the view in the
+    center pane.  The ResourceManager remembers in which configuration to
+    activate and in which to deactivate the resource.  When the resource is
+    deactivated or activated manually by the user then the ResourceManager
+    detects this and remembers it for the future.
+*/
+class SlideSorterModule final
+    : public SlideSorterModuleBase
+{
+public:
+    SlideSorterModule (
+        const rtl::Reference<::sd::DrawController>& rxController,
+        const OUString& rsLeftPaneURL);
+    virtual ~SlideSorterModule() override;
+
+    /** Remember the given URL as one of a center pane view for which to
+        activate the resource managed by the called object.
+    */
+    void AddActiveMainView (const OUString& rsMainViewURL);
+    bool IsResourceActive (const OUString& rsMainViewURL);
+    void SaveResourceState();
+
+    virtual void disposing(std::unique_lock<std::mutex>&) override;
+
+    // XConfigurationChangeListener
+    virtual void SAL_CALL notifyConfigurationChange (
+        const css::drawing::framework::ConfigurationChangeEvent& rEvent) override;
+
+    // XEventListener
+    virtual void SAL_CALL disposing (
+        const css::lang::EventObject& rEvent) override;
+
+private:
+    css::uno::Reference<css::drawing::framework::XConfigurationController>
+        mxConfigurationController;
+    ::std::set<OUString> maActiveMainViewContainer;
+    /// The resource managed by this class.
+    css::uno::Reference<css::drawing::framework::XResourceId> mxResourceId;
+    /// The anchor of the main view.
+    css::uno::Reference<css::drawing::framework::XResourceId> mxMainViewAnchorId;
+    OUString msCurrentMainViewURL;
+    css::uno::Reference<css::drawing::framework::XResourceId> mxViewTabBarId;
+    rtl::Reference<::sd::DrawController> mxControllerManager;
+
+    void HandleMainViewSwitch (
+        const OUString& rsViewURL,
+        const bool bIsActivated);
+    void HandleResourceRequest(
+        bool bActivation,
+        const css::uno::Reference<css::drawing::framework::XConfiguration>& rxConfiguration);
+    void UpdateViewTabBar (
+        const css::uno::Reference<css::drawing::framework::XTabBar>& rxViewTabBar);
+};
+
+} // end of namespace sd::framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/framework/module/ToolBarModule.cxx b/sd/source/ui/framework/module/ToolBarModule.cxx
new file mode 100644
index 0000000000..de7f3e5831
--- /dev/null
+++ b/sd/source/ui/framework/module/ToolBarModule.cxx
@@ -0,0 +1,189 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "ToolBarModule.hxx"
+#include <ViewShellBase.hxx>
+#include <DrawController.hxx>
+#include <comphelper/servicehelper.hxx>
+#include <framework/FrameworkHelper.hxx>
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::drawing::framework;
+
+using ::sd::framework::FrameworkHelper;
+
+namespace {
+    const sal_Int32 gnConfigurationUpdateStartEvent(0);
+    const sal_Int32 gnConfigurationUpdateEndEvent(1);
+    const sal_Int32 gnResourceActivationRequestEvent(2);
+    const sal_Int32 gnResourceDeactivationRequestEvent(3);
+}
+
+namespace sd::framework {
+
+//===== ToolBarModule =========================================================
+
+ToolBarModule::ToolBarModule (
+    const rtl::Reference<sd::DrawController>& rxController)
+    : mpBase(nullptr),
+      mbMainViewSwitchUpdatePending(false)
+{
+    // Tunnel through the controller to obtain a ViewShellBase.
+    if (rxController != nullptr)
+        mpBase = rxController->GetViewShellBase();
+
+    if (!rxController.is())
+        return;
+
+    mxConfigurationController = rxController->getConfigurationController();
+    if (!mxConfigurationController.is())
+        return;
+
+    mxConfigurationController->addConfigurationChangeListener(
+        this,
+        FrameworkHelper::msConfigurationUpdateStartEvent,
+        Any(gnConfigurationUpdateStartEvent));
+    mxConfigurationController->addConfigurationChangeListener(
+        this,
+        FrameworkHelper::msConfigurationUpdateEndEvent,
+        Any(gnConfigurationUpdateEndEvent));
+    mxConfigurationController->addConfigurationChangeListener(
+        this,
+        FrameworkHelper::msResourceActivationRequestEvent,
+        Any(gnResourceActivationRequestEvent));
+    mxConfigurationController->addConfigurationChangeListener(
+        this,
+        FrameworkHelper::msResourceDeactivationRequestEvent,
+        Any(gnResourceDeactivationRequestEvent));
+}
+
+ToolBarModule::~ToolBarModule()
+{
+}
+
+void ToolBarModule::disposing(std::unique_lock<std::mutex>&)
+{
+    if (mxConfigurationController.is())
+    {
+        mxConfigurationController->removeConfigurationChangeListener(this);
+        mxConfigurationController = nullptr;
+    }
+}
+
+void SAL_CALL ToolBarModule::notifyConfigurationChange (
+    const ConfigurationChangeEvent& rEvent)
+{
+    if (!mxConfigurationController.is())
+        return;
+
+    sal_Int32 nEventType = 0;
+    rEvent.UserData >>= nEventType;
+    switch (nEventType)
+    {
+        case gnConfigurationUpdateStartEvent:
+            HandleUpdateStart();
+            break;
+
+        case gnConfigurationUpdateEndEvent:
+            HandleUpdateEnd();
+            break;
+
+        case gnResourceActivationRequestEvent:
+        case gnResourceDeactivationRequestEvent:
+            // Remember the request for the activation or deactivation
+            // of the center pane view.  When that happens then on end
+            // of the next configuration update the set of visible tool
+            // bars will be updated.
+            if ( ! mbMainViewSwitchUpdatePending)
+                if (rEvent.ResourceId->getResourceURL().match(
+                    FrameworkHelper::msViewURLPrefix)
+                    && rEvent.ResourceId->isBoundToURL(
+                        FrameworkHelper::msCenterPaneURL, AnchorBindingMode_DIRECT))
+                {
+                    mbMainViewSwitchUpdatePending = true;
+                }
+            break;
+    }
+}
+
+void ToolBarModule::HandleUpdateStart()
+{
+    // Lock the ToolBarManager and tell it to lock the ViewShellManager as
+    // well.  This way the ToolBarManager can optimize the releasing of
+    // locks and arranging of updates of both tool bars and the view shell
+    // stack.
+    if (mpBase != nullptr)
+    {
+        std::shared_ptr<ToolBarManager> pToolBarManager (mpBase->GetToolBarManager());
+        mpToolBarManagerLock.reset(new ToolBarManager::UpdateLock(pToolBarManager));
+        pToolBarManager->LockViewShellManager();
+    }
+}
+
+void ToolBarModule::HandleUpdateEnd()
+{
+    if (mbMainViewSwitchUpdatePending)
+    {
+        mbMainViewSwitchUpdatePending = false;
+        // Update the set of visible tool bars and deactivate those that are
+        // no longer visible.  This is done before the old view shell is
+        // destroyed in order to avoid unnecessary updates of those tool
+        // bars.
+        std::shared_ptr<ToolBarManager> pToolBarManager (mpBase->GetToolBarManager());
+        std::shared_ptr<FrameworkHelper> pFrameworkHelper (
+            FrameworkHelper::Instance(*mpBase));
+        ViewShell* pViewShell
+            = pFrameworkHelper->GetViewShell(FrameworkHelper::msCenterPaneURL).get();
+        if (pViewShell != nullptr)
+        {
+            pToolBarManager->MainViewShellChanged(*pViewShell);
+            pToolBarManager->SelectionHasChanged(
+                *pViewShell,
+                *pViewShell->GetView());
+            pToolBarManager->PreUpdate();
+        }
+        else
+        {
+            pToolBarManager->MainViewShellChanged();
+            pToolBarManager->PreUpdate();
+        }
+    }
+
+    // Releasing the update lock of the ToolBarManager  will let the
+    // ToolBarManager with the help of the ViewShellManager take care of
+    // updating tool bars and view shell with the minimal amount of
+    // shell stack modifications and tool bar updates.
+    mpToolBarManagerLock.reset();
+}
+
+void SAL_CALL ToolBarModule::disposing (const lang::EventObject& rEvent)
+{
+    if (mxConfigurationController.is()
+        && rEvent.Source == mxConfigurationController)
+    {
+        // Without the configuration controller this class can do nothing.
+        mxConfigurationController = nullptr;
+        dispose();
+    }
+}
+
+} // end of namespace sd::framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/framework/module/ToolBarModule.hxx b/sd/source/ui/framework/module/ToolBarModule.hxx
new file mode 100644
index 0000000000..bf0c017ef9
--- /dev/null
+++ b/sd/source/ui/framework/module/ToolBarModule.hxx
@@ -0,0 +1,83 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#pragma once
+
+#include <ToolBarManager.hxx>
+#include <com/sun/star/drawing/framework/XConfigurationChangeListener.hpp>
+#include <comphelper/compbase.hxx>
+#include <o3tl/deleter.hxx>
+#include <rtl/ref.hxx>
+#include <memory>
+
+namespace com::sun::star::drawing::framework { class XConfigurationController; }
+namespace com::sun::star::frame { class XController; }
+
+namespace sd {
+class DrawController;
+class ViewShellBase;
+}
+
+namespace sd::framework {
+
+typedef comphelper::WeakComponentImplHelper <
+    css::drawing::framework::XConfigurationChangeListener
+    > ToolBarModuleInterfaceBase;
+
+/** This module is responsible for locking the ToolBarManager during
+    configuration updates and for triggering ToolBarManager updates.
+*/
+class ToolBarModule final
+    : public ToolBarModuleInterfaceBase
+{
+public:
+    /** Create a new module.
+        @param rxController
+            This is the access point to the drawing framework.
+    */
+    explicit ToolBarModule (
+        const rtl::Reference<sd::DrawController>& rxController);
+    virtual ~ToolBarModule() override;
+
+    virtual void disposing(std::unique_lock<std::mutex>&) override;
+
+    // XConfigurationChangeListener
+
+    virtual void SAL_CALL notifyConfigurationChange (
+        const css::drawing::framework::ConfigurationChangeEvent& rEvent) override;
+
+    // XEventListener
+
+    virtual void SAL_CALL disposing (
+        const css::lang::EventObject& rEvent) override;
+
+private:
+    css::uno::Reference<
+        css::drawing::framework::XConfigurationController> mxConfigurationController;
+    ViewShellBase* mpBase;
+    std::unique_ptr<ToolBarManager::UpdateLock, o3tl::default_delete<ToolBarManager::UpdateLock>> mpToolBarManagerLock;
+    bool mbMainViewSwitchUpdatePending;
+
+    void HandleUpdateStart();
+    void HandleUpdateEnd();
+};
+
+} // end of namespace sd::framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/framework/module/ViewTabBarModule.cxx b/sd/source/ui/framework/module/ViewTabBarModule.cxx
new file mode 100644
index 0000000000..163b7adb02
--- /dev/null
+++ b/sd/source/ui/framework/module/ViewTabBarModule.cxx
@@ -0,0 +1,179 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "ViewTabBarModule.hxx"
+
+#include <framework/FrameworkHelper.hxx>
+#include <DrawController.hxx>
+#include <com/sun/star/drawing/framework/XControllerManager.hpp>
+#include <com/sun/star/drawing/framework/XTabBar.hpp>
+#include <com/sun/star/frame/XController.hpp>
+
+#include <strings.hrc>
+#include <sdresid.hxx>
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::drawing::framework;
+
+using ::sd::framework::FrameworkHelper;
+
+namespace {
+
+const sal_Int32 ResourceActivationRequestEvent = 0;
+const sal_Int32 ResourceDeactivationRequestEvent = 1;
+const sal_Int32 ResourceActivationEvent = 2;
+
+}
+
+namespace sd::framework {
+
+//===== ViewTabBarModule ==================================================
+
+ViewTabBarModule::ViewTabBarModule (
+    const rtl::Reference<::sd::DrawController>& rxController,
+    const Reference<XResourceId>& rxViewTabBarId)
+    : mxViewTabBarId(rxViewTabBarId)
+{
+    if (!rxController.is())
+        return;
+
+    mxConfigurationController = rxController->getConfigurationController();
+    if (!mxConfigurationController.is())
+        return;
+
+    mxConfigurationController->addConfigurationChangeListener(
+        this,
+        FrameworkHelper::msResourceActivationRequestEvent,
+        Any(ResourceActivationRequestEvent));
+    mxConfigurationController->addConfigurationChangeListener(
+        this,
+        FrameworkHelper::msResourceDeactivationRequestEvent,
+        Any(ResourceDeactivationRequestEvent));
+
+    UpdateViewTabBar(nullptr);
+    mxConfigurationController->addConfigurationChangeListener(
+        this,
+        FrameworkHelper::msResourceActivationEvent,
+        Any(ResourceActivationEvent));
+}
+
+ViewTabBarModule::~ViewTabBarModule()
+{
+}
+
+void ViewTabBarModule::disposing(std::unique_lock<std::mutex>&)
+{
+    if (mxConfigurationController.is())
+    {
+        mxConfigurationController->removeConfigurationChangeListener(this);
+        mxConfigurationController = nullptr;
+    }
+}
+
+void SAL_CALL ViewTabBarModule::notifyConfigurationChange (
+    const ConfigurationChangeEvent& rEvent)
+{
+    if (!mxConfigurationController.is())
+        return;
+
+    sal_Int32 nEventType = 0;
+    rEvent.UserData >>= nEventType;
+    switch (nEventType)
+    {
+        case ResourceActivationRequestEvent:
+            if (mxViewTabBarId->isBoundTo(rEvent.ResourceId, AnchorBindingMode_DIRECT))
+            {
+                mxConfigurationController->requestResourceActivation(
+                    mxViewTabBarId,
+                    ResourceActivationMode_ADD);
+            }
+            break;
+
+        case ResourceDeactivationRequestEvent:
+            if (mxViewTabBarId->isBoundTo(rEvent.ResourceId, AnchorBindingMode_DIRECT))
+            {
+                mxConfigurationController->requestResourceDeactivation(mxViewTabBarId);
+            }
+            break;
+
+        case ResourceActivationEvent:
+            if (rEvent.ResourceId->compareTo(mxViewTabBarId) == 0)
+            {
+                UpdateViewTabBar(Reference<XTabBar>(rEvent.ResourceObject,UNO_QUERY));
+            }
+    }
+}
+
+void SAL_CALL ViewTabBarModule::disposing (
+    const lang::EventObject& rEvent)
+{
+    if (mxConfigurationController.is()
+        && rEvent.Source == mxConfigurationController)
+    {
+        // Without the configuration controller this class can do nothing.
+        mxConfigurationController = nullptr;
+        dispose();
+    }
+}
+
+void ViewTabBarModule::UpdateViewTabBar (const Reference<XTabBar>& rxTabBar)
+{
+    if (!mxConfigurationController.is())
+        return;
+
+    Reference<XTabBar> xBar (rxTabBar);
+    if ( ! xBar.is())
+        xBar.set( mxConfigurationController->getResource(mxViewTabBarId), UNO_QUERY);
+
+    if (!xBar.is())
+        return;
+
+    TabBarButton aEmptyButton;
+
+    Reference<XResourceId> xAnchor (mxViewTabBarId->getAnchor());
+
+    TabBarButton aImpressViewButton;
+    aImpressViewButton.ResourceId = FrameworkHelper::CreateResourceId(
+        FrameworkHelper::msImpressViewURL,
+        xAnchor);
+    aImpressViewButton.ButtonLabel = SdResId(STR_NORMAL_MODE);
+    if ( ! xBar->hasTabBarButton(aImpressViewButton))
+        xBar->addTabBarButtonAfter(aImpressViewButton, aEmptyButton);
+
+    TabBarButton aOutlineViewButton;
+    aOutlineViewButton.ResourceId = FrameworkHelper::CreateResourceId(
+        FrameworkHelper::msOutlineViewURL,
+        xAnchor);
+    aOutlineViewButton.ButtonLabel = SdResId(STR_OUTLINE_MODE);
+    if ( ! xBar->hasTabBarButton(aOutlineViewButton))
+        xBar->addTabBarButtonAfter(aOutlineViewButton, aImpressViewButton);
+
+    TabBarButton aNotesViewButton;
+    aNotesViewButton.ResourceId = FrameworkHelper::CreateResourceId(
+        FrameworkHelper::msNotesViewURL,
+        xAnchor);
+    aNotesViewButton.ButtonLabel = SdResId(STR_NOTES_MODE);
+    if ( ! xBar->hasTabBarButton(aNotesViewButton))
+        xBar->addTabBarButtonAfter(aNotesViewButton, aOutlineViewButton);
+}
+
+} // end of namespace sd::framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/framework/module/ViewTabBarModule.hxx b/sd/source/ui/framework/module/ViewTabBarModule.hxx
new file mode 100644
index 0000000000..5a492dc324
--- /dev/null
+++ b/sd/source/ui/framework/module/ViewTabBarModule.hxx
@@ -0,0 +1,85 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#pragma once
+
+#include <com/sun/star/drawing/framework/XConfigurationChangeListener.hpp>
+#include <comphelper/compbase.hxx>
+#include <rtl/ref.hxx>
+
+namespace com::sun::star::drawing::framework { class XConfigurationController; }
+namespace com::sun::star::drawing::framework { class XTabBar; }
+namespace com::sun::star::frame { class XController; }
+namespace sd { class DrawController; }
+
+namespace sd::framework {
+
+typedef comphelper::WeakComponentImplHelper <
+    css::drawing::framework::XConfigurationChangeListener
+    > ViewTabBarModuleInterfaceBase;
+
+/** This module is responsible for showing the ViewTabBar above the view in
+    the center pane.
+*/
+class ViewTabBarModule
+    : public ViewTabBarModuleInterfaceBase
+{
+public:
+    /** Create a new module that controls the view tab bar above the view
+        in the specified pane.
+        @param rxController
+            This is the access point to the drawing framework.
+        @param rxViewTabBarId
+            This ResourceId specifies which tab bar is to be managed by the
+            new module.
+    */
+    ViewTabBarModule (
+        const rtl::Reference<::sd::DrawController>& rxController,
+        const css::uno::Reference<
+            css::drawing::framework::XResourceId>& rxViewTabBarId);
+    virtual ~ViewTabBarModule() override;
+
+    virtual void disposing(std::unique_lock<std::mutex>&) override;
+
+    // XConfigurationChangeListener
+
+    virtual void SAL_CALL notifyConfigurationChange (
+        const css::drawing::framework::ConfigurationChangeEvent& rEvent) override;
+
+    // XEventListener
+
+    virtual void SAL_CALL disposing (
+        const css::lang::EventObject& rEvent) override;
+
+private:
+    css::uno::Reference<
+        css::drawing::framework::XConfigurationController> mxConfigurationController;
+    css::uno::Reference<css::drawing::framework::XResourceId> mxViewTabBarId;
+
+    /** This is the place where the view tab bar is filled.  Only missing
+        buttons are added, so it is safe to call this method multiple
+        times.
+    */
+    void UpdateViewTabBar (
+        const css::uno::Reference<css::drawing::framework::XTabBar>& rxTabBar);
+};
+
+} // end of namespace sd::framework
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */