71 files changed, 100 insertions, 135 deletions
diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk
index a774d0610cb4..247942273104 100644
--- a/sd/Library_sdui.mk
+++ b/sd/Library_sdui.mk
@@ -11,6 +11,8 @@ $(eval $(call gb_Library_Library,sdui))
 
 $(eval $(call gb_Library_set_plugin_for,sdui,sd))
 
+$(eval $(call gb_Library_set_componentfile,sdui,sd/source/console/presenter,services))
+
 $(eval $(call gb_Library_set_include,sdui,\
     $$(INCLUDE) \
     -I$(SRCDIR)/sd/inc \
@@ -93,6 +95,39 @@ $(eval $(call gb_Library_add_exception_objects,sdui,\
     sd/source/ui/dlg/vectdlg \
     sd/source/ui/dlg/PhotoAlbumDialog \
     sd/source/ui/dlg/BulletAndPositionDlg \
+    sd/source/console/PresenterAccessibility \
+    sd/source/console/PresenterBitmapContainer \
+    sd/source/console/PresenterButton \
+    sd/source/console/PresenterCanvasHelper \
+    sd/source/console/PresenterConfigurationAccess \
+    sd/source/console/PresenterController \
+    sd/source/console/PresenterCurrentSlideObserver \
+    sd/source/console/PresenterFrameworkObserver \
+    sd/source/console/PresenterGeometryHelper \
+    sd/source/console/PresenterHelpView \
+    sd/source/console/PresenterHelper \
+    sd/source/console/PresenterNotesView \
+    sd/source/console/PresenterPaintManager \
+    sd/source/console/PresenterPane \
+    sd/source/console/PresenterPaneBase \
+    sd/source/console/PresenterPaneBorderPainter \
+    sd/source/console/PresenterPaneContainer \
+    sd/source/console/PresenterPaneFactory \
+    sd/source/console/PresenterProtocolHandler \
+    sd/source/console/PresenterScreen \
+    sd/source/console/PresenterScrollBar \
+    sd/source/console/PresenterSlidePreview \
+    sd/source/console/PresenterSlideShowView \
+    sd/source/console/PresenterSlideSorter \
+    sd/source/console/PresenterSprite \
+    sd/source/console/PresenterSpritePane \
+    sd/source/console/PresenterTextView \
+    sd/source/console/PresenterTheme \
+    sd/source/console/PresenterTimer \
+    sd/source/console/PresenterToolBar \
+    sd/source/console/PresenterUIPainter \
+    sd/source/console/PresenterViewFactory \
+    sd/source/console/PresenterWindowManager \
 ))
 
 # $(WORKDIR)/inc/sd/sddll0.hxx :
diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sd/source/console/PresenterAccessibility.cxx
index 4f2fa33f3866..4f2fa33f3866 100644
--- a/sdext/source/presenter/PresenterAccessibility.cxx
+++ b/sd/source/console/PresenterAccessibility.cxx
diff --git a/sdext/source/presenter/PresenterAccessibility.hxx b/sd/source/console/PresenterAccessibility.hxx
index 12015d0938d0..12015d0938d0 100644
--- a/sdext/source/presenter/PresenterAccessibility.hxx
+++ b/sd/source/console/PresenterAccessibility.hxx
diff --git a/sdext/source/presenter/PresenterBitmapContainer.cxx b/sd/source/console/PresenterBitmapContainer.cxx
index e435c8dbac69..e435c8dbac69 100644
--- a/sdext/source/presenter/PresenterBitmapContainer.cxx
+++ b/sd/source/console/PresenterBitmapContainer.cxx
diff --git a/sdext/source/presenter/PresenterBitmapContainer.hxx b/sd/source/console/PresenterBitmapContainer.hxx
index 7a9de89a7f13..7a9de89a7f13 100644
--- a/sdext/source/presenter/PresenterBitmapContainer.hxx
+++ b/sd/source/console/PresenterBitmapContainer.hxx
diff --git a/sdext/source/presenter/PresenterButton.cxx b/sd/source/console/PresenterButton.cxx
index d0fa61a09c94..d0fa61a09c94 100644
--- a/sdext/source/presenter/PresenterButton.cxx
+++ b/sd/source/console/PresenterButton.cxx
diff --git a/sdext/source/presenter/PresenterButton.hxx b/sd/source/console/PresenterButton.hxx
index ec2f617bd64a..ec2f617bd64a 100644
--- a/sdext/source/presenter/PresenterButton.hxx
+++ b/sd/source/console/PresenterButton.hxx
diff --git a/sdext/source/presenter/PresenterCanvasHelper.cxx b/sd/source/console/PresenterCanvasHelper.cxx
index 4ff103958e1a..4ff103958e1a 100644
--- a/sdext/source/presenter/PresenterCanvasHelper.cxx
+++ b/sd/source/console/PresenterCanvasHelper.cxx
diff --git a/sdext/source/presenter/PresenterCanvasHelper.hxx b/sd/source/console/PresenterCanvasHelper.hxx
index 8902a9712bf6..8902a9712bf6 100644
--- a/sdext/source/presenter/PresenterCanvasHelper.hxx
+++ b/sd/source/console/PresenterCanvasHelper.hxx
diff --git a/sdext/source/presenter/PresenterConfigurationAccess.cxx b/sd/source/console/PresenterConfigurationAccess.cxx
index 4e8494c1115c..4e8494c1115c 100644
--- a/sdext/source/presenter/PresenterConfigurationAccess.cxx
+++ b/sd/source/console/PresenterConfigurationAccess.cxx
diff --git a/sdext/source/presenter/PresenterConfigurationAccess.hxx b/sd/source/console/PresenterConfigurationAccess.hxx
index afd1b9aa4e87..afd1b9aa4e87 100644
--- a/sdext/source/presenter/PresenterConfigurationAccess.hxx
+++ b/sd/source/console/PresenterConfigurationAccess.hxx
diff --git a/sdext/source/presenter/PresenterController.cxx b/sd/source/console/PresenterController.cxx
index e9831ac749d5..e9831ac749d5 100644
--- a/sdext/source/presenter/PresenterController.cxx
+++ b/sd/source/console/PresenterController.cxx
diff --git a/sdext/source/presenter/PresenterController.hxx b/sd/source/console/PresenterController.hxx
index f29970c6903d..f29970c6903d 100644
--- a/sdext/source/presenter/PresenterController.hxx
+++ b/sd/source/console/PresenterController.hxx
diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.cxx b/sd/source/console/PresenterCurrentSlideObserver.cxx
index 27e5dc7e45e4..27e5dc7e45e4 100644
--- a/sdext/source/presenter/PresenterCurrentSlideObserver.cxx
+++ b/sd/source/console/PresenterCurrentSlideObserver.cxx
diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx b/sd/source/console/PresenterCurrentSlideObserver.hxx
index 6e005e4c8799..6e005e4c8799 100644
--- a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx
+++ b/sd/source/console/PresenterCurrentSlideObserver.hxx
diff --git a/sdext/source/presenter/PresenterFrameworkObserver.cxx b/sd/source/console/PresenterFrameworkObserver.cxx
index 3ca06a913775..3ca06a913775 100644
--- a/sdext/source/presenter/PresenterFrameworkObserver.cxx
+++ b/sd/source/console/PresenterFrameworkObserver.cxx
diff --git a/sdext/source/presenter/PresenterFrameworkObserver.hxx b/sd/source/console/PresenterFrameworkObserver.hxx
index 6700ad0a2322..6700ad0a2322 100644
--- a/sdext/source/presenter/PresenterFrameworkObserver.hxx
+++ b/sd/source/console/PresenterFrameworkObserver.hxx
diff --git a/sdext/source/presenter/PresenterGeometryHelper.cxx b/sd/source/console/PresenterGeometryHelper.cxx
index b2ad35c63e94..b2ad35c63e94 100644
--- a/sdext/source/presenter/PresenterGeometryHelper.cxx
+++ b/sd/source/console/PresenterGeometryHelper.cxx
diff --git a/sdext/source/presenter/PresenterGeometryHelper.hxx b/sd/source/console/PresenterGeometryHelper.hxx
index c2f55757e9da..c2f55757e9da 100644
--- a/sdext/source/presenter/PresenterGeometryHelper.hxx
+++ b/sd/source/console/PresenterGeometryHelper.hxx
diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sd/source/console/PresenterHelpView.cxx
index bdfa1ab37fb9..bdfa1ab37fb9 100644
--- a/sdext/source/presenter/PresenterHelpView.cxx
+++ b/sd/source/console/PresenterHelpView.cxx
diff --git a/sdext/source/presenter/PresenterHelpView.hxx b/sd/source/console/PresenterHelpView.hxx
index 2d147c346576..2d147c346576 100644
--- a/sdext/source/presenter/PresenterHelpView.hxx
+++ b/sd/source/console/PresenterHelpView.hxx
diff --git a/sdext/source/presenter/PresenterHelper.cxx b/sd/source/console/PresenterHelper.cxx
index 76bec0ecee7d..76bec0ecee7d 100644
--- a/sdext/source/presenter/PresenterHelper.cxx
+++ b/sd/source/console/PresenterHelper.cxx
diff --git a/sdext/source/presenter/PresenterHelper.hxx b/sd/source/console/PresenterHelper.hxx
index 69fc57333941..69fc57333941 100644
--- a/sdext/source/presenter/PresenterHelper.hxx
+++ b/sd/source/console/PresenterHelper.hxx
diff --git a/sdext/source/presenter/PresenterNotesView.cxx b/sd/source/console/PresenterNotesView.cxx
index 457be1f612b7..457be1f612b7 100644
--- a/sdext/source/presenter/PresenterNotesView.cxx
+++ b/sd/source/console/PresenterNotesView.cxx
diff --git a/sdext/source/presenter/PresenterNotesView.hxx b/sd/source/console/PresenterNotesView.hxx
index 1af3f241f004..1af3f241f004 100644
--- a/sdext/source/presenter/PresenterNotesView.hxx
+++ b/sd/source/console/PresenterNotesView.hxx
diff --git a/sdext/source/presenter/PresenterPaintManager.cxx b/sd/source/console/PresenterPaintManager.cxx
index f7b612d9a05a..f7b612d9a05a 100644
--- a/sdext/source/presenter/PresenterPaintManager.cxx
+++ b/sd/source/console/PresenterPaintManager.cxx
diff --git a/sdext/source/presenter/PresenterPaintManager.hxx b/sd/source/console/PresenterPaintManager.hxx
index ad2f6b0cbf31..ad2f6b0cbf31 100644
--- a/sdext/source/presenter/PresenterPaintManager.hxx
+++ b/sd/source/console/PresenterPaintManager.hxx
diff --git a/sdext/source/presenter/PresenterPane.cxx b/sd/source/console/PresenterPane.cxx
index ad35315438e8..ad35315438e8 100644
--- a/sdext/source/presenter/PresenterPane.cxx
+++ b/sd/source/console/PresenterPane.cxx
diff --git a/sdext/source/presenter/PresenterPane.hxx b/sd/source/console/PresenterPane.hxx
index 2a057229f802..2a057229f802 100644
--- a/sdext/source/presenter/PresenterPane.hxx
+++ b/sd/source/console/PresenterPane.hxx
diff --git a/sdext/source/presenter/PresenterPaneBase.cxx b/sd/source/console/PresenterPaneBase.cxx
index 33dc38a1ac12..33dc38a1ac12 100644
--- a/sdext/source/presenter/PresenterPaneBase.cxx
+++ b/sd/source/console/PresenterPaneBase.cxx
diff --git a/sdext/source/presenter/PresenterPaneBase.hxx b/sd/source/console/PresenterPaneBase.hxx
index 3264797fce8d..3264797fce8d 100644
--- a/sdext/source/presenter/PresenterPaneBase.hxx
+++ b/sd/source/console/PresenterPaneBase.hxx
diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.cxx b/sd/source/console/PresenterPaneBorderPainter.cxx
index fac17dd9d64f..fac17dd9d64f 100644
--- a/sdext/source/presenter/PresenterPaneBorderPainter.cxx
+++ b/sd/source/console/PresenterPaneBorderPainter.cxx
diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.hxx b/sd/source/console/PresenterPaneBorderPainter.hxx
index b7b9c0de1e06..b7b9c0de1e06 100644
--- a/sdext/source/presenter/PresenterPaneBorderPainter.hxx
+++ b/sd/source/console/PresenterPaneBorderPainter.hxx
diff --git a/sdext/source/presenter/PresenterPaneContainer.cxx b/sd/source/console/PresenterPaneContainer.cxx
index b28f36a399a7..b28f36a399a7 100644
--- a/sdext/source/presenter/PresenterPaneContainer.cxx
+++ b/sd/source/console/PresenterPaneContainer.cxx
diff --git a/sdext/source/presenter/PresenterPaneContainer.hxx b/sd/source/console/PresenterPaneContainer.hxx
index 136c25690b16..136c25690b16 100644
--- a/sdext/source/presenter/PresenterPaneContainer.hxx
+++ b/sd/source/console/PresenterPaneContainer.hxx
diff --git a/sdext/source/presenter/PresenterPaneFactory.cxx b/sd/source/console/PresenterPaneFactory.cxx
index b779e950d478..b779e950d478 100644
--- a/sdext/source/presenter/PresenterPaneFactory.cxx
+++ b/sd/source/console/PresenterPaneFactory.cxx
diff --git a/sdext/source/presenter/PresenterPaneFactory.hxx b/sd/source/console/PresenterPaneFactory.hxx
index 306db4a4f626..306db4a4f626 100644
--- a/sdext/source/presenter/PresenterPaneFactory.hxx
+++ b/sd/source/console/PresenterPaneFactory.hxx
diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sd/source/console/PresenterProtocolHandler.cxx
index a32a73b6180e..8064f56597c4 100644
--- a/sdext/source/presenter/PresenterProtocolHandler.cxx
+++ b/sd/source/console/PresenterProtocolHandler.cxx
@@ -290,7 +290,7 @@ PresenterProtocolHandler::getSupportedServiceNames()
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
-sdext_PresenterProtocolHandler_get_implementation(
+sd_PresenterProtocolHandler_get_implementation(
     css::uno::XComponentContext* , css::uno::Sequence<css::uno::Any> const&)
 {
     return cppu::acquire(new PresenterProtocolHandler());
diff --git a/sdext/source/presenter/PresenterProtocolHandler.hxx b/sd/source/console/PresenterProtocolHandler.hxx
index 217fb2658abe..217fb2658abe 100644
--- a/sdext/source/presenter/PresenterProtocolHandler.hxx
+++ b/sd/source/console/PresenterProtocolHandler.hxx
diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sd/source/console/PresenterScreen.cxx
index 0f4cdedb98fa..8337839af09b 100644
--- a/sdext/source/presenter/PresenterScreen.cxx
+++ b/sd/source/console/PresenterScreen.cxx
@@ -106,7 +106,7 @@ sal_Bool SAL_CALL PresenterScreenJob::supportsService(const OUString& aServiceNa
 
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
-sdext_PresenterScreenJob_get_implementation(
+sd_PresenterScreenJob_get_implementation(
     css::uno::XComponentContext* context , css::uno::Sequence<css::uno::Any> const&)
 {
     return cppu::acquire(new PresenterScreenJob(context));
diff --git a/sdext/source/presenter/PresenterScreen.hxx b/sd/source/console/PresenterScreen.hxx
index 3e4caf19442a..3e4caf19442a 100644
--- a/sdext/source/presenter/PresenterScreen.hxx
+++ b/sd/source/console/PresenterScreen.hxx
diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sd/source/console/PresenterScrollBar.cxx
index 3a0891ec5d3c..3a0891ec5d3c 100644
--- a/sdext/source/presenter/PresenterScrollBar.cxx
+++ b/sd/source/console/PresenterScrollBar.cxx
diff --git a/sdext/source/presenter/PresenterScrollBar.hxx b/sd/source/console/PresenterScrollBar.hxx
index 1c3bcc2fd1af..1c3bcc2fd1af 100644
--- a/sdext/source/presenter/PresenterScrollBar.hxx
+++ b/sd/source/console/PresenterScrollBar.hxx
diff --git a/sdext/source/presenter/PresenterSlidePreview.cxx b/sd/source/console/PresenterSlidePreview.cxx
index 9de4c8820b8c..9de4c8820b8c 100644
--- a/sdext/source/presenter/PresenterSlidePreview.cxx
+++ b/sd/source/console/PresenterSlidePreview.cxx
diff --git a/sdext/source/presenter/PresenterSlidePreview.hxx b/sd/source/console/PresenterSlidePreview.hxx
index 85107693a9fa..85107693a9fa 100644
--- a/sdext/source/presenter/PresenterSlidePreview.hxx
+++ b/sd/source/console/PresenterSlidePreview.hxx
diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx b/sd/source/console/PresenterSlideShowView.cxx
index 132eaf35f85e..132eaf35f85e 100644
--- a/sdext/source/presenter/PresenterSlideShowView.cxx
+++ b/sd/source/console/PresenterSlideShowView.cxx
diff --git a/sdext/source/presenter/PresenterSlideShowView.hxx b/sd/source/console/PresenterSlideShowView.hxx
index e4466522eddf..e4466522eddf 100644
--- a/sdext/source/presenter/PresenterSlideShowView.hxx
+++ b/sd/source/console/PresenterSlideShowView.hxx
diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sd/source/console/PresenterSlideSorter.cxx
index ef33a4dde634..ef33a4dde634 100644
--- a/sdext/source/presenter/PresenterSlideSorter.cxx
+++ b/sd/source/console/PresenterSlideSorter.cxx
diff --git a/sdext/source/presenter/PresenterSlideSorter.hxx b/sd/source/console/PresenterSlideSorter.hxx
index 807bc439929e..807bc439929e 100644
--- a/sdext/source/presenter/PresenterSlideSorter.hxx
+++ b/sd/source/console/PresenterSlideSorter.hxx
diff --git a/sdext/source/presenter/PresenterSprite.cxx b/sd/source/console/PresenterSprite.cxx
index 0f7c8f829062..0f7c8f829062 100644
--- a/sdext/source/presenter/PresenterSprite.cxx
+++ b/sd/source/console/PresenterSprite.cxx
diff --git a/sdext/source/presenter/PresenterSprite.hxx b/sd/source/console/PresenterSprite.hxx
index b550ec0a815f..b550ec0a815f 100644
--- a/sdext/source/presenter/PresenterSprite.hxx
+++ b/sd/source/console/PresenterSprite.hxx
diff --git a/sdext/source/presenter/PresenterSpritePane.cxx b/sd/source/console/PresenterSpritePane.cxx
index c90f250fb192..c90f250fb192 100644
--- a/sdext/source/presenter/PresenterSpritePane.cxx
+++ b/sd/source/console/PresenterSpritePane.cxx
diff --git a/sdext/source/presenter/PresenterSpritePane.hxx b/sd/source/console/PresenterSpritePane.hxx
index 1c2c923b942a..1c2c923b942a 100644
--- a/sdext/source/presenter/PresenterSpritePane.hxx
+++ b/sd/source/console/PresenterSpritePane.hxx
diff --git a/sdext/source/presenter/PresenterTextView.cxx b/sd/source/console/PresenterTextView.cxx
index 08d981fe6ac1..08d981fe6ac1 100644
--- a/sdext/source/presenter/PresenterTextView.cxx
+++ b/sd/source/console/PresenterTextView.cxx
diff --git a/sdext/source/presenter/PresenterTextView.hxx b/sd/source/console/PresenterTextView.hxx
index 6dd2da3b2372..6dd2da3b2372 100644
--- a/sdext/source/presenter/PresenterTextView.hxx
+++ b/sd/source/console/PresenterTextView.hxx
diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sd/source/console/PresenterTheme.cxx
index 59c340d8627a..59c340d8627a 100644
--- a/sdext/source/presenter/PresenterTheme.cxx
+++ b/sd/source/console/PresenterTheme.cxx
diff --git a/sdext/source/presenter/PresenterTheme.hxx b/sd/source/console/PresenterTheme.hxx
index ae92433a676c..ae92433a676c 100644
--- a/sdext/source/presenter/PresenterTheme.hxx
+++ b/sd/source/console/PresenterTheme.hxx
diff --git a/sdext/source/presenter/PresenterTimer.cxx b/sd/source/console/PresenterTimer.cxx
index b9a4b62815c4..b9a4b62815c4 100644
--- a/sdext/source/presenter/PresenterTimer.cxx
+++ b/sd/source/console/PresenterTimer.cxx
diff --git a/sdext/source/presenter/PresenterTimer.hxx b/sd/source/console/PresenterTimer.hxx
index 1c2b6530b759..1c2b6530b759 100644
--- a/sdext/source/presenter/PresenterTimer.hxx
+++ b/sd/source/console/PresenterTimer.hxx
diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sd/source/console/PresenterToolBar.cxx
index 867459423d8e..867459423d8e 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sd/source/console/PresenterToolBar.cxx
diff --git a/sdext/source/presenter/PresenterToolBar.hxx b/sd/source/console/PresenterToolBar.hxx
index 1b789955689c..1b789955689c 100644
--- a/sdext/source/presenter/PresenterToolBar.hxx
+++ b/sd/source/console/PresenterToolBar.hxx
diff --git a/sdext/source/presenter/PresenterUIPainter.cxx b/sd/source/console/PresenterUIPainter.cxx
index 7b37736ff39d..7b37736ff39d 100644
--- a/sdext/source/presenter/PresenterUIPainter.cxx
+++ b/sd/source/console/PresenterUIPainter.cxx
diff --git a/sdext/source/presenter/PresenterUIPainter.hxx b/sd/source/console/PresenterUIPainter.hxx
index f21ca291a147..f21ca291a147 100644
--- a/sdext/source/presenter/PresenterUIPainter.hxx
+++ b/sd/source/console/PresenterUIPainter.hxx
diff --git a/sdext/source/presenter/PresenterViewFactory.cxx b/sd/source/console/PresenterViewFactory.cxx
index 06eff32f7d3f..06eff32f7d3f 100644
--- a/sdext/source/presenter/PresenterViewFactory.cxx
+++ b/sd/source/console/PresenterViewFactory.cxx
diff --git a/sdext/source/presenter/PresenterViewFactory.hxx b/sd/source/console/PresenterViewFactory.hxx
index 7f3468d4e57a..7f3468d4e57a 100644
--- a/sdext/source/presenter/PresenterViewFactory.hxx
+++ b/sd/source/console/PresenterViewFactory.hxx
diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sd/source/console/PresenterWindowManager.cxx
index 11db88ce52b6..11db88ce52b6 100644
--- a/sdext/source/presenter/PresenterWindowManager.cxx
+++ b/sd/source/console/PresenterWindowManager.cxx
diff --git a/sdext/source/presenter/PresenterWindowManager.hxx b/sd/source/console/PresenterWindowManager.hxx
index 04d164e35f8a..04d164e35f8a 100644
--- a/sdext/source/presenter/PresenterWindowManager.hxx
+++ b/sd/source/console/PresenterWindowManager.hxx
diff --git a/sdext/source/presenter/presenter.component b/sd/source/console/presenter.component
index 01e18b38eca0..3e1bc8508d36 100644
--- a/sdext/source/presenter/presenter.component
+++ b/sd/source/console/presenter.component
@@ -10,9 +10,9 @@
 <component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
         xmlns="http://openoffice.org/2010/uno-components">
     <implementation name="org.libreoffice.comp.PresenterScreenJob"
-        constructor="sdext_PresenterScreenJob_get_implementation" />
+        constructor="sd_PresenterScreenJob_get_implementation" />
     <implementation name="org.libreoffice.comp.PresenterScreenProtocolHandler"
-        constructor="sdext_PresenterProtocolHandler_get_implementation">
+        constructor="sd_PresenterProtocolHandler_get_implementation">
         <service name="com.sun.star.frame.ProtocolHandler"/>
     </implementation>
 </component>
diff --git a/sdext/Library_PresenterScreen.mk b/sdext/Library_PresenterScreen.mk
deleted file mode 100644
index e486a4ff8284..000000000000
--- a/sdext/Library_PresenterScreen.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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/.
-#
-
-$(eval $(call gb_Library_Library,PresenterScreen))
-
-$(eval $(call gb_Library_set_componentfile,PresenterScreen,sdext/source/presenter/presenter,services))
-
-$(eval $(call gb_Library_set_precompiled_header,PresenterScreen,sdext/inc/pch/precompiled_PresenterScreen))
-
-$(eval $(call gb_Library_use_externals,PresenterScreen,\
-	boost_headers \
-))
-
-$(eval $(call gb_Library_use_sdk_api,PresenterScreen))
-
-$(eval $(call gb_Library_use_libraries,PresenterScreen,\
-    comphelper \
-    cppu \
-    cppuhelper \
-    sal \
-    vcl \
-))
-
-$(eval $(call gb_Library_add_exception_objects,PresenterScreen,\
-    sdext/source/presenter/PresenterAccessibility \
-    sdext/source/presenter/PresenterBitmapContainer \
-    sdext/source/presenter/PresenterButton \
-    sdext/source/presenter/PresenterCanvasHelper \
-    sdext/source/presenter/PresenterConfigurationAccess \
-    sdext/source/presenter/PresenterController \
-    sdext/source/presenter/PresenterCurrentSlideObserver \
-    sdext/source/presenter/PresenterFrameworkObserver \
-    sdext/source/presenter/PresenterGeometryHelper \
-    sdext/source/presenter/PresenterHelpView \
-    sdext/source/presenter/PresenterHelper \
-    sdext/source/presenter/PresenterNotesView \
-    sdext/source/presenter/PresenterPaintManager \
-    sdext/source/presenter/PresenterPane \
-    sdext/source/presenter/PresenterPaneBase \
-    sdext/source/presenter/PresenterPaneBorderPainter \
-    sdext/source/presenter/PresenterPaneContainer \
-    sdext/source/presenter/PresenterPaneFactory \
-    sdext/source/presenter/PresenterProtocolHandler \
-    sdext/source/presenter/PresenterScreen \
-    sdext/source/presenter/PresenterScrollBar \
-    sdext/source/presenter/PresenterSlidePreview \
-    sdext/source/presenter/PresenterSlideShowView \
-    sdext/source/presenter/PresenterSlideSorter \
-    sdext/source/presenter/PresenterSprite \
-    sdext/source/presenter/PresenterSpritePane \
-    sdext/source/presenter/PresenterTextView \
-    sdext/source/presenter/PresenterTheme \
-    sdext/source/presenter/PresenterTimer \
-    sdext/source/presenter/PresenterToolBar \
-    sdext/source/presenter/PresenterUIPainter \
-    sdext/source/presenter/PresenterViewFactory \
-    sdext/source/presenter/PresenterWindowManager \
-))
-
-# vim:set noet sw=4 ts=4:
diff --git a/sdext/Module_sdext.mk b/sdext/Module_sdext.mk
index fd1d191b4939..1522d214470f 100644
--- a/sdext/Module_sdext.mk
+++ b/sdext/Module_sdext.mk
@@ -10,10 +10,6 @@
 $(eval $(call gb_Module_Module,sdext))
 
 $(eval $(call gb_Module_add_targets,sdext,\
-    Library_PresenterScreen \
-))
-
-$(eval $(call gb_Module_add_targets,sdext,\
     Library_PresentationMinimizer \
 ))
 
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 58d49b46a3b3..9a63a43bc958 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -9460,6 +9460,67 @@ sd/qa/unit/dialogs-test.cxx
 sd/qa/unit/filters-test.cxx
 sd/qa/unit/tiledrendering/tiledrendering.cxx
 sd/qa/unit/uimpress.cxx
+sd/source/console/PresenterAccessibility.cxx
+sd/source/console/PresenterAccessibility.hxx
+sd/source/console/PresenterBitmapContainer.cxx
+sd/source/console/PresenterBitmapContainer.hxx
+sd/source/console/PresenterButton.cxx
+sd/source/console/PresenterButton.hxx
+sd/source/console/PresenterCanvasHelper.cxx
+sd/source/console/PresenterCanvasHelper.hxx
+sd/source/console/PresenterConfigurationAccess.cxx
+sd/source/console/PresenterConfigurationAccess.hxx
+sd/source/console/PresenterController.cxx
+sd/source/console/PresenterController.hxx
+sd/source/console/PresenterCurrentSlideObserver.cxx
+sd/source/console/PresenterCurrentSlideObserver.hxx
+sd/source/console/PresenterFrameworkObserver.cxx
+sd/source/console/PresenterFrameworkObserver.hxx
+sd/source/console/PresenterGeometryHelper.cxx
+sd/source/console/PresenterGeometryHelper.hxx
+sd/source/console/PresenterHelpView.cxx
+sd/source/console/PresenterHelpView.hxx
+sd/source/console/PresenterHelper.cxx
+sd/source/console/PresenterNotesView.cxx
+sd/source/console/PresenterNotesView.hxx
+sd/source/console/PresenterPaintManager.cxx
+sd/source/console/PresenterPaintManager.hxx
+sd/source/console/PresenterPane.cxx
+sd/source/console/PresenterPaneBase.cxx
+sd/source/console/PresenterPaneBase.hxx
+sd/source/console/PresenterPaneBorderPainter.cxx
+sd/source/console/PresenterPaneBorderPainter.hxx
+sd/source/console/PresenterPaneContainer.cxx
+sd/source/console/PresenterPaneContainer.hxx
+sd/source/console/PresenterPaneFactory.cxx
+sd/source/console/PresenterPaneFactory.hxx
+sd/source/console/PresenterProtocolHandler.cxx
+sd/source/console/PresenterProtocolHandler.hxx
+sd/source/console/PresenterScreen.cxx
+sd/source/console/PresenterScreen.hxx
+sd/source/console/PresenterScrollBar.cxx
+sd/source/console/PresenterScrollBar.hxx
+sd/source/console/PresenterSlidePreview.cxx
+sd/source/console/PresenterSlidePreview.hxx
+sd/source/console/PresenterSlideShowView.cxx
+sd/source/console/PresenterSlideShowView.hxx
+sd/source/console/PresenterSlideSorter.cxx
+sd/source/console/PresenterSlideSorter.hxx
+sd/source/console/PresenterSprite.cxx
+sd/source/console/PresenterSpritePane.cxx
+sd/source/console/PresenterTextView.cxx
+sd/source/console/PresenterTextView.hxx
+sd/source/console/PresenterTheme.cxx
+sd/source/console/PresenterTheme.hxx
+sd/source/console/PresenterTimer.cxx
+sd/source/console/PresenterTimer.hxx
+sd/source/console/PresenterToolBar.cxx
+sd/source/console/PresenterToolBar.hxx
+sd/source/console/PresenterUIPainter.cxx
+sd/source/console/PresenterViewFactory.cxx
+sd/source/console/PresenterViewFactory.hxx
+sd/source/console/PresenterWindowManager.cxx
+sd/source/console/PresenterWindowManager.hxx
 sd/source/core/CustomAnimationCloner.cxx
 sd/source/core/CustomAnimationEffect.cxx
 sd/source/core/CustomAnimationPreset.cxx
@@ -10162,67 +10223,6 @@ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
 sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
 sdext/source/pdfimport/xpdfwrapper/pnghelper.hxx
 sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
-sdext/source/presenter/PresenterAccessibility.cxx
-sdext/source/presenter/PresenterAccessibility.hxx
-sdext/source/presenter/PresenterBitmapContainer.cxx
-sdext/source/presenter/PresenterBitmapContainer.hxx
-sdext/source/presenter/PresenterButton.cxx
-sdext/source/presenter/PresenterButton.hxx
-sdext/source/presenter/PresenterCanvasHelper.cxx
-sdext/source/presenter/PresenterCanvasHelper.hxx
-sdext/source/presenter/PresenterConfigurationAccess.cxx
-sdext/source/presenter/PresenterConfigurationAccess.hxx
-sdext/source/presenter/PresenterController.cxx
-sdext/source/presenter/PresenterController.hxx
-sdext/source/presenter/PresenterCurrentSlideObserver.cxx
-sdext/source/presenter/PresenterCurrentSlideObserver.hxx
-sdext/source/presenter/PresenterFrameworkObserver.cxx
-sdext/source/presenter/PresenterFrameworkObserver.hxx
-sdext/source/presenter/PresenterGeometryHelper.cxx
-sdext/source/presenter/PresenterGeometryHelper.hxx
-sdext/source/presenter/PresenterHelpView.cxx
-sdext/source/presenter/PresenterHelpView.hxx
-sdext/source/presenter/PresenterHelper.cxx
-sdext/source/presenter/PresenterNotesView.cxx
-sdext/source/presenter/PresenterNotesView.hxx
-sdext/source/presenter/PresenterPaintManager.cxx
-sdext/source/presenter/PresenterPaintManager.hxx
-sdext/source/presenter/PresenterPane.cxx
-sdext/source/presenter/PresenterPaneBase.cxx
-sdext/source/presenter/PresenterPaneBase.hxx
-sdext/source/presenter/PresenterPaneBorderPainter.cxx
-sdext/source/presenter/PresenterPaneBorderPainter.hxx
-sdext/source/presenter/PresenterPaneContainer.cxx
-sdext/source/presenter/PresenterPaneContainer.hxx
-sdext/source/presenter/PresenterPaneFactory.cxx
-sdext/source/presenter/PresenterPaneFactory.hxx
-sdext/source/presenter/PresenterProtocolHandler.cxx
-sdext/source/presenter/PresenterProtocolHandler.hxx
-sdext/source/presenter/PresenterScreen.cxx
-sdext/source/presenter/PresenterScreen.hxx
-sdext/source/presenter/PresenterScrollBar.cxx
-sdext/source/presenter/PresenterScrollBar.hxx
-sdext/source/presenter/PresenterSlidePreview.cxx
-sdext/source/presenter/PresenterSlidePreview.hxx
-sdext/source/presenter/PresenterSlideShowView.cxx
-sdext/source/presenter/PresenterSlideShowView.hxx
-sdext/source/presenter/PresenterSlideSorter.cxx
-sdext/source/presenter/PresenterSlideSorter.hxx
-sdext/source/presenter/PresenterSprite.cxx
-sdext/source/presenter/PresenterSpritePane.cxx
-sdext/source/presenter/PresenterTextView.cxx
-sdext/source/presenter/PresenterTextView.hxx
-sdext/source/presenter/PresenterTheme.cxx
-sdext/source/presenter/PresenterTheme.hxx
-sdext/source/presenter/PresenterTimer.cxx
-sdext/source/presenter/PresenterTimer.hxx
-sdext/source/presenter/PresenterToolBar.cxx
-sdext/source/presenter/PresenterToolBar.hxx
-sdext/source/presenter/PresenterUIPainter.cxx
-sdext/source/presenter/PresenterViewFactory.cxx
-sdext/source/presenter/PresenterViewFactory.hxx
-sdext/source/presenter/PresenterWindowManager.cxx
-sdext/source/presenter/PresenterWindowManager.hxx
 setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx
 setup_native/source/win32/customactions/quickstarter/quickstarter.cxx
 setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx