cui/source/dialogs/SpellDialog.cxx | 2 +- editeng/source/misc/svxacorr.cxx | 2 +- svtools/source/control/ruler.cxx | 12 ++++-------- svx/source/customshapes/EnhancedCustomShapeFontWork.cxx | 2 +- 4 files changed, 7 insertions(+), 11 deletions(-)
New commits: commit bcd994e16a25cdba42a89725e75386342c6d85ae Author: Caolán McNamara <[email protected]> AuthorDate: Sat Dec 6 20:15:59 2025 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Sun Dec 7 11:41:51 2025 +0100 cid#1659736 Division or modulo by float zero For char/line, the other cases gets set to non 0. In many of the other units we set lower levels equal to the level above so we don't have a smaller tick size to attempt to draw, so explicitly do this for char/line. probably in the code since: commit dda8877b989ebe330315e94523b983a6803e1372 Date: Mon Sep 2 23:25:33 2013 +0200 Ruler: minimal unit 1/16 inch, 1/10 cm, dynamic tick draw, various Change-Id: Ifaa88144ec54922017fd66b0deeaa398b28b700d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195178 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index 3b16fa111b66..e4da613bef16 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -427,7 +427,8 @@ void Ruler::ImplDrawTicks(vcl::RenderContext& rRenderContext, tools::Long nMin, tools::Long DPIOffset = nScale - 1; double nTick4 = aImplRulerUnitTab[mnUnitIndex].nTick4; - double nTick2 = 0; + double nTick3 = aImplRulerUnitTab[mnUnitIndex].nTick3; + double nTick2 = aImplRulerUnitTab[mnUnitIndex].nTick2; double nTickCount = aImplRulerUnitTab[mnUnitIndex].nTick1 / nScale; double nTickUnit = 0; tools::Long nTickWidth; @@ -440,6 +441,7 @@ void Ruler::ImplDrawTicks(vcl::RenderContext& rRenderContext, tools::Long nMin, if (mnCharWidth == 0) mnCharWidth = 371; nTick4 = mnCharWidth * 2; + nTick3 = mnCharWidth; nTick2 = mnCharWidth; nTickCount = mnCharWidth; nTickUnit = mnCharWidth; @@ -449,6 +451,7 @@ void Ruler::ImplDrawTicks(vcl::RenderContext& rRenderContext, tools::Long nMin, if (mnLineHeight == 0) mnLineHeight = 551; nTick4 = mnLineHeight * 2; + nTick3 = mnLineHeight; nTick2 = mnLineHeight; nTickUnit = mnLineHeight; nTickCount = mnLineHeight; @@ -531,13 +534,6 @@ void Ruler::ImplDrawTicks(vcl::RenderContext& rRenderContext, tools::Long nMin, tools::Long n = 0; double nTick = 0.0; - double nTick3 = 0; - - if ((mnUnitIndex != RULER_UNIT_CHAR) && (mnUnitIndex != RULER_UNIT_LINE)) - { - nTick2 = aImplRulerUnitTab[mnUnitIndex].nTick2; - nTick3 = aImplRulerUnitTab[mnUnitIndex].nTick3; - } Size nTickGapSize; commit 42de271b199ac6ef7c5d0bf98ec9f85fb97f4a59 Author: Caolán McNamara <[email protected]> AuthorDate: Sat Dec 6 11:57:46 2025 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Sun Dec 7 11:41:40 2025 +0100 cid#1557959 Variable copied when it could be moved and cid#1660011 Variable copied when it could be moved cid#1660458 Variable copied when it could be moved Change-Id: I1073f7d1af6d8055353b5f36e30cf81cafac3fad Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195161 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 59ce2fc5c1b1..381612ebf2e6 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -2120,7 +2120,7 @@ svx::SpellPortions SentenceEditWindow_Impl::CreateSpellPortions() const { aPortion1.bIgnoreThisError = true; } - aRet.push_back(aPortion1); + aRet.push_back(std::move(aPortion1)); nStart = aStart->nPosition; eLang = aStart->eLanguage; ++aStart; diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index 6bfc0898cfea..510277fae19d 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -2060,7 +2060,7 @@ SvxAutoCorrect::SearchWordsInList( auto pRet = lcl_SearchWordsInList( &rList, rTxt, rStt, nEndPos ); if( pRet ) { - rLang = aLanguageTag; + rLang = std::move(aLanguageTag); return pRet; } } diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx index 366dd891b67e..c66d4e09d046 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx @@ -413,7 +413,7 @@ static void GetTextAreaOutline( FWCharacterData aCharacterData; if ( pVirDev->GetTextOutlines( aCharacterData.vOutlines, rText, 0, 0, -1, nWidth, aDXArray ) ) { - rParagraph.vCharacters.push_back( aCharacterData ); + rParagraph.vCharacters.push_back(std::move(aCharacterData)); } else {
