ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

sw mailmerge: Use SwXTextDocument directly, avoid UNO querying

Browse Source 
Call SwDocShell::GetBaseModel instead of SfxObjectShell::GetModel
to get a reference to the concrete SwXTextDocument
instead of to the abstract XModel3 interface.

This allows calling its `storeToUrl` method directly, without
having to explicitly query for the XStorable interface
first.

Change-Id: I276a70c4766a2baa14a86f80fdafa529f68ceed4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/211055
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
This commit is contained in:
Michael Weghorn
2026-09-17 14:51:47 +02:00
parent 59de16fb1c
commit 79514c6d03
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/source/ui/dbui/mmresultdialogs.cxx
+8 -8
View File
@@ -595,11 +595,11 @@ IMPL_LINK_NOARG(SwMMResultSaveDialog, SaveOutputHdl_Impl, weld::Button&, void)
{
uno::Sequence< beans::PropertyValue > aValues { comphelper::makePropertyValue(u"FilterName"_ustr, sFilter) };
uno::Reference< frame::XStorable > xStore( pTargetView->GetDocShell()->GetModel(), uno::UNO_QUERY);
rtl::Reference<SwXTextDocument> pModel = pTargetView->GetDocShell()->GetBaseModel();
ErrCode nErrorCode = ERRCODE_NONE;
try
{
xStore->storeToURL( sPath, aValues );
pModel->storeToURL(sPath, aValues);
}
catch (const task::ErrorCodeIOException& rErrorEx)
{
@@ -629,11 +629,11 @@ IMPL_LINK_NOARG(SwMMResultSaveDialog, SaveOutputHdl_Impl, weld::Button&, void)
pValues[0].Name = "FilterName";
pValues[0].Value <<= pSfxFlt->GetFilterName();
uno::Reference< frame::XStorable > xStore( pTargetView->GetDocShell()->GetModel(), uno::UNO_QUERY);
rtl::Reference<SwXTextDocument> pModel = pTargetView->GetDocShell()->GetBaseModel();
ErrCode nErrorCode = ERRCODE_NONE;
try
{
xStore->storeToURL( sTargetTempURL, aValues );
pModel->storeToURL(sTargetTempURL, aValues);
}
catch (const task::ErrorCodeIOException& rErrorEx)
{
@@ -1111,8 +1111,8 @@ IMPL_LINK_NOARG(SwMMResultEmailDialog, SendDocumentsHdl_Impl, weld::Button&, voi
uno::Sequence< beans::PropertyValue > aValues { comphelper::makePropertyValue(u"FilterName"_ustr, pTargetSfxFlt->GetFilterName()) };
uno::Reference< frame::XStorable > xStore( pTargetView->GetDocShell()->GetModel(), uno::UNO_QUERY);
xStore->storeToURL( sTargetTempURL, aValues );
rtl::Reference<SwXTextDocument> pModel = pTargetView->GetDocShell()->GetBaseModel();
pModel->storeToURL(sTargetTempURL, aValues);
//create the send dialog
std::shared_ptr<SwSendMailDialog> xDlg = std::make_shared<SwSendMailDialog>(Application::GetDefDialogParent(), *xConfigItem);
@@ -1191,8 +1191,8 @@ IMPL_LINK_NOARG(SwMMResultEmailDialog, SendDocumentsHdl_Impl, weld::Button&, voi
pFilterValues[nOpt].Value <<= sPassword;
}
uno::Reference< frame::XStorable > xTempStore( pTempView->GetDocShell()->GetModel(), uno::UNO_QUERY);
xTempStore->storeToURL( aName.GetValue(), aFilterValues );
rtl::Reference<SwXTextDocument> pTempModel = pTempView->GetDocShell()->GetBaseModel();
pTempModel->storeToURL(aName.GetValue(), aFilterValues);
}
xTempDocShell->DoClose();