basegfx/source/polygon/b2dpolygon.cxx | 158 +++++++++++++++++----------------- cui/source/tabpages/tpcolor.cxx | 12 +- 2 files changed, 85 insertions(+), 85 deletions(-)
New commits: commit a08089b8ead3c6b2f87d0a9da2be5c30df81347e Author: Noel Grandin <[email protected]> AuthorDate: Fri Dec 3 14:10:11 2021 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Fri Dec 3 18:00:39 2021 +0100 flatten ImplB2DPolygon data a little Change-Id: I64860888bf23a11e8dfaf1fc72132b6fadc526ea Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126311 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/basegfx/source/polygon/b2dpolygon.cxx b/basegfx/source/polygon/b2dpolygon.cxx index 7276208cd326..a1d50321e8e9 100644 --- a/basegfx/source/polygon/b2dpolygon.cxx +++ b/basegfx/source/polygon/b2dpolygon.cxx @@ -556,22 +556,22 @@ class ImplB2DPolygon private: // The point vector. This vector exists always and defines the // count of members. - CoordinateDataArray2D maPoints; + CoordinateDataArray2D maPoints; // The control point vectors. This vectors are created on demand // and may be zero. - std::unique_ptr< ControlVectorArray2D > mpControlVector; + std::optional< ControlVectorArray2D > moControlVector; // buffered data for e.g. default subdivision and range std::unique_ptr< ImplBufferedData > mpBufferedData; // flag which decides if this polygon is opened or closed - bool mbIsClosed; + bool mbIsClosed; public: const basegfx::B2DPolygon& getDefaultAdaptiveSubdivision(const basegfx::B2DPolygon& rSource) const { - if(!mpControlVector || !mpControlVector->isUsed()) + if(!moControlVector || !moControlVector->isUsed()) { return rSource; } @@ -604,9 +604,9 @@ public: mbIsClosed(rToBeCopied.mbIsClosed) { // complete initialization using copy - if(rToBeCopied.mpControlVector && rToBeCopied.mpControlVector->isUsed()) + if(rToBeCopied.moControlVector && rToBeCopied.moControlVector->isUsed()) { - mpControlVector.reset( new ControlVectorArray2D(*rToBeCopied.mpControlVector) ); + moControlVector.emplace( *rToBeCopied.moControlVector ); } } @@ -615,12 +615,12 @@ public: mbIsClosed(rToBeCopied.mbIsClosed) { // complete initialization using partly copy - if(rToBeCopied.mpControlVector && rToBeCopied.mpControlVector->isUsed()) + if(rToBeCopied.moControlVector && rToBeCopied.moControlVector->isUsed()) { - mpControlVector.reset( new ControlVectorArray2D(*rToBeCopied.mpControlVector, nIndex, nCount) ); + moControlVector.emplace( *rToBeCopied.moControlVector, nIndex, nCount ); - if(!mpControlVector->isUsed()) - mpControlVector.reset(); + if(!moControlVector->isUsed()) + moControlVector.reset(); } } @@ -628,16 +628,16 @@ public: { if (this != &rOther) { - mpControlVector.reset(); + moControlVector.reset(); mpBufferedData.reset(); maPoints = rOther.maPoints; mbIsClosed = rOther.mbIsClosed; - if (rOther.mpControlVector && rOther.mpControlVector->isUsed()) + if (rOther.moControlVector && rOther.moControlVector->isUsed()) { - mpControlVector.reset( new ControlVectorArray2D(*rOther.mpControlVector) ); + moControlVector.emplace( *rOther.moControlVector ); - if(!mpControlVector->isUsed()) - mpControlVector.reset(); + if(!moControlVector->isUsed()) + moControlVector.reset(); } } return *this; @@ -670,24 +670,24 @@ public: { bool bControlVectorsAreEqual(true); - if(mpControlVector) + if(moControlVector) { - if(rCandidate.mpControlVector) + if(rCandidate.moControlVector) { - bControlVectorsAreEqual = ((*mpControlVector) == (*rCandidate.mpControlVector)); + bControlVectorsAreEqual = ((*moControlVector) == (*rCandidate.moControlVector)); } else { // candidate has no control vector, so it's assumed all unused. - bControlVectorsAreEqual = !mpControlVector->isUsed(); + bControlVectorsAreEqual = !moControlVector->isUsed(); } } else { - if(rCandidate.mpControlVector) + if(rCandidate.moControlVector) { // we have no control vector, so it's assumed all unused. - bControlVectorsAreEqual = !rCandidate.mpControlVector->isUsed(); + bControlVectorsAreEqual = !rCandidate.moControlVector->isUsed(); } } @@ -723,10 +723,10 @@ public: const CoordinateData2D aCoordinate(rPoint); maPoints.append(aCoordinate); - if(mpControlVector) + if(moControlVector) { const ControlVectorPair2D aVectorPair; - mpControlVector->append(aVectorPair); + moControlVector->append(aVectorPair); } } @@ -738,19 +738,19 @@ public: CoordinateData2D aCoordinate(rPoint); maPoints.insert(nIndex, aCoordinate, nCount); - if(mpControlVector) + if(moControlVector) { ControlVectorPair2D aVectorPair; - mpControlVector->insert(nIndex, aVectorPair, nCount); + moControlVector->insert(nIndex, aVectorPair, nCount); } } } const basegfx::B2DVector& getPrevControlVector(sal_uInt32 nIndex) const { - if(mpControlVector) + if(moControlVector) { - return mpControlVector->getPrevVector(nIndex); + return moControlVector->getPrevVector(nIndex); } else { @@ -760,30 +760,30 @@ public: void setPrevControlVector(sal_uInt32 nIndex, const basegfx::B2DVector& rValue) { - if(!mpControlVector) + if(!moControlVector) { if(!rValue.equalZero()) { mpBufferedData.reset(); - mpControlVector.reset( new ControlVectorArray2D(maPoints.count()) ); - mpControlVector->setPrevVector(nIndex, rValue); + moControlVector.emplace(maPoints.count()); + moControlVector->setPrevVector(nIndex, rValue); } } else { mpBufferedData.reset(); - mpControlVector->setPrevVector(nIndex, rValue); + moControlVector->setPrevVector(nIndex, rValue); - if(!mpControlVector->isUsed()) - mpControlVector.reset(); + if(!moControlVector->isUsed()) + moControlVector.reset(); } } const basegfx::B2DVector& getNextControlVector(sal_uInt32 nIndex) const { - if(mpControlVector) + if(moControlVector) { - return mpControlVector->getNextVector(nIndex); + return moControlVector->getNextVector(nIndex); } else { @@ -793,34 +793,34 @@ public: void setNextControlVector(sal_uInt32 nIndex, const basegfx::B2DVector& rValue) { - if(!mpControlVector) + if(!moControlVector) { if(!rValue.equalZero()) { mpBufferedData.reset(); - mpControlVector.reset( new ControlVectorArray2D(maPoints.count()) ); - mpControlVector->setNextVector(nIndex, rValue); + moControlVector.emplace(maPoints.count()); + moControlVector->setNextVector(nIndex, rValue); } } else { mpBufferedData.reset(); - mpControlVector->setNextVector(nIndex, rValue); + moControlVector->setNextVector(nIndex, rValue); - if(!mpControlVector->isUsed()) - mpControlVector.reset(); + if(!moControlVector->isUsed()) + moControlVector.reset(); } } bool areControlPointsUsed() const { - return (mpControlVector && mpControlVector->isUsed()); + return (moControlVector && moControlVector->isUsed()); } void resetControlVectors() { mpBufferedData.reset(); - mpControlVector.reset(); + moControlVector.reset(); } void setControlVectors(sal_uInt32 nIndex, const basegfx::B2DVector& rPrev, const basegfx::B2DVector& rNext) @@ -852,24 +852,24 @@ public: mpBufferedData.reset(); - if(rSource.mpControlVector && rSource.mpControlVector->isUsed() && !mpControlVector) + if(rSource.moControlVector && rSource.moControlVector->isUsed() && !moControlVector) { - mpControlVector.reset( new ControlVectorArray2D(maPoints.count()) ); + moControlVector.emplace(maPoints.count()); } maPoints.insert(nIndex, rSource.maPoints); - if(rSource.mpControlVector) + if(rSource.moControlVector) { - mpControlVector->insert(nIndex, *rSource.mpControlVector); + moControlVector->insert(nIndex, *rSource.moControlVector); - if(!mpControlVector->isUsed()) - mpControlVector.reset(); + if(!moControlVector->isUsed()) + moControlVector.reset(); } - else if(mpControlVector) + else if(moControlVector) { ControlVectorPair2D aVectorPair; - mpControlVector->insert(nIndex, aVectorPair, nCount); + moControlVector->insert(nIndex, aVectorPair, nCount); } } @@ -881,12 +881,12 @@ public: mpBufferedData.reset(); maPoints.remove(nIndex, nCount); - if(mpControlVector) + if(moControlVector) { - mpControlVector->remove(nIndex, nCount); + moControlVector->remove(nIndex, nCount); - if(!mpControlVector->isUsed()) - mpControlVector.reset(); + if(!moControlVector->isUsed()) + moControlVector.reset(); } } @@ -900,10 +900,10 @@ public: // flip points maPoints.flip(mbIsClosed); - if(mpControlVector) + if(moControlVector) { // flip control vector - mpControlVector->flip(mbIsClosed); + moControlVector->flip(mbIsClosed); } } @@ -916,9 +916,9 @@ public: if(maPoints.getCoordinate(0) == maPoints.getCoordinate(nIndex)) { - if(mpControlVector) + if(moControlVector) { - if(mpControlVector->getNextVector(nIndex).equalZero() && mpControlVector->getPrevVector(0).equalZero()) + if(moControlVector->getNextVector(nIndex).equalZero() && moControlVector->getPrevVector(0).equalZero()) { return true; } @@ -935,9 +935,9 @@ public: { if(maPoints.getCoordinate(a) == maPoints.getCoordinate(a + 1)) { - if(mpControlVector) + if(moControlVector) { - if(mpControlVector->getNextVector(a).equalZero() && mpControlVector->getPrevVector(a + 1).equalZero()) + if(moControlVector->getNextVector(a).equalZero() && moControlVector->getPrevVector(a + 1).equalZero()) { return true; } @@ -960,7 +960,7 @@ public: mpBufferedData.reset(); - if(mpControlVector) + if(moControlVector) { bool bRemove; @@ -974,9 +974,9 @@ public: if(maPoints.getCoordinate(0) == maPoints.getCoordinate(nIndex)) { - if(mpControlVector) + if(moControlVector) { - if(mpControlVector->getNextVector(nIndex).equalZero() && mpControlVector->getPrevVector(0).equalZero()) + if(moControlVector->getNextVector(nIndex).equalZero() && moControlVector->getPrevVector(0).equalZero()) { bRemove = true; } @@ -992,9 +992,9 @@ public: { const sal_uInt32 nIndex(maPoints.count() - 1); - if(mpControlVector && !mpControlVector->getPrevVector(nIndex).equalZero()) + if(moControlVector && !moControlVector->getPrevVector(nIndex).equalZero()) { - mpControlVector->setPrevVector(0, mpControlVector->getPrevVector(nIndex)); + moControlVector->setPrevVector(0, moControlVector->getPrevVector(nIndex)); } remove(nIndex, 1); @@ -1012,7 +1012,7 @@ public: { mpBufferedData.reset(); - if(mpControlVector) + if(moControlVector) { sal_uInt32 nIndex(0); @@ -1022,9 +1022,9 @@ public: { bool bRemove(maPoints.getCoordinate(nIndex) == maPoints.getCoordinate(nIndex + 1)); - if(bRemove && mpControlVector) + if(bRemove && moControlVector) { - if(!mpControlVector->getNextVector(nIndex).equalZero() || !mpControlVector->getPrevVector(nIndex + 1).equalZero()) + if(!moControlVector->getNextVector(nIndex).equalZero() || !moControlVector->getPrevVector(nIndex + 1).equalZero()) { bRemove = false; } @@ -1032,9 +1032,9 @@ public: if(bRemove) { - if(mpControlVector && !mpControlVector->getPrevVector(nIndex).equalZero()) + if(moControlVector && !moControlVector->getPrevVector(nIndex).equalZero()) { - mpControlVector->setPrevVector(nIndex + 1, mpControlVector->getPrevVector(nIndex)); + moControlVector->setPrevVector(nIndex + 1, moControlVector->getPrevVector(nIndex)); } // if next is same as index and the control vectors are unused, delete index @@ -1057,27 +1057,27 @@ public: { mpBufferedData.reset(); - if(mpControlVector) + if(moControlVector) { for(sal_uInt32 a(0); a < maPoints.count(); a++) { basegfx::B2DPoint aCandidate = maPoints.getCoordinate(a); - if(mpControlVector->isUsed()) + if(moControlVector->isUsed()) { - const basegfx::B2DVector& rPrevVector(mpControlVector->getPrevVector(a)); - const basegfx::B2DVector& rNextVector(mpControlVector->getNextVector(a)); + const basegfx::B2DVector& rPrevVector(moControlVector->getPrevVector(a)); + const basegfx::B2DVector& rNextVector(moControlVector->getNextVector(a)); if(!rPrevVector.equalZero()) { basegfx::B2DVector aPrevVector(rMatrix * rPrevVector); - mpControlVector->setPrevVector(a, aPrevVector); + moControlVector->setPrevVector(a, aPrevVector); } if(!rNextVector.equalZero()) { basegfx::B2DVector aNextVector(rMatrix * rNextVector); - mpControlVector->setNextVector(a, aNextVector); + moControlVector->setNextVector(a, aNextVector); } } @@ -1085,8 +1085,8 @@ public: maPoints.setCoordinate(a, aCandidate); } - if(!mpControlVector->isUsed()) - mpControlVector.reset(); + if(!moControlVector->isUsed()) + moControlVector.reset(); } else { commit f869f3cb773de041b5bf7162ed1afac88c902061 Author: Caolán McNamara <[email protected]> AuthorDate: Fri Dec 3 14:09:33 2021 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Dec 3 18:00:27 2021 +0100 some translations are searched for in the wrong .mo since... commit c895a6d8298a349784cd0aafff4bf518ac8d0a7d Date: Fri May 15 10:51:10 2020 +0200 Resolves tdf#132799 - Deleting of colors unclear Tooltips added for disabled states those ones are in cui.mo (CuiResId) not svx (SvxResId) which is more obvious now we only SVXSTR for strings in svx Change-Id: I595bd5aadd8ead18291ff818405bec594c8d32db Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126318 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index e03b5a3cc787..5367fc2ed271 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -129,7 +129,7 @@ SvxColorTabPage::SvxColorTabPage(weld::Container* pPage, weld::DialogController* // disable modify buttons // Color palettes can't be modified m_xBtnDelete->set_sensitive(false); - m_xBtnDelete->set_tooltip_text( SvxResId(RID_CUISTR_DELETEUSERCOLOR1) ); + m_xBtnDelete->set_tooltip_text( CuiResId(RID_CUISTR_DELETEUSERCOLOR1) ); m_xMoreColors->set_from_icon_name("cmd/sc_additionsdialog.png"); m_xMoreColors->connect_clicked(LINK(this, SvxColorTabPage, OnMoreColorsClick)); @@ -375,7 +375,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickAddHdl_Impl, weld::Button&, void) m_xValSetColorList->InsertItem( nId + 1 , aCurrentColor, aName ); m_xValSetColorList->SelectItem( nId + 1 ); m_xBtnDelete->set_sensitive(false); - m_xBtnDelete->set_tooltip_text( SvxResId(RID_CUISTR_DELETEUSERCOLOR2) ); + m_xBtnDelete->set_tooltip_text( CuiResId(RID_CUISTR_DELETEUSERCOLOR2) ); ImpColorCountChanged(); } @@ -436,7 +436,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickDeleteHdl_Impl, weld::Button&, void) else { m_xBtnDelete->set_sensitive(false); - m_xBtnDelete->set_tooltip_text( SvxResId(RID_CUISTR_DELETEUSERCOLOR2) ); + m_xBtnDelete->set_tooltip_text( CuiResId(RID_CUISTR_DELETEUSERCOLOR2) ); } } @@ -472,7 +472,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, SelectPaletteLBHdl, weld::ComboBox&, void) if (nPos != 0) { m_xBtnDelete->set_sensitive(false); - m_xBtnDelete->set_tooltip_text( SvxResId(RID_CUISTR_DELETEUSERCOLOR1) ); + m_xBtnDelete->set_tooltip_text( CuiResId(RID_CUISTR_DELETEUSERCOLOR1) ); } m_xValSetColorList->Resize(); @@ -502,14 +502,14 @@ IMPL_LINK(SvxColorTabPage, SelectValSetHdl_Impl, ValueSet*, pValSet, void) else { m_xBtnDelete->set_sensitive(false); - m_xBtnDelete->set_tooltip_text( SvxResId(RID_CUISTR_DELETEUSERCOLOR1) ); + m_xBtnDelete->set_tooltip_text( CuiResId(RID_CUISTR_DELETEUSERCOLOR1) ); } } if (pValSet == m_xValSetRecentList.get()) { m_xValSetColorList->SetNoSelection(); m_xBtnDelete->set_sensitive(false); - m_xBtnDelete->set_tooltip_text( SvxResId(RID_CUISTR_DELETEUSERCOLOR2) ); + m_xBtnDelete->set_tooltip_text( CuiResId(RID_CUISTR_DELETEUSERCOLOR2) ); } }
