diff options
author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-07-23 08:25:57 +0100 |
---|---|---|
committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-07-23 21:58:02 +0200 |
commit | 8a83a62410bc3f9bbcd6d0dabb260814c6172bf8 (patch) | |
tree | d195c4f8a03960e89f68e05f9b1264b62af75a5f /vcl | |
parent | ac0a497d09d8b4c0b624f788c8db34081fb8caa9 (diff) |
cid#1555167 COPY_INSTEAD_OF_MOVE
and
cid#1555172 COPY_INSTEAD_OF_MOVE
cid#1555184 COPY_INSTEAD_OF_MOVE
cid#1555188 COPY_INSTEAD_OF_MOVE
cid#1555197 COPY_INSTEAD_OF_MOVE
cid#1555209 COPY_INSTEAD_OF_MOVE
cid#1555211 COPY_INSTEAD_OF_MOVE
cid#1555215 COPY_INSTEAD_OF_MOVE
cid#1555216 COPY_INSTEAD_OF_MOVE
cid#1555217 COPY_INSTEAD_OF_MOVE
cid#1555218 COPY_INSTEAD_OF_MOVE
cid#1555222 COPY_INSTEAD_OF_MOVE
cid#1556674 COPY_INSTEAD_OF_MOVE
cid#1555229 COPY_INSTEAD_OF_MOVE
cid#1555233 COPY_INSTEAD_OF_MOVE
cid#1555234 COPY_INSTEAD_OF_MOVE
cid#1555242 COPY_INSTEAD_OF_MOVE
cid#1555250 COPY_INSTEAD_OF_MOVE
cid#1555251 COPY_INSTEAD_OF_MOVE
cid#1555254 COPY_INSTEAD_OF_MOVE
cid#1555304 COPY_INSTEAD_OF_MOVE
cid#1555307 COPY_INSTEAD_OF_MOVE
cid#1555317 COPY_INSTEAD_OF_MOVE
cid#1555329 COPY_INSTEAD_OF_MOVE
cid#1555340 COPY_INSTEAD_OF_MOVE
cid#1555347 COPY_INSTEAD_OF_MOVE
cid#1555352 COPY_INSTEAD_OF_MOVE
cid#1555358 COPY_INSTEAD_OF_MOVE
cid#1555363 COPY_INSTEAD_OF_MOVE
cid#1555365 COPY_INSTEAD_OF_MOVE
cid#1555367 COPY_INSTEAD_OF_MOVE
cid#1555374 COPY_INSTEAD_OF_MOVE
cid#1555380 COPY_INSTEAD_OF_MOVE
Change-Id: I343194c10749488a1143e2517ee0638ab19da218
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170888
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/source/bitmap/dibtools.cxx | 4 | ||||
-rw-r--r-- | vcl/source/filter/graphicfilter.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/pdfwriter_impl.cxx | 8 | ||||
-rw-r--r-- | vcl/source/outdev/bitmap.cxx | 2 |
4 files changed, 7 insertions, 9 deletions
diff --git a/vcl/source/bitmap/dibtools.cxx b/vcl/source/bitmap/dibtools.cxx index c4b15f79e76b..97bcb86b0feb 100644 --- a/vcl/source/bitmap/dibtools.cxx +++ b/vcl/source/bitmap/dibtools.cxx @@ -1036,11 +1036,11 @@ bool ImplReadDIBBody(SvStream& rIStm, Bitmap& rBmp, AlphaMask* pBmpAlpha, sal_uI if (bRet) { - rBmp = aNewBmp; + rBmp = std::move(aNewBmp); if(bAlphaPossible) { - *pBmpAlpha = aNewBmpAlpha; + *pBmpAlpha = std::move(aNewBmpAlpha); } } diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index 111bd905eb33..71092f3b8ffb 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -926,7 +926,7 @@ ErrCode GraphicFilter::readPNG(SvStream & rStream, Graphic & rGraphic, GfxLinkTy std::shared_ptr<SvStream> pIStrm(aMSGifChunk.getAsStream()); ImportGIF(*pIStrm, rGraphic); rLinkType = GfxLinkType::NativeGif; - rpGraphicContent = aMSGifChunk; + rpGraphicContent = std::move(aMSGifChunk); return aReturnCode; } diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index f0c49730a03a..f8477d02965a 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -1260,16 +1260,14 @@ PDFWriterImpl::PDFWriterImpl( const PDFWriter::PDFWriterContext& rContext, m_aStructure[0].m_nParentElement = 0; //m_StructElementStack.push(0); - Font aFont; - aFont.SetFamilyName( u"Times"_ustr ); - aFont.SetFontSize( Size( 0, 12 ) ); - // tdf#150786 use the same settings for widgets regardless of theme m_aWidgetStyleSettings.SetStandardStyles(); GraphicsState aState; aState.m_aMapMode = m_aMapMode; - aState.m_aFont = aFont; + aState.m_aFont.SetFamilyName( u"Times"_ustr ); + aState.m_aFont.SetFontSize( Size( 0, 12 ) ); + m_aGraphicsStack.push_front( aState ); osl::File::RC aError = m_aFile.open(osl_File_OpenFlag_Write | osl_File_OpenFlag_Create); diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx index 86ac23137562..3788a1238818 100644 --- a/vcl/source/outdev/bitmap.cxx +++ b/vcl/source/outdev/bitmap.cxx @@ -677,7 +677,7 @@ void OutputDevice::DrawDeviceAlphaBitmapSlowPath(const Bitmap& rBitmap, if (aLinearContext.blendBitmap( BitmapScopedWriteAccess(aBmp).get(), pBitmapReadAccess.get(), pAlphaReadAccess.get(), nDstWidth, nDstHeight)) { - aNewBitmap = aBmp; + aNewBitmap = std::move(aBmp); } else { |