editeng/source/editeng/impedit4.cxx | 2 +- linguistic/source/lngsvcmgr.cxx | 4 +--- sc/source/ui/unoobj/fmtuno.cxx | 2 +- svx/source/items/zoomslideritem.cxx | 2 +- sw/source/core/txtnode/txtedt.cxx | 2 +- tools/source/fsys/urlobj.cxx | 4 ++++ ucb/source/ucp/tdoc/tdoc_content.cxx | 2 +- 7 files changed, 10 insertions(+), 8 deletions(-)
New commits: commit 54f5e44f580aa3eb8c498f27049f0f7e92ba2ffe Author: Caolán McNamara <[email protected]> AuthorDate: Wed Oct 16 21:15:50 2024 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Thu Nov 7 11:57:42 2024 +0100 cid#1606697 silence Overflowed constant Change-Id: I81d0b10f8e0c34f9d276e59b5eed2c3d879f05cd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176195 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Jenkins diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index 5e200867a5cc..84a89cd32808 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -2656,6 +2656,7 @@ bool INetURLObject::parseHost(sal_Unicode const *& rBegin, sal_Unicode const * p } else if (rtl::isAsciiHexDigit(*p) && nDigits < 4) { + assert(nNumber < 0xffff); nNumber = 16 * nNumber + INetMIME::getHexWeight(*p); ++nDigits; } @@ -2719,6 +2720,7 @@ bool INetURLObject::parseHost(sal_Unicode const *& rBegin, sal_Unicode const * p } else if (rtl::isAsciiDigit(*p) && nDigits < 3) { + assert(nNumber < 0xfff); nNumber = 16 * nNumber + INetMIME::getWeight(*p); ++nDigits; } @@ -2752,6 +2754,7 @@ bool INetURLObject::parseHost(sal_Unicode const *& rBegin, sal_Unicode const * p } else if (rtl::isAsciiHexDigit(*p) && nDigits < 4) { + assert(nNumber < 0xffff); nNumber = 16 * nNumber + INetMIME::getHexWeight(*p); ++nDigits; } @@ -2809,6 +2812,7 @@ bool INetURLObject::parseHost(sal_Unicode const *& rBegin, sal_Unicode const * p } else if (rtl::isAsciiDigit(*p) && nDigits < 3) { + assert(nNumber < 0xfff); nNumber = 16 * nNumber + INetMIME::getWeight(*p); ++nDigits; } commit 6ec7e5bb895a1d8ac4c5fc9e1d2855d189f3685a Author: Caolán McNamara <[email protected]> AuthorDate: Thu Nov 7 08:22:05 2024 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Thu Nov 7 11:57:31 2024 +0100 cid#1555009 COPY_INSTEAD_OF_MOVE and cid#1555173 COPY_INSTEAD_OF_MOVE cid#1555255 COPY_INSTEAD_OF_MOVE cid#1556619 COPY_INSTEAD_OF_MOVE cid#1556766 COPY_INSTEAD_OF_MOVE cid#1557131 COPY_INSTEAD_OF_MOVE Change-Id: Ia581e7858d8ff4db08308b4118116781db1464a6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176193 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index 03295ce18d93..d23bebd26830 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -3071,7 +3071,7 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection, aChgData.nLen = nLen; aChgData.aSelection = EditSelection( EditPaM( pNode, nCurrentStart ), EditPaM( pNode, nCurrentEnd ) ); aChgData.aNewText = aNewText; - aChgData.aOffsets = aOffsets; + aChgData.aOffsets = std::move(aOffsets); aChanges.push_back( aChgData ); } diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index 190a6009d9f5..71eae948e3a4 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -654,9 +654,7 @@ void LngSvcMgr::UpdateAll() Sequence< OUString > aCfgSvcs( getConfiguredServices( aService, aLocale )); Sequence< OUString > aAvailSvcs( getAvailableServices( aService, aLocale )); - aCfgSvcs = lcl_RemoveMissingEntries( aCfgSvcs, aAvailSvcs ); - - aCurSvcs[k][ rNodeName ] = aCfgSvcs; + aCurSvcs[k][rNodeName] = lcl_RemoveMissingEntries(aCfgSvcs, aAvailSvcs); } diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx index a20c1f5b3e8d..deaf80656f3e 100644 --- a/sc/source/ui/unoobj/fmtuno.cxx +++ b/sc/source/ui/unoobj/fmtuno.cxx @@ -272,7 +272,7 @@ void SAL_CALL ScTableConditionalFormat::addNew( else if ( rProp.Value >>= aTokens ) { aEntry.maExpr1.clear(); - aEntry.maTokens1 = aTokens; + aEntry.maTokens1 = std::move(aTokens); } } else if ( rProp.Name == SC_UNONAME_FORMULA2 ) diff --git a/svx/source/items/zoomslideritem.cxx b/svx/source/items/zoomslideritem.cxx index 4f5408d2343a..ba54a68e7739 100644 --- a/svx/source/items/zoomslideritem.cxx +++ b/svx/source/items/zoomslideritem.cxx @@ -173,7 +173,7 @@ bool SvxZoomSliderItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId css::uno::Sequence < sal_Int32 > aValues; if ( rVal >>= aValues ) { - maValues = aValues; + maValues = std::move(aValues); return true; } else diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index 59cee4abb992..099699e0170b 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -1982,7 +1982,7 @@ void SwTextNode::TransliterateText( aChgData.nStart = nCurrentStart; aChgData.nLen = nLen; aChgData.sChanged = sChgd; - aChgData.aOffsets = aOffsets; + aChgData.aOffsets = std::move(aOffsets); aChanges.push_back( aChgData ); } diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx index 358305003ecd..0eb051e95859 100644 --- a/ucb/source/ucp/tdoc/tdoc_content.cxx +++ b/ucb/source/ucp/tdoc/tdoc_content.cxx @@ -2797,7 +2797,7 @@ ContentProperties::getCreatableContentsInfo() const // Folder. aSeq.getArray()[ 0 ].Type = TDOC_FOLDER_CONTENT_TYPE; aSeq.getArray()[ 0 ].Attributes = ucb::ContentInfoAttribute::KIND_FOLDER; - aSeq.getArray()[ 0 ].Properties = aProps; + aSeq.getArray()[ 0 ].Properties = std::move(aProps); return aSeq; }
