oox/source/drawingml/diagram/diagramhelper.cxx | 8 ++++---- sd/source/filter/eppt/pptx-epptbase.cxx | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-)
New commits: commit d818b010bea8fa515d62c4860b336a60f84880eb Author: Caolán McNamara <[email protected]> AuthorDate: Fri Jan 16 16:05:19 2026 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Sat Jan 17 13:00:28 2026 +0100 cid#1680363 Variable copied when it could be moved and cid#1680359 Variable copied when it could be moved Change-Id: I6cd005e4122c24a7841f1fd05b3099d32a38be17 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197467 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/oox/source/drawingml/diagram/diagramhelper.cxx b/oox/source/drawingml/diagram/diagramhelper.cxx index ba816ddbbabc..39b07935b6b5 100644 --- a/oox/source/drawingml/diagram/diagramhelper.cxx +++ b/oox/source/drawingml/diagram/diagramhelper.cxx @@ -204,11 +204,11 @@ bool AdvancedDiagramHelper::removeDiagramNode(const OUString& rNodeId) if(hasDiagramData()) { - const svx::diagram::DomMapFlags aResult = mpDiagramPtr->getData()->removeDiagramNode(rNodeId); + svx::diagram::DomMapFlags aResult = mpDiagramPtr->getData()->removeDiagramNode(rNodeId); bRetval = !aResult.empty(); // reset Dom properties at DiagramData - mpDiagramPtr->resetOOXDomValues(aResult); + mpDiagramPtr->resetOOXDomValues(std::move(aResult)); // reset temporary buffered ModelData association lists & rebuild them // and the Diagram DataModel @@ -230,12 +230,12 @@ void AdvancedDiagramHelper::TextInformationChange(const OUString& rDiagramDataMo } // try text change for model part in DiagramData - const svx::diagram::DomMapFlags aDomMapFlags(mpDiagramPtr->getData()->TextInformationChange(rDiagramDataModelID, rOutl)); + svx::diagram::DomMapFlags aDomMapFlags(mpDiagramPtr->getData()->TextInformationChange(rDiagramDataModelID, rOutl)); if(!aDomMapFlags.empty()) { // reset Dom properties at DiagramData - mpDiagramPtr->resetOOXDomValues(aDomMapFlags); + mpDiagramPtr->resetOOXDomValues(std::move(aDomMapFlags)); // still reset GrabBag at Associated SdrObjGroup object. There are no "OOX.*" // entries anymore, but others like "mso-rotation-angle" and others commit 896674504bb8e2b9de15cb2a6af2aa3f97866f51 Author: Caolán McNamara <[email protected]> AuthorDate: Fri Jan 16 16:04:15 2026 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Sat Jan 17 13:00:17 2026 +0100 cid#738815 Uninitialized scalar field Change-Id: I110683bd10c744ea0c057560ed6dd7d84417866d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197465 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx index dfbd16a0f0df..5dd0f374d485 100644 --- a/sd/source/filter/eppt/pptx-epptbase.cxx +++ b/sd/source/filter/eppt/pptx-epptbase.cxx @@ -109,6 +109,7 @@ PPTWriterBase::PPTWriterBase() , mbEmptyPresObj(false) , mbIsBackgroundDark(false) , mnAngle(0) + , mbHasCanvasPage(false) , mnPages(0) , mnMasterPages(0) , mnCanvasMasterIndex(SAL_MAX_UINT32) @@ -130,6 +131,7 @@ PPTWriterBase::PPTWriterBase( const rtl::Reference< SdXImpressDocument > & rXMod , mbEmptyPresObj(false) , mbIsBackgroundDark(false) , mnAngle(0) + , mbHasCanvasPage(false) , mnPages(0) , mnMasterPages(0) , mnCanvasMasterIndex(SAL_MAX_UINT32)
