--- a/Repository.mk +++ a/Repository.mk @@ -44,6 +44,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ AppleRemote \ + PptImporter \ adabas \ adabasui \ agg \ @@ -64,6 +65,8 @@ editeng \ eggtray \ file \ + filtertracer \ + flash \ for \ forui \ fwe \ @@ -79,6 +82,8 @@ odbc \ odbcbase \ oox \ + pdffilter \ + placeware \ qstart_gtk \ rpt \ rptui \ @@ -92,6 +97,7 @@ smd \ sot \ spa \ + svgfilter \ svl \ svt \ svx \ @@ -103,6 +109,7 @@ sdd \ sdui \ sdfilt \ + t602filter \ textconversiondlgs \ tk \ tl \ @@ -118,6 +125,8 @@ vclplug_kde4 \ vclplug_svp \ xcr \ + xmlfa \ + xmlfd \ xo \ xof \ )) --- a/RepositoryExternal.mk +++ a/RepositoryExternal.mk @@ -360,4 +360,21 @@ endef endif # SYSTEM_OPENSSL +### Jars ############################################################ + +ifeq ($(SYSTEM_SAXON),YES) + +define gb_JavaClassSet__use_saxon +$(call gb_JavaClassSet_add_system_jar,$(1),$(SAXON_JAR)) +endef + +else # !SYSTEM_SAXON + +define gb_JavaClassSet__use_saxon +$(call gb_JavaClassSet_add_jar,$(1),$(OUTDIR)/bin/saxon9.jar) +endef + +endif # SYSTEM_SAXON + + # vim: set noet sw=4 ts=4: --- a/filter/Jar_XSLTFilter.mk +++ a/filter/Jar_XSLTFilter.mk @@ -0,0 +1,45 @@ +#*************************************************************** +# 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 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +#*************************************************************** + +$(eval $(call gb_Jar_Jar,XSLTFilter,SRCDIR)) + +$(eval $(call gb_Jar_add_jars,XSLTFilter,\ + $(OUTDIR)/bin/ridl.jar \ + $(OUTDIR)/bin/unoil.jar \ + $(OUTDIR)/bin/jurt.jar \ + $(OUTDIR)/bin/juh.jar \ +)) + +$(call gb_Jar_use_externals,XSLTFilter,saxon) + +$(eval $(call gb_Jar_set_componentfile,XSLTFilter,filter/source/xsltfilter/XSLTFilter.jar,OOO)) + +$(eval $(call gb_Jar_set_manifest,XSLTFilter,$(SRCDIR)/filter/source/xsltfilter/Manifest)) + +$(eval $(call gb_Jar_set_jarclasspath,XSLTFilter,saxon9.jar)) + +$(eval $(call gb_Jar_set_packageroot,XSLTFilter,com)) + +$(eval $(call gb_Jar_add_sourcefiles,XSLTFilter,\ + filter/source/xsltfilter/com/sun/star/comp/xsltfilter/Base64 \ + filter/source/xsltfilter/com/sun/star/comp/xsltfilter/XSLTFilterOLEExtracter \ + filter/source/xsltfilter/com/sun/star/comp/xsltfilter/XSLTransformer \ +)) + +# vim: set noet sw=4 ts=4: --- a/filter/Jar_XSLTValidate.mk +++ a/filter/Jar_XSLTValidate.mk @@ -0,0 +1,44 @@ +#*************************************************************** +# 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 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +#*************************************************************** + +$(eval $(call gb_Jar_Jar,XSLTValidate,SRCDIR)) + +$(eval $(call gb_Jar_add_jars,XSLTValidate,\ + $(OUTDIR)/bin/ridl.jar \ + $(OUTDIR)/bin/unoil.jar \ + $(OUTDIR)/bin/jurt.jar \ + $(OUTDIR)/bin/juh.jar \ +)) + +#$(eval $(call gb_Jar_use_externals,XSLTValidate,\ + xml-apis \ + xalan \ +)) + +$(eval $(call gb_Jar_set_componentfile,XSLTValidate,filter/source/xsltvalidate/XSLTValidate,OOO)) + +$(eval $(call gb_Jar_set_manifest,XSLTValidate,$(SRCDIR)/filter/source/xsltvalidate/Manifest)) + +$(eval $(call gb_Jar_set_packageroot,XSLTValidate,XSLTValidate.class)) + +$(eval $(call gb_Jar_add_sourcefiles,XSLTValidate,\ + filter/source/xsltvalidate/XSLTValidate \ +)) + +# vim: set noet sw=4 ts=4: --- a/filter/JunitTest_filter_complex.mk +++ a/filter/JunitTest_filter_complex.mk @@ -0,0 +1,40 @@ +#*************************************************************** +# 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 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +#*************************************************************** + +$(eval $(call gb_JunitTest_JunitTest,filter_complex,SRCDIR)) + +$(eval $(call gb_JunitTest_add_jars,filter_complex,\ + $(OUTDIR)/bin/OOoRunner.jar \ + $(OUTDIR)/bin/ridl.jar \ + $(OUTDIR)/bin/test.jar \ + $(OUTDIR)/bin/unoil.jar \ + $(OUTDIR)/bin/jurt.jar \ +)) + +$(eval $(call gb_JunitTest_add_sourcefiles,filter_complex,\ + filter/qa/complex/filter/misc/FinalizedMandatoryTest \ + filter/qa/complex/filter/misc/TypeDetection6FileFormat \ +)) + +$(eval $(call gb_JunitTest_add_classes,filter_complex,\ + complex.filter.misc.FinalizedMandatoryTest \ + complex.filter.misc.TypeDetection6FileFormat \ +)) + +# vim: set noet sw=4 ts=4: --- a/filter/Library_PptImporter.mk +++ a/filter/Library_PptImporter.mk @@ -0,0 +1,47 @@ +#*************************************************************** +# 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 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +#*************************************************************** + +$(eval $(call gb_Library_Library,PptImporter)) + +$(eval $(call gb_Library_add_api,PptImporter,\ + udkapi \ + offapi \ +)) + +$(eval $(call gb_Library_set_include,PptImporter,\ + -I$(SRCDIR)/filter/inc/pch \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Library_add_linked_libs,PptImporter,\ + sot \ + tl \ + cppuhelper \ + cppu \ + sal \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,PptImporter,\ + filter/source/msfilter/powerpoint/pptimporter \ + filter/source/msfilter/powerpoint/pptimporteruno \ + filter/source/msfilter/powerpoint/ppttoxml \ +)) + +# vim: set noet sw=4 ts=4: --- a/filter/Library_filtertracer.mk +++ a/filter/Library_filtertracer.mk @@ -0,0 +1,46 @@ +#*************************************************************** +# 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 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +#*************************************************************** + +$(eval $(call gb_Library_Library,filtertracer)) + +$(eval $(call gb_Library_add_api,filtertracer,\ + udkapi \ + offapi \ +)) + +$(eval $(call gb_Library_set_include,filtertracer,\ + -I$(SRCDIR)/filter/inc/pch \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Library_add_linked_libs,filtertracer,\ + utl \ + tl \ + cppuhelper \ + cppu \ + sal \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,filtertracer,\ + filter/source/filtertracer/filtertracer \ + filter/source/filtertracer/filtertraceruno \ +)) + +# vim: set noet sw=4 ts=4: --- a/filter/Library_flash.mk +++ a/filter/Library_flash.mk @@ -0,0 +1,60 @@ +#*************************************************************** +# 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 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +#*************************************************************** + +$(eval $(call gb_Library_Library,flash)) + +$(eval $(call gb_Library_set_componentfile,flash,filter/source/flash/flash)) + +$(eval $(call gb_Library_add_api,flash,\ + udkapi \ + offapi \ +)) + +$(eval $(call gb_Library_set_include,flash,\ + -I$(SRCDIR)/filter/inc/pch \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Library_add_linked_libs,flash,\ + svt \ + vcl \ + utl \ + tl \ + comphelper \ + basegfx \ + cppuhelper \ + cppu \ + sal \ + $(gb_STDLIBS) \ +)) + +$(call gb_Library_use_external,flash,zlib) + +$(eval $(call gb_Library_add_exception_objects,flash,\ + filter/source/flash/impswfdialog \ + filter/source/flash/swfdialog \ + filter/source/flash/swfexporter \ + filter/source/flash/swffilter \ + filter/source/flash/swfuno \ + filter/source/flash/swfwriter \ + filter/source/flash/swfwriter1 \ + filter/source/flash/swfwriter2 \ +)) + +# vim: set noet sw=4 ts=4: --- a/filter/Library_msfilter.mk +++ a/filter/Library_msfilter.mk @@ -0,0 +1,79 @@ +#*************************************************************** +# 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 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +#*************************************************************** + +$(eval $(call gb_Library_Library,msfilter)) + +$(eval $(call gb_Library_add_package_headers,msfilter,filter_inc)) + +$(eval $(call gb_Library_set_componentfile,msfilter,filter/source/msfilter/msfilter)) + +$(eval $(call gb_Library_add_api,msfilter,\ + udkapi \ + offapi \ +)) + +$(eval $(call gb_Library_set_include,msfilter,\ + -I$(SRCDIR)/filter/inc/pch \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Library_add_defs,msfilter,\ + -DMSFILTER_DLLIMPLEMENTATION \ +)) + +$(eval $(call gb_Library_add_linked_libs,msfilter,\ + svxcore \ + editeng \ + sfx \ + xo \ + sb \ + svt \ + tk \ + vcl \ + svl \ + sot \ + xcr \ + utl \ + tl \ + comphelper \ + basegfx \ + cppuhelper \ + cppu \ + sal \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,msfilter,\ + filter/source/msfilter/countryid \ + filter/source/msfilter/escherex \ + filter/source/msfilter/eschesdo \ + filter/source/msfilter/mscodec \ + filter/source/msfilter/msdffimp \ + filter/source/msfilter/msfiltertracer \ + filter/source/msfilter/msocximex \ + filter/source/msfilter/msoleexp \ + filter/source/msfilter/msvbahelper \ + filter/source/msfilter/msvbasic \ + filter/source/msfilter/services \ + filter/source/msfilter/svdfppt \ + filter/source/msfilter/svxmsbas \ + filter/source/msfilter/svxmsbas2 \ +)) + +# vim: set noet sw=4 ts=4: --- a/filter/Library_pdffilter.mk +++ a/filter/Library_pdffilter.mk @@ -0,0 +1,60 @@ +#*************************************************************** +# 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 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +#*************************************************************** + +$(eval $(call gb_Library_Library,pdffilter)) + +$(eval $(call gb_Library_set_componentfile,pdffilter,filter/source/pdf/pdffilter)) + +$(eval $(call gb_Library_add_api,pdffilter,\ + udkapi \ + offapi \ +)) + +$(eval $(call gb_Library_set_include,pdffilter,\ + -I$(SRCDIR)/filter/inc/pch \ + -I$(SRCDIR)/filter/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Library_add_linked_libs,pdffilter,\ + svt \ + sfx \ + tk \ + vcl \ + utl \ + tl \ + svl \ + comphelper \ + basegfx \ + cppuhelper \ + cppu \ + sal \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,pdffilter,\ + filter/source/pdf/impdialog \ + filter/source/pdf/pdfdialog \ + filter/source/pdf/pdfexport \ + filter/source/pdf/pdffilter \ + filter/source/pdf/pdfinteract \ + filter/source/pdf/pdfuno \ +)) + +# vim: set noet sw=4 ts=4: --- a/filter/Library_placeware.mk +++ a/filter/Library_placeware.mk @@ -0,0 +1,50 @@ +#*************************************************************** +# 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 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +#*************************************************************** + +$(eval $(call gb_Library_Library,placeware)) + +$(eval $(call gb_Library_set_componentfile,placeware,filter/source/placeware/placeware)) + +$(eval $(call gb_Library_add_api,placeware,\ + udkapi \ + offapi \ +)) + +$(eval $(call gb_Library_set_include,placeware,\ + -I$(SRCDIR)/filter/inc/pch \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Library_add_linked_libs,placeware,\ + cppuhelper \ + cppu \ + sal \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,placeware,\ + filter/source/placeware/Base64Codec \ + filter/source/placeware/exporter \ + filter/source/placeware/filter \ + filter/source/placeware/tempfile \ + filter/source/placeware/uno \ + filter/source/placeware/zip \ +)) + +# vim: set noet sw=4 ts=4: --- a/filter/Library_svgfilter.mk +++ a/filter/Library_svgfilter.mk @@ -0,0 +1,72 @@ +#*************************************************************** +# 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 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +#*************************************************************** + +$(eval $(call gb_Library_Library,svgfilter)) + +$(eval $(call gb_Library_set_componentfile,svgfilter,filter/source/svg/svgfilter)) + +$(eval $(call gb_Library_add_api,svgfilter,\ + udkapi \ + offapi \ +)) + +$(eval $(call gb_Library_set_include,svgfilter,\ + -I$(SRCDIR)/filter/inc/pch \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Library_add_linked_libs,svgfilter,\ + svxcore \ + editeng \ + xo \ + svt \ + vcl \ + utl \ + tl \ + comphelper \ + basegfx \ + cppuhelper \ + cppu \ + sal \ + $(gb_STDLIBS) \ +)) + +ifneq ($(SOLAR_JAVA),) +$(eval $(call gb_Library_add_linked_libs,svgfilter,\ + jvmaccess \ +)) +endif + +$(eval $(call gb_Library_add_exception_objects,svgfilter,\ + filter/source/svg/impsvgdialog \ + filter/source/svg/svgdialog \ + filter/source/svg/svgexport \ + filter/source/svg/svgfilter \ + filter/source/svg/svgfontexport \ + filter/source/svg/svguno \ + filter/source/svg/svgwriter \ +)) + +ifneq ($(SOLAR_JAVA),) +$(eval $(call gb_Library_add_exception_objects,svgfilter,\ + filter/source/svg/svgimport \ +)) +endif + +# vim: set noet sw=4 ts=4: --- a/filter/Library_t602filter.mk +++ a/filter/Library_t602filter.mk @@ -0,0 +1,48 @@ +#*************************************************************** +# 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 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +#*************************************************************** + +$(eval $(call gb_Library_Library,t602filter)) + +$(eval $(call gb_Library_set_componentfile,t602filter,filter/source/t602/t602filter)) + +$(eval $(call gb_Library_add_api,t602filter,\ + udkapi \ + offapi \ +)) + +$(eval $(call gb_Library_set_include,t602filter,\ + -I$(SRCDIR)/filter/inc/pch \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Library_add_linked_libs,t602filter,\ + xo \ + tl \ + cppuhelper \ + cppu \ + sal \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,t602filter,\ + filter/source/t602/filterenv \ + filter/source/t602/t602filter \ +)) + +# vim: set noet sw=4 ts=4: --- a/filter/Library_xmlfa.mk +++ a/filter/Library_xmlfa.mk @@ -0,0 +1,49 @@ +#*************************************************************** +# 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 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +#*************************************************************** + +$(eval $(call gb_Library_Library,xmlfa)) + +$(eval $(call gb_Library_set_componentfile,xmlfa,filter/source/xmlfilteradaptor/xmlfa)) + +$(eval $(call gb_Library_add_api,xmlfa,\ + udkapi \ + offapi \ +)) + +$(eval $(call gb_Library_set_include,xmlfa,\ + -I$(SRCDIR)/filter/inc/pch \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Library_add_linked_libs,xmlfa,\ + tl \ + comphelper \ + cppuhelper \ + cppu \ + sal \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,xmlfa,\ + filter/source/xmlfilteradaptor/XmlFilterAdaptor \ + filter/source/xmlfilteradaptor/genericfilter \ + filter/source/xmlfilteradaptor/streamwrap \ +)) + +# vim: set noet sw=4 ts=4: --- a/filter/Library_xmlfd.mk +++ a/filter/Library_xmlfd.mk @@ -0,0 +1,47 @@ +#*************************************************************** +# 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 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +#*************************************************************** + +$(eval $(call gb_Library_Library,xmlfd)) + +$(eval $(call gb_Library_set_componentfile,xmlfd,filter/source/xmlfilterdetect/xmlfd)) + +$(eval $(call gb_Library_add_api,xmlfd,\ + udkapi \ + offapi \ +)) + +$(eval $(call gb_Library_set_include,xmlfd,\ + -I$(SRCDIR)/filter/inc/pch \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Library_add_linked_libs,xmlfd,\ + ucbhelper \ + cppuhelper \ + cppu \ + sal \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,xmlfd,\ + filter/source/xmlfilterdetect/fdcomp \ + filter/source/xmlfilterdetect/filterdetect \ +)) + +# vim: set noet sw=4 ts=4: --- a/filter/Module_filter.mk +++ a/filter/Module_filter.mk @@ -21,6 +21,26 @@ $(eval $(call gb_Module_add_targets,filter,\ Configuration_filter \ + Jar_XSLTFilter \ + Jar_XSLTValidate \ + Library_PptImporter \ + Library_filtertracer \ + Library_flash \ + Library_msfilter \ + Library_pdffilter \ + Library_placeware \ + Library_svgfilter \ + Library_t602filter \ + Library_xmlfa \ + Library_xmlfd \ + Package_inc \ + Package_docbook \ + Package_xslt \ +)) + +# TODO +#$(eval $(call gb_Module_add_subsequentcheck_targets,filter,\ + JunitTest_filter_complex \ )) # vim: set noet sw=4 ts=4: --- a/filter/Package_docbook.mk +++ a/filter/Package_docbook.mk @@ -0,0 +1,26 @@ +#*************************************************************** +# 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 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +#*************************************************************** + +$(eval $(call gb_Package_Package,filter_docbook,$(SRCDIR)/filter/source/docbook)) + +$(eval $(call gb_Package_add_file,filter_docbook,bin/DocBookTemplate.stw,DocBookTemplate.stw)) +$(eval $(call gb_Package_add_file,filter_docbook,bin/docbooktosoffheadings.xsl,docbooktosoffheadings.xsl)) +$(eval $(call gb_Package_add_file,filter_docbook,bin/sofftodocbookheadings.xsl,sofftodocbookheadings.xsl)) + +# vim: set noet sw=4 ts=4: --- a/filter/Package_inc.mk +++ a/filter/Package_inc.mk @@ -0,0 +1,34 @@ +#*************************************************************** +# 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 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +#*************************************************************** + +$(eval $(call gb_Package_Package,filter_inc,$(SRCDIR)/filter/inc)) + +$(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/msfilterdllapi.h,filter/msfilter/msfilterdllapi.h)) +$(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/countryid.hxx,filter/msfilter/countryid.hxx)) +$(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/escherex.hxx,filter/msfilter/escherex.hxx)) +$(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/mscodec.hxx,filter/msfilter/mscodec.hxx)) +$(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/msdffimp.hxx,filter/msfilter/msdffimp.hxx)) +$(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/msfiltertracer.hxx,filter/msfilter/msfiltertracer.hxx)) +$(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/msocximex.hxx,filter/msfilter/msocximex.hxx)) +$(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/msoleexp.hxx,filter/msfilter/msoleexp.hxx)) +$(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/msvbahelper.hxx,filter/msfilter/msvbahelper.hxx)) +$(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/svdfppt.hxx,filter/msfilter/svdfppt.hxx)) +$(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/svxmsbas.hxx,filter/msfilter/svxmsbas.hxx)) + +# vim: set noet sw=4 ts=4: --- a/filter/Package_xslt.mk +++ a/filter/Package_xslt.mk @@ -0,0 +1,74 @@ +#*************************************************************** +# 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 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +#*************************************************************** + +$(eval $(call gb_Package_Package,filter_xslt,$(SRCDIR)/filter/source/xslt)) + +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/common/copy.xsl,common/copy.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/common/math.xsl,common/math.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/common/measure_conversion.xsl,common/measure_conversion.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/common/ooo2ms_docpr.xsl,export/common/ooo2ms_docpr.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/spreadsheetml/formular.xsl,export/spreadsheetml/formular.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/spreadsheetml/ooo2spreadsheetml.xsl,export/spreadsheetml/ooo2spreadsheetml.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/spreadsheetml/style_mapping.xsl,export/spreadsheetml/style_mapping.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/spreadsheetml/styles.xsl,export/spreadsheetml/styles.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/spreadsheetml/table.xsl,export/spreadsheetml/table.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/uof/odf2uof_presentation.xsl,export/uof/odf2uof_presentation.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/uof/odf2uof_spreadsheet.xsl,export/uof/odf2uof_spreadsheet.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/uof/odf2uof_text.xsl,export/uof/odf2uof_text.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/wordml/ooo2wordml.xsl,export/wordml/ooo2wordml.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/wordml/ooo2wordml_border.xsl,export/wordml/ooo2wordml_border.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/wordml/ooo2wordml_custom_draw.xsl,export/wordml/ooo2wordml_custom_draw.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/wordml/ooo2wordml_draw.xsl,export/wordml/ooo2wordml_draw.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/wordml/ooo2wordml_field.xsl,export/wordml/ooo2wordml_field.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/wordml/ooo2wordml_list.xsl,export/wordml/ooo2wordml_list.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/wordml/ooo2wordml_page.xsl,export/wordml/ooo2wordml_page.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/wordml/ooo2wordml_path.xsl,export/wordml/ooo2wordml_path.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/wordml/ooo2wordml_settings.xsl,export/wordml/ooo2wordml_settings.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/wordml/ooo2wordml_table.xsl,export/wordml/ooo2wordml_table.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/wordml/ooo2wordml_text.xsl,export/wordml/ooo2wordml_text.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/import/common/ms2ooo_docpr.xsl,import/common/ms2ooo_docpr.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl,import/spreadsheetml/spreadsheetml2ooo.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/import/uof/uof2odf_presentation.xsl,import/uof/uof2odf_presentation.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/import/uof/uof2odf_spreadsheet.xsl,import/uof/uof2odf_spreadsheet.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/import/uof/uof2odf_text.xsl,import/uof/uof2odf_text.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/import/wordml/wordml2ooo.xsl,import/wordml/wordml2ooo.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/import/wordml/wordml2ooo_custom_draw.xsl,import/wordml/wordml2ooo_custom_draw.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/import/wordml/wordml2ooo_draw.xsl,import/wordml/wordml2ooo_draw.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/import/wordml/wordml2ooo_field.xsl,import/wordml/wordml2ooo_field.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/import/wordml/wordml2ooo_list.xsl,import/wordml/wordml2ooo_list.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/import/wordml/wordml2ooo_page.xsl,import/wordml/wordml2ooo_page.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/import/wordml/wordml2ooo_path.xsl,import/wordml/wordml2ooo_path.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/import/wordml/wordml2ooo_props.xsl,import/wordml/wordml2ooo_props.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/import/wordml/wordml2ooo_settings.xsl,import/wordml/wordml2ooo_settings.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/import/wordml/wordml2ooo_table.xsl,import/wordml/wordml2ooo_table.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/import/wordml/wordml2ooo_text.xsl,import/wordml/wordml2ooo_text.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/common/body.xsl,odf2xhtml/export/common/body.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/common/styles/style_collector.xsl,odf2xhtml/export/common/styles/style_collector.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/common/styles/style_mapping_css.xsl,odf2xhtml/export/common/styles/style_mapping_css.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/common/table/table.xsl,odf2xhtml/export/common/table/table.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/common/table/table_cells.xsl,odf2xhtml/export/common/table/table_cells.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/common/table/table_columns.xsl,odf2xhtml/export/common/table/table_columns.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/common/table/table_rows.xsl,odf2xhtml/export/common/table/table_rows.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/common/table_of_content.xsl,odf2xhtml/export/common/table_of_content.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/xhtml/body.xsl,odf2xhtml/export/xhtml/body.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/xhtml/header.xsl,odf2xhtml/export/xhtml/header.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/xhtml/opendoc2xhtml.xsl,odf2xhtml/export/xhtml/opendoc2xhtml.xsl)) +$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/xhtml/table.xsl,odf2xhtml/export/xhtml/table.xsl)) + +# vim: set noet sw=4 ts=4: --- a/filter/prj/build.lst +++ a/filter/prj/build.lst @@ -3,20 +3,7 @@ fl filter\prj nmake - all fl_prj NULL fl filter usr1 - all fl_mkout NULL fl filter\prj get - all fl_prj NULL fl filter\inc nmake - all fl_inc NULL -fl filter\source\xmlfilteradaptor nmake - all fl_xmlfilteradaptor fl_inc NULL -fl filter\source\xmlfilterdetect nmake - all fl_xmlfilterdetect fl_inc NULL -fl filter\source\msfilter nmake - all fl_msfilter fl_inc NULL -fl filter\source\msfilter\powerpoint nmake - all fl_powerpoint fl_inc NULL -fl filter\source\pdf nmake - all fl_pdf fl_svg fl_inc NULL -fl filter\source\svg nmake - all fl_svg fl_inc NULL -fl filter\source\placeware nmake - all fl_placeware fl_inc NULL -fl filter\source\flash nmake - all fl_flash fl_pdf fl_inc NULL -fl filter\source\filtertracer nmake - all fl_filtertracer fl_inc NULL -fl filter\source\xsltfilter nmake - all fl_xsltfilter fl_inc NULL -fl filter\source\xsltvalidate nmake - all fl_xsltvalidate fl_xsltfilter fl_inc NULL fl filter\source\xsltdialog nmake - all fl_xsltdialog fl_flash fl_inc NULL -fl filter\source\docbook nmake - all fl_docbook fl_inc NULL -fl filter\source\t602 nmake - all fl_t602 fl_inc NULL fl filter\source\graphicfilter\eos2met nmake - all g_vfeom fl_inc NULL fl filter\source\graphicfilter\ios2met nmake - all g_vfiom fl_inc NULL fl filter\source\graphicfilter\epict nmake - all g_vfept fl_inc NULL @@ -40,6 +27,3 @@ fl filter\source\graphicfilter\ipsd nm fl filter\source\graphicfilter\ieps nmake - all g_ieps fl_inc NULL fl filter\source\graphicfilter\icgm nmake - all g_icgm fl_inc NULL fl filter\source\config\cache nmake - all fl_config fl_inc NULL - -# took very long -# fl filter\qa\complex\filter\misc nmake - all fl_qa_complex NULL --- a/filter/qa/complex/filter/misc/makefile.mk +++ a/filter/qa/complex/filter/misc/makefile.mk @@ -1,59 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ = ../../../.. -PRJNAME = filter -TARGET = qa_complex_filter_misc - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = complex/filter/misc -JAVATESTFILES = \ - TypeDetection6FileFormat.java \ - FinalizedMandatoryTest.java - -JAVAFILES = $(JAVATESTFILES) - -JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar jurt.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) -.END - -# Sample how to debug -# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y - -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END - - --- a/filter/source/docbook/makefile.mk +++ a/filter/source/docbook/makefile.mk @@ -1,51 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. -PRJNAME=filter -TARGET=fl_javafilter_binaries - -.INCLUDE: settings.mk - -all: \ - $(BIN)$/docbooktosoffheadings.xsl \ - $(BIN)$/sofftodocbookheadings.xsl \ - $(BIN)$/DocBookTemplate.stw - - - -$(OUT)$/bin$/docbooktosoffheadings.xsl: docbooktosoffheadings.xsl - $(COPY) docbooktosoffheadings.xsl $(OUT)$/bin$/docbooktosoffheadings.xsl - -$(OUT)$/bin$/sofftodocbookheadings.xsl: sofftodocbookheadings.xsl - $(COPY) sofftodocbookheadings.xsl $(OUT)$/bin$/sofftodocbookheadings.xsl - -$(OUT)$/bin$/DocBookTemplate.stw: DocBookTemplate.stw - $(COPY) DocBookTemplate.stw $(OUT)$/bin$/DocBookTemplate.stw - -.INCLUDE: target.mk - --- a/filter/source/filtertracer/exports.dxp +++ a/filter/source/filtertracer/exports.dxp @@ -1,2 +0,0 @@ -component_getImplementationEnvironment -component_getFactory --- a/filter/source/filtertracer/filtertraceruno.cxx +++ a/filter/source/filtertracer/filtertraceruno.cxx @@ -46,7 +46,8 @@ static REF( NMSP_UNO::XInterface ) SAL_C // - component_getImplementationEnvironment - // ------------------------------------------ -extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ ) +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL +component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } @@ -55,7 +56,8 @@ extern "C" void SAL_CALL component_getIm // - component_getFactory - // ------------------------ -extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ ) +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL +component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ ) { REF( NMSP_LANG::XSingleServiceFactory ) xFactory; void* pRet = 0; --- a/filter/source/filtertracer/makefile.mk +++ a/filter/source/filtertracer/makefile.mk @@ -1,63 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. -PRJNAME=filter -TARGET=filtertracer - -ENABLE_EXCEPTIONS=TRUE -USE_DEFFILE=TRUE - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk - -# --- Files ------------------------------------- - -SLOFILES= $(SLO)$/filtertracer.obj \ - $(SLO)$/filtertraceruno.obj - -# --- Library ----------------------------------- - -SHL1TARGET=$(TARGET)$(DLLPOSTFIX) -SHL1STDLIBS=$(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(SALLIB) \ - $(TOOLSLIB) \ - $(UNOTOOLSLIB) - -SHL1DEPN= -SHL1IMPLIB= i$(SHL1TARGET) -SHL1LIBS= $(SLB)$/$(TARGET).lib -SHL1DEF= $(MISC)$/$(SHL1TARGET).def - -DEF1NAME=$(SHL1TARGET) -DEF1EXPORTFILE=exports.dxp - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk --- a/filter/source/flash/makefile.mk +++ a/filter/source/flash/makefile.mk @@ -1,106 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. -PRJNAME=filter -TARGET=flash - -ENABLE_EXCEPTIONS=TRUE -VISIBILITY_HIDDEN=TRUE - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk - -.IF "$(SYSTEM_ZLIB)" == "YES" -CFLAGS+=-DSYSTEM_ZLIB -.ENDIF - -SRS1NAME=$(TARGET) -SRC1FILES = impswfdialog.src - -SLOFILES= $(SLO)$/swffilter.obj \ - $(SLO)$/swfwriter.obj \ - $(SLO)$/swfwriter1.obj \ - $(SLO)$/swfwriter2.obj \ - $(SLO)$/swfuno.obj \ - $(SLO)$/swfexporter.obj \ - $(SLO)$/swfdialog.obj \ - $(SLO)$/impswfdialog.obj - -# --- Library ----------------------------------- - -RESLIB1NAME=$(TARGET) -RESLIB1SRSFILES= $(SRS)$/$(TARGET).srs - -SHL1TARGET=$(TARGET)$(DLLPOSTFIX) - -# static libraries must come at the end for MACOSX -.IF "$(OS)" != "MACOSX" -SHL1STDLIBS+=\ - $(ZLIB3RDLIB) -.ENDIF - - -# dynamic libraries -SHL1STDLIBS+=\ - $(SVTOOLLIB) \ - $(BASEGFXLIB) \ - $(VCLLIB) \ - $(UNOTOOLSLIB) \ - $(TOOLSLIB) \ - $(COMPHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) - -# static libraries must come at the end for MACOSX -.IF "$(OS)" == "MACOSX" -SHL1STDLIBS+=\ - $(ZLIB3RDLIB) -.ENDIF - -SHL1DEPN= -SHL1IMPLIB= i$(SHL1TARGET) -SHL1VERSIONMAP=$(SOLARENV)/src/component.map -SHL1LIBS= $(SLB)$/$(TARGET).lib -SHL1DEF= $(MISC)$/$(SHL1TARGET).def - -DEF1NAME=$(SHL1TARGET) - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk - - -ALLTAR : $(MISC)/flash.component - -$(MISC)/flash.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - flash.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt flash.component --- a/filter/source/msfilter/makefile.mk +++ a/filter/source/msfilter/makefile.mk @@ -1,94 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=filter -TARGET=msfilter - -ENABLE_EXCEPTIONS=TRUE -LIBTARGET=NO - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES= \ - $(SLO)$/countryid.obj \ - $(SLO)$/escherex.obj \ - $(SLO)$/eschesdo.obj \ - $(SLO)$/mscodec.obj \ - $(SLO)$/msdffimp.obj \ - $(SLO)$/msfiltertracer.obj \ - $(SLO)$/msocximex.obj \ - $(SLO)$/msoleexp.obj \ - $(SLO)$/msvbahelper.obj \ - $(SLO)$/msvbasic.obj \ - $(SLO)$/services.obj \ - $(SLO)$/svdfppt.obj \ - $(SLO)$/svxmsbas.obj \ - $(SLO)$/svxmsbas2.obj - -SHL1TARGET= msfilter$(DLLPOSTFIX) -SHL1IMPLIB= i$(TARGET) -SHL1OBJS= $(SLOFILES) -SHL1USE_EXPORTS=name -SHL1STDLIBS= \ - $(EDITENGLIB) \ - $(SVXCORELIB) \ - $(SFX2LIB) \ - $(XMLOFFLIB) \ - $(BASEGFXLIB) \ - $(BASICLIB) \ - $(SVTOOLLIB) \ - $(TKLIB) \ - $(VCLLIB) \ - $(SVLLIB) \ - $(SOTLIB) \ - $(UNOTOOLSLIB) \ - $(TOOLSLIB) \ - $(XMLSCRIPTLIB) \ - $(COMPHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) - -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -DEF1NAME= $(SHL1TARGET) - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/msfilter.component - -$(MISC)/msfilter.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - msfilter.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt msfilter.component --- a/filter/source/msfilter/makefile.pmk +++ a/filter/source/msfilter/makefile.pmk @@ -1,30 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -# Reduction of exported symbols: -CDEFS += -DMSFILTER_DLLIMPLEMENTATION -VISIBILITY_HIDDEN=TRUE --- a/filter/source/msfilter/powerpoint/makefile.mk +++ a/filter/source/msfilter/powerpoint/makefile.mk @@ -1,65 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. -PRJNAME=filter -TARGET=PptImporter - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk - -# --- Files ------------------------------------- - -SLOFILES= $(SLO)$/pptimporter.obj \ - $(SLO)$/pptimporteruno.obj \ - $(SLO)$/ppttoxml.obj - -# --- Library ----------------------------------- - -SHL1TARGET=$(TARGET)$(DLLPOSTFIX) -SHL1STDLIBS=\ - $(SOTLIB) \ - $(TOOLSLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) - -SHL1DEPN= -SHL1IMPLIB= i$(SHL1TARGET) -SHL1LIBS= $(SLB)$/$(TARGET).lib -SHL1VERSIONMAP=$(SOLARENV)/src/component.map -SHL1DEF= $(MISC)$/$(SHL1TARGET).def - -DEF1NAME=$(SHL1TARGET) - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk - --- a/filter/source/pdf/makefile.mk +++ a/filter/source/pdf/makefile.mk @@ -1,92 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. -PRJNAME=filter -TARGET=pdffilter -GEN_HID=TRUE - -ENABLE_EXCEPTIONS=TRUE -VISIBILITY_HIDDEN=TRUE - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk - -# --- Files ------------------------------------- - -SRS1NAME=$(TARGET) -SRC1FILES = impdialog.src \ - pdf.src - -SLOFILES= $(SLO)$/pdfuno.obj \ - $(SLO)$/pdfdialog.obj \ - $(SLO)$/impdialog.obj \ - $(SLO)$/pdffilter.obj \ - $(SLO)$/pdfinteract.obj \ - $(SLO)$/pdfexport.obj - -# --- Library ----------------------------------- - -RESLIB1NAME=$(TARGET) -RESLIB1SRSFILES= $(SRS)$/$(TARGET).srs - -SHL1TARGET=$(TARGET)$(DLLPOSTFIX) - -SHL1STDLIBS=\ - $(SVTOOLLIB) \ - $(TKLIB) \ - $(VCLLIB) \ - $(SVLLIB) \ - $(BASEGFXLIB) \ - $(SFX2LIB) \ - $(UNOTOOLSLIB) \ - $(TOOLSLIB) \ - $(COMPHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) - -SHL1DEPN= -SHL1IMPLIB= i$(SHL1TARGET) -SHL1LIBS= $(SLB)$/$(TARGET).lib -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -SHL1VERSIONMAP=$(SOLARENV)/src/component.map - -DEF1NAME=$(SHL1TARGET) - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/pdffilter.component - -$(MISC)/pdffilter.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - pdffilter.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt pdffilter.component --- a/filter/source/placeware/exports.dxp +++ a/filter/source/placeware/exports.dxp @@ -1,2 +0,0 @@ -component_getImplementationEnvironment -component_getFactory --- a/filter/source/placeware/makefile.mk +++ a/filter/source/placeware/makefile.mk @@ -1,75 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. -PRJNAME=filter -TARGET=placeware -USE_DEFFILE= TRUE -ENABLE_EXCEPTIONS=TRUE -COMP1TYPELIST=$(TARGET) - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk - -# --- Files ------------------------------------- - -SLOFILES= $(SLO)$/zip.obj \ - $(SLO)$/filter.obj \ - $(SLO)$/uno.obj \ - $(SLO)$/exporter.obj \ - $(SLO)$/Base64Codec.obj \ - $(SLO)$/tempfile.obj - -# --- Library ----------------------------------- - -SHL1TARGET=$(TARGET)$(DLLPOSTFIX) - -SHL1STDLIBS= \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(SALLIB) -SHL1VERSIONMAP=$(SOLARENV)/src/component.map - -SHL1DEPN= -SHL1IMPLIB= i$(TARGET) -SHL1LIBS= $(SLB)$/$(TARGET).lib -SHL1DEF= $(MISC)$/$(SHL1TARGET).def - -DEF1NAME= $(SHL1TARGET) - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/placeware.component - -$(MISC)/placeware.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - placeware.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt placeware.component --- a/filter/source/placeware/uno.cxx +++ a/filter/source/placeware/uno.cxx @@ -53,12 +53,14 @@ using namespace ::pwp; extern "C" { //================================================================================================== +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //================================================================================================== +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ ) { --- a/filter/source/svg/makefile.mk +++ a/filter/source/svg/makefile.mk @@ -1,98 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.10.110.6 $ -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. -PRJNAME=filter -TARGET=svgfilter - -ENABLE_EXCEPTIONS=TRUE -VISIBILITY_HIDDEN=TRUE - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk - -# --- Types ------------------------------------- - -SLOFILES= $(SLO)$/svguno.obj \ - $(SLO)$/svgdialog.obj \ - $(SLO)$/impsvgdialog.obj \ - $(SLO)$/svgfilter.obj \ - $(SLO)$/svgexport.obj \ - $(SLO)$/svgfontexport.obj \ - $(SLO)$/svgwriter.obj -.IF "$(SOLAR_JAVA)"!="" -SLOFILES+= $(SLO)$/svgimport.obj -.ENDIF - -# --- Library ----------------------------------- - -SHL1TARGET=$(TARGET)$(DLLPOSTFIX) - -SHL1STDLIBS=\ - $(SVXCORELIB) \ - $(EDITENGLIB) \ - $(XMLOFFLIB) \ - $(VCLLIB) \ - $(UNOTOOLSLIB) \ - $(TOOLSLIB) \ - $(COMPHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) \ - $(BASEGFXLIB) \ - $(SVTOOLLIB) - -.IF "$(SOLAR_JAVA)"!="" -SHL1STDLIBS+=\ - $(JVMACCESSLIB) -.ENDIF - - -SHL1DEPN= -SHL1IMPLIB= i$(SHL1TARGET) -SHL1LIBS= $(SLB)$/$(TARGET).lib -SHL1VERSIONMAP=$(SOLARENV)/src/component.map -SHL1DEF= $(MISC)$/$(SHL1TARGET).def - -DEF1NAME=$(SHL1TARGET) - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/svgfilter.component - -$(MISC)/svgfilter.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - svgfilter.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt svgfilter.component --- a/filter/source/t602/filterenv.cxx +++ a/filter/source/t602/filterenv.cxx @@ -46,12 +46,14 @@ using namespace T602ImportFilter; extern "C" { //================================================================================================== +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //================================================================================================== +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ ) { --- a/filter/source/t602/makefile.mk +++ a/filter/source/t602/makefile.mk @@ -1,70 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ = ..$/.. -PRJNAME = filter -TARGET =t602filter -ENABLE_EXCEPTIONS=TRUE -LIBTARGET=NO - -# --- Settings ----------------------------------------------------- -.INCLUDE: settings.mk - -SRS1NAME = $(TARGET) -SRC1FILES = $(SRS1NAME).src - -RESLIB1NAME=$(SRS1NAME) -RESLIB1SRSFILES= $(SRS)$/$(RESLIB1NAME).srs - -SLOFILES=$(SLO)$/t602filter.obj \ - $(SLO)$/filterenv.obj - -LIBNAME=$(TARGET) -SHL1TARGETDEPN=makefile.mk -SHL1OBJS=$(SLOFILES) -SHL1TARGET=$(LIBNAME)$(DLLPOSTFIX) -SHL1IMPLIB=i$(LIBNAME) -SHL1VERSIONMAP=$(SOLARENV)/src/component.map -#SHL1DEF=$(MISC)$/$(SHL1TARGET).def -DEF1NAME=$(SHL1TARGET) - -SHL1STDLIBS= \ - $(XMLOFFLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(SALLIB) \ - $(TOOLSLIB) - -# --- Targets ------------------------------------------------------ -.INCLUDE : target.mk - -ALLTAR : $(MISC)/t602filter.component - -$(MISC)/t602filter.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - t602filter.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt t602filter.component --- a/filter/source/xmlfilteradaptor/genericfilter.cxx +++ a/filter/source/xmlfilteradaptor/genericfilter.cxx @@ -70,6 +70,7 @@ extern "C" //================================================================================================== +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ ) @@ -82,6 +83,7 @@ void SAL_CALL component_getImplementatio //================================================================================================== +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ ) --- a/filter/source/xmlfilteradaptor/makefile.mk +++ a/filter/source/xmlfilteradaptor/makefile.mk @@ -1,70 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME= filter -TARGET= fl_xmlfilteradaptor - -ENABLE_EXCEPTIONS= TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- defines ------------------------------------------------------ - -CDEFS+=-DCOMPMOD_NAMESPACE=framework - -# --- Targets ------------------------------------------------------ - -SHL1TARGET= xmlfa$(DLLPOSTFIX) -SHL1IMPLIB= i$(SHL1TARGET) - -SHL1VERSIONMAP= $(SOLARENV)/src/component.map -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -DEF1NAME= $(SHL1TARGET) - -SHL1OBJS= $(SLO)$/genericfilter.obj \ - $(SLO)$/XmlFilterAdaptor.obj \ - $(SLO)$/streamwrap.obj - -SHL1STDLIBS= $(COMPHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(TOOLSLIB) \ - $(SALLIB) - -.INCLUDE : target.mk - - -ALLTAR : $(MISC)/xmlfa.component - -$(MISC)/xmlfa.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - xmlfa.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt xmlfa.component --- a/filter/source/xmlfilterdetect/fdcomp.cxx +++ a/filter/source/xmlfilterdetect/fdcomp.cxx @@ -70,6 +70,7 @@ extern "C" //================================================================================================== +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ ) @@ -82,6 +83,7 @@ void SAL_CALL component_getImplementatio //================================================================================================== +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ ) --- a/filter/source/xmlfilterdetect/makefile.mk +++ a/filter/source/xmlfilterdetect/makefile.mk @@ -1,68 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME= filter -TARGET= fl_xmlfilterdetect - -NO_BSYMBOLIC= TRUE -ENABLE_EXCEPTIONS= TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- defines ------------------------------------------------------ - -CDEFS+=-DCOMPMOD_NAMESPACE=framework - -# --- Targets ------------------------------------------------------ - -SHL1TARGET= xmlfd$(DLLPOSTFIX) -SHL1IMPLIB= i$(SHL1TARGET) - -SHL1VERSIONMAP= $(SOLARENV)/src/component.map -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -DEF1NAME= $(SHL1TARGET) - -SHL1OBJS= $(SLO)$/fdcomp.obj \ - $(SLO)$/filterdetect.obj - -SHL1STDLIBS= $(UCBHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/xmlfd.component - -$(MISC)/xmlfd.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - xmlfd.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt xmlfd.component --- a/filter/source/xsltfilter/Manifest +++ a/filter/source/xsltfilter/Manifest @@ -1,3 +1,2 @@ RegistrationClassName: com.sun.star.comp.xsltfilter.XSLTransformer -Class-Path: saxon9.jar UNO-Type-Path: --- a/filter/source/xsltvalidate/makefile.mk +++ a/filter/source/xsltvalidate/makefile.mk @@ -1,84 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ = ..$/.. -PRJNAME = filter -#PACKAGE = com$/sun$/star$/documentconversion$/XSLTValidate -TARGET =XSLTValidate -# --- Settings ----------------------------------------------------- -.IF "$(XML_CLASSPATH)" != "" -XCLASSPATH+=":$(XML_CLASSPATH)" -.ENDIF -.INCLUDE: settings.mk -CLASSDIR!:=$(CLASSDIR)$/$(TARGET) -#USE_UDK_EXTENDED_MANIFESTFILE=TRUE -#USE_EXTENDED_MANIFESTFILE=TRUE -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar crimson.jar - -.IF "$(SYSTEM_XALAN)" == "YES" -EXTRAJARFILES += $(XALAN_JAR) -.ELSE -JARFILES += xalan.jar -.ENDIF - -.IF "$(SYSTEM_XML_APIS)" == "YES" -EXTRAJARFILES += $(XML_APIS_JAR) -.ELSE -JARFILES += xml-apis.jar -.ENDIF - -JAVAFILES = $(subst,$(CLASSDIR)$/, $(subst,.class,.java $(JAVACLASSFILES))) -CUSTOMMANIFESTFILE = Manifest -#JARMANIFEST = Manifest -JARCOMPRESS = TRUE -JARCLASSDIRS = XSLTValidate*.class -JARTARGET = $(TARGET).jar - - -# --- Files -------------------------------------------------------- -JAVACLASSFILES=$(CLASSDIR)$/XSLTValidate.class -#---Manifest ------------------------------------------------------- -#$(OUT)$/class$/$(TARGET)$/META-INF: META-INF -# + $(COPY) $(COPYRECURSE) META-INF $(OUT)$/class$/META-INF -# --- Targets ------------------------------------------------------ -.IF "$(SOLAR_JAVA)"!="" -.INCLUDE : target.mk -$(JAVACLASSFILES) : $(CLASSDIR) -.IF "$(JARMANIFEST)"!="" -$(JARMANIFEST) : $(CLASSDIR) -.ENDIF # "$(JARMANIFEST)"!="" -.ENDIF - -$(CLASSDIR) : - $(MKDIR) $(CLASSDIR) - -ALLTAR : $(MISC)/XSLTValidate.component - -$(MISC)/XSLTValidate.component .ERRREMOVE : \ - $(SOLARENV)/bin/createcomponent.xslt XSLTValidate.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_JAVA)$(JARTARGET)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt XSLTValidate.component --- a/postprocess/packcomponents/makefile.mk +++ a/postprocess/packcomponents/makefile.mk @@ -114,7 +114,7 @@ my_components = \ evtatt \ fileacc \ filterconfig1 \ - flash \ + component/filter/source/flash/flash \ flat \ for \ fpicker \ @@ -130,15 +130,15 @@ my_components = \ log \ mcnttype \ migrationoo2 \ - msfilter \ + component/filter/source/msfilter/msfilter \ mysql \ odbc \ offacc \ oooimprovecore \ package2 \ pcr \ - pdffilter \ - placeware \ + component/filter/source/pdf/pdffilter \ + component/filter/source/placeware/placeware \ preload \ protocolhandler \ pythonloader \ @@ -156,9 +156,9 @@ my_components = \ spl \ srtrs1 \ stringresource \ - svgfilter \ + component/filter/source/svg/svgfilter \ syssh \ - t602filter \ + component/filter/source/t602/t602filter \ tvhlp1 \ ucb1 \ ucpchelp1 \ @@ -176,8 +176,8 @@ my_components = \ vbaevents \ vbaobj \ wpft \ - xmlfa \ - xmlfd \ + component/filter/source/xmlfilteradaptor/xmlfa \ + component/filter/source/xmlfilterdetect/xmlfd \ xmx \ xsltdlg \ xsltfilter \ @@ -249,8 +249,8 @@ my_components += \ ScriptProviderForJava \ ScriptProviderForJavaScript \ XMergeBridge \ - XSLTFilter.jar \ - XSLTValidate \ + component/filter/source/xsltfilter/XSLTFilter.jar \ + component/filter/source/xsltvalidate/XSLTValidate \ component/wizards/com/sun/star/wizards/agenda/agenda \ component/wizards/com/sun/star/wizards/fax/fax \ component/wizards/com/sun/star/wizards/form/form \