compilerplugins/clang/constantparam.numbers.results         |    4 -
 compilerplugins/clang/unusedenumconstants.writeonly.results |    8 +-
 compilerplugins/clang/unusedfields.writeonly.results        |    2 
 include/basegfx/matrix/b3dhommatrixtools.hxx                |    2 
 sd/source/console/PresenterConfigurationAccess.hxx          |    2 
 sd/source/ui/animations/CustomAnimationPane.cxx             |    6 +-
 sd/source/ui/animations/SlideTransitionPane.cxx             |    6 +-
 sd/source/ui/annotations/annotationmanager.cxx              |    6 +-
 sd/source/ui/annotations/annotationmanagerimpl.hxx          |    5 -
 sd/source/ui/framework/module/NotesPaneModule.cxx           |    3 -
 sd/source/ui/framework/module/NotesPaneModule.hxx           |    4 -
 sd/source/ui/framework/module/ToolBarModule.cxx             |    2 
 sd/source/ui/framework/module/ToolBarModule.hxx             |    4 -
 sd/source/ui/inc/CustomAnimationPane.hxx                    |    4 -
 sd/source/ui/inc/DrawViewShell.hxx                          |    2 
 sd/source/ui/inc/EventMultiplexer.hxx                       |    6 +-
 sd/source/ui/inc/FormShellManager.hxx                       |    4 -
 sd/source/ui/inc/NotesPanelView.hxx                         |    4 -
 sd/source/ui/inc/OutlineView.hxx                            |    4 -
 sd/source/ui/inc/SlideTransitionPane.hxx                    |    4 -
 sd/source/ui/inc/TableDesignPane.hxx                        |   10 +--
 sd/source/ui/inc/TemplateScanner.hxx                        |    2 
 sd/source/ui/inc/ToolBarManager.hxx                         |    4 -
 sd/source/ui/inc/ViewShellBase.hxx                          |    4 -
 sd/source/ui/inc/tools/AsynchronousCall.hxx                 |    4 -
 sd/source/ui/inc/tools/AsynchronousTask.hxx                 |    4 -
 sd/source/ui/inc/tools/ConfigurationAccess.hxx              |    4 -
 sd/source/ui/inc/tools/IdleDetection.hxx                    |   10 +--
 sd/source/ui/inc/tools/SlotStateListener.hxx                |    4 -
 sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx          |    4 -
 sd/source/ui/inc/view/viewoverlaymanager.hxx                |    4 -
 sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx         |    6 +-
 sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx         |    4 -
 sd/source/ui/sidebar/LayoutMenu.cxx                         |    8 +-
 sd/source/ui/sidebar/LayoutMenu.hxx                         |    6 +-
 sd/source/ui/sidebar/MasterPageContainer.cxx                |    6 +-
 sd/source/ui/sidebar/MasterPageContainerFiller.hxx          |    2 
 sd/source/ui/sidebar/MasterPageContainerQueue.cxx           |    6 +-
 sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx            |    8 +-
 sd/source/ui/sidebar/SlideBackground.cxx                    |    6 +-
 sd/source/ui/sidebar/SlideBackground.hxx                    |    4 -
 sd/source/ui/slidesorter/controller/SlsListener.cxx         |    6 +-
 sd/source/ui/slidesorter/controller/SlsListener.hxx         |    4 -
 sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx       |    4 -
 sd/source/ui/table/TableDesignPane.cxx                      |    6 +-
 sd/source/ui/tools/AsynchronousCall.cxx                     |    4 -
 sd/source/ui/tools/ConfigurationAccess.cxx                  |    4 -
 sd/source/ui/tools/EventMultiplexer.cxx                     |   36 ++++++------
 sd/source/ui/tools/IdleDetection.cxx                        |    8 +-
 sd/source/ui/tools/SlotStateListener.cxx                    |    4 -
 sd/source/ui/tools/TimerBasedTaskExecution.cxx              |    6 +-
 sd/source/ui/view/FormShellManager.cxx                      |    6 +-
 sd/source/ui/view/NotesPanelView.cxx                        |    2 
 sd/source/ui/view/ToolBarManager.cxx                        |   16 ++---
 sd/source/ui/view/ViewShellBase.cxx                         |    6 +-
 sd/source/ui/view/outlview.cxx                              |    6 +-
 sd/source/ui/view/viewoverlaymanager.cxx                    |    6 +-
 57 files changed, 157 insertions(+), 159 deletions(-)

New commits:
commit a4072e27647106a9363032c9d7953f2691c8c02f
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Wed Aug 20 14:08:18 2025 +0500
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Wed Aug 20 15:23:53 2025 +0200

    sd::tools -> sdtools
    
    At least some IDEs are confused by our multitude of `tools` namespaces,
    and show errors like `namespace "tools" is ambiguous`.
    This removes one such namespace. The idea is to drop all but the one
    in /tools (that has tools::Long and tools::Rectangle).
    
    Change-Id: I338b995a29fcfa7142933c195750292593a364ac
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189959
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/compilerplugins/clang/constantparam.numbers.results 
b/compilerplugins/clang/constantparam.numbers.results
index b68c93cf07fb..b3ef1f8da5af 100644
--- a/compilerplugins/clang/constantparam.numbers.results
+++ b/compilerplugins/clang/constantparam.numbers.results
@@ -2587,11 +2587,11 @@ sd/source/ui/inc/smarttag.hxx:158
     enum SdrHdlKind eNewKind
     23
 sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx:50
-    class std::shared_ptr<class sd::tools::TimerBasedTaskExecution> 
sd::tools::TimerBasedTaskExecution::Create(const class std::shared_ptr<class 
sd::tools::AsynchronousTask> &,unsigned int,unsigned int)
+    class std::shared_ptr<class sdtools::TimerBasedTaskExecution> 
sdtools::TimerBasedTaskExecution::Create(const class std::shared_ptr<class 
sdtools::AsynchronousTask> &,unsigned int,unsigned int)
     unsigned int nMillisecondsBetweenSteps
     5
 sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx:50
-    class std::shared_ptr<class sd::tools::TimerBasedTaskExecution> 
sd::tools::TimerBasedTaskExecution::Create(const class std::shared_ptr<class 
sd::tools::AsynchronousTask> &,unsigned int,unsigned int)
+    class std::shared_ptr<class sdtools::TimerBasedTaskExecution> 
sdtools::TimerBasedTaskExecution::Create(const class std::shared_ptr<class 
sdtools::AsynchronousTask> &,unsigned int,unsigned int)
     unsigned int nMaxTimePerStep
     50
 sd/source/ui/inc/ViewShellManager.hxx:159
diff --git a/compilerplugins/clang/unusedenumconstants.writeonly.results 
b/compilerplugins/clang/unusedenumconstants.writeonly.results
index 438324b902d0..a5416adbffd5 100644
--- a/compilerplugins/clang/unusedenumconstants.writeonly.results
+++ b/compilerplugins/clang/unusedenumconstants.writeonly.results
@@ -5293,13 +5293,13 @@ sd/source/ui/inc/ToolBarManager.hxx:133
 sd/source/ui/inc/ToolBarManager.hxx:134
     enum sd::ToolBarManager::ToolBarGroup MasterMode
 sd/source/ui/inc/tools/ConfigurationAccess.hxx:43
-    enum sd::tools::ConfigurationAccess::WriteMode READ_WRITE
+    enum sdtools::ConfigurationAccess::WriteMode READ_WRITE
 sd/source/ui/inc/tools/IdleDetection.hxx:34
-    enum sd::tools::IdleState SystemEventPending
+    enum sdtools::IdleState SystemEventPending
 sd/source/ui/inc/tools/IdleDetection.hxx:44
-    enum sd::tools::IdleState WindowShowActive
+    enum sdtools::IdleState WindowShowActive
 sd/source/ui/inc/tools/IdleDetection.hxx:48
-    enum sd::tools::IdleState WindowPainting
+    enum sdtools::IdleState WindowPainting
 sd/source/ui/remotecontrol/BluetoothServer.cxx:100
     enum sd::BluetoothServer::Impl::BluezVersion BLUEZ4
 sd/source/ui/remotecontrol/BluetoothServer.hxx:47
diff --git a/compilerplugins/clang/unusedfields.writeonly.results 
b/compilerplugins/clang/unusedfields.writeonly.results
index 3370984ec87b..7d078c056d6b 100644
--- a/compilerplugins/clang/unusedfields.writeonly.results
+++ b/compilerplugins/clang/unusedfields.writeonly.results
@@ -1231,7 +1231,7 @@ sd/source/ui/inc/navigatr.hxx:146
 sd/source/ui/inc/SlideshowLayerRenderer.hxx:89
     sd::RenderPass mbAnimation _Bool
 sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx:72
-    sd::tools::TimerBasedTaskExecution mpSelf 
std::shared_ptr<TimerBasedTaskExecution>
+    sdtools::TimerBasedTaskExecution mpSelf 
std::shared_ptr<TimerBasedTaskExecution>
 sd/source/ui/inc/ViewShellImplementation.hxx:78
     sd::ViewShell::Implementation::ToolBarManagerLock mpLock 
