sd/Library_sdui.mk | 35 +++++++
sd/source/console/PresenterProtocolHandler.cxx | 2
sd/source/console/PresenterScreen.cxx | 2
sd/source/console/presenter.component | 4
sdext/Library_PresenterScreen.mk | 66 -------------
sdext/Module_sdext.mk | 4
solenv/clang-format/excludelist | 122 ++++++++++++-------------
7 files changed, 100 insertions(+), 135 deletions(-)
New commits:
commit 02c4386a09c7364d58c50a388ff77db14810a218
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Fri Jan 20 21:35:29 2023 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Jan 21 16:23:19 2023 +0000
move presenter console from sdext/ to sd/
It really wants to part of the main sd UI where it can interact
nicely with the existing logic, instead of using awkward UNO
APIs.
Change-Id: I6e0d486275515d48abe3438b88d4f58d4bee58fa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145913
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
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
similarity index 100%
rename from sdext/source/presenter/PresenterAccessibility.cxx
rename to sd/source/console/PresenterAccessibility.cxx
diff --git a/sdext/source/presenter/PresenterAccessibility.hxx
b/sd/source/console/PresenterAccessibility.hxx
similarity index 100%
rename from sdext/source/presenter/PresenterAccessibility.hxx
rename to sd/source/console/PresenterAccessibility.hxx
diff --git a/sdext/source/presenter/PresenterBitmapContainer.cxx
b/sd/source/console/PresenterBitmapContainer.cxx
similarity index 100%
rename from sdext/source/presenter/PresenterBitmapContainer.cxx
rename to sd/source/console/PresenterBitmapContainer.cxx
diff --git a/sdext/source/presenter/PresenterBitmapContainer.hxx
b/sd/source/console/PresenterBitmapContainer.hxx
similarity index 100%
rename from sdext/source/presenter/PresenterBitmapContainer.hxx
rename to sd/source/console/PresenterBitmapContainer.hxx
diff --git a/sdext/source/presenter/PresenterButton.cxx
b/sd/source/console/PresenterButton.cxx
similarity index 100%
rename from sdext/source/presenter/PresenterButton.cxx
rename to sd/source/console/PresenterButton.cxx
diff --git a/sdext/source/presenter/PresenterButton.hxx
b/sd/source/console/PresenterButton.hxx
similarity index 100%
rename from sdext/source/presenter/PresenterButton.hxx
rename to sd/source/console/PresenterButton.hxx
diff --git a/sdext/source/presenter/PresenterCanvasHelper.cxx
b/sd/source/console/PresenterCanvasHelper.cxx
similarity index 100%
rename from sdext/source/presenter/PresenterCanvasHelper.cxx
rename to sd/source/console/PresenterCanvasHelper.cxx
diff --git a/sdext/source/presenter/PresenterCanvasHelper.hxx
b/sd/source/console/PresenterCanvasHelper.hxx
similarity index 100%
rename from sdext/source/presenter/PresenterCanvasHelper.hxx
rename to sd/source/console/PresenterCanvasHelper.hxx
diff --git a/sdext/source/presenter/PresenterConfigurationAccess.cxx
b/sd/source/console/PresenterConfigurationAccess.cxx
similarity index 100%
rename from sdext/source/presenter/PresenterConfigurationAccess.cxx
rename to sd/source/console/PresenterConfigurationAccess.cxx
diff --git a/sdext/source/presenter/PresenterConfigurationAccess.hxx
b/sd/source/console/PresenterConfigurationAccess.hxx
similarity index 100%
rename from sdext/source/presenter/PresenterConfigurationAccess.hxx
rename to sd/source/console/PresenterConfigurationAccess.hxx
diff --git a/sdext/source/presenter/PresenterController.cxx
b/sd/source/console/PresenterController.cxx
similarity index 100%
rename from sdext/source/presenter/PresenterController.cxx
rename to sd/source/console/PresenterController.cxx
diff --git a/sdext/source/presenter/PresenterController.hxx
b/sd/source/console/PresenterController.hxx
similarity index 100%
rename from sdext/source/presenter/PresenterController.hxx
rename to sd/source/console/PresenterController.hxx
diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.cxx
b/sd/source/console/PresenterCurrentSlideObserver.cxx
similarity index 100%
rename from sdext/source/presenter/PresenterCurrentSlideObserver.cxx
rename to sd/source/console/PresenterCurrentSlideObserver.cxx
diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx
b/sd/source/console/PresenterCurrentSlideObserver.hxx
similarity index 100%
rename from sdext/source/presenter/PresenterCurrentSlideObserver.hxx
rename to sd/source/console/PresenterCurrentSlideObserver.hxx
diff --git a/sdext/source/presenter/PresenterFrameworkObserver.cxx
b/sd/source/console/PresenterFrameworkObserver.cxx
similarity index 100%
rename from sdext/source/presenter/PresenterFrameworkObserver.cxx
rename to sd/source/console/PresenterFrameworkObserver.cxx
diff --git a/sdext/source/presenter/PresenterFrameworkObserver.hxx
b/sd/source/console/PresenterFrameworkObserver.hxx
similarity index 100%
rename from sdext/source/presenter/PresenterFrameworkObserver.hxx
rename to sd/source/console/PresenterFrameworkObserver.hxx
diff --git a/sdext/source/presenter/PresenterGeometryHelper.cxx
b/sd/source/console/PresenterGeometryHelper.cxx
similarity index 100%
rename from sdext/source/presenter/PresenterGeometryHelper.cxx
rename to sd/source/console/PresenterGeometryHelper.cxx
diff --git a/sdext/source/presenter/PresenterGeometryHelper.hxx
b/sd/source/console/PresenterGeometryHelper.hxx
similarity index 100%
rename from sdext/source/presenter/PresenterGeometryHelper.hxx
rename to sd/source/console/PresenterGeometryHelper.hxx
diff --git a/sdext/source/presenter/PresenterHelpView.cxx
b/sd/source/console/PresenterHelpView.cxx
similarity index 100%
rename from sdext/source/presenter/PresenterHelpView.cxx
rename to sd/source/console/PresenterHelpView.cxx
diff --git a/sdext/source/presenter/PresenterHelpView.hxx
b/sd/source/console/PresenterHelpView.hxx
similarity index 100%
rename from sdext/source/presenter/PresenterHelpView.hxx
rename to sd/source/console/PresenterHelpView.hxx
diff --git a/sdext/source/presenter/PresenterHelper.cxx
b/sd/source/console/PresenterHelper.cxx
similarity index 100%
rename from sdext/source/presenter/PresenterHelper.cxx
rename to sd/source/console/PresenterHelper.cxx
diff --git a/sdext/source/presenter/PresenterHelper.hxx
b/sd/source/console/PresenterHelper.hxx
similarity index 100%
rename from sdext/source/presenter/PresenterHelper.hxx
rename to sd/source/console/PresenterHelper.hxx
diff --git a/sdext/source/presenter/PresenterNotesView.cxx
b/sd/source/console/PresenterNotesView.cxx
similarity index 100%
rename from sdext/source/presenter/PresenterNotesView.cxx
rename to sd/source/console/PresenterNotesView.cxx
diff --git a/sdext/source/presenter/PresenterNotesView.hxx
b/sd/source/console/PresenterNotesView.hxx
similarity index 100%
rename from sdext/source/presenter/PresenterNotesView.hxx
rename to sd/source/console/PresenterNotesView.hxx
diff --git a/sdext/source/presenter/PresenterPaintManager.cxx
b/sd/source/console/PresenterPaintManager.cxx
similarity index 100%
rename from sdext/source/presenter/PresenterPaintManager.cxx
rename to sd/source/console/PresenterPaintManager.cxx
diff --git a/sdext/source/presenter/PresenterPaintManager.hxx
b/sd/source/console/PresenterPaintManager.hxx
similarity index 100%
rename from sdext/source/presenter/PresenterPaintManager.hxx
rename to sd/source/console/PresenterPaintManager.hxx
diff --git a/sdext/source/presenter/PresenterPane.cxx
b/sd/source/console/PresenterPane.cxx
similarity index 100%
rename from sdext/source/presenter/PresenterPane.cxx
rename to sd/source/console/PresenterPane.cxx
diff --git a/sdext/source/presenter/PresenterPane.hxx
b/sd/source/console/PresenterPane.hxx
similarity index 100%
rename from sdext/source/presenter/PresenterPane.hxx
rename to sd/source/console/PresenterPane.hxx
diff --git a/sdext/source/presenter/PresenterPaneBase.cxx
b/sd/source/console/PresenterPaneBase.cxx
similarity index 100%
rename from sdext/source/presenter/PresenterPaneBase.cxx
rename to sd/source/console/PresenterPaneBase.cxx
diff --git a/sdext/source/presenter/PresenterPaneBase.hxx
b/sd/source/console/PresenterPaneBase.hxx
similarity index 100%
rename from sdext/source/presenter/PresenterPaneBase.hxx
rename to sd/source/console/PresenterPaneBase.hxx
diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.cxx
b/sd/source/console/PresenterPaneBorderPainter.cxx
similarity index 100%
rename from sdext/source/presenter/PresenterPaneBorderPainter.cxx
rename to sd/source/console/PresenterPaneBorderPainter.cxx
diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.hxx
b/sd/source/console/PresenterPaneBorderPainter.hxx
similarity index 100%
rename from sdext/source/presenter/PresenterPaneBorderPainter.hxx
rename to sd/source/console/PresenterPaneBorderPainter.hxx
diff --git a/sdext/source/presenter/PresenterPaneContainer.cxx
b/sd/source/console/PresenterPaneContainer.cxx
similarity index 100%
rename from sdext/source/presenter/PresenterPaneContainer.cxx
rename to sd/source/console/PresenterPaneContainer.cxx
diff --git a/sdext/source/presenter/PresenterPaneContainer.hxx
b/sd/source/console/PresenterPaneContainer.hxx
similarity index 100%
rename from sdext/source/presenter/PresenterPaneContainer.hxx
rename to sd/source/console/PresenterPaneContainer.hxx
diff --git a/sdext/source/presenter/PresenterPaneFactory.cxx
b/sd/source/console/PresenterPaneFactory.cxx
similarity index 100%
rename from sdext/source/presenter/PresenterPaneFactory.cxx
rename to sd/source/console/PresenterPaneFactory.cxx
diff --git a/sdext/source/presenter/PresenterPaneFactory.hxx
b/sd/source/console/PresenterPaneFactory.hxx
similarity index 100%
rename from sdext/source/presenter/PresenterPaneFactory.hxx
rename to sd/source/console/PresenterPaneFactory.hxx
diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx
b/sd/source/console/PresenterProtocolHandler.cxx
similarity index 99%
rename from sdext/source/presenter/PresenterProtocolHandler.cxx
rename to 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
similarity index 100%
rename from sdext/source/presenter/PresenterProtocolHandler.hxx
rename to sd/source/console/PresenterProtocolHandler.hxx
diff --git a/sdext/source/presenter/PresenterScreen.cxx
b/sd/source/console/PresenterScreen.cxx
similarity index 99%
rename from sdext/source/presenter/PresenterScreen.cxx
rename to 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
similarity index 100%
rename from sdext/source/presenter/PresenterScreen.hxx
rename to sd/source/console/PresenterScreen.hxx
diff --git a/sdext/source/presenter/PresenterScrollBar.cxx
b/sd/source/console/PresenterScrollBar.cxx
similarity index 100%
rename from sdext/source/presenter/PresenterScrollBar.cxx
rename to sd/source/console/PresenterScrollBar.cxx
diff --git a/sdext/source/presenter/PresenterScrollBar.hxx
b/sd/source/console/PresenterScrollBar.hxx
similarity index 100%
rename from sdext/source/presenter/PresenterScrollBar.hxx
rename to sd/source/console/PresenterScrollBar.hxx
diff --git a/sdext/source/presenter/PresenterSlidePreview.cxx
b/sd/source/console/PresenterSlidePreview.cxx
similarity index 100%
rename from sdext/source/presenter/PresenterSlidePreview.cxx
rename to sd/source/console/PresenterSlidePreview.cxx
diff --git a/sdext/source/presenter/PresenterSlidePreview.hxx
b/sd/source/console/PresenterSlidePreview.hxx
similarity index 100%
rename from sdext/source/presenter/PresenterSlidePreview.hxx
rename to sd/source/console/PresenterSlidePreview.hxx
diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx
b/sd/source/console/PresenterSlideShowView.cxx
similarity index 100%
rename from sdext/source/presenter/PresenterSlideShowView.cxx
rename to sd/source/console/PresenterSlideShowView.cxx
diff --git a/sdext/source/presenter/PresenterSlideShowView.hxx
b/sd/source/console/PresenterSlideShowView.hxx
similarity index 100%
rename from sdext/source/presenter/PresenterSlideShowView.hxx
rename to sd/source/console/PresenterSlideShowView.hxx
diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx
b/sd/source/console/PresenterSlideSorter.cxx
similarity index 100%
rename from sdext/source/presenter/PresenterSlideSorter.cxx
rename to sd/source/console/PresenterSlideSorter.cxx
diff --git a/sdext/source/presenter/PresenterSlideSorter.hxx
b/sd/source/console/PresenterSlideSorter.hxx
similarity index 100%
rename from sdext/source/presenter/PresenterSlideSorter.hxx
rename to sd/source/console/PresenterSlideSorter.hxx
diff --git a/sdext/source/presenter/PresenterSprite.cxx
b/sd/source/console/PresenterSprite.cxx
similarity index 100%
rename from sdext/source/presenter/PresenterSprite.cxx
rename to sd/source/console/PresenterSprite.cxx
diff --git a/sdext/source/presenter/PresenterSprite.hxx
b/sd/source/console/PresenterSprite.hxx
similarity index 100%
rename from sdext/source/presenter/PresenterSprite.hxx
rename to sd/source/console/PresenterSprite.hxx
diff --git a/sdext/source/presenter/PresenterSpritePane.cxx
b/sd/source/console/PresenterSpritePane.cxx
similarity index 100%
rename from sdext/source/presenter/PresenterSpritePane.cxx
rename to sd/source/console/PresenterSpritePane.cxx
diff --git a/sdext/source/presenter/PresenterSpritePane.hxx
b/sd/source/console/PresenterSpritePane.hxx
similarity index 100%
rename from sdext/source/presenter/PresenterSpritePane.hxx
rename to sd/source/console/PresenterSpritePane.hxx
diff --git a/sdext/source/presenter/PresenterTextView.cxx
b/sd/source/console/PresenterTextView.cxx
similarity index 100%
rename from sdext/source/presenter/PresenterTextView.cxx
rename to sd/source/console/PresenterTextView.cxx
diff --git a/sdext/source/presenter/PresenterTextView.hxx
b/sd/source/console/PresenterTextView.hxx
similarity index 100%
rename from sdext/source/presenter/PresenterTextView.hxx
rename to sd/source/console/PresenterTextView.hxx
diff --git a/sdext/source/presenter/PresenterTheme.cxx
b/sd/source/console/PresenterTheme.cxx
similarity index 100%
rename from sdext/source/presenter/PresenterTheme.cxx
rename to sd/source/console/PresenterTheme.cxx
diff --git a/sdext/source/presenter/PresenterTheme.hxx
b/sd/source/console/PresenterTheme.hxx
similarity index 100%
rename from sdext/source/presenter/PresenterTheme.hxx
rename to sd/source/console/PresenterTheme.hxx
diff --git a/sdext/source/presenter/PresenterTimer.cxx
b/sd/source/console/PresenterTimer.cxx
similarity index 100%
rename from sdext/source/presenter/PresenterTimer.cxx
rename to sd/source/console/PresenterTimer.cxx
diff --git a/sdext/source/presenter/PresenterTimer.hxx
b/sd/source/console/PresenterTimer.hxx
similarity index 100%
rename from sdext/source/presenter/PresenterTimer.hxx
rename to sd/source/console/PresenterTimer.hxx
diff --git a/sdext/source/presenter/PresenterToolBar.cxx
b/sd/source/console/PresenterToolBar.cxx
similarity index 100%
rename from sdext/source/presenter/PresenterToolBar.cxx
rename to sd/source/console/PresenterToolBar.cxx
diff --git a/sdext/source/presenter/PresenterToolBar.hxx
b/sd/source/console/PresenterToolBar.hxx
similarity index 100%
rename from sdext/source/presenter/PresenterToolBar.hxx
rename to sd/source/console/PresenterToolBar.hxx
diff --git a/sdext/source/presenter/PresenterUIPainter.cxx
b/sd/source/console/PresenterUIPainter.cxx
similarity index 100%
rename from sdext/source/presenter/PresenterUIPainter.cxx
rename to sd/source/console/PresenterUIPainter.cxx
diff --git a/sdext/source/presenter/PresenterUIPainter.hxx
b/sd/source/console/PresenterUIPainter.hxx
similarity index 100%
rename from sdext/source/presenter/PresenterUIPainter.hxx
rename to sd/source/console/PresenterUIPainter.hxx
diff --git a/sdext/source/presenter/PresenterViewFactory.cxx
b/sd/source/console/PresenterViewFactory.cxx
similarity index 100%
rename from sdext/source/presenter/PresenterViewFactory.cxx
rename to sd/source/console/PresenterViewFactory.cxx
diff --git a/sdext/source/presenter/PresenterViewFactory.hxx
b/sd/source/console/PresenterViewFactory.hxx
similarity index 100%
rename from sdext/source/presenter/PresenterViewFactory.hxx
rename to sd/source/console/PresenterViewFactory.hxx
diff --git a/sdext/source/presenter/PresenterWindowManager.cxx
b/sd/source/console/PresenterWindowManager.cxx
similarity index 100%
rename from sdext/source/presenter/PresenterWindowManager.cxx
rename to sd/source/console/PresenterWindowManager.cxx
diff --git a/sdext/source/presenter/PresenterWindowManager.hxx
b/sd/source/console/PresenterWindowManager.hxx
similarity index 100%
rename from sdext/source/presenter/PresenterWindowManager.hxx
rename to sd/source/console/PresenterWindowManager.hxx
diff --git a/sdext/source/presenter/presenter.component
b/sd/source/console/presenter.component
similarity index 82%
rename from sdext/source/presenter/presenter.component
rename to 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
@@ -9,10 +9,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
