[Libreoffice-commits] core.git: vcl/inc vcl/source vcl/workben
Chris Sherlock
chris.sherlock79 at gmail.com
Fri Jan 8 05:24:59 PST 2016
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 | 6
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, 3694 insertions(+), 3697 deletions(-)
New commits:
commit 054928f49b05291e727fcd747427e88aac38b6f7
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Fri Jan 8 23:53:16 2016 +1100
Revert "vcl: move filter headers to vcl/inc/filter"
Discussed on IRC - overwhelming consensus is to keep the headers
where they were before. The main reason to keep them in the same
directory is to keep headers as local as possible to the source
files, unless something else needs to access it.
The only thing that uses the headers is vc/workben/fftester.cxx
I will work out how to get Doxygen to pick up these headers another way.
This reverts commit 5d7772fc0464c867c5ad2f1e10ccabd7331f7efa.
Change-Id: I45ee970722e27748ab8af8909ac49579dc47ef56
Reviewed-on: https://gerrit.libreoffice.org/21250
Reviewed-by: Chris Sherlock <chris.sherlock79 at gmail.com>
Tested-by: Chris Sherlock <chris.sherlock79 at gmail.com>
diff --git a/vcl/source/filter/FilterConfigCache.cxx b/vcl/source/filter/FilterConfigCache.cxx
index bcab60c..ca579e2 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 "filter/FilterConfigCache.hxx"
+#include "FilterConfigCache.hxx"
#include <vcl/graphicfilter.hxx>
#include <com/sun/star/uno/Any.h>
diff --git a/vcl/inc/filter/FilterConfigCache.hxx b/vcl/source/filter/FilterConfigCache.hxx
similarity index 100%
rename from vcl/inc/filter/FilterConfigCache.hxx
rename to vcl/source/filter/FilterConfigCache.hxx
diff --git a/vcl/source/filter/GraphicNativeMetadata.cxx b/vcl/source/filter/GraphicNativeMetadata.cxx
index 43359ab..532e2d4 100644
--- a/vcl/source/filter/GraphicNativeMetadata.cxx
+++ b/vcl/source/filter/GraphicNativeMetadata.cxx
@@ -21,7 +21,7 @@
#include <vcl/gfxlink.hxx>
-#include "filter/Exif.hxx"
+#include "jpeg/Exif.hxx"
#include <memory>
GraphicNativeMetadata::GraphicNativeMetadata() :
diff --git a/vcl/source/filter/GraphicNativeTransform.cxx b/vcl/source/filter/GraphicNativeTransform.cxx
index b0dd5b1..11a17a5 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 "filter/Exif.hxx"
-#include "filter/JpegTransform.hxx"
+#include "jpeg/Exif.hxx"
+#include "jpeg/JpegTransform.hxx"
GraphicNativeTransform::GraphicNativeTransform(Graphic& rGraphic) :
mrGraphic(rGraphic)
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index f62bbac..7b3d34c 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -40,11 +40,12 @@
#include <vcl/FilterConfigItem.hxx>
#include <vcl/wmf.hxx>
#include <vcl/settings.hxx>
-#include <unotools/ucbstreamhelper.hxx>
-#include <rtl/bootstrap.hxx>
-#include <rtl/instance.hxx>
-#include <vcl/metaact.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 <com/sun/star/uno/Reference.h>
#include <com/sun/star/awt/Size.hpp>
#include <com/sun/star/uno/XInterface.hpp>
@@ -58,19 +59,15 @@
#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 "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"
+#include "FilterConfigCache.hxx"
+#include "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 05c78a5..822452b 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 "filter/graphicfilter_internal.hxx"
+#include "graphicfilter_internal.hxx"
#define DATA_SIZE 640
diff --git a/vcl/inc/filter/graphicfilter_internal.hxx b/vcl/source/filter/graphicfilter_internal.hxx
similarity index 100%
rename from vcl/inc/filter/graphicfilter_internal.hxx
rename to vcl/source/filter/graphicfilter_internal.hxx
diff --git a/vcl/source/filter/igif/decode.cxx b/vcl/source/filter/igif/decode.cxx
index 42a3aeb..b0454d2 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 "filter/decode.hxx"
+#include "decode.hxx"
struct GIFLZWTableEntry
{
diff --git a/vcl/inc/filter/decode.hxx b/vcl/source/filter/igif/decode.hxx
similarity index 100%
rename from vcl/inc/filter/decode.hxx
rename to vcl/source/filter/igif/decode.hxx
diff --git a/vcl/source/filter/igif/gifread.cxx b/vcl/source/filter/igif/gifread.cxx
index 26fd5fc..cb0e0ee 100644
--- a/vcl/source/filter/igif/gifread.cxx
+++ b/vcl/source/filter/igif/gifread.cxx
@@ -19,8 +19,8 @@
#define _GIFPRIVATE
-#include "filter/decode.hxx"
-#include "filter/gifread.hxx"
+#include "decode.hxx"
+#include "gifread.hxx"
#include <memory>
#define NO_PENDING( rStm ) ( ( rStm ).GetError() != ERRCODE_IO_PENDING )
diff --git a/vcl/inc/filter/gifread.hxx b/vcl/source/filter/igif/gifread.hxx
similarity index 100%
rename from vcl/inc/filter/gifread.hxx
rename to vcl/source/filter/igif/gifread.hxx
diff --git a/vcl/source/filter/ixbm/xbmread.cxx b/vcl/source/filter/ixbm/xbmread.cxx
index d6539a1..b12aea3 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 "filter/xbmread.hxx"
+#include "xbmread.hxx"
XBMReader::XBMReader( SvStream& rStm ) :
rIStm ( rStm ),
diff --git a/vcl/inc/filter/xbmread.hxx b/vcl/source/filter/ixbm/xbmread.hxx
similarity index 100%
rename from vcl/inc/filter/xbmread.hxx
rename to vcl/source/filter/ixbm/xbmread.hxx
diff --git a/vcl/inc/filter/rgbtable.hxx b/vcl/source/filter/ixpm/rgbtable.hxx
similarity index 100%
rename from vcl/inc/filter/rgbtable.hxx
rename to vcl/source/filter/ixpm/rgbtable.hxx
diff --git a/vcl/source/filter/ixpm/xpmread.cxx b/vcl/source/filter/ixpm/xpmread.cxx
index b7fec06..cfc7956 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 "filter/rgbtable.hxx"
+#include "rgbtable.hxx"
#define _XPMPRIVATE
-#include "filter/xpmread.hxx"
+#include "xpmread.hxx"
#include <cstring>
XPMReader::XPMReader(SvStream& rStm)
diff --git a/vcl/inc/filter/xpmread.hxx b/vcl/source/filter/ixpm/xpmread.hxx
similarity index 100%
rename from vcl/inc/filter/xpmread.hxx
rename to vcl/source/filter/ixpm/xpmread.hxx
diff --git a/vcl/source/filter/jpeg/Exif.cxx b/vcl/source/filter/jpeg/Exif.cxx
index 7694fb2..b1a4034 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 "filter/Exif.hxx"
+#include "Exif.hxx"
#include <memory>
Exif::Exif() :
diff --git a/vcl/inc/filter/Exif.hxx b/vcl/source/filter/jpeg/Exif.hxx
similarity index 100%
rename from vcl/inc/filter/Exif.hxx
rename to vcl/source/filter/jpeg/Exif.hxx
diff --git a/vcl/source/filter/jpeg/JpegReader.cxx b/vcl/source/filter/jpeg/JpegReader.cxx
index c8479cf..5f42009 100644
--- a/vcl/source/filter/jpeg/JpegReader.cxx
+++ b/vcl/source/filter/jpeg/JpegReader.cxx
@@ -19,11 +19,11 @@
#include <sal/config.h>
-#include "filter/jpeg.h"
+#include "jpeg.h"
#include <jpeglib.h>
#include <jerror.h>
-#include "filter/JpegReader.hxx"
+#include "JpegReader.hxx"
#include <vcl/bmpacc.hxx>
#include <vcl/FilterConfigItem.hxx>
#include <vcl/graphicfilter.hxx>
diff --git a/vcl/inc/filter/JpegReader.hxx b/vcl/source/filter/jpeg/JpegReader.hxx
similarity index 100%
rename from vcl/inc/filter/JpegReader.hxx
rename to vcl/source/filter/jpeg/JpegReader.hxx
diff --git a/vcl/source/filter/jpeg/JpegTransform.cxx b/vcl/source/filter/jpeg/JpegTransform.cxx
index 496b8cc..a71b816 100644
--- a/vcl/source/filter/jpeg/JpegTransform.cxx
+++ b/vcl/source/filter/jpeg/JpegTransform.cxx
@@ -19,8 +19,9 @@
#include <sal/config.h>
-#include "filter/jpeg.h"
-#include "filter/JpegTransform.hxx"
+#include "jpeg.h"
+
+#include "JpegTransform.hxx"
JpegTransform::JpegTransform(SvStream& rInputStream, SvStream& rOutputStream) :
maRotate ( 0 ),
diff --git a/vcl/inc/filter/JpegTransform.hxx b/vcl/source/filter/jpeg/JpegTransform.hxx
similarity index 100%
rename from vcl/inc/filter/JpegTransform.hxx
rename to vcl/source/filter/jpeg/JpegTransform.hxx
diff --git a/vcl/source/filter/jpeg/JpegWriter.cxx b/vcl/source/filter/jpeg/JpegWriter.cxx
index 648299a..cb1a67f 100644
--- a/vcl/source/filter/jpeg/JpegWriter.cxx
+++ b/vcl/source/filter/jpeg/JpegWriter.cxx
@@ -19,11 +19,11 @@
#include <sal/config.h>
-#include "filter/jpeg.h"
+#include "jpeg.h"
#include <jpeglib.h>
#include <jerror.h>
-#include "filter/JpegWriter.hxx"
+#include "JpegWriter.hxx"
#include <vcl/bmpacc.hxx>
#include <vcl/FilterConfigItem.hxx>
#include <vcl/graphicfilter.hxx>
diff --git a/vcl/inc/filter/JpegWriter.hxx b/vcl/source/filter/jpeg/JpegWriter.hxx
similarity index 100%
rename from vcl/inc/filter/JpegWriter.hxx
rename to vcl/source/filter/jpeg/JpegWriter.hxx
diff --git a/vcl/inc/filter/jinclude.h b/vcl/source/filter/jpeg/jinclude.h
similarity index 100%
rename from vcl/inc/filter/jinclude.h
rename to vcl/source/filter/jpeg/jinclude.h
diff --git a/vcl/source/filter/jpeg/jpeg.cxx b/vcl/source/filter/jpeg/jpeg.cxx
index f1e5773..b2e4672 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 "filter/JpegReader.hxx"
-#include "filter/JpegWriter.hxx"
-#include "filter/jpeg.hxx"
+#include "JpegReader.hxx"
+#include "JpegWriter.hxx"
+#include "jpeg.hxx"
#include <vcl/bmpacc.hxx>
#include <vcl/FilterConfigItem.hxx>
diff --git a/vcl/inc/filter/jpeg.h b/vcl/source/filter/jpeg/jpeg.h
similarity index 100%
rename from vcl/inc/filter/jpeg.h
rename to vcl/source/filter/jpeg/jpeg.h
diff --git a/vcl/inc/filter/jpeg.hxx b/vcl/source/filter/jpeg/jpeg.hxx
similarity index 100%
rename from vcl/inc/filter/jpeg.hxx
rename to vcl/source/filter/jpeg/jpeg.hxx
diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx
index f184441..d42ae78 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 "filter/transupp.h"
+#include "transupp.h"
}
-#include "filter/jpeg.h"
-#include "filter/JpegReader.hxx"
-#include "filter/JpegWriter.hxx"
+#include "jpeg.h"
+#include <JpegReader.hxx>
+#include <JpegWriter.hxx>
#include <memory>
#ifdef _MSC_VER
diff --git a/vcl/inc/filter/jpegcomp.h b/vcl/source/filter/jpeg/jpegcomp.h
similarity index 100%
rename from vcl/inc/filter/jpegcomp.h
rename to vcl/source/filter/jpeg/jpegcomp.h
diff --git a/vcl/source/filter/jpeg/transupp.c b/vcl/source/filter/jpeg/transupp.c
index 4530be0..323aa30 100644
--- a/vcl/source/filter/jpeg/transupp.c
+++ b/vcl/source/filter/jpeg/transupp.c
@@ -16,11 +16,11 @@
#include <sal/config.h>
-#include "filter/jinclude.h"
+#include "jinclude.h"
#include "jerror.h"
#include "jpeglib.h"
-#include "filter/transupp.h" /* My own external interface */
-#include "filter/jpegcomp.h"
+#include "transupp.h" /* My own external interface */
+#include "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/inc/filter/transupp.h b/vcl/source/filter/jpeg/transupp.h
similarity index 100%
rename from vcl/inc/filter/transupp.h
rename to vcl/source/filter/jpeg/transupp.h
diff --git a/vcl/source/filter/sgfbram.cxx b/vcl/source/filter/sgfbram.cxx
index f02f249..c449afc 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 "filter/sgffilt.hxx"
-#include "filter/sgfbram.hxx"
+#include "sgffilt.hxx"
+#include "sgfbram.hxx"
#include <memory>
SgfHeader::SgfHeader()
diff --git a/vcl/inc/filter/sgfbram.hxx b/vcl/source/filter/sgfbram.hxx
similarity index 100%
rename from vcl/inc/filter/sgfbram.hxx
rename to vcl/source/filter/sgfbram.hxx
diff --git a/vcl/inc/filter/sgffilt.hxx b/vcl/source/filter/sgffilt.hxx
similarity index 100%
rename from vcl/inc/filter/sgffilt.hxx
rename to vcl/source/filter/sgffilt.hxx
diff --git a/vcl/source/filter/sgvmain.cxx b/vcl/source/filter/sgvmain.cxx
index 9b96af9..18e2d2c 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 "filter/sgffilt.hxx"
-#include "filter/sgfbram.hxx"
-#include "filter/sgvmain.hxx"
-#include "filter/sgvspln.hxx"
+#include "sgffilt.hxx"
+#include "sgfbram.hxx"
+#include "sgvmain.hxx"
+#include "sgvspln.hxx"
#include <unotools/ucbstreamhelper.hxx>
#if defined OSL_BIGENDIAN
diff --git a/vcl/inc/filter/sgvmain.hxx b/vcl/source/filter/sgvmain.hxx
similarity index 100%
rename from vcl/inc/filter/sgvmain.hxx
rename to vcl/source/filter/sgvmain.hxx
diff --git a/vcl/source/filter/sgvspln.cxx b/vcl/source/filter/sgvspln.cxx
index 6a55591..762e310 100644
--- a/vcl/source/filter/sgvspln.cxx
+++ b/vcl/source/filter/sgvspln.cxx
@@ -20,7 +20,7 @@
#include <tools/poly.hxx>
#include <memory>
-#include "filter/sgvspln.hxx"
+#include <sgvspln.hxx>
#include <cmath>
#if defined(ANDROID)
diff --git a/vcl/inc/filter/sgvspln.hxx b/vcl/source/filter/sgvspln.hxx
similarity index 100%
rename from vcl/inc/filter/sgvspln.hxx
rename to vcl/source/filter/sgvspln.hxx
diff --git a/vcl/source/filter/sgvtext.cxx b/vcl/source/filter/sgvtext.cxx
index 4359462..976683b 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 "filter/sgffilt.hxx"
-#include "filter/sgfbram.hxx"
-#include "filter/sgvmain.hxx"
+#include "sgffilt.hxx"
+#include "sgfbram.hxx"
+#include "sgvmain.hxx"
#include <memory>
#include <cstdlib>
diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx
index 9387257..15375dd 100644
--- a/vcl/source/filter/wmf/emfwr.cxx
+++ b/vcl/source/filter/wmf/emfwr.cxx
@@ -21,7 +21,7 @@
#include <algorithm>
-#include "filter/emfwr.hxx"
+#include "emfwr.hxx"
#include <rtl/strbuf.hxx>
#include <tools/helpers.hxx>
#include <tools/fract.hxx>
diff --git a/vcl/inc/filter/emfwr.hxx b/vcl/source/filter/wmf/emfwr.hxx
similarity index 100%
rename from vcl/inc/filter/emfwr.hxx
rename to vcl/source/filter/wmf/emfwr.hxx
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index f10edd2..989e0aa 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 "filter/winmtf.hxx"
+#include "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 baa810d..c19642a 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 "filter/winmtf.hxx"
+#include "winmtf.hxx"
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/polygon/b2dpolypolygontools.hxx>
#include <vcl/metaact.hxx>
diff --git a/vcl/inc/filter/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx
similarity index 100%
rename from vcl/inc/filter/winmtf.hxx
rename to vcl/source/filter/wmf/winmtf.hxx
diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx
index 25328b1..a142f76 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 "filter/winmtf.hxx"
+#include "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 e09e1c0..1b39721 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 "filter/winmtf.hxx"
-#include "filter/emfwr.hxx"
-#include "filter/wmfwr.hxx"
+#include "winmtf.hxx"
+#include "emfwr.hxx"
+#include "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 9a58880..73f0489 100644
--- a/vcl/source/filter/wmf/wmfwr.cxx
+++ b/vcl/source/filter/wmf/wmfwr.cxx
@@ -21,10 +21,9 @@
#include <algorithm>
-#include "filter/wmfwr.hxx"
-#include "filter/emfwr.hxx"
-
+#include "wmfwr.hxx"
#include <unotools/fontcvt.hxx>
+#include "emfwr.hxx"
#include <rtl/crc.h>
#include <rtl/strbuf.hxx>
#include <rtl/tencinfo.h>
diff --git a/vcl/inc/filter/wmfwr.hxx b/vcl/source/filter/wmf/wmfwr.hxx
similarity index 100%
rename from vcl/inc/filter/wmfwr.hxx
rename to vcl/source/filter/wmf/wmfwr.hxx
diff --git a/vcl/workben/fftester.cxx b/vcl/workben/fftester.cxx
index 0e21304..c57407d 100644
--- a/vcl/workben/fftester.cxx
+++ b/vcl/workben/fftester.cxx
@@ -52,10 +52,10 @@
#include <osl/file.hxx>
#include <signal.h>
-#include "filter/gifread.hxx"
-#include "filter/xbmread.hxx"
-#include "filter/xpmread.hxx"
-#include "filter/jpeg.hxx"
+#include <../source/filter/igif/gifread.hxx>
+#include <../source/filter/ixbm/xbmread.hxx>
+#include <../source/filter/ixpm/xpmread.hxx>
+#include <../source/filter/jpeg/jpeg.hxx>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
More information about the Libreoffice-commits
mailing list