[Libreoffice-commits] .: 9 commits - cppcanvas/source cui/source desktop/source editeng/source filter/qa filter/source forms/source framework/source oox/source sc/source sd/source sfx2/inc sfx2/source svgio/source svtools/bmpmaker svtools/CppunitTest_svtools_filters_test.mk svtools/inc svtools/Library_svt.mk svtools/Module_svtools.mk svtools/Package_inc.mk svtools/qa svtools/source svx/source sw/source test/source tubes/source vcl/CppunitTest_vcl_filters_test.mk vcl/inc vcl/Library_vcl.mk vcl/Module_vcl.mk vcl/Package_inc.mk vcl/qa vcl/source vcl/win writerfilter/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Jan 4 12:11:43 PST 2013
cppcanvas/source/mtfrenderer/emfplus.cxx | 2
cui/source/dialogs/SpellDialog.cxx | 2
cui/source/dialogs/about.cxx | 2
cui/source/dialogs/cuigaldlg.cxx | 2
cui/source/dialogs/thesdlg.cxx | 2
cui/source/options/personalization.cxx | 16
desktop/source/app/app.cxx | 2
dev/null |binary
editeng/source/editeng/editview.cxx | 2
editeng/source/items/frmitems.cxx | 2
filter/qa/cppunit/filters-pict-test.cxx | 2
filter/qa/cppunit/filters-tga-test.cxx | 2
filter/qa/cppunit/filters-tiff-test.cxx | 2
filter/source/flash/impswfdialog.hxx | 2
filter/source/flash/swfexporter.cxx | 4
filter/source/flash/swfwriter1.cxx | 2
filter/source/graphicfilter/egif/egif.cxx | 2
filter/source/graphicfilter/epbm/epbm.cxx | 2
filter/source/graphicfilter/epgm/epgm.cxx | 2
filter/source/graphicfilter/epict/epict.cxx | 2
filter/source/graphicfilter/eppm/eppm.cxx | 2
filter/source/graphicfilter/eps/eps.cxx | 2
filter/source/graphicfilter/eras/eras.cxx | 2
filter/source/graphicfilter/etiff/etiff.cxx | 2
filter/source/graphicfilter/ipcd/ipcd.cxx | 2
filter/source/msfilter/escherex.cxx | 2
filter/source/msfilter/msdffimp.cxx | 3
filter/source/pdf/impdialog.hxx | 2
filter/source/pdf/pdfexport.cxx | 4
filter/source/pdf/pdffilter.cxx | 2
filter/source/svg/impsvgdialog.hxx | 2
filter/source/svg/svgreader.cxx | 2
forms/source/component/imgprod.cxx | 2
framework/source/fwe/classes/addonsoptions.cxx | 2
framework/source/uielement/buttontoolbarcontroller.cxx | 2
framework/source/uielement/imagebuttontoolbarcontroller.cxx | 2
framework/source/uielement/togglebuttontoolbarcontroller.cxx | 2
oox/source/helper/graphichelper.cxx | 2
sc/source/filter/excel/excimp8.cxx | 2
sc/source/filter/excel/xiescher.cxx | 2
sc/source/filter/html/htmlpars.cxx | 2
sc/source/ui/drawfunc/fuins1.cxx | 2
sc/source/ui/view/viewfun4.cxx | 2
sd/source/filter/eppt/eppt.cxx | 2
sd/source/filter/eppt/pptx-epptbase.cxx | 2
sd/source/filter/grf/sdgrffilter.cxx | 2
sd/source/filter/html/htmlex.cxx | 4
sd/source/filter/html/pubdlg.cxx | 2
sd/source/filter/html/sdhtmlfilter.cxx | 2
sd/source/ui/app/sddll.cxx | 2
sd/source/ui/dlg/filedlg.cxx | 2
sd/source/ui/docshell/docshell.cxx | 2
sd/source/ui/unoidl/sddetect.cxx | 4
sd/source/ui/unoidl/unopage.cxx | 2
sd/source/ui/view/sdview4.cxx | 2
sfx2/inc/sfx2/opengrf.hxx | 2
sfx2/source/appl/appmisc.cxx | 2
sfx2/source/appl/fileobj.cxx | 2
sfx2/source/dialog/filedlghelper.cxx | 2
sfx2/source/menu/mnumgr.cxx | 2
sfx2/source/menu/thessubmenu.cxx | 2
svgio/source/svgreader/svgimagenode.cxx | 2
svtools/CppunitTest_svtools_filters_test.mk | 62
svtools/Library_svt.mk | 24
svtools/Module_svtools.mk | 6
svtools/Package_inc.mk | 3
svtools/bmpmaker/g2g.cxx | 2
svtools/inc/svtools/FilterConfigItem.hxx | 86
svtools/inc/svtools/filter.hxx | 360 -
svtools/inc/svtools/fltcall.hxx | 2
svtools/inc/svtools/wmf.hxx | 67
svtools/qa/cppunit/data/README | 7
svtools/qa/cppunit/data/bmp/indeterminate/.gitignore | 1
svtools/qa/cppunit/data/bmp/pass/CVE-2008-5870-1.bmp | 1
svtools/qa/cppunit/data/gif/fail/CVE-2008-5937-1.gif | 1
svtools/qa/cppunit/data/gif/pass/EDB-19333-1.gif | 1
svtools/qa/cppunit/data/png/fail/CVE-2004-0597-1.png | 3
svtools/qa/cppunit/data/png/fail/CVE-2009-1511-1.png | 1
svtools/qa/cppunit/data/wmf/fail/CVE-2006-0143-1.wmf | 1
svtools/qa/cppunit/data/wmf/indeterminate/.gitignore | 1
svtools/qa/cppunit/data/wmf/pass/CVE-2006-4071-1.wmf | 1
svtools/qa/cppunit/filters-test.cxx | 108
svtools/source/filter/FilterConfigCache.cxx | 561 --
svtools/source/filter/FilterConfigCache.hxx | 131
svtools/source/filter/FilterConfigItem.cxx | 439 -
svtools/source/filter/SvFilterOptionsDialog.cxx | 13
svtools/source/filter/exportdialog.cxx | 4
svtools/source/filter/filter.cxx | 2449 ----------
svtools/source/filter/filter2.cxx | 1135 ----
svtools/source/filter/igif/decode.cxx | 207
svtools/source/filter/igif/decode.hxx | 60
svtools/source/filter/igif/gifread.cxx | 865 ---
svtools/source/filter/ixbm/xbmread.cxx | 385 -
svtools/source/filter/ixpm/rgbtable.hxx | 689 --
svtools/source/filter/ixpm/xpmread.cxx | 682 --
svtools/source/filter/jpeg/jpeg.cxx | 777 ---
svtools/source/filter/jpeg/jpeg.h | 64
svtools/source/filter/jpeg/jpegc.c | 278 -
svtools/source/filter/sgf.ini | 136
svtools/source/filter/sgfbram.cxx | 532 --
svtools/source/filter/sgvmain.cxx | 966 ---
svtools/source/filter/sgvspln.cxx | 861 ---
svtools/source/filter/sgvtext.cxx | 1277 -----
svtools/source/filter/wmf/emfwr.cxx | 1625 ------
svtools/source/filter/wmf/emfwr.hxx | 105
svtools/source/filter/wmf/enhwmf.cxx | 1418 -----
svtools/source/filter/wmf/winmtf.cxx | 2239 ---------
svtools/source/filter/wmf/winmtf.hxx | 890 ---
svtools/source/filter/wmf/winwmf.cxx | 1503 ------
svtools/source/filter/wmf/wmf.cxx | 110
svtools/source/filter/wmf/wmfwr.cxx | 2052 --------
svtools/source/filter/wmf/wmfwr.hxx | 220
svtools/source/graphic/descriptor.cxx | 2
svtools/source/graphic/provider.cxx | 4
svtools/source/inc/gifread.hxx | 133
svtools/source/inc/jpeg.hxx | 123
svtools/source/inc/sgfbram.hxx | 151
svtools/source/inc/sgffilt.hxx | 40
svtools/source/inc/sgvmain.hxx | 352 -
svtools/source/inc/sgvspln.hxx | 63
svtools/source/inc/xbmread.hxx | 87
svtools/source/inc/xpmread.hxx | 123
svtools/source/misc/embedhlp.cxx | 2
svtools/source/misc/transfer.cxx | 2
svx/source/core/extedit.cxx | 2
svx/source/core/graphichelper.cxx | 2
svx/source/dialog/compressgraphicdialog.cxx | 2
svx/source/gallery2/galbrws2.cxx | 2
svx/source/gallery2/galctrl.cxx | 2
svx/source/gallery2/galmisc.cxx | 4
svx/source/svdraw/svdograf.cxx | 4
svx/source/svdraw/svdoole2.cxx | 2
svx/source/unodraw/UnoGraphicExporter.cxx | 4
svx/source/unodraw/unoshap2.cxx | 4
svx/source/unodraw/unoshap4.cxx | 4
svx/source/unodraw/unoshape.cxx | 2
svx/source/xml/xmlgrhlp.cxx | 2
svx/source/xoutdev/_xoutbmp.cxx | 4
sw/source/core/graphic/ndgrf.cxx | 2
sw/source/core/ole/ndole.cxx | 2
sw/source/filter/writer/writer.cxx | 2
sw/source/filter/ww1/fltshell.cxx | 2
sw/source/filter/ww1/w1filter.cxx | 3
sw/source/filter/ww8/wrtw8esh.cxx | 2
sw/source/filter/ww8/wrtww8gr.cxx | 3
sw/source/filter/ww8/ww8graf2.cxx | 3
sw/source/filter/ww8/ww8par4.cxx | 3
sw/source/ui/dochdl/swdtflvr.cxx | 2
sw/source/ui/frmdlg/frmpage.cxx | 2
sw/source/ui/lingu/olmenu.cxx | 2
sw/source/ui/shells/basesh.cxx | 2
sw/source/ui/shells/grfshex.cxx | 2
sw/source/ui/shells/textsh.cxx | 2
sw/source/ui/uiview/view2.cxx | 2
sw/source/ui/uno/swdetect.cxx | 2
sw/source/ui/utlui/glbltree.cxx | 2
sw/source/ui/utlui/navipi.cxx | 2
test/source/bootstrapfixture.cxx | 2
tubes/source/contacts.cxx | 2
vcl/CppunitTest_vcl_filters_test.mk | 68
vcl/Library_vcl.mk | 24
vcl/Module_vcl.mk | 4
vcl/Package_inc.mk | 3
vcl/inc/vcl/FilterConfigItem.hxx | 87
vcl/inc/vcl/graphicfilter.hxx | 332 +
vcl/inc/vcl/settings.hxx | 9
vcl/inc/vcl/wmf.hxx | 70
vcl/qa/cppunit/graphicfilter/data/README | 7
vcl/qa/cppunit/graphicfilter/data/bmp/indeterminate/.gitignore | 1
vcl/qa/cppunit/graphicfilter/data/bmp/pass/CVE-2004-0691-1.bmp |binary
vcl/qa/cppunit/graphicfilter/data/bmp/pass/CVE-2006-0006-1.bmp |binary
vcl/qa/cppunit/graphicfilter/data/bmp/pass/CVE-2007-2244-1.bmp |binary
vcl/qa/cppunit/graphicfilter/data/bmp/pass/CVE-2008-5870-1.bmp | 1
vcl/qa/cppunit/graphicfilter/data/bmp/pass/EDB-22680-1.bmp |binary
vcl/qa/cppunit/graphicfilter/data/emf/fail/CVE-2004-0209-1.emf |binary
vcl/qa/cppunit/graphicfilter/data/emf/fail/CVE-2008-1083-1.emf |binary
vcl/qa/cppunit/graphicfilter/data/emf/fail/CVE-2009-1217-1.emf |binary
vcl/qa/cppunit/graphicfilter/data/emf/pass/CVE-2008-1087-1.emf |binary
vcl/qa/cppunit/graphicfilter/data/emf/pass/CVE-2008-2245-1.emf |binary
vcl/qa/cppunit/graphicfilter/data/emf/pass/fdo38580-3.emf |binary
vcl/qa/cppunit/graphicfilter/data/gif/fail/CVE-2007-3958-1.gif |binary
vcl/qa/cppunit/graphicfilter/data/gif/fail/CVE-2008-5937-1.gif | 1
vcl/qa/cppunit/graphicfilter/data/gif/pass/CVE-2007-6715-1.gif |binary
vcl/qa/cppunit/graphicfilter/data/gif/pass/CVE-2008-3013-1.gif |binary
vcl/qa/cppunit/graphicfilter/data/gif/pass/CVE-2011-2131-1.gif |binary
vcl/qa/cppunit/graphicfilter/data/gif/pass/CVE-2012-0282-1.gif |binary
vcl/qa/cppunit/graphicfilter/data/gif/pass/EDB-19333-1.gif | 1
vcl/qa/cppunit/graphicfilter/data/jpg/fail/CVE-2004-0200-1.jpg |binary
vcl/qa/cppunit/graphicfilter/data/jpg/fail/CVE-2004-0200-4.jpg |binary
vcl/qa/cppunit/graphicfilter/data/jpg/fail/CVE-2008-5314-1.jpg |binary
vcl/qa/cppunit/graphicfilter/data/jpg/pass/CVE-2004-0200-2.jpg |binary
vcl/qa/cppunit/graphicfilter/data/jpg/pass/CVE-2004-0200-3.jpg |binary
vcl/qa/cppunit/graphicfilter/data/jpg/pass/CVE-2004-0200-5.jpg |binary
vcl/qa/cppunit/graphicfilter/data/png/fail/CVE-2004-0597-1.png | 3
vcl/qa/cppunit/graphicfilter/data/png/fail/CVE-2005-0633-1.png |binary
vcl/qa/cppunit/graphicfilter/data/png/fail/CVE-2006-7210-1.png |binary
vcl/qa/cppunit/graphicfilter/data/png/fail/CVE-2007-2365-1.png |binary
vcl/qa/cppunit/graphicfilter/data/png/fail/CVE-2009-1511-1.png | 1
vcl/qa/cppunit/graphicfilter/data/png/pass/black.png |binary
vcl/qa/cppunit/graphicfilter/data/sgv/pass/SaveAsPicture.sgv |binary
vcl/qa/cppunit/graphicfilter/data/sgv/pass/faxpfeil.sgv |binary
vcl/qa/cppunit/graphicfilter/data/wmf/fail/CVE-2005-2123-1.wmf-0.009-676 |binary
vcl/qa/cppunit/graphicfilter/data/wmf/fail/CVE-2005-2124-1.wmf |binary
vcl/qa/cppunit/graphicfilter/data/wmf/fail/CVE-2005-4560-1.wmf |binary
vcl/qa/cppunit/graphicfilter/data/wmf/fail/CVE-2006-0143-1.wmf | 1
vcl/qa/cppunit/graphicfilter/data/wmf/fail/CVE-2006-0143-2.wmf |binary
vcl/qa/cppunit/graphicfilter/data/wmf/indeterminate/.gitignore | 1
vcl/qa/cppunit/graphicfilter/data/wmf/pass/CVE-2005-2123-1.wmf |binary
vcl/qa/cppunit/graphicfilter/data/wmf/pass/CVE-2006-4071-1.wmf | 1
vcl/qa/cppunit/graphicfilter/data/wmf/pass/CVE-2007-1090-1.wmf |binary
vcl/qa/cppunit/graphicfilter/data/wmf/pass/CVE-2007-1238-1.wmf |binary
vcl/qa/cppunit/graphicfilter/data/wmf/pass/CVE-2007-1245-1.wmf |binary
vcl/qa/cppunit/graphicfilter/filters-test.cxx | 110
vcl/source/app/settings.cxx | 110
vcl/source/filter/FilterConfigCache.cxx | 562 ++
vcl/source/filter/FilterConfigCache.hxx | 130
vcl/source/filter/FilterConfigItem.cxx | 439 +
vcl/source/filter/graphicfilter.cxx | 2398 +++++++++
vcl/source/filter/graphicfilter2.cxx | 1134 ++++
vcl/source/filter/igif/decode.cxx | 207
vcl/source/filter/igif/decode.hxx | 60
vcl/source/filter/igif/gifread.cxx | 865 +++
vcl/source/filter/igif/gifread.hxx | 133
vcl/source/filter/ixbm/xbmread.cxx | 385 +
vcl/source/filter/ixbm/xbmread.hxx | 87
vcl/source/filter/ixpm/rgbtable.hxx | 689 ++
vcl/source/filter/ixpm/xpmread.cxx | 682 ++
vcl/source/filter/ixpm/xpmread.hxx | 123
vcl/source/filter/jpeg/jpeg.cxx | 777 +++
vcl/source/filter/jpeg/jpeg.h | 64
vcl/source/filter/jpeg/jpeg.hxx | 123
vcl/source/filter/jpeg/jpegc.c | 278 +
vcl/source/filter/sgf.ini | 136
vcl/source/filter/sgfbram.cxx | 532 ++
vcl/source/filter/sgfbram.hxx | 151
vcl/source/filter/sgffilt.hxx | 40
vcl/source/filter/sgvmain.cxx | 966 +++
vcl/source/filter/sgvmain.hxx | 352 +
vcl/source/filter/sgvspln.cxx | 861 +++
vcl/source/filter/sgvspln.hxx | 63
vcl/source/filter/sgvtext.cxx | 1277 +++++
vcl/source/filter/wmf/emfwr.cxx | 1625 ++++++
vcl/source/filter/wmf/emfwr.hxx | 105
vcl/source/filter/wmf/enhwmf.cxx | 1418 +++++
vcl/source/filter/wmf/winmtf.cxx | 2239 +++++++++
vcl/source/filter/wmf/winmtf.hxx | 890 +++
vcl/source/filter/wmf/winwmf.cxx | 1503 ++++++
vcl/source/filter/wmf/wmf.cxx | 110
vcl/source/filter/wmf/wmfwr.cxx | 2052 ++++++++
vcl/source/filter/wmf/wmfwr.hxx | 220
vcl/source/gdi/outdev2.cxx | 65
vcl/source/gdi/outdev6.cxx | 4
vcl/source/window/dockingarea.cxx | 28
vcl/source/window/menu.cxx | 61
vcl/win/source/gdi/salnativewidgets-luna.cxx | 2
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 5
256 files changed, 24711 insertions(+), 24689 deletions(-)
New commits:
commit 4a4627eba410df933d004170d9f5638526acaed2
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Jan 4 21:07:57 2013 +0100
Personas: Fix copy constructor + always reference the Application settings
...to avoid reading the bitmaps more than once.
Change-Id: I7577f5df96a5a28f1ac1f800867af5eee298663e
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index abaff95..17d523d 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -305,8 +305,8 @@ ImplStyleData::ImplStyleData( const ImplStyleData& rData ) :
maDialogStyle( rData.maDialogStyle ),
maFrameStyle( rData.maFrameStyle ),
maPersonaHeaderFooter( rData.maPersonaHeaderFooter ),
- mpPersonaHeaderBitmap( NULL ),
- mpPersonaFooterBitmap( NULL )
+ mpPersonaHeaderBitmap( rData.mpPersonaHeaderBitmap? new BitmapEx( *rData.mpPersonaHeaderBitmap ): NULL ),
+ mpPersonaFooterBitmap( rData.mpPersonaFooterBitmap? new BitmapEx( *rData.mpPersonaFooterBitmap ): NULL )
{
mnRefCount = 1;
mnBorderSize = rData.mnBorderSize;
diff --git a/vcl/source/window/dockingarea.cxx b/vcl/source/window/dockingarea.cxx
index 81f67db..7d97dd9 100644
--- a/vcl/source/window/dockingarea.cxx
+++ b/vcl/source/window/dockingarea.cxx
@@ -50,7 +50,7 @@ DockingAreaWindow::ImplData::~ImplData()
static void ImplInitBackground( DockingAreaWindow* pThis )
{
- const BitmapEx* pPersonaBitmap = pThis->GetSettings().GetStyleSettings().GetPersonaHeader();
+ const BitmapEx* pPersonaBitmap = Application::GetSettings().GetStyleSettings().GetPersonaHeader();
if ( pPersonaBitmap != NULL && pThis->GetAlign() == WINDOWALIGN_TOP )
{
Wallpaper aWallpaper( *pPersonaBitmap );
@@ -174,7 +174,7 @@ void DockingAreaWindow::Paint( const Rectangle& )
}
ControlState nState = CTRL_STATE_ENABLED;
- if ( GetAlign() == WINDOWALIGN_TOP && GetSettings().GetStyleSettings().GetPersonaHeader() )
+ if ( GetAlign() == WINDOWALIGN_TOP && Application::GetSettings().GetStyleSettings().GetPersonaHeader() )
Erase();
else if ( !ImplGetSVData()->maNWFData.mbDockingAreaSeparateTB )
{
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 64fe254..5fe08d1 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -3856,7 +3856,7 @@ static void ImplInitMenuWindow( Window* pWin, sal_Bool bFont, sal_Bool bMenuBar
pWin->SetPointFont( rStyleSettings.GetMenuFont() );
if( bMenuBar )
{
- const BitmapEx* pPersonaBitmap = rStyleSettings.GetPersonaHeader();
+ const BitmapEx* pPersonaBitmap = Application::GetSettings().GetStyleSettings().GetPersonaHeader();
if ( pPersonaBitmap != NULL )
{
Wallpaper aWallpaper( *pPersonaBitmap );
@@ -5503,7 +5503,7 @@ void MenuBarWindow::HighlightItem( sal_uInt16 nPos, sal_Bool bHighlight )
MenubarValue aControlValue;
aControlValue.maTopDockingAreaHeight = ImplGetTopDockingAreaHeight( this );
- if ( GetSettings().GetStyleSettings().GetPersonaHeader() )
+ if ( Application::GetSettings().GetStyleSettings().GetPersonaHeader() )
Erase();
else
{
@@ -5539,7 +5539,7 @@ void MenuBarWindow::HighlightItem( sal_uInt16 nPos, sal_Bool bHighlight )
MenubarValue aMenubarValue;
aMenubarValue.maTopDockingAreaHeight = ImplGetTopDockingAreaHeight( this );
- if ( GetSettings().GetStyleSettings().GetPersonaHeader() )
+ if ( Application::GetSettings().GetStyleSettings().GetPersonaHeader() )
Erase( aRect );
else
{
@@ -5775,7 +5775,7 @@ void MenuBarWindow::Paint( const Rectangle& )
MenubarValue aMenubarValue;
aMenubarValue.maTopDockingAreaHeight = ImplGetTopDockingAreaHeight( this );
- if ( GetSettings().GetStyleSettings().GetPersonaHeader() )
+ if ( Application::GetSettings().GetStyleSettings().GetPersonaHeader() )
Erase();
else
{
commit 6112d7b94201f785a722d1d9d9f4da826452d5c5
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Jan 4 04:34:25 2013 +0100
Kill workaround of i#75264 - it breaks drawing of a perfectly fine bitmap.
The case where it broke was a bitmap that is very wide (3000 pixels), but not
too tall - and the small height satisfied the aPosAry.mnDestHeight >
3*mnOutHeight condition.
Such workarounds that are triggered only in very rare cases are a bad idea in
general, unless there is a unit test. I've tested with the document from
i#75264, and it works for me - there were some improvements in the bitmap
scaling, hopefully the root cause is fixed by that, or maybe I just have more
memory; who knows.
Change-Id: I4b7a749378ef35469db78dfc680fc77f87bc4382
diff --git a/vcl/source/gdi/outdev2.cxx b/vcl/source/gdi/outdev2.cxx
index 31a789e..ab8e481 100644
--- a/vcl/source/gdi/outdev2.cxx
+++ b/vcl/source/gdi/outdev2.cxx
@@ -626,71 +626,6 @@ void OutputDevice::ImplDrawBitmap( const Point& rDestPt, const Size& rDestSize,
if ( nMirrFlags )
aBmp.Mirror( nMirrFlags );
- /* #i75264# (corrected with #i81576#)
- * sometimes a bitmap is scaled to a ridiculous size and drawn
- * to a quite normal VDev, so only a very small part of
- * the scaled bitmap will be visible. However actually scaling
- * the bitmap will use so much memory that we end with a crash.
- * Workaround: since only a small part of the scaled bitmap will
- * be actually drawn anyway (because of clipping on the device
- * boundary), limit the destination and source rectangles so
- * that the destination rectangle will overlap the device but only
- * be reasonably (say factor 2) larger than the device itself.
- */
- if( aPosAry.mnDestWidth > 2048 || aPosAry.mnDestHeight > 2048 )
- {
- if( meOutDevType == OUTDEV_WINDOW ||
- (meOutDevType == OUTDEV_VIRDEV && mpPDFWriter == 0 ) )
- {
- // #i81576# do the following trick only if there is overlap at all
- // else the formulae don't work
- // theoretically in this case we wouldn't need to draw the bitmap at all
- // however there are some esoteric case where that is needed
- if( aPosAry.mnDestX + aPosAry.mnDestWidth >= 0
- && aPosAry.mnDestX < mnOutWidth
- && aPosAry.mnDestY + aPosAry.mnDestHeight >= 0
- && aPosAry.mnDestY < mnOutHeight )
- {
- // reduce scaling to something reasonable taking into account the output size
- if( aPosAry.mnDestWidth > 3*mnOutWidth && aPosAry.mnSrcWidth )
- {
- const double nScaleX = aPosAry.mnDestWidth/double(aPosAry.mnSrcWidth);
-
- if( aPosAry.mnDestX + aPosAry.mnDestWidth > mnOutWidth )
- {
- aPosAry.mnDestWidth = Max(long(0),mnOutWidth-aPosAry.mnDestX);
- }
- if( aPosAry.mnDestX < 0 )
- {
- aPosAry.mnDestWidth += aPosAry.mnDestX;
- aPosAry.mnSrcX -= sal::static_int_cast<long>(aPosAry.mnDestX / nScaleX);
- aPosAry.mnDestX = 0;
- }
-
- aPosAry.mnSrcWidth = sal::static_int_cast<long>(aPosAry.mnDestWidth / nScaleX);
- }
-
- if( aPosAry.mnDestHeight > 3*mnOutHeight && aPosAry.mnSrcHeight != 0 )
- {
- const double nScaleY = aPosAry.mnDestHeight/double(aPosAry.mnSrcHeight);
-
- if( aPosAry.mnDestY + aPosAry.mnDestHeight > mnOutHeight )
- {
- aPosAry.mnDestHeight = Max(long(0),mnOutHeight-aPosAry.mnDestY);
- }
- if( aPosAry.mnDestY < 0 )
- {
- aPosAry.mnDestHeight += aPosAry.mnDestY;
- aPosAry.mnSrcY -= sal::static_int_cast<long>(aPosAry.mnDestY / nScaleY);
- aPosAry.mnDestY = 0;
- }
-
- aPosAry.mnSrcHeight = sal::static_int_cast<long>(aPosAry.mnDestHeight / nScaleY);
- }
- }
- }
- }
-
if ( aPosAry.mnSrcWidth && aPosAry.mnSrcHeight && aPosAry.mnDestWidth && aPosAry.mnDestHeight )
{
const double nScaleX = aPosAry.mnDestWidth / static_cast<double>( aPosAry.mnSrcWidth );
commit 3fc8c364cc58429bd840f47a80a9258de21ed131
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Jan 4 02:46:44 2013 +0100
Personas: Make the Persona working in the top docking area too.
Change-Id: I1d3986675ceb7a2748a77b736beb8a654a514e0d
diff --git a/vcl/source/window/dockingarea.cxx b/vcl/source/window/dockingarea.cxx
index 8f2adee..81f67db 100644
--- a/vcl/source/window/dockingarea.cxx
+++ b/vcl/source/window/dockingarea.cxx
@@ -50,7 +50,27 @@ DockingAreaWindow::ImplData::~ImplData()
static void ImplInitBackground( DockingAreaWindow* pThis )
{
- if( !pThis->IsNativeControlSupported( CTRL_TOOLBAR, PART_ENTIRE_CONTROL ) )
+ const BitmapEx* pPersonaBitmap = pThis->GetSettings().GetStyleSettings().GetPersonaHeader();
+ if ( pPersonaBitmap != NULL && pThis->GetAlign() == WINDOWALIGN_TOP )
+ {
+ Wallpaper aWallpaper( *pPersonaBitmap );
+ aWallpaper.SetStyle( WALLPAPER_TOPRIGHT );
+
+ // we need to shift the bitmap vertically so that it spans over the
+ // menubar conveniently
+ long nMenubarHeight = 0;
+ SystemWindow *pSysWin = pThis->GetSystemWindow();
+ if ( pSysWin && pSysWin->GetMenuBar() )
+ {
+ Window *pMenubarWin = pSysWin->GetMenuBar()->GetWindow();
+ if ( pMenubarWin )
+ nMenubarHeight = pMenubarWin->GetOutputHeightPixel();
+ }
+ aWallpaper.SetRect( Rectangle( Point( 0, -nMenubarHeight ), Size( pThis->GetOutputWidthPixel(), pThis->GetOutputHeightPixel() + nMenubarHeight ) ) );
+
+ pThis->SetBackground( aWallpaper );
+ }
+ else if( !pThis->IsNativeControlSupported( CTRL_TOOLBAR, PART_ENTIRE_CONTROL ) )
{
Wallpaper aWallpaper;
aWallpaper.SetStyle( WALLPAPER_APPLICATIONGRADIENT );
@@ -127,6 +147,7 @@ void DockingAreaWindow::SetAlign( WindowAlign eNewAlign )
if( eNewAlign != mpImplData->meAlign )
{
mpImplData->meAlign = eNewAlign;
+ ImplInitBackground( this );
Invalidate();
}
}
@@ -153,7 +174,9 @@ void DockingAreaWindow::Paint( const Rectangle& )
}
ControlState nState = CTRL_STATE_ENABLED;
- if( !ImplGetSVData()->maNWFData.mbDockingAreaSeparateTB )
+ if ( GetAlign() == WINDOWALIGN_TOP && GetSettings().GetStyleSettings().GetPersonaHeader() )
+ Erase();
+ else if ( !ImplGetSVData()->maNWFData.mbDockingAreaSeparateTB )
{
// draw a single toolbar background covering the whole docking area
Point tmp;
@@ -231,6 +254,7 @@ void DockingAreaWindow::Paint( const Rectangle& )
void DockingAreaWindow::Resize()
{
+ ImplInitBackground( this );
ImplInvalidateMenubar( this );
if( IsNativeControlSupported( CTRL_TOOLBAR, PART_ENTIRE_CONTROL ) )
Invalidate();
commit 46505e82ad0f2bd9586e6c853e6e68635dc54007
Author: Jan Holesovsky <kendy at suse.cz>
Date: Thu Jan 3 16:12:00 2013 +0100
Personas: The Personas implementation is actually not Windows-specific.
Change-Id: I33d13cfece22c080e2204d7df10d3e9414b507b7
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index 13a4d32..7d31b0f 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -106,18 +106,6 @@ SvxPersonalizationTabPage::SvxPersonalizationTabPage( Window *pParent, const Sfx
get( m_pSelectPersona, "select_persona" );
m_pSelectPersona->SetClickHdl( LINK( this, SvxPersonalizationTabPage, SelectPersona ) );
-
-#ifndef __WIN32__
- // so far available for Windows only
- Window *pWindow;
- get( pWindow, "personas_label" );
- pWindow->Hide();
-
- m_pNoPersona->Hide();
- m_pDefaultPersona->Hide();
- m_pOwnPersona->Hide();
- m_pSelectPersona->Hide();
-#endif
}
SvxPersonalizationTabPage::~SvxPersonalizationTabPage()
commit 9ae27252a6a07f4b67a43be6c9289983f43b2e95
Author: Jan Holesovsky <kendy at suse.cz>
Date: Tue Jan 1 22:28:21 2013 +0100
Personas: Make the Persona in the menubar working.
Change-Id: I21a45159f6b27aa7beff5ec07530b14480675729
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 926438c..64fe254 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -3856,7 +3856,16 @@ static void ImplInitMenuWindow( Window* pWin, sal_Bool bFont, sal_Bool bMenuBar
pWin->SetPointFont( rStyleSettings.GetMenuFont() );
if( bMenuBar )
{
- if( pWin->IsNativeControlSupported( CTRL_MENUBAR, PART_ENTIRE_CONTROL ) )
+ const BitmapEx* pPersonaBitmap = rStyleSettings.GetPersonaHeader();
+ if ( pPersonaBitmap != NULL )
+ {
+ Wallpaper aWallpaper( *pPersonaBitmap );
+ aWallpaper.SetStyle( WALLPAPER_TOPRIGHT );
+ pWin->SetBackground( aWallpaper );
+ pWin->SetPaintTransparent( sal_False );
+ pWin->SetParentClipMode( 0 );
+ }
+ else if ( pWin->IsNativeControlSupported( CTRL_MENUBAR, PART_ENTIRE_CONTROL ) )
{
pWin->SetBackground(); // background will be drawn by NWF
}
@@ -5494,13 +5503,19 @@ void MenuBarWindow::HighlightItem( sal_uInt16 nPos, sal_Bool bHighlight )
MenubarValue aControlValue;
aControlValue.maTopDockingAreaHeight = ImplGetTopDockingAreaHeight( this );
- Point tmp(0,0);
- Rectangle aBgRegion( tmp, GetOutputSizePixel() );
- DrawNativeControl( CTRL_MENUBAR, PART_ENTIRE_CONTROL,
- aBgRegion,
- CTRL_STATE_ENABLED,
- aControlValue,
- OUString() );
+ if ( GetSettings().GetStyleSettings().GetPersonaHeader() )
+ Erase();
+ else
+ {
+ Point tmp(0,0);
+ Rectangle aBgRegion( tmp, GetOutputSizePixel() );
+ DrawNativeControl( CTRL_MENUBAR, PART_ENTIRE_CONTROL,
+ aBgRegion,
+ CTRL_STATE_ENABLED,
+ aControlValue,
+ OUString() );
+ }
+
ImplAddNWFSeparator( this, aControlValue );
// draw selected item
@@ -5524,12 +5539,18 @@ void MenuBarWindow::HighlightItem( sal_uInt16 nPos, sal_Bool bHighlight )
MenubarValue aMenubarValue;
aMenubarValue.maTopDockingAreaHeight = ImplGetTopDockingAreaHeight( this );
- // use full window size to get proper gradient
- // but clip accordingly
- Point aPt;
- Rectangle aCtrlRect( aPt, GetOutputSizePixel() );
+ if ( GetSettings().GetStyleSettings().GetPersonaHeader() )
+ Erase( aRect );
+ else
+ {
+ // use full window size to get proper gradient
+ // but clip accordingly
+ Point aPt;
+ Rectangle aCtrlRect( aPt, GetOutputSizePixel() );
+
+ DrawNativeControl( CTRL_MENUBAR, PART_ENTIRE_CONTROL, aCtrlRect, CTRL_STATE_ENABLED, aMenubarValue, rtl::OUString() );
+ }
- DrawNativeControl( CTRL_MENUBAR, PART_ENTIRE_CONTROL, aCtrlRect, CTRL_STATE_ENABLED, aMenubarValue, rtl::OUString() );
ImplAddNWFSeparator( this, aMenubarValue );
}
else
@@ -5751,13 +5772,19 @@ void MenuBarWindow::Paint( const Rectangle& )
if( IsNativeControlSupported( CTRL_MENUBAR, PART_ENTIRE_CONTROL) )
{
- Point aPt;
- Rectangle aCtrlRegion( aPt, GetOutputSizePixel() );
-
MenubarValue aMenubarValue;
aMenubarValue.maTopDockingAreaHeight = ImplGetTopDockingAreaHeight( this );
- DrawNativeControl( CTRL_MENUBAR, PART_ENTIRE_CONTROL, aCtrlRegion, CTRL_STATE_ENABLED, aMenubarValue, rtl::OUString() );
+ if ( GetSettings().GetStyleSettings().GetPersonaHeader() )
+ Erase();
+ else
+ {
+ Point aPt;
+ Rectangle aCtrlRegion( aPt, GetOutputSizePixel() );
+
+ DrawNativeControl( CTRL_MENUBAR, PART_ENTIRE_CONTROL, aCtrlRegion, CTRL_STATE_ENABLED, aMenubarValue, rtl::OUString() );
+ }
+
ImplAddNWFSeparator( this, aMenubarValue );
}
SetFillColor( GetSettings().GetStyleSettings().GetMenuColor() );
diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx
index abed118..0ec6af1 100644
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx
@@ -449,7 +449,7 @@ void ImplConvertSpinbuttonValues( int nControlPart, const ControlState& rState,
}
/// Draw an own toolbar style on Windows Vista or later, looks better there
-void impl_drawAeroToolbar( HDC hDC, RECT rc, bool bHorizontal )
+static void impl_drawAeroToolbar( HDC hDC, RECT rc, bool bHorizontal )
{
if ( rc.top == 0 && bHorizontal )
{
commit 8dd6431da661390f16c1b425eab0b497c9c2c33a
Author: Jan Holesovsky <kendy at suse.cz>
Date: Thu Jan 3 15:22:09 2013 +0100
Fix base location of the bitmap Wallpaper computation.
The nX / nY is correct for clipping operation, but not for base; visible with
WALLPAPER_TOPRIGHT style.
Change-Id: I8de92b68b822a156bc376201e97ce458d1a6ba08
diff --git a/vcl/source/gdi/outdev6.cxx b/vcl/source/gdi/outdev6.cxx
index 5efd7b6..46eb689 100644
--- a/vcl/source/gdi/outdev6.cxx
+++ b/vcl/source/gdi/outdev6.cxx
@@ -848,8 +848,8 @@ void OutputDevice::ImplDrawBitmapWallpaper( long nX, long nY,
}
else
{
- aPos = Point( nX, nY );
- aSize = Size( nWidth, nHeight );
+ aPos = Point( 0, 0 );
+ aSize = Size( mnOutWidth, mnOutHeight );
}
mpMetaFile = NULL;
commit a2500801cf2d337f176b074f9159df4925420af4
Author: Jan Holesovsky <kendy at suse.cz>
Date: Tue Jan 1 22:30:18 2013 +0100
Personas: Read the bitmaps in StyleSettings.
Change-Id: I52b67c82f69059a7d2babf1b49e59f27062cc02c
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index b33acae..13a4d32 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -146,7 +146,7 @@ sal_Bool SvxPersonalizationTabPage::FillItemSet( SfxItemSet & )
aPersona = "own";
bool bModified = false;
- uno::Reference< uno::XComponentContext > xContext = comphelper::getProcessComponentContext();
+ uno::Reference< uno::XComponentContext > xContext( comphelper::getProcessComponentContext() );
if ( xContext.is() &&
( aBackground != officecfg::Office::Common::Misc::BackgroundImage::get( xContext ) ||
m_aBackgroundURL != officecfg::Office::Common::Misc::BackgroundImageURL::get( xContext ) ||
@@ -171,7 +171,7 @@ sal_Bool SvxPersonalizationTabPage::FillItemSet( SfxItemSet & )
void SvxPersonalizationTabPage::Reset( const SfxItemSet & )
{
- uno::Reference< uno::XComponentContext > xContext = comphelper::getProcessComponentContext();
+ uno::Reference< uno::XComponentContext > xContext( comphelper::getProcessComponentContext() );
// background image
OUString aBackground( "default" );
diff --git a/vcl/inc/vcl/settings.hxx b/vcl/inc/vcl/settings.hxx
index 3a18de3..d4d4438 100644
--- a/vcl/inc/vcl/settings.hxx
+++ b/vcl/inc/vcl/settings.hxx
@@ -29,6 +29,7 @@
#include <i18npool/languagetag.hxx>
#include <unotools/syslocale.hxx>
+class BitmapEx;
class CollatorWrapper;
class LocaleDataWrapper;
@@ -347,6 +348,11 @@ private:
DialogStyle maDialogStyle;
FrameStyle maFrameStyle;
const void* mpFontOptions;
+
+ OUString maPersonaHeaderFooter; ///< Cache the settings to detect changes.
+
+ BitmapEx* mpPersonaHeaderBitmap; ///< Cache the header bitmap.
+ BitmapEx* mpPersonaFooterBitmap; ///< Cache the footer bitmap.
};
#define DEFAULT_WORKSPACE_GRADIENT_START_COLOR Color( 0xa3, 0xae, 0xb8 )
@@ -860,6 +866,9 @@ public:
void SetFrameStyle( const FrameStyle& rStyle )
{ CopyData(); mpData->maFrameStyle = rStyle; }
+ const BitmapEx* GetPersonaHeader() const;
+ const BitmapEx* GetPersonaFooter() const;
+
void SetStandardStyles();
const StyleSettings& operator =( const StyleSettings& rSet );
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 5370f1c..abaff95 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -17,9 +17,13 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <officecfg/Office/Common.hxx>
+
#include <svsys.h>
#include "comphelper/processfactory.hxx"
+#include <rtl/bootstrap.hxx>
#include "tools/debug.hxx"
+#include <vcl/graphicfilter.hxx>
#include "i18npool/mslangid.hxx"
#include "i18npool/languagetag.hxx"
@@ -38,7 +42,7 @@
#include "unotools/confignode.hxx"
#include "unotools/syslocaleoptions.hxx"
-using ::rtl::OUString;
+using namespace ::com::sun::star;
#include "svdata.hxx"
#include "impimagetree.hxx"
@@ -198,7 +202,10 @@ sal_Bool MouseSettings::operator ==( const MouseSettings& rSet ) const
// =======================================================================
-ImplStyleData::ImplStyleData()
+ImplStyleData::ImplStyleData() :
+ maPersonaHeaderFooter(),
+ mpPersonaHeaderBitmap( NULL ),
+ mpPersonaFooterBitmap( NULL )
{
mnRefCount = 1;
mnScrollBarSize = 16;
@@ -296,7 +303,10 @@ ImplStyleData::ImplStyleData( const ImplStyleData& rData ) :
maGroupFont( rData.maGroupFont ),
maWorkspaceGradient( rData.maWorkspaceGradient ),
maDialogStyle( rData.maDialogStyle ),
- maFrameStyle( rData.maFrameStyle )
+ maFrameStyle( rData.maFrameStyle ),
+ maPersonaHeaderFooter( rData.maPersonaHeaderFooter ),
+ mpPersonaHeaderBitmap( NULL ),
+ mpPersonaFooterBitmap( NULL )
{
mnRefCount = 1;
mnBorderSize = rData.mnBorderSize;
@@ -677,6 +687,100 @@ sal_Bool StyleSettings::GetUseImagesInMenus() const
// -----------------------------------------------------------------------
+static BitmapEx* readBitmapEx( const OUString& rPath )
+{
+ OUString aPath( rPath );
+ rtl::Bootstrap::expandMacros( aPath );
+
+ // import the image
+ Graphic aGraphic;
+ if ( GraphicFilter::LoadGraphic( aPath, String(), aGraphic ) != GRFILTER_OK )
+ return NULL;
+
+ const BitmapEx& rBitmap( aGraphic.GetBitmapEx() );
+ if ( rBitmap.IsEmpty() )
+ return NULL;
+
+ return new BitmapEx( rBitmap );
+}
+
+enum WhichPersona { PERSONA_HEADER, PERSONA_FOOTER };
+
+/** Update the setting of the Persona header / footer in ImplStyleData */
+static void setupPersonaHeaderFooter( WhichPersona eWhich, OUString& rHeaderFooter, BitmapEx*& pHeaderFooterBitmap )
+{
+ uno::Reference< uno::XComponentContext > xContext( comphelper::getProcessComponentContext() );
+ if ( !xContext.is() )
+ return;
+
+ // read from the configuration
+ OUString aPersona( officecfg::Office::Common::Misc::Persona::get( xContext ) );
+ OUString aPersonaSettings( officecfg::Office::Common::Misc::PersonaSettings::get( xContext ) );
+
+ // have the settings changed?
+ OUString aOldValue( aPersona + ";" + aPersonaSettings );
+ if ( rHeaderFooter == aOldValue )
+ return;
+
+ rHeaderFooter = aOldValue;
+
+ // now read the new values and setup bitmaps
+ OUString aHeader, aFooter;
+ if ( aPersona == "own" )
+ {
+ sal_Int32 nIndex = 0;
+ aHeader = aPersonaSettings.getToken( 0, ';', nIndex );
+ if ( nIndex > 0 )
+ aFooter = aPersonaSettings.getToken( 0, ';', nIndex );
+ }
+ else if ( aPersona == "default" )
+ {
+ aHeader = "header.jpg";
+ aFooter = "footer.jpg";
+ }
+
+ OUString aName;
+ switch ( eWhich ) {
+ case PERSONA_HEADER: aName = aHeader; break;
+ case PERSONA_FOOTER: aName = aFooter; break;
+ }
+
+ delete pHeaderFooterBitmap;
+ pHeaderFooterBitmap = NULL;
+
+ if ( !aName.isEmpty() )
+ {
+ // try the gallery first, then edition, and the program path if
+ // everything else fails
+ OUString gallery = "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap") "::UserInstallation}";
+ rtl::Bootstrap::expandMacros( gallery );
+ gallery += "/user/gallery/personas/";
+
+ if ( aPersona == "own" )
+ pHeaderFooterBitmap = readBitmapEx( gallery + aName );
+
+ if ( !pHeaderFooterBitmap )
+ pHeaderFooterBitmap = readBitmapEx( "$BRAND_BASE_DIR/program/edition/" + aName );
+
+ if ( !pHeaderFooterBitmap )
+ pHeaderFooterBitmap = readBitmapEx( "$BRAND_BASE_DIR/program/" + aName );
+ }
+}
+
+const BitmapEx* StyleSettings::GetPersonaHeader() const
+{
+ setupPersonaHeaderFooter( PERSONA_HEADER, mpData->maPersonaHeaderFooter, mpData->mpPersonaHeaderBitmap );
+ return mpData->mpPersonaHeaderBitmap;
+}
+
+const BitmapEx* StyleSettings::GetPersonaFooter() const
+{
+ setupPersonaHeaderFooter( PERSONA_FOOTER, mpData->maPersonaHeaderFooter, mpData->mpPersonaFooterBitmap );
+ return mpData->mpPersonaFooterBitmap;
+}
+
+// -----------------------------------------------------------------------
+
void StyleSettings::SetStandardStyles()
{
CopyData();
commit 0c22f3eadd3ffb461eada94f4b019fbb2161f197
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Jan 2 22:07:41 2013 +0100
Make LO buildable again after the GraphicFilter move.
Change-Id: I3455a7294b136400f32163626d5a7a7f2bfa898c
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
index ba04a9f..3c791d4 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 b4771de..4fa2cfe 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 cc62e89..2c9df74 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 4e50bb3..d443b5e 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 24f97b0..e94cbed 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 f7c6f43..adcf4b7 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 7d07aea..7814318 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 3377cb9..c457256 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 7f3313d..076c4dc 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 08c7998..3551ec6 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 fcf0203..aac646f 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 bfd9070..a76c98c 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 9c1f6b0..6b065ce 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 3efc36c..ce66447 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 e95d135..93be78c 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 f1b6c15..3f867bd 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 98edf9a..ef402a3 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 7ac44a7..23feea3 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 f238a84..469097e 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 68f7a3a..d3e0aa9 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 f5b008e..17f7f51 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 4ef3950..8a83d67 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 9eaea9f..4f6a334 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 2f1807e..9949d3d 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 5462151..f36d504 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 b6208d8..d289ca0 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 336cda2..c9f3133 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 29804e0..9a5c4ea 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 6a2a3af..40318e2 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 92b8fb9..5e9e994 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 799f817..46f688a 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 db213fd..44ee290 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 9c4d87b..270fd3e 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 e4432fa..e57af2e 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 04bff3d..3389286 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 512e9a1..5cb2b69 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 c4937f8..3ac5212 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 33036c0..6e16f27 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 d542b91..8e8103e 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 a5d6199..b0ac39e 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 21d2687..8c9bd9c 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 ac11be4..5d8959a 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 00c322b..4ba7d38 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 dd635ec..31f3b57 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 b2d7afa..4335dc0 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 946b79e..6376827 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 812b40a..08db75d 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 97b5a02..ba7bab9 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 b34b2cd..86610c9 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 66ed424..6488b0e 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 222251c..0431e6e 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 623b6fe..e769a1b 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 2dad995..b54b56c 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 c986744..70dce68 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 44a6d04..fb553a6 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 83a2252..385b8b0 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 cb3d784..abc47b0 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 cbbed60..f406c18 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 f4c5f47..b1075f4 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 b57bf80..8e933c0 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 fa01405..014807f 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 70871fb..604668f 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 85afa18..9be94a3 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 c0a8e01..9a3508c 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 361b060..ded1d84 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 320354b..7cce49b 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 e3ff04e..fdf73d6 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 0e9c9c3..dac6318 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 f49ebb6..1407087 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 4996c6d..5d6ac82 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 735b52e..e43a3ee 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 b44b262..7754075 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 723074a..2cc0c7c 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 1709ea4..ab827f0 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 ead880a..d72f477 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 9f3d0d0..944950c 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 f5c25e3..5ff8acf 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 5fd1aa3..c336391 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 5eef368..cb0760e 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 8d08bf7..d1467bf 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 8a02d44..6ce719e 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 27f3f07..c516b6f 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 6ba0969..19236eb 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 d428c14..4fb5058 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 a57f6fa..33a2df5 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 2b516de..02f10f4 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 d7a0216..71775aa 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 cb60fb6..21dd1bc 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 a634c30..24c4cd5 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 9aa1755..b2f867b 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 ed206c4..8707c22 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 778f2f6..c70ad3c 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 1e73c44..b9f90a0 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 322425d..3349fbf 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 2267a66..28bd60c 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 5b03eed..051b9dd 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 f337aa8..6cb9719 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 e8196c2..b24b34a 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 b31920f..428c91b 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 4af3d07..1a56086 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 020c742..b372ccc 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 c5d7557..4ccf329 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 9f4d46c..b1614d8 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 4eff264..f766149 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 e52ee2c..f6fd67b 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 91cce71..a6badfb2 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 b6db6ef..8cce39f 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 5c1b267..c3898bc 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 362acb3..116e815 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 3f37b74..53a7326 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 e20ebf8..b13f37a 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 23d0c72..f9a7ae1 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 66e2dca..ed0b5e2 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 bdf8269..bec3cc0 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:
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list