diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2019-08-14 12:21:11 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-08-14 14:32:44 +0200 |
| commit | 88afec70112c95a016e92e26c1d06d7dd002e4e8 (patch) | |
| tree | e90e697236d2ca29dc628b8977ac356be707948d /embeddedobj/Library_embobj.mk | |
| parent | d3d13140f0036c53aa74820b41acfeffa3572168 (diff) | |
embeddedobj: respect config for Insert -> Object -> OLE Object -> from file
Tools -> Options -> Load/Save -> Microsoft Office has config options to
decide that Word/Excel/PowerPoint formats are loaded into our doc models
(default) or handled via external OLE applications instead.
This is used in the MSO import/export filters, but in case the UI is
used to insert a new file as an embedded object, then we ignored this
setting, and the embedding type depended on if we found an import filter
for the data or not (if yes, load it; handle externally otherwise).
Fix this inconsistency by checking for the usual MSO import filter names
and respect the existing configuration in those cases, so the user can
choose to not handle these formats internally if wanted.
Change-Id: I6bce8b5467768ef3f21d97b4e0fe3f4d18d9466b
Reviewed-on: https://gerrit.libreoffice.org/77449
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'embeddedobj/Library_embobj.mk')
| -rw-r--r-- | embeddedobj/Library_embobj.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/embeddedobj/Library_embobj.mk b/embeddedobj/Library_embobj.mk index 3030e2ae70c5..6e9929e95016 100644 --- a/embeddedobj/Library_embobj.mk +++ b/embeddedobj/Library_embobj.mk @@ -10,6 +10,10 @@ $(eval $(call gb_Library_Library,embobj)) +$(eval $(call gb_Library_use_custom_headers,embobj,\ + officecfg/registry \ +)) + $(eval $(call gb_Library_set_componentfile,embobj,embeddedobj/util/embobj)) $(eval $(call gb_Library_set_include,embobj,\ |