vcl/inc/filter/Exif.hxx | 92 +++
vcl/inc/filter/FilterConfigCache.hxx | 124 ++++
vcl/inc/filter/JpegReader.hxx | 75 ++
vcl/inc/filter/JpegTransform.hxx | 42 +
vcl/inc/filter/JpegWriter.hxx | 57 +
vcl/inc/filter/decode.hxx | 59 +
vcl/inc/filter/emfwr.hxx | 117 +++
vcl/inc/filter/gifread.hxx | 119 +++
vcl/inc/filter/graphicfilter_internal.hxx | 31 +
vcl/inc/filter/jinclude.h | 81 ++
vcl/inc/filter/jpeg.h | 52 +
vcl/inc/filter/jpeg.hxx | 39 +
vcl/inc/filter/jpegcomp.h | 30
vcl/inc/filter/rgbtable.hxx | 694 ++++++++++++++++++++++
vcl/inc/filter/sgfbram.hxx | 142 ++++
vcl/inc/filter/sgffilt.hxx | 40 +
vcl/inc/filter/sgvmain.hxx | 364 +++++++++++
vcl/inc/filter/sgvspln.hxx | 46 +
vcl/inc/filter/transupp.h | 212 ++++++
vcl/inc/filter/winmtf.hxx | 823 +++++++++++++++++++++++++++
vcl/inc/filter/wmfwr.hxx | 207 ++++++
vcl/inc/filter/xbmread.hxx | 74 ++
vcl/inc/filter/xpmread.hxx | 110 +++
vcl/source/filter/FilterConfigCache.cxx | 2
vcl/source/filter/FilterConfigCache.hxx | 124 ----
vcl/source/filter/GraphicNativeMetadata.cxx | 2
vcl/source/filter/GraphicNativeTransform.cxx | 4
vcl/source/filter/graphicfilter.cxx | 27
vcl/source/filter/graphicfilter2.cxx | 2
vcl/source/filter/graphicfilter_internal.hxx | 31 -
vcl/source/filter/igif/decode.cxx | 2
vcl/source/filter/igif/decode.hxx | 59 -
vcl/source/filter/igif/gifread.cxx | 4
vcl/source/filter/igif/gifread.hxx | 119 ---
vcl/source/filter/ixbm/xbmread.cxx | 2
vcl/source/filter/ixbm/xbmread.hxx | 74 --
vcl/source/filter/ixpm/rgbtable.hxx | 694 ----------------------
vcl/source/filter/ixpm/xpmread.cxx | 4
vcl/source/filter/ixpm/xpmread.hxx | 110 ---
vcl/source/filter/jpeg/Exif.cxx | 2
vcl/source/filter/jpeg/Exif.hxx | 92 ---
vcl/source/filter/jpeg/JpegReader.cxx | 4
vcl/source/filter/jpeg/JpegReader.hxx | 75 --
vcl/source/filter/jpeg/JpegTransform.cxx | 5
vcl/source/filter/jpeg/JpegTransform.hxx | 42 -
vcl/source/filter/jpeg/JpegWriter.cxx | 4
vcl/source/filter/jpeg/JpegWriter.hxx | 57 -
vcl/source/filter/jpeg/jinclude.h | 81 --
vcl/source/filter/jpeg/jpeg.cxx | 6
vcl/source/filter/jpeg/jpeg.h | 52 -
vcl/source/filter/jpeg/jpeg.hxx | 39 -
vcl/source/filter/jpeg/jpegc.cxx | 8
vcl/source/filter/jpeg/jpegcomp.h | 30
vcl/source/filter/jpeg/transupp.c | 4
vcl/source/filter/jpeg/transupp.h | 212 ------
vcl/source/filter/sgfbram.cxx | 4
vcl/source/filter/sgfbram.hxx | 142 ----
vcl/source/filter/sgffilt.hxx | 40 -
vcl/source/filter/sgvmain.cxx | 8
vcl/source/filter/sgvmain.hxx | 364 -----------
vcl/source/filter/sgvspln.cxx | 2
vcl/source/filter/sgvspln.hxx | 46 -
vcl/source/filter/sgvtext.cxx | 6
vcl/source/filter/wmf/emfwr.cxx | 2
vcl/source/filter/wmf/emfwr.hxx | 117 ---
vcl/source/filter/wmf/enhwmf.cxx | 2
vcl/source/filter/wmf/winmtf.cxx | 2
vcl/source/filter/wmf/winmtf.hxx | 823 ---------------------------
vcl/source/filter/wmf/winwmf.cxx | 2
vcl/source/filter/wmf/wmf.cxx | 6
vcl/source/filter/wmf/wmfwr.cxx | 5
vcl/source/filter/wmf/wmfwr.hxx | 207 ------
vcl/workben/fftester.cxx | 8
73 files changed, 3696 insertions(+), 3693 deletions(-)
New commits:
commit 5d7772fc0464c867c5ad2f1e10ccabd7331f7efa
Author: Chris Sherlock <chris.sherloc...@gmail.com>
Date: Fri Jan 8 12:12:22 2016 +1100
vcl: move filter headers to vcl/inc/filter
Change-Id: I0b2b12d3f5cc6e35b2d87adb39ad44ba287c9a01
diff --git a/vcl/source/filter/jpeg/Exif.hxx b/vcl/inc/filter/Exif.hxx
similarity index 100%
rename from vcl/source/filter/jpeg/Exif.hxx
rename to vcl/inc/filter/Exif.hxx
diff --git a/vcl/source/filter/FilterConfigCache.hxx
b/vcl/inc/filter/FilterConfigCache.hxx
similarity index 100%
rename from vcl/source/filter/FilterConfigCache.hxx
rename to vcl/inc/filter/FilterConfigCache.hxx
diff --git a/vcl/source/filter/jpeg/JpegReader.hxx
b/vcl/inc/filter/JpegReader.hxx
similarity index 100%
rename from vcl/source/filter/jpeg/JpegReader.hxx
rename to vcl/inc/filter/JpegReader.hxx
diff --git a/vcl/source/filter/jpeg/JpegTransform.hxx
b/vcl/inc/filter/JpegTransform.hxx
similarity index 100%
rename from vcl/source/filter/jpeg/JpegTransform.hxx
rename to vcl/inc/filter/JpegTransform.hxx
diff --git a/vcl/source/filter/jpeg/JpegWriter.hxx
b/vcl/inc/filter/JpegWriter.hxx
similarity index 100%
rename from vcl/source/filter/jpeg/JpegWriter.hxx
rename to vcl/inc/filter/JpegWriter.hxx
diff --git a/vcl/source/filter/igif/decode.hxx b/vcl/inc/filter/decode.hxx
similarity index 100%
rename from vcl/source/filter/igif/decode.hxx
rename to vcl/inc/filter/decode.hxx
diff --git a/vcl/source/filter/wmf/emfwr.hxx b/vcl/inc/filter/emfwr.hxx
similarity index 100%
rename from vcl/source/filter/wmf/emfwr.hxx
rename to vcl/inc/filter/emfwr.hxx
diff --git a/vcl/source/filter/igif/gifread.hxx b/vcl/inc/filter/gifread.hxx
similarity index 100%
rename from vcl/source/filter/igif/gifread.hxx
rename to vcl/inc/filter/gifread.hxx
diff --git a/vcl/source/filter/graphicfilter_internal.hxx
b/vcl/inc/filter/graphicfilter_internal.hxx
similarity index 100%
rename from vcl/source/filter/graphicfilter_internal.hxx
rename to vcl/inc/filter/graphicfilter_internal.hxx
diff --git a/vcl/source/filter/jpeg/jinclude.h b/vcl/inc/filter/jinclude.h
similarity index 100%
rename from vcl/source/filter/jpeg/jinclude.h
rename to vcl/inc/filter/jinclude.h
diff --git a/vcl/source/filter/jpeg/jpeg.h b/vcl/inc/filter/jpeg.h
similarity index 100%
rename from vcl/source/filter/jpeg/jpeg.h
rename to vcl/inc/filter/jpeg.h
diff --git a/vcl/source/filter/jpeg/jpeg.hxx b/vcl/inc/filter/jpeg.hxx
similarity index 100%
rename from vcl/source/filter/jpeg/jpeg.hxx
rename to vcl/inc/filter/jpeg.hxx
diff --git a/vcl/source/filter/jpeg/jpegcomp.h b/vcl/inc/filter/jpegcomp.h
similarity index 100%
rename from vcl/source/filter/jpeg/jpegcomp.h
rename to vcl/inc/filter/jpegcomp.h
diff --git a/vcl/source/filter/ixpm/rgbtable.hxx b/vcl/inc/filter/rgbtable.hxx
similarity index 100%
rename from vcl/source/filter/ixpm/rgbtable.hxx
rename to vcl/inc/filter/rgbtable.hxx
diff --git a/vcl/source/filter/sgfbram.hxx b/vcl/inc/filter/sgfbram.hxx
similarity index 100%
rename from vcl/source/filter/sgfbram.hxx
rename to vcl/inc/filter/sgfbram.hxx
diff --git a/vcl/source/filter/sgffilt.hxx b/vcl/inc/filter/sgffilt.hxx
similarity index 100%
rename from vcl/source/filter/sgffilt.hxx
rename to vcl/inc/filter/sgffilt.hxx
diff --git a/vcl/source/filter/sgvmain.hxx b/vcl/inc/filter/sgvmain.hxx
similarity index 100%
rename from vcl/source/filter/sgvmain.hxx
rename to vcl/inc/filter/sgvmain.hxx
diff --git a/vcl/source/filter/sgvspln.hxx b/vcl/inc/filter/sgvspln.hxx
similarity index 100%
rename from vcl/source/filter/sgvspln.hxx
rename to vcl/inc/filter/sgvspln.hxx
diff --git a/vcl/source/filter/jpeg/transupp.h b/vcl/inc/filter/transupp.h
similarity index 100%
rename from vcl/source/filter/jpeg/transupp.h
rename to vcl/inc/filter/transupp.h
diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/inc/filter/winmtf.hxx
similarity index 100%
rename from vcl/source/filter/wmf/winmtf.hxx
rename to vcl/inc/filter/winmtf.hxx
diff --git a/vcl/source/filter/wmf/wmfwr.hxx b/vcl/inc/filter/wmfwr.hxx
similarity index 100%
rename from vcl/source/filter/wmf/wmfwr.hxx
rename to vcl/inc/filter/wmfwr.hxx
diff --git a/vcl/source/filter/ixbm/xbmread.hxx b/vcl/inc/filter/xbmread.hxx
similarity index 100%
rename from vcl/source/filter/ixbm/xbmread.hxx
rename to vcl/inc/filter/xbmread.hxx
diff --git a/vcl/source/filter/ixpm/xpmread.hxx b/vcl/inc/filter/xpmread.hxx
similarity index 100%
rename from vcl/source/filter/ixpm/xpmread.hxx
rename to vcl/inc/filter/xpmread.hxx
diff --git a/vcl/source/filter/FilterConfigCache.cxx
b/vcl/source/filter/FilterConfigCache.cxx
index ca579e2..bcab60c 100644
--- a/vcl/source/filter/FilterConfigCache.cxx
+++ b/vcl/source/filter/FilterConfigCache.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "FilterConfigCache.hxx"
+#include "filter/FilterConfigCache.hxx"
#include <vcl/graphicfilter.hxx>
#include <com/sun/star/uno/Any.h>
diff --git a/vcl/source/filter/GraphicNativeMetadata.cxx
b/vcl/source/filter/GraphicNativeMetadata.cxx
index 532e2d4..43359ab 100644
--- a/vcl/source/filter/GraphicNativeMetadata.cxx
+++ b/vcl/source/filter/GraphicNativeMetadata.cxx
@@ -21,7 +21,7 @@
#include <vcl/gfxlink.hxx>
-#include "jpeg/Exif.hxx"
+#include "filter/Exif.hxx"
#include <memory>
GraphicNativeMetadata::GraphicNativeMetadata() :
diff --git a/vcl/source/filter/GraphicNativeTransform.cxx
b/vcl/source/filter/GraphicNativeTransform.cxx
index 11a17a5..b0dd5b1 100644
--- a/vcl/source/filter/GraphicNativeTransform.cxx
+++ b/vcl/source/filter/GraphicNativeTransform.cxx
@@ -24,8 +24,8 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
-#include "jpeg/Exif.hxx"
-#include "jpeg/JpegTransform.hxx"
+#include "filter/Exif.hxx"
+#include "filter/JpegTransform.hxx"
GraphicNativeTransform::GraphicNativeTransform(Graphic& rGraphic) :
mrGraphic(rGraphic)
diff --git a/vcl/source/filter/graphicfilter.cxx
b/vcl/source/filter/graphicfilter.cxx
index 7b3d34c..f62bbac 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -40,12 +40,11 @@
#include <vcl/FilterConfigItem.hxx>
#include <vcl/wmf.hxx>
#include <vcl/settings.hxx>
-#include "igif/gifread.hxx"
-#include "jpeg/jpeg.hxx"
-#include "ixbm/xbmread.hxx"
-#include "ixpm/xpmread.hxx"
-#include "sgffilt.hxx"
-#include "osl/module.hxx"
+#include <unotools/ucbstreamhelper.hxx>
+#include <rtl/bootstrap.hxx>
+#include <rtl/instance.hxx>
+#include <vcl/metaact.hxx>
+
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/awt/Size.hpp>
#include <com/sun/star/uno/XInterface.hpp>
@@ -59,15 +58,19 @@
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
#include <com/sun/star/xml/sax/Writer.hpp>
#include <com/sun/star/ucb/CommandAbortedException.hpp>
-#include <unotools/ucbstreamhelper.hxx>
-#include <rtl/bootstrap.hxx>
-#include <rtl/instance.hxx>
-#include <vcl/metaact.hxx>
+
#include <vector>
#include <memory>
-#include "FilterConfigCache.hxx"
-#include "graphicfilter_internal.hxx"
+#include "filter/gifread.hxx"
+#include "filter/jpeg.hxx"
+#include "filter/xbmread.hxx"
+#include "filter/xpmread.hxx"
+#include "filter/sgffilt.hxx"
+#include "osl/module.hxx"
+
+#include "filter/FilterConfigCache.hxx"
+#include "filter/graphicfilter_internal.hxx"
#define PMGCHUNG_msOG 0x6d734f47 // Microsoft Office Animated GIF
diff --git a/vcl/source/filter/graphicfilter2.cxx
b/vcl/source/filter/graphicfilter2.cxx
index 822452b..05c78a5 100644
--- a/vcl/source/filter/graphicfilter2.cxx
+++ b/vcl/source/filter/graphicfilter2.cxx
@@ -23,7 +23,7 @@
#include <vcl/outdev.hxx>
#include <vcl/graphicfilter.hxx>
#include <unotools/ucbstreamhelper.hxx>
-#include "graphicfilter_internal.hxx"
+#include "filter/graphicfilter_internal.hxx"
#define DATA_SIZE 640
diff --git a/vcl/source/filter/igif/decode.cxx
b/vcl/source/filter/igif/decode.cxx
index b0454d2..42a3aeb 100644
--- a/vcl/source/filter/igif/decode.cxx
+++ b/vcl/source/filter/igif/decode.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "decode.hxx"
+#include "filter/decode.hxx"
struct GIFLZWTableEntry
{
diff --git a/vcl/source/filter/igif/gifread.cxx
b/vcl/source/filter/igif/gifread.cxx
index cb0e0ee..26fd5fc 100644
--- a/vcl/source/filter/igif/gifread.cxx
+++ b/vcl/source/filter/igif/gifread.cxx
@@ -19,8 +19,8 @@
#define _GIFPRIVATE
-#include "decode.hxx"
-#include "gifread.hxx"
+#include "filter/decode.hxx"
+#include "filter/gifread.hxx"
#include <memory>
#define NO_PENDING( rStm ) ( ( rStm ).GetError() != ERRCODE_IO_PENDING )
diff --git a/vcl/source/filter/ixbm/xbmread.cxx
b/vcl/source/filter/ixbm/xbmread.cxx
index b12aea3..d6539a1 100644
--- a/vcl/source/filter/ixbm/xbmread.cxx
+++ b/vcl/source/filter/ixbm/xbmread.cxx
@@ -20,7 +20,7 @@
#define _XBMPRIVATE
#include <ctype.h>
#include <comphelper/string.hxx>
-#include "xbmread.hxx"
+#include "filter/xbmread.hxx"
XBMReader::XBMReader( SvStream& rStm ) :
rIStm ( rStm ),
diff --git a/vcl/source/filter/ixpm/xpmread.cxx
b/vcl/source/filter/ixpm/xpmread.cxx
index cfc7956..b7fec06 100644
--- a/vcl/source/filter/ixpm/xpmread.cxx
+++ b/vcl/source/filter/ixpm/xpmread.cxx
@@ -19,9 +19,9 @@
#include <vcl/bmpacc.hxx>
#include <vcl/graph.hxx>
-#include "rgbtable.hxx"
+#include "filter/rgbtable.hxx"
#define _XPMPRIVATE
-#include "xpmread.hxx"
+#include "filter/xpmread.hxx"
#include <cstring>
XPMReader::XPMReader(SvStream& rStm)
diff --git a/vcl/source/filter/jpeg/Exif.cxx b/vcl/source/filter/jpeg/Exif.cxx
index b1a4034..7694fb2 100644
--- a/vcl/source/filter/jpeg/Exif.cxx
+++ b/vcl/source/filter/jpeg/Exif.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "Exif.hxx"
+#include "filter/Exif.hxx"
#include <memory>
Exif::Exif() :
diff --git a/vcl/source/filter/jpeg/JpegReader.cxx
b/vcl/source/filter/jpeg/JpegReader.cxx
index 5f42009..c8479cf 100644
--- a/vcl/source/filter/jpeg/JpegReader.cxx
+++ b/vcl/source/filter/jpeg/JpegReader.cxx
@@ -19,11 +19,11 @@
#include <sal/config.h>
-#include "jpeg.h"
+#include "filter/jpeg.h"
#include <jpeglib.h>
#include <jerror.h>
-#include "JpegReader.hxx"
+#include "filter/JpegReader.hxx"
#include <vcl/bmpacc.hxx>
#include <vcl/FilterConfigItem.hxx>
#include <vcl/graphicfilter.hxx>
diff --git a/vcl/source/filter/jpeg/JpegTransform.cxx
b/vcl/source/filter/jpeg/JpegTransform.cxx
index a71b816..496b8cc 100644
--- a/vcl/source/filter/jpeg/JpegTransform.cxx
+++ b/vcl/source/filter/jpeg/JpegTransform.cxx
@@ -19,9 +19,8 @@
#include <sal/config.h>
-#include "jpeg.h"
-
-#include "JpegTransform.hxx"
+#include "filter/jpeg.h"
+#include "filter/JpegTransform.hxx"
JpegTransform::JpegTransform(SvStream& rInputStream, SvStream& rOutputStream) :
maRotate ( 0 ),
diff --git a/vcl/source/filter/jpeg/JpegWriter.cxx
b/vcl/source/filter/jpeg/JpegWriter.cxx
index cb1a67f..648299a 100644
--- a/vcl/source/filter/jpeg/JpegWriter.cxx
+++ b/vcl/source/filter/jpeg/JpegWriter.cxx
@@ -19,11 +19,11 @@
#include <sal/config.h>
-#include "jpeg.h"
+#include "filter/jpeg.h"
#include <jpeglib.h>
#include <jerror.h>
-#include "JpegWriter.hxx"
+#include "filter/JpegWriter.hxx"
#include <vcl/bmpacc.hxx>
#include <vcl/FilterConfigItem.hxx>
#include <vcl/graphicfilter.hxx>
diff --git a/vcl/source/filter/jpeg/jpeg.cxx b/vcl/source/filter/jpeg/jpeg.cxx
index b2e4672..f1e5773 100644
--- a/vcl/source/filter/jpeg/jpeg.cxx
+++ b/vcl/source/filter/jpeg/jpeg.cxx
@@ -17,9 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "JpegReader.hxx"
-#include "JpegWriter.hxx"
-#include "jpeg.hxx"
+#include "filter/JpegReader.hxx"
+#include "filter/JpegWriter.hxx"
+#include "filter/jpeg.hxx"
#include <vcl/bmpacc.hxx>
#include <vcl/FilterConfigItem.hxx>
diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx
index d42ae78..f184441 100644
--- a/vcl/source/filter/jpeg/jpegc.cxx
+++ b/vcl/source/filter/jpeg/jpegc.cxx
@@ -29,12 +29,12 @@
#include <osl/diagnose.h>
extern "C" {
-#include "transupp.h"
+#include "filter/transupp.h"
}
-#include "jpeg.h"
-#include <JpegReader.hxx>
-#include <JpegWriter.hxx>
+#include "filter/jpeg.h"
+#include "filter/JpegReader.hxx"
+#include "filter/JpegWriter.hxx"
#include <memory>
#ifdef _MSC_VER
diff --git a/vcl/source/filter/jpeg/transupp.c
b/vcl/source/filter/jpeg/transupp.c
index 323aa30..e9fbbd0 100644
--- a/vcl/source/filter/jpeg/transupp.c
+++ b/vcl/source/filter/jpeg/transupp.c
@@ -19,8 +19,8 @@
#include "jinclude.h"
#include "jerror.h"
#include "jpeglib.h"
-#include "transupp.h" /* My own external interface */
-#include "jpegcomp.h"
+#include "filter/transupp.h" /* My own external interface */
+#include "filter/jpegcomp.h"
#include <ctype.h> /* to declare isdigit() */
/* Definition of jdiv_round_up is copied here from jutils.c in jpeg-8c.tar.gz,
diff --git a/vcl/source/filter/sgfbram.cxx b/vcl/source/filter/sgfbram.cxx
index c449afc..f02f249 100644
--- a/vcl/source/filter/sgfbram.cxx
+++ b/vcl/source/filter/sgfbram.cxx
@@ -24,8 +24,8 @@
#include <vcl/gdimtf.hxx>
#include <tools/color.hxx>
#include <vcl/virdev.hxx>
-#include "sgffilt.hxx"
-#include "sgfbram.hxx"
+#include "filter/sgffilt.hxx"
+#include "filter/sgfbram.hxx"
#include <memory>
SgfHeader::SgfHeader()
diff --git a/vcl/source/filter/sgvmain.cxx b/vcl/source/filter/sgvmain.cxx
index 18e2d2c..9b96af9 100644
--- a/vcl/source/filter/sgvmain.cxx
+++ b/vcl/source/filter/sgvmain.cxx
@@ -23,10 +23,10 @@
#include <tools/poly.hxx>
#include <tools/fract.hxx>
#include <vcl/graphicfilter.hxx>
-#include "sgffilt.hxx"
-#include "sgfbram.hxx"
-#include "sgvmain.hxx"
-#include "sgvspln.hxx"
+#include "filter/sgffilt.hxx"
+#include "filter/sgfbram.hxx"
+#include "filter/sgvmain.hxx"
+#include "filter/sgvspln.hxx"
#include <unotools/ucbstreamhelper.hxx>
#if defined OSL_BIGENDIAN
diff --git a/vcl/source/filter/sgvspln.cxx b/vcl/source/filter/sgvspln.cxx
index 762e310..6a55591 100644
--- a/vcl/source/filter/sgvspln.cxx
+++ b/vcl/source/filter/sgvspln.cxx
@@ -20,7 +20,7 @@
#include <tools/poly.hxx>
#include <memory>
-#include <sgvspln.hxx>
+#include "filter/sgvspln.hxx"
#include <cmath>
#if defined(ANDROID)
diff --git a/vcl/source/filter/sgvtext.cxx b/vcl/source/filter/sgvtext.cxx
index 976683b..4359462 100644
--- a/vcl/source/filter/sgvtext.cxx
+++ b/vcl/source/filter/sgvtext.cxx
@@ -25,9 +25,9 @@
#include <tools/config.hxx>
#include <tools/fract.hxx>
#include <vcl/graphicfilter.hxx>
-#include "sgffilt.hxx"
-#include "sgfbram.hxx"
-#include "sgvmain.hxx"
+#include "filter/sgffilt.hxx"
+#include "filter/sgfbram.hxx"
+#include "filter/sgvmain.hxx"
#include <memory>
#include <cstdlib>
diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx
index 15375dd..9387257 100644
--- a/vcl/source/filter/wmf/emfwr.cxx
+++ b/vcl/source/filter/wmf/emfwr.cxx
@@ -21,7 +21,7 @@
#include <algorithm>
-#include "emfwr.hxx"
+#include "filter/emfwr.hxx"
#include <rtl/strbuf.hxx>
#include <tools/helpers.hxx>
#include <tools/fract.hxx>
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index 989e0aa..f10edd2 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "winmtf.hxx"
+#include "filter/winmtf.hxx"
#include <osl/endian.h>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <vcl/dibtools.hxx>
diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index c19642a..baa810d 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "winmtf.hxx"
+#include "filter/winmtf.hxx"
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/polygon/b2dpolypolygontools.hxx>
#include <vcl/metaact.hxx>
diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx
index a142f76..25328b1 100644
--- a/vcl/source/filter/wmf/winwmf.cxx
+++ b/vcl/source/filter/wmf/winwmf.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "winmtf.hxx"
+#include "filter/winmtf.hxx"
#include <memory>
#include <boost/optional.hpp>
diff --git a/vcl/source/filter/wmf/wmf.cxx b/vcl/source/filter/wmf/wmf.cxx
index 1b39721..e09e1c0 100644
--- a/vcl/source/filter/wmf/wmf.cxx
+++ b/vcl/source/filter/wmf/wmf.cxx
@@ -17,9 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "winmtf.hxx"
-#include "emfwr.hxx"
-#include "wmfwr.hxx"
+#include "filter/winmtf.hxx"
+#include "filter/emfwr.hxx"
+#include "filter/wmfwr.hxx"
#include <vcl/wmf.hxx>
#include <vcl/gdimetafiletools.hxx>
#include <comphelper/scopeguard.hxx>
diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx
index 73f0489..9a58880 100644
--- a/vcl/source/filter/wmf/wmfwr.cxx
+++ b/vcl/source/filter/wmf/wmfwr.cxx
@@ -21,9 +21,10 @@
#include <algorithm>
-#include "wmfwr.hxx"
+#include "filter/wmfwr.hxx"
+#include "filter/emfwr.hxx"
+
#include <unotools/fontcvt.hxx>
-#include "emfwr.hxx"
#include <rtl/crc.h>
#include <rtl/strbuf.hxx>
#include <rtl/tencinfo.h>
diff --git a/vcl/workben/fftester.cxx b/vcl/workben/fftester.cxx
index c57407d..0e21304 100644
--- a/vcl/workben/fftester.cxx
+++ b/vcl/workben/fftester.cxx
@@ -52,10 +52,10 @@
#include <osl/file.hxx>
#include <signal.h>
-#include <../source/filter/igif/gifread.hxx>
-#include <../source/filter/ixbm/xbmread.hxx>
-#include <../source/filter/ixpm/xpmread.hxx>
-#include <../source/filter/jpeg/jpeg.hxx>
+#include "filter/gifread.hxx"
+#include "filter/xbmread.hxx"
+#include "filter/xpmread.hxx"
+#include "filter/jpeg.hxx"
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
