[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - 16 commits - basctl/source 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 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 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
Jan Holesovsky
kendy at suse.cz
Mon Mar 4 08:56:54 PST 2013
basctl/source/basicide/baside2b.cxx | 16
basctl/source/basicide/linenumberwindow.cxx | 3
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
desktop/source/app/app.cxx | 2
desktop/source/splash/splash.cxx | 2
dev/null |binary
editeng/source/editeng/editview.cxx | 2
editeng/source/items/frmitems.cxx | 2
editeng/source/rtf/rtfgrf.cxx | 4
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/presenter/PresenterHelper.hxx | 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
svtools/CppunitTest_svtools_filters_test.mk | 60
svtools/Library_svt.mk | 24
svtools/Module_svtools.mk | 4
svtools/Package_inc.mk | 3
svtools/bmpmaker/g2g.cxx | 2
svtools/inc/svtools/FilterConfigItem.hxx | 95
svtools/inc/svtools/filter.hxx | 380 -
svtools/inc/svtools/fltcall.hxx | 2
svtools/inc/svtools/wmf.hxx | 76
svtools/qa/cppunit/data/README | 7
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 | 101
svtools/source/filter/FilterConfigCache.cxx | 575 --
svtools/source/filter/FilterConfigCache.hxx | 144
svtools/source/filter/FilterConfigItem.cxx | 452 --
svtools/source/filter/SvFilterOptionsDialog.cxx | 13
svtools/source/filter/exportdialog.cxx | 4
svtools/source/filter/filter.cxx | 2250 ----------
svtools/source/filter/filter2.cxx | 1351 ------
svtools/source/filter/igif/decode.cxx | 216
svtools/source/filter/igif/decode.hxx | 69
svtools/source/filter/igif/gifread.cxx | 860 ---
svtools/source/filter/ixbm/xbmread.cxx | 394 -
svtools/source/filter/ixpm/rgbtable.hxx | 698 ---
svtools/source/filter/ixpm/xpmread.cxx | 699 ---
svtools/source/filter/jpeg/jpeg.cxx | 779 ---
svtools/source/filter/jpeg/jpeg.h | 73
svtools/source/filter/jpeg/jpegc.c | 287 -
svtools/source/filter/sgf.ini | 118
svtools/source/filter/sgfbram.cxx | 603 --
svtools/source/filter/sgvmain.cxx | 1073 ----
svtools/source/filter/sgvspln.cxx | 870 ---
svtools/source/filter/sgvtext.cxx | 1289 -----
svtools/source/filter/wmf/emfwr.cxx | 1443 ------
svtools/source/filter/wmf/emfwr.hxx | 102
svtools/source/filter/wmf/enhwmf.cxx | 1431 ------
svtools/source/filter/wmf/winmtf.cxx | 2244 ---------
svtools/source/filter/wmf/winmtf.hxx | 899 ---
svtools/source/filter/wmf/winwmf.cxx | 1522 ------
svtools/source/filter/wmf/wmf.cxx | 119
svtools/source/filter/wmf/wmfwr.cxx | 2084 ---------
svtools/source/filter/wmf/wmfwr.hxx | 229 -
svtools/source/graphic/descriptor.cxx | 2
svtools/source/graphic/provider.cxx | 4
svtools/source/inc/gifread.hxx | 143
svtools/source/inc/jpeg.hxx | 132
svtools/source/inc/sgfbram.hxx | 160
svtools/source/inc/sgffilt.hxx | 49
svtools/source/inc/sgvmain.hxx | 355 -
svtools/source/inc/sgvspln.hxx | 72
svtools/source/inc/xbmread.hxx | 96
svtools/source/inc/xpmread.hxx | 132
svtools/source/misc/embedhlp.cxx | 2
svtools/source/misc/transfer.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/docvw/extedit.cxx | 2
sw/source/ui/docvw/romenu.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 | 1
vcl/CppunitTest_vcl_filters_test.mk | 66
vcl/Library_vcl.mk | 27
vcl/Module_vcl.mk | 4
vcl/Package_inc.mk | 3
vcl/inc/vcl/FilterConfigItem.hxx | 96
vcl/inc/vcl/graphicfilter.hxx | 352 +
vcl/inc/vcl/settings.hxx | 9
vcl/inc/vcl/wmf.hxx | 79
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/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/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 | 107
vcl/source/app/settings.cxx | 76
vcl/source/control/ctrl.cxx | 13
vcl/source/filter/FilterConfigCache.cxx | 579 ++
vcl/source/filter/FilterConfigCache.hxx | 143
vcl/source/filter/FilterConfigItem.cxx | 452 ++
vcl/source/filter/graphicfilter.cxx | 2205 +++++++++
vcl/source/filter/graphicfilter2.cxx | 1350 ++++++
vcl/source/filter/igif/decode.cxx | 216
vcl/source/filter/igif/decode.hxx | 69
vcl/source/filter/igif/gifread.cxx | 860 +++
vcl/source/filter/igif/gifread.hxx | 143
vcl/source/filter/ixbm/xbmread.cxx | 394 +
vcl/source/filter/ixbm/xbmread.hxx | 96
vcl/source/filter/ixpm/rgbtable.hxx | 698 +++
vcl/source/filter/ixpm/xpmread.cxx | 699 +++
vcl/source/filter/ixpm/xpmread.hxx | 132
vcl/source/filter/jpeg/jpeg.cxx | 779 +++
vcl/source/filter/jpeg/jpeg.h | 73
vcl/source/filter/jpeg/jpeg.hxx | 132
vcl/source/filter/jpeg/jpegc.c | 287 +
vcl/source/filter/sgf.ini | 118
vcl/source/filter/sgfbram.cxx | 603 ++
vcl/source/filter/sgfbram.hxx | 160
vcl/source/filter/sgffilt.hxx | 49
vcl/source/filter/sgvmain.cxx | 1073 ++++
vcl/source/filter/sgvmain.hxx | 355 +
vcl/source/filter/sgvspln.cxx | 870 +++
vcl/source/filter/sgvspln.hxx | 72
vcl/source/filter/sgvtext.cxx | 1289 +++++
vcl/source/filter/wmf/emfwr.cxx | 1443 ++++++
vcl/source/filter/wmf/emfwr.hxx | 102
vcl/source/filter/wmf/enhwmf.cxx | 1431 ++++++
vcl/source/filter/wmf/winmtf.cxx | 2244 +++++++++
vcl/source/filter/wmf/winmtf.hxx | 899 +++
vcl/source/filter/wmf/winwmf.cxx | 1522 ++++++
vcl/source/filter/wmf/wmf.cxx | 119
vcl/source/filter/wmf/wmfwr.cxx | 2084 +++++++++
vcl/source/filter/wmf/wmfwr.hxx | 229 +
vcl/source/gdi/outdev2.cxx | 65
vcl/source/gdi/outdev6.cxx | 4
vcl/source/window/dockingarea.cxx | 30
vcl/source/window/menu.cxx | 63
vcl/source/window/split.cxx | 6
vcl/source/window/toolbox.cxx | 6
vcl/source/window/toolbox2.cxx | 3
vcl/win/source/gdi/salnativewidgets-luna.cxx | 2
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 5
253 files changed, 25033 insertions(+), 25001 deletions(-)
New commits:
commit 085f830c49d61f3eec433280ec465033eaa7babf
Author: Jan Holesovsky <kendy at suse.cz>
Date: Thu Jan 17 16:40:24 2013 +0100
Personas: Fix fdo#59208 - get rid of artifacts when we run out of bitmap.
So far I am using the same color that is used for the workspace; should it be
a problem, we can use a different color.
Change-Id: I06fde7f31a9d37d2e387a7e3fd0b6d3d33f8d6e6
diff --git a/vcl/source/window/dockingarea.cxx b/vcl/source/window/dockingarea.cxx
index 33b1c22..5c744a2 100644
--- a/vcl/source/window/dockingarea.cxx
+++ b/vcl/source/window/dockingarea.cxx
@@ -64,6 +64,7 @@ static void ImplInitBackground( DockingAreaWindow* pThis )
{
Wallpaper aWallpaper( rPersonaBitmap );
aWallpaper.SetStyle( WALLPAPER_TOPRIGHT );
+ aWallpaper.SetColor( Application::GetSettings().GetStyleSettings().GetWorkspaceColor() );
// we need to shift the bitmap vertically so that it spans over the
// menubar conveniently
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 66de4bf..e379523 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -3870,6 +3870,8 @@ static void ImplInitMenuWindow( Window* pWin, sal_Bool bFont, sal_Bool bMenuBar
{
Wallpaper aWallpaper( rPersonaBitmap );
aWallpaper.SetStyle( WALLPAPER_TOPRIGHT );
+ aWallpaper.SetColor( Application::GetSettings().GetStyleSettings().GetWorkspaceColor() );
+
pWin->SetBackground( aWallpaper );
pWin->SetPaintTransparent( sal_False );
pWin->SetParentClipMode( 0 );
commit 5579810492ce0a171d3a180a7158e6ae317cbc64
Author: Jan Holesovsky <kendy at suse.cz>
Date: Thu Jan 17 14:25:31 2013 +0100
Personas: Clear the BitmapEx first, so that we can switch off Personas.
[Also rename mpPersona*Bitmap -> maPersona*Bitmap, it is not a pointer.]
Conflicts:
vcl/source/app/settings.cxx
Change-Id: I93cc56b1f30c4fe966b8de87b766e820d9e2cefa
diff --git a/vcl/inc/vcl/settings.hxx b/vcl/inc/vcl/settings.hxx
index 6786483..09cda03 100644
--- a/vcl/inc/vcl/settings.hxx
+++ b/vcl/inc/vcl/settings.hxx
@@ -330,8 +330,8 @@ private:
rtl::OUString maPersonaHeaderFooter; ///< Cache the settings to detect changes.
- BitmapEx mpPersonaHeaderBitmap; ///< Cache the header bitmap.
- BitmapEx mpPersonaFooterBitmap; ///< Cache the footer bitmap.
+ BitmapEx maPersonaHeaderBitmap; ///< Cache the header bitmap.
+ BitmapEx maPersonaFooterBitmap; ///< Cache the footer bitmap.
};
#define DEFAULT_WORKSPACE_GRADIENT_START_COLOR Color( 0xa3, 0xae, 0xb8 )
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index ace45ad..c0325ce 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -212,8 +212,8 @@ sal_Bool MouseSettings::operator ==( const MouseSettings& rSet ) const
ImplStyleData::ImplStyleData() :
maPersonaHeaderFooter(),
- mpPersonaHeaderBitmap(),
- mpPersonaFooterBitmap()
+ maPersonaHeaderBitmap(),
+ maPersonaFooterBitmap()
{
mnRefCount = 1;
mnScrollBarSize = 16;
@@ -311,8 +311,8 @@ ImplStyleData::ImplStyleData( const ImplStyleData& rData ) :
maGroupFont( rData.maGroupFont ),
maWorkspaceGradient( rData.maWorkspaceGradient ),
maPersonaHeaderFooter( rData.maPersonaHeaderFooter ),
- mpPersonaHeaderBitmap( rData.mpPersonaHeaderBitmap ),
- mpPersonaFooterBitmap( rData.mpPersonaFooterBitmap )
+ maPersonaHeaderBitmap( rData.maPersonaHeaderBitmap ),
+ maPersonaFooterBitmap( rData.maPersonaFooterBitmap )
{
mnRefCount = 1;
mnBorderSize = rData.mnBorderSize;
@@ -730,14 +730,14 @@ static void setupPersonaHeaderFooter( WhichPersona eWhich, rtl::OUString& /*rHea
const BitmapEx StyleSettings::GetPersonaHeader() const
{
- setupPersonaHeaderFooter( PERSONA_HEADER, mpData->maPersonaHeaderFooter, mpData->mpPersonaHeaderBitmap );
- return mpData->mpPersonaHeaderBitmap;
+ setupPersonaHeaderFooter( PERSONA_HEADER, mpData->maPersonaHeaderFooter, mpData->maPersonaHeaderBitmap );
+ return mpData->maPersonaHeaderBitmap;
}
const BitmapEx StyleSettings::GetPersonaFooter() const
{
- setupPersonaHeaderFooter( PERSONA_FOOTER, mpData->maPersonaHeaderFooter, mpData->mpPersonaFooterBitmap );
- return mpData->mpPersonaFooterBitmap;
+ setupPersonaHeaderFooter( PERSONA_FOOTER, mpData->maPersonaHeaderFooter, mpData->maPersonaFooterBitmap );
+ return mpData->maPersonaFooterBitmap;
}
// -----------------------------------------------------------------------
commit 8713ae48fab49d066520dcf06746543e53783548
Author: Jan Holesovsky <kendy at suse.cz>
Date: Thu Jan 17 12:02:08 2013 +0100
Personas: Fix fdo#59230 - make Personas fully work in non-NWF case too.
Change-Id: I19a475f198fcb24c4d66134eb67da719fc99099e
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index dda343a..4951a2f 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -622,7 +622,8 @@ void ToolBox::ImplDrawBackground( ToolBox* pThis, const Rectangle &rRect )
if( !bNativeOk )
{
- if( !pThis->IsBackground() )
+ if( !pThis->IsBackground() ||
+ ( pThis->GetAlign() == WINDOWALIGN_TOP && !Application::GetSettings().GetStyleSettings().GetPersonaHeader().IsEmpty() ) )
{
if( !pThis->IsInPaint() )
ImplDrawTransparentBackground( pThis, aPaintRegion );
@@ -1662,7 +1663,8 @@ void ToolBox::ImplInitSettings( sal_Bool bFont,
}
else
{
- if( IsNativeControlSupported( CTRL_TOOLBAR, PART_ENTIRE_CONTROL ) )
+ if( IsNativeControlSupported( CTRL_TOOLBAR, PART_ENTIRE_CONTROL ) ||
+ ( GetAlign() == WINDOWALIGN_TOP && !Application::GetSettings().GetStyleSettings().GetPersonaHeader().IsEmpty() ) )
{
SetBackground();
SetPaintTransparent( sal_True );
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 1e04215..556fead 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -951,6 +951,9 @@ void ToolBox::SetAlign( WindowAlign eNewAlign )
else
mbHorz = sal_True;
+ // Update the background according to Persona if necessary
+ ImplInitSettings( sal_False, sal_False, sal_True );
+
// Hier alles neu ausgeben, da sich Border auch aendert
mbCalc = sal_True;
mbFormat = sal_True;
commit 7133e4ebada1473c7225af71da4adca07b8f94cd
Author: Jan Holesovsky <kendy at suse.cz>
Date: Thu Jan 17 10:40:06 2013 +0100
Personas: Fix one more potential crash.
Change-Id: Ib7aca26c34aa8484e8c71873805ca8e8812526a7
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index cd1c7df..d725b0b 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -438,16 +438,17 @@ void Control::DataChanged( const DataChangedEvent& rDCEvt)
(rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
(rDCEvt.GetFlags() & SETTINGS_STYLE) )
{
- AllSettings aSettings = GetSettings();
- StyleSettings aStyleSettings = aSettings.GetStyleSettings();
- sal_uLong nOldOptions = rDCEvt.GetOldSettings()->GetStyleSettings().GetOptions();
- sal_uLong nNewOptions = aStyleSettings.GetOptions();
+ const AllSettings* pOldSettings = rDCEvt.GetOldSettings();
- if ( !(nNewOptions & STYLE_OPTION_MONO) && ( nOldOptions & STYLE_OPTION_MONO ) )
+ AllSettings aSettings = GetSettings();
+ StyleSettings aStyleSettings = aSettings.GetStyleSettings();
+ sal_uLong nNewOptions = aStyleSettings.GetOptions();
+
+ if ( pOldSettings && !(nNewOptions & STYLE_OPTION_MONO) && ( pOldSettings->GetStyleSettings().GetOptions() & STYLE_OPTION_MONO ) )
{
nNewOptions |= STYLE_OPTION_MONO;
aStyleSettings.SetOptions( nNewOptions );
- aStyleSettings.SetMonoColor( rDCEvt.GetOldSettings()->GetStyleSettings().GetMonoColor() );
+ aStyleSettings.SetMonoColor( pOldSettings->GetStyleSettings().GetMonoColor() );
aSettings.SetStyleSettings( aStyleSettings );
SetSettings( aSettings );
}
commit cd876c68da13d688bd867b3bc3613eb4130532d3
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Sat Jan 12 06:39:31 2013 +0100
fix a bunch of more crashes when setting personas
Conflicts:
basctl/source/basicide/layout.cxx
Change-Id: I6c2c398e074a41c3173bff57bc12496b4c2032b4
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index ebb67bf..698ee04 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -663,8 +663,8 @@ void EditorWindow::DataChanged(DataChangedEvent const & rDCEvt)
&& (rDCEvt.GetFlags() & SETTINGS_STYLE) != 0)
{
Color aColor(GetSettings().GetStyleSettings().GetFieldColor());
- if (aColor
- != rDCEvt.GetOldSettings()->GetStyleSettings().GetFieldColor())
+ const AllSettings* pOldSettings = rDCEvt.GetOldSettings();
+ if (!pOldSettings || aColor != pOldSettings->GetStyleSettings().GetFieldColor())
{
SetBackground(Wallpaper(aColor));
Invalidate();
@@ -672,8 +672,8 @@ void EditorWindow::DataChanged(DataChangedEvent const & rDCEvt)
if (pEditEngine != 0)
{
aColor = GetSettings().GetStyleSettings().GetFieldTextColor();
- if (aColor != rDCEvt.GetOldSettings()->
- GetStyleSettings().GetFieldTextColor())
+ if (!pOldSettings || aColor !=
+ pOldSettings-> GetStyleSettings().GetFieldTextColor())
{
Font aFont(pEditEngine->GetFont());
aFont.SetColor(aColor);
@@ -1164,8 +1164,8 @@ void BreakPointWindow::DataChanged(DataChangedEvent const & rDCEvt)
&& (rDCEvt.GetFlags() & SETTINGS_STYLE) != 0)
{
Color aColor(GetSettings().GetStyleSettings().GetFieldColor());
- if (aColor
- != rDCEvt.GetOldSettings()->GetStyleSettings().GetFieldColor())
+ const AllSettings* pOldSettings = rDCEvt.GetOldSettings();
+ if (!pOldSettings || aColor != pOldSettings->GetStyleSettings().GetFieldColor())
{
setBackgroundColor(aColor);
Invalidate();
@@ -1720,8 +1720,8 @@ void ComplexEditorWindow::DataChanged(DataChangedEvent const & rDCEvt)
&& (rDCEvt.GetFlags() & SETTINGS_STYLE) != 0)
{
Color aColor(GetSettings().GetStyleSettings().GetFaceColor());
- if (aColor
- != rDCEvt.GetOldSettings()->GetStyleSettings().GetFaceColor())
+ const AllSettings* pOldSettings = rDCEvt.GetOldSettings();
+ if (!pOldSettings || aColor != pOldSettings->GetStyleSettings().GetFaceColor())
{
SetBackground(Wallpaper(aColor));
Invalidate();
diff --git a/basctl/source/basicide/linenumberwindow.cxx b/basctl/source/basicide/linenumberwindow.cxx
index 052e2a3..47ea752 100644
--- a/basctl/source/basicide/linenumberwindow.cxx
+++ b/basctl/source/basicide/linenumberwindow.cxx
@@ -94,7 +94,8 @@ void LineNumberWindow::DataChanged(DataChangedEvent const & rDCEvt)
&& (rDCEvt.GetFlags() & SETTINGS_STYLE) != 0)
{
Color aColor(GetSettings().GetStyleSettings().GetFieldColor());
- if (aColor != rDCEvt.GetOldSettings()->GetStyleSettings().GetFieldColor())
+ const AllSettings* pOldSettings = rDCEvt.GetOldSettings();
+ if (!pOldSettings || aColor != pOldSettings->GetStyleSettings().GetFieldColor())
{
SetBackground(Wallpaper(aColor));
Invalidate();
commit a1beac27864650c71d38e819a0da9f971f5ff06d
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Sat Jan 12 05:29:25 2013 +0100
fix crash with new personas when notifying windows
Change-Id: I41e4c747c4662fb066746c0ca87d17ea6742080e
diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx
index a13e4fa..1b556fe 100644
--- a/vcl/source/window/split.cxx
+++ b/vcl/source/window/split.cxx
@@ -739,7 +739,11 @@ void Splitter::DataChanged( const DataChangedEvent& rDCEvt )
Window::DataChanged( rDCEvt );
if( rDCEvt.GetType() == DATACHANGED_SETTINGS )
{
- Color oldFaceColor = ((AllSettings *) rDCEvt.GetData())->GetStyleSettings().GetFaceColor();
+ AllSettings* pOldSettings = static_cast<AllSettings*>(rDCEvt.GetData());
+ if(!pOldSettings)
+ return;
+
+ Color oldFaceColor = pOldSettings->GetStyleSettings().GetFaceColor();
Color newFaceColor = Application::GetSettings().GetStyleSettings().GetFaceColor();
if( oldFaceColor.IsDark() != newFaceColor.IsDark() )
{
commit 3803d8f135b573ccdd755cc406d85751595aacd1
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Jan 9 11:16:47 2013 +0100
Personas: As Michael suggested, use BitmapEx instead of BitmapEx*.
Conflicts:
vcl/inc/vcl/settings.hxx
vcl/source/app/settings.cxx
Change-Id: Ib1d84b37d452785d12502095c0eedaac4a25fb6b
diff --git a/vcl/inc/vcl/settings.hxx b/vcl/inc/vcl/settings.hxx
index 44bcba4..6786483 100644
--- a/vcl/inc/vcl/settings.hxx
+++ b/vcl/inc/vcl/settings.hxx
@@ -32,13 +32,13 @@
#include "vcl/sv.h"
#include "vcl/dllapi.h"
#include "tools/color.hxx"
+#include "vcl/bitmapex.hxx"
#include "vcl/font.hxx"
#include "vcl/accel.hxx"
#include "vcl/wall.hxx"
#include "com/sun/star/lang/Locale.hpp"
#include <unotools/syslocale.hxx>
-class BitmapEx;
class CollatorWrapper;
class LocaleDataWrapper;
@@ -330,8 +330,8 @@ private:
rtl::OUString maPersonaHeaderFooter; ///< Cache the settings to detect changes.
- BitmapEx* mpPersonaHeaderBitmap; ///< Cache the header bitmap.
- BitmapEx* mpPersonaFooterBitmap; ///< Cache the footer bitmap.
+ BitmapEx mpPersonaHeaderBitmap; ///< Cache the header bitmap.
+ BitmapEx mpPersonaFooterBitmap; ///< Cache the footer bitmap.
};
#define DEFAULT_WORKSPACE_GRADIENT_START_COLOR Color( 0xa3, 0xae, 0xb8 )
@@ -837,8 +837,8 @@ public:
void SetWorkspaceGradient( const Wallpaper& rWall )
{ CopyData(); mpData->maWorkspaceGradient = rWall; }
- const BitmapEx* GetPersonaHeader() const;
- const BitmapEx* GetPersonaFooter() const;
+ const BitmapEx GetPersonaHeader() const;
+ const BitmapEx GetPersonaFooter() const;
void SetStandardStyles();
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 79c8617..ace45ad 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -43,7 +43,6 @@
#include "vcl/configsettings.hxx"
#include "vcl/gradient.hxx"
#include "vcl/unohelp.hxx"
-#include "vcl/bitmapex.hxx"
#include "unotools/fontcfg.hxx"
#include "unotools/localedatawrapper.hxx"
@@ -213,8 +212,8 @@ sal_Bool MouseSettings::operator ==( const MouseSettings& rSet ) const
ImplStyleData::ImplStyleData() :
maPersonaHeaderFooter(),
- mpPersonaHeaderBitmap( NULL ),
- mpPersonaFooterBitmap( NULL )
+ mpPersonaHeaderBitmap(),
+ mpPersonaFooterBitmap()
{
mnRefCount = 1;
mnScrollBarSize = 16;
@@ -312,8 +311,8 @@ ImplStyleData::ImplStyleData( const ImplStyleData& rData ) :
maGroupFont( rData.maGroupFont ),
maWorkspaceGradient( rData.maWorkspaceGradient ),
maPersonaHeaderFooter( rData.maPersonaHeaderFooter ),
- mpPersonaHeaderBitmap( rData.mpPersonaHeaderBitmap? new BitmapEx( *rData.mpPersonaHeaderBitmap ): NULL ),
- mpPersonaFooterBitmap( rData.mpPersonaFooterBitmap? new BitmapEx( *rData.mpPersonaFooterBitmap ): NULL )
+ mpPersonaHeaderBitmap( rData.mpPersonaHeaderBitmap ),
+ mpPersonaFooterBitmap( rData.mpPersonaFooterBitmap )
{
mnRefCount = 1;
mnBorderSize = rData.mnBorderSize;
@@ -689,7 +688,7 @@ sal_Bool StyleSettings::GetUseImagesInMenus() const
// -----------------------------------------------------------------------
-static BitmapEx* readBitmapEx( const rtl::OUString& rPath )
+static BitmapEx readBitmapEx( const rtl::OUString& rPath )
{
rtl::OUString aPath( rPath );
rtl::Bootstrap::expandMacros( aPath );
@@ -697,19 +696,15 @@ static BitmapEx* readBitmapEx( const rtl::OUString& rPath )
// import the image
Graphic aGraphic;
if ( GraphicFilter::LoadGraphic( aPath, String(), aGraphic ) != GRFILTER_OK )
- return NULL;
+ return BitmapEx();
- const BitmapEx& rBitmap( aGraphic.GetBitmapEx() );
- if ( rBitmap.IsEmpty() )
- return NULL;
-
- return new BitmapEx( rBitmap );
+ return aGraphic.GetBitmapEx();
}
enum WhichPersona { PERSONA_HEADER, PERSONA_FOOTER };
/** Update the setting of the Persona header / footer in ImplStyleData */
-static void setupPersonaHeaderFooter( WhichPersona eWhich, rtl::OUString& /*rHeaderFooter*/, BitmapEx*& pHeaderFooterBitmap )
+static void setupPersonaHeaderFooter( WhichPersona eWhich, rtl::OUString& /*rHeaderFooter*/, BitmapEx& rHeaderFooterBitmap )
{
rtl::OUString aName;
switch ( eWhich ) {
@@ -717,9 +712,6 @@ static void setupPersonaHeaderFooter( WhichPersona eWhich, rtl::OUString& /*rHea
case PERSONA_FOOTER: aName = "footer.jpg"; break;
}
- delete pHeaderFooterBitmap;
- pHeaderFooterBitmap = NULL;
-
if ( !aName.isEmpty() )
{
// try the gallery first, then edition, and the program path if
@@ -728,21 +720,21 @@ static void setupPersonaHeaderFooter( WhichPersona eWhich, rtl::OUString& /*rHea
rtl::Bootstrap::expandMacros( gallery );
gallery += "/user/gallery/personas/";
- if ( !pHeaderFooterBitmap )
- pHeaderFooterBitmap = readBitmapEx( "$BRAND_BASE_DIR/program/edition/" + aName );
+ if ( rHeaderFooterBitmap.IsEmpty() )
+ rHeaderFooterBitmap = readBitmapEx( "$BRAND_BASE_DIR/program/edition/" + aName );
- if ( !pHeaderFooterBitmap )
- pHeaderFooterBitmap = readBitmapEx( "$BRAND_BASE_DIR/program/" + aName );
+ if ( rHeaderFooterBitmap.IsEmpty() )
+ rHeaderFooterBitmap = readBitmapEx( "$BRAND_BASE_DIR/program/" + aName );
}
}
-const BitmapEx* StyleSettings::GetPersonaHeader() const
+const BitmapEx StyleSettings::GetPersonaHeader() const
{
setupPersonaHeaderFooter( PERSONA_HEADER, mpData->maPersonaHeaderFooter, mpData->mpPersonaHeaderBitmap );
return mpData->mpPersonaHeaderBitmap;
}
-const BitmapEx* StyleSettings::GetPersonaFooter() const
+const BitmapEx StyleSettings::GetPersonaFooter() const
{
setupPersonaHeaderFooter( PERSONA_FOOTER, mpData->maPersonaHeaderFooter, mpData->mpPersonaFooterBitmap );
return mpData->mpPersonaFooterBitmap;
diff --git a/vcl/source/window/dockingarea.cxx b/vcl/source/window/dockingarea.cxx
index 3e4e9a7..33b1c22 100644
--- a/vcl/source/window/dockingarea.cxx
+++ b/vcl/source/window/dockingarea.cxx
@@ -59,10 +59,10 @@ DockingAreaWindow::ImplData::~ImplData()
static void ImplInitBackground( DockingAreaWindow* pThis )
{
- const BitmapEx* pPersonaBitmap = Application::GetSettings().GetStyleSettings().GetPersonaHeader();
- if ( pPersonaBitmap != NULL && pThis->GetAlign() == WINDOWALIGN_TOP )
+ const BitmapEx& rPersonaBitmap = Application::GetSettings().GetStyleSettings().GetPersonaHeader();
+ if ( !rPersonaBitmap.IsEmpty() && pThis->GetAlign() == WINDOWALIGN_TOP )
{
- Wallpaper aWallpaper( *pPersonaBitmap );
+ Wallpaper aWallpaper( rPersonaBitmap );
aWallpaper.SetStyle( WALLPAPER_TOPRIGHT );
// we need to shift the bitmap vertically so that it spans over the
@@ -184,7 +184,7 @@ void DockingAreaWindow::Paint( const Rectangle& )
}
ControlState nState = CTRL_STATE_ENABLED;
- if ( GetAlign() == WINDOWALIGN_TOP && Application::GetSettings().GetStyleSettings().GetPersonaHeader() )
+ if ( GetAlign() == WINDOWALIGN_TOP && !Application::GetSettings().GetStyleSettings().GetPersonaHeader().IsEmpty() )
Erase();
else if ( !ImplGetSVData()->maNWFData.mbDockingAreaSeparateTB )
{
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index e7275bd..66de4bf 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -3865,10 +3865,10 @@ static void ImplInitMenuWindow( Window* pWin, sal_Bool bFont, sal_Bool bMenuBar
pWin->SetPointFont( rStyleSettings.GetMenuFont() );
if( bMenuBar )
{
- const BitmapEx* pPersonaBitmap = Application::GetSettings().GetStyleSettings().GetPersonaHeader();
- if ( pPersonaBitmap != NULL )
+ const BitmapEx& rPersonaBitmap = Application::GetSettings().GetStyleSettings().GetPersonaHeader();
+ if ( !rPersonaBitmap.IsEmpty() )
{
- Wallpaper aWallpaper( *pPersonaBitmap );
+ Wallpaper aWallpaper( rPersonaBitmap );
aWallpaper.SetStyle( WALLPAPER_TOPRIGHT );
pWin->SetBackground( aWallpaper );
pWin->SetPaintTransparent( sal_False );
@@ -5517,7 +5517,7 @@ void MenuBarWindow::HighlightItem( sal_uInt16 nPos, sal_Bool bHighlight )
MenubarValue aControlValue;
aControlValue.maTopDockingAreaHeight = ImplGetTopDockingAreaHeight( this );
- if ( Application::GetSettings().GetStyleSettings().GetPersonaHeader() )
+ if ( !Application::GetSettings().GetStyleSettings().GetPersonaHeader().IsEmpty() )
Erase();
else
{
@@ -5553,7 +5553,7 @@ void MenuBarWindow::HighlightItem( sal_uInt16 nPos, sal_Bool bHighlight )
MenubarValue aMenubarValue;
aMenubarValue.maTopDockingAreaHeight = ImplGetTopDockingAreaHeight( this );
- if ( Application::GetSettings().GetStyleSettings().GetPersonaHeader() )
+ if ( !Application::GetSettings().GetStyleSettings().GetPersonaHeader().IsEmpty() )
Erase( aRect );
else
{
@@ -5797,7 +5797,7 @@ void MenuBarWindow::Paint( const Rectangle& )
MenubarValue aMenubarValue;
aMenubarValue.maTopDockingAreaHeight = ImplGetTopDockingAreaHeight( this );
- if ( Application::GetSettings().GetStyleSettings().GetPersonaHeader() )
+ if ( !Application::GetSettings().GetStyleSettings().GetPersonaHeader().IsEmpty() )
Erase();
else
{
commit e9799b83ca378c30b1bcc604a6f366638f0e5a68
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Jan 4 23:43:42 2013 +0100
Personas: Broadcast the information that the Persona has changed.
Conflicts:
cui/source/options/personalization.cxx
Change-Id: Ic563204c1a1a64d315e3e73dff30b6a6d05cfd87
diff --git a/vcl/source/window/dockingarea.cxx b/vcl/source/window/dockingarea.cxx
index 4cd35c4..3e4e9a7 100644
--- a/vcl/source/window/dockingarea.cxx
+++ b/vcl/source/window/dockingarea.cxx
@@ -112,6 +112,7 @@ void DockingAreaWindow::DataChanged( const DataChangedEvent& rDCEvt )
if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) )
{
ImplInitBackground( this );
+ Invalidate();
}
}
commit 53d002096ad491c896dd14b3c677846d57d22f61
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 936818c..79c8617 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -312,8 +312,8 @@ ImplStyleData::ImplStyleData( const ImplStyleData& rData ) :
maGroupFont( rData.maGroupFont ),
maWorkspaceGradient( rData.maWorkspaceGradient ),
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 af60a9d..4cd35c4 100644
--- a/vcl/source/window/dockingarea.cxx
+++ b/vcl/source/window/dockingarea.cxx
@@ -59,7 +59,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 );
@@ -183,7 +183,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 53a1570..e7275bd 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -3865,7 +3865,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 );
@@ -5517,7 +5517,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
{
@@ -5553,7 +5553,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
{
@@ -5797,7 +5797,7 @@ void MenuBarWindow::Paint( const Rectangle& )
MenubarValue aMenubarValue;
aMenubarValue.maTopDockingAreaHeight = ImplGetTopDockingAreaHeight( this );
- if ( GetSettings().GetStyleSettings().GetPersonaHeader() )
+ if ( Application::GetSettings().GetStyleSettings().GetPersonaHeader() )
Erase();
else
{
commit 9840237b8ba631cbc0b8f66194b33d1e33639a08
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 a90c05d..f0af233 100644
--- a/vcl/source/gdi/outdev2.cxx
+++ b/vcl/source/gdi/outdev2.cxx
@@ -651,71 +651,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 )
mpGraphics->DrawBitmap( &aPosAry, *aBmp.ImplGetImpBitmap()->ImplGetSalBitmap(), this );
}
commit a58fd5e2300dbe2887d0b4121e35cd958c92368a
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 a123ead..af60a9d 100644
--- a/vcl/source/window/dockingarea.cxx
+++ b/vcl/source/window/dockingarea.cxx
@@ -59,7 +59,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 );
@@ -136,6 +156,7 @@ void DockingAreaWindow::SetAlign( WindowAlign eNewAlign )
if( eNewAlign != mpImplData->meAlign )
{
mpImplData->meAlign = eNewAlign;
+ ImplInitBackground( this );
Invalidate();
}
}
@@ -162,7 +183,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;
@@ -240,6 +263,7 @@ void DockingAreaWindow::Paint( const Rectangle& )
void DockingAreaWindow::Resize()
{
+ ImplInitBackground( this );
ImplInvalidateMenubar( this );
if( IsNativeControlSupported( CTRL_TOOLBAR, PART_ENTIRE_CONTROL ) )
Invalidate();
commit e752b2eb39be1cb0c34cfb62583e78200759177b
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 3b4ac0d..53a1570 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -3865,7 +3865,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
}
@@ -5508,13 +5517,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
@@ -5538,12 +5553,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
@@ -5773,13 +5794,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 685249b..582767e 100644
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx
@@ -461,7 +461,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 dfd14eb2803b353f653d5817d9239da691598217
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 cb82500..ae82a0c 100644
--- a/vcl/source/gdi/outdev6.cxx
+++ b/vcl/source/gdi/outdev6.cxx
@@ -859,8 +859,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 8d98580ec89a014721b64a952cc1c68def76f581
Author: Jan Holesovsky <kendy at suse.cz>
Date: Tue Jan 1 22:30:18 2013 +0100
Personas: Read the bitmaps in StyleSettings.
Conflicts:
cui/source/options/personalization.cxx
vcl/inc/vcl/settings.hxx
vcl/source/app/settings.cxx
Change-Id: I52b67c82f69059a7d2babf1b49e59f27062cc02c
diff --git a/vcl/inc/vcl/settings.hxx b/vcl/inc/vcl/settings.hxx
index a3399e1..44bcba4 100644
--- a/vcl/inc/vcl/settings.hxx
+++ b/vcl/inc/vcl/settings.hxx
@@ -38,6 +38,7 @@
#include "com/sun/star/lang/Locale.hpp"
#include <unotools/syslocale.hxx>
+class BitmapEx;
class CollatorWrapper;
class LocaleDataWrapper;
@@ -326,6 +327,11 @@ private:
sal_Bool mnAcceleratorsInContextMenus;
Wallpaper maWorkspaceGradient;
const void* mpFontOptions;
+
+ rtl::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 )
@@ -831,6 +837,9 @@ public:
void SetWorkspaceGradient( const Wallpaper& rWall )
{ CopyData(); mpData->maWorkspaceGradient = rWall; }
+ 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 dfdfa95..936818c 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -26,8 +26,13 @@
*
************************************************************************/
+#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"
@@ -46,7 +51,7 @@
#include "unotools/confignode.hxx"
#include "unotools/syslocaleoptions.hxx"
-using ::rtl::OUString;
+using namespace ::com::sun::star;
#include "svdata.hxx"
#include "impimagetree.hxx"
@@ -206,7 +211,10 @@ sal_Bool MouseSettings::operator ==( const MouseSettings& rSet ) const
// =======================================================================
-ImplStyleData::ImplStyleData()
+ImplStyleData::ImplStyleData() :
+ maPersonaHeaderFooter(),
+ mpPersonaHeaderBitmap( NULL ),
+ mpPersonaFooterBitmap( NULL )
{
mnRefCount = 1;
mnScrollBarSize = 16;
@@ -302,7 +310,10 @@ ImplStyleData::ImplStyleData( const ImplStyleData& rData ) :
maFieldFont( rData.maFieldFont ),
maIconFont( rData.maIconFont ),
maGroupFont( rData.maGroupFont ),
- maWorkspaceGradient( rData.maWorkspaceGradient )
+ maWorkspaceGradient( rData.maWorkspaceGradient ),
+ maPersonaHeaderFooter( rData.maPersonaHeaderFooter ),
+ mpPersonaHeaderBitmap( NULL ),
+ mpPersonaFooterBitmap( NULL )
{
mnRefCount = 1;
mnBorderSize = rData.mnBorderSize;
@@ -678,6 +689,67 @@ sal_Bool StyleSettings::GetUseImagesInMenus() const
// -----------------------------------------------------------------------
+static BitmapEx* readBitmapEx( const rtl::OUString& rPath )
+{
+ rtl::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, rtl::OUString& /*rHeaderFooter*/, BitmapEx*& pHeaderFooterBitmap )
+{
+ rtl::OUString aName;
+ switch ( eWhich ) {
+ case PERSONA_HEADER: aName = "header.jpg"; break;
+ case PERSONA_FOOTER: aName = "footer.jpg"; break;
+ }
+
+ delete pHeaderFooterBitmap;
+ pHeaderFooterBitmap = NULL;
+
+ if ( !aName.isEmpty() )
+ {
+ // try the gallery first, then edition, and the program path if
+ // everything else fails
+ rtl::OUString gallery = "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap") "::UserInstallation}";
+ rtl::Bootstrap::expandMacros( gallery );
+ gallery += "/user/gallery/personas/";
+
+ 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();
@@ -1508,11 +1580,11 @@ bool AllSettings::GetLayoutRTL() const
nUIMirroring = 0; // ask configuration only once
utl::OConfigurationNode aNode = utl::OConfigurationTreeRoot::tryCreateWithServiceFactory(
vcl::unohelper::GetMultiServiceFactory(),
- OUString("org.openoffice.Office.Common/I18N/CTL") ); // note: case sensisitive !
+ rtl::OUString("org.openoffice.Office.Common/I18N/CTL") ); // note: case sensisitive !
if ( aNode.isValid() )
{
sal_Bool bTmp = sal_Bool();
- ::com::sun::star::uno::Any aValue = aNode.getNodeValue( OUString("UIMirroring") );
+ ::com::sun::star::uno::Any aValue = aNode.getNodeValue( rtl::OUString("UIMirroring") );
if( aValue >>= bTmp )
{
// found true or false; if it was nil, nothing is changed
commit 95951c4b9d83952b6b8f8c0969b801d70091cb52
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Jan 2 22:07:41 2013 +0100
Make LO buildable again after the GraphicFilter move.
Conflicts:
cui/source/dialogs/SpellDialog.cxx
editeng/source/items/frmitems.cxx
filter/qa/cppunit/filters-pict-test.cxx
sd/source/filter/grf/sdgrffilter.cxx
sd/source/ui/app/sddll.cxx
svgio/source/svgreader/svgimagenode.cxx
svtools/Library_svt.mk
svtools/Module_svtools.mk
svtools/Package_inc.mk
svtools/source/filter/exportdialog.cxx
svx/source/core/graphichelper.cxx
svx/source/dialog/compressgraphicdialog.cxx
sw/source/ui/shells/grfshex.cxx
sw/source/ui/uiview/view2.cxx
sw/source/ui/utlui/glbltree.cxx
test/source/bootstrapfixture.cxx
tubes/source/contacts.cxx
vcl/Library_vcl.mk
vcl/qa/cppunit/graphicfilter/filters-test.cxx
vcl/source/filter/FilterConfigCache.cxx
vcl/source/filter/graphicfilter.cxx
writerfilter/source/rtftok/rtfdocumentimpl.cxx
Change-Id: I3455a7294b136400f32163626d5a7a7f2bfa898c
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
index e95d37e..d19d496 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -28,7 +28,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 eec15d5..dfc7e9b 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -39,7 +39,7 @@
#include <svl/undo.hxx>
#include <unotools/lingucfg.hxx>
#include <svtools/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 65f6bdd..c1ba67b 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -37,7 +37,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 db1369d..47308e5 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -38,7 +38,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 17db923..ade9db2 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -34,7 +34,7 @@
#include <tools/shl.hxx>
#include <svl/lngmisc.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <svtools/svlbitm.hxx>
#include <svtools/svtreebx.hxx>
#include <vcl/wrkwin.hxx>
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 001eac7..b71940a 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -97,7 +97,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/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index 48510b1..20a5e7d 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -47,7 +47,7 @@
#include <vcl/graph.hxx>
#include <vcl/introwin.hxx>
#include <vcl/virdev.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#define NOT_LOADED ((long)-1)
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index dccb777..fd8d48e 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -40,7 +40,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 da4ca7d..dbcde63 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -65,7 +65,7 @@
#include <svtools/borderhelper.hxx>
#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#define _SVX_FRMITEMS_CXX
diff --git a/editeng/source/rtf/rtfgrf.cxx b/editeng/source/rtf/rtfgrf.cxx
index d6572be..a0bd5cd 100644
--- a/editeng/source/rtf/rtfgrf.cxx
+++ b/editeng/source/rtf/rtfgrf.cxx
@@ -35,8 +35,8 @@
#include <vcl/svapp.hxx>
#include <svtools/rtfkeywd.hxx>
#include <svtools/rtftoken.h>
-#include <svtools/filter.hxx>
-#include <svtools/wmf.hxx>
+#include <vcl/graphicfilter.hxx>
+#include <vcl/wmf.hxx>
#include <editeng/svxrtf.hxx>
diff --git a/filter/qa/cppunit/filters-tga-test.cxx b/filter/qa/cppunit/filters-tga-test.cxx
index c0eba97..1cde0c8 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 942ad16..d878fce 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 f05fa6e..474255e 100644
--- a/filter/source/flash/impswfdialog.hxx
+++ b/filter/source/flash/impswfdialog.hxx
@@ -38,7 +38,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 5b9dbcd..4429a99 100644
--- a/filter/source/flash/swfexporter.cxx
+++ b/filter/source/flash/swfexporter.cxx
@@ -41,8 +41,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 dfc7edf..ca56de3 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -37,7 +37,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>
#include <vcl/rendergraphicrasterizer.hxx>
diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx
index fa4044e..b3bbd90 100644
--- a/filter/source/graphicfilter/egif/egif.cxx
+++ b/filter/source/graphicfilter/egif/egif.cxx
@@ -33,7 +33,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 f25b1b5..ca22eb2 100644
--- a/filter/source/graphicfilter/epbm/epbm.cxx
+++ b/filter/source/graphicfilter/epbm/epbm.cxx
@@ -33,7 +33,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 fd1e89c..8ca0ba6 100644
--- a/filter/source/graphicfilter/epgm/epgm.cxx
+++ b/filter/source/graphicfilter/epgm/epgm.cxx
@@ -33,7 +33,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 1b61585..f80a1e4 100644
--- a/filter/source/graphicfilter/epict/epict.cxx
+++ b/filter/source/graphicfilter/epict/epict.cxx
@@ -28,7 +28,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 e65343a..e0b9da5 100644
--- a/filter/source/graphicfilter/eppm/eppm.cxx
+++ b/filter/source/graphicfilter/eppm/eppm.cxx
@@ -33,7 +33,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 dbe973e..16f351c 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -44,7 +44,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 <vcl/rendergraphicrasterizer.hxx>
#include "strings.hrc"
diff --git a/filter/source/graphicfilter/eras/eras.cxx b/filter/source/graphicfilter/eras/eras.cxx
index a22c1b4..559315e 100644
--- a/filter/source/graphicfilter/eras/eras.cxx
+++ b/filter/source/graphicfilter/eras/eras.cxx
@@ -30,7 +30,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 efd69b6..43e8db9 100644
--- a/filter/source/graphicfilter/etiff/etiff.cxx
+++ b/filter/source/graphicfilter/etiff/etiff.cxx
@@ -33,7 +33,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 8d4070e..a24cf26 100644
--- a/filter/source/graphicfilter/ipcd/ipcd.cxx
+++ b/filter/source/graphicfilter/ipcd/ipcd.cxx
@@ -33,7 +33,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 16459e5..953c35f 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -42,7 +42,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 b5c27bd..23c82c1 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -44,6 +44,7 @@
#include <sot/exchange.hxx>
#include <sot/storinfo.hxx>
#include <vcl/cvtgrf.hxx>
+#include <vcl/wmf.hxx>
#include "viscache.hxx"
// SvxItem-Mapping. Wird benoetigt um die SvxItem-Header erfolgreich zu includen
@@ -65,7 +66,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 f3330c0..8c65d24 100644
--- a/filter/source/pdf/impdialog.hxx
+++ b/filter/source/pdf/impdialog.hxx
@@ -41,7 +41,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 db93010..3d21af2 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -44,8 +44,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 ef8120b..53fc843 100644
--- a/filter/source/pdf/pdffilter.cxx
+++ b/filter/source/pdf/pdffilter.cxx
@@ -32,7 +32,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 6a7e13a..0a776d7 100644
--- a/filter/source/svg/impsvgdialog.hxx
+++ b/filter/source/svg/impsvgdialog.hxx
@@ -44,7 +44,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 d8aee55..fbc4c50 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 be28430..d169d8d 100644
--- a/forms/source/component/imgprod.cxx
+++ b/forms/source/component/imgprod.cxx
@@ -33,7 +33,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 f284d77..eab5467 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -44,7 +44,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 7061386..b5c41df 100644
--- a/framework/source/uielement/buttontoolbarcontroller.cxx
+++ b/framework/source/uielement/buttontoolbarcontroller.cxx
@@ -59,7 +59,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 3d47d4c..0796a4f 100644
--- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
@@ -59,7 +59,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 e102918..3afc1b9 100644
--- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
@@ -59,7 +59,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 edcb198..9672cf4 100644
--- a/oox/source/helper/graphichelper.cxx
+++ b/oox/source/helper/graphichelper.cxx
@@ -40,7 +40,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 91d5a01..5f4064a 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -36,7 +36,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 8940167..4d284e3 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -54,7 +54,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 0566f66..70d103d 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -49,7 +49,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 22671a4..9825134 100644
--- a/sc/source/ui/drawfunc/fuins1.cxx
+++ b/sc/source/ui/drawfunc/fuins1.cxx
@@ -34,7 +34,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 8192b42..e0eae47 100644
--- a/sc/source/ui/view/viewfun4.cxx
+++ b/sc/source/ui/view/viewfun4.cxx
@@ -48,7 +48,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 d041683..b22f5b1 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -55,7 +55,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 d2d2a89..93f34ac 100644
--- a/sd/source/filter/eppt/pptx-epptbase.cxx
+++ b/sd/source/filter/eppt/pptx-epptbase.cxx
@@ -42,7 +42,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 2ad8a7a..1b7c5a4 100644
--- a/sd/source/filter/grf/sdgrffilter.cxx
+++ b/sd/source/filter/grf/sdgrffilter.cxx
@@ -64,7 +64,7 @@
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
#include <sfx2/filedlghelper.hxx>
#include <tools/urlobj.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 cc4573a..3a69771 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -37,7 +37,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>
@@ -58,7 +58,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 b799fed..93b58cf 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -33,7 +33,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 74dd7c4..db87c37 100644
--- a/sd/source/filter/html/sdhtmlfilter.cxx
+++ b/sd/source/filter/html/sdhtmlfilter.cxx
@@ -32,7 +32,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 dad91d7..e45a352 100644
--- a/sd/source/ui/app/sddll.cxx
+++ b/sd/source/ui/app/sddll.cxx
@@ -48,7 +48,7 @@
#include <sfx2/docfilt.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/fcontnr.hxx>
-#include <svtools/FilterConfigItem.hxx>
+#include <vcl/FilterConfigItem.hxx>
#include <com/sun/star/util/XArchiver.hpp>
#include <comphelper/processfactory.hxx>
diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx
index 44df98d..a102413 100644
--- a/sd/source/ui/dlg/filedlg.cxx
+++ b/sd/source/ui/dlg/filedlg.cxx
@@ -49,7 +49,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 2f8bf12..3b14e16 100644
--- a/sd/source/ui/docshell/docshell.cxx
+++ b/sd/source/ui/docshell/docshell.cxx
@@ -46,7 +46,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/presenter/PresenterHelper.hxx b/sd/source/ui/presenter/PresenterHelper.hxx
index b3c7a33..5d5395d 100644
--- a/sd/source/ui/presenter/PresenterHelper.hxx
+++ b/sd/source/ui/presenter/PresenterHelper.hxx
@@ -34,7 +34,7 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase2.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <boost/noncopyable.hpp>
#include <boost/scoped_ptr.hpp>
diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx
index 1a5da08..74a7d16 100644
--- a/sd/source/ui/unoidl/sddetect.cxx
+++ b/sd/source/ui/unoidl/sddetect.cxx
@@ -47,7 +47,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>
@@ -67,7 +67,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>
#include <com/sun/star/util/XArchiver.hpp>
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index f9c0669..1f9ee38 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -65,7 +65,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 ed1a87c..64dd8fe 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -47,7 +47,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 e2ff526..9bc2851f8 100644
--- a/sfx2/inc/sfx2/opengrf.hxx
+++ b/sfx2/inc/sfx2/opengrf.hxx
@@ -29,7 +29,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 1e62b63..d7e158e 100644
--- a/sfx2/source/appl/appmisc.cxx
+++ b/sfx2/source/appl/appmisc.cxx
@@ -32,7 +32,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 ae648c1..cf8d3f4 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -32,7 +32,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 fe35177..547e25e 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -76,7 +76,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 c9a66e7..1841a81 100644
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -51,7 +51,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 c5665c7..0a4c1ed 100644
--- a/sfx2/source/menu/thessubmenu.cxx
+++ b/sfx2/source/menu/thessubmenu.cxx
@@ -36,7 +36,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/svtools/Library_svt.mk b/svtools/Library_svt.mk
index 139e632..2dae9c9 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -70,7 +70,6 @@ $(eval $(call gb_Library_use_libraries,svt,\
$(eval $(call gb_Library_use_externals,svt,\
icuuc \
- jpeg \
))
$(eval $(call gb_Library_add_exception_objects,svt,\
@@ -156,27 +155,8 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
svtools/source/edit/textwindowpeer \
svtools/source/edit/txtattr \
svtools/source/edit/xtextedt \
- 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 \
@@ -269,10 +249,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_libraries,svt,\
advapi32 \
diff --git a/svtools/Module_svtools.mk b/svtools/Module_svtools.mk
index c7f1122..8711646 100644
--- a/svtools/Module_svtools.mk
+++ b/svtools/Module_svtools.mk
@@ -50,10 +50,6 @@ endif
endif
-$(eval $(call gb_Module_add_check_targets,svtools,\
- CppunitTest_svtools_filters_test \
-))
-
$(eval $(call gb_Module_add_subsequentcheck_targets,svtools,\
JunitTest_svtools_unoapi \
))
diff --git a/svtools/Package_inc.mk b/svtools/Package_inc.mk
index 0dfc219..d120891 100644
--- a/svtools/Package_inc.mk
+++ b/svtools/Package_inc.mk
@@ -29,7 +29,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))
@@ -68,7 +67,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/fixedhyper.hxx,svtools/fixedhyper.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fltcall.hxx,svtools/fltcall.hxx))
@@ -184,7 +182,6 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/valueset.hxx,svtools/v
$(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/xtextedt.hxx,svtools/xtextedt.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/xwindowitem.hxx,svtools/xwindowitem.hxx))
diff --git a/svtools/bmpmaker/g2g.cxx b/svtools/bmpmaker/g2g.cxx
index 6773a0f..7caedbc 100644
--- a/svtools/bmpmaker/g2g.cxx
+++ b/svtools/bmpmaker/g2g.cxx
@@ -35,7 +35,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 a3bc298..acb521e5 100644
--- a/svtools/inc/svtools/fltcall.hxx
+++ b/svtools/inc/svtools/fltcall.hxx
@@ -32,7 +32,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 b762c2f..c9a76e3 100644
--- a/svtools/source/filter/SvFilterOptionsDialog.cxx
+++ b/svtools/source/filter/SvFilterOptionsDialog.cxx
@@ -28,9 +28,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>
@@ -206,10 +205,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 )
@@ -222,8 +221,8 @@ sal_Int16 SvFilterOptionsDialog::execute()
pResMgr = ResMgr::CreateResMgr( "svt", Application::GetSettings().GetUILocale() );
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 9fc8ecd..56034fc 100644
--- a/svtools/source/filter/exportdialog.cxx
+++ b/svtools/source/filter/exportdialog.cxx
@@ -32,8 +32,8 @@
#endif
#include <tools/stream.hxx>
-#include <svtools/filter.hxx>
-#include <svtools/FilterConfigItem.hxx>
+#include <vcl/graphicfilter.hxx>
+#include <vcl/FilterConfigItem.hxx>
#include <com/sun/star/io/XStream.hpp>
#include <com/sun/star/awt/Size.hpp>
#include <com/sun/star/view/XSelectionSupplier.hpp>
diff --git a/svtools/source/graphic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx
index e5ee32d..e91101e 100644
--- a/svtools/source/graphic/descriptor.cxx
+++ b/svtools/source/graphic/descriptor.cxx
@@ -31,7 +31,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 9b8c775..989e78d 100644
--- a/svtools/source/graphic/provider.cxx
+++ b/svtools/source/graphic/provider.cxx
@@ -37,8 +37,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/salbtype.hxx>
#include <vcl/virdev.hxx>
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index 135ad30..9fb189d 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.cxx
@@ -28,7 +28,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 373df6d..647752b 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -60,7 +60,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/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 70cd657..f23eef6 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -39,7 +39,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 2a00e5c..c600d4f 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -41,7 +41,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 00ee9b7..a8574d6 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -36,13 +36,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 d82f72c..5187a7e 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -39,7 +39,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>
@@ -56,7 +56,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 8c111dc..3d9a9aa 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -51,7 +51,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 46220ea..6a3c4aa 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -55,7 +55,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>
@@ -66,7 +66,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 9fab3b7..7fccb30 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -43,7 +43,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>
@@ -70,7 +70,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 3fe75fc..db5636e 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -48,7 +48,7 @@
#include <sot/storage.hxx>
#include <sot/exchange.hxx>
-#include <svtools/FilterConfigItem.hxx>
+#include <vcl/FilterConfigItem.hxx>
#include <svx/svdmodel.hxx>
#include "shapeimpl.hxx"
@@ -60,7 +60,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 28b00a7..4107df1 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -102,7 +102,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 bd4954a..d7545f5 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -48,7 +48,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 1bb0b38..8da5c99 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -36,8 +36,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 151d795..9922fce 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -32,7 +32,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 89d53d0..289d5ec 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -60,7 +60,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 9702d17..a38c60f 100644
--- a/sw/source/filter/writer/writer.cxx
+++ b/sw/source/filter/writer/writer.cxx
@@ -31,7 +31,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 41c6336..ad388cb 100644
--- a/sw/source/filter/ww1/fltshell.cxx
+++ b/sw/source/filter/ww1/fltshell.cxx
@@ -30,7 +30,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 458a6c0..53783c2 100644
--- a/sw/source/filter/ww1/w1filter.cxx
+++ b/sw/source/filter/ww1/w1filter.cxx
@@ -31,8 +31,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 88055d2..ccf753e 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -36,7 +36,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 c0008d7..19a7c9b 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -31,7 +31,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 93ef5e7..5885ddc 100644
--- a/sw/source/filter/ww8/ww8graf2.cxx
+++ b/sw/source/filter/ww8/ww8graf2.cxx
@@ -54,7 +54,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 083fbd2..4f42a6b 100644
--- a/sw/source/filter/ww8/ww8par4.cxx
+++ b/sw/source/filter/ww8/ww8par4.cxx
@@ -56,7 +56,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 f3f90d5..e60058e 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -79,7 +79,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/docvw/extedit.cxx b/sw/source/ui/docvw/extedit.cxx
index 98dc6aa..a271a75 100644
--- a/sw/source/ui/docvw/extedit.cxx
+++ b/sw/source/ui/docvw/extedit.cxx
@@ -31,7 +31,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/sw/source/ui/docvw/romenu.cxx b/sw/source/ui/docvw/romenu.cxx
index 068ec3e..f93d388 100644
--- a/sw/source/ui/docvw/romenu.cxx
+++ b/sw/source/ui/docvw/romenu.cxx
@@ -36,7 +36,7 @@
#include <svl/eitem.hxx>
#include <svl/stritem.hxx>
#include <unotools/pathoptions.hxx>
-#include <svtools/filter.hxx>
+#include <vcl/graphicfilter.hxx>
#include <svtools/imap.hxx>
#include <svtools/inetimg.hxx>
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list