::std::unique_ptr<ToolBarManager::UpdateLock, 
o3tl::default_delete<ToolBarManager::UpdateLock> >
 sd/source/ui/inc/ViewShellImplementation.hxx:89
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx 
b/sd/source/ui/animations/CustomAnimationPane.cxx
index 2e72c5384a39..6e23e5016245 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -262,18 +262,18 @@ void CustomAnimationPane::addUndo()
 
 void CustomAnimationPane::addListener()
 {
-    Link<tools::EventMultiplexerEvent&,void> aLink( 
LINK(this,CustomAnimationPane,EventMultiplexerListener) );
+    Link<sdtools::EventMultiplexerEvent&,void> aLink( 
LINK(this,CustomAnimationPane,EventMultiplexerListener) );
     mrBase.GetEventMultiplexer()->AddEventListener(aLink);
 }
 
 void CustomAnimationPane::removeListener()
 {
-    Link<tools::EventMultiplexerEvent&,void> aLink( 
LINK(this,CustomAnimationPane,EventMultiplexerListener) );
+    Link<sdtools::EventMultiplexerEvent&,void> aLink( 
LINK(this,CustomAnimationPane,EventMultiplexerListener) );
     mrBase.GetEventMultiplexer()->RemoveEventListener( aLink );
 }
 
 IMPL_LINK(CustomAnimationPane,EventMultiplexerListener,
-    tools::EventMultiplexerEvent&, rEvent, void)
+    sdtools::EventMultiplexerEvent&, rEvent, void)
 {
     switch (rEvent.meEventId)
     {
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx 
b/sd/source/ui/animations/SlideTransitionPane.cxx
index ae4ba3559675..47366f875377 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -920,18 +920,18 @@ void SlideTransitionPane::playCurrentEffect()
 
 void SlideTransitionPane::addListener()
 {
-    Link<tools::EventMultiplexerEvent&,void> aLink( 
LINK(this,SlideTransitionPane,EventMultiplexerListener) );
+    Link<sdtools::EventMultiplexerEvent&,void> aLink( 
LINK(this,SlideTransitionPane,EventMultiplexerListener) );
     mrBase.GetEventMultiplexer()->AddEventListener( aLink );
 }
 
 void SlideTransitionPane::removeListener()
 {
-    Link<tools::EventMultiplexerEvent&,void> aLink( 
LINK(this,SlideTransitionPane,EventMultiplexerListener) );
+    Link<sdtools::EventMultiplexerEvent&,void> aLink( 
LINK(this,SlideTransitionPane,EventMultiplexerListener) );
     mrBase.GetEventMultiplexer()->RemoveEventListener( aLink );
 }
 
 IMPL_LINK(SlideTransitionPane,EventMultiplexerListener,
-    tools::EventMultiplexerEvent&, rEvent, void)
+    sdtools::EventMultiplexerEvent&, rEvent, void)
 {
     switch (rEvent.meEventId)
     {
diff --git a/sd/source/ui/annotations/annotationmanager.cxx 
b/sd/source/ui/annotations/annotationmanager.cxx
index 9ca5a65f0a4c..6c4115c5f2cf 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -1152,18 +1152,18 @@ void AnnotationManagerImpl::SyncAnnotationObjects()
 
 void AnnotationManagerImpl::addListener()
 {
-    Link<tools::EventMultiplexerEvent&,void> aLink( 
LINK(this,AnnotationManagerImpl,EventMultiplexerListener) );
+    Link<sdtools::EventMultiplexerEvent&,void> aLink( 
LINK(this,AnnotationManagerImpl,EventMultiplexerListener) );
     mrBase.GetEventMultiplexer()->AddEventListener(aLink);
 }
 
 void AnnotationManagerImpl::removeListener()
 {
-    Link<tools::EventMultiplexerEvent&,void> aLink( 
LINK(this,AnnotationManagerImpl,EventMultiplexerListener) );
+    Link<sdtools::EventMultiplexerEvent&,void> aLink( 
LINK(this,AnnotationManagerImpl,EventMultiplexerListener) );
     mrBase.GetEventMultiplexer()->RemoveEventListener( aLink );
 }
 
 IMPL_LINK(AnnotationManagerImpl,EventMultiplexerListener,
-    tools::EventMultiplexerEvent&, rEvent, void)
+    sdtools::EventMultiplexerEvent&, rEvent, void)
 {
     switch (rEvent.meEventId)
     {
diff --git a/sd/source/ui/annotations/annotationmanagerimpl.hxx 
b/sd/source/ui/annotations/annotationmanagerimpl.hxx
index 634d2fe3c85e..088e41a2cb9d 100644
--- a/sd/source/ui/annotations/annotationmanagerimpl.hxx
+++ b/sd/source/ui/annotations/annotationmanagerimpl.hxx
@@ -36,6 +36,7 @@ class SdDrawDocument;
 struct ImplSVEvent;
 
 namespace sdr::annotation { class Annotation; }
+namespace sdtools { class EventMultiplexerEvent; }
 
 namespace sd
 {
@@ -44,8 +45,6 @@ class ViewShellBase;
 class View;
 class DrawController;
 
-namespace tools { class EventMultiplexerEvent; }
-
 typedef comphelper::WeakComponentImplHelper <
     css::document::XEventListener
     > AnnotationManagerImplBase;
@@ -93,7 +92,7 @@ public:
 
     void invalidateSlots();
 
-    DECL_LINK(EventMultiplexerListener, tools::EventMultiplexerEvent&, void);
+    DECL_LINK(EventMultiplexerListener, sdtools::EventMultiplexerEvent&, void);
     DECL_LINK(UpdateTagsHdl, void *, void);
 
     void UpdateTags(bool bSynchron = false);
diff --git a/sd/source/ui/framework/module/NotesPaneModule.cxx 
b/sd/source/ui/framework/module/NotesPaneModule.cxx
index ecc4d27ff091..b3ca810a83d7 100644
--- a/sd/source/ui/framework/module/NotesPaneModule.cxx
+++ b/sd/source/ui/framework/module/NotesPaneModule.cxx
@@ -98,8 +98,7 @@ void NotesPaneModule::disposing(std::unique_lock<std::mutex>&)
     }
 }
 
-IMPL_LINK(NotesPaneModule, EventMultiplexerListener, 
sd::tools::EventMultiplexerEvent&, rEvent,
-          void)
+IMPL_LINK(NotesPaneModule, EventMultiplexerListener, 
sdtools::EventMultiplexerEvent&, rEvent, void)
 {
     if (!mxConfigurationController.is())
         return;
diff --git a/sd/source/ui/framework/module/NotesPaneModule.hxx 
b/sd/source/ui/framework/module/NotesPaneModule.hxx
index 03c5f54cec0a..dd1abd99b58d 100644
--- a/sd/source/ui/framework/module/NotesPaneModule.hxx
+++ b/sd/source/ui/framework/module/NotesPaneModule.hxx
@@ -20,7 +20,7 @@ namespace sd
 class DrawController;
 class ViewShellBase;
 }
-namespace sd::tools
+namespace sdtools
 {
 class EventMultiplexerEvent;
 }
@@ -76,7 +76,7 @@ private:
                            const rtl::Reference<sd::framework::Configuration>& 
rxConfiguration);
     bool IsMasterView(const rtl::Reference<sd::framework::AbstractView>& 
xView);
 
-    DECL_LINK(EventMultiplexerListener, ::sd::tools::EventMultiplexerEvent&, 
void);
+    DECL_LINK(EventMultiplexerListener, ::sdtools::EventMultiplexerEvent&, 
void);
 };
 
 } // end of namespace sd::framework
diff --git a/sd/source/ui/framework/module/ToolBarModule.cxx 
b/sd/source/ui/framework/module/ToolBarModule.cxx
index 1f12099ac51d..f2e98de97e16 100644
--- a/sd/source/ui/framework/module/ToolBarModule.cxx
+++ b/sd/source/ui/framework/module/ToolBarModule.cxx
@@ -243,7 +243,7 @@ void SAL_CALL ToolBarModule::disposing (const 
lang::EventObject& rEvent)
     }
 }
 
-IMPL_LINK(ToolBarModule, EventMultiplexerListener, 
sd::tools::EventMultiplexerEvent&, rEvent,
+IMPL_LINK(ToolBarModule, EventMultiplexerListener, 
sdtools::EventMultiplexerEvent&, rEvent,
           void)
 {
     if (!mpBase)
diff --git a/sd/source/ui/framework/module/ToolBarModule.hxx 
b/sd/source/ui/framework/module/ToolBarModule.hxx
index a6d6f4bd43e5..524783e90d60 100644
--- a/sd/source/ui/framework/module/ToolBarModule.hxx
+++ b/sd/source/ui/framework/module/ToolBarModule.hxx
@@ -33,7 +33,7 @@ class DrawController;
 class ViewShellBase;
 }
 
-namespace sd::tools
+namespace sdtools
 {
 class EventMultiplexerEvent;
 }
@@ -88,7 +88,7 @@ private:
     void HandlePaneViewShellFocused(
         const rtl::Reference<sd::framework::ResourceId>& rxResourceId);
 
-    DECL_LINK(EventMultiplexerListener, ::sd::tools::EventMultiplexerEvent&, 
void);
+    DECL_LINK(EventMultiplexerListener, ::sdtools::EventMultiplexerEvent&, 
void);
 };
 
 } // end of namespace sd::framework
diff --git a/sd/source/ui/inc/CustomAnimationPane.hxx 
b/sd/source/ui/inc/CustomAnimationPane.hxx
index 0291c21aff51..7d833fa66f31 100644
--- a/sd/source/ui/inc/CustomAnimationPane.hxx
+++ b/sd/source/ui/inc/CustomAnimationPane.hxx
@@ -30,7 +30,7 @@
 namespace com::sun::star::drawing { class XDrawPage; }
 namespace weld { class ComboBox; }
 namespace com::sun::star::animations { class XAnimationNode; }
-namespace sd::tools { class EventMultiplexerEvent; }
+namespace sdtools { class EventMultiplexerEvent; }
 
 enum class PathKind { NONE, CURVE, POLYGON, FREEFORM };
 
@@ -104,7 +104,7 @@ private:
     DECL_LINK( implClickHdl, weld::Button&, void );
     DECL_LINK( implToggleHdl, weld::Toggleable&, void );
     DECL_LINK( implPropertyHdl, LinkParamNone*, void );
-    DECL_LINK( EventMultiplexerListener, tools::EventMultiplexerEvent&, void );
+    DECL_LINK( EventMultiplexerListener, sdtools::EventMultiplexerEvent&, void 
);
     DECL_LINK( lateInitCallback, Timer *, void );
     DECL_LINK( DurationModifiedHdl, weld::MetricSpinButton&, void );
     DECL_LINK( DelayModifiedHdl, weld::MetricSpinButton&, void );
diff --git a/sd/source/ui/inc/DrawViewShell.hxx 
b/sd/source/ui/inc/DrawViewShell.hxx
index 76a129e7f70c..3b0b95428129 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -492,7 +492,7 @@ private:
     /** On some occasions it is necessary to make SwitchPage calls
         asynchronously.
     */
