--- a/Repository.mk +++ a/Repository.mk @@ -64,7 +64,18 @@ drawinglayer \ editeng \ eggtray \ + egi \ + eme \ + epb \ + epg \ + epp \ + eps \ + ept \ + era \ + eti \ + exp \ file \ + filterconfig \ filtertracer \ flash \ for \ @@ -76,6 +87,18 @@ fwm \ i18npaper \ i18nregexp \ + icd \ + icg \ + idx \ + ime \ + ipb \ + ipd \ + ips \ + ipt \ + ipx \ + ira \ + itg \ + iti \ lng \ msfilter \ msword \ @@ -129,6 +152,8 @@ xmlfd \ xo \ xof \ + xsltdlg \ + xsltfilter \ )) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ --- a/filter/Library_egi.mk +++ a/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: --- a/filter/Library_eme.mk +++ a/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: --- a/filter/Library_epb.mk +++ a/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: --- a/filter/Library_epg.mk +++ a/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: --- a/filter/Library_epp.mk +++ a/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: --- a/filter/Library_eps.mk +++ a/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: --- a/filter/Library_ept.mk +++ a/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: --- a/filter/Library_era.mk +++ a/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: --- a/filter/Library_eti.mk +++ a/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: --- a/filter/Library_exp.mk +++ a/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: --- a/filter/Library_filterconfig.mk +++ a/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: --- a/filter/Library_icd.mk +++ a/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: --- a/filter/Library_icg.mk +++ a/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: --- a/filter/Library_idx.mk +++ a/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: --- a/filter/Library_ime.mk +++ a/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: --- a/filter/Library_ipb.mk +++ a/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: --- a/filter/Library_ipd.mk +++ a/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: --- a/filter/Library_ips.mk +++ a/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: --- a/filter/Library_ipt.mk +++ a/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: --- a/filter/Library_ipx.mk +++ a/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: --- a/filter/Library_ira.mk +++ a/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: --- a/filter/Library_itg.mk +++ a/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: --- a/filter/Library_iti.mk +++ a/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: --- a/filter/Library_xsltdlg.mk +++ a/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: --- a/filter/Library_xsltfilter.mk +++ a/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: --- a/filter/Module_filter.mk +++ a/filter/Module_filter.mk @@ -24,8 +24,31 @@ 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 @@ Library_t602filter \ Library_xmlfa \ Library_xmlfd \ + Library_xsltdlg \ + Library_xsltfilter \ Package_inc \ Package_docbook \ Package_xslt \ --- a/filter/prj/build.lst +++ a/filter/prj/build.lst @@ -1,29 +1,2 @@ fl filter : L10N:l10n svtools unotools xmloff cppu tools cppuhelper sal svx javaunohelper XPDF:xpdf jvmaccess canvas SAXON:saxon LIBXSLT:libxslt basegfx 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\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 --- a/filter/source/config/cache/makefile.mk +++ a/filter/source/config/cache/makefile.mk @@ -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 -# -# 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 --- a/filter/source/config/cache/registration.hxx +++ a/filter/source/config/cache/registration.hxx @@ -49,7 +49,7 @@ namespace comphelper{ /** TODO doc */ #define _COMPHELPER_COMPONENT_GETIMPLEMENTATIONENVIRONMENT \ - extern "C" void SAL_CALL component_getImplementationEnvironment(const sal_Char** ppEnvironmentTypeName, \ + extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const sal_Char** ppEnvironmentTypeName, \ uno_Environment** /* ppEnvironment */ ) \ { \ *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; \ @@ -82,7 +82,7 @@ namespace comphelper{ /** TODO doc */ #define _COMPHELPER_COMPONENT_GETFACTORY(STATIC_INIT,FACTORYLIST) \ - extern "C" void* SAL_CALL component_getFactory(const sal_Char* pImplementationName, \ + extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* pImplementationName, \ void* pServiceManager , \ void* /* pRegistryKey */ ) \ { \ --- a/filter/source/graphicfilter/egif/egif.cxx +++ a/filter/source/graphicfilter/egif/egif.cxx @@ -564,7 +564,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 ) { return GIFWriter().WriteGIF( rGraphic, rStream, pConfigItem ); --- a/filter/source/graphicfilter/egif/exports.map +++ a/filter/source/graphicfilter/egif/exports.map @@ -1,7 +0,0 @@ -UDK_3_0_0 { - global: - GraphicExport; - - local: - *; -}; --- a/filter/source/graphicfilter/egif/makefile.mk +++ a/filter/source/graphicfilter/egif/makefile.mk @@ -1,71 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=filter -TARGET=egif -TARGET2=egi -DEPTARGET=vegif - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -.IF "$(editdebug)"!="" || "$(EDITDEBUG)"!="" -CDEFS+= -DEDITDEBUG -.ENDIF - -.IF "$(L10N_framework)"=="" -SLOFILES= $(SLO)$/egif.obj \ - $(SLO)$/giflzwc.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 --- a/filter/source/graphicfilter/eos2met/eos2met.cxx +++ a/filter/source/graphicfilter/eos2met/eos2met.cxx @@ -2611,7 +2611,8 @@ sal_Bool METWriter::WriteMET( const GDIM //================== 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 ) --- a/filter/source/graphicfilter/eos2met/exports.map +++ a/filter/source/graphicfilter/eos2met/exports.map @@ -1,7 +0,0 @@ -UDK_3_0_0 { - global: - GraphicExport; - - local: - *; -}; --- a/filter/source/graphicfilter/eos2met/makefile.mk +++ a/filter/source/graphicfilter/eos2met/makefile.mk @@ -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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=filter -TARGET=eos2met -TARGET2=eme -DEPTARGET=veos2met - -# --- Settings ----------------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Allgemein ---------------------------------------------------------- - -.IF "$(editdebug)"!="" || "$(EDITDEBUG)"!="" -CDEFS+= -DEDITDEBUG -.ENDIF - -.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 --- a/filter/source/graphicfilter/epbm/epbm.cxx +++ a/filter/source/graphicfilter/epbm/epbm.cxx @@ -204,7 +204,8 @@ void PBMWriter::ImplWriteNumber( sal_Int // - 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; --- a/filter/source/graphicfilter/epbm/exports.map +++ a/filter/source/graphicfilter/epbm/exports.map @@ -1,7 +0,0 @@ -UDK_3_0_0 { - global: - GraphicExport; - - local: - *; -}; --- a/filter/source/graphicfilter/epbm/makefile.mk +++ a/filter/source/graphicfilter/epbm/makefile.mk @@ -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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=filter -TARGET=epbm -TARGET2=epb -DEPTARGET=vepbm - -# --- Settings ----------------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Allgemein ---------------------------------------------------------- - -.IF "$(editdebug)"!="" || "$(EDITDEBUG)"!="" -CDEFS+= -DEDITDEBUG -.ENDIF - -.IF "$(L10N_framework)"=="" -SLOFILES = $(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 --- a/filter/source/graphicfilter/epgm/epgm.cxx +++ a/filter/source/graphicfilter/epgm/epgm.cxx @@ -229,7 +229,8 @@ void PGMWriter::ImplWriteNumber( sal_Int // - 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; --- a/filter/source/graphicfilter/epgm/exports.map +++ a/filter/source/graphicfilter/epgm/exports.map @@ -1,7 +0,0 @@ -UDK_3_0_0 { - global: - GraphicExport; - - local: - *; -}; --- a/filter/source/graphicfilter/epgm/makefile.mk +++ a/filter/source/graphicfilter/epgm/makefile.mk @@ -1,70 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=filter -TARGET=epgm -TARGET2=epg -DEPTARGET=vepgm - - -# --- Settings ----------------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Allgemein ---------------------------------------------------------- - -.IF "$(editdebug)"!="" || "$(EDITDEBUG)"!="" -CDEFS+= -DEDITDEBUG -.ENDIF - -.IF "$(L10N_framework)"=="" -SLOFILES = $(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 --- a/filter/source/graphicfilter/epict/epict.cxx +++ a/filter/source/graphicfilter/epict/epict.cxx @@ -2304,7 +2304,8 @@ sal_Bool PictWriter::WritePict(const GDI //================== 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; --- a/filter/source/graphicfilter/epict/exports.map +++ a/filter/source/graphicfilter/epict/exports.map @@ -1,7 +0,0 @@ -UDK_3_0_0 { - global: - GraphicExport; - - local: - *; -}; --- a/filter/source/graphicfilter/epict/makefile.mk +++ a/filter/source/graphicfilter/epict/makefile.mk @@ -1,70 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=filter -TARGET=epict -TARGET2=ept -DEPTARGET=vepict - - -# --- Settings ----------------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Allgemein ---------------------------------------------------------- - -.IF "$(editdebug)"!="" || "$(EDITDEBUG)"!="" -CDEFS+= -DEDITDEBUG -.ENDIF - -.IF "$(L10N_framework)"=="" -SLOFILES = $(SLO)$/epict.obj -.ENDIF -# ========================================================================== - -.IF "$(L10N_framework)"=="" -SHL1TARGET= ept$(DLLPOSTFIX) -SHL1IMPLIB= epict -SHL1STDLIBS= $(TOOLSLIB) $(VCLLIB) $(SVTOOLLIB) $(CPPULIB) $(SALLIB) $(BASEGFXLIB) - -SHL1LIBS= $(SLB)$/epict.lib - -.IF "$(GUI)" != "UNX" -.IF "$(COM)" != "GCC" -SHL1OBJS= $(SLO)$/epict.obj -.ENDIF -.ENDIF - -SHL1VERSIONMAP=exports.map -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -DEF1NAME=$(SHL1TARGET) -.ENDIF -# ========================================================================== - -.INCLUDE : target.mk --- a/filter/source/graphicfilter/eppm/eppm.cxx +++ a/filter/source/graphicfilter/eppm/eppm.cxx @@ -237,7 +237,8 @@ void PPMWriter::ImplWriteNumber( sal_Int // - 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) { PPMWriter aPPMWriter; return aPPMWriter.WritePPM( rGraphic, rStream, pFilterConfigItem ); --- a/filter/source/graphicfilter/eppm/exports.map +++ a/filter/source/graphicfilter/eppm/exports.map @@ -1,7 +0,0 @@ -UDK_3_0_0 { - global: - GraphicExport; - - local: - *; -}; --- a/filter/source/graphicfilter/eppm/makefile.mk +++ a/filter/source/graphicfilter/eppm/makefile.mk @@ -1,70 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=filter -TARGET=eppm -TARGET2=epp -DEPTARGET=veppm - -# --- Settings ----------------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Allgemein ---------------------------------------------------------- - -.IF "$(editdebug)"!="" || "$(EDITDEBUG)"!="" -CDEFS+= -DEDITDEBUG -.ENDIF - -.IF "$(L10N_framework)"=="" -SLOFILES = $(SLO)$/eppm.obj -.ENDIF -# ========================================================================== - -.IF "$(L10N_framework)"=="" -SHL1TARGET= epp$(DLLPOSTFIX) -SHL1IMPLIB= eppm -SHL1STDLIBS= $(TOOLSLIB) $(VCLLIB) $(CPPULIB) $(SVTOOLLIB) $(SALLIB) - -SHL1LIBS= $(SLB)$/eppm.lib - -.IF "$(GUI)" != "UNX" -.IF "$(COM)" != "GCC" -SHL1OBJS= $(SLO)$/eppm.obj -.ENDIF -.ENDIF - -SHL1VERSIONMAP=exports.map -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -DEF1NAME=$(SHL1TARGET) -.ENDIF - -# ========================================================================== - -.INCLUDE : target.mk --- a/filter/source/graphicfilter/eps/eps.cxx +++ a/filter/source/graphicfilter/eps/eps.cxx @@ -2750,7 +2750,8 @@ sal_Bool PSWriter::ImplGetBoundingBox( d //================== 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) { PSWriter aPSWriter; return aPSWriter.WritePS( rGraphic, rStream, pFilterConfigItem ); --- a/filter/source/graphicfilter/eps/exports.map +++ a/filter/source/graphicfilter/eps/exports.map @@ -1,7 +0,0 @@ -UDK_3_0_0 { - global: - GraphicExport; - - local: - *; -}; --- a/filter/source/graphicfilter/eps/makefile.mk +++ a/filter/source/graphicfilter/eps/makefile.mk @@ -1,77 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=filter -TARGET=eps -DEPTARGET=veps - -#GEN_HID=TRUE - -# --- Settings ----------------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Allgemein ---------------------------------------------------------- - -.IF "$(editdebug)"!="" || "$(EDITDEBUG)"!="" -CDEFS+= -DEDITDEBUG -.ENDIF - -SRS1NAME=$(TARGET) -SRC1FILES = epsstr.src -.IF "$(L10N_framework)"=="" -EXCEPTIONSFILES=$(SLO)$/eps.obj -SLOFILES = $(SLO)$/eps.obj -.ENDIF - -# ========================================================================== - -RESLIB1NAME=$(TARGET) -RESLIB1SRSFILES=$(SRS)$/$(TARGET).srs -.IF "$(L10N_framework)"=="" -SHL1TARGET= eps$(DLLPOSTFIX) -SHL1IMPLIB= eps -SHL1STDLIBS= $(TOOLSLIB) $(VCLLIB) $(VCLLIB) $(SVTOOLLIB) $(CPPULIB) $(SALLIB) - -SHL1LIBS= $(SLB)$/eps.lib - -.IF "$(GUI)" != "UNX" -.IF "$(COM)" != "GCC" -SHL1OBJS= $(SLO)$/eps.obj -.ENDIF -.ENDIF - -SHL1VERSIONMAP=exports.map -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -DEF1NAME=$(SHL1TARGET) -.ENDIF - -# ========================================================================== - -.INCLUDE : target.mk --- a/filter/source/graphicfilter/eras/eras.cxx +++ a/filter/source/graphicfilter/eras/eras.cxx @@ -280,7 +280,8 @@ void RASWriter::ImplPutByte( sal_uInt8 n // - 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) { RASWriter aRASWriter; --- a/filter/source/graphicfilter/eras/exports.map +++ a/filter/source/graphicfilter/eras/exports.map @@ -1,7 +0,0 @@ -UDK_3_0_0 { - global: - GraphicExport; - - local: - *; -}; --- a/filter/source/graphicfilter/eras/makefile.mk +++ a/filter/source/graphicfilter/eras/makefile.mk @@ -1,67 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=filter -TARGET=eras -DEPTARGET=veras - -# --- Settings ----------------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Allgemein ---------------------------------------------------------- -.IF "$(L10N_framework)"=="" -.IF "$(editdebug)"!="" || "$(EDITDEBUG)"!="" -CDEFS+= -DEDITDEBUG -.ENDIF - -SLOFILES = $(SLO)$/eras.obj - -# ========================================================================== - -SHL1TARGET= era$(DLLPOSTFIX) -SHL1IMPLIB= eras -SHL1STDLIBS= $(VCLLIB) $(TOOLSLIB) $(SALLIB) $(SVTOOLLIB) -SHL1LIBS= $(SLB)$/eras.lib - -.IF "$(GUI)" != "UNX" -.IF "$(COM)" != "GCC" -SHL1OBJS= $(SLO)$/eras.obj -.ENDIF -.ENDIF - -SHL1VERSIONMAP=exports.map -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -DEF1NAME=$(SHL1TARGET) -.ENDIF - -# ========================================================================== - -.INCLUDE : target.mk - --- a/filter/source/graphicfilter/etiff/etiff.cxx +++ a/filter/source/graphicfilter/etiff/etiff.cxx @@ -611,7 +611,8 @@ void TIFFWriter::EndCompression() // - 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) { return TIFFWriter().WriteTIFF( rGraphic, rStream, pFilterConfigItem ); } --- a/filter/source/graphicfilter/etiff/exports.map +++ a/filter/source/graphicfilter/etiff/exports.map @@ -1,7 +0,0 @@ -UDK_3_0_0 { - global: - GraphicExport; - - local: - *; -}; --- a/filter/source/graphicfilter/etiff/makefile.mk +++ a/filter/source/graphicfilter/etiff/makefile.mk @@ -1,65 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=filter -TARGET=etiff -DEPTARGET=vetiff - -# --- Settings ----------------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Allgemein ---------------------------------------------------------- - -.IF "$(editdebug)"!="" || "$(EDITDEBUG)"!="" -CDEFS+= -DEDITDEBUG -.ENDIF -.IF "$(L10N_framework)"=="" -SLOFILES = $(SLO)$/etiff.obj - -# ========================================================================== - -SHL1TARGET= eti$(DLLPOSTFIX) -SHL1IMPLIB= etiff -SHL1STDLIBS= $(VCLLIB) $(TOOLSLIB) $(SALLIB) $(SVTOOLLIB) -SHL1LIBS= $(SLB)$/etiff.lib - -.IF "$(GUI)" != "UNX" -.IF "$(COM)" != "GCC" -SHL1OBJS= $(SLO)$/etiff.obj -.ENDIF -.ENDIF - -SHL1VERSIONMAP=exports.map -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -DEF1NAME=$(SHL1TARGET) -.ENDIF -# ========================================================================== - -.INCLUDE : target.mk --- a/filter/source/graphicfilter/expm/expm.cxx +++ a/filter/source/graphicfilter/expm/expm.cxx @@ -264,7 +264,8 @@ void XPMWriter::ImplWriteColor( sal_uInt // - 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) { XPMWriter aXPMWriter; --- a/filter/source/graphicfilter/expm/exports.map +++ a/filter/source/graphicfilter/expm/exports.map @@ -1,7 +0,0 @@ -UDK_3_0_0 { - global: - GraphicExport; - - local: - *; -}; --- a/filter/source/graphicfilter/expm/makefile.mk +++ a/filter/source/graphicfilter/expm/makefile.mk @@ -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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=filter -TARGET=expm -DEPTARGET=vexpm - - -# --- Settings ----------------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Allgemein ---------------------------------------------------------- - -.IF "$(editdebug)"!="" || "$(EDITDEBUG)"!="" -CDEFS+= -DEDITDEBUG -.ENDIF -.IF "$(L10N_framework)"=="" -SLOFILES = $(SLO)$/expm.obj - -# ========================================================================== - -SHL1TARGET= exp$(DLLPOSTFIX) -SHL1IMPLIB= expm -SHL1STDLIBS= $(VCLLIB) $(TOOLSLIB) $(SALLIB) $(SVTOOLLIB) -SHL1LIBS= $(SLB)$/expm.lib - -.IF "$(GUI)" != "UNX" -.IF "$(COM)" != "GCC" -SHL1OBJS= $(SLO)$/expm.obj -.ENDIF -.ENDIF - -SHL1VERSIONMAP=exports.map -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -DEF1NAME=$(SHL1TARGET) -.ENDIF -# ========================================================================== - -.INCLUDE : target.mk --- a/filter/source/graphicfilter/icgm/cgm.cxx +++ a/filter/source/graphicfilter/icgm/cgm.cxx @@ -847,7 +847,8 @@ SvStream& operator>>( SvStream& rOStm, C //================== GraphicImport - die exportierte Funktion ================ -extern "C" sal_uInt32 __LOADONCALLAPI ImportCGM( String& rFileName, uno::Reference< frame::XModel > & rXModel, sal_uInt32 nMode, void* pProgressBar ) +extern "C" SAL_DLLPUBLIC_EXPORT sal_uInt32 __LOADONCALLAPI +ImportCGM( String& rFileName, uno::Reference< frame::XModel > & rXModel, sal_uInt32 nMode, void* pProgressBar ) { sal_uInt32 nStatus = 0; // retvalue == 0 -> ERROR --- a/filter/source/graphicfilter/icgm/exports.map +++ a/filter/source/graphicfilter/icgm/exports.map @@ -1,7 +0,0 @@ -UDK_3_0_0 { - global: - ImportCGM; - - local: - *; -}; --- a/filter/source/graphicfilter/icgm/makefile.mk +++ a/filter/source/graphicfilter/icgm/makefile.mk @@ -1,80 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. -PRJNAME=filter -TARGET=icgm -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- -.IF "$(L10N_framework)"=="" -SLOFILES = $(SLO)$/cgm.obj \ - $(SLO)$/chart.obj \ - $(SLO)$/class0.obj \ - $(SLO)$/class1.obj \ - $(SLO)$/class2.obj \ - $(SLO)$/class3.obj \ - $(SLO)$/class4.obj \ - $(SLO)$/class5.obj \ - $(SLO)$/class7.obj \ - $(SLO)$/classx.obj \ - $(SLO)$/outact.obj \ - $(SLO)$/actimpr.obj \ - $(SLO)$/bundles.obj \ - $(SLO)$/bitmap.obj \ - $(SLO)$/elements.obj -# $(SLO)$/svdem.obj - -SHL1TARGET = icg$(DLLPOSTFIX) -SHL1IMPLIB = icgm -SHL1VERSIONMAP=exports.map -SHL1DEF = $(MISC)$/$(SHL1TARGET).def -SHL1LIBS = $(SLB)$/icgm.lib - -DEF1NAME=$(SHL1TARGET) - -.IF "$(GUI)"=="OS2" -SHL1OBJS = $(SLO)$/class0.obj -.ENDIF - -SHL1STDLIBS = \ - $(TKLIB) \ - $(VCLLIB) \ - $(UNOTOOLSLIB) \ - $(TOOLSLIB) \ - $(CPPULIB) \ - $(SALLIB) -.ENDIF - -# --- Targets -------------------------------------------------------------- - -.INCLUDE : target.mk - --- a/filter/source/graphicfilter/idxf/exports.map +++ a/filter/source/graphicfilter/idxf/exports.map @@ -1,7 +0,0 @@ -UDK_3_0_0 { - global: - GraphicImport; - - local: - *; -}; --- a/filter/source/graphicfilter/idxf/idxf.cxx +++ a/filter/source/graphicfilter/idxf/idxf.cxx @@ -37,7 +37,8 @@ //================== GraphicImport - die exportierte Funktion ================ -extern "C" sal_Bool __LOADONCALLAPI GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool ) +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI +GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) { DXFRepresentation aDXF; DXF2GDIMetaFile aConverter; --- a/filter/source/graphicfilter/idxf/makefile.mk +++ a/filter/source/graphicfilter/idxf/makefile.mk @@ -1,79 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=filter -TARGET=idxf -DEPTARGET=vidxf - -# --- Settings ----------------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Allgemein ---------------------------------------------------------- - -.IF "$(editdebug)"!="" || "$(EDITDEBUG)"!="" -CDEFS+= -DEDITDEBUG -.ENDIF -.IF "$(L10N_framework)"=="" -EXCEPTIONSFILES=\ - $(SLO)$/dxfentrd.obj \ - $(SLO)$/dxf2mtf.obj - -SLOFILES = $(SLO)$/dxfgrprd.obj \ - $(SLO)$/dxfvec.obj \ - $(SLO)$/dxfentrd.obj \ - $(SLO)$/dxfblkrd.obj \ - $(SLO)$/dxftblrd.obj \ - $(SLO)$/dxfreprd.obj \ - $(SLO)$/dxf2mtf.obj \ - $(SLO)$/idxf.obj - -# ========================================================================== - -SHL1TARGET= idx$(DLLPOSTFIX) -SHL1IMPLIB= idxf -SHL1STDLIBS= $(VCLLIB) $(TOOLSLIB) $(SALLIB) - -SHL1LIBS= $(SLB)$/idxf.lib # $(LB)$/rtftoken.lib - -.IF "$(GUI)" != "UNX" -.IF "$(COM)" != "GCC" -SHL1OBJS= $(SLO)$/idxf.obj -.ENDIF -.ENDIF - -SHL1VERSIONMAP=exports.map -SHL1DEF= $(MISC)$/$(SHL1TARGET).def - -DEF1NAME=$(SHL1TARGET) -.ENDIF - -# ========================================================================== - -.INCLUDE : target.mk --- a/filter/source/graphicfilter/ieps/exports.map +++ a/filter/source/graphicfilter/ieps/exports.map @@ -1,7 +0,0 @@ -UDK_3_0_0 { - global: - GraphicImport; - - local: - *; -}; --- a/filter/source/graphicfilter/ieps/ieps.cxx +++ a/filter/source/graphicfilter/ieps/ieps.cxx @@ -509,11 +509,8 @@ void MakePreview(sal_uInt8* pBuf, sal_uI //================== GraphicImport - die exportierte Funktion ================ -#ifdef WNT -extern "C" sal_Bool _cdecl GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) -#else -extern "C" sal_Bool GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) -#endif +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI +GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) { if ( rStream.GetError() ) return sal_False; --- a/filter/source/graphicfilter/ieps/makefile.mk +++ a/filter/source/graphicfilter/ieps/makefile.mk @@ -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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=filter -TARGET=ieps -DEPTARGET=vieps - -# --- Settings ----------------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Allgemein ---------------------------------------------------------- - -.IF "$(editdebug)"!="" || "$(EDITDEBUG)"!="" -CDEFS+= -DEDITDEBUG -.ENDIF -.IF "$(L10N_framework)"=="" -SLOFILES = $(SLO)$/ieps.obj - -# ========================================================================== - -SHL1TARGET= ips$(DLLPOSTFIX) -SHL1IMPLIB= ieps -SHL1STDLIBS= $(VCLLIB) $(TOOLSLIB) $(SALLIB) -SHL1LIBS= $(SLB)$/ieps.lib - -.IF "$(GUI)" != "UNX" -.IF "$(COM)" != "GCC" -SHL1OBJS= $(SLO)$/ieps.obj -.ENDIF -.ENDIF - -SHL1VERSIONMAP=exports.map -SHL1DEF= $(MISC)$/$(SHL1TARGET).def - -DEF1NAME=$(SHL1TARGET) -.ENDIF -# ========================================================================== - -.INCLUDE : target.mk --- a/filter/source/graphicfilter/ios2met/exports.map +++ a/filter/source/graphicfilter/ios2met/exports.map @@ -1,7 +0,0 @@ -UDK_3_0_0 { - global: - GraphicImport; - - local: - *; -}; --- a/filter/source/graphicfilter/ios2met/ios2met.cxx +++ a/filter/source/graphicfilter/ios2met/ios2met.cxx @@ -2738,7 +2738,8 @@ void OS2METReader::ReadOS2MET( SvStream //================== GraphicImport - die exportierte Funktion ================ -extern "C" sal_Bool __LOADONCALLAPI GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool ) +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI +GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) { OS2METReader aOS2METReader; GDIMetaFile aMTF; --- a/filter/source/graphicfilter/ios2met/makefile.mk +++ a/filter/source/graphicfilter/ios2met/makefile.mk @@ -1,68 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=filter -TARGET=ios2met -DEPTARGET=vios2met - -# --- Settings ----------------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Allgemein ---------------------------------------------------------- - -.IF "$(editdebug)"!="" || "$(EDITDEBUG)"!="" -CDEFS+= -DEDITDEBUG -.ENDIF -.IF "$(L10N_framework)"=="" -SLOFILES = $(SLO)$/ios2met.obj - -# ========================================================================== - -SHL1TARGET= ime$(DLLPOSTFIX) -SHL1IMPLIB= ios2met -SHL1STDLIBS= $(VCLLIB) $(TOOLSLIB) $(SALLIB) - -SHL1LIBS= $(SLB)$/ios2met.lib # $(LB)$/rtftoken.lib - -.IF "$(GUI)" != "UNX" -.IF "$(COM)" != "GCC" -SHL1OBJS= $(SLO)$/ios2met.obj -.ENDIF -.ENDIF - -SHL1VERSIONMAP=exports.map -SHL1DEF= $(MISC)$/$(SHL1TARGET).def - -DEF1NAME=$(SHL1TARGET) -.ENDIF -# ========================================================================== - -.INCLUDE : target.mk - --- a/filter/source/graphicfilter/ipbm/exports.map +++ a/filter/source/graphicfilter/ipbm/exports.map @@ -1,7 +0,0 @@ -UDK_3_0_0 { - global: - GraphicImport; - - local: - *; -}; --- a/filter/source/graphicfilter/ipbm/ipbm.cxx +++ a/filter/source/graphicfilter/ipbm/ipbm.cxx @@ -529,7 +529,8 @@ sal_Bool PBMReader::ImplReadBody() //================== GraphicImport - die exportierte Funktion ================ -extern "C" sal_Bool __LOADONCALLAPI GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool ) +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI +GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) { PBMReader aPBMReader; --- a/filter/source/graphicfilter/ipbm/makefile.mk +++ a/filter/source/graphicfilter/ipbm/makefile.mk @@ -1,68 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=filter -TARGET=ipbm -DEPTARGET=vipbm - -# --- Settings ----------------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Allgemein ---------------------------------------------------------- - -.IF "$(editdebug)"!="" || "$(EDITDEBUG)"!="" -CDEFS+= -DEDITDEBUG -.ENDIF -.IF "$(L10N_framework)"=="" -SLOFILES = $(SLO)$/ipbm.obj - -# ========================================================================== - -SHL1TARGET= ipb$(DLLPOSTFIX) -SHL1IMPLIB= ipbm -SHL1STDLIBS= $(VCLLIB) $(TOOLSLIB) $(SALLIB) -SHL1LIBS= $(SLB)$/ipbm.lib - -.IF "$(GUI)" != "UNX" -.IF "$(COM)" != "GCC" -SHL1OBJS= $(SLO)$/ipbm.obj -.ENDIF -.ENDIF - -SHL1VERSIONMAP=exports.map -SHL1DEF= $(MISC)$/$(SHL1TARGET).def - -DEF1NAME=$(SHL1TARGET) -.ENDIF - -# ========================================================================== - -.INCLUDE : target.mk - --- a/filter/source/graphicfilter/ipcd/exports.map +++ a/filter/source/graphicfilter/ipcd/exports.map @@ -1,7 +0,0 @@ -UDK_3_0_0 { - global: - GraphicImport; - - local: - *; -}; --- a/filter/source/graphicfilter/ipcd/ipcd.cxx +++ a/filter/source/graphicfilter/ipcd/ipcd.cxx @@ -386,7 +386,8 @@ void PCDReader::ReadImage(sal_uLong nMin //================== GraphicImport - die exportierte Funktion ================ -extern "C" sal_Bool __LOADONCALLAPI GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pConfigItem, sal_Bool ) +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI +GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pConfigItem, sal_Bool) { PCDReader aPCDReader; return aPCDReader.ReadPCD( rStream, rGraphic, pConfigItem ); --- a/filter/source/graphicfilter/ipcd/makefile.mk +++ a/filter/source/graphicfilter/ipcd/makefile.mk @@ -1,67 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=filter -TARGET=ipcd -DEPTARGET=vipcd - -# --- Settings ----------------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Allgemein ---------------------------------------------------------- - -.IF "$(editdebug)"!="" || "$(EDITDEBUG)"!="" -CDEFS+= -DEDITDEBUG -.ENDIF -.IF "$(L10N_framework)"=="" -SLOFILES = $(SLO)$/ipcd.obj - -# ========================================================================== - -SHL1TARGET= icd$(DLLPOSTFIX) -SHL1IMPLIB= ipcd -SHL1STDLIBS= $(SVTOOLLIB) $(VCLLIB) $(TOOLSLIB) $(SALLIB) -SHL1LIBS= $(SLB)$/ipcd.lib # $(LB)$/rtftoken.lib - -.IF "$(GUI)" != "UNX" -.IF "$(COM)" != "GCC" -SHL1OBJS= $(SLO)$/ipcd.obj -.ENDIF -.ENDIF - -SHL1VERSIONMAP=exports.map -SHL1DEF= $(MISC)$/$(SHL1TARGET).def - -DEF1NAME=$(SHL1TARGET) -.ENDIF - -# ========================================================================== - -.INCLUDE : target.mk --- a/filter/source/graphicfilter/ipcx/exports.map +++ a/filter/source/graphicfilter/ipcx/exports.map @@ -1,7 +0,0 @@ -UDK_3_0_0 { - global: - GraphicImport; - - local: - *; -}; --- a/filter/source/graphicfilter/ipcx/ipcx.cxx +++ a/filter/source/graphicfilter/ipcx/ipcx.cxx @@ -420,7 +420,8 @@ void PCXReader::ImplReadPalette( sal_uLo //================== GraphicImport - die exportierte Funktion ================ -extern "C" sal_Bool __LOADONCALLAPI GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool ) +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI +GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) { PCXReader aPCXReader; sal_Bool nRetValue = aPCXReader.ReadPCX( rStream, rGraphic ); --- a/filter/source/graphicfilter/ipcx/makefile.mk +++ a/filter/source/graphicfilter/ipcx/makefile.mk @@ -1,67 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=filter -TARGET=ipcx -DEPTARGET=vipcx - -# --- Settings ----------------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Allgemein ---------------------------------------------------------- - -.IF "$(editdebug)"!="" || "$(EDITDEBUG)"!="" -CDEFS+= -DEDITDEBUG -.ENDIF -.IF "$(L10N_framework)"=="" -SLOFILES = $(SLO)$/ipcx.obj - -# ========================================================================== - -SHL1TARGET= ipx$(DLLPOSTFIX) -SHL1IMPLIB= ipcx -SHL1STDLIBS= $(VCLLIB) $(TOOLSLIB) $(SALLIB) -SHL1LIBS= $(SLB)$/ipcx.lib - -.IF "$(GUI)" != "UNX" -.IF "$(COM)" != "GCC" -SHL1OBJS= $(SLO)$/ipcx.obj -.ENDIF -.ENDIF - -SHL1VERSIONMAP=exports.map -SHL1DEF= $(MISC)$/$(SHL1TARGET).def - -DEF1NAME=$(SHL1TARGET) -.ENDIF - -# ========================================================================== - -.INCLUDE : target.mk --- a/filter/source/graphicfilter/ipict/exports.map +++ a/filter/source/graphicfilter/ipict/exports.map @@ -1,7 +0,0 @@ -UDK_3_0_0 { - global: - GraphicImport; - - local: - *; -}; --- a/filter/source/graphicfilter/ipict/ipict.cxx +++ a/filter/source/graphicfilter/ipict/ipict.cxx @@ -1883,7 +1883,8 @@ void PictReader::ReadPict( SvStream & rS //================== GraphicImport - die exportierte Funktion ================ -extern "C" sal_Bool __LOADONCALLAPI GraphicImport( SvStream& rIStm, Graphic & rGraphic, FilterConfigItem*, sal_Bool ) +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI +GraphicImport( SvStream& rIStm, Graphic & rGraphic, FilterConfigItem*, sal_Bool) { GDIMetaFile aMTF; PictReader aPictReader; --- a/filter/source/graphicfilter/ipict/makefile.mk +++ a/filter/source/graphicfilter/ipict/makefile.mk @@ -1,68 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=filter -TARGET=ipict -DEPTARGET=vipict - -# --- Settings ----------------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Allgemein ---------------------------------------------------------- - -.IF "$(editdebug)"!="" || "$(EDITDEBUG)"!="" -CDEFS+= -DEDITDEBUG -.ENDIF -.IF "$(L10N_framework)"=="" -SLOFILES = $(SLO)$/ipict.obj $(SLO)$/shape.obj - -# ========================================================================== - -SHL1TARGET= ipt$(DLLPOSTFIX) -SHL1IMPLIB= ipict -SHL1STDLIBS= $(VCLLIB) $(TOOLSLIB) $(SALLIB) $(BASEGFXLIB) -SHL1LIBS= $(SLB)$/ipict.lib - -.IF "$(GUI)" != "UNX" -.IF "$(COM)" != "GCC" -SHL1OBJS= $(SLOFILES) -.ENDIF -.ENDIF - -SHL1VERSIONMAP=exports.map -SHL1DEF= $(MISC)$/$(SHL1TARGET).def - -DEF1NAME=$(SHL1TARGET) -.ENDIF - -# ========================================================================== - -.INCLUDE : target.mk - --- a/filter/source/graphicfilter/ipsd/exports.map +++ a/filter/source/graphicfilter/ipsd/exports.map @@ -1,7 +0,0 @@ -UDK_3_0_0 { - global: - GraphicImport; - - local: - *; -}; --- a/filter/source/graphicfilter/ipsd/ipsd.cxx +++ a/filter/source/graphicfilter/ipsd/ipsd.cxx @@ -728,7 +728,8 @@ sal_Bool PSDReader::ImplReadBody() //================== GraphicImport - die exportierte Funktion ================ -extern "C" sal_Bool __LOADONCALLAPI GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool ) +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI +GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) { PSDReader aPSDReader; --- a/filter/source/graphicfilter/ipsd/makefile.mk +++ a/filter/source/graphicfilter/ipsd/makefile.mk @@ -1,67 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=filter -TARGET=ipsd -DEPTARGET=vipsd - -# --- Settings ----------------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Allgemein ---------------------------------------------------------- - -.IF "$(editdebug)"!="" || "$(EDITDEBUG)"!="" -CDEFS+= -DEDITDEBUG -.ENDIF -.IF "$(L10N_framework)"=="" -SLOFILES = $(SLO)$/ipsd.obj - -# ========================================================================== - -SHL1TARGET= ipd$(DLLPOSTFIX) -SHL1IMPLIB= ipsd -SHL1STDLIBS= $(VCLLIB) $(TOOLSLIB) $(SALLIB) -SHL1LIBS= $(SLB)$/ipsd.lib - -.IF "$(GUI)" != "UNX" -.IF "$(COM)" != "GCC" -SHL1OBJS= $(SLO)$/ipsd.obj -.ENDIF -.ENDIF - -SHL1VERSIONMAP=exports.map -SHL1DEF= $(MISC)$/$(SHL1TARGET).def - -DEF1NAME=$(SHL1TARGET) -.ENDIF - -# ========================================================================== - -.INCLUDE : target.mk --- a/filter/source/graphicfilter/iras/exports.map +++ a/filter/source/graphicfilter/iras/exports.map @@ -1,7 +0,0 @@ -UDK_3_0_0 { - global: - GraphicImport; - - local: - *; -}; --- a/filter/source/graphicfilter/iras/iras.cxx +++ a/filter/source/graphicfilter/iras/iras.cxx @@ -347,7 +347,8 @@ sal_uInt8 RASReader::ImplGetByte() //================== GraphicImport - die exportierte Funktion ================ -extern "C" sal_Bool __LOADONCALLAPI GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool ) +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI +GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) { RASReader aRASReader; --- a/filter/source/graphicfilter/iras/makefile.mk +++ a/filter/source/graphicfilter/iras/makefile.mk @@ -1,67 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=filter -TARGET=iras -DEPTARGET=viras - -# --- Settings ----------------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Allgemein ---------------------------------------------------------- - -.IF "$(editdebug)"!="" || "$(EDITDEBUG)"!="" -CDEFS+= -DEDITDEBUG -.ENDIF -.IF "$(L10N_framework)"=="" -SLOFILES = $(SLO)$/iras.obj - -# ========================================================================== - -SHL1TARGET= ira$(DLLPOSTFIX) -SHL1IMPLIB= iras -SHL1STDLIBS= $(VCLLIB) $(TOOLSLIB) $(SALLIB) -SHL1LIBS= $(SLB)$/iras.lib - -.IF "$(GUI)" != "UNX" -.IF "$(COM)" != "GCC" -SHL1OBJS= $(SLO)$/iras.obj -.ENDIF -.ENDIF - -SHL1VERSIONMAP=exports.map -SHL1DEF= $(MISC)$/$(SHL1TARGET).def - -DEF1NAME=$(SHL1TARGET) -.ENDIF - -# ========================================================================== - -.INCLUDE : target.mk --- a/filter/source/graphicfilter/itga/exports.map +++ a/filter/source/graphicfilter/itga/exports.map @@ -1,7 +0,0 @@ -UDK_3_0_0 { - global: - GraphicImport; - - local: - *; -}; --- a/filter/source/graphicfilter/itga/itga.cxx +++ a/filter/source/graphicfilter/itga/itga.cxx @@ -752,7 +752,8 @@ sal_Bool TGAReader::ImplReadPalette() //================== GraphicImport - die exportierte Funktion ================ -extern "C" sal_Bool __LOADONCALLAPI GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool ) +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI +GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) { TGAReader aTGAReader; --- a/filter/source/graphicfilter/itga/makefile.mk +++ a/filter/source/graphicfilter/itga/makefile.mk @@ -1,67 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=filter -TARGET=itga -DEPTARGET=vitga - -# --- Settings ----------------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Allgemein ---------------------------------------------------------- - -.IF "$(editdebug)"!="" || "$(EDITDEBUG)"!="" -CDEFS+= -DEDITDEBUG -.ENDIF -.IF "$(L10N_framework)"=="" -SLOFILES = $(SLO)$/itga.obj - -# ========================================================================== - -SHL1TARGET= itg$(DLLPOSTFIX) -SHL1IMPLIB= itga -SHL1STDLIBS= $(VCLLIB) $(TOOLSLIB) $(SALLIB) -SHL1LIBS= $(SLB)$/itga.lib - -.IF "$(GUI)" != "UNX" -.IF "$(COM)" != "GCC" -SHL1OBJS= $(SLO)$/itga.obj -.ENDIF -.ENDIF - -SHL1VERSIONMAP=exports.map -SHL1DEF= $(MISC)$/$(SHL1TARGET).def - -DEF1NAME=$(SHL1TARGET) -.ENDIF - -# ========================================================================== - -.INCLUDE : target.mk --- a/filter/source/graphicfilter/itiff/exports.map +++ a/filter/source/graphicfilter/itiff/exports.map @@ -1,7 +0,0 @@ -UDK_3_0_0 { - global: - GraphicImport; - - local: - *; -}; --- a/filter/source/graphicfilter/itiff/itiff.cxx +++ a/filter/source/graphicfilter/itiff/itiff.cxx @@ -1322,7 +1322,8 @@ sal_Bool TIFFReader::ReadTIFF(SvStream & //================== GraphicImport - die exportierte Funktion ================ -extern "C" sal_Bool __LOADONCALLAPI GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool ) +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI +GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool) { TIFFReader aTIFFReader; --- a/filter/source/graphicfilter/itiff/makefile.mk +++ a/filter/source/graphicfilter/itiff/makefile.mk @@ -1,71 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=filter -TARGET=itiff -DEPTARGET=vitiff - -# --- Settings ----------------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Allgemein ---------------------------------------------------------- - -.IF "$(editdebug)"!="" || "$(EDITDEBUG)"!="" -CDEFS+= -DEDITDEBUG -.ENDIF -.IF "$(L10N_framework)"=="" -SLOFILES = $(SLO)$/itiff.obj \ - $(SLO)$/lzwdecom.obj \ - $(SLO)$/ccidecom.obj - -EXCEPTIONSNOOPTFILES= $(SLO)$/itiff.obj - -# ========================================================================== - -SHL1TARGET= iti$(DLLPOSTFIX) -SHL1IMPLIB= itiff -SHL1STDLIBS= $(VCLLIB) $(TOOLSLIB) $(SALLIB) -SHL1LIBS= $(SLB)$/itiff.lib # $(LB)$/rtftoken.lib - -.IF "$(GUI)" != "UNX" -.IF "$(COM)" != "GCC" -SHL1OBJS= $(SLO)$/itiff.obj -.ENDIF -.ENDIF - -SHL1VERSIONMAP=exports.map -SHL1DEF= $(MISC)$/$(SHL1TARGET).def - -DEF1NAME=$(SHL1TARGET) -.ENDIF - -# ========================================================================== - -.INCLUDE : target.mk --- a/filter/source/xsltdialog/exports.dxp +++ a/filter/source/xsltdialog/exports.dxp @@ -1,2 +0,0 @@ -component_getImplementationEnvironment -component_getFactory --- a/filter/source/xsltdialog/makefile.mk +++ a/filter/source/xsltdialog/makefile.mk @@ -1,102 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. -PRJNAME=filter -TARGET=xsltdlg - -ENABLE_EXCEPTIONS=TRUE -USE_DEFFILE=TRUE -#GEN_HID=TRUE -GEN_HID_OTHER=TRUE - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk - -# --- Files ------------------------------------- - -SRS1NAME=$(TARGET) -SRC1FILES = xmlfiltersettingsdialog.src \ - xmlfiltertabdialog.src \ - xmlfiltertabpagebasic.src \ - xmlfiltertabpagexslt.src \ - xmlfiltertestdialog.src \ - xmlfileview.src \ - xmlfilterdialogstrings.src - -SLOFILES= $(SLO)$/typedetectionimport.obj \ - $(SLO)$/typedetectionexport.obj \ - $(SLO)$/xmlfilterjar.obj \ - $(SLO)$/xmlfilterdialogcomponent.obj \ - $(SLO)$/xmlfiltersettingsdialog.obj \ - $(SLO)$/xmlfiltertabdialog.obj \ - $(SLO)$/xmlfiltertabpagebasic.obj \ - $(SLO)$/xmlfiltertabpagexslt.obj \ - $(SLO)$/xmlfiltertestdialog.obj \ - $(SLO)$/xmlfileview.obj - -# --- Library ----------------------------------- - -RESLIB1NAME=$(TARGET) -RESLIB1SRSFILES= $(SRS)$/$(TARGET).srs - -SHL1TARGET=$(TARGET)$(DLLPOSTFIX) - -SHL1STDLIBS=\ - $(SFX2LIB) \ - $(SVTOOLLIB) \ - $(SVLLIB) \ - $(TKLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(COMPHELPERLIB) \ - $(SALLIB) \ - $(TOOLSLIB) \ - $(VCLLIB) \ - $(UNOTOOLSLIB) \ - $(ONELIB) - -SHL1DEPN= -SHL1IMPLIB= i$(SHL1TARGET) -SHL1LIBS= $(SLB)$/$(TARGET).lib -SHL1DEF= $(MISC)$/$(SHL1TARGET).def - -DEF1NAME=$(SHL1TARGET) -DEF1EXPORTFILE=exports.dxp - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/xsltdlg.component - -$(MISC)/xsltdlg.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - xsltdlg.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt xsltdlg.component --- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx +++ a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx @@ -398,6 +398,7 @@ void SAL_CALL XMLFilterDialogComponent:: extern "C" { //================================================================================================== +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ ) { @@ -405,6 +406,7 @@ void SAL_CALL component_getImplementatio } //================================================================================================== +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ ) { --- a/filter/source/xsltfilter/XSLTFilter.cxx +++ a/filter/source/xsltfilter/XSLTFilter.cxx @@ -676,12 +676,14 @@ using namespace XSLT; extern "C" { +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ ) { --- a/filter/source/xsltfilter/makefile.mk +++ a/filter/source/xsltfilter/makefile.mk @@ -1,103 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ = ..$/.. -PRJNAME = filter -PACKAGE = com/sun/star/comp/xsltfilter -TARGET =XSLTFilter -ENABLE_EXCEPTIONS=TRUE -LIBTARGET=NO - -# --- Settings ----------------------------------------------------- -CLASSDIR!:=$(CLASSDIR)$/$(TARGET) -.INCLUDE: settings.mk - -SLOFILES=$(SLO)$/XSLTFilter.obj $(SLO)$/fla.obj -LIBNAME=xsltfilter -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) - -.IF "$(SOLAR_JAVA)"!="" - -#USE_UDK_EXTENDED_MANIFESTFILE=TRUE -#USE_EXTENDED_MANIFESTFILE=TRUE -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar - -JAVAFILES = $(subst,$(CLASSDIR)$/, $(subst,.class,.java $(JAVACLASSFILES))) -CUSTOMMANIFESTFILE = Manifest - -JARCOMPRESS = TRUE -JARCLASSDIRS = com/sun/star/comp/xsltfilter -JARTARGET = $(TARGET).jar - -.IF "$(SYSTEM_SAXON)" == "YES" -XCLASSPATH:=$(XCLASSPATH)$(PATH_SEPERATOR)$(SAXON_JAR) -.ELSE -JARFILES += saxon9.jar -.ENDIF - -# --- Files -------------------------------------------------------- -JAVACLASSFILES= \ - $(CLASSDIR)/com/sun/star/comp/xsltfilter/XSLTransformer.class \ - $(CLASSDIR)/com/sun/star/comp/xsltfilter/XSLTFilterOLEExtracter.class \ - $(CLASSDIR)/com/sun/star/comp/xsltfilter/Base64.class \ - -.ENDIF - -# --- Targets ------------------------------------------------------ -.INCLUDE : target.mk -.IF "$(SOLAR_JAVA)"!="" -$(JAVACLASSFILES) : $(CLASSDIR) - -$(CLASSDIR) : - $(MKDIR) $(CLASSDIR) -.ENDIF - -ALLTAR : $(MISC)/XSLTFilter.jar.component $(MISC)/xsltfilter.component - -$(MISC)/XSLTFilter.jar.component .ERRREMOVE : \ - $(SOLARENV)/bin/createcomponent.xslt XSLTFilter.jar.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_JAVA)$(JARTARGET)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt XSLTFilter.jar.component - -$(MISC)/xsltfilter.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - xsltfilter.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt xsltfilter.component --- a/postprocess/packcomponents/makefile.mk +++ a/postprocess/packcomponents/makefile.mk @@ -113,7 +113,7 @@ my_components = \ embobj \ evtatt \ fileacc \ - filterconfig1 \ + component/filter/source/config/cache/filterconfig1 \ component/filter/source/flash/flash \ flat \ for \ @@ -179,8 +179,8 @@ my_components = \ component/filter/source/xmlfilteradaptor/xmlfa \ component/filter/source/xmlfilterdetect/xmlfd \ xmx \ - xsltdlg \ - xsltfilter \ + component/filter/source/xsltdialog/xsltdlg \ + component/filter/source/xsltfilter/xsltfilter \ xstor .IF "$(OS)" == "MACOSX" --- a/scp2/source/ooo/file_library_ooo.scp +++ a/scp2/source/ooo/file_library_ooo.scp @@ -477,12 +477,7 @@ End SPECIAL_LIB_FILE(gid_File_Lib_Fileacc,fileacc) -File gid_File_Lib_Filterconfig1 - TXT_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; - Name = SPECIAL_NAME(filterconfig1); -End +STD_LIB_FILE(gid_File_Lib_Filterconfig1, filterconfig) STD_LIB_FILE( gid_File_Lib_Flat, flat)