diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2012-11-24 22:58:01 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2012-11-24 23:21:37 +0100 |
commit | 7bf64a5af4088c0f6d4dbf7f493e94fa63e2a4b2 (patch) | |
tree | 1b5203554f998da6402ee482da1499f6568bf31a /distro-configs | |
parent | 774003e87946ca9dc63b1c1c550be968016d1e53 (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 'distro-configs')
-rw-r--r-- | distro-configs/LibreOfficeAndroid.conf | 3 | ||||
-rw-r--r-- | distro-configs/LibreOfficeAndroidX86.conf | 3 | ||||
-rw-r--r-- | distro-configs/LibreOfficeLinux.conf | 3 | ||||
-rw-r--r-- | distro-configs/LibreOfficeMacOSX.conf | 3 | ||||
-rw-r--r-- | distro-configs/LibreOfficeOpenBSD.conf | 3 | ||||
-rw-r--r-- | distro-configs/LibreOfficeWin32.conf | 3 | ||||
-rw-r--r-- | distro-configs/LibreOfficeiOS.conf | 3 | ||||
-rw-r--r-- | distro-configs/OxygenOfficeLinux.conf | 3 | ||||
-rw-r--r-- | distro-configs/OxygenOfficeWin32.conf | 3 |
9 files changed, 9 insertions, 18 deletions
diff --git a/distro-configs/LibreOfficeAndroid.conf b/distro-configs/LibreOfficeAndroid.conf index 8b92ef83b8cc..525218b60e56 100644 --- a/distro-configs/LibreOfficeAndroid.conf +++ b/distro-configs/LibreOfficeAndroid.conf @@ -1,7 +1,5 @@ --host=arm-linux-androideabi --disable-cairo-canvas ---disable-ext-pdfimport ---disable-ext-presenter-console --disable-ext-presenter-minimizer --disable-ext-report-builder --disable-gconf @@ -14,6 +12,7 @@ --disable-odk --disable-opengl --disable-postgresql-sdbc +--disable-pdfimport --disable-python --disable-randr --disable-randr-link diff --git a/distro-configs/LibreOfficeAndroidX86.conf b/distro-configs/LibreOfficeAndroidX86.conf index e97242a55421..3893c5b940a6 100644 --- a/distro-configs/LibreOfficeAndroidX86.conf +++ b/distro-configs/LibreOfficeAndroidX86.conf @@ -1,8 +1,6 @@ --host=i686-linux-androideabi --disable-cairo-canvas --disable-cups ---disable-ext-pdfimport ---disable-ext-presenter-console --disable-ext-presenter-minimizer --disable-ext-report-builder --disable-gconf @@ -14,6 +12,7 @@ --disable-mozilla --disable-odk --disable-opengl +--disable-pdfimport --disable-postgresql-sdbc --disable-python --disable-randr diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf index bc56887922b4..6f22043fde6e 100644 --- a/distro-configs/LibreOfficeLinux.conf +++ b/distro-configs/LibreOfficeLinux.conf @@ -33,10 +33,9 @@ --enable-ext-wiki-publisher --enable-ext-report-builder --enable-ext-presenter-minimizer ---enable-ext-presenter-console ---enable-ext-pdfimport --enable-ext-nlpsolver --enable-epm +--enable-pdfimport --enable-python=internal --enable-online-update --disable-unix-qstart-libpng diff --git a/distro-configs/LibreOfficeMacOSX.conf b/distro-configs/LibreOfficeMacOSX.conf index 19f12b236e20..2aa870e594d6 100644 --- a/distro-configs/LibreOfficeMacOSX.conf +++ b/distro-configs/LibreOfficeMacOSX.conf @@ -4,12 +4,11 @@ --enable-scripting-beanshell --enable-scripting-javascript --enable-ext-presenter-minimizer ---enable-ext-presenter-console ---enable-ext-pdfimport --enable-ext-wiki-publisher --enable-ext-report-builder --enable-ext-nlpsolver --enable-extension-integration --enable-online-update +--enable-pdfimport --without-system-postgresql --disable-gtk diff --git a/distro-configs/LibreOfficeOpenBSD.conf b/distro-configs/LibreOfficeOpenBSD.conf index f06eef64ebaf..e05e108a6ba8 100644 --- a/distro-configs/LibreOfficeOpenBSD.conf +++ b/distro-configs/LibreOfficeOpenBSD.conf @@ -13,10 +13,9 @@ --enable-gstreamer-0-10 --enable-lockdown --enable-ext-presenter-minimizer ---enable-ext-pdfimport ---enable-ext-presenter-console --enable-ext-report-builder --enable-ext-wiki-publisher +--enable-pdfimport --enable-python=system --with-alloc=system --with-ant-home=/usr/local/ant diff --git a/distro-configs/LibreOfficeWin32.conf b/distro-configs/LibreOfficeWin32.conf index 36351d76fc90..c8f036ade9cd 100644 --- a/distro-configs/LibreOfficeWin32.conf +++ b/distro-configs/LibreOfficeWin32.conf @@ -12,7 +12,6 @@ --enable-ext-wiki-publisher --enable-ext-report-builder --enable-ext-presenter-minimizer ---enable-ext-presenter-console ---enable-ext-pdfimport --enable-ext-nlpsolver --enable-online-update +--enable-pdfimport diff --git a/distro-configs/LibreOfficeiOS.conf b/distro-configs/LibreOfficeiOS.conf index 3c8db0c2959d..52fb60f8a9c4 100644 --- a/distro-configs/LibreOfficeiOS.conf +++ b/distro-configs/LibreOfficeiOS.conf @@ -1,8 +1,6 @@ --build=i386-apple-darwin10.7.0 --host=arm-apple-darwin10 --disable-cairo-canvas ---disable-ext-pdfimport ---disable-ext-presenter-console --disable-ext-presenter-minimizer --disable-ext-report-builder --disable-extension-integration @@ -15,6 +13,7 @@ --disable-mozilla --disable-odk --disable-opengl +--disable-pdfimport --disable-postgresql-sdbc --disable-python --disable-randr diff --git a/distro-configs/OxygenOfficeLinux.conf b/distro-configs/OxygenOfficeLinux.conf index dfbc99eb44f8..0777056c04a8 100644 --- a/distro-configs/OxygenOfficeLinux.conf +++ b/distro-configs/OxygenOfficeLinux.conf @@ -38,8 +38,6 @@ --enable-ext-wiki-publisher --enable-ext-report-builder --enable-ext-presenter-minimizer ---enable-ext-presenter-console ---enable-ext-pdfimport --enable-scripting-beanshell --enable-scripting-javascript --enable-ext-google-docs @@ -53,6 +51,7 @@ --enable-ext-barcode --disable-ext-oooblogger --enable-ext-mysql-connector +--enable-pdfimport --enable-postgresql-sdbc --with-sun-templates --enable-neon diff --git a/distro-configs/OxygenOfficeWin32.conf b/distro-configs/OxygenOfficeWin32.conf index 43106a9dd124..22aa1374e045 100644 --- a/distro-configs/OxygenOfficeWin32.conf +++ b/distro-configs/OxygenOfficeWin32.conf @@ -16,8 +16,6 @@ --enable-ext-wiki-publisher --enable-ext-report-builder --enable-ext-presenter-minimizer ---enable-ext-presenter-console ---enable-ext-pdfimport --enable-scripting-beanshell --enable-scripting-javascript --enable-ext-google-docs @@ -39,4 +37,5 @@ --enable-graphite --enable-dependency-tracking --enable-mozilla +--enable-pdfimport --with-system-mozilla=mozilla |