-    tools::AsynchronousCall maAsynchronousSwitchPageCall;
+    sdtools::AsynchronousCall maAsynchronousSwitchPageCall;
     /** This flag is used to prevent nested calls to SwitchPage().
     */
     bool mbIsInSwitchPage;
diff --git a/sd/source/ui/inc/EventMultiplexer.hxx 
b/sd/source/ui/inc/EventMultiplexer.hxx
index d8a03511c45a..99bd01838ba5 100644
--- a/sd/source/ui/inc/EventMultiplexer.hxx
+++ b/sd/source/ui/inc/EventMultiplexer.hxx
@@ -120,7 +120,7 @@ enum class EventMultiplexerEventId
     FocusShifted,
 };
 
-namespace sd::tools
+namespace sdtools
 {
 class EventMultiplexerEvent
 {
@@ -145,7 +145,7 @@ class EventMultiplexer
 public:
     /** Create new EventMultiplexer for the given ViewShellBase object.
     */
-    EventMultiplexer(ViewShellBase& rBase);
+    EventMultiplexer(sd::ViewShellBase& rBase);
     ~EventMultiplexer();
 
     /** Add an event listener that will be informed about the specified
@@ -176,6 +176,6 @@ private:
     rtl::Reference<Implementation> mpImpl;
 };
 
-} // end of namespace ::sd::tools
+} // end of namespace ::sdtools
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/FormShellManager.hxx 
b/sd/source/ui/inc/FormShellManager.hxx
index 08e31b98ff2f..5e77c39bc446 100644
--- a/sd/source/ui/inc/FormShellManager.hxx
+++ b/sd/source/ui/inc/FormShellManager.hxx
@@ -32,7 +32,7 @@ namespace vcl
 class Window;
 }
 
-namespace sd::tools
+namespace sdtools
 {
 class EventMultiplexerEvent;
 }
@@ -119,7 +119,7 @@ private:
         When this happens then we unregister at the window of the old and
         register at the window of the new shell.
     */
-    DECL_LINK(ConfigurationUpdateHandler, ::sd::tools::EventMultiplexerEvent&, 
void);
+    DECL_LINK(ConfigurationUpdateHandler, ::sdtools::EventMultiplexerEvent&, 
void);
 
     /** This call back is called by the form shell when it gets the focus.
         In this case the form shell is moved to the top of the shell stack.
diff --git a/sd/source/ui/inc/NotesPanelView.hxx 
b/sd/source/ui/inc/NotesPanelView.hxx
index 685818a1c852..38bd40be436a 100644
--- a/sd/source/ui/inc/NotesPanelView.hxx
+++ b/sd/source/ui/inc/NotesPanelView.hxx
@@ -14,7 +14,7 @@
 
 class SdrTextObj;
 
-namespace sd::tools
+namespace sdtools
 {
 class EventMultiplexerEvent;
 }
@@ -83,7 +83,7 @@ public:
     DECL_LINK(StatusEventHdl, EditStatus&, void);
     DECL_LINK(EditModifiedHdl, LinkParamNone*, void);
     DECL_LINK(ModifyTimerHdl, Timer*, void);
-    DECL_LINK(EventMultiplexerListener, tools::EventMultiplexerEvent&, void);
+    DECL_LINK(EventMultiplexerListener, sdtools::EventMultiplexerEvent&, void);
 };
 }
 
diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx
index e4e678b9568b..3775e4848cbf 100644
--- a/sd/source/ui/inc/OutlineView.hxx
+++ b/sd/source/ui/inc/OutlineView.hxx
@@ -32,7 +32,7 @@ class SdrTextObj;
 class SfxProgress;
 class EditView;
 
-namespace sd::tools {
+namespace sdtools {
     class EventMultiplexerEvent;
 }
 
@@ -219,7 +219,7 @@ private:
     */
     DECL_LINK( AppEventListenerHdl, VclSimpleEvent&, void );
 
-    DECL_LINK(EventMultiplexerListener, sd::tools::EventMultiplexerEvent&, 
void);
+    DECL_LINK(EventMultiplexerListener, sdtools::EventMultiplexerEvent&, void);
 
     /** holds a model guard during drag and drop between BeginMovingHdl and 
EndMovingHdl */
     std::unique_ptr<OutlineViewModelChangeGuard, 
o3tl::default_delete<OutlineViewModelChangeGuard>> maDragAndDropModelGuard;
diff --git a/sd/source/ui/inc/SlideTransitionPane.hxx 
b/sd/source/ui/inc/SlideTransitionPane.hxx
index 98a39b3f29fd..974cab638504 100644
--- a/sd/source/ui/inc/SlideTransitionPane.hxx
+++ b/sd/source/ui/inc/SlideTransitionPane.hxx
@@ -31,7 +31,7 @@
 class SdDrawDocument;
 class SdXImpressDocument;
 namespace com::sun::star::drawing { class XDrawView; }
-namespace sd::tools { class EventMultiplexerEvent; }
+namespace sdtools { class EventMultiplexerEvent; }
 
 namespace sd
 {
@@ -101,7 +101,7 @@ private:
     DECL_LINK( DurationLoseFocusHdl, weld::Widget&, void );
     DECL_LINK( SoundListBoxSelected, weld::ComboBox&, void );
     DECL_LINK( LoopSoundBoxChecked, weld::Toggleable&, void );
-    DECL_LINK( EventMultiplexerListener, tools::EventMultiplexerEvent&, void );
+    DECL_LINK( EventMultiplexerListener, sdtools::EventMultiplexerEvent&, void 
);
     DECL_LINK(LateInitCallback, Timer *, void);
 
     ViewShellBase &   mrBase;
diff --git a/sd/source/ui/inc/TableDesignPane.hxx 
b/sd/source/ui/inc/TableDesignPane.hxx
index 6a8fe50eee2c..c29059cc9a3e 100644
--- a/sd/source/ui/inc/TableDesignPane.hxx
+++ b/sd/source/ui/inc/TableDesignPane.hxx
@@ -27,13 +27,13 @@
 namespace com::sun::star::beans { class XPropertySet; }
 namespace com::sun::star::container { class XIndexAccess; class 
XNameContainer; }
 
-namespace sd
-{
-
-namespace tools {
+namespace sdtools {
 class EventMultiplexerEvent;
 }
 
+namespace sd
+{
+
 class ViewShellBase;
 class DrawController;
 
@@ -91,7 +91,7 @@ private:
 
     void FillDesignPreviewControl();
 
-    DECL_LINK(EventMultiplexerListener, tools::EventMultiplexerEvent&, void);
+    DECL_LINK(EventMultiplexerListener, sdtools::EventMultiplexerEvent&, void);
     DECL_LINK(implContextMenuHandler, const Point*, void);
     DECL_LINK(implValueSetHdl, ValueSet*, void);
     DECL_LINK(implCheckBoxHdl, weld::Toggleable&, void);
diff --git a/sd/source/ui/inc/TemplateScanner.hxx 
b/sd/source/ui/inc/TemplateScanner.hxx
index f1a2fbd74dc4..b88d76bcb68d 100644
--- a/sd/source/ui/inc/TemplateScanner.hxx
+++ b/sd/source/ui/inc/TemplateScanner.hxx
@@ -66,7 +66,7 @@ public:
     supported format) last.  When a step does not add a new template then
     the value of the previous step is returned.
 */
-class TemplateScanner final : public ::sd::tools::AsynchronousTask
+class TemplateScanner final : public ::sdtools::AsynchronousTask
 {
 public:
     /** Create a new template scanner and prepare but do not execute the 
scanning.
diff --git a/sd/source/ui/inc/ToolBarManager.hxx 
b/sd/source/ui/inc/ToolBarManager.hxx
index da5325cf693c..7ff2bfdc315f 100644
--- a/sd/source/ui/inc/ToolBarManager.hxx
+++ b/sd/source/ui/inc/ToolBarManager.hxx
@@ -28,7 +28,7 @@
 
 class SdrView;
 namespace sd { class ViewShell; }
-namespace sd::tools { class EventMultiplexer; }
+namespace sdtools { class EventMultiplexer; }
 
 namespace sd {
 
@@ -65,7 +65,7 @@ public:
     */
     static std::shared_ptr<ToolBarManager> Create (
         ViewShellBase& rBase,
-        const std::shared_ptr<tools::EventMultiplexer>& rpMultiplexer,
+        const std::shared_ptr<sdtools::EventMultiplexer>& rpMultiplexer,
         const std::shared_ptr<ViewShellManager>& rpViewShellManager);
 
     ~ToolBarManager();
diff --git a/sd/source/ui/inc/ViewShellBase.hxx 
b/sd/source/ui/inc/ViewShellBase.hxx
index 5d5441d82d4f..2617fb569277 100644
--- a/sd/source/ui/inc/ViewShellBase.hxx
+++ b/sd/source/ui/inc/ViewShellBase.hxx
@@ -27,7 +27,7 @@ class SdDrawDocument;
 struct SdViewOptions;
 class SfxRequest;
 
-namespace sd::tools {
+namespace sdtools {
 class EventMultiplexer;
 }
 
@@ -189,7 +189,7 @@ public:
         events from various sources.  This method must not be called before
         LateInit() has terminated.
     */
-    std::shared_ptr<tools::EventMultiplexer> const & GetEventMultiplexer() 
const;
+    std::shared_ptr<sdtools::EventMultiplexer> const & GetEventMultiplexer() 
const;
 
     /** returns the complete area of the current view relative to the frame
         window
diff --git a/sd/source/ui/inc/tools/AsynchronousCall.hxx 
b/sd/source/ui/inc/tools/AsynchronousCall.hxx
index fa4c180207aa..34df62c69613 100644
--- a/sd/source/ui/inc/tools/AsynchronousCall.hxx
+++ b/sd/source/ui/inc/tools/AsynchronousCall.hxx
@@ -24,7 +24,7 @@
 #include <memory>
 #include <functional>
 
-namespace sd::tools
+namespace sdtools
 {
 /** Store a function object and execute it asynchronous.
 
@@ -72,6 +72,6 @@ private:
     DECL_LINK(TimerCallback, Timer*, void);
 };
 
-} // end of namespace ::sd::tools
+} // end of namespace ::sdtools
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/tools/AsynchronousTask.hxx 
b/sd/source/ui/inc/tools/AsynchronousTask.hxx
index 696423439250..5b8fa53d726b 100644
--- a/sd/source/ui/inc/tools/AsynchronousTask.hxx
+++ b/sd/source/ui/inc/tools/AsynchronousTask.hxx
@@ -19,7 +19,7 @@
 
 #pragma once
 
-namespace sd::tools
+namespace sdtools
 {
 /** Interface for the asynchronous execution of a task.  This interface
     allows a controller to run the task either timer based with a fixed
@@ -44,6 +44,6 @@ protected:
     ~AsynchronousTask() {}
 };
 
-} // end of namespace ::sd::tools
+} // end of namespace ::sdtools
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/tools/ConfigurationAccess.hxx 
b/sd/source/ui/inc/tools/ConfigurationAccess.hxx
index de88b8db3a65..c811fc4820bd 100644
--- a/sd/source/ui/inc/tools/ConfigurationAccess.hxx
+++ b/sd/source/ui/inc/tools/ConfigurationAccess.hxx
@@ -28,7 +28,7 @@
 namespace com::sun::star::container { class XHierarchicalNameAccess; }
 namespace com::sun::star::lang { class XMultiServiceFactory; }
 
-namespace sd::tools {
+namespace sdtools {
 
 /** This class gives access to the configuration.  Create an object of this
     class for one node of the configuration.  This will be the root node.
@@ -99,6 +99,6 @@ private:
         const WriteMode eMode);
 };
 
-} // end of namespace sd::tools
+} // end of namespace sdtools
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/tools/IdleDetection.hxx 
b/sd/source/ui/inc/tools/IdleDetection.hxx
index decf5ff2626b..413faa9c8b94 100644
--- a/sd/source/ui/inc/tools/IdleDetection.hxx
+++ b/sd/source/ui/inc/tools/IdleDetection.hxx
@@ -23,7 +23,7 @@
 
 namespace vcl { class Window; }
 
-namespace sd::tools {
+namespace sdtools {
     enum class IdleState {
         /** When GetIdleState() returns this value, then the system is idle.
         */
@@ -47,12 +47,12 @@ namespace sd::tools {
         */
         WindowPainting = 0x0008,
     };
-} // end of namespace ::sd::tools
+} // end of namespace ::sdtools
 namespace o3tl {
-    template<> struct typed_flags<::sd::tools::IdleState> : 
is_typed_flags<::sd::tools::IdleState, 0x0f> {};
+    template<> struct typed_flags<::sdtools::IdleState> : 
is_typed_flags<::sdtools::IdleState, 0x0f> {};
 }
 
-namespace sd::tools {
+namespace sdtools {
 
 /** Detect whether the system is idle and some time consuming operation may
     be carried out.  This class distinguishes between different states of
@@ -84,6 +84,6 @@ private:
     static IdleState CheckWindowPainting (const vcl::Window& rWindow);
 };
 
-} // end of namespace ::sd::tools
+} // end of namespace ::sdtools
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/tools/SlotStateListener.hxx 
b/sd/source/ui/inc/tools/SlotStateListener.hxx
index 529cd0def3a8..9caf9aed5816 100644
--- a/sd/source/ui/inc/tools/SlotStateListener.hxx
+++ b/sd/source/ui/inc/tools/SlotStateListener.hxx
@@ -28,7 +28,7 @@ namespace com::sun::star::frame { class XDispatch; }
 namespace com::sun::star::frame { class XDispatchProvider; }
 namespace com::sun::star::frame { class XStatusListener; }
 
-namespace sd::tools {
+namespace sdtools {
 
 typedef comphelper::WeakComponentImplHelper<
     css::frame::XStatusListener
@@ -132,6 +132,6 @@ private:
             const css::util::URL& rURL) const;
 };
 
-} // end of namespace ::sd::tools
+} // end of namespace ::sdtools
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx 
b/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx
index 4084e7e8fe83..b1f3fe2f1cbd 100644
--- a/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx
+++ b/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx
@@ -23,7 +23,7 @@
 
 #include <memory>
 
-namespace sd::tools {
+namespace sdtools {
 
 class AsynchronousTask;
 
@@ -84,6 +84,6 @@ private:
     DECL_LINK(TimerCallback, Timer *, void);
 };
 
-} // end of namespace ::sd::tools
+} // end of namespace ::sdtools
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/view/viewoverlaymanager.hxx 
b/sd/source/ui/inc/view/viewoverlaymanager.hxx
index 3a5c98deb3bd..e6f93f4984e7 100644
--- a/sd/source/ui/inc/view/viewoverlaymanager.hxx
+++ b/sd/source/ui/inc/view/viewoverlaymanager.hxx
@@ -29,7 +29,7 @@ namespace sd
 {
 class SmartTag;
 }
-namespace sd::tools
+namespace sdtools
 {
 class EventMultiplexerEvent;
 }
@@ -52,7 +52,7 @@ public:
     void onZoomChanged();
     void UpdateTags();
 
-    DECL_LINK(EventMultiplexerListener, tools::EventMultiplexerEvent&, void);
+    DECL_LINK(EventMultiplexerListener, sdtools::EventMultiplexerEvent&, void);
     DECL_LINK(UpdateTagsHdl, void*, void);
 
     bool CreateTags();
diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx 
b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
index c1ac330b7314..40f387396019 100644
--- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
@@ -68,7 +68,7 @@ CurrentMasterPagesSelector::CurrentMasterPagesSelector(
                           u"modules/simpress/ui/masterpagepanel.ui"_ustr,
                           u"masterpagecurrent_icons"_ustr)
 {
-    Link<sd::tools::EventMultiplexerEvent&, void> aLink(
+    Link<sdtools::EventMultiplexerEvent&, void> aLink(
         LINK(this, CurrentMasterPagesSelector, EventMultiplexerListener));
     rBase.GetEventMultiplexer()->AddEventListener(aLink);
 }
@@ -84,7 +84,7 @@ CurrentMasterPagesSelector::~CurrentMasterPagesSelector()
         OSL_ASSERT(mrDocument.GetDocSh() != nullptr);
     }
 
-    Link<sd::tools::EventMultiplexerEvent&,void> aLink 
(LINK(this,CurrentMasterPagesSelector,EventMultiplexerListener));
+    Link<sdtools::EventMultiplexerEvent&,void> aLink 
(LINK(this,CurrentMasterPagesSelector,EventMultiplexerListener));
     mrBase.GetEventMultiplexer()->RemoveEventListener(aLink);
 }
 
@@ -215,7 +215,7 @@ void 
CurrentMasterPagesSelector::ProcessPopupMenu(weld::Menu& rMenu)
 }
 
 IMPL_LINK(CurrentMasterPagesSelector,EventMultiplexerListener,
-    sd::tools::EventMultiplexerEvent&, rEvent, void)
+    sdtools::EventMultiplexerEvent&, rEvent, void)
 {
     switch (rEvent.meEventId)
     {
diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx 
b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
index 5b2ad3114e2c..5a09a3b1822b 100644
--- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
@@ -23,7 +23,7 @@
 
 #include "MasterPagesSelector.hxx"
 
-namespace sd::tools { class EventMultiplexerEvent; }
+namespace sdtools { class EventMultiplexerEvent; }
 
 namespace sd::sidebar {
 
@@ -69,7 +69,7 @@ protected:
 private:
     virtual void LateInit() override;
 
-    DECL_LINK(EventMultiplexerListener,sd::tools::EventMultiplexerEvent&, 
void);
+    DECL_LINK(EventMultiplexerListener,sdtools::EventMultiplexerEvent&, void);
 };
 
 } // end of namespace sd::sidebar
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx 
b/sd/source/ui/sidebar/LayoutMenu.cxx
index 8a830e1462f8..bcf43bcbb337 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -156,14 +156,14 @@ void LayoutMenu::implConstruct( DrawDocShell& 
rDocumentShell )
     mxLayoutIconView->connect_query_tooltip(LINK(this, LayoutMenu, 
QueryTooltipHdl));
     InvalidateContent();
 
-    Link<::sd::tools::EventMultiplexerEvent&,void> aEventListenerLink 
(LINK(this,LayoutMenu,EventMultiplexerListener));
+    Link<::sdtools::EventMultiplexerEvent&,void> aEventListenerLink 
(LINK(this,LayoutMenu,EventMultiplexerListener));
     mrBase.GetEventMultiplexer()->AddEventListener(aEventListenerLink);
 
     mxLayoutIconView->set_help_id(HID_SD_TASK_PANE_PREVIEW_LAYOUTS);
     
mxLayoutIconView->set_accessible_name(SdResId(STR_TASKPANEL_LAYOUT_MENU_TITLE));
 
     Link<const OUString&,void> aStateChangeLink 
(LINK(this,LayoutMenu,StateChangeHandler));
-    mxListener = new ::sd::tools::SlotStateListener(
+    mxListener = new ::sdtools::SlotStateListener(
         aStateChangeLink,
         
Reference<frame::XDispatchProvider>(mrBase.GetController()->getFrame(), 
UNO_QUERY),
         u".uno:VerticalTextState"_ustr);
@@ -189,7 +189,7 @@ void LayoutMenu::Dispose()
         mxListener->dispose();
 
     Clear();
-    Link<tools::EventMultiplexerEvent&,void> aLink 
(LINK(this,LayoutMenu,EventMultiplexerListener));
+    Link<sdtools::EventMultiplexerEvent&,void> aLink 
(LINK(this,LayoutMenu,EventMultiplexerListener));
     mrBase.GetEventMultiplexer()->RemoveEventListener (aLink);
 }
 
@@ -669,7 +669,7 @@ void LayoutMenu::UpdateSelection()
         mxLayoutIconView->unselect_all();
 }
 
-IMPL_LINK(LayoutMenu, EventMultiplexerListener, 
::sd::tools::EventMultiplexerEvent&, rEvent, void)
+IMPL_LINK(LayoutMenu, EventMultiplexerListener, 
::sdtools::EventMultiplexerEvent&, rEvent, void)
 {
     switch (rEvent.meEventId)
     {
diff --git a/sd/source/ui/sidebar/LayoutMenu.hxx 
b/sd/source/ui/sidebar/LayoutMenu.hxx
index 756f7c078623..269e9d9b4b03 100644
--- a/sd/source/ui/sidebar/LayoutMenu.hxx
+++ b/sd/source/ui/sidebar/LayoutMenu.hxx
@@ -40,7 +40,7 @@ class DrawDocShell;
 class ViewShellBase;
 }
 
-namespace sd::tools
+namespace sdtools
 {
 class EventMultiplexerEvent;
 class SlotStateListener;
@@ -95,7 +95,7 @@ private:
     /** If we are asked for the preferred window size, then use this
         many columns for the calculation.
     */
-    rtl::Reference<::sd::tools::SlotStateListener> mxListener;
+    rtl::Reference<::sdtools::SlotStateListener> mxListener;
     bool mbIsMainViewChangePending;
     css::uno::Reference<css::ui::XSidebar> mxSidebar;
     bool mbIsDisposed;
@@ -165,7 +165,7 @@ private:
     DECL_LINK(MousePressHdl, const MouseEvent&, bool);
     DECL_LINK(QueryTooltipHdl, const weld::TreeIter&, OUString);
     DECL_LINK(StateChangeHandler, const OUString&, void);
-    DECL_LINK(EventMultiplexerListener, ::sd::tools::EventMultiplexerEvent&, 
void);
+    DECL_LINK(EventMultiplexerListener, ::sdtools::EventMultiplexerEvent&, 
void);
     DECL_LINK(MenuSelectAsyncHdl, void*, void);
     DECL_LINK(OnPopupEnd, const OUString&, void);
 
diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx 
b/sd/source/ui/sidebar/MasterPageContainer.cxx
index fb404b765200..37b7941c37f4 100644
--- a/sd/source/ui/sidebar/MasterPageContainer.cxx
+++ b/sd/source/ui/sidebar/MasterPageContainer.cxx
@@ -153,7 +153,7 @@ private:
     // We have to remember the tasks for initialization and filling in case
     // a MasterPageContainer object is destroyed before these tasks have
     // been completed.
-    std::weak_ptr<sd::tools::TimerBasedTaskExecution> mpFillerTask;
+    std::weak_ptr<sdtools::TimerBasedTaskExecution> mpFillerTask;
 
     Size maSmallPreviewSizePixel;
     Size maLargePreviewSizePixel;
@@ -480,7 +480,7 @@ MasterPageContainer::Implementation::~Implementation()
 {
     // When the initializer or filler tasks are still running then we have
     // to stop them now in order to prevent them from calling us back.
-    tools::TimerBasedTaskExecution::ReleaseTask(mpFillerTask);
+    sdtools::TimerBasedTaskExecution::ReleaseTask(mpFillerTask);
 
     mpRequestQueue.reset();
 
@@ -511,7 +511,7 @@ void MasterPageContainer::Implementation::LateInit()
     mpRequestQueue.reset(MasterPageContainerQueue::Create(
         
std::shared_ptr<MasterPageContainerQueue::ContainerAdapter>(Instance())));
 
-    mpFillerTask = ::sd::tools::TimerBasedTaskExecution::Create(
+    mpFillerTask = ::sdtools::TimerBasedTaskExecution::Create(
         std::make_shared<MasterPageContainerFiller>(*this),
         5,
         50);
diff --git a/sd/source/ui/sidebar/MasterPageContainerFiller.hxx 
b/sd/source/ui/sidebar/MasterPageContainerFiller.hxx
index b08452ab681b..c5ce32c14355 100644
--- a/sd/source/ui/sidebar/MasterPageContainerFiller.hxx
+++ b/sd/source/ui/sidebar/MasterPageContainerFiller.hxx
@@ -36,7 +36,7 @@ namespace sd::sidebar
     pages.  These are provided by one default page and from the existing
     Impress templates.  This is done asynchronously.
 */
-class MasterPageContainerFiller : public ::sd::tools::AsynchronousTask
+class MasterPageContainerFiller : public ::sdtools::AsynchronousTask
 {
 public:
     class ContainerAdapter
diff --git a/sd/source/ui/sidebar/MasterPageContainerQueue.cxx 
b/sd/source/ui/sidebar/MasterPageContainerQueue.cxx
index e65d1861d90f..c80eb3498352 100644
--- a/sd/source/ui/sidebar/MasterPageContainerQueue.cxx
+++ b/sd/source/ui/sidebar/MasterPageContainerQueue.cxx
@@ -189,10 +189,10 @@ IMPL_LINK(MasterPageContainerQueue, 
DelayedPreviewCreation, Timer*, pTimer, void
             break;
 
         // First check whether the system is idle.
-        tools::IdleState nIdleState 
(tools::IdleDetection::GetIdleState(nullptr));
-        if (nIdleState != tools::IdleState::Idle)
+        sdtools::IdleState nIdleState 
(sdtools::IdleDetection::GetIdleState(nullptr));
+        if (nIdleState != sdtools::IdleState::Idle)
         {
-            if (nIdleState & tools::IdleState::FullScreenShowActive)
+            if (nIdleState & sdtools::IdleState::FullScreenShowActive)
                 bIsShowingFullScreenShow = true;
             break;
         }
diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx 
b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
index 7b64cdd8266c..25d5d29a248a 100644
--- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
+++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
@@ -106,9 +106,9 @@ void RecentlyUsedMasterPages::LoadPersistentValues()
 {
     try
     {
-        tools::ConfigurationAccess aConfiguration (
+        sdtools::ConfigurationAccess aConfiguration (
             GetPathToImpressConfigurationRoot(),
-            tools::ConfigurationAccess::READ_ONLY);
+            sdtools::ConfigurationAccess::READ_ONLY);
         Reference<container::XNameAccess> xSet (
             aConfiguration.GetConfigurationNode(GetPathToSetNode()),
             UNO_QUERY);
@@ -168,9 +168,9 @@ void RecentlyUsedMasterPages::SavePersistentValues()
 {
     try
     {
-        tools::ConfigurationAccess aConfiguration (
+        sdtools::ConfigurationAccess aConfiguration (
             GetPathToImpressConfigurationRoot(),
-            tools::ConfigurationAccess::READ_WRITE);
+            sdtools::ConfigurationAccess::READ_WRITE);
         Reference<container::XNameContainer> xSet (
             aConfiguration.GetConfigurationNode(GetPathToSetNode()),
             UNO_QUERY);
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx 
b/sd/source/ui/sidebar/SlideBackground.cxx
index d44b6502c6a1..98b7de0efcf3 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -550,18 +550,18 @@ void SlideBackground::SetPanelTitle( const OUString& 
rTitle )
 
 void SlideBackground::addListener()
 {
-    Link<tools::EventMultiplexerEvent&,void> aLink( LINK(this, 
SlideBackground, EventMultiplexerListener) );
+    Link<sdtools::EventMultiplexerEvent&,void> aLink( LINK(this, 
SlideBackground, EventMultiplexerListener) );
     mrBase.GetEventMultiplexer()->AddEventListener( aLink );
 }
 
 void SlideBackground::removeListener()
 {
-    Link<tools::EventMultiplexerEvent&,void> aLink( LINK(this, 
SlideBackground, EventMultiplexerListener) );
+    Link<sdtools::EventMultiplexerEvent&,void> aLink( LINK(this, 
SlideBackground, EventMultiplexerListener) );
     mrBase.GetEventMultiplexer()->RemoveEventListener( aLink );
 }
 
 IMPL_LINK(SlideBackground, EventMultiplexerListener,
-                tools::EventMultiplexerEvent&, rEvent, void)
+                sdtools::EventMultiplexerEvent&, rEvent, void)
 {
     switch (rEvent.meEventId)
     {
diff --git a/sd/source/ui/sidebar/SlideBackground.hxx 
b/sd/source/ui/sidebar/SlideBackground.hxx
index 8d5932629bcd..6dd7232ce4e3 100644
--- a/sd/source/ui/sidebar/SlideBackground.hxx
+++ b/sd/source/ui/sidebar/SlideBackground.hxx
@@ -29,7 +29,7 @@
 #include <com/sun/star/frame/XFrame.hpp>
 
 namespace sd { class ViewShellBase; }
-namespace sd::tools { class EventMultiplexerEvent; }
+namespace sdtools { class EventMultiplexerEvent; }
 
 class ColorListBox;
 class SvxPageItem;
@@ -151,7 +151,7 @@ private:
     DECL_LINK(CloseMasterHdl, weld::Button&, void);
     DECL_LINK(EditMasterHdl, weld::Button&, void);
     DECL_LINK(SelectBgHdl, weld::Button&, void);
-    DECL_LINK(EventMultiplexerListener, tools::EventMultiplexerEvent&, void );
+    DECL_LINK(EventMultiplexerListener, sdtools::EventMultiplexerEvent&, void 
);
     DECL_LINK( ModifyMarginHdl, weld::ComboBox&, void );
 
     void Initialize();
diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx 
b/sd/source/ui/slidesorter/controller/SlsListener.cxx
index 9cac3d0afea0..a3db135a5f01 100644
--- a/sd/source/ui/slidesorter/controller/SlsListener.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx
@@ -115,7 +115,7 @@ Listener::Listener (
             StartListening(*pMainViewShell);
         }
 
-        Link<tools::EventMultiplexerEvent&,void> aLink (LINK(this, Listener, 
EventMultiplexerCallback));
+        Link<sdtools::EventMultiplexerEvent&,void> aLink (LINK(this, Listener, 
EventMultiplexerCallback));
         mpBase->GetEventMultiplexer()->AddEventListener(aLink);
     }
 }
@@ -166,7 +166,7 @@ void Listener::ReleaseListeners()
 
     if (mpBase != nullptr)
     {
-        Link<sd::tools::EventMultiplexerEvent&,void> aLink (LINK(this, 
Listener, EventMultiplexerCallback));
+        Link<sdtools::EventMultiplexerEvent&,void> aLink (LINK(this, Listener, 
EventMultiplexerCallback));
         mpBase->GetEventMultiplexer()->RemoveEventListener(aLink);
     }
 }
@@ -314,7 +314,7 @@ void Listener::Notify (
     }
 }
 
-IMPL_LINK(Listener, EventMultiplexerCallback, 
::sd::tools::EventMultiplexerEvent&, rEvent, void)
+IMPL_LINK(Listener, EventMultiplexerCallback, 
::sdtools::EventMultiplexerEvent&, rEvent, void)
 {
     switch (rEvent.meEventId)
     {
diff --git a/sd/source/ui/slidesorter/controller/SlsListener.hxx 
b/sd/source/ui/slidesorter/controller/SlsListener.hxx
index 910541da4173..75ec0a4dd0c5 100644
--- a/sd/source/ui/slidesorter/controller/SlsListener.hxx
+++ b/sd/source/ui/slidesorter/controller/SlsListener.hxx
@@ -37,7 +37,7 @@ namespace sd {
 class ViewShellBase;
 }
 
-namespace sd::tools { class EventMultiplexerEvent; }
+namespace sdtools { class EventMultiplexerEvent; }
 namespace sd::slidesorter { class SlideSorter; }
 
 namespace sd::slidesorter::controller {
@@ -149,7 +149,7 @@ private:
     */
     void HandleShapeModification (const SdrPage* pPage);
 
-    DECL_LINK(EventMultiplexerCallback, tools::EventMultiplexerEvent&, void);
+    DECL_LINK(EventMultiplexerCallback, sdtools::EventMultiplexerEvent&, void);
 };
 
 } // end of namespace ::sd::slidesorter::controller
diff --git a/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx 
b/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx
index b02f0b5b23e6..0247b6c271cd 100644
--- a/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx
+++ b/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx
@@ -60,8 +60,8 @@ void ViewCacheContext::NotifyPreviewCreation(cache::CacheKey 
aKey)
 
 bool ViewCacheContext::IsIdle()
 {
-    tools::IdleState nIdleState 
(tools::IdleDetection::GetIdleState(mrSlideSorter.GetContentWindow()));
-    return nIdleState == tools::IdleState::Idle;
+    sdtools::IdleState nIdleState 
(sdtools::IdleDetection::GetIdleState(mrSlideSorter.GetContentWindow()));
+    return nIdleState == sdtools::IdleState::Idle;
 }
 
 bool ViewCacheContext::IsVisible (cache::CacheKey aKey)
diff --git a/sd/source/ui/table/TableDesignPane.cxx 
b/sd/source/ui/table/TableDesignPane.cxx
index 3a2a5e4c1959..b518b49535be 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -712,18 +712,18 @@ void TableDesignWidget::endTextEditForStyle(const 
Reference<XInterface>& rStyle)
 
 void TableDesignWidget::addListener()
 {
-    Link<tools::EventMultiplexerEvent&,void> aLink( 
LINK(this,TableDesignWidget,EventMultiplexerListener) );
+    Link<sdtools::EventMultiplexerEvent&,void> aLink( 
LINK(this,TableDesignWidget,EventMultiplexerListener) );
     mrBase.GetEventMultiplexer()->AddEventListener( aLink );
 }
 
 void TableDesignWidget::removeListener()
 {
-    Link<tools::EventMultiplexerEvent&,void> aLink( 
LINK(this,TableDesignWidget,EventMultiplexerListener) );
+    Link<sdtools::EventMultiplexerEvent&,void> aLink( 
LINK(this,TableDesignWidget,EventMultiplexerListener) );
     mrBase.GetEventMultiplexer()->RemoveEventListener( aLink );
 }
 
 IMPL_LINK(TableDesignWidget,EventMultiplexerListener,
-    tools::EventMultiplexerEvent&, rEvent, void)
+    sdtools::EventMultiplexerEvent&, rEvent, void)
 {
     switch (rEvent.meEventId)
     {
diff --git a/sd/source/ui/tools/AsynchronousCall.cxx 
b/sd/source/ui/tools/AsynchronousCall.cxx
index b7b70f63a04a..87724437cd64 100644
--- a/sd/source/ui/tools/AsynchronousCall.cxx
+++ b/sd/source/ui/tools/AsynchronousCall.cxx
@@ -20,7 +20,7 @@
 #include <memory>
 #include <tools/AsynchronousCall.hxx>
 
-namespace sd::tools
+namespace sdtools
 {
 AsynchronousCall::AsynchronousCall()
     : maTimer("sd AsynchronousCall")
@@ -51,6 +51,6 @@ IMPL_LINK(AsynchronousCall, TimerCallback, Timer*, pTimer, 
void)
     }
 }
 
-} // end of namespace ::sd::tools
+} // end of namespace ::sdtools
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/tools/ConfigurationAccess.cxx 
b/sd/source/ui/tools/ConfigurationAccess.cxx
index 35ccadba3783..d99669bcdfc3 100644
--- a/sd/source/ui/tools/ConfigurationAccess.cxx
+++ b/sd/source/ui/tools/ConfigurationAccess.cxx
@@ -31,7 +31,7 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
-namespace sd::tools {
+namespace sdtools {
 
 ConfigurationAccess::ConfigurationAccess (
     const OUString& rsRootName,
@@ -108,6 +108,6 @@ void ConfigurationAccess::CommitChanges()
         xConfiguration->commitChanges();
 }
 
-} // end of namespace sd::tools
+} // end of namespace sdtools
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/tools/EventMultiplexer.cxx 
b/sd/source/ui/tools/EventMultiplexer.cxx
index ee530df15394..f0e7fc8ddfe0 100644
--- a/sd/source/ui/tools/EventMultiplexer.cxx
+++ b/sd/source/ui/tools/EventMultiplexer.cxx
@@ -46,7 +46,7 @@ using ::sd::framework::FrameworkHelper;
 
 class SdDrawDocument;
 
-namespace sd::tools {
+namespace sdtools {
 
 typedef cppu::ImplInheritanceHelper<
       sd::framework::ConfigurationChangeListener,
@@ -60,7 +60,7 @@ class EventMultiplexer::Implementation
       public SfxListener
 {
 public:
-    explicit Implementation (ViewShellBase& rBase);
+    explicit Implementation (sd::ViewShellBase& rBase);
     virtual ~Implementation() override;
 
     void AddEventListener (
@@ -106,7 +106,7 @@ protected:
         const SfxHint& rHint) override;
 
 private:
-    ViewShellBase& mrBase;
+    sd::ViewShellBase& mrBase;
     typedef ::std::vector<Link<EventMultiplexerEvent&,void>> ListenerList;
     ListenerList maListeners;
 
@@ -139,7 +139,7 @@ constexpr OUString aEditModePropertyName = 
u"IsMasterPageMode"_ustr;
 
 //===== EventMultiplexer ======================================================
 
-EventMultiplexer::EventMultiplexer (ViewShellBase& rBase)
+EventMultiplexer::EventMultiplexer (sd::ViewShellBase& rBase)
     : mpImpl (new EventMultiplexer::Implementation(rBase))
 {
 }
@@ -179,7 +179,7 @@ void 
EventMultiplexer::MultiplexEvent(EventMultiplexerEventId eEventId, void con
 
 //===== EventMultiplexer::Implementation ======================================
 
-EventMultiplexer::Implementation::Implementation (ViewShellBase& rBase)
+EventMultiplexer::Implementation::Implementation (sd::ViewShellBase& rBase)
     : mrBase (rBase),
       mbListeningToController (false),
       mbListeningToFrame (false),
@@ -208,7 +208,7 @@ EventMultiplexer::Implementation::Implementation 
(ViewShellBase& rBase)
         StartListening (*mpDocument);
 
     // Listen for configuration changes.
-    DrawController& rDrawController = *mrBase.GetDrawController();
+    sd::DrawController& rDrawController = *mrBase.GetDrawController();
 
     rtl::Reference<sd::framework::ConfigurationController> 
xConfigurationController (
         rDrawController.getConfigurationController());
@@ -220,13 +220,13 @@ EventMultiplexer::Implementation::Implementation 
(ViewShellBase& rBase)
 
     xConfigurationController->addConfigurationChangeListener(
         this,
-        framework::ConfigurationChangeEventType::ResourceActivation);
+        sd::framework::ConfigurationChangeEventType::ResourceActivation);
     xConfigurationController->addConfigurationChangeListener(
         this,
-        framework::ConfigurationChangeEventType::ResourceDeactivation);
+        sd::framework::ConfigurationChangeEventType::ResourceDeactivation);
     xConfigurationController->addConfigurationChangeListener(
         this,
-        framework::ConfigurationChangeEventType::ConfigurationUpdateEnd);
+        sd::framework::ConfigurationChangeEventType::ConfigurationUpdateEnd);
 }
 
 EventMultiplexer::Implementation::~Implementation()
@@ -490,7 +490,7 @@ void 
EventMultiplexer::Implementation::notifyConfigurationChange (
 {
     switch (rEvent.Type)
     {
-        case framework::ConfigurationChangeEventType::ResourceActivation:
+        case sd::framework::ConfigurationChangeEventType::ResourceActivation:
             if 
(rEvent.ResourceId->getResourceURL().match(FrameworkHelper::msViewURLPrefix))
             {
                 CallListeners (EventMultiplexerEventId::ViewAdded);
@@ -505,8 +505,8 @@ void 
EventMultiplexer::Implementation::notifyConfigurationChange (
                 if (rEvent.ResourceId->getResourceURL() == 
FrameworkHelper::msSlideSorterURL)
                 {
                     auto pView = 
dynamic_cast<sd::framework::AbstractView*>(rEvent.ResourceObject.get());
-                    slidesorter::SlideSorterViewShell* pViewShell
-                        = dynamic_cast<slidesorter::SlideSorterViewShell*>(
+                    sd::slidesorter::SlideSorterViewShell* pViewShell
+                        = dynamic_cast<sd::slidesorter::SlideSorterViewShell*>(
                             FrameworkHelper::GetViewShell(pView).get());
                     if (pViewShell != nullptr)
                         pViewShell->AddSelectionChangeListener (
@@ -517,7 +517,7 @@ void 
EventMultiplexer::Implementation::notifyConfigurationChange (
             }
             break;
 
-        case framework::ConfigurationChangeEventType::ResourceDeactivation:
+        case sd::framework::ConfigurationChangeEventType::ResourceDeactivation:
             if 
(rEvent.ResourceId->getResourceURL().match(FrameworkHelper::msViewURLPrefix))
             {
                 if (rEvent.ResourceId->isBoundToURL(
@@ -530,9 +530,9 @@ void 
EventMultiplexer::Implementation::notifyConfigurationChange (
                 // selection change listener at slide sorter.
                 if (rEvent.ResourceId->getResourceURL() == 
FrameworkHelper::msSlideSorterURL)
                 {
-                    auto pView = 
dynamic_cast<framework::AbstractView*>(rEvent.ResourceObject.get());
-                    slidesorter::SlideSorterViewShell* pViewShell
-                        = dynamic_cast<slidesorter::SlideSorterViewShell*>(
+                    auto pView = 
dynamic_cast<sd::framework::AbstractView*>(rEvent.ResourceObject.get());
+                    sd::slidesorter::SlideSorterViewShell* pViewShell
+                        = dynamic_cast<sd::slidesorter::SlideSorterViewShell*>(
                             FrameworkHelper::GetViewShell(pView).get());
                     if (pViewShell != nullptr)
                         pViewShell->RemoveSelectionChangeListener (
@@ -543,7 +543,7 @@ void 
EventMultiplexer::Implementation::notifyConfigurationChange (
             }
             break;
 
-        case framework::ConfigurationChangeEventType::ConfigurationUpdateEnd:
+        case 
sd::framework::ConfigurationChangeEventType::ConfigurationUpdateEnd:
             CallListeners (EventMultiplexerEventId::ConfigurationUpdated);
             break;
 
@@ -644,6 +644,6 @@ EventMultiplexerEvent::EventMultiplexerEvent (
 {
 }
 
-} // end of namespace ::sd::tools
+} // end of namespace ::sdtools
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/tools/IdleDetection.cxx 
b/sd/source/ui/tools/IdleDetection.cxx
index ef4cc0521c52..b07e0c692c1a 100644
--- a/sd/source/ui/tools/IdleDetection.cxx
+++ b/sd/source/ui/tools/IdleDetection.cxx
@@ -30,7 +30,7 @@
 
 using namespace ::com::sun::star;
 
-namespace sd::tools {
+namespace sdtools {
 
 IdleState IdleDetection::GetIdleState (const vcl::Window* pWindow)
 {
@@ -73,10 +73,10 @@ IdleState IdleDetection::CheckSlideShowRunning()
             continue;
 
         // Get sd::ViewShell from active frame.
-        ViewShellBase* pBase = ViewShellBase::GetViewShellBase(pViewFrame);
+        sd::ViewShellBase* pBase = 
sd::ViewShellBase::GetViewShellBase(pViewFrame);
         if (pBase != nullptr)
         {
-            rtl::Reference< SlideShow > xSlideShow( SlideShow::GetSlideShow( 
*pBase ) );
+            rtl::Reference< sd::SlideShow > xSlideShow( 
sd::SlideShow::GetSlideShow( *pBase ) );
             if( xSlideShow.is() && xSlideShow->isRunning() && 
!xSlideShow->IsInteractiveSlideshow()) // IASS
             {
                 if (xSlideShow->isFullScreen())
@@ -98,6 +98,6 @@ IdleState IdleDetection::CheckWindowPainting (const 
vcl::Window& rWindow)
         return IdleState::Idle;
 }
 
-} // end of namespace ::sd::tools
+} // end of namespace ::sdtools
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/tools/SlotStateListener.cxx 
b/sd/source/ui/tools/SlotStateListener.cxx
index b239782e7c7f..1e5c04300bd6 100644
--- a/sd/source/ui/tools/SlotStateListener.cxx
+++ b/sd/source/ui/tools/SlotStateListener.cxx
@@ -27,7 +27,7 @@
 
 using namespace ::com::sun::star;
 
-namespace sd::tools {
+namespace sdtools {
 
 SlotStateListener::SlotStateListener (
     Link<const OUString&,void> const & rCallback,
@@ -148,6 +148,6 @@ void SlotStateListener::ThrowIfDisposed()
     }
 }
 
-} // end of namespace ::sd::tools
+} // end of namespace ::sdtools
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/tools/TimerBasedTaskExecution.cxx 
b/sd/source/ui/tools/TimerBasedTaskExecution.cxx
index bfd2e2fae549..012c50ee9623 100644
--- a/sd/source/ui/tools/TimerBasedTaskExecution.cxx
+++ b/sd/source/ui/tools/TimerBasedTaskExecution.cxx
@@ -24,7 +24,7 @@
 #include <memory>
 #include <utility>
 
-namespace sd::tools {
+namespace sdtools {
 
 /** Used by the shared_ptr instead of the private destructor.
 */
@@ -68,7 +68,7 @@ void TimerBasedTaskExecution::ReleaseTask (
 
     try
     {
-        std::shared_ptr<tools::TimerBasedTaskExecution> pExecution 
(rpExecution);
+        std::shared_ptr<sdtools::TimerBasedTaskExecution> pExecution 
(rpExecution);
         pExecution->Release();
     }
     catch (const std::bad_weak_ptr&)
@@ -126,6 +126,6 @@ IMPL_LINK_NOARG(TimerBasedTaskExecution, TimerCallback, 
Timer *, void)
         mpSelf.reset();
 }
 
-} // end of namespace ::sd::tools
+} // end of namespace ::sdtools
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/view/FormShellManager.cxx 
b/sd/source/ui/view/FormShellManager.cxx
index 3aad7a10a2a3..cfce4a2efc10 100644
--- a/sd/source/ui/view/FormShellManager.cxx
+++ b/sd/source/ui/view/FormShellManager.cxx
@@ -60,7 +60,7 @@ FormShellManager::FormShellManager (ViewShellBase& rBase)
 {
     // Register at the EventMultiplexer to be informed about changes in the
     // center pane.
-    Link<sd::tools::EventMultiplexerEvent&,void> aLink (LINK(this, 
FormShellManager, ConfigurationUpdateHandler));
+    Link<sdtools::EventMultiplexerEvent&,void> aLink (LINK(this, 
FormShellManager, ConfigurationUpdateHandler));
     mrBase.GetEventMultiplexer()->AddEventListener(aLink);
 
     RegisterAtCenterPane();
@@ -72,7 +72,7 @@ void FormShellManager::ImplDestroy()
     UnregisterAtCenterPane();
 
     // Unregister from the EventMultiplexer.
-    Link<sd::tools::EventMultiplexerEvent&,void> aLink (LINK(this, 
FormShellManager, ConfigurationUpdateHandler));
+    Link<sdtools::EventMultiplexerEvent&,void> aLink (LINK(this, 
FormShellManager, ConfigurationUpdateHandler));
     mrBase.GetEventMultiplexer()->RemoveEventListener(aLink);
 
     if (mpSubShellFactory)
@@ -209,7 +209,7 @@ IMPL_LINK_NOARG(FormShellManager, FormControlActivated, 
LinkParamNone*, void)
     }
 }
 
-IMPL_LINK(FormShellManager, ConfigurationUpdateHandler, 
sd::tools::EventMultiplexerEvent&, rEvent, void)
+IMPL_LINK(FormShellManager, ConfigurationUpdateHandler, 
sdtools::EventMultiplexerEvent&, rEvent, void)
 {
     switch (rEvent.meEventId)
     {
diff --git a/sd/source/ui/view/NotesPanelView.cxx 
b/sd/source/ui/view/NotesPanelView.cxx
index 0a7e58d1795d..9b1cece973f0 100644
--- a/sd/source/ui/view/NotesPanelView.cxx
+++ b/sd/source/ui/view/NotesPanelView.cxx
@@ -246,7 +246,7 @@ IMPL_LINK_NOARG(NotesPanelView, ModifyTimerHdl, Timer*, 
void)
     aModifyIdle.Stop();
 }
 
-IMPL_LINK(NotesPanelView, EventMultiplexerListener, 
tools::EventMultiplexerEvent&, rEvent, void)
+IMPL_LINK(NotesPanelView, EventMultiplexerListener, 
sdtools::EventMultiplexerEvent&, rEvent, void)
 {
     switch (rEvent.meEventId)
     {
diff --git a/sd/source/ui/view/ToolBarManager.cxx 
b/sd/source/ui/view/ToolBarManager.cxx
index 0087678acd4a..9b158b0b756d 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -248,7 +248,7 @@ public:
     */
     Implementation (
         ViewShellBase& rBase,
-        std::shared_ptr<sd::tools::EventMultiplexer> pMultiplexer,
+        std::shared_ptr<sdtools::EventMultiplexer> pMultiplexer,
         const std::shared_ptr<ViewShellManager>& rpViewShellManager,
         const std::shared_ptr<ToolBarManager>& rpToolBarManager);
     ~Implementation();
@@ -303,7 +303,7 @@ public:
 private:
     mutable ::osl::Mutex maMutex;
     ViewShellBase& mrBase;
-    std::shared_ptr<sd::tools::EventMultiplexer> mpEventMultiplexer;
+    std::shared_ptr<sdtools::EventMultiplexer> mpEventMultiplexer;
     bool mbIsValid;
     ToolBarList maToolBarList;
     ToolBarShellList maToolBarShellList;
@@ -327,7 +327,7 @@ private:
     bool CheckPlugInMode (std::u16string_view rsName) const;
 
     DECL_LINK(UpdateCallback, void *, void);
-    DECL_LINK(EventMultiplexerCallback, sd::tools::EventMultiplexerEvent&, 
void);
+    DECL_LINK(EventMultiplexerCallback, sdtools::EventMultiplexerEvent&, void);
     DECL_LINK(SetValidCallback, void*, void);
 };
 
@@ -335,7 +335,7 @@ private:
 
 std::shared_ptr<ToolBarManager> ToolBarManager::Create (
     ViewShellBase& rBase,
-    const std::shared_ptr<sd::tools::EventMultiplexer>& rpMultiplexer,
+    const std::shared_ptr<sdtools::EventMultiplexer>& rpMultiplexer,
     const std::shared_ptr<ViewShellManager>& rpViewShellManager)
 {
     std::shared_ptr<ToolBarManager> pManager (new ToolBarManager());
@@ -499,7 +499,7 @@ void ToolBarManager::ToolBarsDestroyed()
 
 ToolBarManager::Implementation::Implementation (
     ViewShellBase& rBase,
-    std::shared_ptr<sd::tools::EventMultiplexer> pMultiplexer,
+    std::shared_ptr<sdtools::EventMultiplexer> pMultiplexer,
     const std::shared_ptr<ViewShellManager>& rpViewShellManager,
     const std::shared_ptr<ToolBarManager>& rpToolBarManager)
     : mrBase(rBase),
@@ -512,7 +512,7 @@ ToolBarManager::Implementation::Implementation (
       mnPendingSetValidCall(nullptr),
       maToolBarRules(rpToolBarManager,rpViewShellManager)
 {
-    Link<tools::EventMultiplexerEvent&,void> aLink 
(LINK(this,ToolBarManager::Implementation,EventMultiplexerCallback));
+    Link<sdtools::EventMultiplexerEvent&,void> aLink 
(LINK(this,ToolBarManager::Implementation,EventMultiplexerCallback));
     mpEventMultiplexer->AddEventListener( aLink );
 }
 
@@ -523,7 +523,7 @@ ToolBarManager::Implementation::Implementation (
 ToolBarManager::Implementation::~Implementation()
 {
     // Unregister at broadcasters.
-    Link<tools::EventMultiplexerEvent&,void> aLink 
(LINK(this,ToolBarManager::Implementation,EventMultiplexerCallback));
+    Link<sdtools::EventMultiplexerEvent&,void> aLink 
(LINK(this,ToolBarManager::Implementation,EventMultiplexerCallback));
     mpEventMultiplexer->RemoveEventListener(aLink);
 
     // Abort pending user calls.
@@ -828,7 +828,7 @@ IMPL_LINK_NOARG(ToolBarManager::Implementation, 
UpdateCallback, void*, void)
 }
 
 IMPL_LINK(ToolBarManager::Implementation,EventMultiplexerCallback,
-    sd::tools::EventMultiplexerEvent&, rEvent, void)
+    sdtools::EventMultiplexerEvent&, rEvent, void)
 {
     SolarMutexGuard g;
     switch (rEvent.meEventId)
diff --git a/sd/source/ui/view/ViewShellBase.cxx 
b/sd/source/ui/view/ViewShellBase.cxx
index 919fcd21519f..e86685b35fda 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -141,7 +141,7 @@ public:
     VclPtr<vcl::Window> mpViewWindow;
     std::shared_ptr<ToolBarManager> mpToolBarManager;
     std::shared_ptr<ViewShellManager> mpViewShellManager;
-    std::shared_ptr<tools::EventMultiplexer> mpEventMultiplexer;
+    std::shared_ptr<sdtools::EventMultiplexer> mpEventMultiplexer;
     std::unique_ptr<FormShellManager> mpFormShellManager;
 
     explicit Implementation (ViewShellBase& rBase);
@@ -304,7 +304,7 @@ void ViewShellBase::LateInit (const OUString& rsDefaultView)
     mpImpl->LateInit();
     InitializeFramework();
 
-    mpImpl->mpEventMultiplexer = 
std::make_shared<tools::EventMultiplexer>(*this);
+    mpImpl->mpEventMultiplexer = 
std::make_shared<sdtools::EventMultiplexer>(*this);
 
     mpImpl->mpFormShellManager = std::make_unique<FormShellManager>(*this);
 
@@ -948,7 +948,7 @@ void ViewShellBase::SetViewOptions(const SdViewOptions& 
rOptions) const
     mpImpl->maViewOptions = rOptions;
 }
 
-std::shared_ptr<tools::EventMultiplexer> const & 
ViewShellBase::GetEventMultiplexer() const
+std::shared_ptr<sdtools::EventMultiplexer> const & 
ViewShellBase::GetEventMultiplexer() const
 {
     OSL_ASSERT(mpImpl != nullptr);
     OSL_ASSERT(mpImpl->mpEventMultiplexer != nullptr);
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index ca21dcf2001a..ad33f0a01644 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -340,7 +340,7 @@ OutlineView::OutlineView(DrawDocShell& rDocSh, vcl::Window* 
pWindow,
         FillOutliner();
     }
 
-    Link<tools::EventMultiplexerEvent&,void> aLink( 
LINK(this,OutlineView,EventMultiplexerListener) );
+    Link<sdtools::EventMultiplexerEvent&,void> aLink( 
LINK(this,OutlineView,EventMultiplexerListener) );
     
mrOutlineViewShell.GetViewShellBase().GetEventMultiplexer()->AddEventListener(aLink);
 
     Reference<XFrame> xFrame;
@@ -366,7 +366,7 @@ OutlineView::~OutlineView()
     DBG_ASSERT(maDragAndDropModelGuard == nullptr,
                "sd::OutlineView::~OutlineView(), prior drag operation not 
finished correctly!");
 
-    Link<tools::EventMultiplexerEvent&,void> aLink( 
LINK(this,OutlineView,EventMultiplexerListener) );
+    Link<sdtools::EventMultiplexerEvent&,void> aLink( 
LINK(this,OutlineView,EventMultiplexerListener) );
     
mrOutlineViewShell.GetViewShellBase().GetEventMultiplexer()->RemoveEventListener(
 aLink );
     DisconnectFromApplication();
 
@@ -1576,7 +1576,7 @@ IMPL_LINK_NOARG(OutlineView, AppEventListenerHdl, 
VclSimpleEvent&, void)
     onUpdateStyleSettings(false);
 }
 
-IMPL_LINK(OutlineView, EventMultiplexerListener, 
::sd::tools::EventMultiplexerEvent&, rEvent, void)
+IMPL_LINK(OutlineView, EventMultiplexerListener, 
::sdtools::EventMultiplexerEvent&, rEvent, void)
 {
     switch (rEvent.meEventId)
     {
diff --git a/sd/source/ui/view/viewoverlaymanager.cxx 
b/sd/source/ui/view/viewoverlaymanager.cxx
index 2e3d4c61187c..aa0fb0bc40b3 100644
--- a/sd/source/ui/view/viewoverlaymanager.cxx
+++ b/sd/source/ui/view/viewoverlaymanager.cxx
@@ -440,7 +440,7 @@ ViewOverlayManager::ViewOverlayManager( ViewShellBase& 
rViewShellBase )
 : mrBase( rViewShellBase )
 , mnUpdateTagsEvent( nullptr )
 {
-    Link<tools::EventMultiplexerEvent&,void> aLink( 
LINK(this,ViewOverlayManager,EventMultiplexerListener) );
+    Link<sdtools::EventMultiplexerEvent&,void> aLink( 
LINK(this,ViewOverlayManager,EventMultiplexerListener) );
     mrBase.GetEventMultiplexer()->AddEventListener(aLink);
 
     StartListening( *mrBase.GetDocShell() );
@@ -448,7 +448,7 @@ ViewOverlayManager::ViewOverlayManager( ViewShellBase& 
rViewShellBase )
 
 ViewOverlayManager::~ViewOverlayManager()
 {
-    Link<tools::EventMultiplexerEvent&,void> aLink( 
LINK(this,ViewOverlayManager,EventMultiplexerListener) );
+    Link<sdtools::EventMultiplexerEvent&,void> aLink( 
LINK(this,ViewOverlayManager,EventMultiplexerListener) );
     mrBase.GetEventMultiplexer()->RemoveEventListener( aLink );
 
     if( mnUpdateTagsEvent )
@@ -536,7 +536,7 @@ bool ViewOverlayManager::DisposeTags()
 }
 
 IMPL_LINK(ViewOverlayManager,EventMultiplexerListener,
-    tools::EventMultiplexerEvent&, rEvent, void)
+    sdtools::EventMultiplexerEvent&, rEvent, void)
 {
     switch (rEvent.meEventId)
     {
commit 02d28b06aba4cf59aad6d992192a12a5a49ce804
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Wed Aug 20 13:43:44 2025 +0500
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Wed Aug 20 15:23:47 2025 +0200

    Fix a typo in comment
    
    Change-Id: I8f193deb234c0d9485284ef4c21fa3a991d2dee3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189958
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/sd/source/console/PresenterConfigurationAccess.hxx 
b/sd/source/console/PresenterConfigurationAccess.hxx
index a11b088ac0d2..6d7867d1dc29 100644
--- a/sd/source/console/PresenterConfigurationAccess.hxx
+++ b/sd/source/console/PresenterConfigurationAccess.hxx
@@ -170,7 +170,7 @@ private:
     css::uno::Any maNode;
 };
 
-} // end of namespace sdext::tools
+} // end of namespace sdext::presenter
 
 #endif
 
commit f514561e425837c55366f4afd411636bca2cd7e9
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Wed Aug 20 13:41:04 2025 +0500
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Wed Aug 20 15:23:41 2025 +0200

    Fix a typo in comment
    
    Change-Id: I55abfb56fa3bbef567562a2e070f9ac41e7747dd
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189957
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
    Tested-by: Jenkins

diff --git a/include/basegfx/matrix/b3dhommatrixtools.hxx 
b/include/basegfx/matrix/b3dhommatrixtools.hxx
index ec83f2c3eb5b..1ef9a27cc0a7 100644
--- a/include/basegfx/matrix/b3dhommatrixtools.hxx
+++ b/include/basegfx/matrix/b3dhommatrixtools.hxx
@@ -38,6 +38,6 @@ UnoHomogenMatrixToB3DHomMatrix(const 
css::drawing::HomogenMatrix& rMatrixIn);
 BASEGFX_DLLPUBLIC void B3DHomMatrixToUnoHomogenMatrix(const B3DHomMatrix& 
rMatrixIn,
                                                       
css::drawing::HomogenMatrix& rMatrixOut);
 
-} // end of namespace basegfx::tools
+} // end of namespace basegfx::utils
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

Reply via email to