sd/source/console/PresenterBitmapContainer.cxx | 8 ++++----
sd/source/console/PresenterBitmapContainer.hxx | 14 ++++++++------
sd/source/console/PresenterPaintManager.cxx | 2 +-
sd/source/console/PresenterPaintManager.hxx | 7 ++++---
sd/source/console/PresenterPaneContainer.cxx | 1 -
sd/source/console/PresenterPaneContainer.hxx | 3 ++-
sd/source/console/PresenterScrollBar.hxx | 5 +++--
sd/source/console/PresenterSlideShowView.hxx | 2 +-
sd/source/console/PresenterTheme.cxx | 4 ++--
9 files changed, 25 insertions(+), 21 deletions(-)
New commits:
commit d762415f1ae2756f17f1d5935ca9bd9287dea18f
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Wed Feb 26 16:56:43 2025 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu Feb 27 07:58:55 2025 +0100
sd presenter: Use concrete PresenterHelper in PresenterBitmapContainer
See
Change-Id: I807bc1ba0d4253329813190ca89cde93bb8f64b4
Author: Michael Weghorn <m.wegh...@posteo.de>
Date: Wed Feb 26 16:01:59 2025 +0100
sd presenter: Use rtl::Ref for
PresenterController::mxPresenterHelper
for more background.
Change-Id: I69ff78bcb1988b218fbdd5f57f7110df6bd72664
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182256
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 85b3ece375e8..1ae92fc91735 100644
--- a/sd/source/console/PresenterBitmapContainer.cxx
+++ b/sd/source/console/PresenterBitmapContainer.cxx
@@ -38,7 +38,7 @@ PresenterBitmapContainer::PresenterBitmapContainer (
std::shared_ptr<PresenterBitmapContainer> xParentContainer,
const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext,
css::uno::Reference<css::rendering::XCanvas> xCanvas,
- css::uno::Reference<css::drawing::XPresenterHelper> xPresenterHelper)
+ rtl::Reference<sd::presenter::PresenterHelper> xPresenterHelper)
: mpParentContainer(std::move(xParentContainer)),
mxCanvas(std::move(xCanvas)),
mxPresenterHelper(std::move(xPresenterHelper))
@@ -62,7 +62,7 @@ PresenterBitmapContainer::PresenterBitmapContainer (
std::shared_ptr<PresenterBitmapContainer> xParentContainer,
const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext,
css::uno::Reference<css::rendering::XCanvas> xCanvas,
- css::uno::Reference<css::drawing::XPresenterHelper> xPresenterHelper)
+ rtl::Reference<sd::presenter::PresenterHelper> xPresenterHelper)
: mpParentContainer(std::move(xParentContainer)),
mxCanvas(std::move(xCanvas)),
mxPresenterHelper(std::move(xPresenterHelper))
@@ -131,7 +131,7 @@ void PresenterBitmapContainer::LoadBitmaps (
std::shared_ptr<PresenterBitmapContainer::BitmapDescriptor>
PresenterBitmapContainer::LoadBitmap (
const css::uno::Reference<css::container::XHierarchicalNameAccess>& rxNode,
const OUString& rsPath,
- const css::uno::Reference<css::drawing::XPresenterHelper>&
rxPresenterHelper,
+ const rtl::Reference<sd::presenter::PresenterHelper>& rxPresenterHelper,
const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
const std::shared_ptr<BitmapDescriptor>& rpDefault)
{
@@ -177,7 +177,7 @@ void PresenterBitmapContainer::ProcessBitmap (
std::shared_ptr<PresenterBitmapContainer::BitmapDescriptor>
PresenterBitmapContainer::LoadBitmap (
const Reference<beans::XPropertySet>& rxProperties,
- const css::uno::Reference<css::drawing::XPresenterHelper>&
rxPresenterHelper,
+ const rtl::Reference<sd::presenter::PresenterHelper>& rxPresenterHelper,
const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
const std::shared_ptr<BitmapDescriptor>& rpDefault)
{
diff --git a/sd/source/console/PresenterBitmapContainer.hxx
b/sd/source/console/PresenterBitmapContainer.hxx
index ee87a5be23db..b1374934398a 100644
--- a/sd/source/console/PresenterBitmapContainer.hxx
+++ b/sd/source/console/PresenterBitmapContainer.hxx
@@ -19,14 +19,16 @@
#pragma once
+#include <PresenterHelper.hxx>
+
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/drawing/XPresenterHelper.hpp>
#include <com/sun/star/rendering/XBitmap.hpp>
#include <com/sun/star/rendering/XCanvas.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/util/Color.hpp>
+#include <rtl/ref.hxx>
#include <map>
#include <memory>
@@ -89,13 +91,13 @@ public:
std::shared_ptr<PresenterBitmapContainer> xParentContainer,
const css::uno::Reference<css::uno::XComponentContext>&
rxComponentContext,
css::uno::Reference<css::rendering::XCanvas> xCanvas,
- css::uno::Reference<css::drawing::XPresenterHelper> xPresenterHelper =
nullptr);
+ rtl::Reference<sd::presenter::PresenterHelper> xPresenterHelper =
nullptr);
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,
- css::uno::Reference<css::drawing::XPresenterHelper> xPresenterHelper =
nullptr);
+ rtl::Reference<sd::presenter::PresenterHelper> xPresenterHelper =
nullptr);
~PresenterBitmapContainer();
PresenterBitmapContainer(const PresenterBitmapContainer&) = delete;
PresenterBitmapContainer& operator=(const PresenterBitmapContainer&) =
delete;
@@ -110,7 +112,7 @@ public:
static std::shared_ptr<BitmapDescriptor> LoadBitmap (
const css::uno::Reference<css::container::XHierarchicalNameAccess>&
rxNode,
const OUString& rsPathToBitmapNode,
- const css::uno::Reference<css::drawing::XPresenterHelper>&
rxPresenterHelper,
+ const rtl::Reference<sd::presenter::PresenterHelper>&
rxPresenterHelper,
const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
const std::shared_ptr<BitmapDescriptor>& rpDefaultBitmap);
@@ -119,7 +121,7 @@ private:
typedef ::std::map<OUString, std::shared_ptr<BitmapDescriptor> >
BitmapContainer;
BitmapContainer maIconContainer;
css::uno::Reference<css::rendering::XCanvas> mxCanvas;
- css::uno::Reference<css::drawing::XPresenterHelper> mxPresenterHelper;
+ rtl::Reference<sd::presenter::PresenterHelper> mxPresenterHelper;
void LoadBitmaps (
const css::uno::Reference<css::container::XNameAccess>& rsRootNode);
@@ -128,7 +130,7 @@ private:
const css::uno::Reference<css::beans::XPropertySet>& rProperties);
static std::shared_ptr<BitmapDescriptor> LoadBitmap (
const css::uno::Reference<css::beans::XPropertySet>& rxProperties,
- const css::uno::Reference<css::drawing::XPresenterHelper>&
rxPresenterHelper,
+ const rtl::Reference<sd::presenter::PresenterHelper>&
rxPresenterHelper,
const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
const std::shared_ptr<PresenterBitmapContainer::BitmapDescriptor>&
rpDefault);
static BitmapDescriptor::TexturingMode
commit 3b3a00372b7aacf4e24e1b380024bc361f8bdc07
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Wed Feb 26 16:47:27 2025 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu Feb 27 07:58:49 2025 +0100
sd presenter: Use concrete PresenterHelper in PresenterPaintManager
See
Change-Id: I807bc1ba0d4253329813190ca89cde93bb8f64b4
Author: Michael Weghorn <m.wegh...@posteo.de>
Date: Wed Feb 26 16:01:59 2025 +0100
sd presenter: Use rtl::Ref for
PresenterController::mxPresenterHelper
for more background.
Change-Id: Iaf7c1561c87150655de4a8d60b746360454230f6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182255
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/sd/source/console/PresenterPaintManager.cxx
b/sd/source/console/PresenterPaintManager.cxx
index f7b612d9a05a..20808a996b67 100644
--- a/sd/source/console/PresenterPaintManager.cxx
+++ b/sd/source/console/PresenterPaintManager.cxx
@@ -31,7 +31,7 @@ namespace sdext::presenter {
PresenterPaintManager::PresenterPaintManager (
const css::uno::Reference<css::awt::XWindow>& rxParentWindow,
- css::uno::Reference<css::drawing::XPresenterHelper> xPresenterHelper,
+ rtl::Reference<sd::presenter::PresenterHelper> xPresenterHelper,
rtl::Reference<PresenterPaneContainer> xPaneContainer)
: mxParentWindow(rxParentWindow),
mxParentWindowPeer(rxParentWindow, UNO_QUERY),
diff --git a/sd/source/console/PresenterPaintManager.hxx
b/sd/source/console/PresenterPaintManager.hxx
index ad2f6b0cbf31..4df9ee12b64e 100644
--- a/sd/source/console/PresenterPaintManager.hxx
+++ b/sd/source/console/PresenterPaintManager.hxx
@@ -20,9 +20,10 @@
#ifndef INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERPAINTMANAGER_HXX
#define INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERPAINTMANAGER_HXX
+#include <PresenterHelper.hxx>
+
#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/awt/XWindowPeer.hpp>
-#include <com/sun/star/drawing/XPresenterHelper.hpp>
#include <rtl/ref.hxx>
#include <functional>
@@ -45,7 +46,7 @@ public:
*/
PresenterPaintManager (
const css::uno::Reference<css::awt::XWindow>& rxParentWindow,
- css::uno::Reference<css::drawing::XPresenterHelper> xPresenterHelper,
+ rtl::Reference<sd::presenter::PresenterHelper> xPresenterHelper,
rtl::Reference<PresenterPaneContainer> xPaneContainer);
::std::function<void (const css::awt::Rectangle& rRepaintBox)>
@@ -78,7 +79,7 @@ public:
private:
css::uno::Reference<css::awt::XWindow> mxParentWindow;
css::uno::Reference<css::awt::XWindowPeer> mxParentWindowPeer;
- css::uno::Reference<css::drawing::XPresenterHelper> mxPresenterHelper;
+ rtl::Reference<sd::presenter::PresenterHelper> mxPresenterHelper;
::rtl::Reference<PresenterPaneContainer> mpPaneContainer;
};
commit 8e0c9e4139fc808ce10afa9f5721e24ac91f5b7a
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Wed Feb 26 16:36:36 2025 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu Feb 27 07:58:43 2025 +0100
sd presenter: Use more rtl::Ref instead of uno::Reference<XPresenterHelper>
See
Change-Id: I807bc1ba0d4253329813190ca89cde93bb8f64b4
Author: Michael Weghorn <m.wegh...@posteo.de>
Date: Wed Feb 26 16:01:59 2025 +0100
sd presenter: Use rtl::Ref for
PresenterController::mxPresenterHelper
for more background.
Change-Id: I3f8895ecf0de161a696aca0dc915b4f33c336440
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182254
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/sd/source/console/PresenterPaneContainer.cxx
b/sd/source/console/PresenterPaneContainer.cxx
index 5b4b66b54897..93eae375ea3a 100644
--- a/sd/source/console/PresenterPaneContainer.cxx
+++ b/sd/source/console/PresenterPaneContainer.cxx
@@ -19,7 +19,6 @@
#include "PresenterPaneContainer.hxx"
#include "PresenterPaneBase.hxx"
-#include <PresenterHelper.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/sd/source/console/PresenterPaneContainer.hxx
b/sd/source/console/PresenterPaneContainer.hxx
index 136c25690b16..467a0d410c59 100644
--- a/sd/source/console/PresenterPaneContainer.hxx
+++ b/sd/source/console/PresenterPaneContainer.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERPANECONTAINER_HXX
#include "PresenterPaneBase.hxx"
+#include <PresenterHelper.hxx>
#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/drawing/XPresenterHelper.hpp>
#include <com/sun/star/drawing/framework/XResourceId.hpp>
@@ -151,7 +152,7 @@ public:
const css::lang::EventObject& rEvent) override;
private:
- css::uno::Reference<css::drawing::XPresenterHelper> mxPresenterHelper;
+ rtl::Reference<sd::presenter::PresenterHelper> mxPresenterHelper;
};
} // end of namespace ::sdext::presenter
diff --git a/sd/source/console/PresenterScrollBar.hxx
b/sd/source/console/PresenterScrollBar.hxx
index 1c3bcc2fd1af..665501f755ba 100644
--- a/sd/source/console/PresenterScrollBar.hxx
+++ b/sd/source/console/PresenterScrollBar.hxx
@@ -21,12 +21,13 @@
#define INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERSCROLLBAR_HXX
#include "PresenterBitmapContainer.hxx"
+#include <PresenterHelper.hxx>
#include <com/sun/star/awt/XWindow.hpp>
-#include <com/sun/star/drawing/XPresenterHelper.hpp>
#include <com/sun/star/rendering/XCanvas.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase.hxx>
+#include <rtl/ref.hxx>
#include <functional>
#include <memory>
@@ -149,7 +150,7 @@ protected:
css::uno::Reference<css::uno::XComponentContext> mxComponentContext;
css::uno::Reference<css::awt::XWindow> mxWindow;
css::uno::Reference<css::rendering::XCanvas> mxCanvas;
- css::uno::Reference<css::drawing::XPresenterHelper> mxPresenterHelper;
+ rtl::Reference<sd::presenter::PresenterHelper> mxPresenterHelper;
std::shared_ptr<PresenterPaintManager> mpPaintManager;
double mnThumbPosition;
double mnTotalSize;
diff --git a/sd/source/console/PresenterSlideShowView.hxx
b/sd/source/console/PresenterSlideShowView.hxx
index 1506f940ea4a..4418d150c609 100644
--- a/sd/source/console/PresenterSlideShowView.hxx
+++ b/sd/source/console/PresenterSlideShowView.hxx
@@ -185,7 +185,7 @@ private:
css::uno::Reference<css::awt::XWindow> mxWindow;
css::uno::Reference<css::awt::XWindow> mxViewWindow;
css::uno::Reference<css::drawing::framework::XPane> mxTopPane;
- css::uno::Reference<css::drawing::XPresenterHelper> mxPresenterHelper;
+ rtl::Reference<sd::presenter::PresenterHelper> mxPresenterHelper;
css::uno::Reference<css::rendering::XPolyPolygon2D> mxBackgroundPolygon1;
css::uno::Reference<css::rendering::XPolyPolygon2D> mxBackgroundPolygon2;
bool mbIsViewAdded;
diff --git a/sd/source/console/PresenterTheme.cxx
b/sd/source/console/PresenterTheme.cxx
index 5abfb283302f..d3573a227841 100644
--- a/sd/source/console/PresenterTheme.cxx
+++ b/sd/source/console/PresenterTheme.cxx
@@ -22,9 +22,9 @@
#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>
+#include <rtl/ref.hxx>
#include <map>
#include <numeric>
#include <utility>
@@ -84,7 +84,7 @@ class ReadContext
public:
Reference<XComponentContext> mxComponentContext;
Reference<rendering::XCanvas> mxCanvas;
- Reference<drawing::XPresenterHelper> mxPresenterHelper;
+ rtl::Reference<sd::presenter::PresenterHelper> mxPresenterHelper;
ReadContext (
const Reference<XComponentContext>& rxContext,
