summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2013-01-02 22:07:41 +0100
committerJan Holesovsky <kendy@suse.cz>2013-01-04 22:02:51 +0100
commit0c22f3eadd3ffb461eada94f4b019fbb2161f197 (patch)
tree81091634b534d4b017a6a1a153df942046da7447
parent255c03d6ad4ed13c456ee621e0af765684a475d2 (diff)
Make LO buildable again after the GraphicFilter move.
Change-Id: I3455a7294b136400f32163626d5a7a7f2bfa898c
-rw-r--r--cppcanvas/source/mtfrenderer/emfplus.cxx2
-rw-r--r--cui/source/dialogs/SpellDialog.cxx2
-rw-r--r--cui/source/dialogs/about.cxx2
-rw-r--r--cui/source/dialogs/cuigaldlg.cxx2
-rw-r--r--cui/source/dialogs/thesdlg.cxx2
-rw-r--r--desktop/source/app/app.cxx2
-rw-r--r--editeng/source/editeng/editview.cxx2
-rw-r--r--editeng/source/items/frmitems.cxx2
-rw-r--r--filter/qa/cppunit/filters-pict-test.cxx2
-rw-r--r--filter/qa/cppunit/filters-tga-test.cxx2
-rw-r--r--filter/qa/cppunit/filters-tiff-test.cxx2
-rw-r--r--filter/source/flash/impswfdialog.hxx2
-rw-r--r--filter/source/flash/swfexporter.cxx4
-rw-r--r--filter/source/flash/swfwriter1.cxx2
-rw-r--r--filter/source/graphicfilter/egif/egif.cxx2
-rw-r--r--filter/source/graphicfilter/epbm/epbm.cxx2
-rw-r--r--filter/source/graphicfilter/epgm/epgm.cxx2
-rw-r--r--filter/source/graphicfilter/epict/epict.cxx2
-rw-r--r--filter/source/graphicfilter/eppm/eppm.cxx2
-rw-r--r--filter/source/graphicfilter/eps/eps.cxx2
-rw-r--r--filter/source/graphicfilter/eras/eras.cxx2
-rw-r--r--filter/source/graphicfilter/etiff/etiff.cxx2
-rw-r--r--filter/source/graphicfilter/ipcd/ipcd.cxx2
-rw-r--r--filter/source/msfilter/escherex.cxx2
-rw-r--r--filter/source/msfilter/msdffimp.cxx3
-rw-r--r--filter/source/pdf/impdialog.hxx2
-rw-r--r--filter/source/pdf/pdfexport.cxx4
-rw-r--r--filter/source/pdf/pdffilter.cxx2
-rw-r--r--filter/source/svg/impsvgdialog.hxx2
-rw-r--r--filter/source/svg/svgreader.cxx2
-rw-r--r--forms/source/component/imgprod.cxx2
-rw-r--r--framework/source/fwe/classes/addonsoptions.cxx2
-rw-r--r--framework/source/uielement/buttontoolbarcontroller.cxx2
-rw-r--r--framework/source/uielement/imagebuttontoolbarcontroller.cxx2
-rw-r--r--framework/source/uielement/togglebuttontoolbarcontroller.cxx2
-rw-r--r--oox/source/helper/graphichelper.cxx2
-rw-r--r--sc/source/filter/excel/excimp8.cxx2
-rw-r--r--sc/source/filter/excel/xiescher.cxx2
-rw-r--r--sc/source/filter/html/htmlpars.cxx2
-rw-r--r--sc/source/ui/drawfunc/fuins1.cxx2
-rw-r--r--sc/source/ui/view/viewfun4.cxx2
-rw-r--r--sd/source/filter/eppt/eppt.cxx2
-rw-r--r--sd/source/filter/eppt/pptx-epptbase.cxx2
-rw-r--r--sd/source/filter/grf/sdgrffilter.cxx2
-rw-r--r--sd/source/filter/html/htmlex.cxx4
-rw-r--r--sd/source/filter/html/pubdlg.cxx2
-rw-r--r--sd/source/filter/html/sdhtmlfilter.cxx2
-rw-r--r--sd/source/ui/app/sddll.cxx2
-rw-r--r--sd/source/ui/dlg/filedlg.cxx2
-rw-r--r--sd/source/ui/docshell/docshell.cxx2
-rw-r--r--sd/source/ui/unoidl/sddetect.cxx4
-rw-r--r--sd/source/ui/unoidl/unopage.cxx2
-rw-r--r--sd/source/ui/view/sdview4.cxx2
-rw-r--r--sfx2/inc/sfx2/opengrf.hxx2
-rw-r--r--sfx2/source/appl/appmisc.cxx2
-rw-r--r--sfx2/source/appl/fileobj.cxx2
-rw-r--r--sfx2/source/dialog/filedlghelper.cxx2
-rw-r--r--sfx2/source/menu/mnumgr.cxx2
-rw-r--r--sfx2/source/menu/thessubmenu.cxx2
-rw-r--r--svgio/source/svgreader/svgimagenode.cxx2
-rw-r--r--svtools/Library_svt.mk24
-rw-r--r--svtools/Module_svtools.mk6
-rw-r--r--svtools/Package_inc.mk3
-rw-r--r--svtools/bmpmaker/g2g.cxx2
-rw-r--r--svtools/inc/svtools/fltcall.hxx2
-rw-r--r--svtools/source/filter/SvFilterOptionsDialog.cxx13
-rw-r--r--svtools/source/filter/exportdialog.cxx4
-rw-r--r--svtools/source/graphic/descriptor.cxx2
-rw-r--r--svtools/source/graphic/provider.cxx4
-rw-r--r--svtools/source/misc/embedhlp.cxx2
-rw-r--r--svtools/source/misc/transfer.cxx2
-rw-r--r--svx/source/core/extedit.cxx2
-rw-r--r--svx/source/core/graphichelper.cxx2
-rw-r--r--svx/source/dialog/compressgraphicdialog.cxx2
-rw-r--r--svx/source/gallery2/galbrws2.cxx2
-rw-r--r--svx/source/gallery2/galctrl.cxx2
-rw-r--r--svx/source/gallery2/galmisc.cxx4
-rw-r--r--svx/source/svdraw/svdograf.cxx4
-rw-r--r--svx/source/svdraw/svdoole2.cxx2
-rw-r--r--svx/source/unodraw/UnoGraphicExporter.cxx4
-rw-r--r--svx/source/unodraw/unoshap2.cxx4
-rw-r--r--svx/source/unodraw/unoshap4.cxx4
-rw-r--r--svx/source/unodraw/unoshape.cxx2
-rw-r--r--svx/source/xml/xmlgrhlp.cxx2
-rw-r--r--svx/source/xoutdev/_xoutbmp.cxx4
-rw-r--r--sw/source/core/graphic/ndgrf.cxx2
-rw-r--r--sw/source/core/ole/ndole.cxx2
-rw-r--r--sw/source/filter/writer/writer.cxx2
-rw-r--r--sw/source/filter/ww1/fltshell.cxx2
-rw-r--r--sw/source/filter/ww1/w1filter.cxx3
-rw-r--r--sw/source/filter/ww8/wrtw8esh.cxx2
-rw-r--r--sw/source/filter/ww8/wrtww8gr.cxx3
-rw-r--r--sw/source/filter/ww8/ww8graf2.cxx3
-rw-r--r--sw/source/filter/ww8/ww8par4.cxx3
-rw-r--r--sw/source/ui/dochdl/swdtflvr.cxx2
-rw-r--r--sw/source/ui/frmdlg/frmpage.cxx2
-rw-r--r--sw/source/ui/lingu/olmenu.cxx2
-rw-r--r--sw/source/ui/shells/basesh.cxx2
-rw-r--r--sw/source/ui/shells/grfshex.cxx2
-rw-r--r--sw/source/ui/shells/textsh.cxx2
-rw-r--r--sw/source/ui/uiview/view2.cxx2
-rw-r--r--sw/source/ui/uno/swdetect.cxx2
-rw-r--r--sw/source/ui/utlui/glbltree.cxx2
-rw-r--r--sw/source/ui/utlui/navipi.cxx2
-rw-r--r--test/source/bootstrapfixture.cxx2
-rw-r--r--tubes/source/contacts.cxx2
-rw-r--r--vcl/CppunitTest_vcl_filters_test.mk22
-rw-r--r--vcl/Library_vcl.mk24
-rw-r--r--vcl/Module_vcl.mk4
-rw-r--r--vcl/Package_inc.mk3
-rw-r--r--vcl/inc/vcl/FilterConfigItem.hxx75
-rw-r--r--vcl/inc/vcl/graphicfilter.hxx50
-rw-r--r--vcl/inc/vcl/wmf.hxx13
-rw-r--r--vcl/qa/cppunit/graphicfilter/filters-test.cxx30
-rw-r--r--vcl/source/filter/FilterConfigCache.cxx5
-rw-r--r--vcl/source/filter/FilterConfigCache.hxx183
-rw-r--r--vcl/source/filter/FilterConfigItem.cxx2
-rw-r--r--vcl/source/filter/graphicfilter.cxx89
-rw-r--r--vcl/source/filter/graphicfilter2.cxx3
-rw-r--r--vcl/source/filter/jpeg/jpeg.cxx8
-rw-r--r--vcl/source/filter/jpeg/jpegc.c4
-rw-r--r--vcl/source/filter/sgvmain.cxx2
-rw-r--r--vcl/source/filter/sgvtext.cxx2
-rw-r--r--vcl/source/filter/wmf/winwmf.cxx2
-rw-r--r--vcl/source/filter/wmf/wmf.cxx2
-rw-r--r--writerfilter/source/rtftok/rtfdocumentimpl.cxx5
126 files changed, 371 insertions, 436 deletions
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
index ba04a9f533b9..3c791d4d2318 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -19,7 +19,7 @@
#include <tools/stream.hxx>
#include <vcl/metaact.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <basegfx/tools/canvastools.hxx>
#include <basegfx/tools/gradienttools.hxx>
#include <basegfx/tools/tools.hxx>
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index b4771dec75a3..4fa2cfe9b1af 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -28,7 +28,7 @@
#include <svl/undo.hxx>
#include <unotools/lingucfg.hxx>
#include <vcl/textdata.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <editeng/unolingu.hxx>
#include <editeng/splwrap.hxx>
#include <linguistic/lngprops.hxx>
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index cc62e89e8fdb..2c9df74420a7 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -26,7 +26,7 @@
#include <unotools/bootstrap.hxx>
#include <com/sun/star/uno/Any.h>
#include <vcl/graph.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <svtools/langhelp.hxx>
#include "com/sun/star/system/SystemShellExecuteFlags.hpp"
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 4e50bb363932..d443b5e2c3b1 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -29,7 +29,7 @@
#include <avmedia/mediawindow.hxx>
#include <unotools/pathoptions.hxx>
#include <sfx2/opengrf.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <svx/gallery1.hxx>
#include <svx/galtheme.hxx>
#include "cuigaldlg.hxx"
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 24f97b0c5de1..e94cbedc54be 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -24,7 +24,7 @@
#include <tools/shl.hxx>
#include <svl/lngmisc.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <svtools/svlbitm.hxx>
#include <svtools/treelistbox.hxx>
#include "svtools/treelistentry.hxx"
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index f7c6f43c4bf9..adcf4b7020d5 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -94,7 +94,7 @@
#include <svtools/fontsubstconfig.hxx>
#include <svtools/accessibilityoptions.hxx>
#include <svtools/apearcfg.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include "langselect.hxx"
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index 7d07aea2bb22..78143183a5f2 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -31,7 +31,7 @@
#include <svl/languageoptions.hxx>
#include <svtools/ctrltool.hxx>
#include <svtools/langtab.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <svl/srchitem.hxx>
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 3377cb9359ce..c457256d0b41 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -54,7 +54,7 @@
#include <svtools/borderhelper.hxx>
#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <editeng/editids.hrc>
#include <editeng/editrids.hrc>
#include <editeng/pbinitem.hxx>
diff --git a/filter/qa/cppunit/filters-pict-test.cxx b/filter/qa/cppunit/filters-pict-test.cxx
index 7f3313d9442c..076c4dc08d5a 100644
--- a/filter/qa/cppunit/filters-pict-test.cxx
+++ b/filter/qa/cppunit/filters-pict-test.cxx
@@ -9,7 +9,7 @@
#include <unotest/filters-test.hxx>
#include <test/bootstrapfixture.hxx>
-#include <svtools/FilterConfigItem.hxx>
+#include <vcl/FilterConfigItem.hxx>
#include <tools/stream.hxx>
#include <vcl/graph.hxx>
diff --git a/filter/qa/cppunit/filters-tga-test.cxx b/filter/qa/cppunit/filters-tga-test.cxx
index 08c7998d6bd9..3551ec6e86c5 100644
--- a/filter/qa/cppunit/filters-tga-test.cxx
+++ b/filter/qa/cppunit/filters-tga-test.cxx
@@ -29,7 +29,7 @@
#include <unotest/filters-test.hxx>
#include <test/bootstrapfixture.hxx>
-#include <svtools/FilterConfigItem.hxx>
+#include <vcl/FilterConfigItem.hxx>
#include <tools/stream.hxx>
#include <vcl/graph.hxx>
diff --git a/filter/qa/cppunit/filters-tiff-test.cxx b/filter/qa/cppunit/filters-tiff-test.cxx
index fcf0203215fa..aac646f39dff 100644
--- a/filter/qa/cppunit/filters-tiff-test.cxx
+++ b/filter/qa/cppunit/filters-tiff-test.cxx
@@ -29,7 +29,7 @@
#include <unotest/filters-test.hxx>
#include <test/bootstrapfixture.hxx>
-#include <svtools/FilterConfigItem.hxx>
+#include <vcl/FilterConfigItem.hxx>
#include <tools/stream.hxx>
#include <vcl/graph.hxx>
diff --git a/filter/source/flash/impswfdialog.hxx b/filter/source/flash/impswfdialog.hxx
index bfd9070135a4..a76c98c60809 100644
--- a/filter/source/flash/impswfdialog.hxx
+++ b/filter/source/flash/impswfdialog.hxx
@@ -29,7 +29,7 @@
#include <vcl/fixed.hxx>
#include <vcl/field.hxx>
-#include <svtools/FilterConfigItem.hxx>
+#include <vcl/FilterConfigItem.hxx>
// ----------------
// - ImpSWFDialog -
diff --git a/filter/source/flash/swfexporter.cxx b/filter/source/flash/swfexporter.cxx
index 9c1f6b02187d..6b065ce8e952 100644
--- a/filter/source/flash/swfexporter.cxx
+++ b/filter/source/flash/swfexporter.cxx
@@ -32,8 +32,8 @@
#include <osl/diagnose.h>
#include <osl/file.hxx>
#include <vcl/metaact.hxx>
-#include <svtools/wmf.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/wmf.hxx>
+#include <vcl/graphicfilter.hxx>
#include "swfexporter.hxx"
#include "swfwriter.hxx"
diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx
index 3efc36c70c95..ce664477136c 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -28,7 +28,7 @@
#include <vcl/virdev.hxx>
#include <vcl/metric.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <vcl/graphictools.hxx>
#ifndef _ZLIB_H
diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx
index e95d13526277..93be78ca2d55 100644
--- a/filter/source/graphicfilter/egif/egif.cxx
+++ b/filter/source/graphicfilter/egif/egif.cxx
@@ -24,7 +24,7 @@
#include <vcl/window.hxx>
#include <svl/solar.hrc>
#include <svtools/fltcall.hxx>
-#include <svtools/FilterConfigItem.hxx>
+#include <vcl/FilterConfigItem.hxx>
#include "giflzwc.hxx"
// -------------
diff --git a/filter/source/graphicfilter/epbm/epbm.cxx b/filter/source/graphicfilter/epbm/epbm.cxx
index f1b6c1567340..3f867bd6f3dd 100644
--- a/filter/source/graphicfilter/epbm/epbm.cxx
+++ b/filter/source/graphicfilter/epbm/epbm.cxx
@@ -24,7 +24,7 @@
#include <vcl/msgbox.hxx>
#include <svl/solar.hrc>
#include <svtools/fltcall.hxx>
-#include <svtools/FilterConfigItem.hxx>
+#include <vcl/FilterConfigItem.hxx>
//============================ PBMWriter ==================================
diff --git a/filter/source/graphicfilter/epgm/epgm.cxx b/filter/source/graphicfilter/epgm/epgm.cxx
index 98edf9a6ca6a..ef402a3cc4c6 100644
--- a/filter/source/graphicfilter/epgm/epgm.cxx
+++ b/filter/source/graphicfilter/epgm/epgm.cxx
@@ -24,7 +24,7 @@
#include <vcl/msgbox.hxx>
#include <svl/solar.hrc>
#include <svtools/fltcall.hxx>
-#include <svtools/FilterConfigItem.hxx>
+#include <vcl/FilterConfigItem.hxx>
//============================ PGMWriter ==================================
diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx
index 7ac44a7ebd1f..23feea383de4 100644
--- a/filter/source/graphicfilter/epict/epict.cxx
+++ b/filter/source/graphicfilter/epict/epict.cxx
@@ -18,7 +18,7 @@
*/
#include <vcl/metaact.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <svl/solar.hrc>
#include <svtools/fltcall.hxx>
diff --git a/filter/source/graphicfilter/eppm/eppm.cxx b/filter/source/graphicfilter/eppm/eppm.cxx
index f238a84ba26e..469097e727e6 100644
--- a/filter/source/graphicfilter/eppm/eppm.cxx
+++ b/filter/source/graphicfilter/eppm/eppm.cxx
@@ -24,7 +24,7 @@
#include <vcl/msgbox.hxx>
#include <svl/solar.hrc>
#include <svtools/fltcall.hxx>
-#include <svtools/FilterConfigItem.hxx>
+#include <vcl/FilterConfigItem.hxx>
//============================ PPMWriter ==================================
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index 68f7a3a528e0..d3e0aa9fe4d5 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -34,7 +34,7 @@
#include <unotools/configmgr.hxx>
#include <svl/solar.hrc>
#include <svtools/fltcall.hxx>
-#include <svtools/FilterConfigItem.hxx>
+#include <vcl/FilterConfigItem.hxx>
#include <vcl/graphictools.hxx>
#include "strings.hrc"
diff --git a/filter/source/graphicfilter/eras/eras.cxx b/filter/source/graphicfilter/eras/eras.cxx
index f5b008eabcee..17f7f51dfa78 100644
--- a/filter/source/graphicfilter/eras/eras.cxx
+++ b/filter/source/graphicfilter/eras/eras.cxx
@@ -21,7 +21,7 @@
#include <vcl/graph.hxx>
#include <vcl/bmpacc.hxx>
#include <svtools/fltcall.hxx>
-#include <svtools/FilterConfigItem.hxx>
+#include <vcl/FilterConfigItem.hxx>
//============================ RASWriter ==================================
diff --git a/filter/source/graphicfilter/etiff/etiff.cxx b/filter/source/graphicfilter/etiff/etiff.cxx
index 4ef3950849e3..8a83d67571ec 100644
--- a/filter/source/graphicfilter/etiff/etiff.cxx
+++ b/filter/source/graphicfilter/etiff/etiff.cxx
@@ -24,7 +24,7 @@
#include <vcl/bmpacc.hxx>
#include <svl/solar.hrc>
#include <svtools/fltcall.hxx>
-#include <svtools/FilterConfigItem.hxx>
+#include <vcl/FilterConfigItem.hxx>
#define NewSubfileType 254
#define ImageWidth 256
diff --git a/filter/source/graphicfilter/ipcd/ipcd.cxx b/filter/source/graphicfilter/ipcd/ipcd.cxx
index 9eaea9fd24a8..4f6a33473f79 100644
--- a/filter/source/graphicfilter/ipcd/ipcd.cxx
+++ b/filter/source/graphicfilter/ipcd/ipcd.cxx
@@ -24,7 +24,7 @@
#include <vcl/svapp.hxx>
#include <svtools/fltcall.hxx>
#include <svl/solar.hrc>
-#include <svtools/FilterConfigItem.hxx>
+#include <vcl/FilterConfigItem.hxx>
//============================ PCDReader ==================================
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 2f1807e6dfe5..9949d3d34d96 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -33,7 +33,7 @@
#include <tools/zcodec.hxx>
#include <svx/svdopath.hxx>
#include <stdlib.h>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include "svx/EnhancedCustomShapeTypeNames.hxx"
#include "svx/EnhancedCustomShapeGeometry.hxx"
#include <svx/EnhancedCustomShapeFunctionParser.hxx>
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 546215173995..f36d50490556 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -36,6 +36,7 @@
#include <sot/exchange.hxx>
#include <sot/storinfo.hxx>
#include <vcl/cvtgrf.hxx>
+#include <vcl/wmf.hxx>
#include "viscache.hxx"
// SvxItem-Mapping. Is needed to successfully include the SvxItem-Header
@@ -57,7 +58,7 @@
#include <com/sun/star/drawing/XShapes.hpp>
#include <editeng/charscaleitem.hxx>
#include <editeng/kernitem.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <tools/string.hxx>
#include <tools/urlobj.hxx>
#include <vcl/virdev.hxx>
diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx
index b6208d855f3e..d289ca021c1e 100644
--- a/filter/source/pdf/impdialog.hxx
+++ b/filter/source/pdf/impdialog.hxx
@@ -32,7 +32,7 @@
#include "vcl/group.hxx"
#include "vcl/pdfwriter.hxx"
-#include "svtools/FilterConfigItem.hxx"
+#include <vcl/FilterConfigItem.hxx>
#include "sfx2/tabdlg.hxx"
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index 336cda2bd973..c9f313300384 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -34,8 +34,8 @@
#include "vcl/svapp.hxx"
#include "toolkit/awt/vclxdevice.hxx"
#include "unotools/localfilehelper.hxx"
-#include "svtools/FilterConfigItem.hxx"
-#include "svtools/filter.hxx"
+#include <vcl/FilterConfigItem.hxx>
+#include <vcl/graphicfilter.hxx>
#include "svl/solar.hrc"
#include "comphelper/string.hxx"
#include "comphelper/storagehelper.hxx"
diff --git a/filter/source/pdf/pdffilter.cxx b/filter/source/pdf/pdffilter.cxx
index 29804e0ca8f2..9a5c4ea15fd0 100644
--- a/filter/source/pdf/pdffilter.cxx
+++ b/filter/source/pdf/pdffilter.cxx
@@ -23,7 +23,7 @@
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
#include <svl/outstrm.hxx>
-#include <svtools/FilterConfigItem.hxx>
+#include <vcl/FilterConfigItem.hxx>
// -------------
// - PDFFilter -
diff --git a/filter/source/svg/impsvgdialog.hxx b/filter/source/svg/impsvgdialog.hxx
index 6a2a3afa7518..40318e289e3c 100644
--- a/filter/source/svg/impsvgdialog.hxx
+++ b/filter/source/svg/impsvgdialog.hxx
@@ -33,7 +33,7 @@
#include <vcl/fixed.hxx>
#include <vcl/field.hxx>
#include <svtools/stdctrl.hxx>
-#include <svtools/FilterConfigItem.hxx>
+#include <vcl/FilterConfigItem.hxx>
#define SVG_EXPORTFILTER_CONFIGPATH "Office.Common/Filter/SVG/Export/"
#define SVG_PROP_TINYPROFILE "TinyMode"
diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index 92b8fb97214f..5e9e994de348 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -57,7 +57,7 @@
#include <vcl/graph.hxx>
#include <vcl/virdev.hxx>
#include <vcl/gradient.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <tools/zcodec.hxx>
#include <boost/bind.hpp>
diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx
index 799f81788791..46f688a38a0a 100644
--- a/forms/source/component/imgprod.cxx
+++ b/forms/source/component/imgprod.cxx
@@ -24,7 +24,7 @@
#include <vcl/cvtgrf.hxx>
#include <vcl/svapp.hxx>
#include <unotools/ucbstreamhelper.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <com/sun/star/io/XInputStream.hpp>
#include "svtools/imageresourceaccess.hxx"
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index db213fda47a7..44ee290f3834 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -30,7 +30,7 @@
#include <rtl/uri.hxx>
#include <comphelper/processfactory.hxx>
#include <vcl/graph.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <boost/unordered_map.hpp>
#include <algorithm>
diff --git a/framework/source/uielement/buttontoolbarcontroller.cxx b/framework/source/uielement/buttontoolbarcontroller.cxx
index 9c4d87b2a07a..270fd3e64f29 100644
--- a/framework/source/uielement/buttontoolbarcontroller.cxx
+++ b/framework/source/uielement/buttontoolbarcontroller.cxx
@@ -40,7 +40,7 @@
#include <vcl/window.hxx>
#include <vcl/graph.hxx>
#include <vcl/bitmap.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <svtools/miscopt.hxx>
using namespace ::com::sun::star;
diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
index e4432fa2216a..e57af2e878dd 100644
--- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
@@ -39,7 +39,7 @@
#include <vcl/window.hxx>
#include <vcl/graph.hxx>
#include <vcl/bitmap.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <svtools/miscopt.hxx>
using namespace ::com::sun::star;
diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
index 04bff3d5bfe1..3389286a226e 100644
--- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
@@ -40,7 +40,7 @@
#include <vcl/window.hxx>
#include <vcl/graph.hxx>
#include <vcl/bitmap.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <svtools/miscopt.hxx>
using namespace ::com::sun::star;
diff --git a/oox/source/helper/graphichelper.cxx b/oox/source/helper/graphichelper.cxx
index 512e9a1f8aa2..5cb2b69b1940 100644
--- a/oox/source/helper/graphichelper.cxx
+++ b/oox/source/helper/graphichelper.cxx
@@ -32,7 +32,7 @@
#include <com/sun/star/graphic/XGraphicProvider.hpp>
#include <com/sun/star/util/MeasureUnit.hpp>
#include <comphelper/seqstream.hxx>
-#include <svtools/wmf.hxx>
+#include <vcl/wmf.hxx>
#include "oox/helper/containerhelper.hxx"
#include "oox/helper/propertyset.hxx"
#include "oox/token/properties.hxx"
diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx
index c4937f840c3a..3ac521235ff5 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -26,7 +26,7 @@
#include <comphelper/mediadescriptor.hxx>
#include <unotools/fltrcfg.hxx>
-#include <svtools/wmf.hxx>
+#include <vcl/wmf.hxx>
#include <editeng/eeitem.hxx>
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index 33036c043c8a..6e16f279b7fe 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -44,7 +44,7 @@
#include <sfx2/objsh.hxx>
#include <unotools/moduleoptions.hxx>
#include <unotools/fltrcfg.hxx>
-#include <svtools/wmf.hxx>
+#include <vcl/wmf.hxx>
#include <comphelper/types.hxx>
#include <comphelper/classids.hxx>
#include <toolkit/helper/vclunohelper.hxx>
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index d542b917be51..8e8103ef49c2 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -40,7 +40,7 @@
#include <sfx2/objsh.hxx>
#include <svl/eitem.hxx>
#include <svl/intitem.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <svtools/parhtml.hxx>
#include <svtools/htmlkywd.hxx>
#include <svtools/htmltokn.h>
diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx
index a5d619965cae..b0ac39edb810 100644
--- a/sc/source/ui/drawfunc/fuins1.cxx
+++ b/sc/source/ui/drawfunc/fuins1.cxx
@@ -25,7 +25,7 @@
#include <svx/svdpagv.hxx>
#include <svx/svdview.hxx>
#include <svx/linkwarn.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <svl/stritem.hxx>
#include <svtools/miscopt.hxx>
#include <vcl/msgbox.hxx>
diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx
index 21d2687b08f2..8c9bd9cb2867 100644
--- a/sc/source/ui/view/viewfun4.cxx
+++ b/sc/source/ui/view/viewfun4.cxx
@@ -34,7 +34,7 @@
#include <sfx2/docfile.hxx>
#include <sfx2/fcontnr.hxx>
#include <svtools/langtab.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <svl/stritem.hxx>
#include <svtools/transfer.hxx>
#include <svl/urlbmk.hxx>
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index ac11be4a1be5..5d8959a6f01e 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -46,7 +46,7 @@
#include <sot/storinfo.hxx>
#include <filter/msfilter/msoleexp.hxx>
#include <vcl/virdev.hxx>
-#include <svtools/wmf.hxx>
+#include <vcl/wmf.hxx>
#include <filter/msfilter/msdffimp.hxx>
#include <filter/msfilter/svxmsbas.hxx>
#include <editeng/flditem.hxx>
diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx
index 00c322b840bc..4ba7d3845179 100644
--- a/sd/source/filter/eppt/pptx-epptbase.cxx
+++ b/sd/source/filter/eppt/pptx-epptbase.cxx
@@ -33,7 +33,7 @@
#include <rtl/ustring.hxx>
#include <rtl/strbuf.hxx>
#include <svtools/fltcall.hxx>
-#include <svtools/wmf.hxx>
+#include <vcl/wmf.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/docinf.hxx>
#include <svx/unoapi.hxx>
diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx
index dd635ec8bcbf..31f3b570f285 100644
--- a/sd/source/filter/grf/sdgrffilter.cxx
+++ b/sd/source/filter/grf/sdgrffilter.cxx
@@ -51,7 +51,7 @@
#include <comphelper/processfactory.hxx>
#include <unotools/pathoptions.hxx>
#include <sfx2/filedlghelper.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <svx/xoutbmp.hxx>
// --
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index b2d7afa38204..4335dc0b448a 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -29,7 +29,7 @@
#include <osl/file.hxx>
#include <tools/fsys.hxx>
#include <unotools/pathoptions.hxx>
-#include <svtools/FilterConfigItem.hxx>
+#include <vcl/FilterConfigItem.hxx>
#include <unotools/ucbstreamhelper.hxx>
#include <unotools/localfilehelper.hxx>
#include <com/sun/star/frame/XStorable.hpp>
@@ -50,7 +50,7 @@
#include <sfx2/docfile.hxx>
#include <vcl/cvtgrf.hxx>
#include <svtools/colorcfg.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <editeng/colritem.hxx>
#include <editeng/editeng.hxx>
#include <editeng/wghtitem.hxx>
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index 946b79e29ea4..6376827fa7b7 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -24,7 +24,7 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <unotools/ucbstreamhelper.hxx>
#include <vcl/lstbox.hxx>
-#include <svtools/FilterConfigItem.hxx>
+#include <vcl/FilterConfigItem.hxx>
#include <vcl/button.hxx>
#include <vcl/fixed.hxx>
#include <vcl/combobox.hxx>
diff --git a/sd/source/filter/html/sdhtmlfilter.cxx b/sd/source/filter/html/sdhtmlfilter.cxx
index 812b40a733d7..08db75d546d7 100644
--- a/sd/source/filter/html/sdhtmlfilter.cxx
+++ b/sd/source/filter/html/sdhtmlfilter.cxx
@@ -23,7 +23,7 @@
#include <vcl/msgbox.hxx>
#include <vcl/metaact.hxx>
#include <vcl/virdev.hxx>
-#include <svtools/FilterConfigItem.hxx>
+#include <vcl/FilterConfigItem.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/docfilt.hxx>
#include <sfx2/frame.hxx>
diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx
index 97b5a021eb65..ba7bab970adb 100644
--- a/sd/source/ui/app/sddll.cxx
+++ b/sd/source/ui/app/sddll.cxx
@@ -39,7 +39,7 @@
#include <sfx2/docfilt.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/fcontnr.hxx>
-#include <svtools/FilterConfigItem.hxx>
+#include <vcl/FilterConfigItem.hxx>
#include <comphelper/processfactory.hxx>
using namespace ::rtl;
diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx
index b34b2cd85ebe..86610c9ecb83 100644
--- a/sd/source/ui/dlg/filedlg.cxx
+++ b/sd/source/ui/dlg/filedlg.cxx
@@ -40,7 +40,7 @@
#include "filedlg.hxx"
#include "sdresid.hxx"
#include "strings.hrc"
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
// --------------------------------------------------------------------
diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx
index 66ed42459fbe..6488b0ebaf34 100644
--- a/sd/source/ui/docshell/docshell.cxx
+++ b/sd/source/ui/docshell/docshell.cxx
@@ -37,7 +37,7 @@
#include <svl/whiter.hxx>
#include <svl/itempool.hxx>
#include <svtools/ctrltool.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <sot/clsids.hxx>
#include <svl/cjkoptions.hxx>
#include <svl/visitem.hxx>
diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx
index 222251c9c7e1..0431e6e985d9 100644
--- a/sd/source/ui/unoidl/sddetect.cxx
+++ b/sd/source/ui/unoidl/sddetect.cxx
@@ -38,7 +38,7 @@
#include <com/sun/star/packages/zip/ZipIOException.hpp>
#include <toolkit/helper/vclunohelper.hxx>
#include <ucbhelper/simpleinteractionrequest.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <rtl/ustring.h>
#include <rtl/logfile.hxx>
#include <svl/itemset.hxx>
@@ -58,7 +58,7 @@
#include <sfx2/docfilt.hxx>
#include <sfx2/fcontnr.hxx>
#include <sfx2/brokenpackageint.hxx>
-#include <svtools/FilterConfigItem.hxx>
+#include <vcl/FilterConfigItem.hxx>
#include <sot/storage.hxx>
#include <unotools/moduleoptions.hxx>
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 623b6fe38462..e769a1b7ccca 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -55,7 +55,7 @@
#include <comphelper/extract.hxx>
#include <list>
#include <svx/svditer.hxx>
-#include <svtools/wmf.hxx>
+#include <vcl/wmf.hxx>
#include <svx/svdoole2.hxx>
#include <svx/svdpool.hxx>
#include <svx/svdview.hxx>
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index 2dad995e304e..b54b56c8f7e8 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -37,7 +37,7 @@
#include <avmedia/mediawindow.hxx>
#include <svtools/ehdl.hxx>
#include <svtools/sfxecode.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include "app.hrc"
#include "Window.hxx"
#include "DrawDocShell.hxx"
diff --git a/sfx2/inc/sfx2/opengrf.hxx b/sfx2/inc/sfx2/opengrf.hxx
index c986744ab1d5..70dce688e9a8 100644
--- a/sfx2/inc/sfx2/opengrf.hxx
+++ b/sfx2/inc/sfx2/opengrf.hxx
@@ -20,7 +20,7 @@
#define _SFX2_OPENGRF_HXX
#include <memory> // auto_ptr
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <sfx2/dllapi.h>
struct SvxOpenGrf_Impl;
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx
index 44a6d0494008..fb553a6dad9e 100644
--- a/sfx2/source/appl/appmisc.cxx
+++ b/sfx2/source/appl/appmisc.cxx
@@ -23,7 +23,7 @@
#include <svl/stritem.hxx>
#include <svl/intitem.hxx>
#include <svl/eitem.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <unotools/internaloptions.hxx>
#include <unotools/pathoptions.hxx>
#include <com/sun/star/registry/InvalidRegistryException.hpp>
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index 83a2252a974b..385b8b00e99b 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -23,7 +23,7 @@
#include <tools/urlobj.hxx>
#include <tools/stream.hxx>
#include <sot/formats.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <sfx2/lnkbase.hxx>
#include <sfx2/app.hxx>
#include <sfx2/progress.hxx>
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index cb3d784ce2f1..abc47b024a41 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -66,7 +66,7 @@
#include <svl/eitem.hxx>
#include <svl/intitem.hxx>
#include <svl/stritem.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <unotools/viewoptions.hxx>
#include <unotools/moduleoptions.hxx>
#include <svtools/helpid.hrc>
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index cbbed605fd8e..f406c189aa25 100644
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -42,7 +42,7 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <osl/file.hxx>
#include <vcl/graph.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <svl/lngmisc.hxx>
#include <sfx2/mnumgr.hxx>
diff --git a/sfx2/source/menu/thessubmenu.cxx b/sfx2/source/menu/thessubmenu.cxx
index f4c5f474efce..b1075f42640a 100644
--- a/sfx2/source/menu/thessubmenu.cxx
+++ b/sfx2/source/menu/thessubmenu.cxx
@@ -27,7 +27,7 @@
#include <svl/stritem.hxx>
#include <tools/debug.hxx>
#include <vcl/graph.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <vector>
diff --git a/svgio/source/svgreader/svgimagenode.cxx b/svgio/source/svgreader/svgimagenode.cxx
index b57bf800c29e..8e933c0f32c5 100644
--- a/svgio/source/svgreader/svgimagenode.cxx
+++ b/svgio/source/svgreader/svgimagenode.cxx
@@ -22,7 +22,7 @@
#include <sax/tools/converter.hxx>
#include <tools/stream.hxx>
#include <vcl/bitmapex.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
#include <drawinglayer/primitive2d/bitmapprimitive2d.hxx>
#include <drawinglayer/primitive2d/groupprimitive2d.hxx>
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index fa014054b806..014807f2fcff 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -61,7 +61,6 @@ $(eval $(call gb_Library_use_libraries,svt,\
$(eval $(call gb_Library_use_externals,svt,\
icuuc \
icu_headers \
- jpeg \
))
$(eval $(call gb_Library_add_exception_objects,svt,\
@@ -144,27 +143,8 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
svtools/source/edit/svmedit2 \
svtools/source/edit/syntaxhighlight \
svtools/source/edit/textwindowpeer \
- svtools/source/filter/FilterConfigCache \
- svtools/source/filter/FilterConfigItem \
svtools/source/filter/SvFilterOptionsDialog \
svtools/source/filter/exportdialog \
- svtools/source/filter/filter \
- svtools/source/filter/filter2 \
- svtools/source/filter/sgfbram \
- svtools/source/filter/sgvmain \
- svtools/source/filter/sgvspln \
- svtools/source/filter/sgvtext \
- svtools/source/filter/igif/decode \
- svtools/source/filter/igif/gifread \
- svtools/source/filter/ixbm/xbmread \
- svtools/source/filter/ixpm/xpmread \
- svtools/source/filter/jpeg/jpeg \
- svtools/source/filter/wmf/emfwr \
- svtools/source/filter/wmf/enhwmf \
- svtools/source/filter/wmf/winmtf \
- svtools/source/filter/wmf/winwmf \
- svtools/source/filter/wmf/wmf \
- svtools/source/filter/wmf/wmfwr \
svtools/source/graphic/descriptor \
svtools/source/graphic/graphic \
svtools/source/graphic/graphicunofactory \
@@ -257,10 +237,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
svtools/source/urlobj/inetimg \
))
-$(eval $(call gb_Library_add_cobjects,svt,\
- svtools/source/filter/jpeg/jpegc \
-))
-
ifeq ($(OS),WNT)
$(eval $(call gb_Library_use_system_win32_libs,svt,\
advapi32 \
diff --git a/svtools/Module_svtools.mk b/svtools/Module_svtools.mk
index 70871fb2ae14..604668f7ccc5 100644
--- a/svtools/Module_svtools.mk
+++ b/svtools/Module_svtools.mk
@@ -42,12 +42,6 @@ endif
endif
-ifneq ($(DISABLE_CVE_TESTS),TRUE)
-$(eval $(call gb_Module_add_check_targets,svtools,\
- CppunitTest_svtools_filters_test \
-))
-endif
-
ifneq ($(OOO_JUNIT_JAR),)
$(eval $(call gb_Module_add_subsequentcheck_targets,svtools,\
JunitTest_svtools_unoapi \
diff --git a/svtools/Package_inc.mk b/svtools/Package_inc.mk
index 85afa18faf61..9be94a3f844b 100644
--- a/svtools/Package_inc.mk
+++ b/svtools/Package_inc.mk
@@ -20,7 +20,6 @@
$(eval $(call gb_Package_Package,svtools_inc,$(SRCDIR)/svtools/inc))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/AccessibleBrowseBoxObjType.hxx,svtools/AccessibleBrowseBoxObjType.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/DocumentInfoPreview.hxx,svtools/DocumentInfoPreview.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/FilterConfigItem.hxx,svtools/FilterConfigItem.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/QueryFolderName.hxx,svtools/QueryFolderName.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/acceleratorexecute.hxx,svtools/acceleratorexecute.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibilityoptions.hxx,svtools/accessibilityoptions.hxx))
@@ -58,7 +57,6 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filedlg.hxx,svtools/fi
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filedlg2.hrc,svtools/filedlg2.hrc))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fileurlbox.hxx,svtools/fileurlbox.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fileview.hxx,svtools/fileview.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filter.hxx,svtools/filter.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filechangedchecker.hxx,svtools/filechangedchecker.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fltcall.hxx,svtools/fltcall.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fmtfield.hxx,svtools/fmtfield.hxx))
@@ -174,7 +172,6 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/viewdataentry.hxx,svto
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wallitem.hxx,svtools/wallitem.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wizardmachine.hxx,svtools/wizardmachine.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wizdlg.hxx,svtools/wizdlg.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wmf.hxx,svtools/wmf.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/xwindowitem.hxx,svtools/xwindowitem.hxx))
# vim: set noet sw=4 ts=4:
diff --git a/svtools/bmpmaker/g2g.cxx b/svtools/bmpmaker/g2g.cxx
index c0a8e01f2ebd..9a3508c96198 100644
--- a/svtools/bmpmaker/g2g.cxx
+++ b/svtools/bmpmaker/g2g.cxx
@@ -26,7 +26,7 @@
#include <tools/fsys.hxx>
#include <tools/stream.hxx>
#include <vcl/svapp.hxx>
-#include "svtools/filter.hxx"
+#include <vcl/graphicfilter.hxx>
#define EXIT_NOERROR 0x00000000
#define EXIT_COMMONERROR 0x00000001
diff --git a/svtools/inc/svtools/fltcall.hxx b/svtools/inc/svtools/fltcall.hxx
index 361b060624e3..ded1d84e021a 100644
--- a/svtools/inc/svtools/fltcall.hxx
+++ b/svtools/inc/svtools/fltcall.hxx
@@ -23,7 +23,7 @@
#include <vcl/field.hxx>
#include <com/sun/star/uno/Sequence.h>
#include <com/sun/star/beans/PropertyValue.hpp>
-#include <svtools/FilterConfigItem.hxx>
+#include <vcl/FilterConfigItem.hxx>
class FilterConfigItem;
class SvStream;
diff --git a/svtools/source/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter/SvFilterOptionsDialog.cxx
index 320354bcf74a..7cce49bfdd6e 100644
--- a/svtools/source/filter/SvFilterOptionsDialog.cxx
+++ b/svtools/source/filter/SvFilterOptionsDialog.cxx
@@ -19,9 +19,8 @@
#include "SvFilterOptionsDialog.hxx"
-#include <svtools/FilterConfigItem.hxx>
-#include <svtools/filter.hxx>
-#include "FilterConfigCache.hxx"
+#include <vcl/FilterConfigItem.hxx>
+#include <vcl/graphicfilter.hxx>
#include <osl/file.hxx>
#include <osl/module.hxx>
#include <svl/solar.hrc>
@@ -197,10 +196,10 @@ sal_Int16 SvFilterOptionsDialog::execute()
{
GraphicFilter aGraphicFilter( sal_True );
- sal_uInt16 nFormat, nFilterCount = aGraphicFilter.pConfig->GetExportFormatCount();
+ sal_uInt16 nFormat, nFilterCount = aGraphicFilter.GetExportFormatCount();
for ( nFormat = 0; nFormat < nFilterCount; nFormat++ )
{
- if ( aGraphicFilter.pConfig->GetExportInternalFilterName( nFormat ) == aInternalFilterName )
+ if ( aGraphicFilter.GetExportInternalFilterName( nFormat ) == aInternalFilterName )
break;
}
if ( nFormat < nFilterCount )
@@ -213,8 +212,8 @@ sal_Int16 SvFilterOptionsDialog::execute()
pResMgr = ResMgr::CreateResMgr( "svt", Application::GetSettings().GetUILanguageTag().getLocale() );
aFltCallDlgPara.pResMgr = pResMgr;
- aFltCallDlgPara.aFilterExt = aGraphicFilter.pConfig->GetExportFormatShortName( nFormat );
- sal_Bool bIsPixelFormat( aGraphicFilter.pConfig->IsExportPixelFormat( nFormat ) );
+ aFltCallDlgPara.aFilterExt = aGraphicFilter.GetExportFormatShortName( nFormat );
+ sal_Bool bIsPixelFormat( aGraphicFilter.IsExportPixelFormat( nFormat ) );
if ( ExportDialog( aFltCallDlgPara, mxMgr, mxSourceDocument, mbExportSelection, bIsPixelFormat ).Execute() == RET_OK )
nRet = ui::dialogs::ExecutableDialogResults::OK;
diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx
index e3ff04e832a3..fdf73d65eb9a 100644
--- a/svtools/source/filter/exportdialog.cxx
+++ b/svtools/source/filter/exportdialog.cxx
@@ -23,8 +23,8 @@
#endif
#include <tools/stream.hxx>
-#include <svtools/filter.hxx>
-#include <svtools/FilterConfigItem.hxx>
+#include <vcl/graphicfilter.hxx>
+#include <vcl/FilterConfigItem.hxx>
#include <svtools/svtools.hrc>
#include <svtools/svtresid.hxx>
#include <com/sun/star/io/XStream.hpp>
diff --git a/svtools/source/graphic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx
index 0e9c9c330774..dac63180f188 100644
--- a/svtools/source/graphic/descriptor.cxx
+++ b/svtools/source/graphic/descriptor.cxx
@@ -21,7 +21,7 @@
#include <osl/mutex.hxx>
#include <unotools/ucbstreamhelper.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <svl/itemprop.hxx>
#include <comphelper/servicehelper.hxx>
diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx
index f49ebb620073..140708757c39 100644
--- a/svtools/source/graphic/provider.cxx
+++ b/svtools/source/graphic/provider.cxx
@@ -27,8 +27,8 @@
#include <tools/resid.hxx>
#include <tools/resmgr.hxx>
#include <unotools/ucbstreamhelper.hxx>
-#include <svtools/filter.hxx>
-#include <svtools/wmf.hxx>
+#include <vcl/graphicfilter.hxx>
+#include <vcl/wmf.hxx>
#include <svl/solar.hrc>
#include <vcl/virdev.hxx>
#include <com/sun/star/io/XStream.hpp>
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index 4996c6dc4ca1..5d6ac82e78e0 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.cxx
@@ -19,7 +19,7 @@
#include <svtools/embedhlp.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <svtools/svtools.hrc>
#include <svtools/svtresid.hxx>
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 735b52eefb40..e43a3ee27a6a 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -50,7 +50,7 @@
#include "svl/urlbmk.hxx"
#include "inetimg.hxx"
-#include <svtools/wmf.hxx>
+#include <vcl/wmf.hxx>
#include <svtools/imap.hxx>
#include <svtools/transfer.hxx>
#include <rtl/strbuf.hxx>
diff --git a/svx/source/core/extedit.cxx b/svx/source/core/extedit.cxx
index b44b262f759f..7754075b25e2 100644
--- a/svx/source/core/extedit.cxx
+++ b/svx/source/core/extedit.cxx
@@ -30,7 +30,7 @@
#include <osl/thread.hxx>
#include <osl/process.h>
#include <osl/time.h>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <svtools/filechangedchecker.hxx>
#include <svx/xoutbmp.hxx>
#include <unotools/ucbstreamhelper.hxx>
diff --git a/svx/source/core/graphichelper.cxx b/svx/source/core/graphichelper.cxx
index 723074ac624a..2cc0c7cc8cad 100644
--- a/svx/source/core/graphichelper.cxx
+++ b/svx/source/core/graphichelper.cxx
@@ -20,7 +20,7 @@
#include <tools/string.hxx>
#include <svx/graphichelper.hxx>
#include <unotools/pathoptions.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <sfx2/docfile.hxx>
#include <svx/xoutbmp.hxx>
#include <sfx2/filedlghelper.hxx>
diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx
index 1709ea4c157e..ab827f0c9f77 100644
--- a/svx/source/dialog/compressgraphicdialog.cxx
+++ b/svx/source/dialog/compressgraphicdialog.cxx
@@ -19,13 +19,13 @@
#include <dlgunit.hxx>
#include <vcl/graph.hxx>
+#include <vcl/graphicfilter.hxx>
#include <vcl/virdev.hxx>
#include <vcl/svapp.hxx>
#include <svx/svdograf.hxx>
#include <svx/sdgcpitm.hxx>
#include <svx/dialmgr.hxx>
#include <svx/compressgraphicdialog.hxx>
-#include <svtools/filter.hxx>
#include <sfx2/dispatch.hxx>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/uno/Sequence.hxx>
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index ead880ae688d..d72f47749df3 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -30,7 +30,7 @@
#include <sfx2/dispatch.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/sfxsids.hrc>
-#include "svtools/filter.hxx"
+#include <vcl/graphicfilter.hxx>
#include <editeng/brshitem.hxx>
#include "helpid.hrc"
#include "svx/gallery.hxx"
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index 9f3d0d0af57c..944950c11717 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -32,7 +32,7 @@
#include "galobj.hxx"
#include <avmedia/mediawindow.hxx>
#include "gallery.hrc"
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
// -----------
// - Defines -
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index f5c25e3eb05e..5ff8acf83458 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -27,13 +27,13 @@
#include <tools/urlobj.hxx>
#include <svl/solar.hrc>
#include <svl/urihelper.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <svl/itempool.hxx>
#include <sfx2/docfile.hxx>
#include <avmedia/mediawindow.hxx>
#include <vcl/svapp.hxx>
-#include "svtools/filter.hxx"
+#include <vcl/graphicfilter.hxx>
#include <svx/svdpage.hxx>
#include <svx/svdograf.hxx>
#include <svx/fmmodel.hxx>
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 5fd1aa33a729..c3363919c636 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -28,7 +28,7 @@
#include <unotools/ucbstreamhelper.hxx>
#include <unotools/localfilehelper.hxx>
#include <svl/style.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <svl/urihelper.hxx>
#include <svtools/grfmgr.hxx>
#include <vcl/svapp.hxx>
@@ -45,7 +45,7 @@
#include <svx/svdpagv.hxx>
#include "svx/svdviter.hxx"
#include <svx/svdview.hxx>
-#include "svtools/filter.hxx"
+#include <vcl/graphicfilter.hxx>
#include <svx/svdograf.hxx>
#include <svx/svdogrp.hxx>
#include <svx/xbitmap.hxx>
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 5eef368cde78..cb0760e65b72 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -42,7 +42,7 @@
#include <toolkit/awt/vclxwindow.hxx>
#include <toolkit/helper/convert.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <svtools/embedhlp.hxx>
#include <sfx2/objsh.hxx>
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index 8d08bf7aa283..d1467bfeb533 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -45,7 +45,7 @@
#include <vcl/metaact.hxx>
#include <vcl/svapp.hxx>
#include <vcl/virdev.hxx>
-#include <svtools/FilterConfigItem.hxx>
+#include <vcl/FilterConfigItem.hxx>
#include <svl/outstrm.hxx>
#include <svx/sdr/contact/objectcontactofobjlistpainter.hxx>
#include <svx/sdr/contact/viewobjectcontact.hxx>
@@ -56,7 +56,7 @@
#include <svx/svdpagv.hxx>
#include <svx/svdograf.hxx>
#include "svx/xoutbmp.hxx"
-#include "svtools/filter.hxx"
+#include <vcl/graphicfilter.hxx>
#include "svx/unoapi.hxx"
#include <svx/svdpage.hxx>
#include <svx/svdmodel.hxx>
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 8a02d44ee0be..6ce719e1bc3b 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -32,7 +32,7 @@
#include <vcl/svapp.hxx>
#include <osl/mutex.hxx>
#include <svtools/fltcall.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <boost/scoped_ptr.hpp>
#include <svx/svdpool.hxx>
@@ -58,7 +58,7 @@
#include <basegfx/tools/unotools.hxx>
#include <comphelper/servicehelper.hxx>
-#include <svtools/wmf.hxx>
+#include <vcl/wmf.hxx>
using ::rtl::OUString;
using namespace ::osl;
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index 27f3f074b1e1..c516b6ff6563 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -37,7 +37,7 @@
#include <sot/storage.hxx>
#include <sot/exchange.hxx>
-#include <svtools/FilterConfigItem.hxx>
+#include <vcl/FilterConfigItem.hxx>
#include <svx/svdmodel.hxx>
#include "shapeimpl.hxx"
@@ -49,7 +49,7 @@
#include "svx/svdview.hxx"
#include "svx/svdglob.hxx"
#include "svx/svdstr.hrc"
-#include <svtools/wmf.hxx>
+#include <vcl/wmf.hxx>
///////////////////////////////////////////////////////////////////////
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 6ba0969082ef..19236eb83341 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -91,7 +91,7 @@
#include "svx/extrud3d.hxx"
#include <boost/bind.hpp>
-#include <svtools/wmf.hxx>
+#include <vcl/wmf.hxx>
using ::rtl::OUString;
using namespace ::osl;
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index d428c147b195..4fb5058a0b23 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -38,7 +38,7 @@
#include <vcl/metaact.hxx>
#include <tools/zcodec.hxx>
-#include "svtools/filter.hxx"
+#include <vcl/graphicfilter.hxx>
#include "svx/xmlgrhlp.hxx"
#include "svx/xmleohlp.hxx"
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index a57f6facad09..33a2df50caed 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -27,8 +27,8 @@
#include <sfx2/docfile.hxx>
#include <sfx2/app.hxx>
#include "svx/xoutbmp.hxx"
-#include <svtools/FilterConfigItem.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/FilterConfigItem.hxx>
+#include <vcl/graphicfilter.hxx>
// -----------
// - Defines -
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 2b516de003bd..02f10f4530e0 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -23,7 +23,7 @@
#include <svl/undo.hxx>
#include <svl/fstathelper.hxx>
#include <svtools/imap.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <sot/storage.hxx>
#include <sfx2/linkmgr.hxx>
#include <editeng/boxitem.hxx>
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index d7a021622fdd..71775aa33853 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -51,7 +51,7 @@
#include <vcl/graph.hxx>
#include <sot/formats.hxx>
#include <unotools/ucbstreamhelper.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <comcore.hrc>
using rtl::OUString;
diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx
index cb60fb6e3bfe..21dd1bceb9fb 100644
--- a/sw/source/filter/writer/writer.cxx
+++ b/sw/source/filter/writer/writer.cxx
@@ -22,7 +22,7 @@
#include <sot/storage.hxx>
#include <sfx2/docfile.hxx>
#include <svl/urihelper.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <editeng/fontitem.hxx>
#include <editeng/eeitem.hxx>
#include <shellio.hxx>
diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx
index a634c30bd19e..24c4cd5c0f24 100644
--- a/sw/source/filter/ww1/fltshell.cxx
+++ b/sw/source/filter/ww1/fltshell.cxx
@@ -21,7 +21,7 @@
#include <ctype.h>
#include <hintids.hxx>
#include <hints.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <vcl/graph.hxx>
#include <svl/urihelper.hxx>
diff --git a/sw/source/filter/ww1/w1filter.cxx b/sw/source/filter/ww1/w1filter.cxx
index 9aa175520c06..b2f867bd5b0e 100644
--- a/sw/source/filter/ww1/w1filter.cxx
+++ b/sw/source/filter/ww1/w1filter.cxx
@@ -22,8 +22,9 @@
#include <tools/solar.h>
#include <comphelper/string.hxx>
#include <editeng/paperinf.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <vcl/graph.hxx>
+#include <vcl/wmf.hxx>
#include <editeng/fontitem.hxx>
#include <editeng/lrspitem.hxx>
#include <editeng/ulspitem.hxx>
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index ed206c472107..8707c22a0510 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -26,7 +26,7 @@
#include <com/sun/star/drawing/XShape.hpp>
#include <vcl/svapp.hxx>
#include <sot/storage.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <svl/itemiter.hxx>
#include <svx/svdobj.hxx>
#include <svx/svdotext.hxx>
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index 778f2f663f57..c70ad3c71748 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -22,7 +22,8 @@
#include <com/sun/star/embed/Aspects.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
#include <rtl/math.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
+#include <vcl/wmf.hxx>
#include <svl/itemiter.hxx>
#include "svl/urihelper.hxx"
diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx
index 1e73c44cc4bc..b9f90a00cab7 100644
--- a/sw/source/filter/ww8/ww8graf2.cxx
+++ b/sw/source/filter/ww8/ww8graf2.cxx
@@ -45,7 +45,8 @@
#include "ww8par.hxx" // class SwWWImplReader
#include "ww8par2.hxx" // struct WWFlyPara
#include "ww8graf.hxx"
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
+#include <vcl/wmf.hxx>
using namespace ::com::sun::star;
using namespace sw::types;
diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx
index 322425dfdf9f..3349fbf9b413 100644
--- a/sw/source/filter/ww8/ww8par4.cxx
+++ b/sw/source/filter/ww8/ww8par4.cxx
@@ -47,7 +47,8 @@
#include <shellio.hxx>
#include <ndole.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
+#include <vcl/wmf.hxx>
#include "ww8scan.hxx"
#include "ww8par.hxx"
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index 2267a66b6803..28bd60c6454c 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -65,7 +65,7 @@
#include <sfx2/docfile.hxx>
#include <unotools/transliterationwrapper.hxx>
#include <unotools/streamwrap.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <svx/unomodel.hxx>
#include <fmturl.hxx>
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 5b03eed972db..051b9dd30fb6 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -65,7 +65,7 @@
#include <com/sun/star/ui/dialogs/XFilePicker.hpp>
#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
using namespace ::com::sun::star;
using ::rtl::OUString;
diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx
index f337aa84d810..6cb971916710 100644
--- a/sw/source/ui/lingu/olmenu.cxx
+++ b/sw/source/ui/lingu/olmenu.cxx
@@ -57,7 +57,7 @@
#include <linguistic/misc.hxx>
#include <osl/file.hxx>
#include <rtl/string.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/imagemgr.hxx>
#include <sfx2/request.hxx>
diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx
index e8196c26dda3..b24b34a5401c 100644
--- a/sw/source/ui/shells/basesh.cxx
+++ b/sw/source/ui/shells/basesh.cxx
@@ -34,7 +34,7 @@
#include <svl/whiter.hxx>
#include <svl/visitem.hxx>
#include <sfx2/objitem.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <svx/gallery.hxx>
#include <editeng/langitem.hxx>
#include <svx/clipfmtitem.hxx>
diff --git a/sw/source/ui/shells/grfshex.cxx b/sw/source/ui/shells/grfshex.cxx
index b31920f31538..428c91bee035 100644
--- a/sw/source/ui/shells/grfshex.cxx
+++ b/sw/source/ui/shells/grfshex.cxx
@@ -26,7 +26,7 @@
#include <swundo.hxx>
#include <shells.hrc>
#include <caption.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <svx/htmlmode.hxx>
#include <doc.hxx>
#include <docsh.hxx>
diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx
index 4af3d0707faa..1a56086c2aa4 100644
--- a/sw/source/ui/shells/textsh.cxx
+++ b/sw/source/ui/shells/textsh.cxx
@@ -50,7 +50,7 @@
#include <editeng/sizeitem.hxx>
#include <editeng/svxacorr.hxx>
#include <editeng/scripttypeitem.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <svx/htmlmode.hxx>
#include <svx/pfiledlg.hxx>
#include <svtools/htmlcfg.hxx>
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index 020c7429d233..b372cccae99f 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -20,7 +20,7 @@
#include <com/sun/star/util/SearchOptions.hpp>
#include <com/sun/star/util/SearchFlags.hpp>
#include <com/sun/star/i18n/TransliterationModules.hpp>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <com/sun/star/sdb/DatabaseContext.hpp>
#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
diff --git a/sw/source/ui/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx
index c5d7557349e4..4ccf329cd8e3 100644
--- a/sw/source/ui/uno/swdetect.cxx
+++ b/sw/source/ui/uno/swdetect.cxx
@@ -53,7 +53,7 @@
#include <sfx2/docfilt.hxx>
#include <sfx2/fcontnr.hxx>
#include <sfx2/brokenpackageint.hxx>
-#include <svtools/FilterConfigItem.hxx>
+#include <vcl/FilterConfigItem.hxx>
#include <unotools/moduleoptions.hxx>
#include <comphelper/ihwrapnofilter.hxx>
diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx
index 9f4d46c25e7f..b1614d851dbe 100644
--- a/sw/source/ui/utlui/glbltree.cxx
+++ b/sw/source/ui/utlui/glbltree.cxx
@@ -28,7 +28,7 @@
#include <sot/filelist.hxx>
#include <svl/eitem.hxx>
#include <svl/urlbmk.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include "svtools/treelistentry.hxx"
#include <sfx2/docinsert.hxx>
#include <sfx2/filedlghelper.hxx>
diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx
index 4eff264a2b42..f766149bee00 100644
--- a/sw/source/ui/utlui/navipi.cxx
+++ b/sw/source/ui/utlui/navipi.cxx
@@ -24,7 +24,7 @@
#include <comphelper/string.hxx>
#include <svl/urlbmk.hxx>
#include <svl/stritem.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <svl/urihelper.hxx>
#include <sot/formats.hxx>
#include <sot/filelist.hxx>
diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx
index e52ee2cddbce..f6fd67bd3344 100644
--- a/test/source/bootstrapfixture.cxx
+++ b/test/source/bootstrapfixture.cxx
@@ -41,7 +41,7 @@
#include <vcl/svapp.hxx>
#include <tools/resmgr.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <unotools/syslocaleoptions.hxx>
using namespace ::com::sun::star;
diff --git a/tubes/source/contacts.cxx b/tubes/source/contacts.cxx
index 91cce715b831..a6badfb21cf3 100644
--- a/tubes/source/contacts.cxx
+++ b/tubes/source/contacts.cxx
@@ -28,7 +28,7 @@
#include <sal/config.h>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <tubes/conference.hxx>
#include <tubes/collaboration.hxx>
#include <tubes/manager.hxx>
diff --git a/vcl/CppunitTest_vcl_filters_test.mk b/vcl/CppunitTest_vcl_filters_test.mk
index b6db6efc463f..8cce39f1a436 100644
--- a/vcl/CppunitTest_vcl_filters_test.mk
+++ b/vcl/CppunitTest_vcl_filters_test.mk
@@ -25,13 +25,19 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CppunitTest_CppunitTest,svtools_filters_test))
+$(eval $(call gb_CppunitTest_CppunitTest,vcl_filters_test))
-$(eval $(call gb_CppunitTest_add_exception_objects,svtools_filters_test, \
- svtools/qa/cppunit/filters-test \
+$(eval $(call gb_CppunitTest_add_exception_objects,vcl_filters_test, \
+ vcl/qa/cppunit/graphicfilter/filters-test \
))
-$(eval $(call gb_CppunitTest_use_libraries,svtools_filters_test, \
+ifeq ($(DISABLE_CVE_TESTS),TRUE)
+$(eval $(call gb_CppunitTest_add_defs,vcl_filters_test,\
+ -DDISABLE_CVE_TESTS \
+))
+endif
+
+$(eval $(call gb_CppunitTest_use_libraries,vcl_filters_test, \
comphelper \
cppu \
cppuhelper \
@@ -44,19 +50,19 @@ $(eval $(call gb_CppunitTest_use_libraries,svtools_filters_test, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_use_api,svtools_filters_test,\
+$(eval $(call gb_CppunitTest_use_api,vcl_filters_test,\
udkapi \
offapi \
))
-$(eval $(call gb_CppunitTest_use_ure,svtools_filters_test))
+$(eval $(call gb_CppunitTest_use_ure,vcl_filters_test))
-$(eval $(call gb_CppunitTest_use_components,svtools_filters_test,\
+$(eval $(call gb_CppunitTest_use_components,vcl_filters_test,\
configmgr/source/configmgr \
i18npool/util/i18npool \
ucb/source/core/ucb1 \
))
-$(eval $(call gb_CppunitTest_use_configuration,svtools_filters_test))
+$(eval $(call gb_CppunitTest_use_configuration,vcl_filters_test))
# vim: set noet sw=4 ts=4:
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 5c1b2676c51f..c3898bc17160 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -63,6 +63,7 @@ $(eval $(call gb_Library_add_defs,vcl,\
$(eval $(call gb_Library_use_sdk_api,vcl))
$(eval $(call gb_Library_use_externals,vcl,\
+ jpeg \
nss3 \
))
@@ -163,6 +164,25 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/edit/textview \
vcl/source/edit/txtattr \
vcl/source/edit/xtextedt \
+ vcl/source/filter/FilterConfigCache \
+ vcl/source/filter/FilterConfigItem \
+ vcl/source/filter/graphicfilter \
+ vcl/source/filter/graphicfilter2 \
+ vcl/source/filter/sgfbram \
+ vcl/source/filter/sgvmain \
+ vcl/source/filter/sgvspln \
+ vcl/source/filter/sgvtext \
+ vcl/source/filter/igif/decode \
+ vcl/source/filter/igif/gifread \
+ vcl/source/filter/ixbm/xbmread \
+ vcl/source/filter/ixpm/xpmread \
+ vcl/source/filter/jpeg/jpeg \
+ vcl/source/filter/wmf/emfwr \
+ vcl/source/filter/wmf/enhwmf \
+ vcl/source/filter/wmf/winmtf \
+ vcl/source/filter/wmf/winwmf \
+ vcl/source/filter/wmf/wmf \
+ vcl/source/filter/wmf/wmfwr \
vcl/source/fontsubset/cff \
vcl/source/fontsubset/fontsubset \
vcl/source/fontsubset/gsub \
@@ -292,6 +312,10 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/window/wrkwin \
))
+$(eval $(call gb_Library_add_cobjects,vcl,\
+ vcl/source/filter/jpeg/jpegc \
+))
+
# optional parts
## handle Graphite
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 362acb3560c4..116e81544e11 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -82,4 +82,8 @@ $(eval $(call gb_Module_add_targets,vcl,\
))
endif
+$(eval $(call gb_Module_add_check_targets,vcl,\
+ CppunitTest_vcl_filters_test \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/vcl/Package_inc.mk b/vcl/Package_inc.mk
index 3f37b7442ad2..53a7326279b1 100644
--- a/vcl/Package_inc.mk
+++ b/vcl/Package_inc.mk
@@ -18,6 +18,7 @@
#
$(eval $(call gb_Package_Package,vcl_inc,$(SRCDIR)/vcl/inc))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/FilterConfigItem.hxx,vcl/FilterConfigItem.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/abstdlg.hxx,vcl/abstdlg.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/accel.hxx,vcl/accel.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/alpha.hxx,vcl/alpha.hxx))
@@ -64,6 +65,7 @@ $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/gfxlink.hxx,vcl/gfxlink.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/gradient.hxx,vcl/gradient.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/graph.h,vcl/graph.h))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/graph.hxx,vcl/graph.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/graphicfilter.hxx,vcl/graphicfilter.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/graphictools.hxx,vcl/graphictools.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/group.hxx,vcl/group.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/hatch.hxx,vcl/hatch.hxx))
@@ -162,6 +164,7 @@ $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/virdev.hxx,vcl/virdev.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/waitobj.hxx,vcl/waitobj.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/wall.hxx,vcl/wall.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/window.hxx,vcl/window.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/wmf.hxx,vcl/wmf.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/wrkwin.hxx,vcl/wrkwin.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/xtextedt.hxx,vcl/xtextedt.hxx))
diff --git a/vcl/inc/vcl/FilterConfigItem.hxx b/vcl/inc/vcl/FilterConfigItem.hxx
index e20ebf8dbf16..b13f37a19680 100644
--- a/vcl/inc/vcl/FilterConfigItem.hxx
+++ b/vcl/inc/vcl/FilterConfigItem.hxx
@@ -21,7 +21,8 @@
#ifndef _FILTER_CONFIG_ITEM_HXX_
#define _FILTER_CONFIG_ITEM_HXX_
-#include "svtools/svtdllapi.h"
+#include <vcl/dllapi.h>
+
#include <tools/string.hxx>
#include <com/sun/star/awt/Size.hpp>
#include <com/sun/star/uno/Any.h>
@@ -31,54 +32,54 @@
#include <com/sun/star/beans/XPropertyAccess.hpp>
#include <com/sun/star/task/XStatusIndicator.hpp>
-class SVT_DLLPUBLIC FilterConfigItem
+class VCL_DLLPUBLIC FilterConfigItem
{
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xUpdatableView;
- ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xPropSet;
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aFilterData;
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xUpdatableView;
+ ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xPropSet;
+ ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aFilterData;
- sal_Bool bModified;
+ sal_Bool bModified;
- SVT_DLLPRIVATE sal_Bool ImplGetPropertyValue( ::com::sun::star::uno::Any& rAny,
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPropSet,
- const ::rtl::OUString& rPropName,
- sal_Bool bTestPropertyAvailability );
+ sal_Bool ImplGetPropertyValue( ::com::sun::star::uno::Any& rAny,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPropSet,
+ const OUString& rPropName,
+ sal_Bool bTestPropertyAvailability );
- SVT_DLLPRIVATE void ImpInitTree( const String& rTree );
+ void ImpInitTree( const String& rTree );
- SVT_DLLPRIVATE static ::com::sun::star::beans::PropertyValue* GetPropertyValue(
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rPropSeq,
- const ::rtl::OUString& rName );
- SVT_DLLPRIVATE static sal_Bool WritePropertyValue(
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rPropSeq,
- const ::com::sun::star::beans::PropertyValue& rPropValue );
+ static ::com::sun::star::beans::PropertyValue* GetPropertyValue(
+ ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rPropSeq,
+ const OUString& rName );
+ static sal_Bool WritePropertyValue(
+ ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rPropSeq,
+ const ::com::sun::star::beans::PropertyValue& rPropValue );
- public :
+public :
- FilterConfigItem( const ::rtl::OUString& rSubTree );
- FilterConfigItem( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >* pFilterData );
- FilterConfigItem( const ::rtl::OUString& rSubTree, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >* pFilterData );
- ~FilterConfigItem();
+ FilterConfigItem( const OUString& rSubTree );
+ FilterConfigItem( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >* pFilterData );
+ FilterConfigItem( const OUString& rSubTree, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >* pFilterData );
+ ~FilterConfigItem();
- // all read methods are trying to return values in following order:
- // 1. FilterData PropertySequence
- // 2. configuration
- // 3. given default
- sal_Bool ReadBool( const ::rtl::OUString& rKey, sal_Bool bDefault );
- sal_Int32 ReadInt32( const ::rtl::OUString& rKey, sal_Int32 nDefault );
- ::rtl::OUString
- ReadString( const ::rtl::OUString& rKey, const ::rtl::OUString& rDefault );
+ // all read methods are trying to return values in following order:
+ // 1. FilterData PropertySequence
+ // 2. configuration
+ // 3. given default
+ sal_Bool ReadBool( const OUString& rKey, sal_Bool bDefault );
+ sal_Int32 ReadInt32( const OUString& rKey, sal_Int32 nDefault );
+ OUString
+ ReadString( const OUString& rKey, const OUString& rDefault );
- // try to store to configuration
- // and always stores into the FilterData sequence
- void WriteBool( const ::rtl::OUString& rKey, sal_Bool bValue );
- void WriteInt32( const ::rtl::OUString& rKey, sal_Int32 nValue );
+ // try to store to configuration
+ // and always stores into the FilterData sequence
+ void WriteBool( const OUString& rKey, sal_Bool bValue );
+ void WriteInt32( const OUString& rKey, sal_Int32 nValue );
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > GetFilterData() const;
+ ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > GetFilterData() const;
- // GetStatusIndicator is returning the "StatusIndicator" property of the FilterData sequence
- ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > GetStatusIndicator() const;
+ // GetStatusIndicator is returning the "StatusIndicator" property of the FilterData sequence
+ ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > GetStatusIndicator() const;
};
#endif // _FILTER_CONFIG_ITEM_HXX_
diff --git a/vcl/inc/vcl/graphicfilter.hxx b/vcl/inc/vcl/graphicfilter.hxx
index 23d0c7204737..f9a7ae138073 100644
--- a/vcl/inc/vcl/graphicfilter.hxx
+++ b/vcl/inc/vcl/graphicfilter.hxx
@@ -20,29 +20,19 @@
#ifndef _FILTER_HXX
#define _FILTER_HXX
-#include <svtools/fltcall.hxx>
-#include "svtools/svtdllapi.h"
-#include <tools/stream.hxx>
-#include <vcl/graph.hxx>
#include <tools/gen.hxx>
+#include <tools/stream.hxx>
#include <tools/urlobj.hxx>
+#include <vcl/dllapi.h>
#include <vcl/field.hxx>
+#include <vcl/graph.hxx>
+
#include <com/sun/star/uno/Sequence.h>
#include <com/sun/star/beans/PropertyValue.hpp>
+class FilterConfigCache;
struct WMF_EXTERNALHEADER;
-// -----------------------
-// - GraphicFilter-Types -
-// -----------------------
-
-struct ImplDirEntryHelper
-{
- static sal_Bool Exists( const INetURLObject& rObj );
- static void Kill( const String& rStr );
-};
-
-class Window;
-class Graphic;
+struct ConvertData;
#define OPT_FILTERSECTION "Graphic"
@@ -134,7 +124,7 @@ class Graphic;
// - GraphicDescriptor -
// ---------------------
-class SVT_DLLPUBLIC GraphicDescriptor
+class VCL_DLLPUBLIC GraphicDescriptor
{
SvStream* pFileStm;
@@ -226,10 +216,7 @@ public:
static String GetImportFormatShortName( sal_uInt16 nFormat );
};
-// -----------------
-// - GraphicFilter -
-// -----------------
-
+/** Information about errors during the GraphicFilter operation. */
struct FilterErrorEx
{
sal_uLong nFilterError;
@@ -238,11 +225,8 @@ struct FilterErrorEx
FilterErrorEx() : nFilterError( 0UL ), nStreamError( 0UL ) {}
};
-// -----------------------------------------------------------------------------
-
-struct ConvertData;
-class FilterConfigCache;
-class SVT_DLLPUBLIC GraphicFilter
+/** Class to import and export graphic formats. */
+class VCL_DLLPUBLIC GraphicFilter
{
friend class SvFilterOptionsDialog;
@@ -287,6 +271,7 @@ public:
sal_uInt16 GetExportFormatNumber( const String& rFormatName );
sal_uInt16 GetExportFormatNumberForMediaType( const String& rShortName );
sal_uInt16 GetExportFormatNumberForShortName( const String& rShortName );
+ String GetExportInternalFilterName( sal_uInt16 nFormat );
sal_uInt16 GetExportFormatNumberForTypeName( const String& rType );
String GetExportFormatName( sal_uInt16 nFormat );
String GetExportFormatTypeName( sal_uInt16 nFormat );
@@ -296,10 +281,6 @@ public:
String GetExportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry = 0 );
sal_Bool IsExportPixelFormat( sal_uInt16 nFormat );
- sal_Bool HasExportDialog( sal_uInt16 nFormat );
- sal_Bool DoExportDialog( Window* pWindow, sal_uInt16 nFormat );
- sal_Bool DoExportDialog( Window* pWindow, sal_uInt16 nFormat, FieldUnit eFieldUnit );
-
sal_uInt16 ExportGraphic( const Graphic& rGraphic, const INetURLObject& rPath,
sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW,
const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData = NULL );
@@ -333,8 +314,6 @@ public:
com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData,
WMF_EXTERNALHEADER *pExtHeader = NULL );
- sal_Bool Setup( sal_uInt16 nFormat );
-
void Abort() { bAbort = sal_True; }
const FilterErrorEx& GetLastError() const;
@@ -348,13 +327,6 @@ public:
sal_uInt16* pDeterminedFormat = NULL );
};
-// ------------------------------------
-// - Windows Metafile Lesen/Schreiben -
-// ------------------------------------
-
-SVT_DLLPUBLIC sal_Bool ReadWindowMetafile( SvStream& rStream, GDIMetaFile& rMTF, FilterConfigItem* pConfigItem );
-SVT_DLLPUBLIC sal_Bool WriteWindowMetafileBits( SvStream& rStream, const GDIMetaFile& rMTF );
-
#endif //_FILTER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/vcl/wmf.hxx b/vcl/inc/vcl/wmf.hxx
index 66e2dcac589d..ed0b5e27fd50 100644
--- a/vcl/inc/vcl/wmf.hxx
+++ b/vcl/inc/vcl/wmf.hxx
@@ -20,8 +20,11 @@
#ifndef _WMF_HXX
#define _WMF_HXX
-#include "svtools/svtdllapi.h"
-#include <svtools/fltcall.hxx>
+#include <vcl/dllapi.h>
+
+class FilterConfigItem;
+class GDIMetaFile;
+class SvStream;
struct WMF_EXTERNALHEADER
{
@@ -54,13 +57,13 @@ struct WMF_EXTERNALHEADER
sal_Bool ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, GDIMetaFile & rGDIMetaFile, FilterConfigItem* pConfigItem = NULL, WMF_EXTERNALHEADER *pExtHeader = NULL );
-SVT_DLLPUBLIC sal_Bool ReadWindowMetafile( SvStream& rStream, GDIMetaFile& rMTF, FilterConfigItem* pConfigItem );
+VCL_DLLPUBLIC sal_Bool ReadWindowMetafile( SvStream& rStream, GDIMetaFile& rMTF, FilterConfigItem* pConfigItem );
-SVT_DLLPUBLIC sal_Bool ConvertGDIMetaFileToWMF( const GDIMetaFile & rMTF, SvStream & rTargetStream, FilterConfigItem* pConfigItem = NULL, sal_Bool bPlaceable = sal_True );
+VCL_DLLPUBLIC sal_Bool ConvertGDIMetaFileToWMF( const GDIMetaFile & rMTF, SvStream & rTargetStream, FilterConfigItem* pConfigItem = NULL, sal_Bool bPlaceable = sal_True );
sal_Bool ConvertGDIMetaFileToEMF( const GDIMetaFile & rMTF, SvStream & rTargetStream, FilterConfigItem* pConfigItem = NULL );
-SVT_DLLPUBLIC sal_Bool WriteWindowMetafileBits( SvStream& rStream, const GDIMetaFile& rMTF );
+VCL_DLLPUBLIC sal_Bool WriteWindowMetafileBits( SvStream& rStream, const GDIMetaFile& rMTF );
#endif
diff --git a/vcl/qa/cppunit/graphicfilter/filters-test.cxx b/vcl/qa/cppunit/graphicfilter/filters-test.cxx
index bdf8269575e2..bec3cc0d9c6d 100644
--- a/vcl/qa/cppunit/graphicfilter/filters-test.cxx
+++ b/vcl/qa/cppunit/graphicfilter/filters-test.cxx
@@ -33,18 +33,18 @@
#include <osl/file.hxx>
#include <osl/process.h>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
using namespace ::com::sun::star;
/* Implementation of Filters test */
-class SvtoolsFiltersTest
+class VclFiltersTest
: public test::FiltersTest
, public test::BootstrapFixture
{
public:
- SvtoolsFiltersTest() : BootstrapFixture(true, false) {}
+ VclFiltersTest() : BootstrapFixture(true, false) {}
virtual bool load(const rtl::OUString &,
const rtl::OUString &rURL, const rtl::OUString &,
@@ -55,12 +55,12 @@ public:
*/
void testCVEs();
- CPPUNIT_TEST_SUITE(SvtoolsFiltersTest);
+ CPPUNIT_TEST_SUITE(VclFiltersTest);
CPPUNIT_TEST(testCVEs);
CPPUNIT_TEST_SUITE_END();
};
-bool SvtoolsFiltersTest::load(const rtl::OUString &,
+bool VclFiltersTest::load(const rtl::OUString &,
const rtl::OUString &rURL, const rtl::OUString &,
unsigned int, unsigned int, unsigned int)
{
@@ -70,38 +70,40 @@ bool SvtoolsFiltersTest::load(const rtl::OUString &,
return aGraphicFilter.ImportGraphic(aGraphic, rURL, aFileStream) == 0;
}
-void SvtoolsFiltersTest::testCVEs()
+void VclFiltersTest::testCVEs()
{
+#ifndef DISABLE_CVE_TESTS
testDir(rtl::OUString(),
- getURLFromSrc("/svtools/qa/cppunit/data/wmf/"),
+ getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/wmf/"),
rtl::OUString());
testDir(rtl::OUString(),
- getURLFromSrc("/svtools/qa/cppunit/data/emf/"),
+ getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/emf/"),
rtl::OUString());
testDir(rtl::OUString(),
- getURLFromSrc("/svtools/qa/cppunit/data/sgv/"),
+ getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/sgv/"),
rtl::OUString());
testDir(rtl::OUString(),
- getURLFromSrc("/svtools/qa/cppunit/data/png/"),
+ getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/png/"),
rtl::OUString());
testDir(rtl::OUString(),
- getURLFromSrc("/svtools/qa/cppunit/data/jpg/"),
+ getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/jpg/"),
rtl::OUString());
testDir(rtl::OUString(),
- getURLFromSrc("/svtools/qa/cppunit/data/gif/"),
+ getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/gif/"),
rtl::OUString());
testDir(rtl::OUString(),
- getURLFromSrc("/svtools/qa/cppunit/data/bmp/"),
+ getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/bmp/"),
rtl::OUString());
+#endif
}
-CPPUNIT_TEST_SUITE_REGISTRATION(SvtoolsFiltersTest);
+CPPUNIT_TEST_SUITE_REGISTRATION(VclFiltersTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/vcl/source/filter/FilterConfigCache.cxx b/vcl/source/filter/FilterConfigCache.cxx
index dc4b7c740cdf..705daed4f783 100644
--- a/vcl/source/filter/FilterConfigCache.cxx
+++ b/vcl/source/filter/FilterConfigCache.cxx
@@ -18,20 +18,21 @@
*/
#include "FilterConfigCache.hxx"
-#include <svtools/filter.hxx>
+
+#include <vcl/graphicfilter.hxx>
#include <com/sun/star/uno/Any.h>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/configuration/theDefaultProvider.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
using namespace ::com::sun::star::lang ; // XMultiServiceFactory
using namespace ::com::sun::star::container ; // XNameAccess
using namespace ::com::sun::star::uno ; // Reference
using namespace ::com::sun::star::beans ; // PropertyValue
using namespace ::com::sun::star::configuration ;
-using ::rtl::OUString;
const char* FilterConfigCache::FilterConfigCacheEntry::InternalPixelFilterNameList[] =
{
diff --git a/vcl/source/filter/FilterConfigCache.hxx b/vcl/source/filter/FilterConfigCache.hxx
index b3f0022b05bb..829122fb88f1 100644
--- a/vcl/source/filter/FilterConfigCache.hxx
+++ b/vcl/source/filter/FilterConfigCache.hxx
@@ -28,102 +28,101 @@
#include <vector>
+/** Cache to keep list of graphic filters + the filters themselves. */
class FilterConfigCache
{
- struct FilterConfigCacheEntry
- {
- ::rtl::OUString sInternalFilterName;
- ::rtl::OUString sType;
- ::com::sun::star::uno::Sequence< ::rtl::OUString > lExtensionList;
- ::rtl::OUString sUIName;
- ::rtl::OUString sDocumentService;
- ::rtl::OUString sFilterService;
- ::rtl::OUString sTemplateName;
-
- ::rtl::OUString sMediaType;
- ::rtl::OUString sFilterType;
-
- sal_Int32 nFlags;
- sal_Int32 nFileFormatVersion;
-
- // user data
- String sFilterName;
- sal_Bool bHasDialog : 1;
- sal_Bool bIsInternalFilter : 1;
- sal_Bool bIsPixelFormat : 1;
-
- sal_Bool CreateFilterName( const ::rtl::OUString& rUserDataEntry );
- String GetShortName( );
-
- static const char* InternalPixelFilterNameList[];
- static const char* InternalVectorFilterNameList[];
- static const char* ExternalPixelFilterNameList[];
- };
-
- typedef std::vector< FilterConfigCacheEntry > CacheVector;
-
-
- CacheVector aImport;
- CacheVector aExport;
- sal_Bool bUseConfig;
-
- static sal_Bool bInitialized;
- static sal_Int32 nIndType;
- static sal_Int32 nIndUIName;
- static sal_Int32 nIndDocumentService;
- static sal_Int32 nIndFilterService;
- static sal_Int32 nIndFlags;
- static sal_Int32 nIndUserData;
- static sal_Int32 nIndFileFormatVersion;
- static sal_Int32 nIndTemplateName;
-
- static const char* InternalFilterListForSvxLight[];
-
- void ImplInit();
- void ImplInitSmart();
-
- public :
-
- sal_uInt16 GetImportFormatCount() const
+ struct FilterConfigCacheEntry
+ {
+ OUString sInternalFilterName;
+ OUString sType;
+ ::com::sun::star::uno::Sequence< OUString > lExtensionList;
+ OUString sUIName;
+ OUString sDocumentService;
+ OUString sFilterService;
+ OUString sTemplateName;
+
+ OUString sMediaType;
+ OUString sFilterType;
+
+ sal_Int32 nFlags;
+ sal_Int32 nFileFormatVersion;
+
+ // user data
+ String sFilterName;
+ sal_Bool bHasDialog : 1;
+ sal_Bool bIsInternalFilter : 1;
+ sal_Bool bIsPixelFormat : 1;
+
+ sal_Bool CreateFilterName( const OUString& rUserDataEntry );
+ String GetShortName( );
+
+ static const char* InternalPixelFilterNameList[];
+ static const char* InternalVectorFilterNameList[];
+ static const char* ExternalPixelFilterNameList[];
+ };
+
+ typedef std::vector< FilterConfigCacheEntry > CacheVector;
+
+ CacheVector aImport;
+ CacheVector aExport;
+ sal_Bool bUseConfig;
+
+ static sal_Bool bInitialized;
+ static sal_Int32 nIndType;
+ static sal_Int32 nIndUIName;
+ static sal_Int32 nIndDocumentService;
+ static sal_Int32 nIndFilterService;
+ static sal_Int32 nIndFlags;
+ static sal_Int32 nIndUserData;
+ static sal_Int32 nIndFileFormatVersion;
+ static sal_Int32 nIndTemplateName;
+
+ static const char* InternalFilterListForSvxLight[];
+
+ void ImplInit();
+ void ImplInitSmart();
+
+public:
+
+ sal_uInt16 GetImportFormatCount() const
{ return sal::static_int_cast< sal_uInt16 >(aImport.size()); };
- sal_uInt16 GetImportFormatNumber( const String& rFormatName );
- sal_uInt16 GetImportFormatNumberForMediaType( const String& rMediaType );
- sal_uInt16 GetImportFormatNumberForShortName( const String& rShortName );
- sal_uInt16 GetImportFormatNumberForTypeName( const String& rType );
- String GetImportFilterName( sal_uInt16 nFormat );
- String GetImportFormatName( sal_uInt16 nFormat );
- String GetImportFormatExtension( sal_uInt16 nFormat, sal_Int32 nEntry = 0);
- String GetImportFormatMediaType( sal_uInt16 nFormat );
- String GetImportFormatShortName( sal_uInt16 nFormat );
- String GetImportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry );
- String GetImportFilterType( sal_uInt16 nFormat );
- String GetImportFilterTypeName( sal_uInt16 nFormat );
-
- sal_Bool IsImportInternalFilter( sal_uInt16 nFormat );
- sal_Bool IsImportPixelFormat( sal_uInt16 nFormat );
-
- sal_uInt16 GetExportFormatCount() const
+ sal_uInt16 GetImportFormatNumber( const String& rFormatName );
+ sal_uInt16 GetImportFormatNumberForMediaType( const String& rMediaType );
+ sal_uInt16 GetImportFormatNumberForShortName( const String& rShortName );
+ sal_uInt16 GetImportFormatNumberForTypeName( const String& rType );
+ String GetImportFilterName( sal_uInt16 nFormat );
+ String GetImportFormatName( sal_uInt16 nFormat );
+ String GetImportFormatExtension( sal_uInt16 nFormat, sal_Int32 nEntry = 0);
+ String GetImportFormatMediaType( sal_uInt16 nFormat );
+ String GetImportFormatShortName( sal_uInt16 nFormat );
+ String GetImportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry );
+ String GetImportFilterType( sal_uInt16 nFormat );
+ String GetImportFilterTypeName( sal_uInt16 nFormat );
+
+ sal_Bool IsImportInternalFilter( sal_uInt16 nFormat );
+ sal_Bool IsImportPixelFormat( sal_uInt16 nFormat );
+
+ sal_uInt16 GetExportFormatCount() const
{ return sal::static_int_cast< sal_uInt16 >(aExport.size()); };
- sal_uInt16 GetExportFormatNumber( const String& rFormatName );
- sal_uInt16 GetExportFormatNumberForMediaType( const String& rMediaType );
- sal_uInt16 GetExportFormatNumberForShortName( const String& rShortName );
- sal_uInt16 GetExportFormatNumberForTypeName( const String& rType );
- String GetExportFilterName( sal_uInt16 nFormat );
- String GetExportFormatName( sal_uInt16 nFormat );
- String GetExportFormatExtension( sal_uInt16 nFormat, sal_Int32 nEntry = 0 );
- String GetExportFormatMediaType( sal_uInt16 nFormat );
- String GetExportFormatShortName( sal_uInt16 nFormat );
- String GetExportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry );
- String GetExportFilterTypeName( sal_uInt16 nFormat );
- String GetExportInternalFilterName( sal_uInt16 nFormat );
-
- sal_Bool IsExportInternalFilter( sal_uInt16 nFormat );
- sal_Bool IsExportPixelFormat( sal_uInt16 nFormat );
- sal_Bool IsExportDialog( sal_uInt16 nFormat );
-
- FilterConfigCache( sal_Bool bUseConfig );
- ~FilterConfigCache();
-
+ sal_uInt16 GetExportFormatNumber( const String& rFormatName );
+ sal_uInt16 GetExportFormatNumberForMediaType( const String& rMediaType );
+ sal_uInt16 GetExportFormatNumberForShortName( const String& rShortName );
+ sal_uInt16 GetExportFormatNumberForTypeName( const String& rType );
+ String GetExportFilterName( sal_uInt16 nFormat );
+ String GetExportFormatName( sal_uInt16 nFormat );
+ String GetExportFormatExtension( sal_uInt16 nFormat, sal_Int32 nEntry = 0 );
+ String GetExportFormatMediaType( sal_uInt16 nFormat );
+ String GetExportFormatShortName( sal_uInt16 nFormat );
+ String GetExportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry );
+ String GetExportFilterTypeName( sal_uInt16 nFormat );
+ String GetExportInternalFilterName( sal_uInt16 nFormat );
+
+ sal_Bool IsExportInternalFilter( sal_uInt16 nFormat );
+ sal_Bool IsExportPixelFormat( sal_uInt16 nFormat );
+ sal_Bool IsExportDialog( sal_uInt16 nFormat );
+
+ FilterConfigCache( sal_Bool bUseConfig );
+ ~FilterConfigCache();
};
#endif // _FILTER_CONFIG_CACHE_HXX_
diff --git a/vcl/source/filter/FilterConfigItem.cxx b/vcl/source/filter/FilterConfigItem.cxx
index 91310b367bed..bd7d7c5985c0 100644
--- a/vcl/source/filter/FilterConfigItem.cxx
+++ b/vcl/source/filter/FilterConfigItem.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <svtools/FilterConfigItem.hxx>
+#include <vcl/FilterConfigItem.hxx>
#include <unotools/configmgr.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index 4839dfa1cc44..3a68acd31c5a 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -30,17 +30,14 @@
#include <vcl/virdev.hxx>
#include <vcl/svapp.hxx>
#include <osl/file.hxx>
-#include <svtools/filter.hxx>
-#include "FilterConfigCache.hxx"
-#include <svtools/FilterConfigItem.hxx>
-#include <svtools/fltcall.hxx>
-#include <svtools/wmf.hxx>
-#include "gifread.hxx"
-#include "jpeg.hxx"
-#include "xbmread.hxx"
-#include "xpmread.hxx"
+#include <vcl/graphicfilter.hxx>
+#include <vcl/FilterConfigItem.hxx>
+#include <vcl/wmf.hxx>
+#include "igif/gifread.hxx"
+#include "jpeg/jpeg.hxx"
+#include "ixbm/xbmread.hxx"
+#include "ixpm/xpmread.hxx"
#include <svl/solar.hrc>
-#include <svtools/svtools.hrc>
#include "sgffilt.hxx"
#include "osl/module.hxx"
#include <com/sun/star/uno/Reference.h>
@@ -64,7 +61,7 @@
#include <vcl/metaact.hxx>
#include <vector>
-#include "SvFilterOptionsDialog.hxx"
+#include "FilterConfigCache.hxx"
#define PMGCHUNG_msOG 0x6d734f47 // Microsoft Office Animated GIF
@@ -110,7 +107,7 @@ public:
~ImpFilterOutputStream() {}
};
-sal_Bool ImplDirEntryHelper::Exists( const INetURLObject& rObj )
+static sal_Bool DirEntryExists( const INetURLObject& rObj )
{
sal_Bool bExists = sal_False;
@@ -139,7 +136,7 @@ sal_Bool ImplDirEntryHelper::Exists( const INetURLObject& rObj )
// -----------------------------------------------------------------------------
-void ImplDirEntryHelper::Kill( const String& rMainUrl )
+static void KillDirEntry( const String& rMainUrl )
{
try
{
@@ -1323,6 +1320,13 @@ sal_uInt16 GraphicFilter::GetExportFormatNumberForShortName( const String& rShor
// ------------------------------------------------------------------------
+String GraphicFilter::GetExportInternalFilterName( sal_uInt16 nFormat )
+{
+ return pConfig->GetExportInternalFilterName( nFormat );
+}
+
+// ------------------------------------------------------------------------
+
sal_uInt16 GraphicFilter::GetExportFormatNumberForTypeName( const String& rType )
{
return pConfig->GetExportFormatNumberForTypeName( rType );
@@ -1855,7 +1859,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const INetURLO
RTL_LOGFILE_CONTEXT( aLog, "GraphicFilter::ExportGraphic() (thb)" );
sal_uInt16 nRetValue = GRFILTER_FORMATERROR;
DBG_ASSERT( rPath.GetProtocol() != INET_PROT_NOT_VALID, "GraphicFilter::ExportGraphic() : ProtType == INET_PROT_NOT_VALID" );
- sal_Bool bAlreadyExists = ImplDirEntryHelper::Exists( rPath );
+ sal_Bool bAlreadyExists = DirEntryExists( rPath );
String aMainUrl( rPath.GetMainURL( INetURLObject::NO_DECODE ) );
SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( aMainUrl, STREAM_WRITE | STREAM_TRUNC );
@@ -1865,7 +1869,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const INetURLO
delete pStream;
if( ( GRFILTER_OK != nRetValue ) && !bAlreadyExists )
- ImplDirEntryHelper::Kill( aMainUrl );
+ KillDirEntry( aMainUrl );
}
return nRetValue;
#endif
@@ -2268,61 +2272,6 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const String&
// ------------------------------------------------------------------------
-sal_Bool GraphicFilter::Setup( sal_uInt16 )
-{
- return sal_False;
-}
-
-// ------------------------------------------------------------------------
-
-sal_Bool GraphicFilter::HasExportDialog( sal_uInt16 nFormat )
-{
- return pConfig->IsExportDialog( nFormat );
-}
-
-// ------------------------------------------------------------------------
-
-sal_Bool GraphicFilter::DoExportDialog( Window* pWindow, sal_uInt16 nFormat )
-{
- return DoExportDialog( pWindow, nFormat, FUNIT_MM );
-}
-
-sal_Bool GraphicFilter::DoExportDialog( Window*, sal_uInt16 nFormat, FieldUnit )
-{
-#ifdef DISABLE_EXPORT
- (void) nFormat;
-
- return sal_False;
-#else
- sal_Bool bRet = sal_False;
- com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >
- xSMgr( ::comphelper::getProcessServiceFactory() );
-
- uno::Reference< com::sun::star::uno::XInterface > xFilterOptionsDialog
- ( xSMgr->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.svtools.SvFilterOptionsDialog" )) ),
- com::sun::star::uno::UNO_QUERY );
- if ( xFilterOptionsDialog.is() )
- {
- com::sun::star::uno::Reference< com::sun::star::ui::dialogs::XExecutableDialog > xExecutableDialog
- ( xFilterOptionsDialog, ::com::sun::star::uno::UNO_QUERY );
- com::sun::star::uno::Reference< com::sun::star::beans::XPropertyAccess > xPropertyAccess
- ( xFilterOptionsDialog, ::com::sun::star::uno::UNO_QUERY );
- if ( xExecutableDialog.is() && xPropertyAccess.is() )
- {
- com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aMediaDescriptor( 1 );
- aMediaDescriptor[ 0 ].Name = String( RTL_CONSTASCII_USTRINGPARAM( "FilterName" ) );
- rtl::OUString aStr( pConfig->GetExportInternalFilterName( nFormat ) );
- aMediaDescriptor[ 0 ].Value <<= aStr;
- xPropertyAccess->setPropertyValues( aMediaDescriptor );
- bRet = xExecutableDialog->execute() == com::sun::star::ui::dialogs::ExecutableDialogResults::OK;
- }
- }
- return bRet;
-#endif
-}
-
-// ------------------------------------------------------------------------
-
const FilterErrorEx& GraphicFilter::GetLastError() const
{
return *pErrorEx;
diff --git a/vcl/source/filter/graphicfilter2.cxx b/vcl/source/filter/graphicfilter2.cxx
index 3cf7abfef5a1..22bb1891bef4 100644
--- a/vcl/source/filter/graphicfilter2.cxx
+++ b/vcl/source/filter/graphicfilter2.cxx
@@ -22,8 +22,7 @@
#include <stdio.h>
#include <tools/stream.hxx>
#include <vcl/outdev.hxx>
-#include <svtools/filter.hxx>
-#include "FilterConfigCache.hxx"
+#include <vcl/graphicfilter.hxx>
#include <unotools/ucbstreamhelper.hxx>
#define DATA_SIZE 640
diff --git a/vcl/source/filter/jpeg/jpeg.cxx b/vcl/source/filter/jpeg/jpeg.cxx
index 6bd130d9a727..3c0fe9c429dc 100644
--- a/vcl/source/filter/jpeg/jpeg.cxx
+++ b/vcl/source/filter/jpeg/jpeg.cxx
@@ -24,15 +24,15 @@ extern "C"
{
#include "stdio.h"
#include "jpeg.h"
- #include "jpeglib.h"
- #include "jerror.h"
+ #include <jpeg/jpeglib.h>
+ #include <jpeg/jerror.h>
}
#define _JPEGPRIVATE
#include <vcl/bmpacc.hxx>
#include "jpeg.hxx"
-#include <svtools/FilterConfigItem.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/FilterConfigItem.hxx>
+#include <vcl/graphicfilter.hxx>
// -----------
// - Defines -
diff --git a/vcl/source/filter/jpeg/jpegc.c b/vcl/source/filter/jpeg/jpegc.c
index 528e19e51216..f9bcc07ca3df 100644
--- a/vcl/source/filter/jpeg/jpegc.c
+++ b/vcl/source/filter/jpeg/jpegc.c
@@ -20,8 +20,8 @@
#include <stdio.h>
#include <stdlib.h>
#include "setjmp.h"
-#include "jpeglib.h"
-#include "jerror.h"
+#include "jpeg/jpeglib.h"
+#include "jpeg/jerror.h"
#include "jpeg.h"
#include "rtl/alloc.h"
#include "osl/diagnose.h"
diff --git a/vcl/source/filter/sgvmain.cxx b/vcl/source/filter/sgvmain.cxx
index 667856464164..aea90fbb9ee1 100644
--- a/vcl/source/filter/sgvmain.cxx
+++ b/vcl/source/filter/sgvmain.cxx
@@ -22,7 +22,7 @@
#include <osl/endian.h>
#include <vcl/graph.hxx>
#include <tools/poly.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include "sgffilt.hxx"
#include "sgfbram.hxx"
#include "sgvmain.hxx"
diff --git a/vcl/source/filter/sgvtext.cxx b/vcl/source/filter/sgvtext.cxx
index 235f36808298..ed4846b3bf17 100644
--- a/vcl/source/filter/sgvtext.cxx
+++ b/vcl/source/filter/sgvtext.cxx
@@ -21,7 +21,7 @@
#include <rtl/math.h>
#include <comphelper/string.hxx>
#include <tools/config.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include "sgffilt.hxx"
#include "sgfbram.hxx"
#include "sgvmain.hxx"
diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx
index f9f38e09eb92..0d6276a8f3df 100644
--- a/vcl/source/filter/wmf/winwmf.cxx
+++ b/vcl/source/filter/wmf/winwmf.cxx
@@ -21,7 +21,7 @@
#include "winmtf.hxx"
#include <boost/scoped_array.hpp>
#include <vcl/gdimtf.hxx>
-#include <svtools/wmf.hxx>
+#include <vcl/wmf.hxx>
#include <rtl/crc.h>
#include <rtl/tencinfo.h>
#include <osl/endian.h>
diff --git a/vcl/source/filter/wmf/wmf.cxx b/vcl/source/filter/wmf/wmf.cxx
index 9c3b7e6dc0e7..26f7a1a0ba81 100644
--- a/vcl/source/filter/wmf/wmf.cxx
+++ b/vcl/source/filter/wmf/wmf.cxx
@@ -21,7 +21,7 @@
#include "winmtf.hxx"
#include "emfwr.hxx"
#include "wmfwr.hxx"
-#include <svtools/wmf.hxx>
+#include <vcl/wmf.hxx>
#include <comphelper/scopeguard.hxx>
// -----------------------------------------------------------------------------
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 58a67cd0d486..d7422a061cf2 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -39,15 +39,16 @@
#include <com/sun/star/text/RelOrientation.hpp>
#include <com/sun/star/text/WrapTextMode.hpp>
#include <rtl/tencinfo.h>
-#include <svtools/wmf.hxx>
#include <svl/lngmisc.hxx>
#include <unotools/ucbstreamhelper.hxx>
#include <unotools/streamwrap.hxx>
#include <com/sun/star/drawing/XDrawPageSupplier.hpp>
#include <rtl/ustring.hxx>
-#include <vcl/graph.hxx>
#include <svtools/grfmgr.hxx>
+#include <vcl/graph.hxx>
+#include <vcl/outdev.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/wmf.hxx>
#include <filter/msfilter/util.hxx>
#include <filter/msfilter/escherex.hxx>
#include <comphelper/string.hxx>