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

7 files changed, 39 insertions, 45 deletions

diff --git a/scp2/source/extensions/directory_extensions.scp b/scp2/source/extensions/directory_extensions.scp
index 62d3b942ce07..9d3a018647fe 100644
--- a/scp2/source/extensions/directory_extensions.scp
+++ b/scp2/source/extensions/directory_extensions.scp
@@ -66,17 +66,6 @@ End
 
 #endif
 
-/* ** PDF Import ** */
-
-#ifndef WITHOUT_EXTENSION_PDFIMPORT
-
-Directory gid_Brand_Dir_Share_Extensions_PDF_Import
-	ParentID = gid_Brand_Dir_Share_Extensions;
-	DosName = "pdfimport";
-End
-
-#endif
-
 /* ** Numbertext ** */
 
 #ifdef WITH_EXTENSION_NUMBERTEXT
diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp
index f268379905f2..24b2e77bce06 100644
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@ -72,19 +72,6 @@ End
 
 #endif
 
-/* ** PDF Import ** */
-
-#ifndef WITHOUT_EXTENSION_PDFIMPORT
-
-File gid_File_Oxt_PDF_Import
-    TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_PDF_Import;
-    Name = "pdfimport.oxt";
-End
-
-#endif
-
 /* ** Numbertext ** */
 
 #ifdef WITH_EXTENSION_NUMBERTEXT
diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp
index 48b5f7d31975..37558c30e558 100644
--- a/scp2/source/extensions/module_extensions.scp
+++ b/scp2/source/extensions/module_extensions.scp
@@ -87,21 +87,6 @@ Module gid_Module_Optional_Extensions_MEDIAWIKI
 End
 #endif
 
-/* ** PDF Import ** */
-
-#ifndef WITHOUT_EXTENSION_PDFIMPORT
-Module gid_Module_Optional_Extensions_PDFIMPORT
-    PackageInfo = "packinfo_extensions.txt";
-    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_PDFIMPORT);
-    ParentID = gid_Module_Optional_Extensions;
-    Files = (
-        gid_File_Oxt_PDF_Import );
-    Minimal = NO;
-    Default = YES;
-    Styles = ( );
-End
-#endif
-
 /* ** Numbertext ** */
 
 #ifdef WITH_EXTENSION_NUMBERTEXT
diff --git a/scp2/source/extensions/module_extensions.ulf b/scp2/source/extensions/module_extensions.ulf
index 1d9e2476e629..336a2eb45aef 100644
--- a/scp2/source/extensions/module_extensions.ulf
+++ b/scp2/source/extensions/module_extensions.ulf
@@ -51,12 +51,6 @@ en-US = "MediaWiki Publisher"
 [STR_DESC_MODULE_OPTIONAL_EXTENSIONS_MEDIAWIKI]
 en-US = "MediaWiki Publisher"
 
-[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_PDFIMPORT]
-en-US = "PDF Import"
-
-[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_PDFIMPORT]
-en-US = "PDF Import"
-
 [STR_NAME_MODULE_OPTIONAL_EXTENSIONS_NUMBERTEXT]
 en-US = "Numbertext"
 
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 27c47f9ca637..826ed661cc51 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -903,6 +903,19 @@ STD_LIB_FILE( gid_File_Lib_Log, log)
 
 STD_LIB_FILE( gid_File_Lib_Pdffilter, pdffilter)
 
+#if !defined WITHOUT_PDFIMPORT
+File gid_File_PDFImport
+    TXT_FILE_BODY;
+    Dir = SCP2_OOO_BIN_DIR;
+#if defined UNX
+    Name = STRING(CONCAT2(pdfimport.uno,UNXSUFFIX));
+#else
+    Name = "pdfimport.uno.dll";
+#endif
+    Styles = (PACKED);
+End
+#endif
+
 SPECIAL_LIB_FILE(gid_File_Lib_Deployment,deployment)
 
 SPECIAL_LIB_FILE(gid_File_Lib_DeploymentGui,deploymentgui)
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 6b30e7212cff..9079a4f6247d 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -115,6 +115,29 @@ File gid_File_Exe_Nsplugin
 End
 #endif
 
+#if !defined WITHOUT_PDFIMPORT
+
+Directory gid_Dir_Share_Xpdfimport
+    ParentID = gid_Brand_Dir_Share;
+    DosName = "xpdfimport";
+End
+
+File gid_File_Dat_XpdfimportErrPdf
+    TXT_FILE_BODY;
+    Dir = gid_Dir_Share_Xpdfimport;
+    Name = "xpdfimport_err.pdf";
+    Styles = (PACKED);
+End
+
+File gid_File_Exe_Xpdfimport
+    BIN_FILE_BODY;
+    Dir = gid_Brand_Dir_Program;
+    Name = EXENAME(xpdfimport);
+    Styles = (PACKED);
+End
+
+#endif
+
 File gid_File_Bin_Gengal
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 13bb7b7593a3..0949760eed0e 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -180,6 +180,8 @@ Module gid_Module_Root_Files_4
 	Default = YES;
 	Styles = (HIDDEN_ROOT);
 	Files = (gid_File_Dat_Root4,
+        gid_File_Dat_XpdfimportErrPdf,
+        gid_File_Exe_Xpdfimport,
 	gid_File_Filter_Eme,
 	gid_File_Filter_Sdfilt,
 	gid_File_Filter_Svgio,
@@ -235,6 +237,7 @@ Module gid_Module_Root_Files_4
 	gid_File_Lib_Oox,
 	gid_File_Lib_Pcr,
 	gid_File_Lib_Pdffilter,
+        gid_File_Lib_PdfImport,
 	gid_File_Lib_Pk,
 	gid_File_Lib_Pl,
 	gid_File_Lib_Sf_Prothdlr,