basegfx/source/polygon/b2dlinegeometry.cxx | 23 ++++++----------------- comphelper/source/property/propmultiplex2.cxx | 10 +++------- include/basegfx/polygon/b2dlinegeometry.hxx | 3 +-- include/comphelper/propmultiplex2.hxx | 4 +--- include/svx/svdotable.hxx | 2 +- oox/source/drawingml/shape.cxx | 2 +- svx/source/table/svdotable.cxx | 4 ++-- 7 files changed, 15 insertions(+), 33 deletions(-)
New commits: commit 203476b6676505acafd1c41561800afd9316a0f6 Author: Noel Grandin <[email protected]> AuthorDate: Tue Jul 4 16:12:19 2023 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Tue Jul 4 20:19:06 2023 +0200 loplugin:constantparam Change-Id: Iee554baae7239c9bf0ac35cab6ff235a88dc29a1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153973 Tested-by: Noel Grandin <[email protected]> Reviewed-by: Noel Grandin <[email protected]> diff --git a/basegfx/source/polygon/b2dlinegeometry.cxx b/basegfx/source/polygon/b2dlinegeometry.cxx index 6dda8f9e7e1f..37c7cfc172d2 100644 --- a/basegfx/source/polygon/b2dlinegeometry.cxx +++ b/basegfx/source/polygon/b2dlinegeometry.cxx @@ -848,8 +848,7 @@ namespace basegfx css::drawing::LineCap eCap, double fMaxAllowedAngle, double fMaxPartOfEdge, - double fMiterMinimumAngle, - basegfx::triangulator::B2DTriangleVector* pTriangles) + double fMiterMinimumAngle) { if(fMaxAllowedAngle > M_PI_2) { @@ -959,7 +958,7 @@ namespace basegfx fHalfLineWidth, eJoin, fMiterMinimumAngle, - pTriangles)); + nullptr)); } else if(aOrientation == B2VectorOrientation::Negative) { @@ -976,7 +975,7 @@ namespace basegfx fHalfLineWidth, eJoin, fMiterMinimumAngle, - pTriangles)); + nullptr)); } } @@ -995,7 +994,7 @@ namespace basegfx bLast && eCap == css::drawing::LineCap_ROUND, bFirst && eCap == css::drawing::LineCap_SQUARE, bLast && eCap == css::drawing::LineCap_SQUARE, - pTriangles)); + nullptr)); } else { @@ -1007,7 +1006,7 @@ namespace basegfx false, false, false, - pTriangles)); + nullptr)); } // prepare next step @@ -1030,17 +1029,7 @@ namespace basegfx aCandidate.getB2DPoint(0), fHalfLineWidth)); - if(nullptr != pTriangles) - { - const basegfx::triangulator::B2DTriangleVector aResult( - basegfx::triangulator::triangulate( - aCircle)); - pTriangles->insert(pTriangles->end(), aResult.begin(), aResult.end()); - } - else - { - aRetval.append(aCircle); - } + aRetval.append(aCircle); } return aRetval; diff --git a/comphelper/source/property/propmultiplex2.cxx b/comphelper/source/property/propmultiplex2.cxx index 16c06c3bc1f9..b9d7719c4e1d 100644 --- a/comphelper/source/property/propmultiplex2.cxx +++ b/comphelper/source/property/propmultiplex2.cxx @@ -51,14 +51,12 @@ void OPropertyChangeListener2::setAdapter(std::unique_lock<std::mutex>& /*rGuard OPropertyChangeMultiplexer2::OPropertyChangeMultiplexer2(std::mutex& rMutex, std::unique_lock<std::mutex>& rGuard, OPropertyChangeListener2* _pListener, - const Reference<XPropertySet>& _rxSet, - bool _bAutoReleaseSet) + const Reference<XPropertySet>& _rxSet) : m_rMutex(rMutex) , m_xSet(_rxSet) , m_pListener(_pListener) , m_nLockCount(0) , m_bListening(false) - , m_bAutoSetRelease(_bAutoReleaseSet) { m_pListener->setAdapter(rGuard, this); } @@ -84,8 +82,7 @@ void OPropertyChangeMultiplexer2::dispose(std::unique_lock<std::mutex>& rGuard) m_pListener = nullptr; m_bListening = false; - if (m_bAutoSetRelease) - m_xSet = nullptr; + m_xSet = nullptr; } void OPropertyChangeMultiplexer2::onListenerDestruction() @@ -114,8 +111,7 @@ void SAL_CALL OPropertyChangeMultiplexer2::disposing(const EventObject& /*_rSour m_pListener = nullptr; m_bListening = false; - if (m_bAutoSetRelease) - m_xSet = nullptr; + m_xSet = nullptr; } // XPropertyChangeListener diff --git a/include/basegfx/polygon/b2dlinegeometry.hxx b/include/basegfx/polygon/b2dlinegeometry.hxx index e12dd74987f9..9a330c4f4e5b 100644 --- a/include/basegfx/polygon/b2dlinegeometry.hxx +++ b/include/basegfx/polygon/b2dlinegeometry.hxx @@ -139,8 +139,7 @@ namespace basegfx::utils css::drawing::LineCap eCap, double fMaxAllowedAngle = basegfx::deg2rad(12.5), double fMaxPartOfEdge = 0.4, - double fMiterMinimumAngle = basegfx::deg2rad(15.0), - basegfx::triangulator::B2DTriangleVector* pTriangles = nullptr); + double fMiterMinimumAngle = basegfx::deg2rad(15.0)); } // end of namespace basegfx::utils diff --git a/include/comphelper/propmultiplex2.hxx b/include/comphelper/propmultiplex2.hxx index 5e6fec1571c3..ff3a9abaf2ef 100644 --- a/include/comphelper/propmultiplex2.hxx +++ b/include/comphelper/propmultiplex2.hxx @@ -80,7 +80,6 @@ class COMPHELPER_DLLPUBLIC OPropertyChangeMultiplexer2 final OPropertyChangeListener2* m_pListener; sal_Int32 m_nLockCount; bool m_bListening : 1; - bool const m_bAutoSetRelease : 1; void onListenerDestruction(); virtual ~OPropertyChangeMultiplexer2() override; @@ -88,8 +87,7 @@ class COMPHELPER_DLLPUBLIC OPropertyChangeMultiplexer2 final public: OPropertyChangeMultiplexer2(std::mutex& rMutex, std::unique_lock<std::mutex>& rGuard, OPropertyChangeListener2* _pListener, - const css::uno::Reference<css::beans::XPropertySet>& _rxSet, - bool _bAutoReleaseSet = true); + const css::uno::Reference<css::beans::XPropertySet>& _rxSet); // XEventListener virtual void SAL_CALL disposing(const css::lang::EventObject& Source) override; diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx index 3e0da9a72708..4a25ae970d7e 100644 --- a/include/svx/svdotable.hxx +++ b/include/svx/svdotable.hxx @@ -256,7 +256,7 @@ public: /// Next time layouting would be done, skip it (to layout at the end of multiple actions). void SetSkipChangeLayout(bool bSkipChangeLayout); - void LayoutTableHeight(tools::Rectangle& rArea, bool bFit); + void LayoutTableHeight(tools::Rectangle& rArea); virtual void onEditOutlinerStatusEvent( EditStatus* pEditStatus ) override; diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 4c1492451dd4..040a632563cc 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -1543,7 +1543,7 @@ Reference< XShape > const & Shape::createAndInsert( if (auto* pTableShape = dynamic_cast<sdr::table::SdrTableObj*>(SdrObject::getSdrObjectFromXShape(mxShape))) { tools::Rectangle aArea{}; - pTableShape->LayoutTableHeight(aArea, /*bFit=*/false); + pTableShape->LayoutTableHeight(aArea); sal_Int32 nCorrectedHeight = aArea.GetHeight(); const auto& aShapeSize = mxShape->getSize(); if( nCorrectedHeight > aShapeSize.Height ) diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index d29685627afc..bb30b64773cd 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -2376,11 +2376,11 @@ void SdrTableObj::CropTableModelToSelection(const CellPos& rStart, const CellPos mpImpl->CropTableModelToSelection(rStart, rEnd); } -void SdrTableObj::LayoutTableHeight(tools::Rectangle& rArea, bool bFit) +void SdrTableObj::LayoutTableHeight(tools::Rectangle& rArea) { if( mpImpl.is() && mpImpl->mpLayouter) { - mpImpl->mpLayouter->LayoutTableHeight(rArea, bFit); + mpImpl->mpLayouter->LayoutTableHeight(rArea, /*bFit*/false); } }
