sd/source/console/PresenterBitmapContainer.cxx | 28 +++----------------------
sd/source/console/PresenterBitmapContainer.hxx | 11 +--------
sd/source/console/PresenterController.cxx | 22 -------------------
sd/source/console/PresenterController.hxx | 2 -
sd/source/console/PresenterTheme.cxx | 5 +---
sd/source/console/PresenterToolBar.cxx | 3 --
6 files changed, 9 insertions(+), 62 deletions(-)
New commits:
commit fc44d28260ea4ef74c3ed125d57af3e7e588f42c
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu Feb 27 10:49:08 2025 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu Feb 27 22:59:59 2025 +0100
sd presenter: Drop PresenterController::mxPresenterHelper
It's no more needed after
Change-Id: I3668849e06aadc2ad9cfd4be80ee0749d59c8440
Author: Michael Weghorn <m.wegh...@posteo.de>
Date: Thu Feb 27 10:45:18 2025 +0100
sd presenter: Drop PresenterToolBar::Context::mxPresenterHelper
Also drop the use of XMultiComponentFactory in the
PresenterController ctor which seems unnecessary
and seems only to be there because it was used
in the past to create a PresenterHelperobject/XPresenterHelper
instance when this was still done using a UNO service.
Change-Id: I87e323cf6c5d8f3b67deb5ab5bd203af4c0b2063
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182294
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/sd/source/console/PresenterController.cxx
b/sd/source/console/PresenterController.cxx
index da330a5d71ab..a2e07bbb90e8 100644
--- a/sd/source/console/PresenterController.cxx
+++ b/sd/source/console/PresenterController.cxx
@@ -140,14 +140,6 @@ PresenterController::PresenterController (
mpPaneBorderPainter = new PresenterPaneBorderPainter(rxContext);
mpWindowManager->SetPaneBorderPainter(mpPaneBorderPainter);
- // Create an object that is able to load the bitmaps in a format that is
- // supported by the canvas.
- Reference<lang::XMultiComponentFactory> xFactory =
- rxContext->getServiceManager();
- if ( ! xFactory.is())
- return;
- mxPresenterHelper = new sd::presenter::PresenterHelper(rxContext);
-
if (mxSlideShowController.is())
{
mxSlideShowController->activate();
@@ -166,10 +158,7 @@ PresenterController::PresenterController (
maInstances[mxController->getFrame()] = this;
// Create a URLTransformer.
- if (xFactory.is())
- {
- mxUrlTransformer.set(util::URLTransformer::create(mxComponentContext));
- }
+ mxUrlTransformer.set(util::URLTransformer::create(mxComponentContext));
}
PresenterController::~PresenterController()
@@ -216,11 +205,6 @@ void PresenterController::disposing()
xComponent->dispose();
}
mpCanvasHelper.reset();
- {
- if (mxPresenterHelper.is())
- mxPresenterHelper->dispose();
- mxPresenterHelper.clear();
- }
mpPaintManager.reset();
mnPendingSlideNumber = -1;
{
@@ -458,10 +442,6 @@ const std::shared_ptr<PresenterCanvasHelper>&
PresenterController::GetCanvasHelp
{
return mpCanvasHelper;
}
-const rtl::Reference<sd::presenter::PresenterHelper>&
PresenterController::GetPresenterHelper() const
-{
- return mxPresenterHelper;
-}
const std::shared_ptr<PresenterPaintManager>&
PresenterController::GetPaintManager() const
{
diff --git a/sd/source/console/PresenterController.hxx
b/sd/source/console/PresenterController.hxx
index 6ac04b14008d..523d900a3867 100644
--- a/sd/source/console/PresenterController.hxx
+++ b/sd/source/console/PresenterController.hxx
@@ -108,7 +108,6 @@ public:
const rtl::Reference<PresenterPaneContainer>& GetPaneContainer() const;
const ::rtl::Reference<PresenterPaneBorderPainter>& GetPaneBorderPainter()
const;
const std::shared_ptr<PresenterCanvasHelper>& GetCanvasHelper() 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 +195,6 @@ private:
css::uno::Reference<css::awt::XWindow> mxMainWindow;
::rtl::Reference<PresenterPaneBorderPainter> mpPaneBorderPainter;
std::shared_ptr<PresenterCanvasHelper> mpCanvasHelper;
- rtl::Reference<sd::presenter::PresenterHelper> mxPresenterHelper;
std::shared_ptr<PresenterPaintManager> mpPaintManager;
sal_Int32 mnPendingSlideNumber;
css::uno::Reference<css::util::XURLTransformer> mxUrlTransformer;
commit fce24e47de104afebbe02ed23141b99ff7af605c
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu Feb 27 10:45:18 2025 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu Feb 27 22:59:52 2025 +0100
sd presenter: Drop PresenterToolBar::Context::mxPresenterHelper
It's no more needed after
Change-Id: I0afcf0e429fbc1b3c503f79373d3150fdd59a4bc
Author: Michael Weghorn <m.wegh...@posteo.de>
Date: Thu Feb 27 10:10:15 2025 +0100
sd presenter: Drop PresenterHelper param
Change-Id: I3668849e06aadc2ad9cfd4be80ee0749d59c8440
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182293
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/sd/source/console/PresenterToolBar.cxx
b/sd/source/console/PresenterToolBar.cxx
index 2286748c2623..c9397ab8b5a1 100644
--- a/sd/source/console/PresenterToolBar.cxx
+++ b/sd/source/console/PresenterToolBar.cxx
@@ -104,7 +104,6 @@ public:
Context() = default;
Context(const Context&) = delete;
Context& operator=(const Context&) = delete;
- rtl::Reference<sd::presenter::PresenterHelper> mxPresenterHelper;
css::uno::Reference<css::rendering::XCanvas> mxCanvas;
};
@@ -597,10 +596,8 @@ void PresenterToolBar::CreateControls (
PresenterConfigurationAccess::GetConfigurationNode(xToolBarNode,
u"Entries"_ustr),
UNO_QUERY);
Context aContext;
- aContext.mxPresenterHelper = mpPresenterController->GetPresenterHelper();
aContext.mxCanvas = mxCanvas;
if (xEntries.is()
- && aContext.mxPresenterHelper.is()
&& aContext.mxCanvas.is())
{
PresenterConfigurationAccess::ForAll(
commit c9be05938a2e2258642c300de31ae396137bc5bd
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu Feb 27 10:28:11 2025 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu Feb 27 22:59:45 2025 +0100
sd presenter: Drop PresenterBitmapContainer::mxPresenterHelper
It is only written to, but never read, since
Change-Id: I7055e5652f59f251b58bc4d79f7dae0e9c99f667
Author: Michael Weghorn <m.wegh...@posteo.de>
Date: Thu Feb 27 10:10:15 2025 +0100
sd presenter: Drop PresenterHelper param
Drop the class member and ctor params only needed to
initialize it.
Change-Id: Id935301e6188ee7b5d0fbe9bf065a5b185b1a137
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182292
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/sd/source/console/PresenterBitmapContainer.cxx
b/sd/source/console/PresenterBitmapContainer.cxx
index 57cc911f1131..4da0e60ff932 100644
--- a/sd/source/console/PresenterBitmapContainer.cxx
+++ b/sd/source/console/PresenterBitmapContainer.cxx
@@ -36,14 +36,10 @@ PresenterBitmapContainer::PresenterBitmapContainer (
const OUString& rsConfigurationBase,
std::shared_ptr<PresenterBitmapContainer> xParentContainer,
const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext,
- css::uno::Reference<css::rendering::XCanvas> xCanvas,
- rtl::Reference<sd::presenter::PresenterHelper> xPresenterHelper)
+ css::uno::Reference<css::rendering::XCanvas> xCanvas)
: mpParentContainer(std::move(xParentContainer)),
- mxCanvas(std::move(xCanvas)),
- mxPresenterHelper(std::move(xPresenterHelper))
+ mxCanvas(std::move(xCanvas))
{
- Initialize(rxComponentContext);
-
// Get access to the configuration.
PresenterConfigurationAccess aConfiguration (
rxComponentContext,
@@ -59,29 +55,13 @@ PresenterBitmapContainer::PresenterBitmapContainer (
PresenterBitmapContainer::PresenterBitmapContainer (
const css::uno::Reference<css::container::XNameAccess>& rxRootNode,
std::shared_ptr<PresenterBitmapContainer> xParentContainer,
- const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext,
- css::uno::Reference<css::rendering::XCanvas> xCanvas,
- rtl::Reference<sd::presenter::PresenterHelper> xPresenterHelper)
+ css::uno::Reference<css::rendering::XCanvas> xCanvas)
: mpParentContainer(std::move(xParentContainer)),
- mxCanvas(std::move(xCanvas)),
- mxPresenterHelper(std::move(xPresenterHelper))
+ mxCanvas(std::move(xCanvas))
{
- Initialize(rxComponentContext);
-
LoadBitmaps(rxRootNode);
}
-void PresenterBitmapContainer::Initialize (
- const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext)
-{
- if ( mxPresenterHelper.is())
- return;
-
- // Create an object that is able to load the bitmaps in a format that is
- // supported by the canvas.
- mxPresenterHelper = new sd::presenter::PresenterHelper(rxComponentContext);
-}
-
PresenterBitmapContainer::~PresenterBitmapContainer()
{
maIconContainer.clear();
diff --git a/sd/source/console/PresenterBitmapContainer.hxx
b/sd/source/console/PresenterBitmapContainer.hxx
index a5d34db290a9..7b72ec940ebb 100644
--- a/sd/source/console/PresenterBitmapContainer.hxx
+++ b/sd/source/console/PresenterBitmapContainer.hxx
@@ -90,21 +90,15 @@ public:
const OUString& rsConfigurationBase,
std::shared_ptr<PresenterBitmapContainer> xParentContainer,
const css::uno::Reference<css::uno::XComponentContext>&
rxComponentContext,
- css::uno::Reference<css::rendering::XCanvas> xCanvas,
- rtl::Reference<sd::presenter::PresenterHelper> xPresenterHelper =
nullptr);
+ css::uno::Reference<css::rendering::XCanvas> xCanvas);
PresenterBitmapContainer (
const css::uno::Reference<css::container::XNameAccess>& rsRootNode,
std::shared_ptr<PresenterBitmapContainer> xParentContainer,
- const css::uno::Reference<css::uno::XComponentContext>&
rxComponentContext,
- css::uno::Reference<css::rendering::XCanvas> xCanvas,
- rtl::Reference<sd::presenter::PresenterHelper> xPresenterHelper =
nullptr);
+ css::uno::Reference<css::rendering::XCanvas> xCanvas);
~PresenterBitmapContainer();
PresenterBitmapContainer(const PresenterBitmapContainer&) = delete;
PresenterBitmapContainer& operator=(const PresenterBitmapContainer&) =
delete;
- void Initialize (
- const css::uno::Reference<css::uno::XComponentContext>&
rxComponentContext);
-
/** Return the bitmap set that is associated with the given name.
*/
std::shared_ptr<BitmapDescriptor> GetBitmap (const OUString& rsName) const;
@@ -120,7 +114,6 @@ private:
typedef ::std::map<OUString, std::shared_ptr<BitmapDescriptor> >
BitmapContainer;
BitmapContainer maIconContainer;
css::uno::Reference<css::rendering::XCanvas> mxCanvas;
- rtl::Reference<sd::presenter::PresenterHelper> mxPresenterHelper;
void LoadBitmaps (
const css::uno::Reference<css::container::XNameAccess>& rsRootNode);
diff --git a/sd/source/console/PresenterTheme.cxx
b/sd/source/console/PresenterTheme.cxx
index 801c14e488c7..37258d81d54b 100644
--- a/sd/source/console/PresenterTheme.cxx
+++ b/sd/source/console/PresenterTheme.cxx
@@ -598,7 +598,7 @@ void PresenterTheme::Theme::Read (
PresenterConfigurationAccess::GetConfigurationNode(mxThemeRoot,
u"Bitmaps"_ustr), UNO_QUERY),
mpParentTheme != nullptr ? mpParentTheme->mpIconContainer
: std::shared_ptr<PresenterBitmapContainer>(),
- rReadContext.mxComponentContext, rReadContext.mxCanvas);
+ rReadContext.mxCanvas);
// Read fonts.
Reference<container::XNameAccess> xFontNode(
@@ -850,8 +850,7 @@ void PaneStyleContainer::ProcessPaneStyle(
xBitmapsNode,
pStyle->mpParentStyle != nullptr ? pStyle->mpParentStyle->mpBitmaps
:
std::shared_ptr<PresenterBitmapContainer>(),
- rReadContext.mxComponentContext, rReadContext.mxCanvas,
- rReadContext.mxPresenterHelper);
+ rReadContext.mxCanvas);
}
mStyles.push_back(pStyle);
