diff options
| author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-08-05 15:18:16 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-08-06 09:13:52 +0200 |
| commit | ac0514fb3d7e93c06242dc72c5f56031dcb8a3c9 (patch) | |
| tree | 8c4d7486a24fb6fe78d87be4b3e76945695a88f4 /oox | |
| parent | 6e12713a7938e464b55a54b9dfd662000057a85f (diff) | |
cid#1555415 COPY_INSTEAD_OF_MOVE
and
cid#1555430 COPY_INSTEAD_OF_MOVE
cid#1555497 COPY_INSTEAD_OF_MOVE
cid#1555542 COPY_INSTEAD_OF_MOVE
cid#1555543 COPY_INSTEAD_OF_MOVE
cid#1555564 COPY_INSTEAD_OF_MOVE
cid#1555593 COPY_INSTEAD_OF_MOVE
cid#1555602 COPY_INSTEAD_OF_MOVE
cid#1555610 COPY_INSTEAD_OF_MOVE
cid#1555667 COPY_INSTEAD_OF_MOVE
cid#1555693 COPY_INSTEAD_OF_MOVE
cid#1555719 COPY_INSTEAD_OF_MOVE
cid#1555757 COPY_INSTEAD_OF_MOVE
cid#1555795 COPY_INSTEAD_OF_MOVE
cid#1555826 COPY_INSTEAD_OF_MOVE
cid#1555847 COPY_INSTEAD_OF_MOVE
cid#1555851 COPY_INSTEAD_OF_MOVE
cid#1555863 COPY_INSTEAD_OF_MOVE
cid#1555865 COPY_INSTEAD_OF_MOVE
cid#1555867 COPY_INSTEAD_OF_MOVE
cid#1555869 COPY_INSTEAD_OF_MOVE
cid#1555879 COPY_INSTEAD_OF_MOVE
cid#1555890 COPY_INSTEAD_OF_MOVE
cid#1555893 COPY_INSTEAD_OF_MOVE
cid#1555900 COPY_INSTEAD_OF_MOVE
cid#1555922 COPY_INSTEAD_OF_MOVE
cid#1555925 COPY_INSTEAD_OF_MOVE
Change-Id: I5d362a09e80eecd282e63c745bfe26eac2631a0d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171492
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/table/predefined-table-styles.cxx | 10 | ||||
| -rw-r--r-- | oox/source/drawingml/textbodycontext.cxx | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/oox/source/drawingml/table/predefined-table-styles.cxx b/oox/source/drawingml/table/predefined-table-styles.cxx index a02c8ddf0c89..9011b5c8c628 100644 --- a/oox/source/drawingml/table/predefined-table-styles.cxx +++ b/oox/source/drawingml/table/predefined-table-styles.cxx @@ -905,11 +905,11 @@ std::unique_ptr<TableStyle> CreateTableStyle(const OUString& styleId) pTableStyle->getFirstCol().getTextBoldStyle() = bFirstColTextBoldStyle; pTableStyle->getLastCol().getTextBoldStyle() = bLastColTextBoldStyle; - pTableStyle->getWholeTbl().getTextColor() = wholeTblTextColor; - pTableStyle->getFirstRow().getTextColor() = firstRowTextColor; - pTableStyle->getFirstCol().getTextColor() = firstColTextColor; - pTableStyle->getLastRow().getTextColor() = lastRowTextColor; - pTableStyle->getLastCol().getTextColor() = lastColTextColor; + pTableStyle->getWholeTbl().getTextColor() = std::move(wholeTblTextColor); + pTableStyle->getFirstRow().getTextColor() = std::move(firstRowTextColor); + pTableStyle->getFirstCol().getTextColor() = std::move(firstColTextColor); + pTableStyle->getLastRow().getTextColor() = std::move(lastRowTextColor); + pTableStyle->getLastCol().getTextColor() = std::move(lastColTextColor); pTableStyle->getBand1H().getTextColor() = ::oox::drawingml::Color(); //band1HTextColor pTableStyle->getBand1V().getTextColor() = ::oox::drawingml::Color(); //band1VTextColor diff --git a/oox/source/drawingml/textbodycontext.cxx b/oox/source/drawingml/textbodycontext.cxx index eef146b5d47a..ce8de24a09be 100644 --- a/oox/source/drawingml/textbodycontext.cxx +++ b/oox/source/drawingml/textbodycontext.cxx @@ -114,7 +114,7 @@ ContextHandlerRef TextParagraphContext::onCreateContext( sal_Int32 aElementToken rtl::Reference<HyperLinkContext> pContext(new HyperLinkContext( *this, rAttribs, pRun->getTextCharacterProperties().maHyperlinkPropertyMap)); // but create text run context because HyperLinkContext can't process internal w:r, w:t, etc - return new RegularTextRunContext(*this, pRun); + return new RegularTextRunContext(*this, std::move(pRun)); } default: SAL_WARN("oox", "TextParagraphContext::onCreateContext: unhandled element: " << getBaseToken(aElementToken)); |