sd/source/console/PresenterButton.cxx | 1 - sd/source/console/PresenterButton.hxx | 3 ++- sd/source/console/PresenterPaneBase.hxx | 4 +++- sd/source/console/PresenterToolBar.cxx | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-)
New commits: commit 320b12921a1171ae3b81fe1fb153f34e9895fe2e Author: Michael Weghorn <m.wegh...@posteo.de> AuthorDate: Wed Feb 26 16:34:17 2025 +0100 Commit: Michael Weghorn <m.wegh...@posteo.de> CommitDate: Thu Feb 27 07:58:36 2025 +0100 sd presenter: Use rtl::Ref for PresenterPaneBase::mxPresenterHelper 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: Iac824d48d682fd68b21cdaa79ffe8d1e103a20e0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182253 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.wegh...@posteo.de> diff --git a/sd/source/console/PresenterPaneBase.hxx b/sd/source/console/PresenterPaneBase.hxx index 3264797fce8d..38f1189c31e4 100644 --- a/sd/source/console/PresenterPaneBase.hxx +++ b/sd/source/console/PresenterPaneBase.hxx @@ -20,6 +20,8 @@ #ifndef INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERPANEBASE_HXX #define INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERPANEBASE_HXX +#include <PresenterHelper.hxx> + #include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> #include <com/sun/star/awt/XWindowListener.hpp> @@ -101,7 +103,7 @@ protected: css::uno::Reference<css::rendering::XCanvas> mxContentCanvas; css::uno::Reference<css::drawing::framework::XResourceId> mxPaneId; css::uno::Reference<css::drawing::framework::XPaneBorderPainter> mxBorderPainter; - css::uno::Reference<css::drawing::XPresenterHelper> mxPresenterHelper; + rtl::Reference<sd::presenter::PresenterHelper> mxPresenterHelper; OUString msTitle; css::uno::Reference<css::uno::XComponentContext> mxComponentContext; commit 56bb84fe410ee3f52bbd869cbadd36aa0d5fe40d Author: Michael Weghorn <m.wegh...@posteo.de> AuthorDate: Wed Feb 26 16:31:28 2025 +0100 Commit: Michael Weghorn <m.wegh...@posteo.de> CommitDate: Thu Feb 27 07:58:30 2025 +0100 sd presenter: Use rtl::Reference 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: Ieb424ede4db71a4bb488654b935d6e130ed14b31 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182252 Reviewed-by: Michael Weghorn <m.wegh...@posteo.de> Tested-by: Jenkins diff --git a/sd/source/console/PresenterToolBar.cxx b/sd/source/console/PresenterToolBar.cxx index 7d64f74155a2..d5d919f2034a 100644 --- a/sd/source/console/PresenterToolBar.cxx +++ b/sd/source/console/PresenterToolBar.cxx @@ -104,7 +104,7 @@ public: Context() = default; Context(const Context&) = delete; Context& operator=(const Context&) = delete; - Reference<drawing::XPresenterHelper> mxPresenterHelper; + rtl::Reference<sd::presenter::PresenterHelper> mxPresenterHelper; css::uno::Reference<css::rendering::XCanvas> mxCanvas; }; commit 87d89848ea275249a5a22b9655bf3cee51d1485e Author: Michael Weghorn <m.wegh...@posteo.de> AuthorDate: Wed Feb 26 16:27:07 2025 +0100 Commit: Michael Weghorn <m.wegh...@posteo.de> CommitDate: Thu Feb 27 07:58:24 2025 +0100 sd presenter: Use rtl::Ref for PresenterButton::mxPresenterHelper 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: I4799e1233c4478807d5975a97a4242cf9b98cb37 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182251 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.wegh...@posteo.de> diff --git a/sd/source/console/PresenterButton.cxx b/sd/source/console/PresenterButton.cxx index dde10334dabb..6d23518564c1 100644 --- a/sd/source/console/PresenterButton.cxx +++ b/sd/source/console/PresenterButton.cxx @@ -23,7 +23,6 @@ #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> diff --git a/sd/source/console/PresenterButton.hxx b/sd/source/console/PresenterButton.hxx index ec2f617bd64a..148ba4e0f560 100644 --- a/sd/source/console/PresenterButton.hxx +++ b/sd/source/console/PresenterButton.hxx @@ -22,6 +22,7 @@ #include "PresenterBitmapContainer.hxx" #include "PresenterTheme.hxx" +#include <PresenterHelper.hxx> #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/awt/XPaintListener.hpp> #include <com/sun/star/awt/XMouseListener.hpp> @@ -89,7 +90,7 @@ private: std::shared_ptr<PresenterTheme> mpTheme; 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; const OUString msText; const PresenterTheme::SharedFontDescriptor mpFont; const PresenterTheme::SharedFontDescriptor mpMouseOverFont;