diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-07-09 19:49:34 +1000 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-07-10 18:38:40 +0200 |
| commit | edc62adae9a354ca1305e83b10c98a545f58d341 (patch) | |
| tree | 5bdbcf8901df3e18183fcffc8c4ac6c9c6ae610a /sw/source/ui/dbui/mmlayoutpage.cxx | |
| parent | d7cdb7fcc48a580cd5183ba899f73f2ad9bdbec9 (diff) | |
tdf#118634: Don't save embedded data source to a temporary preview document
Also don't use storeAsURL to store embedded datasource when the document
is being saved using storeToURL.
Change-Id: I69a7ee5ae066e591be5e45c87bcf57dff370decc
Reviewed-on: https://gerrit.libreoffice.org/57178
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sw/source/ui/dbui/mmlayoutpage.cxx')
| -rw-r--r-- | sw/source/ui/dbui/mmlayoutpage.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx index ff38b6d75aa8..4fb050c0096d 100644 --- a/sw/source/ui/dbui/mmlayoutpage.cxx +++ b/sw/source/ui/dbui/mmlayoutpage.cxx @@ -111,10 +111,13 @@ SwMailMergeLayoutPage::SwMailMergeLayoutPage( SwMailMergeWizard* _pParent) : aTempFile.EnableKillingFile(); } SwView* pView = m_pWizard->GetSwView(); - uno::Sequence< beans::PropertyValue > aValues(1); + uno::Sequence< beans::PropertyValue > aValues(2); beans::PropertyValue* pValues = aValues.getArray(); pValues[0].Name = "FilterName"; pValues[0].Value <<= pSfxFlt->GetFilterName(); + // Don't save embedded data set! It would steal it from current document. + pValues[1].Name = "NoEmbDataSet"; + pValues[1].Value <<= true; uno::Reference< frame::XStorable > xStore( pView->GetDocShell()->GetModel(), uno::UNO_QUERY); xStore->storeToURL( m_sExampleURL, aValues ); |