sd/source/console/PresenterPaneBorderPainter.cxx | 26 -----------------------
sd/source/console/PresenterTheme.cxx | 2 -
2 files changed, 28 deletions(-)
New commits:
commit 84961ec877a13c528112f8aeb045dcc6c286bdb6
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu Feb 27 11:01:47 2025 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu Feb 27 23:00:15 2025 +0100
sd presenter: Drop commented out code
It's commented ever since it was added in
commit 4d91841e0bc18d5b01fe85eb03eb0be589cf0c74
Author: Vladimir Glazounov <v...@openoffice.org>
Date: Tue May 13 13:34:16 2008 +0000
INTEGRATION: CWS presenterscreen (1.2.4); FILE MERGED
2008/04/22 08:24:33 af 1.2.4.3: RESYNC: (1.2-1.3); FILE MERGED
2008/04/16 16:59:13 af 1.2.4.2: #i18486# Fixed some Linux build
problems.
2008/04/16 15:46:44 af 1.2.4.1: #i18486# Added support for callout.
Change-Id: I27c8bfa4fef204d19aab46371efa4efe2427dfad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182296
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/sd/source/console/PresenterPaneBorderPainter.cxx
b/sd/source/console/PresenterPaneBorderPainter.cxx
index 4e4cf9314182..89c6f0f0ae76 100644
--- a/sd/source/console/PresenterPaneBorderPainter.cxx
+++ b/sd/source/console/PresenterPaneBorderPainter.cxx
@@ -630,32 +630,6 @@ void PresenterPaneBorderPainter::Renderer::PaintBitmap(
return;
}
- /*
- Reference<rendering::XBitmap> xMaskedBitmap (
- PresenterBitmapHelper::FillMaskedWithColor (
- mxCanvas,
- Reference<rendering::XIntegerBitmap>(xBitmap, UNO_QUERY),
- rBitmap.mxMaskBitmap,
- 0x00ff0000,
- rBackgroundBitmap.maReplacementColor));
- if (xMaskedBitmap.is())
- xBitmap = xMaskedBitmap;
- else if (rBitmap.mxMaskBitmap.is() && mxPresenterHelper.is())
- {
- const static sal_Int32 nOutsideMaskColor (0x00ff0000);
- Reference<rendering::XIntegerBitmap> xMask (
- mxPresenterHelper->createMask(
- mxCanvas,
- rBitmap.mxMaskBitmap,
- nOutsideMaskColor,
- false));
- xBitmap = mxPresenterHelper->applyBitmapMaskWithColor(
- mxCanvas,
- Reference<rendering::XIntegerBitmap>(xBitmap, UNO_QUERY),
- xMask,
- rBackgroundBitmap.maReplacementColor);
- }
- */
rendering::RenderState aRenderState (
geometry::AffineMatrix2D(
double(nW)/rpBitmap->mnWidth, 0, nX,
commit 97fc0f691d7beb97d3481cf9ec60b2b0a63f8795
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu Feb 27 10:59:50 2025 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu Feb 27 23:00:08 2025 +0100
sd presenter: Drop ReadContext::mxPresenterHelper
It's only written to, but never read.
Change-Id: I75d087f61f5005af5e17f9efc05c07c948b50c14
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182295
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/sd/source/console/PresenterTheme.cxx
b/sd/source/console/PresenterTheme.cxx
index 37258d81d54b..f0c319b6bfd5 100644
--- a/sd/source/console/PresenterTheme.cxx
+++ b/sd/source/console/PresenterTheme.cxx
@@ -84,7 +84,6 @@ class ReadContext
public:
Reference<XComponentContext> mxComponentContext;
Reference<rendering::XCanvas> mxCanvas;
- rtl::Reference<sd::presenter::PresenterHelper> mxPresenterHelper;
ReadContext (
const Reference<XComponentContext>& rxContext,
@@ -651,7 +650,6 @@ ReadContext::ReadContext (
: mxComponentContext(rxContext),
mxCanvas(rxCanvas)
{
- mxPresenterHelper = new sd::presenter::PresenterHelper(rxContext);
}
PresenterTheme::SharedFontDescriptor ReadContext::ReadFont (
