summaryrefslogtreecommitdiff
path: root/sd/source/ui/docshell
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2017-07-19 08:42:36 +0200
committerJan Holesovsky <kendy@collabora.com>2017-07-21 19:46:41 +0200
commit5d0901a75e7ef96dc722b5277450cc18ad163f7b (patch)
tree10196f12c94e0f4680ffcd59e1b3c712853d6d70 /sd/source/ui/docshell
parent7b0607aa7d42e3ea4c1623d65b124970abc04d79 (diff)
sd pptm: Add a separate PPTM filter.
Similarly to commit 697173f6fdfae581022cfdb5ec5171c5a3be58f0, we have to preserve the correct content-type which is not the same for PPTX and PPTM. This commit also changes sdfilt.component to use the constructor feature. Change-Id: I4b334540ec07a53d308e6b9dd6403294842bddf8 Reviewed-on: https://gerrit.libreoffice.org/40195 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-on: https://gerrit.libreoffice.org/40265 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'sd/source/ui/docshell')
-rw-r--r--sd/source/ui/docshell/docshel4.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index c124c564a5a1..6c077ab3ae1a 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -387,8 +387,9 @@ bool DrawDocShell::ImportFrom(SfxMedium &rMedium,
uno::Reference<text::XTextRange> const& xInsertPosition)
{
const OUString aFilterName( rMedium.GetFilter()->GetFilterName() );
- if( aFilterName == "Impress MS PowerPoint 2007 XML" ||
- aFilterName == "Impress MS PowerPoint 2007 XML AutoPlay" )
+ if (aFilterName == "Impress MS PowerPoint 2007 XML" ||
+ aFilterName == "Impress MS PowerPoint 2007 XML AutoPlay" ||
+ aFilterName == "Impress MS PowerPoint 2007 XML VBA")
{
// As this is a MSFT format, we should use the "MS Compat"
// mode for spacing before and after paragraphs.