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 /include/sfx2 | |
| 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 'include/sfx2')
| -rw-r--r-- | include/sfx2/objsh.hxx | 3 | ||||
| -rw-r--r-- | include/sfx2/sfxsids.hrc | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index b5e5fb0b498d..a6bff464d369 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -584,7 +584,8 @@ public: static bool CopyStoragesOfUnknownMediaType( const css::uno::Reference< css::embed::XStorage >& xSource, - const css::uno::Reference< css::embed::XStorage >& xTarget ); + const css::uno::Reference<css::embed::XStorage>& xTarget, + const css::uno::Sequence<OUString>& rExceptions = css::uno::Sequence<OUString>()); // The functions from SvPersist void EnableSetModified( bool bEnable = true ); diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc index 49bfb72846f2..bbf108841bd1 100644 --- a/include/sfx2/sfxsids.hrc +++ b/include/sfx2/sfxsids.hrc @@ -174,7 +174,7 @@ class SfxDocumentInfoItem; #define SID_CONTENTTYPE (SID_SFX_START + 1541) -#define SID_SAVETO (SID_SFX_START + 1546) +#define SID_SAVETO TypedWhichId<SfxBoolItem>(SID_SFX_START + 1546) #define SID_VERSION (SID_SFX_START + 1583) @@ -251,8 +251,11 @@ class SfxDocumentInfoItem; #define SID_TOOLBAR_MODE (SID_SFX_START + 1728) #define SID_NO_FILE_SYNC (SID_SFX_START + 1729) #define SID_NO_THUMBNAIL (SID_SFX_START + 1730) +// Used to export a temporary file for preview in Mail Merge Wizard, where saving the data source is +// not required for preview, but interferes with not-yet-saved embedded data source for main document. +#define SID_NO_EMBEDDED_DS TypedWhichId<SfxBoolItem>(SID_SFX_START + 1731) -// SID_SFX_free_START (SID_SFX_START + 1731) +// SID_SFX_free_START (SID_SFX_START + 1732) // SID_SFX_free_END (SID_SFX_START + 3999) #define SID_OPEN_NEW_VIEW (SID_SFX_START + 520) |