reportdesign/source/core/api/ReportDefinition.cxx | 11 +++++------ sw/source/uibase/uiview/view2.cxx | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-)
New commits: commit d5cfca11655d8ddbb4cf3c6a5fb241da9da3dcbb Author: Caolán McNamara <caolan.mcnam...@collabora.com> AuthorDate: Mon Jul 14 21:12:10 2025 +0100 Commit: Caolán McNamara <caolan.mcnam...@collabora.com> CommitDate: Tue Jul 15 09:45:02 2025 +0200 cid#1659059 COPY_INSTEAD_OF_MOVE Change-Id: I004650d26cf5df77fc06ea695ff4a14c5a3670a3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187878 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com> diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx index 44ccd1f9d4d7..6fb0897cead7 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -1313,7 +1313,7 @@ void SwView::Execute(SfxRequest &rReq) auto xDialog = std::make_shared<svx::GotoPageDlg>( GetViewFrame().GetFrameWeld(), SwResId(STR_GOTO_PAGE_DLG_TITLE), SwResId(ST_PGE) + ":", nPhyPage, GetWrtShell().GetPageCnt()); - weld::DialogController::runAsync(xDialog, [this, xDialog, xRequest](sal_uInt32 nResult) { + weld::DialogController::runAsync(xDialog,[this, xDialog, xRequest=std::move(xRequest)](sal_uInt32 nResult) { if (nResult == RET_OK) GetWrtShell().GotoPage(xDialog->GetPageSelection(), true); commit f279d9129063f055b2a4ccb7fcaea044416954b2 Author: Michael Weghorn <m.wegh...@posteo.de> AuthorDate: Mon Jul 14 23:33:47 2025 +0200 Commit: Michael Weghorn <m.wegh...@posteo.de> CommitDate: Tue Jul 15 09:44:48 2025 +0200 reportdesign: Simplify assignment of uno::Reference vars Declare vars when they're assigned. Drop unnecessary rtl::Reference vars and rtl::Reference::get() calls. Change-Id: I085a7f19b5895155e4f7375af897df520a7dd8b7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187884 Reviewed-by: Michael Weghorn <m.wegh...@posteo.de> Tested-by: Jenkins diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index 2cd976f31f80..ab4ee631e0dc 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -1329,12 +1329,11 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS auto pDelegatorArguments = aDelegatorArguments.getArray(); pDelegatorArguments[nArgsLen++] <<= xInfoSet; - uno::Reference< document::XEmbeddedObjectResolver > xObjectResolver; - uno::Reference<document::XGraphicStorageHandler> xGraphicStorageHandler; - rtl::Reference<SvXMLGraphicHelper> xGraphicHelper = SvXMLGraphicHelper::Create(_xStorageToSaveTo,SvXMLGraphicHelperMode::Write); - xGraphicStorageHandler = xGraphicHelper.get(); - xGraphicHelper.clear(); - xObjectResolver = SvXMLEmbeddedObjectHelper::Create( _xStorageToSaveTo,*this, SvXMLEmbeddedObjectHelperMode::Write ).get(); + uno::Reference<document::XGraphicStorageHandler> xGraphicStorageHandler + = SvXMLGraphicHelper::Create(_xStorageToSaveTo, SvXMLGraphicHelperMode::Write); + uno::Reference<document::XEmbeddedObjectResolver> xObjectResolver + = SvXMLEmbeddedObjectHelper::Create(_xStorageToSaveTo, *this, + SvXMLEmbeddedObjectHelperMode::Write); pDelegatorArguments[nArgsLen++] <<= xGraphicStorageHandler; pDelegatorArguments[nArgsLen++] <<= xObjectResolver;