Makefile.in | 4
Repository.mk | 6
config_host/config_poppler.h.in | 12
configure.ac | 12
scp2/Module_scp2.mk | 4
scp2/source/ooo/common_brand.scp | 8
scp2/source/ooo/file_ooo.scp | 4
sd/CppunitTest_sd_import_tests.mk | 2
sd/qa/unit/import-tests.cxx | 10
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 8
solenv/bin/macosx-codesign-app-bundle | 2
sysui/desktop/macosx/Info.plist.in | 1473 +++++++++++-------
ure/Package_install.mk | 2
vcl/Module_vcl.mk | 12
14 files changed, 1007 insertions(+), 552 deletions(-)
New commits:
commit 64b8ffdc6b92c9efeebe335d4054ae28cbd43f0c
Author: Andras Timar <andras.ti...@collabora.com>
Date: Sun May 17 17:50:33 2015 +0200
codesign --force
Change-Id: I4128e4eb127098eafa96e82cc3e698a75079b53b
diff --git a/solenv/bin/macosx-codesign-app-bundle
b/solenv/bin/macosx-codesign-app-bundle
index 04d52aa..23fe2be 100755
--- a/solenv/bin/macosx-codesign-app-bundle
+++ b/solenv/bin/macosx-codesign-app-bundle
@@ -58,7 +58,7 @@ done
find "$APP_BUNDLE/Contents/MacOS" -type f |
while read file; do
id=`echo ${file#${APP_BUNDLE}/Contents/} | sed -e 's,/,.,g'`
- codesign --verbose --identifier=$MACOSX_BUNDLE_IDENTIFIER.$id --sign
"$MACOSX_CODESIGNING_IDENTITY" $entitlements "$file"
+ codesign --force --verbose --identifier=$MACOSX_BUNDLE_IDENTIFIER.$id
--sign "$MACOSX_CODESIGNING_IDENTITY" $entitlements "$file"
done
# Sign included bundles. First .app ones (i.e. the Python.app inside
commit ab4c2403129c2b832769ff00e36f332c6357f33f
Author: Andras Timar <andras.ti...@collabora.com>
Date: Sun May 17 16:26:15 2015 +0200
use Info.plist from cp-4.3
Change-Id: I61d8d9fca19fe6e02b2d7f9129b1a15dbd9758c5
diff --git a/sysui/desktop/macosx/Info.plist.in
b/sysui/desktop/macosx/Info.plist.in
index 6f6f711..c6bb7d9 100755
--- a/sysui/desktop/macosx/Info.plist.in
+++ b/sysui/desktop/macosx/Info.plist.in
@@ -21,7 +21,7 @@
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
- <!-- UTI declarations for OS X >= 10.4 -->
+
<key>UTExportedTypeDeclarations</key>
<array>
<!-- Writer documents -->
@@ -48,6 +48,8 @@
<string>application/vnd.stardivision.writer</string>
</array>
</dict>
+ <key>UTTypeIconFile</key>
+ <string>text.icns</string>
</dict>
<dict>
<key>UTTypeIdentifier</key>
@@ -70,28 +72,8 @@
<string>application/vnd.oasis.opendocument.text</string>
</array>
</dict>
- </dict>
- <dict>
- <key>UTTypeIdentifier</key>
- <string>vnd.oasis.opendocument.text-flat-xml</string>
- <key>UTTypeDescription</key>
- <string>OpenDocument Text (Flat XML)</string>
- <key>UTTypeConformsTo</key>
- <array>
- <string>public.data</string>
- <string>public.content</string>
- </array>
- <key>UTTypeTagSpecification</key>
- <dict>
- <key>public.filename-extension</key>
- <array>
- <string>fodt</string>
- </array>
- <key>public.mime-type</key>
- <array>
-
<string>application/vnd.oasis.opendocument.text-flat-xml</string>
- </array>
- </dict>
+ <key>UTTypeIconFile</key>
+ <string>oasis-text.icns</string>
</dict>
<!-- Calc documents -->
@@ -118,6 +100,8 @@
<string>application/vnd.stardivision.calc</string>
</array>
</dict>
+ <key>UTTypeIconFile</key>
+ <string>spreadsheet.icns</string>
</dict>
<dict>
<key>UTTypeIdentifier</key>
@@ -140,28 +124,8 @@
<string>application/vnd.oasis.opendocument.spreadsheet</string>
</array>
</dict>
- </dict>
- <dict>
- <key>UTTypeIdentifier</key>
-
<string>vnd.oasis.opendocument.spreadsheet-flat-xml</string>
- <key>UTTypeDescription</key>
- <string>OpenDocument Spreadsheet (Flat XML)</string>
- <key>UTTypeConformsTo</key>
- <array>
- <string>public.data</string>
- <string>public.content</string>
- </array>
- <key>UTTypeTagSpecification</key>
- <dict>
- <key>public.filename-extension</key>
- <array>
- <string>fods</string>
- </array>
- <key>public.mime-type</key>
- <array>
-
<string>application/vnd.oasis.opendocument.spreadsheet-flat-xml</string>
- </array>
- </dict>
+ <key>UTTypeIconFile</key>
+ <string>oasis-spreadsheet.icns</string>
</dict>
<!-- Impress documents -->
@@ -190,6 +154,8 @@
<string>application/vnd.stardivision.impress-packed</string>
</array>
</dict>
+ <key>UTTypeIconFile</key>
+ <string>presentation.icns</string>
</dict>
<dict>
<key>UTTypeIdentifier</key>
@@ -212,28 +178,8 @@
<string>application/vnd.oasis.opendocument.presentation</string>
</array>
</dict>
- </dict>
- <dict>
- <key>UTTypeIdentifier</key>
-
<string>vnd.oasis.opendocument.presentation-flat-xml</string>
- <key>UTTypeDescription</key>
- <string>OpenDocument Presentation</string>
- <key>UTTypeConformsTo</key>
- <array>
- <string>public.data</string>
- <string>public.content</string>
- </array>
- <key>UTTypeTagSpecification</key>
- <dict>
- <key>public.filename-extension</key>
- <array>
- <string>fodp</string>
- </array>
- <key>public.mime-type</key>
- <array>
-
<string>application/vnd.oasis.opendocument.presentation-flat-xml</string>
- </array>
- </dict>
+ <key>UTTypeIconFile</key>
+ <string>oasis-presentation.icns</string>
</dict>
<!-- Draw documents -->
@@ -260,6 +206,8 @@
<string>application/vnd.stardivision.draw</string>
</array>
</dict>
+ <key>UTTypeIconFile</key>
+ <string>drawing.icns</string>
</dict>
<dict>
<key>UTTypeIdentifier</key>
@@ -282,12 +230,16 @@
<string>application/vnd.oasis.opendocument.graphics</string>
</array>
</dict>
+ <key>UTTypeIconFile</key>
+ <string>oasis-drawing.icns</string>
</dict>
+
+ <!-- Chart documents -->
<dict>
<key>UTTypeIdentifier</key>
-
<string>vnd.oasis.opendocument.graphics-flat-xml</string>
+ <string>org.oasis-open.opendocument.chart</string>
<key>UTTypeDescription</key>
- <string>OpenDocument Drawing (Flat XML)</string>
+ <string>OpenDocument Chart</string>
<key>UTTypeConformsTo</key>
<array>
<string>public.data</string>
@@ -297,11 +249,11 @@
<dict>
<key>public.filename-extension</key>
<array>
- <string>fodg</string>
+ <string>odc</string>
</array>
<key>public.mime-type</key>
<array>
-
<string>application/vnd.oasis.opendocument.graphics-flat-xml</string>
+
<string>application/vnd.oasis.opendocument.chart</string>
</array>
</dict>
</dict>
@@ -328,6 +280,8 @@
<string>application/vnd.sun.xml.writer.global</string>
</array>
</dict>
+ <key>UTTypeIconFile</key>
+ <string>master-document.icns</string>
</dict>
<dict>
<key>UTTypeIdentifier</key>
@@ -350,6 +304,8 @@
<string>application/vnd.oasis.opendocument.text-master</string>
</array>
</dict>
+ <key>UTTypeIconFile</key>
+ <string>oasis-master-document.icns</string>
</dict>
<!-- Math documents -->
@@ -376,6 +332,8 @@
<string>application/vnd.stardivision.math</string>
</array>
</dict>
+ <key>UTTypeIconFile</key>
+ <string>formula.icns</string>
</dict>
<dict>
<key>UTTypeIdentifier</key>
@@ -398,6 +356,8 @@
<string>application/vnd.oasis.opendocument.formula</string>
</array>
</dict>
+ <key>UTTypeIconFile</key>
+ <string>oasis-formula.icns</string>
</dict>
<!-- Text template documents -->
@@ -422,6 +382,8 @@
<string>application/vnd.sun.xml.writer.template</string>
</array>
</dict>
+ <key>UTTypeIconFile</key>
+ <string>text-template.icns</string>
</dict>
<dict>
<key>UTTypeIdentifier</key>
@@ -444,30 +406,8 @@
<string>application/vnd.oasis.opendocument.text-template</string>
</array>
</dict>
- </dict>
-
- <!-- Writer master document templates -->
- <dict>
- <key>UTTypeIdentifier</key>
-
<string>org.oasis-open.opendocument.text-master-template</string>
- <key>UTTypeDescription</key>
- <string>OpenDocument Text Master Template</string>
- <key>UTTypeConformsTo</key>
- <array>
- <string>public.data</string>
- <string>public.content</string>
- </array>
- <key>UTTypeTagSpecification</key>
- <dict>
- <key>public.filename-extension</key>
- <array>
- <string>otm</string>
- </array>
- <key>public.mime-type</key>
- <array>
-
<string>application/vnd.oasis.opendocument.text-master-template</string>
- </array>
- </dict>
+ <key>UTTypeIconFile</key>
+ <string>oasis-text-template.icns</string>
</dict>
<!-- Spreadsheet template documents -->
@@ -492,6 +432,8 @@
<string>application/vnd.sun.xml.calc.template</string>
</array>
</dict>
+ <key>UTTypeIconFile</key>
+ <string>spreadsheet-template.icns</string>
</dict>
<dict>
<key>UTTypeIdentifier</key>
@@ -514,6 +456,8 @@
<string>application/vnd.oasis.opendocument.spreadsheet-template</string>
</array>
</dict>
+ <key>UTTypeIconFile</key>
+ <string>oasis-spreadsheet-template.icns</string>
</dict>
<!-- Presentation template documents -->
@@ -538,6 +482,8 @@
<string>application/vnd.sun.xml.impress.template</string>
</array>
</dict>
+ <key>UTTypeIconFile</key>
+ <string>presentation-template.icns</string>
</dict>
<dict>
<key>UTTypeIdentifier</key>
@@ -560,6 +506,8 @@
<string>application/vnd.oasis.opendocument.presentation-template</string>
</array>
</dict>
+ <key>UTTypeIconFile</key>
+ <string>oasis-presentation-template.icns</string>
</dict>
<!-- Drawing template documents -->
@@ -584,6 +532,8 @@
<string>application/vnd.sun.xml.draw.template</string>
</array>
</dict>
+ <key>UTTypeIconFile</key>
+ <string>drawing-template.icns</string>
</dict>
<dict>
<key>UTTypeIdentifier</key>
@@ -606,6 +556,8 @@
<string>application/vnd.oasis.opendocument.graphics-template</string>
</array>
</dict>
+ <key>UTTypeIconFile</key>
+ <string>oasis-drawing-template.icns</string>
</dict>
<!-- Base documents -->
@@ -630,6 +582,8 @@
<string>application/vnd.oasis.opendocument.database</string>
</array>
</dict>
+ <key>UTTypeIconFile</key>
+ <string>oasis-database.icns</string>
</dict>
<!-- Extensions -->
@@ -654,12 +608,36 @@
<string>application/vnd.openofficeorg.extension</string>
</array>
</dict>
+ <key>UTTypeIconFile</key>
+ <string>extension.icns</string>
</dict>
</array>
<key>UTImportedTypeDeclarations</key>
<array>
- <!-- Microsoft Word XML -->
+ <!-- Microsoft Word Template -->
+ <dict>
+ <key>UTTypeConformsTo</key>
+ <array>
+ <string>public.composite-content</string>
+ </array>
+ <key>UTTypeDescription</key>
+ <string>Microsoft Word Template</string>
+ <key>UTTypeIdentifier</key>
+ <string>com.microsoft.word.dot</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>public.filename-extension</key>
+ <array>
+ <string>dot</string>
+ </array>
+ <key>public.mime-type</key>
+ <array>
+ <string>application/msword</string>
<!-- ??? -->
+ </array>
+ </dict>
+ </dict>
+ <!-- OOXML wordprocessing -->
<dict>
<key>UTTypeConformsTo</key>
<array>
@@ -751,7 +729,7 @@
</dict>
</dict>
- <!-- Microsoft Excel XML -->
+ <!-- OOXML spreadsheet -->
<dict>
<key>UTTypeConformsTo</key>
<array>
@@ -866,7 +844,7 @@
</dict>
</dict>
- <!-- Microsoft Powerpoint XML -->
+ <!-- OOXML presentation -->
<dict>
<key>UTTypeConformsTo</key>
<array>
@@ -917,7 +895,6 @@
<array>
<string>org.openxmlformats.openxml</string>
<string>public.presentation</string>
- <string>public.executable</string>
</array>
<key>UTTypeDescription</key>
<string>Office Open XML presentation template</string>
@@ -958,581 +935,1013 @@
</array>
</dict>
</dict>
- </array>
- <!-- Document type declaration for OS X < 10.4 -->
- <key>CFBundleDocumentTypes</key>
- <array>
+ <!-- Others -->
<dict>
- <key>CFBundleTypeExtensions</key>
- <array>
- <string>sxw</string>
- <string>sdw</string>
- </array>
- <key>CFBundleTypeMIMETypes</key>
+ <key>UTTypeConformsTo</key>
<array>
- <string>application/vnd.sun.xml.writer</string>
-
<string>application/vnd.stardivision.writer</string>
+ <string>public.data</string>
+ <string>public.content</string>
</array>
- <key>CFBundleTypeIconFile</key>
- <string>text.icns</string>
- <key>CFBundleTypeName</key>
- <string>OpenOffice.org 1.0 Text</string>
- <key>CFBundleTypeRole</key>
- <string>Editor</string>
- <key>LSIsAppleDefaultForType</key>
- <true/>
+ <key>UTTypeDescription</key>
+ <string>WordPerfect Document</string>
+ <key>UTTypeIdentifier</key>
+ <string>org.libreoffice.wpd-document</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>public.filename-extension</key>
+ <array>
+ <string>wpd</string>
+ </array>
+ <key>public.mime-type</key>
+ <array>
+
<string>application/vnd.wordperfect</string>
+ </array>
+ </dict>
</dict>
<dict>
- <key>CFBundleTypeExtensions</key>
- <array>
- <string>odt</string>
- </array>
- <key>CFBundleTypeMIMETypes</key>
+ <key>UTTypeConformsTo</key>
<array>
-
<string>application/vnd.oasis.opendocument.text</string>
+ <string>public.data</string>
+ <string>public.content</string>
</array>
- <key>CFBundleTypeIconFile</key>
- <string>oasis-text.icns</string>
- <key>CFBundleTypeName</key>
- <string>OpenDocument Text</string>
- <key>CFBundleTypeRole</key>
- <string>Editor</string>
- <key>LSIsAppleDefaultForType</key>
- <true/>
+ <key>UTTypeDescription</key>
+ <string>PalmDoc eBook </string>
+ <key>UTTypeIdentifier</key>
+ <string>org.libreoffice.pdb-document</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>public.filename-extension</key>
+ <array>
+ <string>pdb</string>
+ </array>
+ <key>public.mime-type</key>
+ <array>
+
<string>application/x-aportisdoc</string>
+ </array>
+ </dict>
</dict>
<dict>
- <key>CFBundleTypeExtensions</key>
- <array>
- <string>sxc</string>
- <string>sdc</string>
- </array>
- <key>CFBundleTypeMIMETypes</key>
+ <key>UTTypeConformsTo</key>
<array>
- <string>application/vnd.sun.xml.calc</string>
-
<string>application/vnd.stardivision.calc</string>
+ <string>public.data</string>
+ <string>public.content</string>
</array>
- <key>CFBundleTypeIconFile</key>
- <string>spreadsheet.icns</string>
- <key>CFBundleTypeName</key>
- <string>OpenOffice.org 1.0 Spreadsheet</string>
- <key>CFBundleTypeRole</key>
- <string>Editor</string>
- <key>LSIsAppleDefaultForType</key>
- <true/>
+ <key>UTTypeDescription</key>
+ <string>Hangul WP 97 Document</string>
+ <key>UTTypeIdentifier</key>
+ <string>org.libreoffice.hwp-document</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>public.filename-extension</key>
+ <array>
+ <string>hwp</string>
+ </array>
+ <key>public.mime-type</key>
+ <array>
+
<string>application/x-hwp-document</string> <!-- ??? -->
+ </array>
+ </dict>
</dict>
<dict>
- <key>CFBundleTypeExtensions</key>
- <array>
- <string>ods</string>
- </array>
- <key>CFBundleTypeMIMETypes</key>
+ <key>UTTypeConformsTo</key>
<array>
-
<string>application/vnd.oasis.opendocument.spreadsheet</string>
+ <string>public.data</string>
+ <string>public.content</string>
</array>
- <key>CFBundleTypeIconFile</key>
- <string>oasis-spreadsheet.icns</string>
- <key>CFBundleTypeName</key>
- <string>OpenDocument Spreadsheet</string>
- <key>CFBundleTypeRole</key>
- <string>Editor</string>
- <key>LSIsAppleDefaultForType</key>
- <true/>
+ <key>UTTypeDescription</key>
+ <string>Microsoft Works for Mac Document (v1 -
v4)</string>
+ <key>UTTypeIdentifier</key>
+ <string>org.libreoffice.wks-document</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>public.filename-extension</key>
+ <array>
+ <string>wps</string>
+ </array>
+ <key>public.mime-type</key>
+ <array>
+
<string>application/vnd.ms-works</string>
+ </array>
+ </dict>
</dict>
<dict>
- <key>CFBundleTypeExtensions</key>
- <array>
- <string>sxi</string>
- <string>sdd</string>
- <string>sdp</string>
- </array>
- <key>CFBundleTypeMIMETypes</key>
+ <key>UTTypeConformsTo</key>
<array>
- <string>application/vnd.sun.xml.impress</string>
-
<string>application/vnd.stardivision.impress</string>
-
<string>application/vnd.stardivision.impress-packed</string>
+ <string>public.data</string>
+ <string>public.content</string>
</array>
- <key>CFBundleTypeIconFile</key>
- <string>presentation.icns</string>
- <key>CFBundleTypeName</key>
- <string>OpenOffice.org 1.0 Presentation</string>
- <key>CFBundleTypeRole</key>
- <string>Editor</string>
- <key>LSIsAppleDefaultForType</key>
- <true/>
+ <key>UTTypeDescription</key>
+ <string>Data Interchange Format</string>
+ <key>UTTypeIdentifier</key>
+ <string>org.libreoffice.dif-document</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>public.filename-extension</key>
+ <array>
+ <string>dif</string>
+ </array>
+ <key>public.mime-type</key>
+ <array>
+
<string>application/x-dif-document</string> <!-- ??? -->
+ </array>
+ </dict>
</dict>
<dict>
- <key>CFBundleTypeExtensions</key>
- <array>
- <string>odp</string>
- </array>
- <key>CFBundleTypeMIMETypes</key>
+ <key>UTTypeConformsTo</key>
<array>
-
<string>application/vnd.oasis.opendocument.presentation</string>
+ <string>public.data</string>
+ <string>public.content</string>
</array>
- <key>CFBundleTypeIconFile</key>
- <string>oasis-presentation.icns</string>
- <key>CFBundleTypeName</key>
- <string>OpenDocument Presentation</string>
- <key>CFBundleTypeRole</key>
- <string>Editor</string>
- <key>LSIsAppleDefaultForType</key>
- <true/>
+ <key>UTTypeDescription</key>
+ <string>SYLK Document</string>
+ <key>UTTypeIdentifier</key>
+ <string>org.libreoffice.slk-document</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>public.filename-extension</key>
+ <array>
+ <string>slk</string>
+ </array>
+ <key>public.mime-type</key>
+ <array>
+
<string>application/x-slk-document</string> <!-- ??? -->
+ </array>
+ </dict>
</dict>
<dict>
- <key>CFBundleTypeExtensions</key>
- <array>
- <string>sxd</string>
- <string>sda</string>
- </array>
- <key>CFBundleTypeMIMETypes</key>
+ <key>UTTypeConformsTo</key>
<array>
- <string>application/vnd.sun.xml.draw</string>
-
<string>application/vnd.stardivision.draw</string>
+ <string>public.data</string>
+ <string>public.content</string>
</array>
- <key>CFBundleTypeIconFile</key>
- <string>drawing.icns</string>
- <key>CFBundleTypeName</key>
- <string>OpenOffice.org 1.0 Drawing</string>
- <key>CFBundleTypeRole</key>
- <string>Editor</string>
- <key>LSIsAppleDefaultForType</key>
- <true/>
- </dict>
+ <key>UTTypeDescription</key>
+ <string>Comma-Separated Value Document</string>
+ <key>UTTypeIdentifier</key>
+ <string>org.libreoffice.csv-document</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>public.filename-extension</key>
+ <array>
+ <string>csv</string>
+ </array>
+ <key>public.mime-type</key>
+ <array>
+
<string>application/x-csv-document</string> <!-- ??? -->
+ </array>
+ </dict>
+ </dict>
<dict>
- <key>CFBundleTypeExtensions</key>
+ <key>UTTypeConformsTo</key>
<array>
- <string>odg</string>
+ <string>public.data</string>
+ <string>public.content</string>
</array>
- <key>CFBundleTypeMIMETypes</key>
+ <key>UTTypeDescription</key>
+ <string>dBASE Document</string>
+ <key>UTTypeIdentifier</key>
+ <string>org.libreoffice.dbf-document</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>public.filename-extension</key>
+ <array>
+ <string>dbf</string>
+ </array>
+ <key>public.mime-type</key>
+ <array>
+
<string>application/x-dbf-document</string> <!-- ??? -->
+ </array>
+ </dict>
+ </dict>
+ <dict>
+ <key>UTTypeConformsTo</key>
<array>
-
<string>application/vnd.oasis.opendocument.graphics</string>
+ <string>public.data</string>
+ <string>public.content</string>
</array>
- <key>CFBundleTypeIconFile</key>
- <string>oasis-drawing.icns</string>
+ <key>UTTypeDescription</key>
+ <string>Lotus 1-2-3 Spreadsheet</string>
+ <key>UTTypeIdentifier</key>
+ <string>org.libreoffice.123-document</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>public.filename-extension</key>
+ <array>
+ <string>wk1</string>
+ <string>wks</string>
+ <string>123</string>
+ </array>
+ <key>public.mime-type</key>
+ <array>
+
<string>application/vnd.lotus-1-2-3</string>
+
<string>application/vnd.lotus-1-2-3</string>
+
<string>application/vnd.lotus-1-2-3</string>
+ </array>
+ </dict>
+ </dict>
+ <dict>
+ <key>UTTypeConformsTo</key>
+ <array>
+ <string>public.data</string>
+ <string>public.content</string>
+ <string>public.image</string>
+ </array>
+ <key>UTTypeDescription</key>
+ <string>Computer Graphics Metafile</string>
+ <key>UTTypeIdentifier</key>
+ <string>org.libreoffice.cgm-document</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>public.filename-extension</key>
+ <array>
+ <string>cgm</string>
+ </array>
+ <key>public.mime-type</key>
+ <array>
+ <string>image/cgm</string>
+ </array>
+ </dict>
+ </dict>
+ <dict>
+ <key>UTTypeConformsTo</key>
+ <array>
+ <string>public.data</string>
+ <string>public.content</string>
+ <string>public.image</string>
+ </array>
+ <key>UTTypeDescription</key>
+ <string>AutoCAD Interchange Format</string>
+ <key>UTTypeIdentifier</key>
+ <string>org.libreoffice.dxf-document</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>public.filename-extension</key>
+ <array>
+ <string>dxf</string>
+ </array>
+ <key>public.mime-type</key>
+ <array>
+ <string>image/vnd.dxf</string>
+ </array>
+ </dict>
+ </dict>
+ <dict>
+ <key>UTTypeConformsTo</key>
+ <array>
+ <string>public.data</string>
+ <string>public.content</string>
+ <string>public.image</string>
+ </array>
+ <key>UTTypeDescription</key>
+ <string>Windows Enhanced Metafile</string>
+ <key>UTTypeIdentifier</key>
+ <string>org.libreoffice.emf-document</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>public.filename-extension</key>
+ <array>
+ <string>emf</string>
+ </array>
+ <key>public.mime-type</key>
+ <array>
+ <string>image/x-emf</string>
+ </array>
+ </dict>
+ </dict>
+ <dict>
+ <key>UTTypeConformsTo</key>
+ <array>
+ <string>public.data</string>
+ <string>public.content</string>
+ <string>public.image</string>
+ </array>
+ <key>UTTypeDescription</key>
+ <string>Windows Metafile</string>
+ <key>UTTypeIdentifier</key>
+ <string>org.libreoffice.wmf-document</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>public.filename-extension</key>
+ <array>
+ <string>wmf</string>
+ </array>
+ <key>public.mime-type</key>
+ <array>
+ <string>image/x-wmf</string>
+ </array>
+ </dict>
+ </dict>
+ <dict>
+ <key>UTTypeConformsTo</key>
+ <array>
+ <string>public.data</string>
+ <string>public.content</string>
+ </array>
+ <key>UTTypeDescription</key>
+ <string>Plain Text File</string>
+ <key>UTTypeIdentifier</key>
+ <string>public.plain-text</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>public.filename-extension</key>
+ <array>
+ <string>txt</string>
+ </array>
+ <key>public.mime-type</key>
+ <array>
+ <string>text/plain</string>
+ </array>
+ </dict>
+ </dict>
+ <dict>
+ <key>UTTypeConformsTo</key>
+ <array>
+ <string>public.data</string>
+ <string>public.content</string>
+ </array>
+ <key>UTTypeDescription</key>
+ <string>Rich Text Format</string>
+ <key>UTTypeIdentifier</key>
+ <string>public.rtf</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>public.filename-extension</key>
+ <array>
+ <string>rtf</string>
+ </array>
+ <key>public.mime-type</key>
+ <array>
+ <string>application/rtf</string>
+ </array>
+ </dict>
+ </dict>
+
+ </array>
+
+ <key>CFBundleDocumentTypes</key>
+ <array>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>OpenOffice.org 1.0 Text</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>org.openoffice.text</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>OpenDocument Text</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+
<string>org.oasis-open.opendocument.text</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>OpenOffice.org 1.0 Spreadsheet</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>org.openoffice.spreadsheet</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>OpenDocument Spreadsheet</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+
<string>org.oasis-open.opendocument.spreadsheet</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>OpenOffice.org 1.0 Presentation</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>org.openoffice.presentation</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>OpenDocument Presentation</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+
<string>org.oasis-open.opendocument.presentation</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>OpenOffice.org 1.0 Drawing</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>org.openoffice.graphics</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>OpenDocument Drawing</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+
<string>org.oasis-open.opendocument.graphics</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>OpenDocument Chart</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+
<string>org.oasis-open.opendocument.chart</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>OpenOffice.org 1.0 Master</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>org.openoffice.text-master</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>OpenDocument Master</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+
<string>org.oasis-open.opendocument.text-master</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>OpenOffice.org 1.0 Formula</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>org.openoffice.formula</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>OpenDocument Formula</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+
<string>org.oasis-open.opendocument.formula</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>OpenOffice.org 1.0 Text Template</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>org.openoffice.text-template</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>OpenDocument Text Template</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+
<string>org.oasis-open.opendocument.text-template</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>OpenOffice.org 1.0 Spreadsheet Template</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+
<string>org.openoffice.spreadsheet-template</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>OpenDocument Spreadsheet Template</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+
<string>org.oasis-open.opendocument.spreadsheet-template</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>OpenOffice.org 1.0 Presentation
Template</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+
<string>org.openoffice.presentation-template</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>OpenDocument Presentation Template</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+
<string>org.oasis-open.opendocument.presentation-template</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>OpenOffice.org 1.0 Drawing Template</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+
<string>org.openoffice.graphics-template</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>OpenDocument Drawing Template</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+
<string>org.oasis-open.opendocument.graphics-template</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>OpenDocument Database</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+
<string>org.oasis-open.opendocument.database</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>@PRODUCTNAME@ Extension</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>org.openoffice.extension</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>Microsoft Word Document</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>com.microsoft.word.doc</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>Microsoft Word Template</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>com.microsoft.word.dot</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>Office Open XML word processing
document</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+
<string>org.openxmlformats.wordprocessingml.document</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>Office Open XML word processing document
(macros enabled)</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+
<string>org.openxmlformats.wordprocessingml.document.macroenabled</string>
+ </array>
+ </dict>
+ <dict>
<key>CFBundleTypeName</key>
- <string>OpenDocument Drawing</string>
+ <string>Office Open XML word processing
template</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
- <key>LSIsAppleDefaultForType</key>
- <true/>
- </dict>
- <dict>
- <key>CFBundleTypeExtensions</key>
- <array>
- <string>sxg</string>
- </array>
- <key>CFBundleTypeMIMETypes</key>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
<array>
-
<string>application/vnd.sun.xml.writer.global</string>
+
<string>org.openxmlformats.wordprocessingml.template</string>
</array>
- <key>CFBundleTypeIconFile</key>
- <string>master-document.icns</string>
+ </dict>
+ <dict>
<key>CFBundleTypeName</key>
- <string>OpenOffice.org 1.0 Master</string>
+ <string>Office Open XML word processing template
(macros enabled)</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
- <key>LSIsAppleDefaultForType</key>
- <true/>
- </dict>
- <dict>
- <key>CFBundleTypeExtensions</key>
- <array>
- <string>odm</string>
- </array>
- <key>CFBundleTypeMIMETypes</key>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
<array>
-
<string>application/vnd.oasis.opendocument.text-master</string>
+
<string>org.openxmlformats.wordprocessingml.template.macroenabled</string>
</array>
- <key>CFBundleTypeIconFile</key>
- <string>oasis-master-document.icns</string>
+ </dict>
+ <dict>
<key>CFBundleTypeName</key>
- <string>OpenDocument Master</string>
+ <string>Microsoft Excel Spreadsheet</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
- <key>LSIsAppleDefaultForType</key>
- <true/>
- </dict>
- <dict>
- <key>CFBundleTypeExtensions</key>
- <array>
- <string>sxm</string>
- <string>smf</string>
- </array>
- <key>CFBundleTypeMIMETypes</key>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
<array>
- <string>application/vnd.sun.xml.math</string>
-
<string>application/vnd.stardivision.math</string>
+ <string>com.microsoft.excel.xls</string>
</array>
- <key>CFBundleTypeIconFile</key>
- <string>formula.icns</string>
+ </dict>
+ <dict>
<key>CFBundleTypeName</key>
- <string>OpenOffice.org 1.0 Formula</string>
+ <string>Office Open XML spreadsheet template</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
- <key>LSIsAppleDefaultForType</key>
- <true/>
- </dict>
- <dict>
- <key>CFBundleTypeExtensions</key>
- <array>
- <string>odf</string>
- </array>
- <key>CFBundleTypeMIMETypes</key>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
<array>
-
<string>application/vnd.oasis.opendocument.formula</string>
+
<string>org.openxmlformats.spreadsheetml.template</string>
</array>
- <key>CFBundleTypeIconFile</key>
- <string>oasis-formula.icns</string>
+ </dict>
+ <dict>
<key>CFBundleTypeName</key>
- <string>OpenDocument Formula</string>
+ <string>Office Open XML spreadsheet template (macros
enabled)</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
- <key>LSIsAppleDefaultForType</key>
- <true/>
- </dict>
- <dict>
- <key>CFBundleTypeExtensions</key>
- <array>
- <string>stw</string>
- </array>
- <key>CFBundleTypeMIMETypes</key>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
<array>
-
<string>application/vnd.sun.xml.writer.template</string>
+
<string>org.openxmlformats.spreadsheetml.template.macroenabled</string>
</array>
- <key>CFBundleTypeIconFile</key>
- <string>text-template.icns</string>
+ </dict>
+ <dict>
<key>CFBundleTypeName</key>
- <string>OpenOffice.org 1.0 Text Template</string>
+ <string>Office Open XML spreadsheet</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
- <key>LSIsAppleDefaultForType</key>
- <true/>
- </dict>
- <dict>
- <key>CFBundleTypeExtensions</key>
- <array>
- <string>ott</string>
- </array>
- <key>CFBundleTypeMIMETypes</key>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
<array>
-
<string>application/vnd.oasis.opendocument.text-template</string>
+
<string>org.openxmlformats.spreadsheetml.sheet</string>
</array>
- <key>CFBundleTypeIconFile</key>
- <string>oasis-text-template.icns</string>
+ </dict>
+ <dict>
<key>CFBundleTypeName</key>
- <string>OpenDocument Text Template</string>
+ <string>Microsoft Excel 2007 spreadsheet (macros
enabled)</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
- <key>LSIsAppleDefaultForType</key>
- <true/>
- </dict>
- <dict>
- <key>CFBundleTypeExtensions</key>
- <array>
- <string>otm</string>
- </array>
- <key>CFBundleTypeMIMETypes</key>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
<array>
-
<string>application/vnd.oasis.opendocument.text-master-template</string>
+
<string>com.microsoft.excel.sheet.binary.macroenabled</string>
</array>
- <key>CFBundleTypeIconFile</key>
- <string>oasis-master-template.icns</string>
- <key>CFBundleTypeName</key>
- <string>OpenDocument Master Template</string>
- <key>CFBundleTypeRole</key>
- <string>Editor</string>
- <key>LSIsAppleDefaultForType</key>
- <true/>
</dict>
<dict>
- <key>CFBundleTypeExtensions</key>
- <array>
- <string>stc</string>
- </array>
- <key>CFBundleTypeMIMETypes</key>
- <array>
-
<string>application/vnd.sun.xml.calc.template</string>
- </array>
- <key>CFBundleTypeIconFile</key>
- <string>spreadsheet-template.icns</string>
<key>CFBundleTypeName</key>
- <string>OpenOffice.org 1.0 Spreadsheet Template</string>
+ <string>Office Open XML spreadsheet (macros
enabled)</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
- <key>LSIsAppleDefaultForType</key>
- <true/>
- </dict>
- <dict>
- <key>CFBundleTypeExtensions</key>
- <array>
- <string>ots</string>
- </array>
- <key>CFBundleTypeMIMETypes</key>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
<array>
-
<string>application/vnd.oasis.opendocument.spreadsheet-template</string>
+
<string>org.openxmlformats.spreadsheetml.sheet.macroenabled</string>
</array>
- <key>CFBundleTypeIconFile</key>
- <string>oasis-spreadsheet-template.icns</string>
+ </dict>
+ <dict>
<key>CFBundleTypeName</key>
- <string>OpenDocument Spreadsheet Template</string>
+ <string>Microsoft Powerpoint Presentation</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
- <key>LSIsAppleDefaultForType</key>
- <true/>
- </dict>
- <dict>
- <key>CFBundleTypeExtensions</key>
- <array>
- <string>sti</string>
- </array>
- <key>CFBundleTypeMIMETypes</key>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
<array>
-
<string>application/vnd.sun.xml.impress.template</string>
+ <string>com.microsoft.powerpoint.ppt</string>
</array>
- <key>CFBundleTypeIconFile</key>
- <string>presentation-template.icns</string>
+ </dict>
+ <dict>
<key>CFBundleTypeName</key>
- <string>OpenOffice.org 1.0 Presentation
Template</string>
+ <string>Office Open XML presentation</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
- <key>LSIsAppleDefaultForType</key>
- <true/>
- </dict>
- <dict>
- <key>CFBundleTypeExtensions</key>
- <array>
- <string>otp</string>
- </array>
- <key>CFBundleTypeMIMETypes</key>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
<array>
-
<string>application/vnd.oasis.opendocument.presentation-template</string>
+
<string>org.openxmlformats.presentationml.presentation</string>
</array>
- <key>CFBundleTypeIconFile</key>
- <string>oasis-presentation-template.icns</string>
+ </dict>
+ <dict>
<key>CFBundleTypeName</key>
- <string>OpenDocument Presentation Template</string>
+ <string>Office Open XML presentation (macros
enabled)</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
- <key>LSIsAppleDefaultForType</key>
- <true/>
- </dict>
- <dict>
- <key>CFBundleTypeExtensions</key>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
<array>
- <string>std</string>
+
<string>org.openxmlformats.presentationml.presentation.macroenabled</string>
</array>
- <key>CFBundleTypeMIMETypes</key>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>Office Open XML presentation template</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
<array>
-
<string>application/vnd.sun.xml.draw.template</string>
+
<string>org.openxmlformats.presentationml.template</string>
</array>
- <key>CFBundleTypeIconFile</key>
- <string>drawing-template.icns</string>
+ </dict>
+ <dict>
<key>CFBundleTypeName</key>
- <string>OpenOffice.org 1.0 Drawing Template</string>
+ <string>Office Open XML presentation template (macros
enabled)</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
- <key>LSIsAppleDefaultForType</key>
- <true/>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+
<string>org.openxmlformats.presentationml.template.macroenabled</string>
+ </array>
</dict>
<dict>
- <key>CFBundleTypeExtensions</key>
+ <key>CFBundleTypeName</key>
+ <string>WordPerfect Document</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
<array>
- <string>otg</string>
+ <string>org.libreoffice.wpd-document</string>
</array>
- <key>CFBundleTypeMIMETypes</key>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>PalmDoc eBook </string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
<array>
-
<string>application/vnd.oasis.opendocument.graphics-template</string>
+ <string>org.libreoffice.pdb-document</string>
</array>
- <key>CFBundleTypeIconFile</key>
- <string>oasis-drawing-template.icns</string>
+ </dict>
+ <dict>
<key>CFBundleTypeName</key>
- <string>OpenDocument Drawing Template</string>
+ <string>Hangul WP 97 Document</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
- <key>LSIsAppleDefaultForType</key>
- <true/>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>org.libreoffice.hwp-document</string>
+ </array>
</dict>
<dict>
- <key>CFBundleTypeExtensions</key>
+ <key>CFBundleTypeName</key>
+ <string>Microsoft Works for Mac Document (v1 -
v4)</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
<array>
- <string>odb</string>
+ <string>org.libreoffice.wks-document</string>
</array>
- <key>CFBundleTypeMIMETypes</key>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>Data Interchange Format</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
<array>
-
<string>application/vnd.oasis.opendocument.database</string>
+ <string>org.libreoffice.dif-document</string>
</array>
- <key>CFBundleTypeIconFile</key>
- <string>oasis-database.icns</string>
+ </dict>
+ <dict>
<key>CFBundleTypeName</key>
- <string>OpenDocument Database</string>
+ <string>SYLK Document</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
- <key>LSIsAppleDefaultForType</key>
- <true/>
- </dict>
- <dict>
- <key>CFBundleTypeExtensions</key>
- <array>
- <string>doc</string>
- <string>dot</string>
- <string>rtf</string>
- <string>html</string>
- <string>htm</string>
- <string>pdb</string>
- <string>xml</string>
- <string>psw</string>
- <string>wpd</string>
- <string>jtd</string>
- <string>jtt</string>
- <string>hwp</string>
- <string>wps</string>
- <string>dif</string>
- <string>dbf</string>
- <string>xls</string>
- <string>xlw</string>
- <string>xlt</string>
- <string>slk</string>
- <string>csv</string>
- <string>wk1</string>
- <string>wk2</string>
- <string>123</string>
- <string>pxl</string>
- <string>ppt</string>
- <string>pps</string>
- <string>pot</string>
- <string>cgm</string>
- <string>dxf</string>
- <string>emf</string>
- <string>eps</string>
- <string>met</string>
- <string>pct</string>
- <string>sgf</string>
- <string>sgv</string>
- <string>svm</string>
- <string>wmf</string>
- <string>bmp</string>
- <string>gif</string>
- <string>jpg</string>
- <string>jpeg</string>
- <string>jfif</string>
- <string>jif</string>
- <string>jpe</string>
- <string>pbm</string>
- <string>pcx</string>
- <string>pgm</string>
- <string>png</string>
- <string>ppm</string>
- <string>psd</string>
- <string>ras</string>
- <string>tga</string>
- <string>tif</string>
- <string>tiff</string>
- <string>xbm</string>
- <string>xpm</string>
- <string>pcd</string>
- <string>oth</string>
- <string>mml</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>org.libreoffice.slk-document</string>
</array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>Comma-Separated Value Document</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>org.libreoffice.csv-document</string>
+ </array>
</dict>
<dict>
- <key>CFBundleTypeExtensions</key>
+ <key>CFBundleTypeName</key>
+ <string>dBASE Document</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
<array>
- <string>txt</string>
- <string>TXT</string>
- <string>text</string>
- <string>*</string>
+ <string>org.libreoffice.dbf-document</string>
</array>
+ </dict>
+ <dict>
<key>CFBundleTypeName</key>
- <string>TEXT</string>
- <key>CFBundleTypeOSTypes</key>
+ <string>Lotus 1-2-3 Spreadsheet</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
<array>
- <string>TEXT</string>
- <string>sEXT</string>
- <string>ttro</string>
+ <string>org.libreoffice.123-document</string>
</array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>Computer Graphics Metafile</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>org.libreoffice.cgm-document</string>
+ </array>
</dict>
<dict>
+ <key>CFBundleTypeName</key>
+ <string>AutoCAD Interchange Format</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
<key>LSItemContentTypes</key>
<array>
- <string>org.openoffice.text</string>
-
<string>org.oasis-open.opendocument.text</string>
-
<string>vnd.oasis.opendocument.text-flat-xml</string>
- <string>org.openoffice.spreadsheet</string>
-
<string>org.oasis-open.opendocument.spreadsheet</string>
-
<string>vnd.oasis.opendocument.spreadsheet-flat-xml</string>
- <string>org.openoffice.presentation</string>
-
<string>org.oasis-open.opendocument.presentation</string>
-
<string>vnd.oasis.opendocument.presentation-flat-xml</string>
- <string>org.openoffice.graphics</string>
-
<string>org.oasis-open.opendocument.graphics</string>
-
<string>vnd.oasis.opendocument.graphics-flat-xml</string>
- <string>org.openoffice.text-master</string>
-
<string>org.oasis-open.opendocument.text-master</string>
- <string>org.openoffice.formula</string>
-
<string>org.oasis-open.opendocument.formula</string>
- <string>org.openoffice.text-template</string>
-
<string>org.oasis-open.opendocument.text-template</string>
-
<string>org.oasis-open.opendocument.text-master-template</string>
-
<string>org.openoffice.spreadsheet-template</string>
-
<string>org.oasis-open.opendocument.spreadsheet-template</string>
-
<string>org.openoffice.presentation-template</string>
-
<string>org.oasis-open.opendocument.presentation-template</string>
-
<string>org.openoffice.graphics-template</string>
-
<string>org.oasis-open.opendocument.graphics-template</string>
-
<string>org.oasis-open.opendocument.database</string>
-
<string>org.oasis-open.opendocument.chart</string>
- <string>public.rtf</string>
- <string>public.html</string>
- <string>public.jpeg</string>
- <string>public.tiff</string>
- <string>public.png</string>
- <string>public.xbitmap-image</string>
-
<string>com.adobe.encapsulated-postscript</string>
- <string>com.microsoft.bmp</string>
- <string>com.microsoft.word.doc</string>
- <string>com.microsoft.excel.xls</string>
- <string>com.microsoft.powerpoint.ppt</string>
-
<string>org.openxmlformats.wordprocessingml.document</string>
-
<string>org.openxmlformats.wordprocessingml.document.macroenabled</string>
-
<string>org.openxmlformats.wordprocessingml.template</string>
-
<string>org.openxmlformats.wordprocessingml.template.macroenabled</string>
-
<string>org.openxmlformats.spreadsheetml.sheet</string>
-
<string>org.openxmlformats.spreadsheetml.sheet.macroenabled</string>
-
<string>com.microsoft.excel.sheet.binary.macroenabled</string>
-
<string>org.openxmlformats.spreadsheetml.template</string>
-
<string>org.openxmlformats.spreadsheetml.template.macroenabled</string>
-
<string>org.openxmlformats.presentationml.presentation</string>
-
<string>org.openxmlformats.presentationml.presentation.macroenabled</string>
-
<string>org.openxmlformats.presentationml.template</string>
-
<string>org.openxmlformats.presentationml.template.macroenabled</string>
+ <string>org.libreoffice.dxf-document</string>
</array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>Windows Enhanced Metafile</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>org.libreoffice.emf-document</string>
+ </array>
</dict>
<dict>
- <key>CFBundleTypeExtensions</key>
+ <key>CFBundleTypeName</key>
+ <string>Windows Metafile</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
<array>
- <string>oxt</string>
+ <string>org.libreoffice.wmf-document</string>
</array>
- <key>CFBundleTypeMIMETypes</key>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>Plain Text File</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
<array>
-
<string>application/vnd.openofficeorg.extension</string>
+ <string>public.plain-text</string>
</array>
- <key>CFBundleTypeIconFile</key>
- <string>extension.icns</string>
+ </dict>
+ <dict>
<key>CFBundleTypeName</key>
- <string>@PRODUCTNAME@ Extension</string>
+ <string>Rich Text Format</string>
<key>CFBundleTypeRole</key>
- <string>Viewer</string>
- <key>LSIsAppleDefaultForType</key>
- <true/>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>public.rtf</string>
+ </array>
</dict>
</array>
+
<key>CFBundleExecutable</key>
<string>soffice</string>
<key>CFBundleGetInfoString</key>
commit cee3803ae6451d540b59027271c4463814b6efb8
Author: Andras Timar <andras.ti...@collabora.com>
Date: Sun May 17 16:19:34 2015 +0200
remove unoinfo from App Store package
Change-Id: I12f07c688966d610191a801c7838052d57f197c4
diff --git a/Makefile.in b/Makefile.in
index 3880377..1ee0c26 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -315,9 +315,10 @@ ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
rm -rf $(TESTINSTALLDIR)/LibreOffice$(if
$(ENABLE_RELEASE_BUILD),,Dev).app/Contents/Frameworks/LibreOfficePython.framework/Versions/[1-9]*/lib/python[1-9]*/config-[1-9]*
#
ifneq ($ENABLE_MACOSX_SANDBOX),)
-# Remove the gengal.bin binary and unopkg script that we don't want
+# Remove the gengal.bin binary and unopkg and unoinfo script that we don't want
rm $(TESTINSTALLDIR)/LibreOffice$(if
$(ENABLE_RELEASE_BUILD),,Dev).app/Contents/MacOS/gengal.bin
rm $(TESTINSTALLDIR)/LibreOffice$(if
$(ENABLE_RELEASE_BUILD),,Dev).app/Contents/MacOS/unopkg
+ rm $(TESTINSTALLDIR)/LibreOffice$(if
$(ENABLE_RELEASE_BUILD),,Dev).app/Contents/MacOS/unoinfo
endif
#
# Then use the macosx-codesign-app-bundle script
commit 18039679779ad82f1ba772c4d465337f17579565
Author: Andras Timar <andras.ti...@collabora.com>
Date: Sun May 17 14:32:02 2015 +0200
Don't package ui-previewer in App Store case
Change-Id: I122c65d7f6dec7588ea2624e291e9dfe04dff22c
diff --git a/Repository.mk b/Repository.mk
index ce79ee8..9a84a50 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -146,7 +146,9 @@ $(eval $(call
gb_Helper_register_executables_for_install,OOO,ooo, \
$(if $(filter
unx-TRUE,$(GUIBASE)-$(ENABLE_NPAPI_FROM_BROWSER)),pluginapp.bin) \
$(if $(filter unx-TRUE,$(GUIBASE)-$(ENABLE_TDE)),tdefilepicker) \
$(if $(filter WNT,$(OS)),,uri-encode) \
- ui-previewer \
+ $(if $(ENABLE_MACOSX_SANDBOX),, \
+ ui-previewer \
+ ) \
$(if $(filter WNT,$(OS)), \
senddoc \
) \
commit f35634f896400b6e7018307054b2b1dee88474ab
Author: Andras Timar <andras.ti...@collabora.com>
Date: Sun May 17 11:43:08 2015 +0200
remove unopkg script from MacOSX folder of sandboxed app
Change-Id: Ib59953225480e6923e418b966cce289f07f863b5
diff --git a/Makefile.in b/Makefile.in
index cf61549..3880377 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -315,8 +315,9 @@ ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
rm -rf $(TESTINSTALLDIR)/LibreOffice$(if
$(ENABLE_RELEASE_BUILD),,Dev).app/Contents/Frameworks/LibreOfficePython.framework/Versions/[1-9]*/lib/python[1-9]*/config-[1-9]*
#
ifneq ($ENABLE_MACOSX_SANDBOX),)
-# Remove the gengal.bin binary that we don't want
+# Remove the gengal.bin binary and unopkg script that we don't want
rm $(TESTINSTALLDIR)/LibreOffice$(if
$(ENABLE_RELEASE_BUILD),,Dev).app/Contents/MacOS/gengal.bin
+ rm $(TESTINSTALLDIR)/LibreOffice$(if
$(ENABLE_RELEASE_BUILD),,Dev).app/Contents/MacOS/unopkg
endif
#
# Then use the macosx-codesign-app-bundle script
commit 86ddbcf3120966c4e8bab9b89ddc31288d0b9812
Author: Andras Timar <andras.ti...@collabora.com>
Date: Sun May 17 11:39:44 2015 +0200
Don't put symlink to MacOS folder of sandboxed app
Change-Id: Ica4cfd3befa67aa1d03140ad2a766dfbb208ec0a
diff --git a/ure/Package_install.mk b/ure/Package_install.mk
index 13106f1..902af7d 100644
--- a/ure/Package_install.mk
+++ b/ure/Package_install.mk
@@ -15,7 +15,9 @@ $(eval $(call
gb_Package_add_symbolic_link,ure_install,$(LIBO_URE_BIN_FOLDER)/un
endif
ifeq (MACOSX,$(OS))
+ifneq ($(ENABLE_MACOSX_SANDBOX),TRUE)
$(eval $(call
gb_Package_add_symbolic_link,ure_install,MacOS/urelibs,../Frameworks))
+endif
else ifeq (WNT,$(OS))
$(eval $(call gb_Package_add_file,ure_install,ure-link,ure-link))
else
commit 54df16fa8b2f77da4be781028a88791e194c0659
Author: Andras Timar <andras.ti...@collabora.com>
Date: Sun May 17 11:07:14 2015 +0200
Don't package unoinfo in case of Mac OS X like app structure
Change-Id: I517ed7ac43b0655c7e571e0b9fead32c4f2e7948
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 8ee98d5..e567574 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -514,7 +514,7 @@ File gid_Brand_File_Desktophelper_Txt
End
#endif
-#if !defined WNT
+#if !defined WNT && !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
File gid_Brand_File_Bin_Unoinfo
BIN_FILE_BODY;
Dir = gid_Brand_Dir_Program;
commit 819cb5bbe828f3771497a0acc37a7cd343c654e9
Author: Andras Timar <andras.ti...@collabora.com>
Date: Sun May 17 10:59:11 2015 +0200
Don't package gengal script in App Store case
Change-Id: Ia7002e5f56cad7efd264baa940ccc350ae5ee08c
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index b3c5ff7..36934b4 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -122,7 +122,7 @@ File gid_File_Basic_Tutorials
Name = "wizards_basicsrvtutorials.filelist";
End
-#if defined UNX
+#if defined UNX && ! defined ENABLE_MACOSX_SANDBOX
File gid_File_Script_Gengal
BIN_FILE_BODY;
commit 5a980a391a385a4d46da4c5bda4cd9826a513745
Author: Andras Timar <andras.ti...@collabora.com>
Date: Sun May 17 10:56:20 2015 +0200
Don't build ui-previewer in the App Store case
Change-Id: I1b095586b66fbbe582b0e7266609895bb288c6fb
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 329740a..f861316 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -25,11 +25,13 @@ $(eval $(call gb_Module_add_targets,vcl,\
Package_opengl \
$(if $(filter DESKTOP,$(BUILD_TYPE)), \
StaticLibrary_vclmain \
- Executable_ui-previewer \
- $(if $(filter LINUX MACOSX WNT,$(OS)), \
- Executable_icontest \
- Executable_outdevgrind \
- Executable_vcldemo )) \
+ $(if $(ENABLE_MACOSX_SANDBOX),, \
+ Executable_ui-previewer \
+ ) \
+ $(if $(filter LINUX MACOSX WNT,$(OS)), \
+ Executable_icontest \
+ Executable_outdevgrind \
+ Executable_vcldemo )) \
$(if $(filter-out ANDROID IOS WNT,$(OS)), \
Executable_svdemo \
Executable_svptest \
commit 7d06eae708d2178edc758550fc9deeb4690b7846
Author: Andras Timar <andras.ti...@collabora.com>
Date: Sun May 17 10:50:40 2015 +0200
scp2: fix --disable-python
Change-Id: I621ef88aefa91fb8f970a9ccb7d974019841cdc7
diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
index be02cd8..3720386 100644
--- a/scp2/Module_scp2.mk
+++ b/scp2/Module_scp2.mk
@@ -22,7 +22,9 @@ $(eval $(call gb_Module_add_targets,scp2,\
InstallModule_math \
InstallModule_onlineupdate \
InstallModule_ooo \
- InstallModule_python \
+ $(if $(filter TRUE,$(DISABLE_PYTHON)),,\
+ InstallModule_python \
+ ) \
InstallModule_ure \
InstallModule_writer \
InstallModule_xsltfilter \
commit dc9c4eef6a629cb2806afc57f7ba7cb183f5704e
Author: Tor Lillqvist <t...@collabora.com>
Date: Tue Apr 28 22:51:10 2015 +0300
Fix --disable-pdfimport build
Conflicts:
sd/qa/unit/import-tests.cxx
Change-Id: I932f584ef3c054abe738d59e9957c3a40be1d2c9
diff --git a/config_host/config_poppler.h.in b/config_host/config_poppler.h.in
index 458c49b..934aec1 100644
--- a/config_host/config_poppler.h.in
+++ b/config_host/config_poppler.h.in
@@ -5,6 +5,8 @@ Settings for poppler header file dection
#ifndef CONFIG_POPPLER_H
#define CONFIG_POPPLER_H
+#define ENABLE_PDFIMPORT 0
+
#define HAVE_POPPLER_VERSION_H 0
#endif
diff --git a/configure.ac b/configure.ac
index 5981c28..359c5dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10399,6 +10399,7 @@ if test $_os != Android -a $_os != iOS -a \( -z
"$enable_pdfimport" -o "$enable_
BUILD_TYPE="$BUILD_TYPE POPPLER"
AC_DEFINE([HAVE_POPPLER_VERSION_H], 1)
fi
+ AC_DEFINE([ENABLE_PDFIMPORT],1)
else
AC_MSG_RESULT([no])
fi
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 024801b..6b2612c 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -7,6 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#include <config_poppler.h>
+
#include "sdmodeltestbase.hxx"
#include <svl/stritem.hxx>
@@ -94,8 +96,10 @@ public:
void testShapeLineStyle();
void testBnc862510_6();
void testBnc862510_7();
+#if ENABLE_PDFIMPORT
void testPDFImport();
void testPDFImportSkipImages();
+#endif
void testBnc910045();
CPPUNIT_TEST_SUITE(SdImportTest);
@@ -129,8 +133,10 @@ public:
CPPUNIT_TEST(testShapeLineStyle);
CPPUNIT_TEST(testBnc862510_6);
CPPUNIT_TEST(testBnc862510_7);
+#if ENABLE_PDFIMPORT
CPPUNIT_TEST(testPDFImport);
CPPUNIT_TEST(testPDFImportSkipImages);
+#endif
CPPUNIT_TEST(testBnc910045);
CPPUNIT_TEST_SUITE_END();
@@ -1079,6 +1085,8 @@ void SdImportTest::testBnc862510_7()
xDocShRef->DoClose();
}
+#if ENABLE_PDFIMPORT
+
void SdImportTest::testPDFImport()
{
::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/pdf/txtpic.pdf"), PDF);
@@ -1116,6 +1124,8 @@ void SdImportTest::testPDFImportSkipImages()
xDocShRef->DoClose();
}
+#endif
+
void SdImportTest::testBnc910045()
{
// Problem with table style which defines cell color with fill style
commit 5af3f7985e51fbd65ed070bb56f27bd7347dc02d
Author: Tomáš Chvátal <tomas.chva...@gmail.com>
Date: Thu Apr 16 10:13:06 2015 +0200
Make cpp/poppler-version.h header optional
Older popler (SLE11) does not have this header yet.
With the code simply if the header not found define version to oldest
possible working candidate and also raise the .pc check to the same.
Change-Id: I039c879879188fe2eb90cd119b80a1d6354a6a9c
Reviewed-on: https://gerrit.libreoffice.org/15339
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/config_host/config_poppler.h.in b/config_host/config_poppler.h.in
new file mode 100644
index 0000000..458c49b
--- /dev/null
+++ b/config_host/config_poppler.h.in
@@ -0,0 +1,10 @@
+/*
+Settings for poppler header file dection
+*/
+
+#ifndef CONFIG_POPPLER_H
+#define CONFIG_POPPLER_H
+
+#define HAVE_POPPLER_VERSION_H 0
+
+#endif
diff --git a/configure.ac b/configure.ac
index 3f3863a..5981c28 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10379,14 +10379,15 @@ if test $_os != Android -a $_os != iOS -a \( -z
"$enable_pdfimport" -o "$enable_
if test "$with_system_poppler" = "yes"; then
AC_MSG_RESULT([external])
SYSTEM_POPPLER=TRUE
- PKG_CHECK_MODULES( POPPLER, poppler >= 0.8.0 )
+ PKG_CHECK_MODULES( POPPLER, poppler >= 0.12.0 )
AC_LANG_PUSH([C++])
save_CXXFLAGS=$CXXFLAGS
save_CPPFLAGS=$CPPFLAGS
CXXFLAGS="$CXXFLAGS $POPPLER_CFLAGS"
CPPFLAGS="$CPPFLAGS $POPPLER_CFLAGS"
- AC_CHECK_HEADER([cpp/poppler-version.h], [],
- [AC_MSG_ERROR([cpp/poppler-version.h not found. Install
poppler])], [])
+ AC_CHECK_HEADER([cpp/poppler-version.h],
+ [AC_DEFINE([HAVE_POPPLER_VERSION_H], 1)],
+ [])
CXXFLAGS=$save_CXXFLAGS
CPPFLAGS=$save_CPPFLAGS
AC_LANG_POP([C++])
@@ -10396,6 +10397,7 @@ if test $_os != Android -a $_os != iOS -a \( -z
"$enable_pdfimport" -o "$enable_
AC_MSG_RESULT([internal])
SYSTEM_POPPLER=
BUILD_TYPE="$BUILD_TYPE POPPLER"
+ AC_DEFINE([HAVE_POPPLER_VERSION_H], 1)
fi
else
AC_MSG_RESULT([no])
@@ -12853,6 +12855,7 @@ AC_CONFIG_HEADERS([config_host/config_vcl.h])
AC_CONFIG_HEADERS([config_host/config_vclplug.h])
AC_CONFIG_HEADERS([config_host/config_version.h])
AC_CONFIG_HEADERS([config_host/config_oauth2.h])
+AC_CONFIG_HEADERS([config_host/config_poppler.h])
AC_OUTPUT
if test "$CROSS_COMPILING" = TRUE; then
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
index d8e691c..15545fe 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_SDEXT_SOURCE_PDFIMPORT_XPDFWRAPPER_PDFIOUTDEV_GPL_HXX
#include <sal/types.h>
+#include <config_poppler.h>
#if defined __GNUC__
# pragma GCC diagnostic push
@@ -50,7 +51,14 @@
class GfxPath;
class GfxFont;
class PDFDoc;
+#if HAVE_POPPLER_VERSION_H
#include <cpp/poppler-version.h>
+#else
+#define POPPLER_VERSION "0.12.3"
+#define POPPLER_VERSION_MAJOR 0
+#define POPPLER_VERSION_MINOR 12
+#define POPPLER_VERSION_MICRO 3
+#endif
#define POPPLER_CHECK_VERSION(major,minor,micro) \
(POPPLER_VERSION_MAJOR > (major) || \
(POPPLER_VERSION_MAJOR == (major) && POPPLER_VERSION_MINOR > (minor)) || \
commit 970fe67be2f54b5f7aa25615636413e7ae4be3dd
Author: Tor Lillqvist <t...@collabora.com>
Date: Tue Apr 28 19:13:08 2015 +0300
Check ENABLE_PDFIMPORT
(cherry picked from commit baee89d5a068fe950e78e9ec13937f237c5a2c9e)
Conflicts:
sd/CppunitTest_sd_import_tests.mk
Change-Id: I1c0e7e5ecfcd62315e367d537cd3e0466b66e48f
diff --git a/Repository.mk b/Repository.mk
index 3396fe9..ce79ee8 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -499,9 +499,11 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,postgresqlsdbc, \
postgresql-sdbc-impl) \
))
+ifneq ($(ENABLE_PDFIMPORT),)
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,pdfimport, \
pdfimport \
))
+endif
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,python, \
pythonloader \
diff --git a/sd/CppunitTest_sd_import_tests.mk
b/sd/CppunitTest_sd_import_tests.mk
index c30aef6..e8e738f 100644
--- a/sd/CppunitTest_sd_import_tests.mk
+++ b/sd/CppunitTest_sd_import_tests.mk
@@ -89,7 +89,7 @@ $(eval $(call gb_CppunitTest_use_components,sd_import_tests,\
sd/util/sd \
sd/util/sdfilt \
sd/util/sdd \
- sdext/source/pdfimport/pdfimport \
+ $(if $(ENABLE_PDFIMPORT),sdext/source/pdfimport/pdfimport) \
sfx2/util/sfx \
sot/util/sot \
svl/source/fsstor/fsstorage \
commit 8bc2c6fc07b469aefa8fe0c066eca1dbd8ddd5a6
Author: Tor Lillqvist <t...@collabora.com>
Date: Sat Sep 20 01:12:17 2014 +0300
This test was the wrong way surely?
Change-Id: I3470fbd2992cd96a772452d75fb2f0320bb529bf
diff --git a/configure.ac b/configure.ac
index 69a2e7c..3f3863a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12673,7 +12673,7 @@ if test "$enable_mpl_subset" = "yes"; then
AC_MSG_ERROR([need to --disable-ext-mariadb-connector - mariadb/mysql
support.])
fi
if test -n "$ENABLE_PDFIMPORT"; then
- if test "x$SYSTEM_POPPLER" != "x"; then
+ if test "x$SYSTEM_POPPLER" = "x"; then
AC_MSG_ERROR([need to disable PDF import via poppler or use system
library])
fi
fi
commit a9503e4f9173e8583a6e61348ca9ba58f9216fec
Author: Andras Timar <andras.ti...@collabora.com>
Date: Fri May 15 17:05:17 2015 +0200
shell script in Contents/MacOS is not accepted
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 9cbe5ec..b3c5ff7 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -158,7 +158,7 @@ End
#endif
-#if defined UNX
+#if defined UNX && ! defined ENABLE_MACOSX_SANDBOX
File gid_File_Bin_Senddoc
BIN_FILE_BODY;
Dir = FILELIST_DIR;
commit f78edcedd358b4298a083782fa17ad654a1e080f
Author: Andras Timar <andras.ti...@collabora.com>
Date: Thu May 14 00:01:17 2015 +0200
do not set unix executable bit for CREDITS.fodt, LICENSE.fodt and NOTICE
(cherry picked from commit cb5a0b03bef4eb8ab0d8689ec73ed83bb73ef5c0)
Conflicts:
scp2/source/ooo/common_brand.scp
Change-Id: Iab15ca1479d39e480369a18a7b043675d319f2ca
Conflicts:
scp2/source/ooo/common_brand.scp
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index f3cf520..8ee98d5 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -1317,7 +1317,7 @@ File gid_Eula_Odt
End
File gid_License_Odt
- BIN_FILE_BODY;
+ TXT_FILE_BODY;
#if defined MACOSX
Dir = gid_Dir_Bundle_Contents_Resources;
#else
@@ -1328,7 +1328,7 @@ File gid_License_Odt
End
File gid_Credits_Odt
- BIN_FILE_BODY;
+ TXT_FILE_BODY;
#if defined MACOSX
Dir = gid_Dir_Bundle_Contents_Resources;
#else
@@ -1339,7 +1339,7 @@ File gid_Credits_Odt
End
File gid_Apache_Notice
- BIN_FILE_BODY;
+ TXT_FILE_BODY;
#if defined MACOSX
Dir = gid_Dir_Bundle_Contents_Resources;
#else
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
