sd/source/console/PresenterToolBar.cxx | 89 +++++++++++++++------------------
sd/source/console/PresenterToolBar.hxx | 3 -
2 files changed, 43 insertions(+), 49 deletions(-)
New commits:
commit 73794df9ec583df0e656707fbfccec11fd1c3854
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Fri May 16 10:46:02 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Fri May 16 20:18:10 2025 +0200
sd presenter: Indent try block
Change-Id: Id433c9943866480caec21f209ee4570d6f1c696f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185396
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 79f9367c5e56..8e7784f4c7a0 100644
--- a/sd/source/console/PresenterToolBar.cxx
+++ b/sd/source/console/PresenterToolBar.cxx
@@ -1271,39 +1271,39 @@ void ElementMode::ReadElementMode (
{
try
{
- Reference<container::XHierarchicalNameAccess> xNode (
- PresenterConfigurationAccess::GetProperty(rxElementProperties,
rsModeName),
- UNO_QUERY);
- Reference<beans::XPropertySet> xProperties (
- PresenterConfigurationAccess::GetNodeProperties(xNode, OUString()));
- if (!xProperties.is())
- {
- // The mode is not specified. Use the given, possibly empty,
- // default mode instead.
- mpIcon = rDefaultMode.mpIcon;
- msAction = rDefaultMode.msAction;
- maText = rDefaultMode.maText;
- }
+ Reference<container::XHierarchicalNameAccess> xNode (
+ PresenterConfigurationAccess::GetProperty(rxElementProperties,
rsModeName),
+ UNO_QUERY);
+ Reference<beans::XPropertySet> xProperties (
+ PresenterConfigurationAccess::GetNodeProperties(xNode,
OUString()));
+ if (!xProperties.is())
+ {
+ // The mode is not specified. Use the given, possibly empty,
+ // default mode instead.
+ mpIcon = rDefaultMode.mpIcon;
+ msAction = rDefaultMode.msAction;
+ maText = rDefaultMode.maText;
+ }
- // Read action.
- if ( ! (PresenterConfigurationAccess::GetProperty(xProperties,
u"Action"_ustr) >>= msAction))
- msAction = rDefaultMode.msAction;
+ // Read action.
+ if ( ! (PresenterConfigurationAccess::GetProperty(xProperties,
u"Action"_ustr) >>= msAction))
+ msAction = rDefaultMode.msAction;
- // Read text and font
- {
- OUString sText = rDefaultMode.maText.GetText();
- PresenterConfigurationAccess::GetProperty(xProperties, u"Text"_ustr)
>>= sText;
- Reference<container::XHierarchicalNameAccess> xFontNode (
- PresenterConfigurationAccess::GetProperty(xProperties,
u"Font"_ustr), UNO_QUERY);
- PresenterTheme::SharedFontDescriptor pFont(PresenterTheme::ReadFont(
- xFontNode, rDefaultMode.maText.GetFont()));
- maText = Text(std::move(sText), std::move(pFont));
- }
+ // Read text and font
+ {
+ OUString sText = rDefaultMode.maText.GetText();
+ PresenterConfigurationAccess::GetProperty(xProperties,
u"Text"_ustr) >>= sText;
+ Reference<container::XHierarchicalNameAccess> xFontNode (
+ PresenterConfigurationAccess::GetProperty(xProperties,
u"Font"_ustr), UNO_QUERY);
+ PresenterTheme::SharedFontDescriptor
pFont(PresenterTheme::ReadFont(
+ xFontNode, rDefaultMode.maText.GetFont()));
+ maText = Text(std::move(sText), std::move(pFont));
+ }
- // Read bitmaps to display as icons.
- Reference<container::XHierarchicalNameAccess> xIconNode (
- PresenterConfigurationAccess::GetProperty(xProperties, u"Icon"_ustr),
UNO_QUERY);
- mpIcon = PresenterBitmapContainer::LoadBitmap(xIconNode, u""_ustr,
rxCanvas, rDefaultMode.mpIcon);
+ // Read bitmaps to display as icons.
+ Reference<container::XHierarchicalNameAccess> xIconNode (
+ PresenterConfigurationAccess::GetProperty(xProperties,
u"Icon"_ustr), UNO_QUERY);
+ mpIcon = PresenterBitmapContainer::LoadBitmap(xIconNode, u""_ustr,
rxCanvas, rDefaultMode.mpIcon);
}
catch(Exception&)
{
commit a8aca56e1390c01e100543ff0895caf216b72501
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Fri May 16 10:43:06 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Fri May 16 20:18:02 2025 +0200
sd presenter: Pass param by ref instead of shared_ptr
This also allows dropping various null checks.
Change-Id: I6fb579ab88f944b7a8ae7dad1e7377ef889a7033
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185395
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 4de53a1895a0..79f9367c5e56 100644
--- a/sd/source/console/PresenterToolBar.cxx
+++ b/sd/source/console/PresenterToolBar.cxx
@@ -91,7 +91,7 @@ public:
void ReadElementMode (
const Reference<beans::XPropertySet>& rxProperties,
const OUString& rsModeName,
- std::shared_ptr<ElementMode> const & rpDefaultMode,
+ const ElementMode& rDefaultMode,
const css::uno::Reference<css::rendering::XCanvas>& rxCanvas);
};
typedef std::shared_ptr<ElementMode> SharedElementMode;
@@ -606,11 +606,11 @@ void PresenterToolBar::ProcessEntry (
SharedElementMode pSelectedMode = std::make_shared<ElementMode>();
SharedElementMode pDisabledMode = std::make_shared<ElementMode>();
SharedElementMode pMouseOverSelectedMode = std::make_shared<ElementMode>();
- pNormalMode->ReadElementMode(rxProperties, u"Normal"_ustr, pNormalMode,
mxCanvas);
- pMouseOverMode->ReadElementMode(rxProperties, u"MouseOver"_ustr,
pNormalMode, mxCanvas);
- pSelectedMode->ReadElementMode(rxProperties, u"Selected"_ustr,
pNormalMode, mxCanvas);
- pDisabledMode->ReadElementMode(rxProperties, u"Disabled"_ustr,
pNormalMode, mxCanvas);
- pMouseOverSelectedMode->ReadElementMode(rxProperties,
u"MouseOverSelected"_ustr, pSelectedMode, mxCanvas);
+ pNormalMode->ReadElementMode(rxProperties, u"Normal"_ustr, *pNormalMode,
mxCanvas);
+ pMouseOverMode->ReadElementMode(rxProperties, u"MouseOver"_ustr,
*pNormalMode, mxCanvas);
+ pSelectedMode->ReadElementMode(rxProperties, u"Selected"_ustr,
*pNormalMode, mxCanvas);
+ pDisabledMode->ReadElementMode(rxProperties, u"Disabled"_ustr,
*pNormalMode, mxCanvas);
+ pMouseOverSelectedMode->ReadElementMode(rxProperties,
u"MouseOverSelected"_ustr, *pSelectedMode, mxCanvas);
// Create new element.
::rtl::Reference<Element> pElement;
@@ -1266,7 +1266,7 @@ ElementMode::ElementMode()
void ElementMode::ReadElementMode (
const Reference<beans::XPropertySet>& rxElementProperties,
const OUString& rsModeName,
- std::shared_ptr<ElementMode> const & rpDefaultMode,
+ const ElementMode& rDefaultMode,
const css::uno::Reference<css::rendering::XCanvas>& rxCanvas)
{
try
@@ -1276,38 +1276,34 @@ void ElementMode::ReadElementMode (
UNO_QUERY);
Reference<beans::XPropertySet> xProperties (
PresenterConfigurationAccess::GetNodeProperties(xNode, OUString()));
- if (!xProperties.is() && rpDefaultMode != nullptr)
+ if (!xProperties.is())
{
// The mode is not specified. Use the given, possibly empty,
// default mode instead.
- mpIcon = rpDefaultMode->mpIcon;
- msAction = rpDefaultMode->msAction;
- maText = rpDefaultMode->maText;
+ mpIcon = rDefaultMode.mpIcon;
+ msAction = rDefaultMode.msAction;
+ maText = rDefaultMode.maText;
}
// Read action.
if ( ! (PresenterConfigurationAccess::GetProperty(xProperties,
u"Action"_ustr) >>= msAction))
- if (rpDefaultMode != nullptr)
- msAction = rpDefaultMode->msAction;
+ msAction = rDefaultMode.msAction;
// Read text and font
{
- OUString sText(rpDefaultMode != nullptr ?
rpDefaultMode->maText.GetText() : OUString());
+ OUString sText = rDefaultMode.maText.GetText();
PresenterConfigurationAccess::GetProperty(xProperties, u"Text"_ustr)
>>= sText;
Reference<container::XHierarchicalNameAccess> xFontNode (
PresenterConfigurationAccess::GetProperty(xProperties,
u"Font"_ustr), UNO_QUERY);
PresenterTheme::SharedFontDescriptor pFont(PresenterTheme::ReadFont(
- xFontNode, rpDefaultMode != nullptr ?
rpDefaultMode->maText.GetFont()
- :
PresenterTheme::SharedFontDescriptor()));
+ xFontNode, rDefaultMode.maText.GetFont()));
maText = Text(std::move(sText), std::move(pFont));
}
// Read bitmaps to display as icons.
Reference<container::XHierarchicalNameAccess> xIconNode (
PresenterConfigurationAccess::GetProperty(xProperties, u"Icon"_ustr),
UNO_QUERY);
- mpIcon = PresenterBitmapContainer::LoadBitmap(
- xIconNode, u""_ustr, rxCanvas,
- rpDefaultMode != nullptr ? rpDefaultMode->mpIcon :
SharedBitmapDescriptor());
+ mpIcon = PresenterBitmapContainer::LoadBitmap(xIconNode, u""_ustr,
rxCanvas, rDefaultMode.mpIcon);
}
catch(Exception&)
{
commit 4cb65bf14ca75a35dcab1754384ef4d62a1e27dc
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Fri May 16 10:32:36 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Fri May 16 20:17:57 2025 +0200
sd presenter: Make PresenterToolBar::LayoutPart non-static
That gets rid of the need to pass the canvas as a param,
as the member can be accessed directly now.
Change-Id: I5ab8a551da9a2d4f7bf8565ad695ebe668c3bd43
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185394
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 ac80fab6093b..4de53a1895a0 100644
--- a/sd/source/console/PresenterToolBar.cxx
+++ b/sd/source/console/PresenterToolBar.cxx
@@ -720,7 +720,7 @@ void PresenterToolBar::Layout()
if (rxPart->size() > 1 && bIsHorizontal)
aBoundingBox.X2 += (rxPart->size() - 1) * nGapWidth;
- LayoutPart(mxCanvas, rxPart, aBoundingBox, aPartSizes[rxPart],
bIsHorizontal);
+ LayoutPart(rxPart, aBoundingBox, aPartSizes[rxPart], bIsHorizontal);
bIsHorizontal = !bIsHorizontal;
nX += aBoundingBox.X2 - aBoundingBox.X1 + nGapWidth;
};
@@ -770,8 +770,7 @@ geometry::RealSize2D PresenterToolBar::CalculatePartSize(
return aTotalSize;
}
-void PresenterToolBar::LayoutPart (
- const Reference<rendering::XCanvas>& rxCanvas,
+void PresenterToolBar::LayoutPart(
const SharedElementContainerPart& rpPart,
const geometry::RealRectangle2D& rBoundingBox,
const geometry::RealSize2D& rPartSize,
@@ -797,7 +796,7 @@ void PresenterToolBar::LayoutPart (
if (!rxElement)
continue;
- const awt::Size aElementSize
(rxElement->GetBoundingSize(rxCanvas));
+ const awt::Size aElementSize =
rxElement->GetBoundingSize(mxCanvas);
if (bIsHorizontal)
{
if (rxElement->IsFilling())
@@ -835,7 +834,7 @@ void PresenterToolBar::LayoutPart (
if (bIsHorizontal)
{
- const awt::Size aElementSize
((*iElement)->GetBoundingSize(rxCanvas));
+ const awt::Size aElementSize
((*iElement)->GetBoundingSize(mxCanvas));
if ((*iElement)->IsFilling())
{
nY = rBoundingBox.Y1;
@@ -855,7 +854,7 @@ void PresenterToolBar::LayoutPart (
else if (iElement == iFirst - 2){
iElement = iFirst;
}
- const awt::Size aElementSize
((*iElement)->GetBoundingSize(rxCanvas));
+ const awt::Size aElementSize
((*iElement)->GetBoundingSize(mxCanvas));
if ((*iElement)->IsFilling())
{
nX = rBoundingBox.X1;
diff --git a/sd/source/console/PresenterToolBar.hxx
b/sd/source/console/PresenterToolBar.hxx
index 2bb9362ea25e..eef4b52d52a9 100644
--- a/sd/source/console/PresenterToolBar.hxx
+++ b/sd/source/console/PresenterToolBar.hxx
@@ -161,8 +161,7 @@ private:
css::geometry::RealSize2D CalculatePartSize(
const SharedElementContainerPart& rpPart,
const bool bIsHorizontal);
- static void LayoutPart (
- const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
+ void LayoutPart(
const SharedElementContainerPart& rpPart,
const css::geometry::RealRectangle2D& rBoundingBox,
const css::geometry::RealSize2D& rPartSize,
