diff options
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/objstor.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 61ab2371eb24..7eb2824636c7 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -101,6 +101,7 @@ #include <officecfg/Office/Common.hxx> #include <osl/file.hxx> #include <comphelper/scopeguard.hxx> +#include <comphelper/lok.hxx> #include <sfx2/signaturestate.hxx> #include <sfx2/app.hxx> @@ -746,9 +747,13 @@ bool SfxObjectShell::DoLoad( SfxMedium *pMed ) if ( GetError() == ERRCODE_NONE ) { + // Experimental PDF importing using PDFium. This is currently enabled for LOK only and + // we handle it not via XmlFilterAdaptor but a new SdPdfFiler. + const bool bPdfiumImport = comphelper::LibreOfficeKit::isActive() && pMedium->GetFilter() && + (pMedium->GetFilter()->GetFilterName() == "draw_pdf_import"); pImpl->nLoadedFlags = SfxLoadedFlags::NONE; pImpl->bModelInitialized = false; - if ( pMedium->GetFilter() && ( pMedium->GetFilter()->GetFilterFlags() & SfxFilterFlags::STARONEFILTER ) ) + if ( pMedium->GetFilter() && ( pMedium->GetFilter()->GetFilterFlags() & SfxFilterFlags::STARONEFILTER ) && !bPdfiumImport ) { uno::Reference < beans::XPropertySet > xSet( GetModel(), uno::UNO_QUERY ); const OUString sLockUpdates("LockUpdates"); |