From 3c446a4ded14ded98d88294ecf5f659718aee6ad Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 16 Jul 2020 12:01:46 +0200 Subject: sdext/pdfimport: create instances with uno constructors See tdf#74608 for motivation. Change-Id: I0c43eac5e325a22146c19f52a8226544c60b3aa9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98919 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sdext/Library_pdfimport.mk | 1 - sdext/source/pdfimport/filterdet.cxx | 8 ++ sdext/source/pdfimport/pdfiadaptor.cxx | 39 ++++++++ sdext/source/pdfimport/pdfimport.component | 17 ++-- sdext/source/pdfimport/services.cxx | 145 ----------------------------- 5 files changed, 58 insertions(+), 152 deletions(-) delete mode 100644 sdext/source/pdfimport/services.cxx (limited to 'sdext') diff --git a/sdext/Library_pdfimport.mk b/sdext/Library_pdfimport.mk index 11a1a3e9aebf..3359ef5e6a46 100644 --- a/sdext/Library_pdfimport.mk +++ b/sdext/Library_pdfimport.mk @@ -57,7 +57,6 @@ $(eval $(call gb_Library_add_exception_objects,pdfimport,\ sdext/source/pdfimport/pdfparse/pdfparse \ sdext/source/pdfimport/sax/emitcontext \ sdext/source/pdfimport/sax/saxattrlist \ - sdext/source/pdfimport/services \ sdext/source/pdfimport/tree/drawtreevisiting \ sdext/source/pdfimport/tree/genericelements \ sdext/source/pdfimport/tree/imagecontainer \ diff --git a/sdext/source/pdfimport/filterdet.cxx b/sdext/source/pdfimport/filterdet.cxx index b3fe676315fa..7619f4518b89 100644 --- a/sdext/source/pdfimport/filterdet.cxx +++ b/sdext/source/pdfimport/filterdet.cxx @@ -595,6 +595,14 @@ uno::Reference< io::XStream > getAdditionalStream( const OUString& return xEmbed; } + +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* +sdext_PDFDetector_get_implementation( + css::uno::XComponentContext* context , css::uno::Sequence const&) +{ + return cppu::acquire(new PDFDetector(context)); +} + } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/pdfiadaptor.cxx b/sdext/source/pdfimport/pdfiadaptor.cxx index a496736dca78..45f35320fe30 100644 --- a/sdext/source/pdfimport/pdfiadaptor.cxx +++ b/sdext/source/pdfimport/pdfiadaptor.cxx @@ -326,6 +326,45 @@ css::uno::Sequence PDFIRawAdaptor::getSupportedServiceNames() return css::uno::Sequence{"com.sun.star.document.ImportFilter"}; } + + +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* +sdext_PDFIRawAdaptor_Writer_get_implementation( + css::uno::XComponentContext* context , css::uno::Sequence const&) +{ + pdfi::PDFIRawAdaptor* pAdaptor = new pdfi::PDFIRawAdaptor( "org.libreoffice.comp.documents.WriterPDFImport", context ); + pAdaptor->setTreeVisitorFactory(pdfi::createWriterTreeVisitorFactory()); + pAdaptor->acquire(); + return static_cast(pAdaptor); +} + +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* +sdext_PDFIRawAdaptor_Draw_get_implementation( + css::uno::XComponentContext* context , css::uno::Sequence const&) +{ + pdfi::PDFIRawAdaptor* pAdaptor = new pdfi::PDFIRawAdaptor( "org.libreoffice.comp.documents.DrawPDFImport", context ); + pAdaptor->setTreeVisitorFactory(pdfi::createDrawTreeVisitorFactory()); + pAdaptor->acquire(); + return static_cast(pAdaptor); +} + +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* +sdext_PDFIRawAdaptor_Impress_get_implementation( + css::uno::XComponentContext* context , css::uno::Sequence const&) +{ + pdfi::PDFIRawAdaptor* pAdaptor = new pdfi::PDFIRawAdaptor( "org.libreoffice.comp.documents.ImpressPDFImport", context ); + pAdaptor->setTreeVisitorFactory(pdfi::createImpressTreeVisitorFactory()); + pAdaptor->acquire(); + return static_cast(pAdaptor); +} + +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* +sdext_PDFIHybridAdaptor_get_implementation( + css::uno::XComponentContext* context , css::uno::Sequence const&) +{ + return cppu::acquire(new pdfi::PDFIHybridAdaptor( context )); +} + } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/pdfimport.component b/sdext/source/pdfimport/pdfimport.component index 396b37ead8cb..125e90589656 100644 --- a/sdext/source/pdfimport/pdfimport.component +++ b/sdext/source/pdfimport/pdfimport.component @@ -8,20 +8,25 @@ * --> - + xmlns="http://openoffice.org/2010/uno-components"> + - + - + - + - + diff --git a/sdext/source/pdfimport/services.cxx b/sdext/source/pdfimport/services.cxx deleted file mode 100644 index b15f497dc481..000000000000 --- a/sdext/source/pdfimport/services.cxx +++ /dev/null @@ -1,145 +0,0 @@ -/* -*- 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/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - - -#include "pdfiadaptor.hxx" -#include "filterdet.hxx" -#include - -#include -#include - -using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::registry; - - -namespace -{ - Reference< XInterface > Create_PDFIHybridAdaptor( const Reference< XComponentContext >& _rxContext ) - { - return *(new pdfi::PDFIHybridAdaptor( _rxContext )); - } - - Reference< XInterface > Create_PDFIRawAdaptor_Writer( const Reference< XComponentContext >& _rxContext ) - { - pdfi::PDFIRawAdaptor* pAdaptor = new pdfi::PDFIRawAdaptor( "org.libreoffice.comp.documents.WriterPDFImport", _rxContext ); - - pAdaptor->setTreeVisitorFactory(pdfi::createWriterTreeVisitorFactory()); - - return uno::Reference(static_cast(pAdaptor)); - } - - Reference< XInterface > Create_PDFIRawAdaptor_Draw( const Reference< XComponentContext >& _rxContext ) - { - pdfi::PDFIRawAdaptor* pAdaptor = new pdfi::PDFIRawAdaptor( "org.libreoffice.comp.documents.DrawPDFImport", _rxContext ); - - pAdaptor->setTreeVisitorFactory(pdfi::createDrawTreeVisitorFactory()); - - return uno::Reference(static_cast(pAdaptor)); - } - - Reference< XInterface > Create_PDFIRawAdaptor_Impress( const Reference< XComponentContext >& _rxContext ) - { - pdfi::PDFIRawAdaptor* pAdaptor = new pdfi::PDFIRawAdaptor( "org.libreoffice.comp.documents.ImpressPDFImport", _rxContext ); - - pAdaptor->setTreeVisitorFactory(pdfi::createImpressTreeVisitorFactory()); - - return uno::Reference(static_cast(pAdaptor)); - } - - Reference< XInterface > Create_PDFDetector( const Reference< XComponentContext >& _rxContext ) - { - return *(new pdfi::PDFDetector( _rxContext ) ); - } -} - -namespace -{ - typedef Reference< XInterface > (* ComponentFactory)( const Reference< XComponentContext >& ); - - struct ComponentDescription - { - const char* pAsciiServiceName; - const char* pAsciiImplementationName; - ComponentFactory pFactory; - - ComponentDescription() - :pAsciiServiceName( nullptr ) - ,pAsciiImplementationName( nullptr ) - ,pFactory( nullptr ) - { - } - ComponentDescription( const char* _pAsciiServiceName, const char* _pAsciiImplementationName, ComponentFactory _pFactory ) - :pAsciiServiceName( _pAsciiServiceName ) - ,pAsciiImplementationName( _pAsciiImplementationName ) - ,pFactory( _pFactory ) - { - } - }; - - const ComponentDescription* lcl_getComponents() - { - static const ComponentDescription aDescriptions[] = { - ComponentDescription( "com.sun.star.document.ImportFilter", "org.libreoffice.comp.documents.HybridPDFImport", Create_PDFIHybridAdaptor ), - ComponentDescription( "com.sun.star.document.ImportFilter", "org.libreoffice.comp.documents.WriterPDFImport", Create_PDFIRawAdaptor_Writer ), - ComponentDescription( "com.sun.star.document.ImportFilter", "org.libreoffice.comp.documents.DrawPDFImport", Create_PDFIRawAdaptor_Draw ), - ComponentDescription( "com.sun.star.document.ImportFilter", "org.libreoffice.comp.documents.ImpressPDFImport", Create_PDFIRawAdaptor_Impress ), - ComponentDescription( "com.sun.star.document.ImportFilter", "org.libreoffice.comp.documents.PDFDetector", Create_PDFDetector ), - ComponentDescription() - }; - return aDescriptions; - } -} - -extern "C" SAL_DLLPUBLIC_EXPORT void* pdfimport_component_getFactory( - const char* pImplementationName, - SAL_UNUSED_PARAMETER void* /*pServiceManager*/, - SAL_UNUSED_PARAMETER void* /*pRegistryKey*/ ) -{ - OUString sImplementationName( OUString::createFromAscii( pImplementationName ) ); - - Reference< XSingleComponentFactory > xFactory; - - const ComponentDescription* pComponents = lcl_getComponents(); - while ( pComponents->pAsciiServiceName != nullptr ) - { - if ( sImplementationName.equalsAscii( pComponents->pAsciiImplementationName ) ) - { - Sequence< OUString > sServices(1); - sServices[0] = OUString::createFromAscii( pComponents->pAsciiServiceName ); - - xFactory = ::cppu::createSingleComponentFactory( - pComponents->pFactory, - sImplementationName, - sServices - ); - break; - } - - ++pComponents; - } - - // by definition, objects returned via this C API need to ber acquired once - xFactory->acquire(); - return xFactory.get(); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit