Hi, I have submitted a patch for review:
https://gerrit.libreoffice.org/2026 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/26/2026/1 fdo#60353: Avoid impl name clashes with other PDF import extensions This is only relevant for LO 3.6, as LO 4 switched this from a bundled extension to a core part, and in doing so also changed the implementation names (to "org.libreoffice.comp.documents..."; this commit is extra careful and choses names that will not clash with those either, "org.libreoffice.ext.documents..."). Change-Id: Ia6ec27809dcdfe5da630bd84f42c70146e427d7d --- M sdext/source/pdfimport/config/pdf_import_filter.xcu M sdext/source/pdfimport/config/pdf_types.xcu M sdext/source/pdfimport/description.xml M sdext/source/pdfimport/pdfimport.component M sdext/source/pdfimport/services.cxx 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/sdext/source/pdfimport/config/pdf_import_filter.xcu b/sdext/source/pdfimport/config/pdf_import_filter.xcu index 628be6d..c30127a 100644 --- a/sdext/source/pdfimport/config/pdf_import_filter.xcu +++ b/sdext/source/pdfimport/config/pdf_import_filter.xcu @@ -26,7 +26,7 @@ <prop oor:name="UIComponent"/> <prop oor:name="UserData" oor:type="oor:string-list"> <!-- converter service, ,import service,export service, , ,bool for pretty printing on or off --> - <value oor:separator=",">com.sun.star.comp.documents.DrawPDFImport,,com.sun.star.comp.Draw.XMLOasisImporter,,,,true</value> + <value oor:separator=",">org.libreoffice.ext.documents.DrawPDFImport,,com.sun.star.comp.Draw.XMLOasisImporter,,,,true</value> </prop> </node> @@ -55,7 +55,7 @@ <prop oor:name="UIComponent"/> <prop oor:name="UserData" oor:type="oor:string-list"> <!-- converter service, ,import service,export service, , ,bool for pretty printing on or off --> - <value oor:separator=",">com.sun.star.comp.documents.ImpressPDFImport,,com.sun.star.comp.Impress.XMLOasisImporter,,,,true</value> + <value oor:separator=",">org.libreoffice.ext.documents.ImpressPDFImport,,com.sun.star.comp.Impress.XMLOasisImporter,,,,true</value> </prop> </node> @@ -84,7 +84,7 @@ <prop oor:name="UIComponent"/> <prop oor:name="UserData" oor:type="oor:string-list"> <!-- converter service, ,import service,export service, , ,bool for pretty printing on or off --> - <value oor:separator=",">com.sun.star.comp.documents.WriterPDFImport,,com.sun.star.comp.Writer.XMLOasisImporter,,,,true</value> + <value oor:separator=",">org.libreoffice.ext.documents.WriterPDFImport,,com.sun.star.comp.Writer.XMLOasisImporter,,,,true</value> </prop> </node> @@ -96,7 +96,7 @@ <value>0</value> </prop> <prop oor:name="FilterService" oor:type="xs:string"> - <value>com.sun.star.comp.documents.HybridPDFImport</value> + <value>org.libreoffice.ext.documents.HybridPDFImport</value> </prop> <prop oor:name="Flags" oor:type="oor:string-list"> <value>3RDPARTYFILTER ALIEN IMPORT NOTINFILEDIALOG NOTINCHOOSER</value> @@ -123,7 +123,7 @@ <value>0</value> </prop> <prop oor:name="FilterService" oor:type="xs:string"> - <value>com.sun.star.comp.documents.HybridPDFImport</value> + <value>org.libreoffice.ext.documents.HybridPDFImport</value> </prop> <prop oor:name="Flags" oor:type="oor:string-list"> <value>3RDPARTYFILTER ALIEN IMPORT NOTINFILEDIALOG NOTINCHOOSER</value> @@ -150,7 +150,7 @@ <value>0</value> </prop> <prop oor:name="FilterService" oor:type="xs:string"> - <value>com.sun.star.comp.documents.HybridPDFImport</value> + <value>org.libreoffice.ext.documents.HybridPDFImport</value> </prop> <prop oor:name="Flags" oor:type="oor:string-list"> <value>3RDPARTYFILTER ALIEN IMPORT NOTINFILEDIALOG NOTINCHOOSER</value> @@ -177,7 +177,7 @@ <value>0</value> </prop> <prop oor:name="FilterService" oor:type="xs:string"> - <value>com.sun.star.comp.documents.HybridPDFImport</value> + <value>org.libreoffice.ext.documents.HybridPDFImport</value> </prop> <prop oor:name="Flags" oor:type="oor:string-list"> <value>3RDPARTYFILTER ALIEN IMPORT NOTINFILEDIALOG NOTINCHOOSER</value> diff --git a/sdext/source/pdfimport/config/pdf_types.xcu b/sdext/source/pdfimport/config/pdf_types.xcu index 11990a8..942779f 100644 --- a/sdext/source/pdfimport/config/pdf_types.xcu +++ b/sdext/source/pdfimport/config/pdf_types.xcu @@ -3,7 +3,7 @@ <oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:package="org.openoffice.TypeDetection" oor:name="Types"> <node oor:name="Types"> <node oor:name="pdf_Portable_Document_Format" oor:op="replace" > - <prop oor:name="DetectService"><value>com.sun.star.comp.documents.PDFDetector</value></prop> + <prop oor:name="DetectService"><value>org.libreoffice.ext.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> diff --git a/sdext/source/pdfimport/description.xml b/sdext/source/pdfimport/description.xml index 0816004..f3ec15f 100644 --- a/sdext/source/pdfimport/description.xml +++ b/sdext/source/pdfimport/description.xml @@ -10,7 +10,7 @@ <OpenOffice.org-minimal-version value="3.0" dep:name="OpenOffice.org 3.0"/> </dependencies> - <version value="1.0.6" /> + <version value="1.0.7" /> <platform value="@PLATFORM@" /> diff --git a/sdext/source/pdfimport/pdfimport.component b/sdext/source/pdfimport/pdfimport.component index 1392302..98a6756 100644 --- a/sdext/source/pdfimport/pdfimport.component +++ b/sdext/source/pdfimport/pdfimport.component @@ -1,19 +1,19 @@ <?xml version="1.0"?> <component xmlns="http://openoffice.org/2010/uno-components" loader="com.sun.star.loader.SharedLibrary"> - <implementation name="com.sun.star.comp.documents.HybridPDFImport"> + <implementation name="org.libreoffice.ext.documents.HybridPDFImport"> <service name="com.sun.star.document.ImportFilter"/> </implementation> - <implementation name="com.sun.star.comp.documents.WriterPDFImport"> + <implementation name="org.libreoffice.ext.documents.WriterPDFImport"> <service name="com.sun.star.document.ImportFilter"/> </implementation> - <implementation name="com.sun.star.comp.documents.DrawPDFImport"> + <implementation name="org.libreoffice.ext.documents.DrawPDFImport"> <service name="com.sun.star.document.ImportFilter"/> </implementation> - <implementation name="com.sun.star.comp.documents.ImpressPDFImport"> + <implementation name="org.libreoffice.ext.documents.ImpressPDFImport"> <service name="com.sun.star.document.ImportFilter"/> </implementation> - <implementation name="com.sun.star.comp.documents.PDFDetector"> + <implementation name="org.libreoffice.ext.documents.PDFDetector"> <service name="com.sun.star.document.ImportFilter"/> </implementation> </component> diff --git a/sdext/source/pdfimport/services.cxx b/sdext/source/pdfimport/services.cxx index 7e4da4b..2a68653 100644 --- a/sdext/source/pdfimport/services.cxx +++ b/sdext/source/pdfimport/services.cxx @@ -108,11 +108,11 @@ static const ComponentDescription* lcl_getComponents() { static const ComponentDescription aDescriptions[] = { - ComponentDescription( "com.sun.star.document.ImportFilter", "com.sun.star.comp.documents.HybridPDFImport", Create_PDFIHybridAdaptor ), - ComponentDescription( "com.sun.star.document.ImportFilter", "com.sun.star.comp.documents.WriterPDFImport", Create_PDFIRawAdaptor_Writer ), - ComponentDescription( "com.sun.star.document.ImportFilter", "com.sun.star.comp.documents.DrawPDFImport", Create_PDFIRawAdaptor_Draw ), - ComponentDescription( "com.sun.star.document.ImportFilter", "com.sun.star.comp.documents.ImpressPDFImport", Create_PDFIRawAdaptor_Impress ), - ComponentDescription( "com.sun.star.document.ImportFilter", "com.sun.star.comp.documents.PDFDetector", Create_PDFDetector ), + ComponentDescription( "com.sun.star.document.ImportFilter", "org.libreoffice.ext.documents.HybridPDFImport", Create_PDFIHybridAdaptor ), + ComponentDescription( "com.sun.star.document.ImportFilter", "org.libreoffice.ext.documents.WriterPDFImport", Create_PDFIRawAdaptor_Writer ), + ComponentDescription( "com.sun.star.document.ImportFilter", "org.libreoffice.ext.documents.DrawPDFImport", Create_PDFIRawAdaptor_Draw ), + ComponentDescription( "com.sun.star.document.ImportFilter", "org.libreoffice.ext.documents.ImpressPDFImport", Create_PDFIRawAdaptor_Impress ), + ComponentDescription( "com.sun.star.document.ImportFilter", "org.libreoffice.ext.documents.PDFDetector", Create_PDFDetector ), ComponentDescription() }; return aDescriptions; -- To view, visit https://gerrit.libreoffice.org/2026 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia6ec27809dcdfe5da630bd84f42c70146e427d7d Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Stephan Bergmann <sberg...@redhat.com> _______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice