summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-11-24 22:58:01 +0100
committerStephan Bergmann <sbergman@redhat.com>2012-11-24 23:21:37 +0100
commit7bf64a5af4088c0f6d4dbf7f493e94fa63e2a4b2 (patch)
tree1b5203554f998da6402ee482da1499f6568bf31a /filter
parent774003e87946ca9dc63b1c1c550be968016d1e53 (diff)
Turn PDF import from bundled extension to plain code
No need for dirty hacks linking in basegfx objects statically any more. To avoid unnecessary confusion between the newly plain code and any instance of the old extension still installed (per-user or shared), I renamed all relevant UNO implementation identifiers from com.sun.star.comp.documents.* to org.libreoffice.comp.documents.*. Also, existing installations of the extension are explicitly not migrated to new user profiles. The xpdfimport executable is now in program/, its xpdfimport_err.pdf in share/xpdfimport/. To simplify finding the _err.pdf from xpdfimport, its full pathname is now given as additional second argument to xpdfimport. To find xpdfimport executable from CppunitTest, CppunitTest creates a symlink from solver's unittest/installation/program to solver's bin, so that "$BRAND_BASE_DIR/program/xpdfimport" works there (as CppunitTest now sets BRAND_BASE_DIR to solver's unittest/installation). The sdext/source/pdfipmort/dialogs/ Basic stuff appeared to be unused (even though it was included in the .oxt) and has been removed. The --disable-ext-pdfimport configure switch is renamed to --disable-pdfimport. Having it still conditional requires some pdf_Portable_Document_Format vs. pdf_Portable_Document_Format_import foo in module filter. Change-Id: Iee58c2f6187142a418decc9ea3a5df10eb7e0523
Diffstat (limited to 'filter')
-rw-r--r--filter/Configuration_filter.mk70
-rw-r--r--filter/source/config/fragments/types/pdf_Portable_Document_Format_import.xcu29
2 files changed, 92 insertions, 7 deletions
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index 5b41bdac1b3e..b629c0ba707d 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -329,7 +329,6 @@ $(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 \
@@ -339,6 +338,15 @@ $(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_ \
@@ -393,9 +401,17 @@ $(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 \
- pdf_Portable_Document_Format \
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 \
+)
+endif
$(call filter_Configuration_add_filters,fcfg_langpack,fcfg_web_filters.xcu,filter/source/config/fragments/filters,\
HTML \
@@ -424,9 +440,17 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_global_types.xcu,filter
generic_Text \
writer_StarOffice_XML_Writer \
writer_globaldocument_StarOffice_XML_Writer_GlobalDocument \
- pdf_Portable_Document_Format \
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 \
+)
+endif
$(call filter_Configuration_add_filters,fcfg_langpack,fcfg_global_filters.xcu,filter/source/config/fragments/filters,\
Text__encoded___StarWriter_GlobalDocument_ \
@@ -465,7 +489,6 @@ $(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 \
@@ -476,6 +499,15 @@ $(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 \
@@ -532,7 +564,6 @@ $(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 \
@@ -541,6 +572,15 @@ $(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_ \
@@ -570,7 +610,6 @@ $(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 \
@@ -582,6 +621,15 @@ $(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 \
@@ -642,9 +690,17 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_math_types.xcu,filter/s
math_MathML_XML_Math \
math_MathType_3x \
math_StarOffice_XML_Math \
- pdf_Portable_Document_Format \
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 \
+)
+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
new file mode 100644
index 000000000000..ab0ec52ec455
--- /dev/null
+++ b/filter/source/config/fragments/types/pdf_Portable_Document_Format_import.xcu
@@ -0,0 +1,29 @@
+<!--
+ * 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>