Kaydet (Commit) 878a860d authored tarafından Miklos Vajna's avatar Miklos Vajna

vcl: add initial PDF import-as-graphic filter

This allows Insert -> Image e.g. in Writer to read a PDF file, and
insert the metafile equivalent of the first page into the document.

Currently the original PDF document is lost on import (unlike when
inserting an SVG file).

Change-Id: Ib0472c5d9bd9a1da054353fa3a3a638a1052721e
Reviewed-on: https://gerrit.libreoffice.org/26586Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
Tested-by: 's avatarJenkins <ci@libreoffice.org>
üst 27211114
......@@ -837,6 +837,7 @@ $(eval $(call filter_Configuration_add_internal_filters,fcfg_langpack,fcfg_inter
pcd_Import_Base16 \
pct_Import \
pcx_Import \
pdf_Import \
pgm_Import \
png_Export \
png_Import \
......
<!--
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
-->
<node oor:name="pdf_Import" oor:op="replace" >
<prop oor:name="Type"><value>pdf_Portable_Document_Format</value></prop>
<prop oor:name="FormatName"><value>SVIPDF</value></prop>
<prop oor:name="RealFilterName"><value>PDF - Portable Document Format</value></prop>
<prop oor:name="UIComponent"/>
<prop oor:name="UIName">
<value xml:lang="en-US">PDF - Portable Document Format</value>
</prop>
<prop oor:name="Flags"><value>IMPORT</value></prop>
</node>
......@@ -75,6 +75,7 @@ namespace o3tl
#define IMP_XBM "SVIXBM"
#define IMP_XPM "SVIXPM"
#define IMP_SVG "SVISVG"
#define IMP_PDF "SVIPDF"
#define EXP_BMP "SVBMP"
#define EXP_SVMETAFILE "SVMETAFILE"
#define EXP_WMF "SVWMF"
......
......@@ -362,6 +362,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/filter/sgvtext \
vcl/source/filter/igif/decode \
vcl/source/filter/igif/gifread \
vcl/source/filter/ipdf/pdfread \
vcl/source/filter/ixbm/xbmread \
vcl/source/filter/ixpm/xpmread \
vcl/source/filter/jpeg/Exif \
......
......@@ -42,7 +42,7 @@ const char* FilterConfigCache::FilterConfigCacheEntry::InternalPixelFilterNameLi
const char* FilterConfigCache::FilterConfigCacheEntry::InternalVectorFilterNameList[] =
{
IMP_SVMETAFILE, IMP_WMF, IMP_EMF, IMP_SVSGF, IMP_SVSGV, IMP_SVG,
IMP_SVMETAFILE, IMP_WMF, IMP_EMF, IMP_SVSGF, IMP_SVSGV, IMP_SVG, IMP_PDF,
EXP_SVMETAFILE, EXP_WMF, EXP_EMF, EXP_SVG, nullptr
};
......
......@@ -41,6 +41,7 @@
#include <vcl/wmf.hxx>
#include <vcl/settings.hxx>
#include "igif/gifread.hxx"
#include "ipdf/pdfread.hxx"
#include "jpeg/jpeg.hxx"
#include "ixbm/xbmread.hxx"
#include "ixpm/xpmread.hxx"
......@@ -763,6 +764,16 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension,
}
}
if (!bTest || rFormatExtension.startsWith("PDF"))
{
if ((sFirstBytes[0] == '%' && sFirstBytes[1] == 'P' && sFirstBytes[2] == 'D' &&
sFirstBytes[3] == 'F' && sFirstBytes[4] == '-'))
{
rFormatExtension = "PDF";
return true;
}
}
return bTest && !bSomethingTested;
}
......@@ -1685,6 +1696,11 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPat
break;
}
}
else if (aFilterName == IMP_PDF)
{
if (!ImportPDF(rIStream, rGraphic))
nStatus = GRFILTER_FILTERERROR;
}
else
nStatus = GRFILTER_FILTERERROR;
}
......
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include "pdfread.hxx"
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/document/XFilter.hpp>
#include <com/sun/star/document/XImporter.hpp>
#include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
#include <com/sun/star/frame/Desktop.hpp>
#include <com/sun/star/io/XStream.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <comphelper/processfactory.hxx>
#include <comphelper/propertyvalue.hxx>
#include <comphelper/scopeguard.hxx>
#include <unotools/streamwrap.hxx>
#include <vcl/wmf.hxx>
using namespace com::sun::star;
namespace
{
/// Imports a PDF stream into Draw.
uno::Reference<lang::XComponent> importIntoDraw(SvStream& rStream)
{
// Create an empty Draw component.
uno::Reference<frame::XDesktop2> xDesktop = css::frame::Desktop::create(comphelper::getProcessComponentContext());
uno::Reference<frame::XComponentLoader> xComponentLoader(xDesktop, uno::UNO_QUERY);
uno::Sequence<beans::PropertyValue> aLoadArguments =
{
comphelper::makePropertyValue("Hidden", true)
};
uno::Reference<lang::XComponent> xComponent = xComponentLoader->loadComponentFromURL("private:factory/sdraw", "_default", 0, aLoadArguments);
// Import the PDF into it.
uno::Reference<lang::XMultiServiceFactory> xMultiServiceFactory(comphelper::getProcessServiceFactory());
// Need to go via FilterFactory, otherwise XmlFilterAdaptor::initialize() is not called.
uno::Reference<lang::XMultiServiceFactory> xFilterFactory(xMultiServiceFactory->createInstance("com.sun.star.document.FilterFactory"), uno::UNO_QUERY);
uno::Reference<document::XFilter> xFilter(xFilterFactory->createInstanceWithArguments("draw_pdf_import", uno::Sequence<uno::Any>()), uno::UNO_QUERY);
uno::Reference<document::XImporter> xImporter(xFilter, uno::UNO_QUERY);
xImporter->setTargetDocument(xComponent);
uno::Reference<io::XStream> xStream(new utl::OStreamWrapper(rStream));
uno::Sequence<beans::PropertyValue> aImportArguments =
{
// XmlFilterAdaptor::importImpl() mandates URL, even if it's empty.
comphelper::makePropertyValue("URL", OUString()),
comphelper::makePropertyValue("InputStream", xStream),
};
if (xFilter->filter(aImportArguments))
return xComponent;
else
{
xComponent->dispose();
return uno::Reference<lang::XComponent>();
}
}
}
VCL_DLLPUBLIC bool ImportPDF(SvStream& rStream, Graphic& rGraphic)
{
uno::Reference<lang::XComponent> xComponent = importIntoDraw(rStream);
if (!xComponent.is())
return false;
comphelper::ScopeGuard aGuard([&xComponent]()
{
xComponent->dispose();
});
// Get the preview of the first page.
uno::Reference<drawing::XDrawPagesSupplier> xDrawPagesSupplier(xComponent, uno::UNO_QUERY);
uno::Reference<drawing::XDrawPages> xDrawPages = xDrawPagesSupplier->getDrawPages();
if (xDrawPages->getCount() <= 0)
return false;
uno::Reference<beans::XPropertySet> xFirstPage(xDrawPages->getByIndex(0), uno::UNO_QUERY);
uno::Sequence<sal_Int8> aSequence;
if (!(xFirstPage->getPropertyValue("Preview") >>= aSequence))
return false;
if (!aSequence.hasElements())
return false;
// Convert it into a GDIMetaFile.
SvMemoryStream aPreviewStream(aSequence.getLength());
aPreviewStream.WriteBytes(aSequence.getArray(), aSequence.getLength());
aPreviewStream.Seek(0);
GDIMetaFile aMtf;
if (!ConvertWMFToGDIMetaFile(aPreviewStream, aMtf))
return false;
rGraphic = aMtf;
return true;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#ifndef INCLUDED_VCL_SOURCE_FILTER_IPDF_PDFREAD_HXX
#define INCLUDED_VCL_SOURCE_FILTER_IPDF_PDFREAD_HXX
#include <tools/stream.hxx>
#include <vcl/graph.hxx>
/// Imports a PDF stream into rGraphic as a GDIMetaFile.
VCL_DLLPUBLIC bool ImportPDF(SvStream& rStream, Graphic& rGraphic);
#endif // INCLUDED_VCL_SOURCE_FILTER_IPDF_PDFREAD_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment