mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

convert pdfimport to passive registration

Browse Source
This commit is contained in:
David Tardon
2012-04-19 12:12:29 +02:00
parent 6d9a524352
commit abd74a8ef0
8 changed files with 61 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Repository.mk
View File

@@ -494,7 +494,6 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
nullcanvas \
OGLTrans \
passwordcontainer \
pdfimport \
PresenterScreen \
simplecanvas \
slideshow \
@@ -559,6 +558,7 @@ $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \
))
$(eval $(call gb_Helper_register_libraries,EXTENSIONLIBS, \
pdfimport \
SunPresentationMinimizer \
))

2
sdext/Extension_pdfimport.mk
View File

@@ -31,6 +31,8 @@ $(eval $(call gb_Extension_Extension,pdfimport,sdext/source/pdfimport))
$(eval $(call gb_Extension_set_platform,pdfimport,$(sdext_PLATFORM)))
$(eval $(call gb_Extension_add_file,pdfimport,components.rdb,$(call gb_Rdb_get_target,pdfimport)))
$(eval $(call gb_Extension_add_files,pdfimport,,\
$(call gb_Executable_get_target,xpdfimport) \
$(call gb_Library_get_target,pdfimport) \

2
sdext/Library_pdfimport.mk
View File

@@ -27,6 +27,8 @@
$(eval $(call gb_Library_Library,pdfimport))
$(eval $(call gb_Library_set_componentfile,pdfimport,sdext/source/pdfimport/pdfimport))
$(eval $(call gb_Library_use_api,pdfimport,\
offapi \
udkapi \

1
sdext/Module_sdext.mk
View File

@@ -45,6 +45,7 @@ $(eval $(call gb_Module_add_targets,sdext,\
Executable_xpdfimport \
Extension_pdfimport \
Library_pdfimport \
Rdb_pdfimport \
StaticLibrary_pdfimport_s \
))

34
sdext/Rdb_pdfimport.mk Normal file
View File

@@ -0,0 +1,34 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
# the License or as specified alternatively below. You may obtain a copy of
# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
# Major Contributor(s):
# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
# (initial developer)
#
# All Rights Reserved.
#
# For minor contributions see the git repository.
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
$(eval $(call gb_Rdb_Rdb,pdfimport))
$(eval $(call gb_Rdb_add_components,pdfimport,\
sdext/source/pdfimport/pdfimport \
))
# vim:set shiftwidth=4 softtabstop=4 expandtab:

4
sdext/source/pdfimport/manifest.xml
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd">
<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
<manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-component;type=native"
manifest:full-path="pdfimport.uno@SHARED_EXTENSION@"/>
<manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-components;platform=@PLATFORM@"
manifest:full-path="components.rdb"/>
<manifest:file-entry manifest:media-type="application/vnd.sun.star.executable"
manifest:full-path="xpdfimport@EXEC_EXTENSION@"/>
<manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"

19
sdext/source/pdfimport/pdfimport.component Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0"?>
<component xmlns="http://openoffice.org/2010/uno-components"
loader="com.sun.star.loader.SharedLibrary">
<implementation name="com.sun.star.comp.documents.HybridPDFImport">
<service name="com.sun.star.document.ImportFilter"/>
</implementation>
<implementation name="com.sun.star.comp.documents.WriterPDFImport">
<service name="com.sun.star.document.ImportFilter"/>
</implementation>
<implementation name="com.sun.star.comp.documents.DrawPDFImport">
<service name="com.sun.star.document.ImportFilter"/>
</implementation>
<implementation name="com.sun.star.comp.documents.ImpressPDFImport">
<service name="com.sun.star.document.ImportFilter"/>
</implementation>
<implementation name="com.sun.star.comp.documents.PDFDetector">
<service name="com.sun.star.document.ImportFilter"/>
</implementation>
</component>

30
sdext/source/pdfimport/services.cxx
View File

@@ -119,36 +119,6 @@ namespace
}
}
extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL
component_writeInfo(
SAL_UNUSED_PARAMETER void* /*pServiceManager*/, void* pRegistryKey )
{
Reference< XRegistryKey > xRootKey( static_cast< XRegistryKey* >( pRegistryKey ) );
::rtl::OUString sRootKey( "/", 1, RTL_TEXTENCODING_ASCII_US );
const ComponentDescription* pComponents = lcl_getComponents();
while ( pComponents->pAsciiServiceName != NULL )
{
::rtl::OUString sMainKeyName( sRootKey );
sMainKeyName += ::rtl::OUString::createFromAscii( pComponents->pAsciiImplementationName );
sMainKeyName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
try
{
Reference< XRegistryKey > xNewKey( xRootKey->createKey( sMainKeyName ) );
xNewKey->createKey( ::rtl::OUString::createFromAscii( pComponents->pAsciiServiceName ) );
}
catch( Exception& )
{
OSL_FAIL( "OModule::writeComponentInfos: something went wrong while creating the keys!" );
return sal_False;
}
++pComponents;
}
return sal_True;
}
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
const sal_Char* pImplementationName,
SAL_UNUSED_PARAMETER void* /*pServiceManager*/,