diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2012-11-29 11:27:45 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2012-11-29 11:36:58 +0100 |
commit | 79e5ee5f6949f4b8645ef32dba61705d02473c60 (patch) | |
tree | 2042e4b002d19e7d828b838537278ca9f10da629 /filter | |
parent | 053108588dd634838457ba81e7dc70e82aa50e02 (diff) |
Isolate PDF Import so it can be made optionally installable
...which can be attractive for installation sets that use --with-system-poppler
but do not want the LO core package to depend on a poppler package. See the
comment at the top of scp2/source/ooo/module_pdfimport.scp for details.
The build-time --disable-pdfimport configure switch is gone, PDF Import is built
unconditionally for all platforms but Android and iOS now. (The
ENABLE_PDFIMPORT variable now uses TRUE/FALSE rather than YES/NO, to increase
consistency across those variables.)
Change-Id: I6509d0b2e770b276cd54540408fb1ec5a7dda058
Diffstat (limited to 'filter')
-rw-r--r-- | filter/Configuration_filter.mk | 70 | ||||
-rw-r--r-- | filter/source/config/fragments/types/pdf_Portable_Document_Format_import.xcu | 29 |
2 files changed, 7 insertions, 92 deletions
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk index b629c0ba707d..5b41bdac1b3e 100644 --- a/filter/Configuration_filter.mk +++ b/filter/Configuration_filter.mk @@ -329,6 +329,7 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu,filter generic_Text \ writer_MIZI_Hwp_97 \ writer_StarOffice_XML_Writer_Template \ + pdf_Portable_Document_Format \ writer8_template \ writer8 \ writer_MS_Word_2003_XML \ @@ -338,15 +339,6 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu,filter writer_OOXML_Template \ writer_layout_dump_xml \ ) -ifeq ($(ENABLE_PDFIMPORT),YES) -$(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu,filter/source/config/fragments/types,\ - pdf_Portable_Document_Format_import \ -) -else -$(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu,filter/source/config/fragments/types,\ - pdf_Portable_Document_Format \ -) -endif $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters.xcu,filter/source/config/fragments/filters,\ HTML__StarWriter_ \ @@ -401,17 +393,9 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_web_types.xcu,filter/so writer_web_HTML_help \ writer_StarOffice_XML_Writer \ writer_web_StarOffice_XML_Writer_Web_Template \ - writerweb8_writer_template \ -) -ifeq ($(ENABLE_PDFIMPORT),YES) -$(call filter_Configuration_add_types,fcfg_langpack,fcfg_web_types.xcu,filter/source/config/fragments/types,\ - pdf_Portable_Document_Format_import \ -) -else -$(call filter_Configuration_add_types,fcfg_langpack,fcfg_web_types.xcu,filter/source/config/fragments/types,\ pdf_Portable_Document_Format \ + writerweb8_writer_template \ ) -endif $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_web_filters.xcu,filter/source/config/fragments/filters,\ HTML \ @@ -440,17 +424,9 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_global_types.xcu,filter generic_Text \ writer_StarOffice_XML_Writer \ writer_globaldocument_StarOffice_XML_Writer_GlobalDocument \ - writerglobal8 \ -) -ifeq ($(ENABLE_PDFIMPORT),YES) -$(call filter_Configuration_add_types,fcfg_langpack,fcfg_global_types.xcu,filter/source/config/fragments/types,\ - pdf_Portable_Document_Format_import \ -) -else -$(call filter_Configuration_add_types,fcfg_langpack,fcfg_global_types.xcu,filter/source/config/fragments/types,\ pdf_Portable_Document_Format \ + writerglobal8 \ ) -endif $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_global_filters.xcu,filter/source/config/fragments/filters,\ Text__encoded___StarWriter_GlobalDocument_ \ @@ -489,6 +465,7 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_calc_types.xcu,filter/s calc_SYLK \ calc_StarOffice_XML_Calc \ calc_StarOffice_XML_Calc_Template \ + pdf_Portable_Document_Format \ calc_dBase\ calc8 \ calc8_template \ @@ -499,15 +476,6 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_calc_types.xcu,filter/s calc_OOXML \ calc_OOXML_Template \ ) -ifeq ($(ENABLE_PDFIMPORT),YES) -$(call filter_Configuration_add_types,fcfg_langpack,fcfg_calc_types.xcu,filter/source/config/fragments/types,\ - pdf_Portable_Document_Format_import \ -) -else -$(call filter_Configuration_add_types,fcfg_langpack,fcfg_calc_types.xcu,filter/source/config/fragments/types,\ - pdf_Portable_Document_Format \ -) -endif $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_calc_filters.xcu,filter/source/config/fragments/filters,\ DIF \ @@ -564,6 +532,7 @@ $(call filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fr $(call filter_Configuration_add_types,fcfg_langpack,fcfg_draw_types.xcu,filter/source/config/fragments/types,\ draw_StarOffice_XML_Draw \ draw_StarOffice_XML_Draw_Template \ + pdf_Portable_Document_Format \ draw8 \ draw8_template \ draw_WordPerfect_Graphics \ @@ -572,15 +541,6 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_draw_types.xcu,filter/s draw_CorelDraw_Document \ draw_Corel_Presentation_Exchange \ ) -ifeq ($(ENABLE_PDFIMPORT),YES) -$(call filter_Configuration_add_types,fcfg_langpack,fcfg_draw_types.xcu,filter/source/config/fragments/types,\ - pdf_Portable_Document_Format_import \ -) -else -$(call filter_Configuration_add_types,fcfg_langpack,fcfg_draw_types.xcu,filter/source/config/fragments/types,\ - pdf_Portable_Document_Format \ -) -endif $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_draw_filters.xcu,filter/source/config/fragments/filters,\ StarOffice_XML__Draw_ \ @@ -610,6 +570,7 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_impress_types.xcu,filte impress_MS_PowerPoint_97_Vorlage \ impress_StarOffice_XML_Impress \ impress_StarOffice_XML_Impress_Template \ + pdf_Portable_Document_Format \ pwp_PlaceWare \ impress8 \ impress8_template \ @@ -621,15 +582,6 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_impress_types.xcu,filte impress_OOXML_Presentation_Template \ impress_OOXML_Presentation_AutoPlay \ ) -ifeq ($(ENABLE_PDFIMPORT),YES) -$(call filter_Configuration_add_types,fcfg_langpack,fcfg_impress_types.xcu,filter/source/config/fragments/types,\ - pdf_Portable_Document_Format_import \ -) -else -$(call filter_Configuration_add_types,fcfg_langpack,fcfg_impress_types.xcu,filter/source/config/fragments/types,\ - pdf_Portable_Document_Format \ -) -endif $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_impress_filters.xcu,filter/source/config/fragments/filters,\ MS_PowerPoint_97 \ @@ -690,17 +642,9 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_math_types.xcu,filter/s math_MathML_XML_Math \ math_MathType_3x \ math_StarOffice_XML_Math \ - math8 \ -) -ifeq ($(ENABLE_PDFIMPORT),YES) -$(call filter_Configuration_add_types,fcfg_langpack,fcfg_math_types.xcu,filter/source/config/fragments/types,\ - pdf_Portable_Document_Format_import \ -) -else -$(call filter_Configuration_add_types,fcfg_langpack,fcfg_math_types.xcu,filter/source/config/fragments/types,\ pdf_Portable_Document_Format \ + math8 \ ) -endif $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_math_filters.xcu,filter/source/config/fragments/filters,\ MathML_XML__Math_ \ diff --git a/filter/source/config/fragments/types/pdf_Portable_Document_Format_import.xcu b/filter/source/config/fragments/types/pdf_Portable_Document_Format_import.xcu deleted file mode 100644 index ab0ec52ec455..000000000000 --- a/filter/source/config/fragments/types/pdf_Portable_Document_Format_import.xcu +++ /dev/null @@ -1,29 +0,0 @@ -<!-- - * 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 . - --> - <node oor:name="pdf_Portable_Document_Format" oor:op="replace" > - <prop oor:name="DetectService"><value>org.libreoffice.comp.documents.PDFDetector</value></prop> - <prop oor:name="URLPattern"/> - <prop oor:name="Extensions"><value>pdf</value></prop> - <prop oor:name="MediaType"><value>application/pdf</value></prop> - <prop oor:name="Preferred"><value>true</value></prop> - <prop oor:name="PreferredFilter"><value>draw_pdf_import</value></prop> - <prop oor:name="UIName"> - <value>PDF - Portable Document Format (Draw)</value> - </prop> - <prop oor:name="ClipboardFormat"/> - </node> |