ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

merged graphic import/export into a single library

Browse Source 
instead of egi, eme, epb, epg, epp, eps, ept, era, eti, exp,
icd, idx, ime, ipb, ipd, ips, ipt, ipx, ira, itg, iti,
there is now one graphic import export lib (gie)

Change-Id: I20c0dd94e5857bb6e2e8cc8ac175ff500c6bbdfc
Reviewed-on: https://gerrit.libreoffice.org/19756
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Oliver Specht <oliver.specht@cib.de>
This commit is contained in:
Oliver Specht
2015-11-06 11:42:36 +00:00
parent 938f670928
commit 7f533e6cda
70 changed files with 221 additions and 1082 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Repository.mk
+2 -22
View File
@@ -313,18 +313,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
$(if $(ENABLE_OPENGL_CANVAS),oglcanvas) \
drawinglayer \
editeng \
egi \
eme \
$(if $(filter WNT,$(OS)),$(if $(DISABLE_ATL),,emser)) \
epb \
epg \
epp \
eps \
ept \
era \
eti \
evtatt \
exp \
expwrap \
$(call gb_Helper_optional,DBCONNECTIVITY, \
flat \
@@ -346,19 +336,9 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
$(if $(filter DESKTOP,$(BUILD_TYPE)),helplinker) \
i18npool \
i18nsearch \
gie \
hyphen \
icd \
icg \
idx \
ime \
ipb \
ipd \
ips \
ipt \
ipx \
ira \
itg \
iti \
icg \
$(if $(ENABLE_JAVA),jdbc) \
ldapbe2 \
localebe1 \
filter/CppunitTest_filter_dxf_test.mk
+1 -1
View File
@@ -16,7 +16,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,filter_dxf_test, \
))
$(eval $(call gb_CppunitTest_use_libraries,filter_dxf_test, \
idx \
gie \
sal \
test \
tl \
filter/CppunitTest_filter_eps_test.mk
+1 -1
View File
@@ -16,7 +16,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,filter_eps_test, \
))
$(eval $(call gb_CppunitTest_use_libraries,filter_eps_test, \
ips \
gie \
sal \
test \
tl \
filter/CppunitTest_filter_met_test.mk
+1 -1
View File
@@ -16,7 +16,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,filter_met_test, \
))
$(eval $(call gb_CppunitTest_use_libraries,filter_met_test, \
ime \
gie \
sal \
test \
tl \
filter/CppunitTest_filter_pcd_test.mk
+1 -1
View File
@@ -16,7 +16,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,filter_pcd_test, \
))
$(eval $(call gb_CppunitTest_use_libraries,filter_pcd_test, \
icd \
gie \
sal \
test \
tl \
filter/CppunitTest_filter_pcx_test.mk
+1 -1
View File
@@ -16,7 +16,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,filter_pcx_test, \
))
$(eval $(call gb_CppunitTest_use_libraries,filter_pcx_test, \
ipx \
gie \
sal \
test \
tl \
filter/CppunitTest_filter_pict_test.mk
+6 -1
View File
@@ -18,17 +18,22 @@ $(eval $(call gb_CppunitTest_add_exception_objects,filter_pict_test, \
))
$(eval $(call gb_CppunitTest_use_libraries,filter_pict_test, \
gie \
cppu \
comphelper \
basegfx \
sal \
test \
tk \
tl \
utl \
unotest \
vcl \
$(gb_UWINAPI) \
))
$(eval $(call gb_CppunitTest_use_library_objects,filter_pict_test, \
ipt \
gie \
))
$(eval $(call gb_CppunitTest_use_api,filter_pict_test,\
filter/CppunitTest_filter_ppm_test.mk
+1 -1
View File
@@ -16,7 +16,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,filter_ppm_test, \
))
$(eval $(call gb_CppunitTest_use_libraries,filter_ppm_test, \
ipb \
gie \
sal \
test \
tl \
filter/CppunitTest_filter_psd_test.mk
+1 -1
View File
@@ -16,7 +16,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,filter_psd_test, \
))
$(eval $(call gb_CppunitTest_use_libraries,filter_psd_test, \
ipd \
gie \
sal \
test \
tl \
filter/CppunitTest_filter_ras_test.mk
+1 -1
View File
@@ -16,7 +16,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,filter_ras_test, \
))
$(eval $(call gb_CppunitTest_use_libraries,filter_ras_test, \
ira \
gie \
sal \
test \
tl \
filter/CppunitTest_filter_tga_test.mk
+1 -1
View File
@@ -16,7 +16,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,filter_tga_test, \
))
$(eval $(call gb_CppunitTest_use_libraries,filter_tga_test, \
itg \
gie \
sal \
test \
tl \
filter/CppunitTest_filter_tiff_test.mk
+1 -1
View File
@@ -16,7 +16,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,filter_tiff_test, \
))
$(eval $(call gb_CppunitTest_use_libraries,filter_tiff_test, \
iti \
gie \
sal \
test \
tl \
filter/Library_egi.mk
-40
View File
@@ -1,40 +0,0 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
# This file incorporates work covered by the following license notice:
#
# 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 .
#
$(eval $(call gb_Library_Library,egi))
$(eval $(call gb_Library_use_external,egi,boost_headers))
$(eval $(call gb_Library_use_sdk_api,egi))
$(eval $(call gb_Library_use_libraries,egi,\
svt \
vcl \
tl \
cppu \
sal \
$(gb_UWINAPI) \
))
$(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:
filter/Library_eme.mk
-39
View File
@@ -1,39 +0,0 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
# This file incorporates work covered by the following license notice:
#
# 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 .
#
$(eval $(call gb_Library_Library,eme))
$(eval $(call gb_Library_use_external,eme,boost_headers))
$(eval $(call gb_Library_use_sdk_api,eme))
$(eval $(call gb_Library_use_libraries,eme,\
svt \
vcl \
tl \
cppu \
sal \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_add_exception_objects,eme,\
filter/source/graphicfilter/eos2met/eos2met \
))
# vim: set noet sw=4 ts=4:
filter/Library_epb.mk
-39
View File
@@ -1,39 +0,0 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
# This file incorporates work covered by the following license notice:
#
# 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 .
#
$(eval $(call gb_Library_Library,epb))
$(eval $(call gb_Library_use_external,epb,boost_headers))
$(eval $(call gb_Library_use_sdk_api,epb))
$(eval $(call gb_Library_use_libraries,epb,\
svt \
vcl \
tl \
cppu \
sal \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_add_exception_objects,epb,\
filter/source/graphicfilter/epbm/epbm \
))
# vim: set noet sw=4 ts=4:
filter/Library_epg.mk
-39
View File
@@ -1,39 +0,0 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
# This file incorporates work covered by the following license notice:
#
# 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 .
#
$(eval $(call gb_Library_Library,epg))
$(eval $(call gb_Library_use_external,epg,boost_headers))
$(eval $(call gb_Library_use_sdk_api,epg))
$(eval $(call gb_Library_use_libraries,epg,\
svt \
vcl \
tl \
cppu \
sal \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_add_exception_objects,epg,\
filter/source/graphicfilter/epgm/epgm \
))
# vim: set noet sw=4 ts=4:
filter/Library_epp.mk
-39
View File
@@ -1,39 +0,0 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
# This file incorporates work covered by the following license notice:
#
# 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 .
#
$(eval $(call gb_Library_Library,epp))
$(eval $(call gb_Library_use_external,epp,boost_headers))
$(eval $(call gb_Library_use_sdk_api,epp))
$(eval $(call gb_Library_use_libraries,epp,\
svt \
vcl \
tl \
cppu \
sal \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_add_exception_objects,epp,\
filter/source/graphicfilter/eppm/eppm \
))
# vim: set noet sw=4 ts=4:
filter/Library_eps.mk
-41
View File
@@ -1,41 +0,0 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
# This file incorporates work covered by the following license notice:
#
# 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 .
#
$(eval $(call gb_Library_Library,eps))
$(eval $(call gb_Library_use_external,eps,boost_headers))
$(eval $(call gb_Library_use_sdk_api,eps))
$(eval $(call gb_Library_use_libraries,eps,\
svt \
vcl \
utl \
tl \
i18nlangtag \
cppu \
sal \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_add_exception_objects,eps,\
filter/source/graphicfilter/eps/eps \
))
# vim: set noet sw=4 ts=4:
filter/Library_ept.mk
-40
View File
@@ -1,40 +0,0 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
# This file incorporates work covered by the following license notice:
#
# 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 .
#
$(eval $(call gb_Library_Library,ept))
$(eval $(call gb_Library_use_external,ept,boost_headers))
$(eval $(call gb_Library_use_sdk_api,ept))
$(eval $(call gb_Library_use_libraries,ept,\
svt \
vcl \
tl \
basegfx \
cppu \
sal \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_add_exception_objects,ept,\
filter/source/graphicfilter/epict/epict \
))
# vim: set noet sw=4 ts=4:
filter/Library_era.mk
-39
View File
@@ -1,39 +0,0 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
# This file incorporates work covered by the following license notice:
#
# 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 .
#
$(eval $(call gb_Library_Library,era))
$(eval $(call gb_Library_use_external,era,boost_headers))
$(eval $(call gb_Library_use_sdk_api,era))
$(eval $(call gb_Library_use_libraries,era,\
svt \
vcl \
tl \
cppu \
sal \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_add_exception_objects,era,\
filter/source/graphicfilter/eras/eras \
))
# vim: set noet sw=4 ts=4:
filter/Library_eti.mk
-39
View File
@@ -1,39 +0,0 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
# This file incorporates work covered by the following license notice:
#
# 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 .
#
$(eval $(call gb_Library_Library,eti))
$(eval $(call gb_Library_use_external,eti,boost_headers))
$(eval $(call gb_Library_use_sdk_api,eti))
$(eval $(call gb_Library_use_libraries,eti,\
svt \
vcl \
tl \
cppu \
sal \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_add_exception_objects,eti,\
filter/source/graphicfilter/etiff/etiff \
))
# vim: set noet sw=4 ts=4:
filter/Library_exp.mk
-39
View File
@@ -1,39 +0,0 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
# This file incorporates work covered by the following license notice:
#
# 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 .
#
$(eval $(call gb_Library_Library,exp))
$(eval $(call gb_Library_use_external,exp,boost_headers))
$(eval $(call gb_Library_use_sdk_api,exp))
$(eval $(call gb_Library_use_libraries,exp,\
svt \
vcl \
tl \
cppu \
sal \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_add_exception_objects,exp,\
filter/source/graphicfilter/expm/expm \
))
# vim: set noet sw=4 ts=4:
filter/Library_gie.mk
+75
View File
@@ -0,0 +1,75 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
# This file incorporates work covered by the following license notice:
#
# 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 .
#
$(eval $(call gb_Library_Library,gie))
$(eval $(call gb_Library_use_external,gie,boost_headers))
$(eval $(call gb_Library_use_sdk_api,gie))
$(eval $(call gb_Library_use_libraries,gie,\
basegfx \
comphelper \
i18nlangtag \
svt \
vcl \
utl \
tl \
tk \
cppu \
sal \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_add_exception_objects,gie,\
filter/source/graphicfilter/egif/egif \
filter/source/graphicfilter/expm/expm \
filter/source/graphicfilter/etiff/etiff \
filter/source/graphicfilter/eos2met/eos2met \
filter/source/graphicfilter/epbm/epbm \
filter/source/graphicfilter/epgm/epgm \
filter/source/graphicfilter/eppm/eppm \
filter/source/graphicfilter/eps/eps \
filter/source/graphicfilter/egif/giflzwc \
filter/source/graphicfilter/epict/epict \
filter/source/graphicfilter/eras/eras \
filter/source/graphicfilter/itiff/ccidecom \
filter/source/graphicfilter/itiff/itiff \
filter/source/graphicfilter/itiff/lzwdecom \
filter/source/graphicfilter/ipict/ipict \
filter/source/graphicfilter/ipict/shape \
filter/source/graphicfilter/ipcx/ipcx \
filter/source/graphicfilter/iras/iras \
filter/source/graphicfilter/itga/itga \
filter/source/graphicfilter/ieps/ieps \
filter/source/graphicfilter/ipsd/ipsd \
filter/source/graphicfilter/ipbm/ipbm \
filter/source/graphicfilter/ios2met/ios2met \
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 \
filter/source/graphicfilter/ipcd/ipcd \
))
# vim: set noet sw=4 ts=4:
filter/Library_icd.mk
-38
View File
@@ -1,38 +0,0 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
# This file incorporates work covered by the following license notice:
#
# 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 .
#
$(eval $(call gb_Library_Library,icd))
$(eval $(call gb_Library_use_external,icd,boost_headers))
$(eval $(call gb_Library_use_sdk_api,icd))
$(eval $(call gb_Library_use_libraries,icd,\
svt \
vcl \
tl \
sal \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_add_exception_objects,icd,\
filter/source/graphicfilter/ipcd/ipcd \
))
# vim: set noet sw=4 ts=4:
filter/Library_idx.mk
-44
View File
@@ -1,44 +0,0 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
# This file incorporates work covered by the following license notice:
#
# 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 .
#
$(eval $(call gb_Library_Library,idx))
$(eval $(call gb_Library_use_external,idx,boost_headers))
$(eval $(call gb_Library_use_sdk_api,idx))
$(eval $(call gb_Library_use_libraries,idx,\
vcl \
tl \
sal \
$(gb_UWINAPI) \
))
$(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:
filter/Library_ime.mk
-37
View File
@@ -1,37 +0,0 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
# This file incorporates work covered by the following license notice:
#
# 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 .
#
$(eval $(call gb_Library_Library,ime))
$(eval $(call gb_Library_use_external,ime,boost_headers))
$(eval $(call gb_Library_use_sdk_api,ime))
$(eval $(call gb_Library_use_libraries,ime,\
vcl \
tl \
sal \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_add_exception_objects,ime,\
filter/source/graphicfilter/ios2met/ios2met \
))
# vim: set noet sw=4 ts=4:
filter/Library_ipb.mk
-37
View File
@@ -1,37 +0,0 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
# This file incorporates work covered by the following license notice:
#
# 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 .
#
$(eval $(call gb_Library_Library,ipb))
$(eval $(call gb_Library_use_external,ipb,boost_headers))
$(eval $(call gb_Library_use_sdk_api,ipb))
$(eval $(call gb_Library_use_libraries,ipb,\
vcl \
tl \
sal \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_add_exception_objects,ipb,\
filter/source/graphicfilter/ipbm/ipbm \
))
# vim: set noet sw=4 ts=4:
filter/Library_ipd.mk
-37
View File
@@ -1,37 +0,0 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
# This file incorporates work covered by the following license notice:
#
# 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 .
#
$(eval $(call gb_Library_Library,ipd))
$(eval $(call gb_Library_use_external,ipd,boost_headers))
$(eval $(call gb_Library_use_sdk_api,ipd))
$(eval $(call gb_Library_use_libraries,ipd,\
vcl \
tl \
sal \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_add_exception_objects,ipd,\
filter/source/graphicfilter/ipsd/ipsd \
))
# vim: set noet sw=4 ts=4:
filter/Library_ips.mk
-38
View File
@@ -1,38 +0,0 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
# This file incorporates work covered by the following license notice:
#
# 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 .
#
$(eval $(call gb_Library_Library,ips))
$(eval $(call gb_Library_use_external,ips,boost_headers))
$(eval $(call gb_Library_use_sdk_api,ips))
$(eval $(call gb_Library_use_libraries,ips,\
vcl \
tl \
sal \
utl \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_add_exception_objects,ips,\
filter/source/graphicfilter/ieps/ieps \
))
# vim: set noet sw=4 ts=4:
filter/Library_ipt.mk
-39
View File
@@ -1,39 +0,0 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
# This file incorporates work covered by the following license notice:
#
# 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 .
#
$(eval $(call gb_Library_Library,ipt))
$(eval $(call gb_Library_use_external,ipt,boost_headers))
$(eval $(call gb_Library_use_sdk_api,ipt))
$(eval $(call gb_Library_use_libraries,ipt,\
vcl \
tl \
basegfx \
sal \
$(gb_UWINAPI) \
))
$(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:
filter/Library_ipx.mk
-37
View File
@@ -1,37 +0,0 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
# This file incorporates work covered by the following license notice:
#
# 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 .
#
$(eval $(call gb_Library_Library,ipx))
$(eval $(call gb_Library_use_external,ipx,boost_headers))
$(eval $(call gb_Library_use_sdk_api,ipx))
$(eval $(call gb_Library_use_libraries,ipx,\
vcl \
tl \
sal \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_add_exception_objects,ipx,\
filter/source/graphicfilter/ipcx/ipcx \
))
# vim: set noet sw=4 ts=4:
filter/Library_ira.mk
-37
View File
@@ -1,37 +0,0 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
# This file incorporates work covered by the following license notice:
#
# 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 .
#
$(eval $(call gb_Library_Library,ira))
$(eval $(call gb_Library_use_external,ira,boost_headers))
$(eval $(call gb_Library_use_sdk_api,ira))
$(eval $(call gb_Library_use_libraries,ira,\
vcl \
tl \
sal \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_add_exception_objects,ira,\
filter/source/graphicfilter/iras/iras \
))
# vim: set noet sw=4 ts=4:
filter/Library_itg.mk
-37
View File
@@ -1,37 +0,0 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
# This file incorporates work covered by the following license notice:
#
# 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 .
#
$(eval $(call gb_Library_Library,itg))
$(eval $(call gb_Library_use_external,itg,boost_headers))
$(eval $(call gb_Library_use_sdk_api,itg))
$(eval $(call gb_Library_use_libraries,itg,\
vcl \
tl \
sal \
$(gb_UWINAPI) \
))
$(eval $(call gb_Library_add_exception_objects,itg,\
filter/source/graphicfilter/itga/itga \
))
# vim: set noet sw=4 ts=4:
filter/Library_iti.mk
-39
View File
@@ -1,39 +0,0 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
# This file incorporates work covered by the following license notice:
#
# 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 .
#
$(eval $(call gb_Library_Library,iti))
$(eval $(call gb_Library_use_external,iti,boost_headers))
$(eval $(call gb_Library_use_sdk_api,iti))
$(eval $(call gb_Library_use_libraries,iti,\
vcl \
tl \
sal \
$(gb_UWINAPI) \
))
$(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:
filter/Module_filter.mk
+2 -23
View File
@@ -21,31 +21,10 @@ $(eval $(call gb_Module_Module,filter))
$(eval $(call gb_Module_add_targets,filter,\
Configuration_filter \
CustomTarget_svg \
$(if $(filter EXPORT,$(BUILD_TYPE)), \
Library_egi \
Library_eme \
Library_epb \
Library_epg \
Library_epp \
Library_eps \
Library_ept \
Library_era \
Library_eti \
Library_exp) \
Library_gie \
Library_filterconfig \
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_icg \
Library_msfilter \
Library_odfflatxml \
Library_pdffilter \
filter/qa/cppunit/filters-dxf-test.cxx
+2 -2
View File
@@ -19,7 +19,7 @@
extern "C"
{
SAL_DLLPUBLIC_EXPORT bool SAL_CALL
GraphicImport(SvStream & rStream, Graphic & rGraphic,
idxGraphicImport(SvStream & rStream, Graphic & rGraphic,
FilterConfigItem*);
}
@@ -54,7 +54,7 @@ bool DxfFilterTest::load(const OUString &,
{
SvFileStream aFileStream(rURL, StreamMode::READ);
Graphic aGraphic;
return GraphicImport(aFileStream, aGraphic, NULL);
return idxGraphicImport(aFileStream, aGraphic, NULL);
}
void DxfFilterTest::testCVEs()
filter/qa/cppunit/filters-eps-test.cxx
+2 -2
View File
@@ -19,7 +19,7 @@
extern "C"
{
SAL_DLLPUBLIC_EXPORT bool SAL_CALL
GraphicImport(SvStream & rStream, Graphic & rGraphic,
ipsGraphicImport(SvStream & rStream, Graphic & rGraphic,
FilterConfigItem*);
}
@@ -54,7 +54,7 @@ bool EpsFilterTest::load(const OUString &,
{
SvFileStream aFileStream(rURL, StreamMode::READ);
Graphic aGraphic;
return GraphicImport(aFileStream, aGraphic, NULL);
return ipsGraphicImport(aFileStream, aGraphic, NULL);
}
void EpsFilterTest::testCVEs()
filter/qa/cppunit/filters-met-test.cxx
+2 -2
View File
@@ -19,7 +19,7 @@
extern "C"
{
SAL_DLLPUBLIC_EXPORT bool SAL_CALL
GraphicImport(SvStream & rStream, Graphic & rGraphic,
imeGraphicImport(SvStream & rStream, Graphic & rGraphic,
FilterConfigItem*);
}
@@ -54,7 +54,7 @@ bool MetFilterTest::load(const OUString &,
{
SvFileStream aFileStream(rURL, StreamMode::READ);
Graphic aGraphic;
return GraphicImport(aFileStream, aGraphic, NULL);
return imeGraphicImport(aFileStream, aGraphic, NULL);
}
void MetFilterTest::testCVEs()
filter/qa/cppunit/filters-pcd-test.cxx
+2 -2
View File
@@ -19,7 +19,7 @@
extern "C"
{
SAL_DLLPUBLIC_EXPORT bool SAL_CALL
GraphicImport(SvStream & rStream, Graphic & rGraphic,
icdGraphicImport(SvStream & rStream, Graphic & rGraphic,
FilterConfigItem*);
}
@@ -54,7 +54,7 @@ bool PcdFilterTest::load(const OUString &,
{
SvFileStream aFileStream(rURL, StreamMode::READ);
Graphic aGraphic;
return GraphicImport(aFileStream, aGraphic, NULL);
return icdGraphicImport(aFileStream, aGraphic, NULL);
}
void PcdFilterTest::testCVEs()
filter/qa/cppunit/filters-pcx-test.cxx
+2 -2
View File
@@ -19,7 +19,7 @@
extern "C"
{
SAL_DLLPUBLIC_EXPORT bool SAL_CALL
GraphicImport(SvStream & rStream, Graphic & rGraphic,
ipxGraphicImport(SvStream & rStream, Graphic & rGraphic,
FilterConfigItem*);
}
@@ -54,7 +54,7 @@ bool PcxFilterTest::load(const OUString &,
{
SvFileStream aFileStream(rURL, StreamMode::READ);
Graphic aGraphic;
return GraphicImport(aFileStream, aGraphic, NULL);
return ipxGraphicImport(aFileStream, aGraphic, NULL);
}
void PcxFilterTest::testCVEs()
filter/qa/cppunit/filters-pict-test.cxx
+2 -2
View File
@@ -24,7 +24,7 @@
extern "C"
{
SAL_DLLPUBLIC_EXPORT bool SAL_CALL
GraphicImport(SvStream & rStream, Graphic & rGraphic,
iptGraphicImport(SvStream & rStream, Graphic & rGraphic,
FilterConfigItem*);
}
@@ -68,7 +68,7 @@ bool PictFilterTest::load(const OUString &,
{
SvFileStream aFileStream(rURL, StreamMode::READ);
Graphic aGraphic;
return GraphicImport(aFileStream, aGraphic, NULL);
return iptGraphicImport(aFileStream, aGraphic, NULL);
}
void PictFilterTest::testCVEs()
filter/qa/cppunit/filters-ppm-test.cxx
+2 -2
View File
@@ -19,7 +19,7 @@
extern "C"
{
SAL_DLLPUBLIC_EXPORT bool SAL_CALL
GraphicImport(SvStream & rStream, Graphic & rGraphic,
ipbGraphicImport(SvStream & rStream, Graphic & rGraphic,
FilterConfigItem*);
}
@@ -54,7 +54,7 @@ bool PpmFilterTest::load(const OUString &,
{
SvFileStream aFileStream(rURL, StreamMode::READ);
Graphic aGraphic;
return GraphicImport(aFileStream, aGraphic, NULL);
return ipbGraphicImport(aFileStream, aGraphic, NULL);
}
void PpmFilterTest::testCVEs()
filter/qa/cppunit/filters-psd-test.cxx
+2 -2
View File
@@ -19,7 +19,7 @@
extern "C"
{
SAL_DLLPUBLIC_EXPORT bool SAL_CALL
GraphicImport(SvStream & rStream, Graphic & rGraphic,
ipdGraphicImport(SvStream & rStream, Graphic & rGraphic,
FilterConfigItem*);
}
@@ -54,7 +54,7 @@ bool PsdFilterTest::load(const OUString &,
{
SvFileStream aFileStream(rURL, StreamMode::READ);
Graphic aGraphic;
return GraphicImport(aFileStream, aGraphic, NULL);
return ipdGraphicImport(aFileStream, aGraphic, NULL);
}
void PsdFilterTest::testCVEs()
filter/qa/cppunit/filters-ras-test.cxx
+2 -2
View File
@@ -19,7 +19,7 @@
extern "C"
{
SAL_DLLPUBLIC_EXPORT bool SAL_CALL
GraphicImport(SvStream & rStream, Graphic & rGraphic,
iraGraphicImport(SvStream & rStream, Graphic & rGraphic,
FilterConfigItem*);
}
@@ -54,7 +54,7 @@ bool RasFilterTest::load(const OUString &,
{
SvFileStream aFileStream(rURL, StreamMode::READ);
Graphic aGraphic;
return GraphicImport(aFileStream, aGraphic, NULL);
return iraGraphicImport(aFileStream, aGraphic, NULL);
}
void RasFilterTest::testCVEs()
filter/qa/cppunit/filters-tga-test.cxx
+2 -2
View File
@@ -19,7 +19,7 @@
extern "C"
{
SAL_DLLPUBLIC_EXPORT bool SAL_CALL
GraphicImport(SvStream & rStream, Graphic & rGraphic,
itgGraphicImport(SvStream & rStream, Graphic & rGraphic,
FilterConfigItem*);
}
@@ -54,7 +54,7 @@ bool TgaFilterTest::load(const OUString &,
{
SvFileStream aFileStream(rURL, StreamMode::READ);
Graphic aGraphic;
return GraphicImport(aFileStream, aGraphic, NULL);
return itgGraphicImport(aFileStream, aGraphic, NULL);
}
void TgaFilterTest::testCVEs()
filter/qa/cppunit/filters-tiff-test.cxx
+2 -2
View File
@@ -19,7 +19,7 @@
extern "C"
{
SAL_DLLPUBLIC_EXPORT bool SAL_CALL
GraphicImport(SvStream & rStream, Graphic & rGraphic,
itiGraphicImport(SvStream & rStream, Graphic & rGraphic,
FilterConfigItem*);
}
@@ -54,7 +54,7 @@ bool TiffFilterTest::load(const OUString &,
{
SvFileStream aFileStream(rURL, StreamMode::READ);
Graphic aGraphic;
return GraphicImport(aFileStream, aGraphic, NULL);
return itiGraphicImport(aFileStream, aGraphic, NULL);
}
void TiffFilterTest::testCVEs()
filter/source/graphicfilter/egif/egif.cxx
+1 -9
View File
@@ -561,16 +561,8 @@ void GIFWriter::WriteTerminator()
}
// this needs to be kept in sync with
// ImpFilterLibCacheEntry::GetImportFunction() from
// vcl/source/filter/graphicfilter.cxx
#if defined(DISABLE_DYNLOADING)
#define GraphicExport egiGraphicExport
#endif
extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
GraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem )
egiGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem )
{
GIFWriter aWriter(rStream);
return aWriter.WriteGIF(rGraphic, pConfigItem);
filter/source/graphicfilter/eos2met/eos2met.cxx
+1 -7
View File
@@ -2563,15 +2563,9 @@ bool METWriter::WriteMET( const GDIMetaFile& rMTF, SvStream& rTargetStream, Filt
//================== GraphicExport - the exported Function ================
// this needs to be kept in sync with
// ImpFilterLibCacheEntry::GetImportFunction() from
// vcl/source/filter/graphicfilter.cxx
#if defined(DISABLE_DYNLOADING)
#define GraphicExport emeGraphicExport
#endif
extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
GraphicExport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pFilterConfigItem )
emeGraphicExport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pFilterConfigItem )
{
METWriter aMETWriter;
filter/source/graphicfilter/epbm/epbm.cxx
+1 -7
View File
@@ -190,15 +190,9 @@ void PBMWriter::ImplWriteNumber(sal_Int32 nNumber)
// - exported function -
// this needs to be kept in sync with
// ImpFilterLibCacheEntry::GetImportFunction() from
// vcl/source/filter/graphicfilter.cxx
#if defined(DISABLE_DYNLOADING)
#define GraphicExport epbGraphicExport
#endif
extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
GraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem )
epbGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem )
{
PBMWriter aPBMWriter(rStream);
filter/source/graphicfilter/epgm/epgm.cxx
+1 -8
View File
@@ -210,15 +210,8 @@ void PGMWriter::ImplWriteNumber(sal_Int32 nNumber)
// - exported function -
// this needs to be kept in sync with
// ImpFilterLibCacheEntry::GetImportFunction() from
// vcl/source/filter/graphicfilter.cxx
#if defined(DISABLE_DYNLOADING)
#define GraphicExport epgGraphicExport
#endif
extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
GraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem )
epgGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem )
{
PGMWriter aPGMWriter(rStream);
filter/source/graphicfilter/epict/epict.cxx
+1 -8
View File
@@ -2255,15 +2255,8 @@ bool PictWriter::WritePict(const GDIMetaFile & rMTF, SvStream & rTargetStream, F
// GraphicExport - the exported Function
// this needs to be kept in sync with
// ImpFilterLibCacheEntry::GetImportFunction() from
// vcl/source/filter/graphicfilter.cxx
#if defined(DISABLE_DYNLOADING)
#define GraphicExport eptGraphicExport
#endif
extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
GraphicExport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pFilterConfigItem )
eptGraphicExport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pFilterConfigItem )
{
PictWriter aPictWriter;
filter/source/graphicfilter/eppm/eppm.cxx
+1 -8
View File
@@ -221,15 +221,8 @@ void PPMWriter::ImplWriteNumber(sal_Int32 nNumber)
// - exported function -
// this needs to be kept in sync with
// ImpFilterLibCacheEntry::GetImportFunction() from
// vcl/source/filter/graphicfilter.cxx
#if defined(DISABLE_DYNLOADING)
#define GraphicExport eppGraphicExport
#endif
extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
GraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem )
eppGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem )
{
PPMWriter aPPMWriter(rStream);
return aPPMWriter.WritePPM( rGraphic, pFilterConfigItem );
filter/source/graphicfilter/eps/eps.cxx
+1 -8
View File
@@ -2847,15 +2847,8 @@ bool PSWriter::ImplGetBoundingBox( double* nNumb, sal_uInt8* pSource, sal_uLong
//================== GraphicExport - the exported function ===================
// this needs to be kept in sync with
// ImpFilterLibCacheEntry::GetImportFunction() from
// vcl/source/filter/graphicfilter.cxx
#if defined(DISABLE_DYNLOADING)
#define GraphicExport epsGraphicExport
#endif
extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
GraphicExport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pFilterConfigItem )
epsGraphicExport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pFilterConfigItem )
{
PSWriter aPSWriter;
return aPSWriter.WritePS( rGraphic, rStream, pFilterConfigItem );
filter/source/graphicfilter/eras/eras.cxx
+1 -8
View File
@@ -271,15 +271,8 @@ void RASWriter::ImplPutByte( sal_uInt8 nPutThis )
// - exported function -
// this needs to be kept in sync with
// ImpFilterLibCacheEntry::GetImportFunction() from
// vcl/source/filter/graphicfilter.cxx
#if defined(DISABLE_DYNLOADING)
#define GraphicExport eraGraphicExport
#endif
extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
GraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem )
eraGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem )
{
RASWriter aRASWriter(rStream);
filter/source/graphicfilter/etiff/etiff.cxx
+1 -8
View File
@@ -602,15 +602,8 @@ void TIFFWriter::EndCompression()
// this needs to be kept in sync with
// ImpFilterLibCacheEntry::GetImportFunction() from
// vcl/source/filter/graphicfilter.cxx
#if defined(DISABLE_DYNLOADING)
#define GraphicExport etiGraphicExport
#endif
extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
GraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem )
etiGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem )
{
TIFFWriter aWriter(rStream);
return aWriter.WriteTIFF( rGraphic, pFilterConfigItem );
filter/source/graphicfilter/expm/expm.cxx
+1 -9
View File
@@ -249,16 +249,8 @@ void XPMWriter::ImplWriteColor( sal_uInt16 nNumber )
}
// this needs to be kept in sync with
// ImpFilterLibCacheEntry::GetImportFunction() from
// vcl/source/filter/graphicfilter.cxx
#if defined(DISABLE_DYNLOADING)
#define GraphicExport expGraphicExport
#endif
extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
GraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem )
expGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem )
{
XPMWriter aXPMWriter(rStream);
filter/source/graphicfilter/idxf/idxf.cxx
+1 -8
View File
@@ -29,15 +29,8 @@ class FilterConfigItem;
//================== GraphicImport - die exportierte Funktion ================
// this needs to be kept in sync with
// ImpFilterLibCacheEntry::GetImportFunction() from
// vcl/source/filter/graphicfilter.cxx
#if defined(DISABLE_DYNLOADING)
#define GraphicImport idxGraphicImport
#endif
extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
GraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
idxGraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
{
DXFRepresentation aDXF;
DXF2GDIMetaFile aConverter;
filter/source/graphicfilter/ieps/ieps.cxx
+1 -7
View File
@@ -522,15 +522,9 @@ void MakePreview(sal_uInt8* pBuf, sal_uInt32 nBytesRead,
//================== GraphicImport - the exported function ================
// this needs to be kept in sync with
// ImpFilterLibCacheEntry::GetImportFunction() from
// vcl/source/filter/graphicfilter.cxx
#if defined(DISABLE_DYNLOADING)
#define GraphicImport ipsGraphicImport
#endif
extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
GraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
ipsGraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
{
if ( rStream.GetError() )
return false;
filter/source/graphicfilter/ios2met/ios2met.cxx
+1 -8
View File
@@ -2766,15 +2766,8 @@ void OS2METReader::ReadOS2MET( SvStream & rStreamOS2MET, GDIMetaFile & rGDIMetaF
//================== GraphicImport - the exported function ================
// this needs to be kept in sync with
// ImpFilterLibCacheEntry::GetImportFunction() from
// vcl/source/filter/graphicfilter.cxx
#if defined(DISABLE_DYNLOADING)
#define GraphicImport imeGraphicImport
#endif
extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
GraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
imeGraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
{
OS2METReader aOS2METReader;
GDIMetaFile aMTF;
filter/source/graphicfilter/ipbm/ipbm.cxx
+1 -8
View File
@@ -530,15 +530,8 @@ bool PBMReader::ImplReadBody()
//================== GraphicImport - the exported function ================
// this needs to be kept in sync with
// ImpFilterLibCacheEntry::GetImportFunction() from
// vcl/source/filter/graphicfilter.cxx
#if defined(DISABLE_DYNLOADING)
#define GraphicImport ipbGraphicImport
#endif
extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
GraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
ipbGraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
{
PBMReader aPBMReader(rStream);
filter/source/graphicfilter/ipcd/ipcd.cxx
+1 -8
View File
@@ -365,15 +365,8 @@ void PCDReader::ReadImage()
//================== GraphicImport - the exported Function ================
// this needs to be kept in sync with
// ImpFilterLibCacheEntry::GetImportFunction() from
// vcl/source/filter/graphicfilter.cxx
#if defined(DISABLE_DYNLOADING)
#define GraphicImport icdGraphicImport
#endif
extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
GraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pConfigItem )
icdGraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pConfigItem )
{
PCDReader aPCDReader(rStream);
return aPCDReader.ReadPCD(rGraphic, pConfigItem);
filter/source/graphicfilter/ipcx/ipcx.cxx
+1 -8
View File
@@ -401,15 +401,8 @@ void PCXReader::ImplReadPalette( sal_uLong nCol )
//================== GraphicImport - the exported function ================
// this needs to be kept in sync with
// ImpFilterLibCacheEntry::GetImportFunction() from
// vcl/source/filter/graphicfilter.cxx
#if defined(DISABLE_DYNLOADING)
#define GraphicImport ipxGraphicImport
#endif
extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
GraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
ipxGraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
{
PCXReader aPCXReader(rStream);
bool bRetValue = aPCXReader.ReadPCX(rGraphic);
filter/source/graphicfilter/ipict/ipict.cxx
+1 -8
View File
@@ -1965,15 +1965,8 @@ void ReadPictFile(SvStream &rStreamPict, GDIMetaFile& rGDIMetaFile)
//================== GraphicImport - the exported function ================
// this needs to be kept in sync with
// ImpFilterLibCacheEntry::GetImportFunction() from
// vcl/source/filter/graphicfilter.cxx
#if defined(DISABLE_DYNLOADING)
#define GraphicImport iptGraphicImport
#endif
extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
GraphicImport( SvStream& rIStm, Graphic & rGraphic, FilterConfigItem* )
iptGraphicImport( SvStream& rIStm, Graphic & rGraphic, FilterConfigItem* )
{
GDIMetaFile aMTF;
bool bRet = false;
filter/source/graphicfilter/ipsd/ipsd.cxx
+1 -8
View File
@@ -745,15 +745,8 @@ bool PSDReader::ImplReadBody()
//================== GraphicImport - the exported function ================
// this needs to be kept in sync with
// ImpFilterLibCacheEntry::GetImportFunction() from
// vcl/source/filter/graphicfilter.cxx
#if defined(DISABLE_DYNLOADING)
#define GraphicImport ipdGraphicImport
#endif
extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
GraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
ipdGraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
{
PSDReader aPSDReader(rStream);
filter/source/graphicfilter/iras/iras.cxx
+1 -8
View File
@@ -364,15 +364,8 @@ sal_uInt8 RASReader::ImplGetByte()
//================== GraphicImport - die exportierte Funktion ================
// this needs to be kept in sync with
// ImpFilterLibCacheEntry::GetImportFunction() from
// vcl/source/filter/graphicfilter.cxx
#if defined(DISABLE_DYNLOADING)
#define GraphicImport iraGraphicImport
#endif
extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
GraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
iraGraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
{
RASReader aRASReader(rStream);
filter/source/graphicfilter/itga/itga.cxx
+1 -8
View File
@@ -786,15 +786,8 @@ bool TGAReader::ImplReadPalette()
//================== GraphicImport - die exportierte Funktion ================
// this needs to be kept in sync with
// ImpFilterLibCacheEntry::GetImportFunction() from
// vcl/source/filter/graphicfilter.cxx
#if defined(DISABLE_DYNLOADING)
#define GraphicImport itgGraphicImport
#endif
extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
GraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
itgGraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
{
TGAReader aTGAReader(rStream);
filter/source/graphicfilter/itiff/itiff.cxx
+1 -8
View File
@@ -1462,15 +1462,8 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic )
//================== GraphicImport - the exported function ================
// this needs to be kept in sync with
// ImpFilterLibCacheEntry::GetImportFunction() from
// vcl/source/filter/graphicfilter.cxx
#if defined(DISABLE_DYNLOADING)
#define GraphicImport itiGraphicImport
#endif
extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
GraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
itiGraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
{
TIFFReader aTIFFReader;
vcl/source/filter/FilterConfigCache.cxx
+19 -4
View File
@@ -87,8 +87,8 @@ bool FilterConfigCache::FilterConfigCacheEntry::CreateFilterName( const OUString
if ( sFilterName.equalsIgnoreAsciiCase( OUString(*pPtr, strlen(*pPtr), RTL_TEXTENCODING_ASCII_US) ) )
bIsPixelFormat = true;
}
OUString sTemp(SVLIBRARY("?"));
sFilterName = sTemp.replaceFirst("?", sFilterName);
sExternalFilterName = sFilterName;
sFilterName = SVLIBRARY("gie");
}
return ! sFilterName.isEmpty();
}
@@ -410,7 +410,22 @@ OUString FilterConfigCache::GetImportFilterTypeName( sal_uInt16 nFormat )
return OUString("");
}
OUString FilterConfigCache::GetImportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry )
OUString FilterConfigCache::GetExternalFilterName(sal_uInt16 nFormat, bool bExport)
{
if (bExport)
{
if (nFormat < aExport.size())
return aExport[nFormat].sExternalFilterName;
}
else
{
if (nFormat < aImport.size())
return aImport[nFormat].sExternalFilterName;
}
return OUString("");
}
OUString FilterConfigCache::GetImportWildcard(sal_uInt16 nFormat, sal_Int32 nEntry)
{
OUString aWildcard( GetImportFormatExtension( nFormat, nEntry ) );
if ( !aWildcard.isEmpty() )
@@ -430,7 +445,7 @@ OUString FilterConfigCache::GetExportFilterName( sal_uInt16 nFormat )
return OUString("");
}
sal_uInt16 FilterConfigCache::GetExportFormatNumber( const OUString& rFormatName )
sal_uInt16 FilterConfigCache::GetExportFormatNumber(const OUString& rFormatName)
{
CacheVector::const_iterator aIter, aEnd;
for (aIter = aExport.begin(), aEnd = aExport.end(); aIter != aEnd; ++aIter)
vcl/source/filter/FilterConfigCache.hxx
+3
View File
@@ -39,6 +39,7 @@ class FilterConfigCache
OUString sDocumentService;
OUString sFilterService;
OUString sTemplateName;
OUString sExternalFilterName;
OUString sMediaType;
OUString sFilterType;
@@ -96,6 +97,8 @@ public:
OUString GetImportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry );
OUString GetImportFilterType( sal_uInt16 nFormat );
OUString GetImportFilterTypeName( sal_uInt16 nFormat );
OUString GetExternalFilterName(sal_uInt16 nFormat, bool bExport);
bool IsImportInternalFilter( sal_uInt16 nFormat );
vcl/source/filter/graphicfilter.cxx
+61 -19
View File
@@ -71,11 +71,6 @@
#define PMGCHUNG_msOG 0x6d734f47 // Microsoft Office Animated GIF
#ifndef DISABLE_DYNLOADING
#define IMPORT_FUNCTION_NAME "GraphicImport"
#define EXPORT_FUNCTION_NAME "GraphicExport"
#endif
using namespace ::com::sun::star;
using comphelper::string::getTokenCount;
@@ -941,20 +936,22 @@ struct ImpFilterLibCacheEntry
osl::Module maLibrary;
#endif
OUString maFiltername;
OUString maFormatName;
PFilterCall mpfnImport;
ImpFilterLibCacheEntry( const OUString& rPathname, const OUString& rFiltername );
ImpFilterLibCacheEntry(const OUString& rPathname, const OUString& rFiltername, const OUString& rFormatName);
bool operator==( const OUString& rFiltername ) const { return maFiltername == rFiltername; }
PFilterCall GetImportFunction();
};
ImpFilterLibCacheEntry::ImpFilterLibCacheEntry( const OUString& rPathname, const OUString& rFiltername ) :
ImpFilterLibCacheEntry::ImpFilterLibCacheEntry( const OUString& rPathname, const OUString& rFiltername, const OUString& rFormatName ) :
mpNext ( NULL ),
#ifndef DISABLE_DYNLOADING
maLibrary ( rPathname ),
#endif
maFiltername ( rFiltername ),
maFormatName ( rFormatName ),
mpfnImport ( NULL )
{
#ifdef DISABLE_DYNLOADING
@@ -983,8 +980,29 @@ PFilterCall ImpFilterLibCacheEntry::GetImportFunction()
if( !mpfnImport )
{
#ifndef DISABLE_DYNLOADING
mpfnImport = reinterpret_cast<PFilterCall>(maLibrary.getFunctionSymbol(IMPORT_FUNCTION_NAME));
#else
if (maFormatName.equalsAscii("icd"))
mpfnImport = reinterpret_cast<PFilterCall>(maLibrary.getFunctionSymbol("icdGraphicImport"));
else if (maFormatName.equalsAscii("idx"))
mpfnImport = reinterpret_cast<PFilterCall>(maLibrary.getFunctionSymbol("idxGraphicImport"));
else if (maFormatName.equalsAscii("ime"))
mpfnImport = reinterpret_cast<PFilterCall>(maLibrary.getFunctionSymbol("imeGraphicImport"));
else if (maFormatName.equalsAscii("ipb"))
mpfnImport = reinterpret_cast<PFilterCall>(maLibrary.getFunctionSymbol("ipbGraphicImport"));
else if (maFormatName.equalsAscii("ipd"))
mpfnImport = reinterpret_cast<PFilterCall>(maLibrary.getFunctionSymbol("ipdGraphicImport"));
else if (maFormatName.equalsAscii("ips"))
mpfnImport = reinterpret_cast<PFilterCall>(maLibrary.getFunctionSymbol("ipsGraphicImport"));
else if (maFormatName.equalsAscii("ipt"))
mpfnImport = reinterpret_cast<PFilterCall>(maLibrary.getFunctionSymbol("iptGraphicImport"));
else if (maFormatName.equalsAscii("ipx"))
mpfnImport = reinterpret_cast<PFilterCall>(maLibrary.getFunctionSymbol("ipxGraphicImport"));
else if (maFormatName.equalsAscii("ira"))
mpfnImport = reinterpret_cast<PFilterCall>(maLibrary.getFunctionSymbol("iraGraphicImport"));
else if (maFormatName.equalsAscii("itg"))
mpfnImport = reinterpret_cast<PFilterCall>(maLibrary.getFunctionSymbol("itgGraphicImport"));
else if (maFormatName.equalsAscii("iti"))
mpfnImport = reinterpret_cast<PFilterCall>(maLibrary.getFunctionSymbol("itiGraphicImport"));
#else
if( maFiltername.equalsAscii( "icd" ) )
mpfnImport = icdGraphicImport;
else if( maFiltername.equalsAscii( "idx" ) )
@@ -1007,7 +1025,7 @@ PFilterCall ImpFilterLibCacheEntry::GetImportFunction()
mpfnImport = itgGraphicImport;
else if( maFiltername.equalsAscii( "iti" ) )
mpfnImport = itiGraphicImport;
#endif
#endif
}
return mpfnImport;
@@ -1022,7 +1040,7 @@ public:
ImpFilterLibCache();
~ImpFilterLibCache();
ImpFilterLibCacheEntry* GetFilter( const OUString& rFilterPath, const OUString& rFiltername );
ImpFilterLibCacheEntry* GetFilter( const OUString& rFilterPath, const OUString& rFiltername, const OUString& rFormatName );
};
ImpFilterLibCache::ImpFilterLibCache() :
@@ -1042,13 +1060,13 @@ ImpFilterLibCache::~ImpFilterLibCache()
}
}
ImpFilterLibCacheEntry* ImpFilterLibCache::GetFilter( const OUString& rFilterPath, const OUString& rFilterName )
ImpFilterLibCacheEntry* ImpFilterLibCache::GetFilter(const OUString& rFilterPath, const OUString& rFilterName, const OUString& rFormatName)
{
ImpFilterLibCacheEntry* pEntry = mpFirst;
while( pEntry )
{
if( *pEntry == rFilterName )
if( *pEntry == rFilterName && pEntry->maFormatName == rFormatName )
break;
else
pEntry = pEntry->mpNext;
@@ -1056,7 +1074,7 @@ ImpFilterLibCacheEntry* ImpFilterLibCache::GetFilter( const OUString& rFilterPat
if( !pEntry )
{
OUString aPhysicalName( ImpCreateFullFilterPath( rFilterPath, rFilterName ) );
pEntry = new ImpFilterLibCacheEntry( aPhysicalName, rFilterName );
pEntry = new ImpFilterLibCacheEntry(aPhysicalName, rFilterName, rFormatName );
#ifndef DISABLE_DYNLOADING
if ( pEntry->maLibrary.is() )
#endif
@@ -1305,6 +1323,7 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPat
WMF_EXTERNALHEADER *pExtHeader )
{
OUString aFilterName;
OUString aExternalFilterName;
sal_uLong nStreamBegin;
sal_uInt16 nStatus;
GraphicReader* pContext = rGraphic.GetContext();
@@ -1385,6 +1404,7 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPat
*pDeterminedFormat = nFormat;
aFilterName = pConfig->GetImportFilterName( nFormat );
aExternalFilterName = pConfig->GetExternalFilterName(nFormat, false);
}
else
{
@@ -1679,7 +1699,7 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPat
sal_Int32 i, nTokenCount = getTokenCount(aFilterPath, ';');
ImpFilterLibCache &rCache = Cache::get();
for( i = 0; ( i < nTokenCount ) && ( pFilter == NULL ); i++ )
pFilter = rCache.GetFilter( aFilterPath.getToken(i, ';'), aFilterName );
pFilter = rCache.GetFilter(aFilterPath.getToken(i, ';'), aFilterName, aExternalFilterName);
if( !pFilter )
nStatus = GRFILTER_FILTERERROR;
else
@@ -1855,6 +1875,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString
FilterConfigItem aConfigItem( const_cast<uno::Sequence< beans::PropertyValue >*>(pFilterData) );
OUString aFilterName( pConfig->GetExportFilterName( nFormat ) );
OUString aExternalFilterName(pConfig->GetExternalFilterName(nFormat, true));
bAbort = false;
sal_uInt16 nStatus = GRFILTER_OK;
@@ -2096,9 +2117,30 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString
OUString aPhysicalName( ImpCreateFullFilterPath( aFilterPath.getToken(i, ';'), aFilterName ) );
osl::Module aLibrary( aPhysicalName );
PFilterCall pFunc = reinterpret_cast<PFilterCall>(aLibrary.getFunctionSymbol(EXPORT_FUNCTION_NAME));
// Execute dialog in DLL
#else
PFilterCall pFunc = NULL;
OUString tmpFilterName = aExternalFilterName;
if (tmpFilterName.equalsAscii("egi"))
pFunc = reinterpret_cast<PFilterCall>(aLibrary.getFunctionSymbol("egiGraphicExport"));
else if (tmpFilterName.equalsAscii("eme"))
pFunc = reinterpret_cast<PFilterCall>(aLibrary.getFunctionSymbol("emeGraphicExport"));
else if (tmpFilterName.equalsAscii("epb"))
pFunc = reinterpret_cast<PFilterCall>(aLibrary.getFunctionSymbol("epbGraphicExport"));
else if (tmpFilterName.equalsAscii("epg"))
pFunc = reinterpret_cast<PFilterCall>(aLibrary.getFunctionSymbol("epgGraphicExport"));
else if (tmpFilterName.equalsAscii("epp"))
pFunc = reinterpret_cast<PFilterCall>(aLibrary.getFunctionSymbol("eppGraphicExport"));
else if (tmpFilterName.equalsAscii("eps"))
pFunc = reinterpret_cast<PFilterCall>(aLibrary.getFunctionSymbol("epsGraphicExport"));
else if (tmpFilterName.equalsAscii("ept"))
pFunc = reinterpret_cast<PFilterCall>(aLibrary.getFunctionSymbol("eptGraphicExport"));
else if (tmpFilterName.equalsAscii("era"))
pFunc = reinterpret_cast<PFilterCall>(aLibrary.getFunctionSymbol("eraGraphicExport"));
else if (tmpFilterName.equalsAscii("eti"))
pFunc = reinterpret_cast<PFilterCall>(aLibrary.getFunctionSymbol("etiGraphicExport"));
else if (tmpFilterName.equalsAscii("exp"))
pFunc = reinterpret_cast<PFilterCall>(aLibrary.getFunctionSymbol("expGraphicExport"));
// Execute dialog in DLL
#else
PFilterCall pFunc = NULL;
if( aFilterName.equalsAscii( "egi" ) )
pFunc = egiGraphicExport;
@@ -2120,7 +2162,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString
pFunc = etiGraphicExport;
else if( aFilterName.equalsAscii( "exp" ) )
pFunc = expGraphicExport;
#endif
#endif
if( pFunc )
{
if ( !(*pFunc)( rOStm, aGraphic, &aConfigItem ) )