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.grandin@collabora.co.uk>

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 :

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());

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));

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>

sdext/Library_PresenterScreen.mk

@@ -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:

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 \
 ))

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