sd/IwyuFilter_sd.yaml | 4
sd/Library_sd.mk | 2
sd/source/ui/presenter/PresenterTextView.cxx | 466 ------------------
sd/source/ui/presenter/PresenterTextView.hxx | 71 --
sd/source/ui/slidesorter/shell/SlideSorterService.cxx | 411 ---------------
sd/source/ui/slidesorter/shell/SlideSorterService.hxx | 153 -----
sd/util/sd.component | 8
solenv/bin/native-code.py | 2
vcl/workben/cgmfuzzer.cxx | 4
9 files changed, 1121 deletions(-)
New commits:
commit cb32938d572777c9a5d75007cc76ba50c5a698eb
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Jan 20 18:33:34 2023 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Jan 20 19:22:26 2023 +0000
[API CHANGE] remove unused SlideSorterService
which was introduced in
commit 8c4d7aa42dd4b3b08c3b4a9e4ba772737b7bd0c4
Author: Kurt Zenker <k...@openoffice.org>
Date: Thu Apr 3 13:42:43 2008 +0000
INTEGRATION: CWS presenterview (1.1.2); FILE ADDED
but does not appear to have ever been actually used.
Change-Id: Icd33f81cfee246fe72a4b9e584f7a6ca96d6e38b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145907
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index e2ec16119adc..86ad12f6a2b9 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -405,7 +405,6 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/slidesorter/model/SlsPageEnumerationProvider \
sd/source/ui/slidesorter/model/SlsVisualState \
sd/source/ui/slidesorter/shell/SlideSorter \
- sd/source/ui/slidesorter/shell/SlideSorterService \
sd/source/ui/slidesorter/shell/SlideSorterViewShell \
sd/source/ui/slidesorter/view/SlideSorterView \
sd/source/ui/slidesorter/view/SlsFramePainter \
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
deleted file mode 100644
index fa65cba421b4..000000000000
--- a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
+++ /dev/null
@@ -1,411 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "SlideSorterService.hxx"
-#include <SlideSorter.hxx>
-#include <controller/SlideSorterController.hxx>
-#include <controller/SlsProperties.hxx>
-#include <controller/SlsCurrentSlideManager.hxx>
-#include <model/SlideSorterModel.hxx>
-#include <model/SlsPageDescriptor.hxx>
-#include <view/SlideSorterView.hxx>
-#include <view/SlsLayouter.hxx>
-#include <DrawController.hxx>
-
-#include <comphelper/servicehelper.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
-
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::drawing::framework;
-using ::sd::slidesorter::view::Layouter;
-
-namespace sd::slidesorter {
-
-//===== SlideSorterService
==========================================================
-
-SlideSorterService::SlideSorterService()
-{
-}
-
-SlideSorterService::~SlideSorterService()
-{
-}
-
-void SlideSorterService::disposing(std::unique_lock<std::mutex>&)
-{
- mpSlideSorter.reset();
-
- if (mxParentWindow.is())
- {
- mxParentWindow->removeWindowListener(this);
- }
-}
-
-//----- XInitialization -------------------------------------------------------
-
-void SAL_CALL SlideSorterService::initialize (const Sequence<Any>& rArguments)
-{
- ThrowIfDisposed();
-
- if (rArguments.getLength() != 3)
- {
- throw RuntimeException("SlideSorterService: invalid number of
arguments",
- static_cast<drawing::XDrawView*>(this));
- }
-
- mxViewId.set(rArguments[0], UNO_QUERY_THROW);
-
- // Get the XController.
- Reference<frame::XController> xController (rArguments[1], UNO_QUERY_THROW);
-
- // Tunnel through the controller to obtain a ViewShellBase.
- ViewShellBase* pBase = nullptr;
- ::sd::DrawController* pController =
dynamic_cast<sd::DrawController*>(xController.get());
- if (pController != nullptr)
- pBase = pController->GetViewShellBase();
-
- // Get the parent window.
- mxParentWindow.set(rArguments[2], UNO_QUERY_THROW);
- VclPtr<vcl::Window> pParentWindow =
VCLUnoHelper::GetWindow(mxParentWindow);
-
- mxParentWindow->addWindowListener(this);
-
- if (pBase != nullptr && pParentWindow)
- mpSlideSorter = SlideSorter::CreateSlideSorter(
- *pBase,
- *pParentWindow);
-
- Resize();
-}
-
-//----- XView -----------------------------------------------------------------
-
-Reference<XResourceId> SAL_CALL SlideSorterService::getResourceId()
-{
- return mxViewId;
-}
-
-sal_Bool SAL_CALL SlideSorterService::isAnchorOnly()
-{
- return false;
-}
-
-//----- XWindowListener -------------------------------------------------------
-
-void SAL_CALL SlideSorterService::windowResized (const awt::WindowEvent&)
-{
- ThrowIfDisposed();
-
- Resize();
-}
-
-void SAL_CALL SlideSorterService::windowMoved (const awt::WindowEvent&) {}
-
-void SAL_CALL SlideSorterService::windowShown (const lang::EventObject&)
-{
- ThrowIfDisposed();
- Resize();
-}
-
-void SAL_CALL SlideSorterService::windowHidden (const lang::EventObject&)
-{
- ThrowIfDisposed();
-}
-
-//----- lang::XEventListener --------------------------------------------------
-
-void SAL_CALL SlideSorterService::disposing (const lang::EventObject& rEvent)
-{
- if (rEvent.Source == mxParentWindow)
- mxParentWindow = nullptr;
-}
-
-//----- XDrawView -------------------------------------------------------------
-
-void SAL_CALL SlideSorterService::setCurrentPage(const
Reference<drawing::XDrawPage>& rxSlide)
-{
- ThrowIfDisposed();
- if (mpSlideSorter != nullptr)
-
mpSlideSorter->GetController().GetCurrentSlideManager()->NotifyCurrentSlideChange(
- mpSlideSorter->GetModel().GetIndex(rxSlide));
-}
-
-Reference<drawing::XDrawPage> SAL_CALL SlideSorterService::getCurrentPage()
-{
- ThrowIfDisposed();
- if (mpSlideSorter != nullptr)
- return
mpSlideSorter->GetController().GetCurrentSlideManager()->GetCurrentSlide()->GetXDrawPage();
- else
- return nullptr;
-}
-
-//----- attributes ------------------------------------------------------------
-
-Reference<container::XIndexAccess> SAL_CALL
SlideSorterService::getDocumentSlides()
-{
- return mpSlideSorter->GetModel().GetDocumentSlides();
-}
-
-void SAL_CALL SlideSorterService::setDocumentSlides (
- const Reference<container::XIndexAccess >& rxSlides)
-{
- ThrowIfDisposed();
- if (mpSlideSorter != nullptr && mpSlideSorter->IsValid())
- mpSlideSorter->GetController().SetDocumentSlides(rxSlides);
-}
-
-sal_Bool SAL_CALL SlideSorterService::getIsHighlightCurrentSlide()
-{
- ThrowIfDisposed();
- if (mpSlideSorter == nullptr || !mpSlideSorter->IsValid())
- return false;
- else
- return mpSlideSorter->GetProperties()->IsHighlightCurrentSlide();
-}
-
-void SAL_CALL SlideSorterService::setIsHighlightCurrentSlide (sal_Bool bValue)
-{
- ThrowIfDisposed();
- if (mpSlideSorter != nullptr && mpSlideSorter->IsValid())
- {
- mpSlideSorter->GetProperties()->SetHighlightCurrentSlide(bValue);
- controller::SlideSorterController::ModelChangeLock aLock
(mpSlideSorter->GetController());
- mpSlideSorter->GetController().HandleModelChange();
- }
-}
-
-sal_Bool SAL_CALL SlideSorterService::getIsShowSelection()
-{
- ThrowIfDisposed();
- if (mpSlideSorter == nullptr || !mpSlideSorter->IsValid())
- return false;
- else
- return mpSlideSorter->GetProperties()->IsShowSelection();
-}
-
-void SAL_CALL SlideSorterService::setIsShowSelection (sal_Bool bValue)
-{
- ThrowIfDisposed();
- if (mpSlideSorter != nullptr && mpSlideSorter->IsValid())
- mpSlideSorter->GetProperties()->SetShowSelection(bValue);
-}
-
-sal_Bool SAL_CALL SlideSorterService::getIsShowFocus()
-{
- ThrowIfDisposed();
- if (mpSlideSorter == nullptr || !mpSlideSorter->IsValid())
- return false;
- else
- return mpSlideSorter->GetProperties()->IsShowFocus();
-}
-
-void SAL_CALL SlideSorterService::setIsShowFocus (sal_Bool bValue)
-{
- ThrowIfDisposed();
- if (mpSlideSorter != nullptr && mpSlideSorter->IsValid())
- mpSlideSorter->GetProperties()->SetShowFocus(bValue);
-}
-
-sal_Bool SAL_CALL SlideSorterService::getIsCenterSelection()
-{
- ThrowIfDisposed();
- if (mpSlideSorter == nullptr || !mpSlideSorter->IsValid())
- return false;
- else
- return mpSlideSorter->GetProperties()->IsCenterSelection();
-}
-
-void SAL_CALL SlideSorterService::setIsCenterSelection (sal_Bool bValue)
-{
- ThrowIfDisposed();
- if (mpSlideSorter != nullptr && mpSlideSorter->IsValid())
- mpSlideSorter->GetProperties()->SetCenterSelection(bValue);
-}
-
-sal_Bool SAL_CALL
SlideSorterService::getIsSuspendPreviewUpdatesDuringFullScreenPresentation()
-{
- ThrowIfDisposed();
- if (mpSlideSorter == nullptr || !mpSlideSorter->IsValid())
- return true;
- else
- return mpSlideSorter->GetProperties()
- ->IsSuspendPreviewUpdatesDuringFullScreenPresentation();
-}
-
-void SAL_CALL
SlideSorterService::setIsSuspendPreviewUpdatesDuringFullScreenPresentation (
- sal_Bool bValue)
-{
- ThrowIfDisposed();
- if (mpSlideSorter != nullptr && mpSlideSorter->IsValid())
- mpSlideSorter->GetProperties()
- ->SetSuspendPreviewUpdatesDuringFullScreenPresentation(bValue);
-}
-
-sal_Bool SAL_CALL SlideSorterService::getIsOrientationVertical()
-{
- ThrowIfDisposed();
- if (mpSlideSorter == nullptr || !mpSlideSorter->IsValid())
- return true;
- else
- return mpSlideSorter->GetView().GetOrientation() !=
Layouter::HORIZONTAL;
-}
-
-void SAL_CALL SlideSorterService::setIsOrientationVertical (sal_Bool bValue)
-{
- ThrowIfDisposed();
- if (mpSlideSorter != nullptr && mpSlideSorter->IsValid())
- mpSlideSorter->GetView().SetOrientation(bValue
- ? Layouter::GRID
- : Layouter::HORIZONTAL);
-}
-
-sal_Bool SAL_CALL SlideSorterService::getIsSmoothScrolling()
-{
- ThrowIfDisposed();
- if (mpSlideSorter == nullptr || !mpSlideSorter->IsValid())
- return false;
- else
- return mpSlideSorter->GetProperties()->IsSmoothSelectionScrolling();
-}
-
-void SAL_CALL SlideSorterService::setIsSmoothScrolling (sal_Bool bValue)
-{
- ThrowIfDisposed();
- if (mpSlideSorter != nullptr && mpSlideSorter->IsValid())
- mpSlideSorter->GetProperties()->SetSmoothSelectionScrolling(bValue);
-}
-
-sal_Int32 SAL_CALL SlideSorterService::getBackgroundColor()
-{
- ThrowIfDisposed();
- if (mpSlideSorter == nullptr || !mpSlideSorter->IsValid())
- return util::Color();
- else
- return util::Color(
- mpSlideSorter->GetProperties()->GetBackgroundColor());
-}
-
-void SAL_CALL SlideSorterService::setBackgroundColor (sal_Int32
aBackgroundColor)
-{
- ThrowIfDisposed();
- if (mpSlideSorter != nullptr && mpSlideSorter->IsValid())
-
mpSlideSorter->GetProperties()->SetBackgroundColor(Color(ColorTransparency,
aBackgroundColor));
-}
-
-sal_Int32 SAL_CALL SlideSorterService::getTextColor()
-{
- ThrowIfDisposed();
- if (mpSlideSorter == nullptr || !mpSlideSorter->IsValid())
- return util::Color();
- else
- return util::Color(
- mpSlideSorter->GetProperties()->GetTextColor());
-}
-
-void SAL_CALL SlideSorterService::setTextColor (sal_Int32 aTextColor)
-{
- ThrowIfDisposed();
- if (mpSlideSorter != nullptr && mpSlideSorter->IsValid())
- mpSlideSorter->GetProperties()->SetTextColor(Color(ColorTransparency,
aTextColor));
-}
-
-sal_Int32 SAL_CALL SlideSorterService::getSelectionColor()
-{
- ThrowIfDisposed();
- if (mpSlideSorter == nullptr || !mpSlideSorter->IsValid())
- return util::Color();
- else
- return util::Color(
- mpSlideSorter->GetProperties()->GetSelectionColor());
-}
-
-void SAL_CALL SlideSorterService::setSelectionColor (sal_Int32 aSelectionColor)
-{
- ThrowIfDisposed();
- if (mpSlideSorter != nullptr && mpSlideSorter->IsValid())
-
mpSlideSorter->GetProperties()->SetSelectionColor(Color(ColorTransparency,
aSelectionColor));
-}
-
-sal_Int32 SAL_CALL SlideSorterService::getHighlightColor()
-{
- ThrowIfDisposed();
- if (mpSlideSorter == nullptr || !mpSlideSorter->IsValid())
- return util::Color();
- else
- return util::Color(
- mpSlideSorter->GetProperties()->GetHighlightColor());
-}
-
-void SAL_CALL SlideSorterService::setHighlightColor (sal_Int32 aHighlightColor)
-{
- ThrowIfDisposed();
- if (mpSlideSorter != nullptr && mpSlideSorter->IsValid())
-
mpSlideSorter->GetProperties()->SetHighlightColor(Color(ColorTransparency,
aHighlightColor));
-}
-
-sal_Bool SAL_CALL SlideSorterService::getIsUIReadOnly()
-{
- ThrowIfDisposed();
- if (mpSlideSorter == nullptr || !mpSlideSorter->IsValid())
- return true;
- else
- return mpSlideSorter->GetProperties()->IsUIReadOnly();
-}
-
-void SAL_CALL SlideSorterService::setIsUIReadOnly (sal_Bool bIsUIReadOnly)
-{
- ThrowIfDisposed();
- if (mpSlideSorter != nullptr && mpSlideSorter->IsValid())
- mpSlideSorter->GetProperties()->SetUIReadOnly(bIsUIReadOnly);
-}
-
-void SlideSorterService::Resize()
-{
- if (mxParentWindow.is())
- {
- awt::Rectangle aWindowBox = mxParentWindow->getPosSize();
- mpSlideSorter->ArrangeGUIElements(
- Point(0,0),
- Size(aWindowBox.Width, aWindowBox.Height));
- }
-}
-
-void SlideSorterService::ThrowIfDisposed()
-{
- if (SlideSorterServiceInterfaceBase::m_bDisposed)
- {
- throw lang::DisposedException ("SlideSorterService object has already
been disposed",
- static_cast<drawing::XDrawView*>(this));
- }
-}
-
-} // end of namespace ::sd::slidesorter
-
-
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
-com_sun_star_comp_Draw_SlideSorter_get_implementation(css::uno::XComponentContext*
/*context*/,
-
css::uno::Sequence<css::uno::Any> const &)
-{
- return cppu::acquire(new sd::slidesorter::SlideSorterService);
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx
b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx
deleted file mode 100644
index 579a5bae5c33..000000000000
--- a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx
+++ /dev/null
@@ -1,153 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#pragma once
-
-#include <com/sun/star/awt/XWindowListener.hpp>
-#include <com/sun/star/drawing/XSlideSorterBase.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <comphelper/compbase.hxx>
-#include <memory>
-
-namespace com::sun::star::awt { class XWindow; }
-
-namespace sd::slidesorter {
-
-typedef comphelper::WeakComponentImplHelper <
- css::drawing::XSlideSorterBase,
- css::lang::XInitialization,
- css::awt::XWindowListener
-> SlideSorterServiceInterfaceBase;
-
-class SlideSorter;
-
-/** Implementation of the com.sun.star.drawing.SlideSorter service.
-*/
-class SlideSorterService
- : public SlideSorterServiceInterfaceBase
-{
-public:
- explicit SlideSorterService();
- virtual ~SlideSorterService() override;
- SlideSorterService(const SlideSorterService&) = delete;
- SlideSorterService& operator=(const SlideSorterService&) = delete;
- virtual void disposing(std::unique_lock<std::mutex>&) override;
-
- // XInitialization
-
- virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>&
rArguments) override;
-
- // XResourceId
-
- css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL
getResourceId() override;
-
- sal_Bool SAL_CALL isAnchorOnly() override;
-
- // XWindowListener
-
- virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent)
override;
-
- virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent)
override;
-
- virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent)
override;
-
- virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent)
override;
-
- // lang::XEventListener
- virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent)
override;
-
- // XDrawView
-
- virtual void SAL_CALL setCurrentPage(
- const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) override;
-
- virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL
getCurrentPage() override;
-
- // Attributes
-
- virtual css::uno::Reference<css::container::XIndexAccess> SAL_CALL
getDocumentSlides() override;
-
- virtual void SAL_CALL setDocumentSlides (
- const css::uno::Reference<css::container::XIndexAccess >& rxSlides)
override;
-
- virtual sal_Bool SAL_CALL getIsHighlightCurrentSlide() override;
-
- virtual void SAL_CALL setIsHighlightCurrentSlide (sal_Bool
bIsHighlightCurrentSlide) override;
-
- virtual sal_Bool SAL_CALL getIsShowSelection() override;
-
- virtual void SAL_CALL setIsShowSelection (sal_Bool bIsShowSelection)
override;
-
- virtual sal_Bool SAL_CALL getIsCenterSelection() override;
-
- virtual void SAL_CALL setIsCenterSelection (sal_Bool bIsCenterSelection)
override;
-
- virtual sal_Bool SAL_CALL
getIsSuspendPreviewUpdatesDuringFullScreenPresentation() override;
-
- virtual void SAL_CALL
setIsSuspendPreviewUpdatesDuringFullScreenPresentation (
- sal_Bool bIsSuspendPreviewUpdatesDuringFullScreenPresentation)
override;
-
- virtual sal_Bool SAL_CALL getIsOrientationVertical() override;
-
- virtual void SAL_CALL setIsOrientationVertical (sal_Bool
bIsOrientationVertical) override;
-
- virtual sal_Bool SAL_CALL getIsSmoothScrolling() override;
-
- virtual void SAL_CALL setIsSmoothScrolling (sal_Bool
bIsOrientationVertical) override;
-
- virtual sal_Int32 SAL_CALL getBackgroundColor() override;
-
- virtual void SAL_CALL setBackgroundColor (sal_Int32 aBackgroundColor)
override;
-
- virtual sal_Int32 SAL_CALL getTextColor() override;
-
- virtual void SAL_CALL setTextColor (sal_Int32 aTextColor) override;
-
- virtual sal_Int32 SAL_CALL getSelectionColor() override;
-
- virtual void SAL_CALL setSelectionColor (sal_Int32 aSelectionColor)
override;
-
- virtual sal_Int32 SAL_CALL getHighlightColor() override;
-
- virtual void SAL_CALL setHighlightColor (sal_Int32 aHighlightColor)
override;
-
- virtual sal_Bool SAL_CALL getIsUIReadOnly() override;
-
- virtual void SAL_CALL setIsUIReadOnly (sal_Bool bIsUIReadOnly) override;
-
- virtual sal_Bool SAL_CALL getIsShowFocus() override;
-
- virtual void SAL_CALL setIsShowFocus (sal_Bool bIsShowFocus) override;
-
-private:
- std::shared_ptr<SlideSorter> mpSlideSorter;
- css::uno::Reference<css::drawing::framework::XResourceId> mxViewId;
- css::uno::Reference<css::awt::XWindow> mxParentWindow;
-
- void Resize();
-
- /** @throws css::lang::DisposedException when the object has already been
- disposed.
- */
- void ThrowIfDisposed();
-};
-
-} // end of namespace ::sd::slidesorter
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/util/sd.component b/sd/util/sd.component
index 04bd60513491..1d1b1fb6fd05 100644
--- a/sd/util/sd.component
+++ b/sd/util/sd.component
@@ -45,10 +45,6 @@
constructor="com_sun_star_comp_Draw_SlideRenderer_get_implementation">
<service name="com.sun.star.drawing.SlideRenderer"/>
</implementation>
- <implementation name="com.sun.star.comp.Draw.SlideSorter"
- constructor="com_sun_star_comp_Draw_SlideSorter_get_implementation">
- <service name="com.sun.star.drawing.SlideSorter"/>
- </implementation>
<implementation name="com.sun.star.comp.Draw.framework.BasicPaneFactory"
constructor="com_sun_star_comp_Draw_framework_BasicPaneFactory_get_implementation">
<service name="com.sun.star.drawing.framework.BasicPaneFactory"/>
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 03b17d2860b6..f306f0833dc1 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -695,7 +695,6 @@ draw_constructor_list = [
"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_Draw_SlideSorter_get_implementation",
"com_sun_star_comp_Draw_framework_configuration_Configuration_get_implementation",
"com_sun_star_comp_draw_SdHtmlOptionsDialog_get_implementation",
"com_sun_star_comp_sd_InsertSlideController_get_implementation",
diff --git a/vcl/workben/cgmfuzzer.cxx b/vcl/workben/cgmfuzzer.cxx
index a2a9e767be6c..dc677edaa7ed 100644
--- a/vcl/workben/cgmfuzzer.cxx
+++ b/vcl/workben/cgmfuzzer.cxx
@@ -61,7 +61,6 @@ void * sd_PresentationDocument_get_implementation( void *,
void * );
void * com_sun_star_comp_Draw_PresenterHelper_get_implementation( void *, void
* );
void * com_sun_star_comp_Draw_PresenterPreviewCache_get_implementation( void
*, void * );
void * com_sun_star_comp_Draw_SlideRenderer_get_implementation( void *, void *
);
-void * com_sun_star_comp_Draw_SlideSorter_get_implementation( void *, void * );
void *
com_sun_star_comp_Draw_framework_configuration_Configuration_get_implementation(
void *, void * );
void * com_sun_star_comp_draw_SdHtmlOptionsDialog_get_implementation( void *,
void * );
void * com_sun_star_comp_sd_InsertSlideController_get_implementation( void *,
void * );
@@ -134,7 +133,6 @@ lo_get_constructor_map(void)
{ "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_Draw_SlideSorter_get_implementation",
com_sun_star_comp_Draw_SlideSorter_get_implementation },
{
"com_sun_star_comp_Draw_framework_configuration_Configuration_get_implementation",
com_sun_star_comp_Draw_framework_configuration_Configuration_get_implementation
},
{ "com_sun_star_comp_draw_SdHtmlOptionsDialog_get_implementation",
com_sun_star_comp_draw_SdHtmlOptionsDialog_get_implementation },
{ "com_sun_star_comp_sd_InsertSlideController_get_implementation",
com_sun_star_comp_sd_InsertSlideController_get_implementation },
commit 4a72caaae9534cd229186fd952603a4ef736ef45
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Jan 20 15:48:03 2023 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Jan 20 19:22:12 2023 +0000
[API CHANGE] PresenterTextView UNO service is dead
Nothing constructs it, and it looks like it was never fully hooked up,
various bits of it have been removed, starting with
commit a38cbc58bbe3b385830a5287ea272e28a8ae3652
Author: Felix Zhang <fezh...@suse.com>
Date: Mon Oct 24 17:50:01 2011 +0800
remove unused methods from sdext:presenter
Change-Id: I61080fa589ab6b886b841d7be5eed892c4bd829a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145898
Tested-by: Noel Grandin <noel.gran...@collabora.co.uk>
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sd/IwyuFilter_sd.yaml b/sd/IwyuFilter_sd.yaml
index 530cac5249d8..650d975003f7 100644
--- a/sd/IwyuFilter_sd.yaml
+++ b/sd/IwyuFilter_sd.yaml
@@ -274,10 +274,6 @@ excludelist:
- com/sun/star/rendering/XSpriteCanvas.hpp
- com/sun/star/rendering/XBitmap.hpp
- com/sun/star/awt/XWindowListener.hpp
- sd/source/ui/presenter/PresenterTextView.hxx:
- # base class has to be a complete type
- - tools/PropertySet.hxx
- - com/sun/star/lang/XInitialization.hpp
sd/source/ui/presenter/SlideRenderer.hxx:
# base class has to be a complete type
- com/sun/star/drawing/XSlideRenderer.hpp
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 3c60a60b3a3d..e2ec16119adc 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -346,7 +346,6 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/presenter/PresenterCanvas \
sd/source/ui/presenter/PresenterHelper \
sd/source/ui/presenter/PresenterPreviewCache \
- sd/source/ui/presenter/PresenterTextView \
sd/source/ui/presenter/SlideRenderer \
sd/source/ui/sidebar/AllMasterPagesSelector \
sd/source/ui/sidebar/CurrentMasterPagesSelector \
diff --git a/sd/source/ui/presenter/PresenterTextView.cxx
b/sd/source/ui/presenter/PresenterTextView.cxx
deleted file mode 100644
index d8abea74547a..000000000000
--- a/sd/source/ui/presenter/PresenterTextView.cxx
+++ /dev/null
@@ -1,466 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "PresenterTextView.hxx"
-
-#include <i18nlangtag/mslangid.hxx>
-#include <cppcanvas/vclfactory.hxx>
-#include <svl/itempool.hxx>
-#include <unotools/lingucfg.hxx>
-#include <editeng/colritem.hxx>
-#include <editeng/editeng.hxx>
-#include <editeng/editstat.hxx>
-#include <editeng/eeitem.hxx>
-#include <editeng/fhgtitem.hxx>
-#include <editeng/fontitem.hxx>
-#include <vcl/bitmapex.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/virdev.hxx>
-#include <com/sun/star/awt/FontDescriptor.hpp>
-#include <com/sun/star/awt/Size.hpp>
-#include <com/sun/star/rendering/XCanvas.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/i18n/ScriptType.hpp>
-#include <o3tl/string_view.hxx>
-
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-
-constexpr OUStringLiteral gsTextPropertyName(u"Text");
-constexpr OUStringLiteral gsBitmapPropertyName(u"Bitmap");
-constexpr OUStringLiteral gsSizePropertyName(u"Size");
-constexpr OUStringLiteral gsBackgroundColorPropertyName(u"BackgroundColor");
-constexpr OUStringLiteral gsTextColorPropertyName(u"TextColor");
-constexpr OUStringLiteral gsFontDescriptorPropertyName(u"FontDescriptor");
-constexpr OUStringLiteral gsTopPropertyName(u"Top");
-constexpr OUStringLiteral gsTopRelativePropertyName(u"RelativeTop");
-constexpr OUStringLiteral gsTotalHeightPropertyName(u"TotalHeight");
-
-namespace sd::presenter {
-
-// PresenterTextView::Implementation
-class PresenterTextView::Implementation
-{
-public:
- Implementation();
- ~Implementation();
-
- void SetCanvas (const cppcanvas::CanvasSharedPtr& rCanvas);
- void SetSize (const Size aSize);
- void SetBackgroundColor (const Color aColor);
- void SetTextColor (const Color aColor);
- void SetFontDescriptor (const awt::FontDescriptor& rFontDescriptor);
- sal_Int32 GetTop() const { return mnTop;}
- void SetTop (const sal_Int32 nTop);
- void SetText (const OUString& Text);
- sal_Int32 ParseDistance (std::u16string_view sDistance) const;
- Reference<rendering::XBitmap> const & GetBitmap();
- sal_Int32 GetTotalHeight();
-
-private:
- Reference<rendering::XBitmap> mxBitmap;
- cppcanvas::CanvasSharedPtr mpCanvas;
- VclPtr<VirtualDevice> mpOutputDevice;
- std::unique_ptr<EditEngine> mpEditEngine;
- rtl::Reference<SfxItemPool> mpEditEngineItemPool;
- Size maSize;
- OUString msText;
- sal_Int32 mnTop;
- sal_Int32 mnTotalHeight;
-
- void CheckTop();
-};
-
-// PresenterTextView
-PresenterTextView::PresenterTextView ()
- : mpImplementation(new Implementation())
-{
-}
-
-PresenterTextView::~PresenterTextView()
-{
-}
-
-void SAL_CALL PresenterTextView::disposing()
-{
- mpImplementation.reset();
-}
-
-// XInitialization
-void SAL_CALL PresenterTextView::initialize (const Sequence<Any>& rArguments)
-{
- ThrowIfDisposed();
-
- if (rArguments.getLength() != 1)
- {
- throw RuntimeException("PresenterTextView: invalid number of
arguments",
- static_cast<XWeak*>(this));
- }
-
- Reference<rendering::XCanvas> xCanvas (rArguments[0], UNO_QUERY_THROW);
- mpImplementation->SetCanvas(
- cppcanvas::VCLFactory::createCanvas(xCanvas));
-}
-
-Any PresenterTextView::GetPropertyValue (const OUString& rsPropertyName)
-{
- ThrowIfDisposed();
-
- if (rsPropertyName == gsBitmapPropertyName)
- {
- return Any(mpImplementation->GetBitmap());
- }
- else if (rsPropertyName == gsTopPropertyName)
- {
- return Any(mpImplementation->GetTop());
- }
- else if (rsPropertyName == gsTotalHeightPropertyName)
- {
- return Any(mpImplementation->GetTotalHeight());
- }
-
- return Any();
-}
-
-Any PresenterTextView::SetPropertyValue (
- const OUString& rsPropertyName,
- const css::uno::Any& rValue)
-{
- ThrowIfDisposed();
-
- Any aOldValue;
- if (rsPropertyName == gsTextPropertyName)
- {
- OUString sText;
- if (rValue >>= sText)
- mpImplementation->SetText(sText);
- }
- else if (rsPropertyName == gsSizePropertyName)
- {
- awt::Size aSize;
- if (rValue >>= aSize)
- mpImplementation->SetSize(Size(aSize.Width,aSize.Height));
- }
- else if (rsPropertyName == gsBackgroundColorPropertyName)
- {
- ::Color aColor;
- if (rValue >>= aColor)
- mpImplementation->SetBackgroundColor(aColor);
- }
- else if (rsPropertyName == gsTextColorPropertyName)
- {
- ::Color aColor;
- if (rValue >>= aColor)
- mpImplementation->SetTextColor(aColor);
- }
- else if (rsPropertyName == gsFontDescriptorPropertyName)
- {
- awt::FontDescriptor aFontDescriptor;
- if (rValue >>= aFontDescriptor)
- mpImplementation->SetFontDescriptor(aFontDescriptor);
- }
- else if (rsPropertyName == gsTopPropertyName)
- {
- sal_Int32 nTop = 0;
- if (rValue >>= nTop)
- mpImplementation->SetTop(nTop);
- }
- else if (rsPropertyName == gsTopRelativePropertyName)
- {
- OUString sDistance;
- if (rValue >>= sDistance)
- mpImplementation->SetTop(
- mpImplementation->GetTop()
- + mpImplementation->ParseDistance(sDistance));
- }
- return aOldValue;
-}
-
-void PresenterTextView::ThrowIfDisposed()
-{
- if (PresenterTextViewInterfaceBase::rBHelper.bDisposed
- || PresenterTextViewInterfaceBase::rBHelper.bInDispose ||
mpImplementation == nullptr)
- {
- throw lang::DisposedException ("PresenterTextView object has already
been disposed",
- static_cast<uno::XWeak*>(this));
- }
-}
-
-// PresenterTextView::Implementation
-PresenterTextView::Implementation::Implementation()
- :
mpOutputDevice(VclPtr<VirtualDevice>::Create(*Application::GetDefaultDevice(),
DeviceFormat::DEFAULT, DeviceFormat::DEFAULT)),
- mpEditEngineItemPool(EditEngine::CreatePool()),
- maSize(100,100),
- mnTop(0),
- mnTotalHeight(-1)
-{
- mpOutputDevice->SetMapMode(MapMode(MapUnit::MapPixel));
-
- // set fonts to be used
- SvtLinguOptions aOpt;
- SvtLinguConfig().GetOptions( aOpt );
-
- struct FontDta {
- LanguageType nFallbackLang;
- LanguageType nLang;
- DefaultFontType nFontType;
- sal_uInt16 nFontInfoId;
- } aTable[3] =
- {
- // info to get western font to be used
- { LANGUAGE_ENGLISH_US, LANGUAGE_NONE,
- DefaultFontType::SERIF, EE_CHAR_FONTINFO },
- // info to get CJK font to be used
- { LANGUAGE_JAPANESE, LANGUAGE_NONE,
- DefaultFontType::CJK_TEXT, EE_CHAR_FONTINFO_CJK },
- // info to get CTL font to be used
- { LANGUAGE_ARABIC_SAUDI_ARABIA, LANGUAGE_NONE,
- DefaultFontType::CTL_TEXT, EE_CHAR_FONTINFO_CTL }
- };
- aTable[0].nLang =
MsLangId::resolveSystemLanguageByScriptType(aOpt.nDefaultLanguage,
css::i18n::ScriptType::LATIN);
- aTable[1].nLang =
MsLangId::resolveSystemLanguageByScriptType(aOpt.nDefaultLanguage_CJK,
css::i18n::ScriptType::ASIAN);
- aTable[2].nLang =
MsLangId::resolveSystemLanguageByScriptType(aOpt.nDefaultLanguage_CTL,
css::i18n::ScriptType::COMPLEX);
-
- for (const FontDta & rFntDta : aTable)
- {
- LanguageType nLang = (LANGUAGE_NONE == rFntDta.nLang) ?
- rFntDta.nFallbackLang : rFntDta.nLang;
- vcl::Font aFont = OutputDevice::GetDefaultFont(
- rFntDta.nFontType, nLang, GetDefaultFontFlags::OnlyOne);
- mpEditEngineItemPool->SetPoolDefaultItem(
- SvxFontItem(
- aFont.GetFamilyType(),
- aFont.GetFamilyName(),
- aFont.GetStyleName(),
- aFont.GetPitch(),
- aFont.GetCharSet(),
- rFntDta.nFontInfoId));
- }
-
- mpEditEngine.reset( new EditEngine (mpEditEngineItemPool.get()) );
-
- mpEditEngine->EnableUndo (true);
- mpEditEngine->SetDefTab (sal_uInt16(
- Application::GetDefaultDevice()->GetTextWidth("XXXX")));
-
- mpEditEngine->SetControlWord(
- EEControlBits(mpEditEngine->GetControlWord() |
EEControlBits::AUTOINDENTING) &
- EEControlBits(~EEControlBits::UNDOATTRIBS) &
- EEControlBits(~EEControlBits::PASTESPECIAL) );
-
- mpEditEngine->SetWordDelimiters (" .=+-*/(){}[];\"");
- mpEditEngine->SetRefMapMode(MapMode(MapUnit::MapPixel));
- mpEditEngine->SetPaperSize (Size(800, 0));
- mpEditEngine->EraseVirtualDevice();
- mpEditEngine->ClearModifyFlag();
-}
-
-PresenterTextView::Implementation::~Implementation()
-{
- mpEditEngine.reset();
- mpEditEngineItemPool.clear();
- mpOutputDevice.disposeAndClear();
-}
-
-void PresenterTextView::Implementation::SetCanvas (const
cppcanvas::CanvasSharedPtr& rpCanvas)
-{
- mpCanvas = rpCanvas;
- mxBitmap = nullptr;
-}
-
-void PresenterTextView::Implementation::SetSize (const Size aSize)
-{
- DBG_ASSERT(mpEditEngine!=nullptr, "EditEngine missing");
-
- maSize = aSize;
- mpEditEngine->SetPaperSize(maSize);
- mnTotalHeight = -1;
- mxBitmap = nullptr;
-}
-
-void PresenterTextView::Implementation::SetBackgroundColor (const Color aColor)
-{
- mxBitmap = nullptr;
-
- DBG_ASSERT(mpEditEngine!=nullptr, "EditEngine missing");
- DBG_ASSERT(mpEditEngineItemPool!=nullptr, "EditEngineItemPool missing");
- mpEditEngine->SetBackgroundColor(aColor);
- mpEditEngine->EnableAutoColor(false);
- mpEditEngine->ForceAutoColor(false);
-}
-
-void PresenterTextView::Implementation::SetTextColor (const Color aColor)
-{
- mxBitmap = nullptr;
-
- DBG_ASSERT(mpEditEngineItemPool!=nullptr, "EditEngineItemPool missing");
- mpEditEngineItemPool->SetPoolDefaultItem(SvxColorItem(aColor,
EE_CHAR_COLOR));
-}
-
-void PresenterTextView::Implementation::SetFontDescriptor (
- const awt::FontDescriptor& rFontDescriptor)
-{
- mxBitmap = nullptr;
-
- DBG_ASSERT(mpEditEngineItemPool!=nullptr, "EditEngineItemPool missing");
-
- const sal_Int32 nFontHeight = rFontDescriptor.Height;
-
- SvxFontHeightItem aFontHeight(
- Application::GetDefaultDevice()->LogicToPixel(
- Size(0, nFontHeight), MapMode (MapUnit::MapPoint)).Height(),
- 100,
- EE_CHAR_FONTHEIGHT);
- mpEditEngineItemPool->SetPoolDefaultItem( aFontHeight);
- aFontHeight.SetWhich (EE_CHAR_FONTHEIGHT_CJK);
- mpEditEngineItemPool->SetPoolDefaultItem( aFontHeight);
- aFontHeight.SetWhich (EE_CHAR_FONTHEIGHT_CTL);
- mpEditEngineItemPool->SetPoolDefaultItem( aFontHeight);
-
- SvxFontItem aSvxFontItem (EE_CHAR_FONTINFO);
- aSvxFontItem.SetFamilyName( rFontDescriptor.Name );
- mpEditEngineItemPool->SetPoolDefaultItem(aSvxFontItem);
-
- mnTotalHeight = -1;
- mxBitmap = nullptr;
-
- CheckTop();
- mnTotalHeight = -1;
-}
-
-void PresenterTextView::Implementation::SetTop (const sal_Int32 nTop)
-{
- if (nTop == mnTop)
- return;
-
- mnTop = nTop;
- mxBitmap = nullptr;
- CheckTop();
-}
-
-void PresenterTextView::Implementation::SetText (const OUString& rText)
-{
- DBG_ASSERT(mpEditEngine!=nullptr, "EditEngine missing");
- msText = rText;
- mpEditEngine->SetPaperSize(maSize);
- mnTotalHeight = -1;
- mxBitmap = nullptr;
-}
-
-sal_Int32 PresenterTextView::Implementation::ParseDistance
(std::u16string_view sDistance) const
-{
- DBG_ASSERT(mpEditEngine!=nullptr, "EditEngine missing");
- sal_Int32 nDistance (0);
- if (o3tl::ends_with(sDistance, u"px"))
- {
- nDistance = o3tl::toInt32(sDistance.substr(0,sDistance.size()-2));
- }
- else if (o3tl::ends_with(sDistance, u"l"))
- {
- const sal_Int32 nLines
(o3tl::toInt32(sDistance.substr(0,sDistance.size()-1)));
- // Take the height of the first line as the height of every line.
- const sal_uInt32 nFirstLineHeight (mpEditEngine->GetLineHeight(0));
- nDistance = nFirstLineHeight * nLines;
- }
-
- return nDistance;
-}
-
-Reference<rendering::XBitmap> const &
PresenterTextView::Implementation::GetBitmap()
-{
- DBG_ASSERT(mpEditEngine!=nullptr, "EditEngine missing");
-
- if ( ! mxBitmap.is())
- {
- mpOutputDevice.disposeAndClear();
- mpOutputDevice =
VclPtr<VirtualDevice>::Create(*Application::GetDefaultDevice(),
- DeviceFormat::DEFAULT,
DeviceFormat::DEFAULT);
- mpOutputDevice->SetMapMode(MapMode(MapUnit::MapPixel));
- mpOutputDevice->SetOutputSizePixel(maSize);
- mpOutputDevice->SetLineColor();
- mpOutputDevice->SetFillColor();
- mpOutputDevice->SetBackground(Wallpaper());
- mpOutputDevice->Erase();
-
- MapMode aMapMode (mpOutputDevice->GetMapMode());
- aMapMode.SetOrigin(Point(0,0));
- mpOutputDevice->SetMapMode(aMapMode);
- const ::tools::Rectangle aWindowBox (Point(0,0), maSize);
- mpOutputDevice->DrawRect(aWindowBox);
-
- mpEditEngine->Clear();
- mpEditEngine->SetText(msText);
- mpEditEngine->SetPaperSize(maSize);
-
- mpEditEngine->Draw(*mpOutputDevice, aWindowBox, Point(0,mnTop));
-
- const BitmapEx aBitmap (mpOutputDevice->GetBitmapEx(Point(0,0),
maSize));
- mxBitmap = cppcanvas::VCLFactory::createBitmap(
- mpCanvas,
- aBitmap
- )->getUNOBitmap();
- }
- return mxBitmap;
-}
-
-sal_Int32 PresenterTextView::Implementation::GetTotalHeight()
-{
- DBG_ASSERT(mpEditEngine!=nullptr, "EditEngine missing");
-
- if (mnTotalHeight < 0)
- {
- if ( ! mxBitmap.is())
- GetBitmap();
- mnTotalHeight = mpEditEngine->GetTextHeight();
- }
- return mnTotalHeight;
-}
-
-void PresenterTextView::Implementation::CheckTop()
-{
- DBG_ASSERT(mpEditEngine!=nullptr, "EditEngine missing");
-
- if (mpEditEngine!=nullptr && mnTotalHeight < 0)
- mnTotalHeight = mpEditEngine->GetTextHeight();
- if (mpEditEngine!=nullptr && mnTop >= mnTotalHeight)
- mnTop = mnTotalHeight - mpEditEngine->GetLineHeight(0);
-
- if (mnTotalHeight < maSize.Height())
- mnTop = 0;
-
- if (mnTotalHeight - mnTop < maSize.Height())
- mnTop = mnTotalHeight - maSize.Height();
-
- if (mnTop < 0)
- mnTop = 0;
-}
-
-} // end of namespace ::sd::presenter
-
-
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
-com_sun_star_comp_Draw_PresenterTextView_get_implementation(css::uno::XComponentContext*,
-
css::uno::Sequence<css::uno::Any> const &)
-{
- return cppu::acquire(new sd::presenter::PresenterTextView);
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/presenter/PresenterTextView.hxx
b/sd/source/ui/presenter/PresenterTextView.hxx
deleted file mode 100644
index 28b68aaa57d6..000000000000
--- a/sd/source/ui/presenter/PresenterTextView.hxx
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#pragma once
-
-#include <tools/PropertySet.hxx>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <cppuhelper/implbase.hxx>
-#include <memory>
-
-namespace sd::presenter {
-
-typedef ::cppu::ImplInheritanceHelper <
- tools::PropertySet,
- css::lang::XInitialization
-> PresenterTextViewInterfaceBase;
-
-/** Render text into bitmaps. An edit engine is used to render the text.
- This service is used by the presenter screen to render the notes view.
-*/
-class PresenterTextView
- : public PresenterTextViewInterfaceBase
-{
-public:
- PresenterTextView ();
- virtual ~PresenterTextView() override;
- PresenterTextView(const PresenterTextView&) = delete;
- PresenterTextView& operator=(const PresenterTextView&) = delete;
-
- // XInitialization
-
- virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>&
rArguments) override;
-
-protected:
- virtual void SAL_CALL disposing() override;
-
- virtual css::uno::Any GetPropertyValue (
- const OUString& rsPropertyName) override;
- virtual css::uno::Any SetPropertyValue (
- const OUString& rsPropertyName,
- const css::uno::Any& rValue) override;
-
-private:
- class Implementation;
- std::unique_ptr<Implementation> mpImplementation;
-
- /** @throws css::lang::DisposedException when the object has already been
- disposed.
- */
- void ThrowIfDisposed();
-};
-
-} // end of namespace ::sd::presenter
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/util/sd.component b/sd/util/sd.component
index 77731ac018ea..04bd60513491 100644
--- a/sd/util/sd.component
+++ b/sd/util/sd.component
@@ -41,10 +41,6 @@
constructor="com_sun_star_comp_Draw_PresenterPreviewCache_get_implementation">
<service name="com.sun.star.drawing.PresenterPreviewCache"/>
</implementation>
- <implementation name="com.sun.star.comp.Draw.PresenterTextView"
-
constructor="com_sun_star_comp_Draw_PresenterTextView_get_implementation">
- <service name="com.sun.star.drawing.PresenterTextView"/>
- </implementation>
<implementation name="com.sun.star.comp.Draw.SlideRenderer"
constructor="com_sun_star_comp_Draw_SlideRenderer_get_implementation">
<service name="com.sun.star.drawing.SlideRenderer"/>
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 1e394a6f7a74..03b17d2860b6 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -694,7 +694,6 @@ draw_constructor_list = [
"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_PresenterTextView_get_implementation",
"com_sun_star_comp_Draw_SlideRenderer_get_implementation",
"com_sun_star_comp_Draw_SlideSorter_get_implementation",
"com_sun_star_comp_Draw_framework_configuration_Configuration_get_implementation",
diff --git a/vcl/workben/cgmfuzzer.cxx b/vcl/workben/cgmfuzzer.cxx
index 7d36f2acc7a0..a2a9e767be6c 100644
--- a/vcl/workben/cgmfuzzer.cxx
+++ b/vcl/workben/cgmfuzzer.cxx
@@ -60,7 +60,6 @@ void *
com_sun_star_comp_Draw_DrawingModule_get_implementation( void *, void * )
void * sd_PresentationDocument_get_implementation( void *, void * );
void * com_sun_star_comp_Draw_PresenterHelper_get_implementation( void *, void
* );
void * com_sun_star_comp_Draw_PresenterPreviewCache_get_implementation( void
*, void * );
-void * com_sun_star_comp_Draw_PresenterTextView_get_implementation( void *,
void * );
void * com_sun_star_comp_Draw_SlideRenderer_get_implementation( void *, void *
);
void * com_sun_star_comp_Draw_SlideSorter_get_implementation( void *, void * );
void *
com_sun_star_comp_Draw_framework_configuration_Configuration_get_implementation(
void *, void * );
@@ -134,7 +133,6 @@ lo_get_constructor_map(void)
{ "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_PresenterTextView_get_implementation",
com_sun_star_comp_Draw_PresenterTextView_get_implementation },
{ "com_sun_star_comp_Draw_SlideRenderer_get_implementation",
com_sun_star_comp_Draw_SlideRenderer_get_implementation },
{ "com_sun_star_comp_Draw_SlideSorter_get_implementation",
com_sun_star_comp_Draw_SlideSorter_get_implementation },
{
"com_sun_star_comp_Draw_framework_configuration_Configuration_get_implementation",
com_sun_star_comp_Draw_framework_configuration_Configuration_get_implementation
},
