[Libreoffice-commits] .: 13 commits - Repository.mk RepositoryExternal.mk dbaccess/source filter/AllLangResTarget_eps.mk filter/AllLangResTarget_flash.mk filter/AllLangResTarget_pdffilter.mk filter/AllLangResTarget_t602filter.mk filter/AllLangResTarget_xsltdlg.mk filter/Configuration_filter.mk filter/Jar_XSLTFilter.mk filter/Jar_XSLTValidate.mk filter/JunitTest_filter_complex.mk filter/Library_PptImporter.mk filter/Library_egi.mk filter/Library_eme.mk filter/Library_epb.mk filter/Library_epg.mk filter/Library_epp.mk filter/Library_eps.mk filter/Library_ept.mk filter/Library_era.mk filter/Library_eti.mk filter/Library_exp.mk filter/Library_filterconfig.mk filter/Library_filtertracer.mk filter/Library_flash.mk filter/Library_icd.mk filter/Library_icg.mk filter/Library_idx.mk filter/Library_ime.mk filter/Library_ipb.mk filter/Library_ipd.mk filter/Library_ips.mk filter/Library_ipt.mk filter/Library_ipx.mk filter/Library_ira.mk filter/Library_itg.mk filter/Library_iti.mk filter/Library_msfilt er.mk filter/Library_odfflatxml.mk filter/Library_pdffilter.mk filter/Library_placeware.mk filter/Library_svgfilter.mk filter/Library_t602filter.mk filter/Library_xmlfa.mk filter/Library_xmlfd.mk filter/Library_xsltdlg.mk filter/Library_xsltfilter.mk filter/Makefile filter/Module_filter.mk filter/Package_docbook.mk filter/Package_filter_generated.mk filter/Package_inc.mk filter/Package_xslt.mk filter/prj filter/qa filter/source postprocess/packcomponents sc/CppunitTest_sc_test_filters.mk scp2/source solenv/gbuild
Michael Stahl
mst at kemper.freedesktop.org
Thu Sep 15 05:09:15 PDT 2011
Repository.mk | 35
RepositoryExternal.mk | 17
dbaccess/source/core/api/RowSet.cxx | 1
dbaccess/source/core/dataaccess/databasecontext.cxx | 6
filter/AllLangResTarget_eps.mk | 32
filter/AllLangResTarget_flash.mk | 32
filter/AllLangResTarget_pdffilter.mk | 41
filter/AllLangResTarget_t602filter.mk | 32
filter/AllLangResTarget_xsltdlg.mk | 43
filter/Configuration_filter.mk | 1129 ++++++++++++++++
filter/Jar_XSLTFilter.mk | 45
filter/Jar_XSLTValidate.mk | 44
filter/JunitTest_filter_complex.mk | 40
filter/Library_PptImporter.mk | 47
filter/Library_egi.mk | 46
filter/Library_eme.mk | 45
filter/Library_epb.mk | 45
filter/Library_epg.mk | 45
filter/Library_epp.mk | 45
filter/Library_eps.mk | 46
filter/Library_ept.mk | 46
filter/Library_era.mk | 45
filter/Library_eti.mk | 45
filter/Library_exp.mk | 45
filter/Library_filterconfig.mk | 63
filter/Library_filtertracer.mk | 46
filter/Library_flash.mk | 60
filter/Library_icd.mk | 44
filter/Library_icg.mk | 60
filter/Library_idx.mk | 50
filter/Library_ime.mk | 43
filter/Library_ipb.mk | 43
filter/Library_ipd.mk | 43
filter/Library_ips.mk | 43
filter/Library_ipt.mk | 45
filter/Library_ipx.mk | 43
filter/Library_ira.mk | 43
filter/Library_itg.mk | 43
filter/Library_iti.mk | 45
filter/Library_msfilter.mk | 78 +
filter/Library_odfflatxml.mk | 57
filter/Library_pdffilter.mk | 60
filter/Library_placeware.mk | 50
filter/Library_svgfilter.mk | 75 +
filter/Library_t602filter.mk | 48
filter/Library_xmlfa.mk | 49
filter/Library_xmlfd.mk | 47
filter/Library_xsltdlg.mk | 63
filter/Library_xsltfilter.mk | 57
filter/Makefile | 30
filter/Module_filter.mk | 78 +
filter/Package_docbook.mk | 26
filter/Package_filter_generated.mk | 39
filter/Package_inc.mk | 35
filter/Package_xslt.mk | 74 +
filter/prj/build.lst | 48
filter/prj/d.lst | 72 -
filter/prj/makefile.mk | 32
filter/qa/complex/filter/misc/makefile.mk | 59
filter/source/config/cache/makefile.mk | 87 -
filter/source/config/fragments/fcfg_base.mk | 51
filter/source/config/fragments/fcfg_calc.mk | 114 -
filter/source/config/fragments/fcfg_calc_bf.mk | 59
filter/source/config/fragments/fcfg_chart.mk | 48
filter/source/config/fragments/fcfg_chart_bf.mk | 47
filter/source/config/fragments/fcfg_database.mk | 45
filter/source/config/fragments/fcfg_draw.mk | 61
filter/source/config/fragments/fcfg_draw_bf.mk | 51
filter/source/config/fragments/fcfg_drawgraphics.mk | 119 -
filter/source/config/fragments/fcfg_global.mk | 59
filter/source/config/fragments/fcfg_global_bf.mk | 55
filter/source/config/fragments/fcfg_impress.mk | 86 -
filter/source/config/fragments/fcfg_impress_bf.mk | 66
filter/source/config/fragments/fcfg_impressgraphics.mk | 83 -
filter/source/config/fragments/fcfg_internalgraphics.mk | 110 -
filter/source/config/fragments/fcfg_math.mk | 55
filter/source/config/fragments/fcfg_math_bf.mk | 50
filter/source/config/fragments/fcfg_palm.mk | 44
filter/source/config/fragments/fcfg_pocketexcel.mk | 44
filter/source/config/fragments/fcfg_pocketword.mk | 44
filter/source/config/fragments/fcfg_web.mk | 65
filter/source/config/fragments/fcfg_web_bf.mk | 54
filter/source/config/fragments/fcfg_writer.mk | 118 -
filter/source/config/fragments/fcfg_writer_bf.mk | 63
filter/source/config/fragments/fcfg_xslt.mk | 63
filter/source/config/fragments/filters/makefile.mk | 57
filter/source/config/fragments/makefile.mk | 262 ---
filter/source/config/fragments/packagedef.mk | 70
filter/source/config/fragments/types/makefile.mk | 54
filter/source/docbook/makefile.mk | 51
filter/source/filtertracer/makefile.mk | 63
filter/source/flash/makefile.mk | 106 -
filter/source/graphicfilter/egif/egif.cxx | 3
filter/source/graphicfilter/egif/exports.map | 7
filter/source/graphicfilter/egif/makefile.mk | 72 -
filter/source/graphicfilter/eos2met/eos2met.cxx | 3
filter/source/graphicfilter/eos2met/exports.map | 7
filter/source/graphicfilter/eos2met/makefile.mk | 66
filter/source/graphicfilter/epbm/epbm.cxx | 3
filter/source/graphicfilter/epbm/exports.map | 7
filter/source/graphicfilter/epbm/makefile.mk | 68
filter/source/graphicfilter/epgm/epgm.cxx | 3
filter/source/graphicfilter/epgm/exports.map | 7
filter/source/graphicfilter/epgm/makefile.mk | 69
filter/source/graphicfilter/epict/epict.cxx | 3
filter/source/graphicfilter/epict/exports.map | 7
filter/source/graphicfilter/epict/makefile.mk | 68
filter/source/graphicfilter/eppm/eppm.cxx | 3
filter/source/graphicfilter/eppm/exports.map | 7
filter/source/graphicfilter/eppm/makefile.mk | 66
filter/source/graphicfilter/eps/eps.cxx | 3
filter/source/graphicfilter/eps/exports.map | 7
filter/source/graphicfilter/eps/makefile.mk | 71 -
filter/source/graphicfilter/eras/eras.cxx | 3
filter/source/graphicfilter/eras/exports.map | 7
filter/source/graphicfilter/eras/makefile.mk | 64
filter/source/graphicfilter/etiff/etiff.cxx | 3
filter/source/graphicfilter/etiff/exports.map | 7
filter/source/graphicfilter/etiff/makefile.mk | 63
filter/source/graphicfilter/expm/expm.cxx | 3
filter/source/graphicfilter/expm/exports.map | 7
filter/source/graphicfilter/expm/makefile.mk | 64
filter/source/graphicfilter/icgm/cgm.cxx | 3
filter/source/graphicfilter/icgm/exports.map | 7
filter/source/graphicfilter/icgm/makefile.mk | 76 -
filter/source/graphicfilter/idxf/exports.map | 7
filter/source/graphicfilter/idxf/idxf.cxx | 3
filter/source/graphicfilter/idxf/makefile.mk | 76 -
filter/source/graphicfilter/ieps/exports.map | 7
filter/source/graphicfilter/ieps/ieps.cxx | 7
filter/source/graphicfilter/ieps/makefile.mk | 64
filter/source/graphicfilter/ios2met/exports.map | 7
filter/source/graphicfilter/ios2met/ios2met.cxx | 3
filter/source/graphicfilter/ios2met/makefile.mk | 66
filter/source/graphicfilter/ipbm/exports.map | 7
filter/source/graphicfilter/ipbm/ipbm.cxx | 3
filter/source/graphicfilter/ipbm/makefile.mk | 66
filter/source/graphicfilter/ipcd/exports.map | 7
filter/source/graphicfilter/ipcd/ipcd.cxx | 3
filter/source/graphicfilter/ipcd/makefile.mk | 65
filter/source/graphicfilter/ipcx/exports.map | 7
filter/source/graphicfilter/ipcx/ipcx.cxx | 3
filter/source/graphicfilter/ipcx/makefile.mk | 65
filter/source/graphicfilter/ipict/exports.map | 7
filter/source/graphicfilter/ipict/ipict.cxx | 3
filter/source/graphicfilter/ipict/makefile.mk | 65
filter/source/graphicfilter/ipsd/exports.map | 7
filter/source/graphicfilter/ipsd/ipsd.cxx | 3
filter/source/graphicfilter/ipsd/makefile.mk | 65
filter/source/graphicfilter/iras/exports.map | 7
filter/source/graphicfilter/iras/iras.cxx | 3
filter/source/graphicfilter/iras/makefile.mk | 65
filter/source/graphicfilter/itga/exports.map | 7
filter/source/graphicfilter/itga/itga.cxx | 3
filter/source/graphicfilter/itga/makefile.mk | 65
filter/source/graphicfilter/itiff/exports.map | 7
filter/source/graphicfilter/itiff/itiff.cxx | 3
filter/source/graphicfilter/itiff/makefile.mk | 68
filter/source/msfilter/makefile.mk | 99 -
filter/source/msfilter/makefile.pmk | 30
filter/source/msfilter/powerpoint/makefile.mk | 65
filter/source/odfflatxml/makefile.mk | 64
filter/source/pdf/makefile.mk | 92 -
filter/source/placeware/makefile.mk | 75 -
filter/source/svg/Makefile | 76 +
filter/source/svg/makefile.mk | 132 -
filter/source/svg/test/makefile.mk | 115 -
filter/source/t602/makefile.mk | 69
filter/source/xmlfilteradaptor/makefile.mk | 70
filter/source/xmlfilterdetect/makefile.mk | 68
filter/source/xsltdialog/makefile.mk | 101 -
filter/source/xsltfilter/Manifest | 1
filter/source/xsltfilter/makefile.mk | 118 -
filter/source/xsltvalidate/makefile.mk | 83 -
postprocess/packcomponents/makefile.mk | 28
sc/CppunitTest_sc_test_filters.mk | 2
scp2/source/ooo/file_library_ooo.scp | 7
solenv/gbuild/Jar.mk | 7
solenv/gbuild/gbuild.mk | 8
solenv/gbuild/gbuild_simple.mk | 2
180 files changed, 3760 insertions(+), 5445 deletions(-)
New commits:
commit f69eb5b70342cbb499dc9b99a5eb78e59eb2d416
Author: Michael Stahl <mst at openoffice.org>
Date: Thu Sep 15 14:01:39 2011 +0200
dbaccess: databasecontext.cxx: copy m_aDatabaseObjects
this fixes an STL assertion due to invalidated iterator.
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx
index 3ce9914..22f77a7 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -283,8 +283,10 @@ void ODatabaseContext::disposing()
m_aContainerListeners.disposeAndClear(aDisposeEvent);
// dispose the data sources
- ObjectCache::iterator aEnd = m_aDatabaseObjects.end();
- for ( ObjectCache::iterator aIter = m_aDatabaseObjects.begin();
+ // disposing seems to remove elements, so work on copy for valid iterators
+ ObjectCache objCopy(m_aDatabaseObjects);
+ ObjectCache::iterator const aEnd = objCopy.end();
+ for ( ObjectCache::iterator aIter = objCopy.begin();
aIter != aEnd;
++aIter
)
commit 3c6d38fed033ba8b47af75a9b8712a4bd2c0ddec
Author: Michael Stahl <mst at openoffice.org>
Date: Thu Sep 15 14:01:38 2011 +0200
dbaccess: RowSet.cxx: update m_bIsInsertRow
fixes an STL assertion; this line was accidentally removed in merge commit
bc3bbd2bb4b629ec612beeeeadd959a2fb6426c2
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index 8e88f4e..c74d75e 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -968,6 +968,7 @@ void SAL_CALL ORowSet::updateRow( ) throw(SQLException, RuntimeException)
aEvt.Rows += aBookmarks.size();
m_aBookmark = m_pCache->getBookmark();
m_aCurrentRow = m_pCache->m_aMatrixIter;
+ m_bIsInsertRow = sal_False;
if ( m_pCache->m_aMatrixIter != m_pCache->getEnd() && (*m_pCache->m_aMatrixIter).is() )
{
if ( m_pCache->isResultSetChanged() )
commit c103db16cd86423cf59a843ecaa27e450d0ad8fa
Author: Michael Stahl <mst at openoffice.org>
Date: Thu Sep 15 14:01:37 2011 +0200
filter: gb_Library_use_externals requires eval?
diff --git a/filter/Library_flash.mk b/filter/Library_flash.mk
index 60fc4d0..7736b6b 100644
--- a/filter/Library_flash.mk
+++ b/filter/Library_flash.mk
@@ -44,7 +44,7 @@ $(eval $(call gb_Library_add_linked_libs,flash,\
$(gb_STDLIBS) \
))
-$(call gb_Library_use_externals,flash,zlib)
+$(eval $(call gb_Library_use_externals,flash,zlib))
$(eval $(call gb_Library_add_exception_objects,flash,\
filter/source/flash/impswfdialog \
diff --git a/filter/Library_svgfilter.mk b/filter/Library_svgfilter.mk
index 23119d4..9a6e19a 100644
--- a/filter/Library_svgfilter.mk
+++ b/filter/Library_svgfilter.mk
@@ -55,7 +55,7 @@ $(eval $(call gb_Library_add_linked_libs,svgfilter,\
$(gb_STDLIBS) \
))
-$(call gb_Library_use_externals,svgfilter,libxml2)
+$(eval $(call gb_Library_use_externals,svgfilter,libxml2))
$(eval $(call gb_Library_add_exception_objects,svgfilter,\
filter/source/svg/b2dellipse \
diff --git a/filter/Library_xsltfilter.mk b/filter/Library_xsltfilter.mk
index 7ee7244..2409a47 100644
--- a/filter/Library_xsltfilter.mk
+++ b/filter/Library_xsltfilter.mk
@@ -43,10 +43,10 @@ $(eval $(call gb_Library_add_linked_libs,xsltfilter,\
$(gb_STDLIBS) \
))
-$(call gb_Library_use_externals,xsltfilter,\
+$(eval $(call gb_Library_use_externals,xsltfilter,\
libxml2 \
libxslt \
-)
+))
$(eval $(call gb_Library_add_exception_objects,xsltfilter,\
filter/source/xsltfilter/LibXSLTTransformer \
commit b72e42b29c57f0752e0bc92d47fa622a47c13c86
Author: Michael Stahl <mst at openoffice.org>
Date: Thu Sep 15 14:01:36 2011 +0200
filter: add missing resource makefiles
diff --git a/filter/AllLangResTarget_eps.mk b/filter/AllLangResTarget_eps.mk
new file mode 100644
index 0000000..6b78274
--- /dev/null
+++ b/filter/AllLangResTarget_eps.mk
@@ -0,0 +1,32 @@
+#***************************************************************
+# 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_AllLangResTarget_AllLangResTarget,eps))
+
+$(eval $(call gb_AllLangResTarget_add_srs,eps,\
+ filter/eps \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,filter/eps))
+
+$(eval $(call gb_SrsTarget_add_files,filter/eps,\
+ filter/source/graphicfilter/eps/epsstr.src \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/AllLangResTarget_flash.mk b/filter/AllLangResTarget_flash.mk
new file mode 100644
index 0000000..9c34a91
--- /dev/null
+++ b/filter/AllLangResTarget_flash.mk
@@ -0,0 +1,32 @@
+#***************************************************************
+# 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_AllLangResTarget_AllLangResTarget,flash))
+
+$(eval $(call gb_AllLangResTarget_add_srs,flash,\
+ filter/flash \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,filter/flash))
+
+$(eval $(call gb_SrsTarget_add_files,filter/flash,\
+ filter/source/flash/impswfdialog.src \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/AllLangResTarget_pdffilter.mk b/filter/AllLangResTarget_pdffilter.mk
new file mode 100644
index 0000000..ce3ef85
--- /dev/null
+++ b/filter/AllLangResTarget_pdffilter.mk
@@ -0,0 +1,41 @@
+#***************************************************************
+# 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_AllLangResTarget_AllLangResTarget,pdffilter))
+
+# this is ugly; why is it necessary to set this manually?
+$(eval $(call gb_AllLangResTarget_set_reslocation,pdffilter,res))
+
+$(eval $(call gb_AllLangResTarget_add_srs,pdffilter,\
+ filter/pdffilter \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,filter/pdffilter))
+
+$(eval $(call gb_SrsTarget_set_include,filter/pdffilter,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/filter/inc \
+))
+
+$(eval $(call gb_SrsTarget_add_files,filter/pdffilter,\
+ filter/source/pdf/impdialog.src \
+ filter/source/pdf/pdf.src \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/AllLangResTarget_t602filter.mk b/filter/AllLangResTarget_t602filter.mk
new file mode 100644
index 0000000..f1dcc91
--- /dev/null
+++ b/filter/AllLangResTarget_t602filter.mk
@@ -0,0 +1,32 @@
+#***************************************************************
+# 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_AllLangResTarget_AllLangResTarget,t602filter))
+
+$(eval $(call gb_AllLangResTarget_add_srs,t602filter,\
+ filter/t602filter \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,filter/t602filter))
+
+$(eval $(call gb_SrsTarget_add_files,filter/t602filter,\
+ filter/source/t602/t602filter.src \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/AllLangResTarget_xsltdlg.mk b/filter/AllLangResTarget_xsltdlg.mk
new file mode 100644
index 0000000..6ed201d
--- /dev/null
+++ b/filter/AllLangResTarget_xsltdlg.mk
@@ -0,0 +1,43 @@
+#***************************************************************
+# 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_AllLangResTarget_AllLangResTarget,xsltdlg))
+
+$(eval $(call gb_AllLangResTarget_add_srs,xsltdlg,\
+ filter/xsltdlg \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,filter/xsltdlg))
+
+$(eval $(call gb_SrsTarget_set_include,filter/xsltdlg,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/filter/inc \
+))
+
+$(eval $(call gb_SrsTarget_add_files,filter/xsltdlg,\
+ filter/source/xsltdialog/xmlfiltersettingsdialog.src \
+ filter/source/xsltdialog/xmlfiltertabdialog.src \
+ filter/source/xsltdialog/xmlfiltertabpagebasic.src \
+ filter/source/xsltdialog/xmlfiltertabpagexslt.src \
+ filter/source/xsltdialog/xmlfiltertestdialog.src \
+ filter/source/xsltdialog/xmlfileview.src \
+ filter/source/xsltdialog/xmlfilterdialogstrings.src \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk
index 2130660..1a8240a 100644
--- a/filter/Module_filter.mk
+++ b/filter/Module_filter.mk
@@ -20,6 +20,11 @@
$(eval $(call gb_Module_Module,filter))
$(eval $(call gb_Module_add_targets,filter,\
+ AllLangResTarget_eps \
+ AllLangResTarget_flash \
+ AllLangResTarget_pdffilter \
+ AllLangResTarget_t602filter \
+ AllLangResTarget_xsltdlg \
Configuration_filter \
Jar_XSLTFilter \
Jar_XSLTValidate \
diff --git a/filter/prj/d.lst b/filter/prj/d.lst
index 53b7a14..e69de29 100644
--- a/filter/prj/d.lst
+++ b/filter/prj/d.lst
@@ -1,72 +0,0 @@
-mkdir: %COMMON_DEST%\bin\hid
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin\hid\*.hid
-..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
-..\%__SRC%\lib\lib*.so %_DEST%\lib
-..\%__SRC%\lib\lib*.dylib %_DEST%\lib
-..\%__SRC%\lib\lib*.a %_DEST%\lib
-..\%__SRC%\lib\imsfilter.lib %_DEST%\lib\imsfilter.lib
-..\%__SRC%\class\*.jar %_DEST%\bin\*.jar
-..\%__SRC%\class\XSLTFilter\*.jar %_DEST%\bin\*.jar
-..\%__SRC%\class\XSLTValidate\*.jar %_DEST%\bin\*.jar
-..\%__SRC%\bin\*.res %_DEST%\bin\*.res
-mkdir: %_DEST%\bin\xslt
-mkdir: %_DEST%\bin\xslt\common
-mkdir: %_DEST%\bin\xslt\export
-mkdir: %_DEST%\bin\xslt\export\common
-mkdir: %_DEST%\bin\xslt\export\common\styles
-mkdir: %_DEST%\bin\xslt\export\common\table
-mkdir: %_DEST%\bin\xslt\export\spreadsheetml
-mkdir: %_DEST%\bin\xslt\export\wiki
-mkdir: %_DEST%\bin\xslt\export\wordml
-mkdir: %_DEST%\bin\xslt\export\uof
-mkdir: %_DEST%\bin\xslt\export\xhtml
-mkdir: %_DEST%\bin\xslt\import
-mkdir: %_DEST%\bin\xslt\import\common
-mkdir: %_DEST%\bin\xslt\import\spreadsheetml
-mkdir: %_DEST%\bin\xslt\import\uof
-mkdir: %_DEST%\bin\xslt\import\wordml
-mkdir: %_DEST%\xml\registry
-mkdir: %_DEST%\xml\registry\spool
-mkdir: %_DEST%\bin\pdfimport
-..\source\xslt\common\*.xsl %_DEST%\bin\xslt\common\*.xsl
-..\source\xslt\export\common\*.xsl %_DEST%\bin\xslt\export\common\*.xsl
-..\source\xslt\odf2xhtml\export\common\*.xsl %_DEST%\bin\xslt\export\common\*.xsl
-..\source\xslt\odf2xhtml\export\common\styles\*.xsl %_DEST%\bin\xslt\export\common\styles\*.xsl
-..\source\xslt\odf2xhtml\export\common\table\*.xsl %_DEST%\bin\xslt\export\common\table\*.xsl
-..\source\xslt\export\spreadsheetml\*.xsl %_DEST%\bin\xslt\export\spreadsheetml\*.xsl
-..\source\xslt\export\wiki\*.xsl %_DEST%\bin\xslt\export\wiki\*.xsl
-..\source\xslt\export\wiki\*.ott %_DEST%\bin\xslt\export\wiki\*.ott
-..\source\xslt\export\wordml\*.xsl %_DEST%\bin\xslt\export\wordml\*.xsl
-..\source\xslt\export\uof\*.xsl %_DEST%\bin\xslt\export\uof\*.xsl
-..\source\xslt\export\xhtml\*.xsl %_DEST%\bin\xslt\export\xhtml\*.xsl
-..\source\xslt\odf2xhtml\export\xhtml\*.xsl %_DEST%\bin\xslt\export\xhtml\*.xsl
-..\source\xslt\import\common\*.xsl %_DEST%\bin\xslt\import\common\*.xsl
-..\source\xslt\import\spreadsheetml\*.xsl %_DEST%\bin\xslt\import\spreadsheetml\*.xsl
-..\source\xslt\import\wordml\*.xsl %_DEST%\bin\xslt\import\wordml\*.xsl
-..\source\xslt\import\uof\*.xsl %_DEST%\bin\xslt\import\uof\*.xsl
-..\%__SRC%\bin\*.xsl %_DEST%\bin\*.xsl
-..\%__SRC%\bin\*.stw %_DEST%\bin\*.stw
-..\%__SRC%\bin\pdf2xml.* %_DEST%\bin\pdf2xml.*
-..\%__SRC%\bin\pdfunzip.* %_DEST%\bin\pdfunzip.*
-..\%__SRC%\misc\filters\modulepacks\fcfg_*.xcu %_DEST%\xml\registry\spool\fcfg_*.xcu
-..\%COMMON_OUTDIR%\bin\fcfg_langpack_*.zip %_DEST%\pck\fcfg_langpack_*.zip
-..\%__SRC%\misc\t602filter.component %_DEST%\xml\t602filter.component
-
-mkdir: %_DEST%\inc\filter
-mkdir: %_DEST%\inc\filter\msfilter
-..\inc\filter\msfilter\*.hxx %_DEST%\inc\filter\msfilter\*.hxx
-..\inc\filter\msfilter\*.h %_DEST%\inc\filter\msfilter\*.h
-
-..\%__SRC%\misc\XSLTFilter.jar.component %_DEST%\xml\XSLTFilter.jar.component
-..\%__SRC%\misc\XSLTValidate.component %_DEST%\xml\XSLTValidate.component
-..\%__SRC%\misc\filterconfig1.component %_DEST%\xml\filterconfig1.component
-..\%__SRC%\misc\flash.component %_DEST%\xml\flash.component
-..\%__SRC%\misc\msfilter.component %_DEST%\xml\msfilter.component
-..\%__SRC%\misc\odfflatxml.component %_DEST%\xml\odfflatxml.component
-..\%__SRC%\misc\pdffilter.component %_DEST%\xml\pdffilter.component
-..\%__SRC%\misc\placeware.component %_DEST%\xml\placeware.component
-..\%__SRC%\misc\svgfilter.component %_DEST%\xml\svgfilter.component
-..\%__SRC%\misc\xmlfa.component %_DEST%\xml\xmlfa.component
-..\%__SRC%\misc\xmlfd.component %_DEST%\xml\xmlfd.component
-..\%__SRC%\misc\xsltdlg.component %_DEST%\xml\xsltdlg.component
-..\%__SRC%\misc\xsltfilter.component %_DEST%\xml\xsltfilter.component
diff --git a/filter/source/config/fragments/delzip b/filter/source/config/fragments/delzip
deleted file mode 100644
index e69de29..0000000
commit 94883340a945dbd130ad16400f4ac25cae4bec1a
Author: Michael Stahl <mst at openoffice.org>
Date: Thu Sep 15 14:01:36 2011 +0200
filter: convert odfflatxml library
diff --git a/Repository.mk b/Repository.mk
index 75feaa0..6ef7e69 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -122,6 +122,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
msfilter \
msword \
msworks \
+ odfflatxml \
pdffilter \
placeware \
qstart_gtk \
diff --git a/filter/Library_odfflatxml.mk b/filter/Library_odfflatxml.mk
new file mode 100644
index 0000000..58267a1
--- /dev/null
+++ b/filter/Library_odfflatxml.mk
@@ -0,0 +1,57 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 Michael Stahl <mst at openoffice.org> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,odfflatxml))
+
+$(eval $(call gb_Library_set_componentfile,odfflatxml,filter/source/odfflatxml/odfflatxml))
+
+$(eval $(call gb_Library_add_api,odfflatxml,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_set_include,odfflatxml,\
+ -I$(SRCDIR)/filter/inc/pch \
+ $$(INCLUDE) \
+ -I$(SRCDIR)/filter/inc \
+))
+
+$(eval $(call gb_Library_add_linked_libs,odfflatxml,\
+ xo \
+ tl \
+ ucbhelper \
+ cppuhelper \
+ cppu \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,odfflatxml,\
+ filter/source/odfflatxml/OdfFlatXml \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk
index c1ba595..2130660 100644
--- a/filter/Module_filter.mk
+++ b/filter/Module_filter.mk
@@ -50,6 +50,7 @@ $(eval $(call gb_Module_add_targets,filter,\
Library_itg \
Library_iti \
Library_msfilter \
+ Library_odfflatxml \
Library_pdffilter \
Library_placeware \
Library_svgfilter \
diff --git a/filter/prj/build.lst b/filter/prj/build.lst
index 33b6309..76713fe 100644
--- a/filter/prj/build.lst
+++ b/filter/prj/build.lst
@@ -1,3 +1,2 @@
fl filter : TRANSLATIONS:translations svtools unotools xmloff cppu tools cppuhelper sal svx javaunohelper XPDF:xpdf jvmaccess canvas SAXON:saxon LIBXSLT:libxslt basegfx package PYTHON:python NULL
fl filter\prj nmake - all fl_prj NULL
-fl filter\source\odfflatxml nmake - all fl_odfflatxml fl_inc NULL
diff --git a/filter/source/odfflatxml/makefile.mk b/filter/source/odfflatxml/makefile.mk
deleted file mode 100644
index 0783bd9..0000000
--- a/filter/source/odfflatxml/makefile.mk
+++ /dev/null
@@ -1,64 +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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ = ..$/..
-PRJNAME = filter
-TARGET = odfflatxml
-ENABLE_EXCEPTIONS=TRUE
-LIBTARGET=NO
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE: settings.mk
-
-SLOFILES=$(SLO)$/OdfFlatXml.obj
-LIBNAME=odfflatxml
-SHL1TARGETDEPN=makefile.mk
-SHL1OBJS=$(SLOFILES)
-SHL1TARGET=$(LIBNAME)$(DLLPOSTFIX)
-SHL1IMPLIB=i$(LIBNAME)
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-
-SHL1STDLIBS= \
- $(TOOLSLIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(XMLOFFLIB) \
- $(SALLIB) \
- $(UCBHELPERLIB)
-
-# --- Targets ------------------------------------------------------
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/odfflatxml.component
-
-$(MISC)/odfflatxml.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- odfflatxml.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt odfflatxml.component
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index fc2d249..07086ab 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -66,6 +66,7 @@ my_components = \
component/filter/source/config/cache/filterconfig1 \
component/filter/source/flash/flash \
component/filter/source/msfilter/msfilter \
+ component/filter/source/odfflatxml/odfflatxml \
component/filter/source/pdf/pdffilter \
component/filter/source/placeware/placeware \
component/filter/source/svg/svgfilter \
@@ -151,7 +152,6 @@ my_components = \
localebe1 \
mysql \
odbc \
- odfflatxml \
protocolhandler \
scriptframe \
sdbc2 \
commit 8c8b34694aa803d155e38ca30a3816b5c1b06a45
Author: Michael Stahl <mst at openoffice.org>
Date: Thu Sep 15 14:01:35 2011 +0200
filter: svg: adapt to changes in LO
diff --git a/filter/Library_svgfilter.mk b/filter/Library_svgfilter.mk
index 31087a1..23119d4 100644
--- a/filter/Library_svgfilter.mk
+++ b/filter/Library_svgfilter.mk
@@ -19,8 +19,14 @@
$(eval $(call gb_Library_Library,svgfilter))
+$(eval $(call gb_Library_add_package_headers,svgfilter,filter_generated))
+
$(eval $(call gb_Library_set_componentfile,svgfilter,filter/source/svg/svgfilter))
+$(eval $(call gb_Library_add_defs,svgfilter,\
+ -DUSE_MODERN_SPIRIT \
+))
+
$(eval $(call gb_Library_add_api,svgfilter,\
udkapi \
offapi \
@@ -29,6 +35,7 @@ $(eval $(call gb_Library_add_api,svgfilter,\
$(eval $(call gb_Library_set_include,svgfilter,\
-I$(SRCDIR)/filter/inc/pch \
$$(INCLUDE) \
+ -I$(WORKDIR)/CustomTarget/filter/source/svg \
))
$(eval $(call gb_Library_add_linked_libs,svgfilter,\
@@ -48,25 +55,21 @@ $(eval $(call gb_Library_add_linked_libs,svgfilter,\
$(gb_STDLIBS) \
))
-ifneq ($(SOLAR_JAVA),)
-$(eval $(call gb_Library_add_linked_libs,svgfilter,\
- jvmaccess \
-))
-endif
+$(call gb_Library_use_externals,svgfilter,libxml2)
$(eval $(call gb_Library_add_exception_objects,svgfilter,\
+ filter/source/svg/b2dellipse \
filter/source/svg/impsvgdialog \
+ filter/source/svg/parserfragments \
filter/source/svg/svgdialog \
filter/source/svg/svgexport \
filter/source/svg/svgfilter \
filter/source/svg/svgfontexport \
- filter/source/svg/svgwriter \
-))
-
-ifneq ($(SOLAR_JAVA),)
-$(eval $(call gb_Library_add_exception_objects,svgfilter,\
filter/source/svg/svgimport \
+ filter/source/svg/svgreader \
+ filter/source/svg/svgwriter \
+ filter/source/svg/tokenmap \
+ filter/source/svg/units \
))
-endif
# vim: set noet sw=4 ts=4:
diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk
index 0567f86..c1ba595 100644
--- a/filter/Module_filter.mk
+++ b/filter/Module_filter.mk
@@ -60,6 +60,7 @@ $(eval $(call gb_Module_add_targets,filter,\
Library_xsltfilter \
Package_inc \
Package_docbook \
+ Package_filter_generated \
Package_xslt \
))
diff --git a/filter/Package_filter_generated.mk b/filter/Package_filter_generated.mk
new file mode 100644
index 0000000..bdcd213
--- /dev/null
+++ b/filter/Package_filter_generated.mk
@@ -0,0 +1,39 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 Michael Stahl <mst at openoffice.org> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,filter_generated,$(WORKDIR)/CustomTarget/filter/source/svg))
+
+$(eval $(call gb_Package_add_customtarget,filter_generated,filter/source/svg,SRCDIR))
+
+$(eval $(call gb_CustomTarget_add_dependencies,filter/source/svg,\
+ filter/source/svg/gentoken.pl \
+ filter/source/svg/tokens.txt \
+ filter/source/svg/presentation_engine.js \
+ filter/source/svg/js2hxx.py \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/source/svg/Makefile b/filter/source/svg/Makefile
new file mode 100644
index 0000000..5ccd632
--- /dev/null
+++ b/filter/source/svg/Makefile
@@ -0,0 +1,76 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 Michael Stahl <mst at openoffice.org> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+SRCDIR_FILTER := $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+WORKDIR_FILTER := .
+
+include $(GBUILDDIR)/gbuild_simple.mk
+
+filter_SRC_svg_Tokens := $(SRCDIR_FILTER)/tokens.txt
+filter_SRC_svg_GenToken := $(SRCDIR_FILTER)/gentoken.pl
+filter_SRC_svg_PresentationEngine := $(SRCDIR_FILTER)/presentation_engine.js
+filter_SRC_svg_Js2Hxx := $(SRCDIR_FILTER)/js2hxx.py
+
+filter_GEN_svg_Tokens_gperf := $(WORKDIR_FILTER)/tokens.gperf
+filter_GEN_svg_Tokens_hxx := $(WORKDIR_FILTER)/tokens.hxx
+filter_GEN_svg_Tokens_cxx := $(WORKDIR_FILTER)/tokens.cxx
+filter_GEN_svg_Script_hxx := $(WORKDIR_FILTER)/svgscript.hxx
+
+$(filter_GEN_svg_Tokens_gperf) : \
+ $(filter_SRC_svg_GenToken) $(filter_SRC_svg_Tokens)
+ $(call gb_Output_announce,$@,build,GPF,3)
+ $(call gb_Helper_abbreviate_dirs, \
+ $(PERL) $(filter_SRC_svg_GenToken) $(filter_SRC_svg_Tokens) \
+ $(filter_GEN_svg_Tokens_hxx) $(filter_GEN_svg_Tokens_gperf))
+
+# dummy rule: both files generated by recipe above
+$(filter_GEN_svg_Tokens_hxx) : $(filter_GEN_svg_Tokens_gperf)
+
+$(filter_GEN_svg_Tokens_cxx) : $(filter_GEN_svg_Tokens_gperf)
+ $(call gb_Output_announce,$@,build,GPF,1)
+ $(call gb_Helper_abbreviate_dirs, \
+ gperf --compare-strncmp -C -m 20 $(filter_GEN_svg_Tokens_gperf) \
+ | sed -e "s/(char\*)0/(char\*)0$(COMMA) 0/g" \
+ > $(filter_GEN_svg_Tokens_cxx))
+
+$(filter_GEN_svg_Script_hxx) : \
+ $(filter_SRC_svg_PresentationEngine) $(filter_SRC_svg_Js2Hxx)
+ $(call gb_Output_announce,$@,build,PY ,1)
+ $(call gb_Helper_abbreviate_dirs, \
+ $(gb_PYTHON) $(filter_SRC_svg_Js2Hxx) \
+ $(filter_SRC_svg_PresentationEngine) \
+ $(filter_GEN_svg_Script_hxx))
+
+.DEFAULT_GOAL:=all
+.PHONY: all
+all : \
+ $(filter_GEN_svg_Tokens_gperf) \
+ $(filter_GEN_svg_Tokens_hxx) \
+ $(filter_GEN_svg_Tokens_cxx) \
+ $(filter_GEN_svg_Script_hxx) \
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/gbuild_simple.mk b/solenv/gbuild/gbuild_simple.mk
index 18d1e07..002dd27 100644
--- a/solenv/gbuild/gbuild_simple.mk
+++ b/solenv/gbuild/gbuild_simple.mk
@@ -28,6 +28,8 @@
# this is a subset of gbuild functionality, for use in custom makefiles
+COMMA :=,
+
include $(GBUILDDIR)/Output.mk
# BuildDirs uses the Output functions already
commit a254cf292c5679843c6fa2624fa1aa5ce69e39fe
Author: Michael Stahl <mst at openoffice.org>
Date: Thu Sep 15 14:01:34 2011 +0200
filter: adapt to changes in LO
diff --git a/filter/Library_eps.mk b/filter/Library_eps.mk
index dde9165..a35c7b4 100644
--- a/filter/Library_eps.mk
+++ b/filter/Library_eps.mk
@@ -32,6 +32,7 @@ $(eval $(call gb_Library_set_include,eps,\
$(eval $(call gb_Library_add_linked_libs,eps,\
svt \
vcl \
+ utl \
tl \
cppu \
sal \
diff --git a/filter/Library_filterconfig.mk b/filter/Library_filterconfig.mk
index 20159f3..bfc66a3 100644
--- a/filter/Library_filterconfig.mk
+++ b/filter/Library_filterconfig.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_Library_add_api,filterconfig,\
$(eval $(call gb_Library_set_include,filterconfig,\
-I$(SRCDIR)/filter/inc/pch \
$$(INCLUDE) \
+ -I$(SRCDIR)/filter/inc \
))
$(eval $(call gb_Library_add_linked_libs,filterconfig,\
diff --git a/filter/Library_msfilter.mk b/filter/Library_msfilter.mk
index 3f11459..2663a61 100644
--- a/filter/Library_msfilter.mk
+++ b/filter/Library_msfilter.mk
@@ -68,11 +68,10 @@ $(eval $(call gb_Library_add_exception_objects,msfilter,\
filter/source/msfilter/msfiltertracer \
filter/source/msfilter/msocximex \
filter/source/msfilter/msoleexp \
+ filter/source/msfilter/mstoolbar \
filter/source/msfilter/msvbahelper \
- filter/source/msfilter/msvbasic \
filter/source/msfilter/services \
filter/source/msfilter/svdfppt \
- filter/source/msfilter/svxmsbas \
filter/source/msfilter/svxmsbas2 \
))
diff --git a/filter/Library_svgfilter.mk b/filter/Library_svgfilter.mk
index 425067d..31087a1 100644
--- a/filter/Library_svgfilter.mk
+++ b/filter/Library_svgfilter.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_Library_add_linked_libs,svgfilter,\
xo \
svt \
vcl \
+ svl \
utl \
tl \
comphelper \
@@ -59,7 +60,6 @@ $(eval $(call gb_Library_add_exception_objects,svgfilter,\
filter/source/svg/svgexport \
filter/source/svg/svgfilter \
filter/source/svg/svgfontexport \
- filter/source/svg/svguno \
filter/source/svg/svgwriter \
))
diff --git a/filter/Library_xsltfilter.mk b/filter/Library_xsltfilter.mk
index bc99b82..7ee7244 100644
--- a/filter/Library_xsltfilter.mk
+++ b/filter/Library_xsltfilter.mk
@@ -34,15 +34,24 @@ $(eval $(call gb_Library_set_include,xsltfilter,\
$(eval $(call gb_Library_add_linked_libs,xsltfilter,\
xo \
tl \
+ package2 \
+ comphelper \
+ ucbhelper \
cppuhelper \
cppu \
sal \
$(gb_STDLIBS) \
))
+$(call gb_Library_use_externals,xsltfilter,\
+ libxml2 \
+ libxslt \
+)
+
$(eval $(call gb_Library_add_exception_objects,xsltfilter,\
+ filter/source/xsltfilter/LibXSLTTransformer \
+ filter/source/xsltfilter/OleHandler \
filter/source/xsltfilter/XSLTFilter \
- filter/source/xsltfilter/fla \
))
# vim: set noet sw=4 ts=4:
diff --git a/filter/Package_inc.mk b/filter/Package_inc.mk
index 14f1972..af2ade6 100644
--- a/filter/Package_inc.mk
+++ b/filter/Package_inc.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/msdffimp.hxx,fi
$(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/mstoolbar.hxx,filter/msfilter/mstoolbar.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))
diff --git a/sc/CppunitTest_sc_test_filters.mk b/sc/CppunitTest_sc_test_filters.mk
index 07e4123..d7aa043 100644
--- a/sc/CppunitTest_sc_test_filters.mk
+++ b/sc/CppunitTest_sc_test_filters.mk
@@ -120,11 +120,11 @@ $(eval $(call gb_RdbTarget_add_components,sc_filters_test,\
sax/source/expatwrap/expwrap \
sax/source/fastparser/fastsax \
oox/util/oox \
+ filter/source/config/cache/filterconfig1 \
))
$(eval $(call gb_RdbTarget_add_old_components,sc_filters_test,\
configmgr \
- filterconfig1 \
ucb1 \
ucpfile1 \
))
commit 83cb157c54701d70d302004fa6a5d8bdc8c4a098
Author: Michael Stahl <mst at openoffice.org>
Date: Thu Sep 15 14:01:33 2011 +0200
filter: convert some more libraries to gbuild
diff --git a/Repository.mk b/Repository.mk
index c3d0b25..75feaa0 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -81,6 +81,17 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
doctok \
drawinglayer \
editeng \
+ egi \
+ eme \
+ epb \
+ epg \
+ epp \
+ eps \
+ ept \
+ era \
+ eti \
+ exp \
+ filterconfig \
filtertracer \
flash \
for \
@@ -93,6 +104,18 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
hwp \
i18npaper \
i18nregexp \
+ icd \
+ icg \
+ idx \
+ ime \
+ ipb \
+ ipd \
+ ips \
+ ipt \
+ ipx \
+ ira \
+ itg \
+ iti \
lng \
lwpft \
merged \
@@ -159,6 +182,8 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
xmlfd \
xo \
xof \
+ xsltdlg \
+ xsltfilter \
))
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
diff --git a/filter/Library_egi.mk b/filter/Library_egi.mk
new file mode 100644
index 0000000..89b13fe
--- /dev/null
+++ b/filter/Library_egi.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,egi))
+
+$(eval $(call gb_Library_add_api,egi,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_set_include,egi,\
+ -I$(SRCDIR)/filter/inc/pch \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,egi,\
+ svt \
+ vcl \
+ tl \
+ cppu \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,egi,\
+ filter/source/graphicfilter/egif/egif \
+ filter/source/graphicfilter/egif/giflzwc \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_eme.mk b/filter/Library_eme.mk
new file mode 100644
index 0000000..6988dd5
--- /dev/null
+++ b/filter/Library_eme.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_Library_Library,eme))
+
+$(eval $(call gb_Library_add_api,eme,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_set_include,eme,\
+ -I$(SRCDIR)/filter/inc/pch \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,eme,\
+ svt \
+ vcl \
+ tl \
+ cppu \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,eme,\
+ filter/source/graphicfilter/eos2met/eos2met \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_epb.mk b/filter/Library_epb.mk
new file mode 100644
index 0000000..990c181
--- /dev/null
+++ b/filter/Library_epb.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_Library_Library,epb))
+
+$(eval $(call gb_Library_add_api,epb,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_set_include,epb,\
+ -I$(SRCDIR)/filter/inc/pch \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,epb,\
+ svt \
+ vcl \
+ tl \
+ cppu \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,epb,\
+ filter/source/graphicfilter/epbm/epbm \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_epg.mk b/filter/Library_epg.mk
new file mode 100644
index 0000000..b23d282
--- /dev/null
+++ b/filter/Library_epg.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_Library_Library,epg))
+
+$(eval $(call gb_Library_add_api,epg,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_set_include,epg,\
+ -I$(SRCDIR)/filter/inc/pch \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,epg,\
+ svt \
+ vcl \
+ tl \
+ cppu \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,epg,\
+ filter/source/graphicfilter/epgm/epgm \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_epp.mk b/filter/Library_epp.mk
new file mode 100644
index 0000000..0f18710
--- /dev/null
+++ b/filter/Library_epp.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_Library_Library,epp))
+
+$(eval $(call gb_Library_add_api,epp,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_set_include,epp,\
+ -I$(SRCDIR)/filter/inc/pch \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,epp,\
+ svt \
+ vcl \
+ tl \
+ cppu \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,epp,\
+ filter/source/graphicfilter/eppm/eppm \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_eps.mk b/filter/Library_eps.mk
new file mode 100644
index 0000000..dde9165
--- /dev/null
+++ b/filter/Library_eps.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_Library_Library,eps))
+
+$(eval $(call gb_Library_add_api,eps,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_set_include,eps,\
+ -I$(SRCDIR)/filter/inc/pch \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,eps,\
+ svt \
+ vcl \
+ tl \
+ cppu \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,eps,\
+ filter/source/graphicfilter/eps/eps \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_ept.mk b/filter/Library_ept.mk
new file mode 100644
index 0000000..5ec38fe
--- /dev/null
+++ b/filter/Library_ept.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,ept))
+
+$(eval $(call gb_Library_add_api,ept,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_set_include,ept,\
+ -I$(SRCDIR)/filter/inc/pch \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,ept,\
+ svt \
+ vcl \
+ tl \
+ basegfx \
+ cppu \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,ept,\
+ filter/source/graphicfilter/epict/epict \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_era.mk b/filter/Library_era.mk
new file mode 100644
index 0000000..90a3b00
--- /dev/null
+++ b/filter/Library_era.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_Library_Library,era))
+
+$(eval $(call gb_Library_add_api,era,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_set_include,era,\
+ -I$(SRCDIR)/filter/inc/pch \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,era,\
+ svt \
+ vcl \
+ tl \
+ cppu \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,era,\
+ filter/source/graphicfilter/eras/eras \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_eti.mk b/filter/Library_eti.mk
new file mode 100644
index 0000000..0ef7b24
--- /dev/null
+++ b/filter/Library_eti.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_Library_Library,eti))
+
+$(eval $(call gb_Library_add_api,eti,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_set_include,eti,\
+ -I$(SRCDIR)/filter/inc/pch \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,eti,\
+ svt \
+ vcl \
+ tl \
+ cppu \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,eti,\
+ filter/source/graphicfilter/etiff/etiff \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_exp.mk b/filter/Library_exp.mk
new file mode 100644
index 0000000..41b38e1
--- /dev/null
+++ b/filter/Library_exp.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_Library_Library,exp))
+
+$(eval $(call gb_Library_add_api,exp,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_set_include,exp,\
+ -I$(SRCDIR)/filter/inc/pch \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,exp,\
+ svt \
+ vcl \
+ tl \
+ cppu \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,exp,\
+ filter/source/graphicfilter/expm/expm \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_filterconfig.mk b/filter/Library_filterconfig.mk
new file mode 100644
index 0000000..20159f3
--- /dev/null
+++ b/filter/Library_filterconfig.mk
@@ -0,0 +1,62 @@
+#***************************************************************
+# 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,filterconfig))
+
+$(eval $(call gb_Library_set_componentfile,filterconfig,filter/source/config/cache/filterconfig1))
+
+$(eval $(call gb_Library_add_api,filterconfig,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_set_include,filterconfig,\
+ -I$(SRCDIR)/filter/inc/pch \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,filterconfig,\
+ fwe \
+ utl \
+ tl \
+ comphelper \
+ cppuhelper \
+ cppu \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+
+$(eval $(call gb_Library_add_exception_objects,filterconfig,\
+ filter/source/config/cache/basecontainer \
+ filter/source/config/cache/cacheitem \
+ filter/source/config/cache/cacheupdatelistener \
+ filter/source/config/cache/configflush \
+ filter/source/config/cache/contenthandlerfactory \
+ filter/source/config/cache/filtercache \
+ filter/source/config/cache/filterfactory \
+ filter/source/config/cache/frameloaderfactory \
+ filter/source/config/cache/lateinitlistener \
+ filter/source/config/cache/lateinitthread \
+ filter/source/config/cache/querytokenizer \
+ filter/source/config/cache/registration \
+ filter/source/config/cache/typedetection \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_icd.mk b/filter/Library_icd.mk
new file mode 100644
index 0000000..556022f
--- /dev/null
+++ b/filter/Library_icd.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_Library_Library,icd))
+
+$(eval $(call gb_Library_add_api,icd,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_set_include,icd,\
+ -I$(SRCDIR)/filter/inc/pch \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,icd,\
+ svt \
+ vcl \
+ tl \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,icd,\
+ filter/source/graphicfilter/ipcd/ipcd \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_icg.mk b/filter/Library_icg.mk
new file mode 100644
index 0000000..e759bc2
--- /dev/null
+++ b/filter/Library_icg.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,icg))
+
+$(eval $(call gb_Library_add_api,icg,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_set_include,icg,\
+ -I$(SRCDIR)/filter/inc/pch \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,icg,\
+ tk \
+ vcl \
+ utl \
+ tl \
+ cppu \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,icg,\
+ filter/source/graphicfilter/icgm/actimpr \
+ filter/source/graphicfilter/icgm/bitmap \
+ filter/source/graphicfilter/icgm/bundles \
+ filter/source/graphicfilter/icgm/cgm \
+ filter/source/graphicfilter/icgm/chart \
+ filter/source/graphicfilter/icgm/class0 \
+ filter/source/graphicfilter/icgm/class1 \
+ filter/source/graphicfilter/icgm/class2 \
+ filter/source/graphicfilter/icgm/class3 \
+ filter/source/graphicfilter/icgm/class4 \
+ filter/source/graphicfilter/icgm/class5 \
+ filter/source/graphicfilter/icgm/class7 \
+ filter/source/graphicfilter/icgm/classx \
+ filter/source/graphicfilter/icgm/elements \
+ filter/source/graphicfilter/icgm/outact \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_idx.mk b/filter/Library_idx.mk
new file mode 100644
index 0000000..ff28e4a
--- /dev/null
+++ b/filter/Library_idx.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,idx))
+
+$(eval $(call gb_Library_add_api,idx,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_set_include,idx,\
+ -I$(SRCDIR)/filter/inc/pch \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,idx,\
+ vcl \
+ tl \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,idx,\
+ filter/source/graphicfilter/idxf/dxf2mtf \
+ filter/source/graphicfilter/idxf/dxfblkrd \
+ filter/source/graphicfilter/idxf/dxfentrd \
+ filter/source/graphicfilter/idxf/dxfgrprd \
+ filter/source/graphicfilter/idxf/dxfreprd \
+ filter/source/graphicfilter/idxf/dxftblrd \
+ filter/source/graphicfilter/idxf/dxfvec \
+ filter/source/graphicfilter/idxf/idxf \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_ime.mk b/filter/Library_ime.mk
new file mode 100644
index 0000000..8440d9f
--- /dev/null
+++ b/filter/Library_ime.mk
@@ -0,0 +1,43 @@
+#***************************************************************
+# 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,ime))
+
+$(eval $(call gb_Library_add_api,ime,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_set_include,ime,\
+ -I$(SRCDIR)/filter/inc/pch \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,ime,\
+ vcl \
+ tl \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,ime,\
+ filter/source/graphicfilter/ios2met/ios2met \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_ipb.mk b/filter/Library_ipb.mk
new file mode 100644
index 0000000..20290ca
--- /dev/null
+++ b/filter/Library_ipb.mk
@@ -0,0 +1,43 @@
+#***************************************************************
+# 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,ipb))
+
+$(eval $(call gb_Library_add_api,ipb,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_set_include,ipb,\
+ -I$(SRCDIR)/filter/inc/pch \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,ipb,\
+ vcl \
+ tl \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,ipb,\
+ filter/source/graphicfilter/ipbm/ipbm \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_ipd.mk b/filter/Library_ipd.mk
new file mode 100644
index 0000000..adba684
--- /dev/null
+++ b/filter/Library_ipd.mk
@@ -0,0 +1,43 @@
+#***************************************************************
+# 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,ipd))
+
+$(eval $(call gb_Library_add_api,ipd,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_set_include,ipd,\
+ -I$(SRCDIR)/filter/inc/pch \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,ipd,\
+ vcl \
+ tl \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,ipd,\
+ filter/source/graphicfilter/ipsd/ipsd \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_ips.mk b/filter/Library_ips.mk
new file mode 100644
index 0000000..62ca72e
--- /dev/null
+++ b/filter/Library_ips.mk
@@ -0,0 +1,43 @@
+#***************************************************************
+# 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,ips))
+
+$(eval $(call gb_Library_add_api,ips,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_set_include,ips,\
+ -I$(SRCDIR)/filter/inc/pch \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,ips,\
+ vcl \
+ tl \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,ips,\
+ filter/source/graphicfilter/ieps/ieps \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_ipt.mk b/filter/Library_ipt.mk
new file mode 100644
index 0000000..db61a5e
--- /dev/null
+++ b/filter/Library_ipt.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_Library_Library,ipt))
+
+$(eval $(call gb_Library_add_api,ipt,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_set_include,ipt,\
+ -I$(SRCDIR)/filter/inc/pch \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,ipt,\
+ vcl \
+ tl \
+ basegfx \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,ipt,\
+ filter/source/graphicfilter/ipict/ipict \
+ filter/source/graphicfilter/ipict/shape \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_ipx.mk b/filter/Library_ipx.mk
new file mode 100644
index 0000000..a709c5f
--- /dev/null
+++ b/filter/Library_ipx.mk
@@ -0,0 +1,43 @@
+#***************************************************************
+# 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,ipx))
+
+$(eval $(call gb_Library_add_api,ipx,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_set_include,ipx,\
+ -I$(SRCDIR)/filter/inc/pch \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,ipx,\
+ vcl \
+ tl \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,ipx,\
+ filter/source/graphicfilter/ipcx/ipcx \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_ira.mk b/filter/Library_ira.mk
new file mode 100644
index 0000000..90a9b9a
--- /dev/null
+++ b/filter/Library_ira.mk
@@ -0,0 +1,43 @@
+#***************************************************************
+# 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,ira))
+
+$(eval $(call gb_Library_add_api,ira,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_set_include,ira,\
+ -I$(SRCDIR)/filter/inc/pch \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,ira,\
+ vcl \
+ tl \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,ira,\
+ filter/source/graphicfilter/iras/iras \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_itg.mk b/filter/Library_itg.mk
new file mode 100644
index 0000000..ff82b7e
--- /dev/null
+++ b/filter/Library_itg.mk
@@ -0,0 +1,43 @@
+#***************************************************************
+# 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,itg))
+
+$(eval $(call gb_Library_add_api,itg,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_set_include,itg,\
+ -I$(SRCDIR)/filter/inc/pch \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,itg,\
+ vcl \
+ tl \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,itg,\
+ filter/source/graphicfilter/itga/itga \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_iti.mk b/filter/Library_iti.mk
new file mode 100644
index 0000000..0d15830
--- /dev/null
+++ b/filter/Library_iti.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_Library_Library,iti))
+
+$(eval $(call gb_Library_add_api,iti,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_set_include,iti,\
+ -I$(SRCDIR)/filter/inc/pch \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,iti,\
+ vcl \
+ tl \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,iti,\
+ filter/source/graphicfilter/itiff/ccidecom \
+ filter/source/graphicfilter/itiff/itiff \
+ filter/source/graphicfilter/itiff/lzwdecom \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_xsltdlg.mk b/filter/Library_xsltdlg.mk
new file mode 100644
index 0000000..3c60903
--- /dev/null
+++ b/filter/Library_xsltdlg.mk
@@ -0,0 +1,63 @@
+#***************************************************************
+# 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,xsltdlg))
+
+$(eval $(call gb_Library_set_componentfile,xsltdlg,filter/source/xsltdialog/xsltdlg))
+
+$(eval $(call gb_Library_add_api,xsltdlg,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_set_include,xsltdlg,\
+ -I$(SRCDIR)/filter/inc/pch \
+ $$(INCLUDE) \
+ -I$(SRCDIR)/filter/inc \
+))
+
+$(eval $(call gb_Library_add_linked_libs,xsltdlg,\
+ sfx \
+ svt \
+ tk \
+ vcl \
+ svl \
+ utl \
+ tl \
+ comphelper \
+ cppuhelper \
+ cppu \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,xsltdlg,\
+ filter/source/xsltdialog/typedetectionexport \
+ filter/source/xsltdialog/typedetectionimport \
+ filter/source/xsltdialog/xmlfileview \
+ filter/source/xsltdialog/xmlfilterdialogcomponent \
+ filter/source/xsltdialog/xmlfilterjar \
+ filter/source/xsltdialog/xmlfiltersettingsdialog \
+ filter/source/xsltdialog/xmlfiltertabdialog \
+ filter/source/xsltdialog/xmlfiltertabpagebasic \
+ filter/source/xsltdialog/xmlfiltertabpagexslt \
+ filter/source/xsltdialog/xmlfiltertestdialog \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_xsltfilter.mk b/filter/Library_xsltfilter.mk
new file mode 100644
index 0000000..bc99b82
--- /dev/null
+++ b/filter/Library_xsltfilter.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,xsltfilter))
+
+$(eval $(call gb_Library_set_componentfile,xsltfilter,filter/source/xsltfilter/xsltfilter))
+
+$(eval $(call gb_Library_add_api,xsltfilter,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_set_include,xsltfilter,\
+ -I$(SRCDIR)/filter/inc/pch \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,xsltfilter,\
+ xo \
+ tl \
+ cppuhelper \
+ cppu \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,xsltfilter,\
+ filter/source/xsltfilter/XSLTFilter \
+ filter/source/xsltfilter/fla \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk
index 7d0f723..0567f86 100644
--- a/filter/Module_filter.mk
+++ b/filter/Module_filter.mk
@@ -24,8 +24,31 @@ $(eval $(call gb_Module_add_targets,filter,\
Jar_XSLTFilter \
Jar_XSLTValidate \
Library_PptImporter \
+ Library_egi \
+ Library_eme \
+ Library_epb \
+ Library_epg \
+ Library_epp \
+ Library_eps \
+ Library_ept \
+ Library_era \
+ Library_eti \
+ Library_exp \
+ Library_filterconfig \
Library_filtertracer \
Library_flash \
+ Library_icd \
+ Library_icg \
+ Library_idx \
+ Library_ime \
+ Library_ipb \
+ Library_ipd \
+ Library_ips \
+ Library_ipt \
+ Library_ipx \
+ Library_ira \
+ Library_itg \
+ Library_iti \
Library_msfilter \
Library_pdffilter \
Library_placeware \
@@ -33,6 +56,8 @@ $(eval $(call gb_Module_add_targets,filter,\
Library_t602filter \
Library_xmlfa \
Library_xmlfd \
+ Library_xsltdlg \
+ Library_xsltfilter \
Package_inc \
Package_docbook \
Package_xslt \
diff --git a/filter/prj/build.lst b/filter/prj/build.lst
index cd074b9..33b6309 100644
--- a/filter/prj/build.lst
+++ b/filter/prj/build.lst
@@ -1,30 +1,3 @@
fl filter : TRANSLATIONS:translations svtools unotools xmloff cppu tools cppuhelper sal svx javaunohelper XPDF:xpdf jvmaccess canvas SAXON:saxon LIBXSLT:libxslt basegfx package PYTHON:python NULL
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\odfflatxml nmake - all fl_odfflatxml fl_inc NULL
-fl filter\source\xsltdialog nmake - all fl_xsltdialog fl_flash 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
-fl filter\source\graphicfilter\egif nmake - all g_vfegf fl_inc NULL
-fl filter\source\graphicfilter\ipcd nmake - all g_vfipc fl_inc NULL
-fl filter\source\graphicfilter\ipcx nmake - all g_vfipx fl_inc NULL
-fl filter\source\graphicfilter\ipict nmake - all g_vfipt fl_inc NULL
-fl filter\source\graphicfilter\idxf nmake - all g_vfidx fl_inc NULL
-fl filter\source\graphicfilter\itiff nmake - all g_vfitf fl_inc NULL
-fl filter\source\graphicfilter\ipbm nmake - all g_vfpbm fl_inc NULL
-fl filter\source\graphicfilter\epbm nmake - all g_epbm fl_inc NULL
-fl filter\source\graphicfilter\epgm nmake - all g_epgm fl_inc NULL
-fl filter\source\graphicfilter\eppm nmake - all g_eppm fl_inc NULL
-fl filter\source\graphicfilter\iras nmake - all g_iras fl_inc NULL
-fl filter\source\graphicfilter\expm nmake - all g_expm fl_inc NULL
-fl filter\source\graphicfilter\eras nmake - all g_eras fl_inc NULL
-fl filter\source\graphicfilter\etiff nmake - all g_etiff fl_inc NULL
-fl filter\source\graphicfilter\eps nmake - all g_eps fl_inc NULL
-fl filter\source\graphicfilter\itga nmake - all g_itga fl_inc NULL
-fl filter\source\graphicfilter\ipsd nmake - all g_ipsd fl_inc NULL
-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
diff --git a/filter/source/config/cache/makefile.mk b/filter/source/config/cache/makefile.mk
deleted file mode 100644
index d94c81e..0000000
--- a/filter/source/config/cache/makefile.mk
+++ /dev/null
@@ -1,87 +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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ = ..$/..$/..
-
-PRJNAME = filter
-TARGET = filterconfig
-ENABLE_EXCEPTIONS = TRUE
-VERSION = 1
-USE_DEFFILE = TRUE
-LIBTARGET = NO
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Library -----------------------------------
-
-SHL1TARGET= $(TARGET)$(VERSION)
-
-SLOFILES= \
- $(SLO)$/configflush.obj \
- $(SLO)$/basecontainer.obj \
- $(SLO)$/cacheitem.obj \
- $(SLO)$/contenthandlerfactory.obj \
- $(SLO)$/filtercache.obj \
- $(SLO)$/filterfactory.obj \
- $(SLO)$/frameloaderfactory.obj \
- $(SLO)$/lateinitlistener.obj \
- $(SLO)$/lateinitthread.obj \
- $(SLO)$/querytokenizer.obj \
- $(SLO)$/registration.obj \
- $(SLO)$/typedetection.obj \
- $(SLO)$/cacheupdatelistener.obj
-
-SHL1OBJS= $(SLOFILES)
-
-SHL1STDLIBS= \
- $(COMPHELPERLIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(SALLIB) \
- $(TOOLSLIB) \
- $(UNOTOOLSLIB) \
- $(FWELIB)
-
-DEF1NAME= $(SHL1TARGET)
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-SHL1DEPN=
-SHL1IMPLIB= i$(SHL1TARGET)
-SHL1VERSIONMAP= $(SOLARENV)/src/component.map
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/filterconfig1.component
-
-$(MISC)/filterconfig1.component .ERRREMOVE : \
- $(SOLARENV)/bin/createcomponent.xslt filterconfig1.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt filterconfig1.component
diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx
index efb0bf2..6167a25 100644
--- a/filter/source/graphicfilter/egif/egif.cxx
+++ b/filter/source/graphicfilter/egif/egif.cxx
@@ -569,7 +569,8 @@ void GIFWriter::WriteTerminator()
// ------------------------------------------------------------------------
-extern "C" sal_Bool __LOADONCALLAPI GraphicExport( SvStream& rStream, Graphic& rGraphic,
+extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI
+GraphicExport( SvStream& rStream, Graphic& rGraphic,
FilterConfigItem* pConfigItem, sal_Bool )
{
GIFWriter aWriter(rStream);
diff --git a/filter/source/graphicfilter/egif/exports.map b/filter/source/graphicfilter/egif/exports.map
deleted file mode 100644
index d4e28c4..0000000
--- a/filter/source/graphicfilter/egif/exports.map
+++ /dev/null
@@ -1,7 +0,0 @@
-UDK_3_0_0 {
- global:
- GraphicExport;
-
- local:
- *;
-};
diff --git a/filter/source/graphicfilter/egif/makefile.mk b/filter/source/graphicfilter/egif/makefile.mk
deleted file mode 100644
index ad68423..0000000
--- a/filter/source/graphicfilter/egif/makefile.mk
+++ /dev/null
@@ -1,72 +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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=filter
-TARGET=egif
-TARGET2=egi
-DEPTARGET=vegif
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(L10N_framework)"==""
-SLOFILES= \
- $(EXCEPTIONSFILES) \
- $(SLO)$/giflzwc.obj
-
-EXCEPTIONSFILES= \
- $(SLO)$/egif.obj
-
-.ENDIF
-
-# ==========================================================================
-
-.IF "$(L10N_framework)"==""
-SHL1TARGET= egi$(DLLPOSTFIX)
-SHL1IMPLIB= egif
-SHL1STDLIBS= $(TOOLSLIB) $(VCLLIB) $(CPPULIB) $(SVTOOLLIB) $(SALLIB)
-
-SHL1LIBS= $(SLB)$/egif.lib
-
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
-SHL1OBJS= $(SLO)$/egif.obj
-.ENDIF
-.ENDIF
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-.ENDIF
-# ==========================================================================
-
-.INCLUDE : target.mk
diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx
index 6a444cb..8d87430 100644
--- a/filter/source/graphicfilter/eos2met/eos2met.cxx
+++ b/filter/source/graphicfilter/eos2met/eos2met.cxx
@@ -2587,7 +2587,8 @@ sal_Bool METWriter::WriteMET( const GDIMetaFile& rMTF, SvStream& rTargetStream,
//================== GraphicExport - die exportierte Funktion ================
-extern "C" sal_Bool __LOADONCALLAPI GraphicExport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool )
+extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI
+GraphicExport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool )
{ METWriter aMETWriter;
if ( rGraphic.GetType() == GRAPHIC_GDIMETAFILE )
diff --git a/filter/source/graphicfilter/eos2met/exports.map b/filter/source/graphicfilter/eos2met/exports.map
deleted file mode 100644
index d4e28c4..0000000
--- a/filter/source/graphicfilter/eos2met/exports.map
+++ /dev/null
@@ -1,7 +0,0 @@
-UDK_3_0_0 {
- global:
- GraphicExport;
-
- local:
- *;
-};
diff --git a/filter/source/graphicfilter/eos2met/makefile.mk b/filter/source/graphicfilter/eos2met/makefile.mk
deleted file mode 100644
index f6ce5b3..0000000
--- a/filter/source/graphicfilter/eos2met/makefile.mk
+++ /dev/null
@@ -1,66 +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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=filter
-TARGET=eos2met
-TARGET2=eme
-DEPTARGET=veos2met
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Allgemein ----------------------------------------------------------
-
-.IF "$(L10N_framework)"==""
-SLOFILES = $(SLO)$/eos2met.obj
-
-
-.ENDIF
-# ==========================================================================
-
-.IF "$(L10N_framework)"==""
-SHL1TARGET= eme$(DLLPOSTFIX)
-SHL1IMPLIB= eos2met
-SHL1STDLIBS= $(TOOLSLIB) $(VCLLIB) $(SVTOOLLIB) $(CPPULIB) $(SALLIB)
-
-SHL1LIBS= $(SLB)$/eos2met.lib
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
-SHL1OBJS= $(SLO)$/eos2met.obj
-.ENDIF
-.ENDIF
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-.ENDIF
-# ==========================================================================
-
-.INCLUDE : target.mk
diff --git a/filter/source/graphicfilter/epbm/epbm.cxx b/filter/source/graphicfilter/epbm/epbm.cxx
index f94ab01..612873f 100644
--- a/filter/source/graphicfilter/epbm/epbm.cxx
+++ b/filter/source/graphicfilter/epbm/epbm.cxx
@@ -200,7 +200,8 @@ void PBMWriter::ImplWriteNumber(sal_Int32 nNumber)
// - exported function -
// ---------------------
-extern "C" sal_Bool __LOADONCALLAPI GraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool )
+extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI
+GraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool)
{
PBMWriter aPBMWriter(rStream);
diff --git a/filter/source/graphicfilter/epbm/exports.map b/filter/source/graphicfilter/epbm/exports.map
deleted file mode 100644
index d4e28c4..0000000
--- a/filter/source/graphicfilter/epbm/exports.map
+++ /dev/null
@@ -1,7 +0,0 @@
-UDK_3_0_0 {
- global:
- GraphicExport;
-
- local:
- *;
-};
diff --git a/filter/source/graphicfilter/epbm/makefile.mk b/filter/source/graphicfilter/epbm/makefile.mk
deleted file mode 100644
index 778c951..0000000
--- a/filter/source/graphicfilter/epbm/makefile.mk
+++ /dev/null
@@ -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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=filter
-TARGET=epbm
-TARGET2=epb
-DEPTARGET=vepbm
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Allgemein ----------------------------------------------------------
-
-.IF "$(L10N_framework)"==""
-SLOFILES = \
- $(EXCEPTIONSFILES)
-EXCEPTIONSFILES = \
- $(SLO)$/epbm.obj
-.ENDIF
-# ==========================================================================
-
-.IF "$(L10N_framework)"==""
-SHL1TARGET= epb$(DLLPOSTFIX)
-SHL1IMPLIB= epbm
-SHL1STDLIBS= $(TOOLSLIB) $(VCLLIB) $(CPPULIB) $(SVTOOLLIB) $(SALLIB)
-
-SHL1LIBS= $(SLB)$/epbm.lib
-
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
-SHL1OBJS= $(SLO)$/epbm.obj
-.ENDIF
-.ENDIF
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-.ENDIF
-# ==========================================================================
-
-.INCLUDE : target.mk
diff --git a/filter/source/graphicfilter/epgm/epgm.cxx b/filter/source/graphicfilter/epgm/epgm.cxx
index 747f052..6e4b746 100644
--- a/filter/source/graphicfilter/epgm/epgm.cxx
+++ b/filter/source/graphicfilter/epgm/epgm.cxx
@@ -225,7 +225,8 @@ void PGMWriter::ImplWriteNumber(sal_Int32 nNumber)
// - exported function -
// ---------------------
-extern "C" sal_Bool __LOADONCALLAPI GraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool )
+extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI
+GraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool)
{
PGMWriter aPGMWriter(rStream);
diff --git a/filter/source/graphicfilter/epgm/exports.map b/filter/source/graphicfilter/epgm/exports.map
deleted file mode 100644
index d4e28c4..0000000
--- a/filter/source/graphicfilter/epgm/exports.map
+++ /dev/null
@@ -1,7 +0,0 @@
-UDK_3_0_0 {
- global:
- GraphicExport;
-
- local:
- *;
-};
diff --git a/filter/source/graphicfilter/epgm/makefile.mk b/filter/source/graphicfilter/epgm/makefile.mk
deleted file mode 100644
index 244ab48..0000000
--- a/filter/source/graphicfilter/epgm/makefile.mk
+++ /dev/null
@@ -1,69 +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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=filter
-TARGET=epgm
-TARGET2=epg
-DEPTARGET=vepgm
-
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Allgemein ----------------------------------------------------------
-
-.IF "$(L10N_framework)"==""
-SLOFILES = \
- $(EXCEPTIONSFILES)
-EXCEPTIONSFILES = \
- $(SLO)$/epgm.obj
-.ENDIF
-# ==========================================================================
-
-.IF "$(L10N_framework)"==""
-SHL1TARGET= epg$(DLLPOSTFIX)
-SHL1IMPLIB= epgm
-SHL1STDLIBS= $(TOOLSLIB) $(VCLLIB) $(CPPULIB) $(SVTOOLLIB) $(SALLIB)
-
-SHL1LIBS= $(SLB)$/epgm.lib
-
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
-SHL1OBJS= $(SLO)$/epgm.obj
-.ENDIF
-.ENDIF
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-.ENDIF
-# ==========================================================================
-
-.INCLUDE : target.mk
diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx
index 49d14de..aa00f1f 100644
--- a/filter/source/graphicfilter/epict/epict.cxx
+++ b/filter/source/graphicfilter/epict/epict.cxx
@@ -2305,7 +2305,8 @@ sal_Bool PictWriter::WritePict(const GDIMetaFile & rMTF, SvStream & rTargetStrea
//================== GraphicExport - die exportierte Funktion ================
-extern "C" sal_Bool __LOADONCALLAPI GraphicExport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool)
+extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI
+GraphicExport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool)
{
PictWriter aPictWriter;
diff --git a/filter/source/graphicfilter/epict/exports.map b/filter/source/graphicfilter/epict/exports.map
deleted file mode 100644
index d4e28c4..0000000
--- a/filter/source/graphicfilter/epict/exports.map
+++ /dev/null
@@ -1,7 +0,0 @@
-UDK_3_0_0 {
- global:
- GraphicExport;
-
- local:
- *;
-};
diff --git a/filter/source/graphicfilter/epict/makefile.mk b/filter/source/graphicfilter/epict/makefile.mk
deleted file mode 100644
index 38ed352..0000000
--- a/filter/source/graphicfilter/epict/makefile.mk
+++ /dev/null
@@ -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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=filter
-TARGET=epict
-TARGET2=ept
-DEPTARGET=vepict
-
-
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list