sd/inc/PresenterHelper.hxx | 9 +++------
sd/source/console/PresenterBitmapContainer.cxx | 11 ++---------
sd/source/console/PresenterButton.cxx | 23 +++++++----------------
sd/source/console/PresenterController.cxx | 16 +++++-----------
sd/source/console/PresenterController.hxx | 5 +++--
sd/source/console/PresenterNotesView.cxx | 2 +-
sd/source/console/PresenterPane.cxx | 9 ++-------
sd/source/console/PresenterPaneBorderPainter.cxx | 11 ++---------
sd/source/console/PresenterPaneContainer.cxx | 11 ++---------
sd/source/console/PresenterScrollBar.cxx | 23 +++++++----------------
sd/source/console/PresenterSlideShowView.cxx | 8 ++------
sd/source/console/PresenterSpritePane.cxx | 9 ++-------
sd/source/console/PresenterTheme.cxx | 11 ++---------
sd/source/ui/presenter/PresenterHelper.cxx | 21 ---------------------
sd/util/sd.component | 4 ----
solenv/bin/native-code.py | 1 -
vcl/workben/cgmfuzzer.cxx | 2 --
17 files changed, 40 insertions(+), 136 deletions(-)
New commits:
commit 9bb7e3bdb4facb5d04550fbdd187d2df34fa0892
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Wed Feb 26 16:01:59 2025 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu Feb 27 07:58:16 2025 +0100
sd presenter: Use rtl::Ref for PresenterController::mxPresenterHelper
... now that it's known to be an sd::presenter::PresenterHelper
after
Change-Id: I9e65b907eca64c0abcafee3423fb21d2a657d850
Author: Michael Weghorn <m.wegh...@posteo.de>
Date: Wed Feb 26 15:18:51 2025 +0100
sd presenter: Call PresenterHelper ctor directly, drop service
Similar simplification is possible elsewhere to continue the
cleanup mentioned in offapi/com/sun/star/drawing/XPresenterHelper.idl:
/** This interface is a collection of functions that were necessary to
implement larger parts of the presenter screen as extension. The
methods of this interface give access to services that could only be
implemented in the Office core, not in an extension.
<p>As the presenter screen is no extension any more, this hack can
go again;
it just needs clean-up.</p>
*/
Change-Id: I807bc1ba0d4253329813190ca89cde93bb8f64b4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182240
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/sd/source/console/PresenterController.cxx
b/sd/source/console/PresenterController.cxx
index 0e34ab15aa5b..56786d3b9cf5 100644
--- a/sd/source/console/PresenterController.cxx
+++ b/sd/source/console/PresenterController.cxx
@@ -32,7 +32,6 @@
#include "PresenterTheme.hxx"
#include "PresenterViewFactory.hxx"
#include "PresenterWindowManager.hxx"
-#include <PresenterHelper.hxx>
#include <DrawController.hxx>
#include <com/sun/star/awt/Key.hpp>
@@ -218,10 +217,9 @@ void PresenterController::disposing()
}
mpCanvasHelper.reset();
{
- Reference<lang::XComponent> xComponent (mxPresenterHelper, UNO_QUERY);
- mxPresenterHelper = nullptr;
- if (xComponent.is())
- xComponent->dispose();
+ if (mxPresenterHelper.is())
+ mxPresenterHelper->dispose();
+ mxPresenterHelper.clear();
}
mpPaintManager.reset();
mnPendingSlideNumber = -1;
@@ -460,8 +458,7 @@ const std::shared_ptr<PresenterCanvasHelper>&
PresenterController::GetCanvasHelp
{
return mpCanvasHelper;
}
-
-const Reference<drawing::XPresenterHelper>&
PresenterController::GetPresenterHelper() const
+const rtl::Reference<sd::presenter::PresenterHelper>&
PresenterController::GetPresenterHelper() const
{
return mxPresenterHelper;
}
diff --git a/sd/source/console/PresenterController.hxx
b/sd/source/console/PresenterController.hxx
index c4a7d22b6096..c680a828391b 100644
--- a/sd/source/console/PresenterController.hxx
+++ b/sd/source/console/PresenterController.hxx
@@ -23,6 +23,7 @@
#include "PresenterAccessibility.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>
@@ -108,7 +109,7 @@ public:
const rtl::Reference<PresenterPaneContainer>& GetPaneContainer() const;
const ::rtl::Reference<PresenterPaneBorderPainter>& GetPaneBorderPainter()
const;
const std::shared_ptr<PresenterCanvasHelper>& GetCanvasHelper() const;
- const css::uno::Reference<css::drawing::XPresenterHelper>&
GetPresenterHelper() const;
+ const rtl::Reference<sd::presenter::PresenterHelper>& GetPresenterHelper()
const;
const std::shared_ptr<PresenterPaintManager>& GetPaintManager() const;
double GetSlideAspectRatio() const;
void ShowView (const OUString& rsViewURL);
@@ -196,7 +197,7 @@ private:
css::uno::Reference<css::awt::XWindow> mxMainWindow;
::rtl::Reference<PresenterPaneBorderPainter> mpPaneBorderPainter;
std::shared_ptr<PresenterCanvasHelper> mpCanvasHelper;
- css::uno::Reference<css::drawing::XPresenterHelper> mxPresenterHelper;
+ rtl::Reference<sd::presenter::PresenterHelper> mxPresenterHelper;
std::shared_ptr<PresenterPaintManager> mpPaintManager;
sal_Int32 mnPendingSlideNumber;
css::uno::Reference<css::util::XURLTransformer> mxUrlTransformer;
diff --git a/sd/source/console/PresenterNotesView.cxx
b/sd/source/console/PresenterNotesView.cxx
index f82fd1106564..edfd581c9e9a 100644
--- a/sd/source/console/PresenterNotesView.cxx
+++ b/sd/source/console/PresenterNotesView.cxx
@@ -172,7 +172,7 @@ void PresenterNotesView::CreateToolBar (
if (!rpPresenterController)
return;
- Reference<drawing::XPresenterHelper> xPresenterHelper (
+ rtl::Reference<sd::presenter::PresenterHelper> xPresenterHelper (
rpPresenterController->GetPresenterHelper());
if ( ! xPresenterHelper.is())
return;
commit 6817c8de91905ebb0647b8a9b556827a44d60198
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Wed Feb 26 15:18:51 2025 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu Feb 27 07:58:09 2025 +0100
sd presenter: Call PresenterHelper ctor directly, drop service
Instead of creating instances of sd::presenter::PresenterHelper
by using a "com.sun.star.drawing.PresenterHelper" service
and a factory to create them, call the ctor directly.
Drop the now unused service/component.
The use of UNO abstraction seems to be historical only, see the
/** This interface is a collection of functions that were necessary to
implement larger parts of the presenter screen as extension. The
methods of this interface give access to services that could only be
implemented in the Office core, not in an extension.
<p>As the presenter screen is no extension any more, this hack can
go again;
it just needs clean-up.</p>
*/
comment in offapi/com/sun/star/drawing/XPresenterHelper.idl,
introduced with
commit ea91c7d90d74e1ca039ba669b5d3e14fa359c0fa
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Nov 21 17:19:28 2012 +0100
Turn presenter screen from bundled extension to plain code
Change-Id: I9e65b907eca64c0abcafee3423fb21d2a657d850
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182239
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/sd/inc/PresenterHelper.hxx b/sd/inc/PresenterHelper.hxx
index 5450447dd60e..eff88a549c4c 100644
--- a/sd/inc/PresenterHelper.hxx
+++ b/sd/inc/PresenterHelper.hxx
@@ -19,6 +19,8 @@
#pragma once
+#include "sddllapi.h"
+
#include <com/sun/star/drawing/XPresenterHelper.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -30,14 +32,13 @@ namespace sd::presenter {
typedef comphelper::WeakComponentImplHelper<
css::lang::XInitialization,
- css::lang::XServiceInfo,
css::drawing::XPresenterHelper
> PresenterHelperInterfaceBase;
/** Implementation of the XPresenterHelper interface: functionality that can
not be implemented in an extension.
*/
-class PresenterHelper final
+class SD_DLLPUBLIC PresenterHelper final
: public PresenterHelperInterfaceBase
{
public:
@@ -50,10 +51,6 @@ public:
virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>&
rArguments) override;
- OUString SAL_CALL getImplementationName() override;
- sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override;
- css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
-
// XPresenterHelper
virtual css::uno::Reference<css::awt::XWindow> SAL_CALL createWindow (
diff --git a/sd/source/console/PresenterBitmapContainer.cxx
b/sd/source/console/PresenterBitmapContainer.cxx
index da2aa2e2072f..85b3ece375e8 100644
--- a/sd/source/console/PresenterBitmapContainer.cxx
+++ b/sd/source/console/PresenterBitmapContainer.cxx
@@ -19,6 +19,7 @@
#include "PresenterBitmapContainer.hxx"
#include "PresenterConfigurationAccess.hxx"
+#include <PresenterHelper.hxx>
#include <com/sun/star/drawing/XPresenterHelper.hpp>
#include <com/sun/star/lang/XMultiComponentFactory.hpp>
@@ -79,15 +80,7 @@ void PresenterBitmapContainer::Initialize (
// Create an object that is able to load the bitmaps in a format that is
// supported by the canvas.
- Reference<lang::XMultiComponentFactory> xFactory =
- rxComponentContext->getServiceManager();
- if ( ! xFactory.is())
- return;
- mxPresenterHelper.set(
- xFactory->createInstanceWithContext(
- u"com.sun.star.drawing.PresenterHelper"_ustr,
- rxComponentContext),
- UNO_QUERY_THROW);
+ mxPresenterHelper = new sd::presenter::PresenterHelper(rxComponentContext);
}
PresenterBitmapContainer::~PresenterBitmapContainer()
diff --git a/sd/source/console/PresenterButton.cxx
b/sd/source/console/PresenterButton.cxx
index 148ae0cde58f..dde10334dabb 100644
--- a/sd/source/console/PresenterButton.cxx
+++ b/sd/source/console/PresenterButton.cxx
@@ -23,6 +23,7 @@
#include "PresenterGeometryHelper.hxx"
#include "PresenterPaintManager.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/drawing/XPresenterHelper.hpp>
@@ -102,22 +103,12 @@ PresenterButton::PresenterButton (
{
try
{
- Reference<lang::XMultiComponentFactory> xFactory
(rxComponentContext->getServiceManager());
- if ( ! xFactory.is())
- throw RuntimeException();
-
- mxPresenterHelper.set(
- xFactory->createInstanceWithContext(
- u"com.sun.star.comp.Draw.PresenterHelper"_ustr,
- rxComponentContext),
- UNO_QUERY_THROW);
-
- if (mxPresenterHelper.is())
- mxWindow = mxPresenterHelper->createWindow(rxParentWindow,
- false,
- false,
- false,
- false);
+ mxPresenterHelper = new
sd::presenter::PresenterHelper(rxComponentContext);
+ mxWindow = mxPresenterHelper->createWindow(rxParentWindow,
+ false,
+ false,
+ false,
+ false);
// Make the background transparent.
Reference<awt::XWindowPeer> xPeer (mxWindow, UNO_QUERY_THROW);
diff --git a/sd/source/console/PresenterController.cxx
b/sd/source/console/PresenterController.cxx
index 53729505e5ad..0e34ab15aa5b 100644
--- a/sd/source/console/PresenterController.cxx
+++ b/sd/source/console/PresenterController.cxx
@@ -32,6 +32,7 @@
#include "PresenterTheme.hxx"
#include "PresenterViewFactory.hxx"
#include "PresenterWindowManager.hxx"
+#include <PresenterHelper.hxx>
#include <DrawController.hxx>
#include <com/sun/star/awt/Key.hpp>
@@ -146,11 +147,7 @@ PresenterController::PresenterController (
rxContext->getServiceManager();
if ( ! xFactory.is())
return;
- mxPresenterHelper.set(
- xFactory->createInstanceWithContext(
- u"com.sun.star.drawing.PresenterHelper"_ustr,
- rxContext),
- UNO_QUERY_THROW);
+ mxPresenterHelper = new sd::presenter::PresenterHelper(rxContext);
if (mxSlideShowController.is())
{
diff --git a/sd/source/console/PresenterPane.cxx
b/sd/source/console/PresenterPane.cxx
index 997c610fee59..1f300ef771ea 100644
--- a/sd/source/console/PresenterPane.cxx
+++ b/sd/source/console/PresenterPane.cxx
@@ -20,6 +20,7 @@
#include "PresenterPane.hxx"
#include "PresenterController.hxx"
#include "PresenterPaintManager.hxx"
+#include <PresenterHelper.hxx>
#include <com/sun/star/lang/XMultiComponentFactory.hpp>
using namespace ::com::sun::star;
@@ -34,13 +35,7 @@ PresenterPane::PresenterPane (
const ::rtl::Reference<PresenterController>& rpPresenterController)
: PresenterPaneBase(rxContext, rpPresenterController)
{
- Reference<lang::XMultiComponentFactory> xFactory (
- mxComponentContext->getServiceManager(), UNO_SET_THROW);
- mxPresenterHelper.set(
- xFactory->createInstanceWithContext(
- u"com.sun.star.comp.Draw.PresenterHelper"_ustr,
- mxComponentContext),
- UNO_QUERY_THROW);
+ mxPresenterHelper = new sd::presenter::PresenterHelper(mxComponentContext);
}
PresenterPane::~PresenterPane()
diff --git a/sd/source/console/PresenterPaneBorderPainter.cxx
b/sd/source/console/PresenterPaneBorderPainter.cxx
index 4d32f7942a40..4e7e932c0118 100644
--- a/sd/source/console/PresenterPaneBorderPainter.cxx
+++ b/sd/source/console/PresenterPaneBorderPainter.cxx
@@ -21,6 +21,7 @@
#include "PresenterCanvasHelper.hxx"
#include "PresenterGeometryHelper.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/drawing/XPresenterHelper.hpp>
@@ -370,15 +371,7 @@ PresenterPaneBorderPainter::Renderer::Renderer (
maViewState(geometry::AffineMatrix2D(1,0,0, 0,1,0), nullptr),
mbHasCallout(false)
{
- Reference<lang::XMultiComponentFactory> xFactory
(rxContext->getServiceManager());
- if (xFactory.is())
- {
- mxPresenterHelper.set(
- xFactory->createInstanceWithContext(
- u"com.sun.star.comp.Draw.PresenterHelper"_ustr,
- rxContext),
- UNO_QUERY_THROW);
- }
+ mxPresenterHelper = new sd::presenter::PresenterHelper(rxContext);
}
void PresenterPaneBorderPainter::Renderer::SetCanvas (const
Reference<rendering::XCanvas>& rxCanvas)
diff --git a/sd/source/console/PresenterPaneContainer.cxx
b/sd/source/console/PresenterPaneContainer.cxx
index ba8f8e53c6ca..5b4b66b54897 100644
--- a/sd/source/console/PresenterPaneContainer.cxx
+++ b/sd/source/console/PresenterPaneContainer.cxx
@@ -19,6 +19,7 @@
#include "PresenterPaneContainer.hxx"
#include "PresenterPaneBase.hxx"
+#include <PresenterHelper.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -30,15 +31,7 @@ PresenterPaneContainer::PresenterPaneContainer (
const Reference<XComponentContext>& rxContext)
: PresenterPaneContainerInterfaceBase(m_aMutex)
{
- Reference<lang::XMultiComponentFactory> xFactory
(rxContext->getServiceManager());
- if (xFactory.is())
- {
- mxPresenterHelper.set(
- xFactory->createInstanceWithContext(
- u"com.sun.star.comp.Draw.PresenterHelper"_ustr,
- rxContext),
- UNO_QUERY_THROW);
- }
+ mxPresenterHelper = new sd::presenter::PresenterHelper(rxContext);
}
PresenterPaneContainer::~PresenterPaneContainer()
diff --git a/sd/source/console/PresenterScrollBar.cxx
b/sd/source/console/PresenterScrollBar.cxx
index 0464ab2beddd..154fa02f9e19 100644
--- a/sd/source/console/PresenterScrollBar.cxx
+++ b/sd/source/console/PresenterScrollBar.cxx
@@ -24,6 +24,7 @@
#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>
@@ -88,22 +89,12 @@ PresenterScrollBar::PresenterScrollBar (
{
try
{
- Reference<lang::XMultiComponentFactory> xFactory
(rxComponentContext->getServiceManager());
- if ( ! xFactory.is())
- throw RuntimeException();
-
- mxPresenterHelper.set(
- xFactory->createInstanceWithContext(
- u"com.sun.star.comp.Draw.PresenterHelper"_ustr,
- rxComponentContext),
- UNO_QUERY_THROW);
-
- if (mxPresenterHelper.is())
- mxWindow = mxPresenterHelper->createWindow(rxParentWindow,
- false,
- false,
- false,
- false);
+ mxPresenterHelper = new
sd::presenter::PresenterHelper(rxComponentContext);
+ mxWindow = mxPresenterHelper->createWindow(rxParentWindow,
+ false,
+ false,
+ false,
+ false);
// Make the background transparent. The slide show paints its own
background.
Reference<awt::XWindowPeer> xPeer (mxWindow, UNO_QUERY_THROW);
diff --git a/sd/source/console/PresenterSlideShowView.cxx
b/sd/source/console/PresenterSlideShowView.cxx
index 5f461a968679..5a068e8d7e66 100644
--- a/sd/source/console/PresenterSlideShowView.cxx
+++ b/sd/source/console/PresenterSlideShowView.cxx
@@ -22,6 +22,7 @@
#include "PresenterCanvasHelper.hxx"
#include "PresenterGeometryHelper.hxx"
#include "PresenterPaneContainer.hxx"
+#include <PresenterHelper.hxx>
#include <DrawController.hxx>
#include <com/sun/star/awt/InvalidateStyle.hpp>
#include <com/sun/star/awt/PosSize.hpp>
@@ -106,12 +107,7 @@ void PresenterSlideShowView::LateInit()
Reference<lang::XComponent> xSlideShowComponent (mxSlideShow, UNO_QUERY);
xSlideShowComponent->addEventListener(static_cast<awt::XWindowListener*>(this));
- Reference<lang::XMultiComponentFactory> xFactory (
- mxComponentContext->getServiceManager(), UNO_SET_THROW);
- mxPresenterHelper.set (xFactory->createInstanceWithContext(
- u"com.sun.star.comp.Draw.PresenterHelper"_ustr,
- mxComponentContext),
- UNO_QUERY_THROW);
+ mxPresenterHelper = new sd::presenter::PresenterHelper(mxComponentContext);
// Use view id and controller to retrieve window and canvas from
// configuration controller.
diff --git a/sd/source/console/PresenterSpritePane.cxx
b/sd/source/console/PresenterSpritePane.cxx
index 594addcd4309..f89554fe88fc 100644
--- a/sd/source/console/PresenterSpritePane.cxx
+++ b/sd/source/console/PresenterSpritePane.cxx
@@ -19,6 +19,7 @@
#include "PresenterController.hxx"
#include "PresenterSpritePane.hxx"
+#include <PresenterHelper.hxx>
#include <com/sun/star/lang/XMultiComponentFactory.hpp>
using namespace ::com::sun::star;
@@ -33,13 +34,7 @@ PresenterSpritePane::PresenterSpritePane (const
Reference<XComponentContext>& rx
: PresenterPaneBase(rxContext, rpPresenterController),
mpSprite(std::make_shared<PresenterSprite>())
{
- Reference<lang::XMultiComponentFactory> xFactory (
- mxComponentContext->getServiceManager(), UNO_SET_THROW);
- mxPresenterHelper.set(
- xFactory->createInstanceWithContext(
- u"com.sun.star.comp.Draw.PresenterHelper"_ustr,
- mxComponentContext),
- UNO_QUERY_THROW);
+ mxPresenterHelper = new sd::presenter::PresenterHelper(mxComponentContext);
}
PresenterSpritePane::~PresenterSpritePane()
diff --git a/sd/source/console/PresenterTheme.cxx
b/sd/source/console/PresenterTheme.cxx
index ef8cd5a3a29d..5abfb283302f 100644
--- a/sd/source/console/PresenterTheme.cxx
+++ b/sd/source/console/PresenterTheme.cxx
@@ -21,6 +21,7 @@
#include "PresenterBitmapContainer.hxx"
#include "PresenterCanvasHelper.hxx"
#include "PresenterConfigurationAccess.hxx"
+#include <PresenterHelper.hxx>
#include <com/sun/star/drawing/XPresenterHelper.hpp>
#include <com/sun/star/rendering/PanoseWeight.hpp>
#include <osl/diagnose.h>
@@ -651,15 +652,7 @@ ReadContext::ReadContext (
: mxComponentContext(rxContext),
mxCanvas(rxCanvas)
{
- Reference<lang::XMultiComponentFactory> xFactory
(rxContext->getServiceManager());
- if (xFactory.is())
- {
- mxPresenterHelper.set(
- xFactory->createInstanceWithContext(
- u"com.sun.star.comp.Draw.PresenterHelper"_ustr,
- rxContext),
- UNO_QUERY_THROW);
- }
+ mxPresenterHelper = new sd::presenter::PresenterHelper(rxContext);
}
PresenterTheme::SharedFontDescriptor ReadContext::ReadFont (
diff --git a/sd/source/ui/presenter/PresenterHelper.cxx
b/sd/source/ui/presenter/PresenterHelper.cxx
index b22bbe02e53b..4a8e9b2edbe7 100644
--- a/sd/source/ui/presenter/PresenterHelper.cxx
+++ b/sd/source/ui/presenter/PresenterHelper.cxx
@@ -55,18 +55,6 @@ PresenterHelper::~PresenterHelper()
void SAL_CALL PresenterHelper::initialize (const Sequence<Any>&) {}
-OUString PresenterHelper::getImplementationName() {
- return u"com.sun.star.comp.Draw.PresenterHelper"_ustr;
-}
-
-sal_Bool PresenterHelper::supportsService(OUString const & ServiceName) {
- return cppu::supportsService(this, ServiceName);
-}
-
-css::uno::Sequence<OUString> PresenterHelper::getSupportedServiceNames() {
- return {u"com.sun.star.drawing.PresenterHelper"_ustr};
-}
-
//----- XPaneHelper ----------------------------------------------------
Reference<awt::XWindow> SAL_CALL PresenterHelper::createWindow (
@@ -467,13 +455,4 @@ awt::Rectangle PresenterHelper::getWindowExtentsRelative (
} // end of namespace ::sd::presenter
-
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
-com_sun_star_comp_Draw_PresenterHelper_get_implementation(css::uno::XComponentContext*
context,
-
css::uno::Sequence<css::uno::Any> const &)
-{
- return cppu::acquire(new sd::presenter::PresenterHelper(context));
-}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/util/sd.component b/sd/util/sd.component
index 24f54893bbd6..83daaadc9fca 100644
--- a/sd/util/sd.component
+++ b/sd/util/sd.component
@@ -33,10 +33,6 @@
<service name="com.sun.star.drawing.DrawingDocumentFactory"/>
<service name="com.sun.star.presentation.PresentationDocument"/>
</implementation>
- <implementation name="com.sun.star.comp.Draw.PresenterHelper"
- constructor="com_sun_star_comp_Draw_PresenterHelper_get_implementation">
- <service name="com.sun.star.drawing.PresenterHelper"/>
- </implementation>
<implementation name="com.sun.star.comp.Draw.PresenterPreviewCache"
constructor="com_sun_star_comp_Draw_PresenterPreviewCache_get_implementation">
<service name="com.sun.star.drawing.PresenterPreviewCache"/>
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 3992949f2311..993c1ed88d2a 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -694,7 +694,6 @@ draw_constructor_list = [
"sd_DrawingDocument_get_implementation",
"com_sun_star_comp_Draw_DrawingModule_get_implementation",
"sd_PresentationDocument_get_implementation",
- "com_sun_star_comp_Draw_PresenterHelper_get_implementation",
"com_sun_star_comp_Draw_PresenterPreviewCache_get_implementation",
"com_sun_star_comp_Draw_SlideRenderer_get_implementation",
"com_sun_star_comp_sd_InsertSlideController_get_implementation",
diff --git a/vcl/workben/cgmfuzzer.cxx b/vcl/workben/cgmfuzzer.cxx
index 993937adba53..f2f3ae968f57 100644
--- a/vcl/workben/cgmfuzzer.cxx
+++ b/vcl/workben/cgmfuzzer.cxx
@@ -58,7 +58,6 @@ void linguistic_GrammarCheckingIterator_get_implementation(
void );
void sd_DrawingDocument_get_implementation( void );
void com_sun_star_comp_Draw_DrawingModule_get_implementation( void );
void sd_PresentationDocument_get_implementation( void );
-void com_sun_star_comp_Draw_PresenterHelper_get_implementation( void );
void com_sun_star_comp_Draw_PresenterPreviewCache_get_implementation( void );
void com_sun_star_comp_Draw_SlideRenderer_get_implementation( void );
void com_sun_star_comp_sd_InsertSlideController_get_implementation( void );
@@ -128,7 +127,6 @@ lo_get_constructor_map(void)
{ "sd_DrawingDocument_get_implementation",
sd_DrawingDocument_get_implementation },
{ "com_sun_star_comp_Draw_DrawingModule_get_implementation",
com_sun_star_comp_Draw_DrawingModule_get_implementation },
{ "sd_PresentationDocument_get_implementation",
sd_PresentationDocument_get_implementation },
- { "com_sun_star_comp_Draw_PresenterHelper_get_implementation",
com_sun_star_comp_Draw_PresenterHelper_get_implementation },
{ "com_sun_star_comp_Draw_PresenterPreviewCache_get_implementation",
com_sun_star_comp_Draw_PresenterPreviewCache_get_implementation },
{ "com_sun_star_comp_Draw_SlideRenderer_get_implementation",
com_sun_star_comp_Draw_SlideRenderer_get_implementation },
{ "com_sun_star_comp_sd_InsertSlideController_get_implementation",
com_sun_star_comp_sd_InsertSlideController_get_implementation },
