sd: Move some presenter console helper classes to Library_sdui

These classes are only used by the presenter console implementation in sd/source/console/, so move the classes there as well, which implies moving them from Library_sd to Library_sdui and no longer having to have PresenterHelper.hxx in an sd-wide internal include directory and there is no more need for PresenterHelper to be SD_DLLPUBLIC. In other words: Make clear these are implementation details of the presenter console, and not used elsewhere. Change-Id: Ica2a516215344360f647c121b5f0942a67f54ea3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/208744 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Tested-by: Jenkins
2026-07-28 23:36:25 +02:00
parent 232d10d8f6
commit a8e8ff5dcc
25 changed files with 33 additions and 29 deletions
@@ -1192,7 +1192,7 @@ void UseUniquePtr::CheckDeleteParmVar(const CXXDeleteExpr* deleteExpr, const Par
    if (fn == SRCDIR "/sd/source/ui/framework/tools/FrameworkHelper.cxx")
        return;
    // actually held via shared_ptr, uses protected deleter object
-    if (fn == SRCDIR "/sd/source/ui/presenter/CanvasUpdateRequester.cxx")
+    if (fn == SRCDIR "/sd/source/console/CanvasUpdateRequester.cxx")
        return;
    // actually held via shared_ptr, uses protected deleter object
    if (fn == SRCDIR "/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx")
@@ -172,7 +172,7 @@ excludelist:
    sd/source/ui/inc/tools/SlotStateListener.hxx:
    # base class has to be a complete type
    - com/sun/star/frame/XStatusListener.hpp
-    sd/source/ui/presenter/PresenterCanvas.hxx:
+    sd/source/console/PresenterCanvas.hxx:
    # base class has to be a complete type
    - com/sun/star/rendering/XSpriteCanvas.hpp
    - com/sun/star/rendering/XBitmap.hpp
@@ -350,9 +350,6 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
 	sd/source/ui/func/unmovss \
 	sd/source/ui/func/unoaprms \
 	sd/source/ui/func/unprlout \
-	sd/source/ui/presenter/CanvasUpdateRequester \
-	sd/source/ui/presenter/PresenterCanvas \
-	sd/source/ui/presenter/PresenterHelper \
 	sd/source/ui/presenter/PresenterPreviewCache \
 	sd/source/ui/presenter/SlideRenderer \
 	sd/source/ui/sidebar/AllMasterPagesSelector \
@@ -96,9 +96,11 @@ $(eval $(call gb_Library_add_exception_objects,sdui,\
    sd/source/console/AccessibleNotes \
    sd/source/console/AccessibleObject \
    sd/source/console/AccessibleParagraph \
+    sd/source/console/CanvasUpdateRequester \
    sd/source/console/PresenterAccessibility \
    sd/source/console/PresenterBitmapContainer \
    sd/source/console/PresenterButton \
+    sd/source/console/PresenterCanvas \
    sd/source/console/PresenterCanvasHelper \
    sd/source/console/PresenterConfigurationAccess \
    sd/source/console/PresenterController \
@@ -106,6 +108,7 @@ $(eval $(call gb_Library_add_exception_objects,sdui,\
    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 \
@@ -19,7 +19,7 @@

 #include "PresenterBitmapContainer.hxx"
 #include "PresenterConfigurationAccess.hxx"
-#include <PresenterHelper.hxx>
+#include "PresenterHelper.hxx"

 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
 #include <utility>
@@ -19,7 +19,7 @@

 #pragma once

-#include <PresenterHelper.hxx>
+#include "PresenterHelper.hxx"

 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
@@ -20,8 +20,8 @@
 #pragma once

 #include "PresenterBitmapContainer.hxx"
+#include "PresenterHelper.hxx"
 #include "PresenterTheme.hxx"
-#include <PresenterHelper.hxx>
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/awt/XPaintListener.hpp>
 #include <com/sun/star/awt/XMouseListener.hpp>
@@ -20,9 +20,10 @@
 #pragma once

 #include "PresenterAccessibility.hxx"
+#include "PresenterHelper.hxx"
 #include "PresenterPaneContainer.hxx"
 #include "PresenterTheme.hxx"
-#include <PresenterHelper.hxx>
+
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <com/sun/star/awt/XKeyListener.hpp>
@@ -21,8 +21,9 @@

 #include <cstddef>

-#include <PresenterHelper.hxx>
 #include "PresenterCanvas.hxx"
+#include "PresenterHelper.hxx"
+
 #include <cppcanvas/vclfactory.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <com/sun/star/awt/XVclWindowPeer.hpp>
@@ -19,8 +19,6 @@

 #pragma once

-#include "sddllapi.h"
-
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/rendering/XCanvas.hpp>
@@ -31,7 +29,7 @@ namespace com::sun::star::uno { class XComponentContext; }

 namespace sd::presenter {

-class SD_DLLPUBLIC PresenterHelper final
+class PresenterHelper final
 {
 public:
    PresenterHelper() = delete;
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERPAINTMANAGER_HXX
 #define INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERPAINTMANAGER_HXX

-#include <PresenterHelper.hxx>
+#include "PresenterHelper.hxx"

 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/awt/XWindowPeer.hpp>
@@ -19,8 +19,9 @@

 #include "PresenterPane.hxx"
 #include "PresenterController.hxx"
+#include "PresenterHelper.hxx"
 #include "PresenterPaintManager.hxx"
-#include <PresenterHelper.hxx>
+
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>

 using namespace ::com::sun::star;
@@ -19,10 +19,9 @@

 #pragma once

+#include "PresenterHelper.hxx"
 #include "PresenterPaneBorderPainter.hxx"

-#include <PresenterHelper.hxx>
-
 #include <cppuhelper/compbase.hxx>
 #include <com/sun/star/awt/XWindowListener.hpp>
 #include <framework/AbstractPane.hxx>
@@ -20,8 +20,8 @@
 #include "PresenterPaneBorderPainter.hxx"
 #include "PresenterCanvasHelper.hxx"
 #include "PresenterGeometryHelper.hxx"
+#include "PresenterHelper.hxx"
 #include "PresenterTheme.hxx"
-#include <PresenterHelper.hxx>
 #include <com/sun/star/awt/Point.hpp>
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/rendering/CompositeOperation.hpp>
@@ -20,8 +20,9 @@
 #ifndef INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERPANECONTAINER_HXX
 #define INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERPANECONTAINER_HXX

+#include "PresenterHelper.hxx"
 #include "PresenterPaneBase.hxx"
-#include <PresenterHelper.hxx>
+
 #include <com/sun/star/awt/XWindow.hpp>
 #include <ResourceId.hxx>
 #include <framework/AbstractView.hxx>
@@ -21,10 +21,10 @@
 #include "PresenterBitmapContainer.hxx"
 #include "PresenterCanvasHelper.hxx"
 #include "PresenterGeometryHelper.hxx"
+#include "PresenterHelper.hxx"
 #include "PresenterPaintManager.hxx"
 #include "PresenterTimer.hxx"
 #include "PresenterUIPainter.hxx"
-#include <PresenterHelper.hxx>
 #include <com/sun/star/awt/PosSize.hpp>
 #include <com/sun/star/awt/XWindowPeer.hpp>
 #include <com/sun/star/rendering/CompositeOperation.hpp>
@@ -20,7 +20,8 @@
 #pragma once

 #include "PresenterBitmapContainer.hxx"
-#include <PresenterHelper.hxx>
+#include "PresenterHelper.hxx"
+
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/rendering/XCanvas.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
@@ -21,8 +21,8 @@
 #include "PresenterSlideShowView.hxx"
 #include "PresenterCanvasHelper.hxx"
 #include "PresenterGeometryHelper.hxx"
+#include "PresenterHelper.hxx"
 #include "PresenterPaneContainer.hxx"
-#include <PresenterHelper.hxx>
 #include <DrawController.hxx>
 #include <framework/ConfigurationController.hxx>
 #include <strings.hrc>
@@ -18,8 +18,9 @@
 */

 #include "PresenterController.hxx"
+#include "PresenterHelper.hxx"
 #include "PresenterSpritePane.hxx"
-#include <PresenterHelper.hxx>
+
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>

 using namespace ::com::sun::star;
@@ -21,7 +21,8 @@
 #include "PresenterBitmapContainer.hxx"
 #include "PresenterCanvasHelper.hxx"
 #include "PresenterConfigurationAccess.hxx"
-#include <PresenterHelper.hxx>
+#include "PresenterHelper.hxx"
+
 #include <com/sun/star/rendering/PanoseWeight.hpp>
 #include <osl/diagnose.h>
 #include <rtl/ref.hxx>
@@ -9076,7 +9076,6 @@ sd/inc/CustomAnimationPreset.hxx
 sd/inc/EffectMigration.hxx
 sd/inc/FactoryIds.hxx
 sd/inc/OutlinerIterator.hxx
-sd/inc/PresenterHelper.hxx
 sd/inc/PresenterPreviewCache.hxx
 sd/inc/ResourceId.hxx
 sd/inc/SlideRenderer.hxx
@@ -9124,12 +9123,15 @@ sd/source/console/AccessibleObject.cxx
 sd/source/console/AccessibleObject.hxx
 sd/source/console/AccessibleParagraph.cxx
 sd/source/console/AccessibleParagraph.hxx
+sd/source/console/CanvasUpdateRequester.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/PresenterCanvas.cxx
+sd/source/console/PresenterCanvas.hxx
 sd/source/console/PresenterCanvasHelper.cxx
 sd/source/console/PresenterCanvasHelper.hxx
 sd/source/console/PresenterConfigurationAccess.cxx
@@ -9144,6 +9146,8 @@ 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/PresenterHelper.hxx
 sd/source/console/PresenterNotesView.cxx
 sd/source/console/PresenterNotesView.hxx
 sd/source/console/PresenterPaintManager.cxx
@@ -9563,10 +9567,6 @@ sd/source/ui/inc/unoprnms.hxx
 sd/source/ui/inc/unosrch.hxx
 sd/source/ui/inc/unprlout.hxx
 sd/source/ui/inc/vectdlg.hxx
-sd/source/ui/presenter/CanvasUpdateRequester.cxx
-sd/source/ui/presenter/PresenterCanvas.cxx
-sd/source/ui/presenter/PresenterCanvas.hxx
-sd/source/ui/presenter/PresenterHelper.cxx
 sd/source/ui/presenter/PresenterPreviewCache.cxx
 sd/source/ui/presenter/SlideRenderer.cxx
 sd/source/ui/remotecontrol/AvahiNetworkService.cxx