vcl/source/outdev/clipping.cxx | 4 +---
vcl/source/outdev/curvedshapes.cxx | 6 ++----
vcl/source/outdev/gradient.cxx | 9 ++++-----
vcl/source/outdev/hatch.cxx | 7 ++-----
vcl/source/outdev/map.cxx | 6 +++---
vcl/source/outdev/mask.cxx | 6 ++----
vcl/source/outdev/nativecontrols.cxx | 13 ++++++-------
vcl/source/outdev/outdev.cxx | 11 +++++------
vcl/source/outdev/pixel.cxx | 6 ++----
vcl/source/outdev/polygon.cxx | 10 ++++------
vcl/source/outdev/polyline.cxx | 8 +++-----
vcl/source/outdev/rect.cxx | 7 +++----
vcl/source/outdev/stack.cxx | 1 -
vcl/source/outdev/text.cxx | 20 ++++++++++----------
vcl/source/outdev/textline.cxx | 19 ++++++++-----------
15 files changed, 55 insertions(+), 78 deletions(-)
New commits:
commit 1a5d548b96d86ad7ca04c2b23dc18517a538a998
Author: Chris Sherlock <chris.sherloc...@gmail.com>
AuthorDate: Sun Nov 27 03:06:22 2022 +1100
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Thu Dec 1 05:01:12 2022 +0100
vcl: remove unnecessary includes
Change-Id: I41cb0b38857ddeef7cb7f82c1b523a9c7fcf2413
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143324
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/vcl/source/outdev/clipping.cxx b/vcl/source/outdev/clipping.cxx
index 0570719a15fa..ad45b08e1f87 100644
--- a/vcl/source/outdev/clipping.cxx
+++ b/vcl/source/outdev/clipping.cxx
@@ -19,12 +19,10 @@
#include <sal/config.h>
#include <osl/diagnose.h>
-
#include <tools/debug.hxx>
+
#include <vcl/metaact.hxx>
#include <vcl/virdev.hxx>
-#include <vcl/gdimtf.hxx>
-#include <vcl/outdev.hxx>
#include <salgdi.hxx>
diff --git a/vcl/source/outdev/curvedshapes.cxx
b/vcl/source/outdev/curvedshapes.cxx
index de7379dd32bb..b5a13fb721d9 100644
--- a/vcl/source/outdev/curvedshapes.cxx
+++ b/vcl/source/outdev/curvedshapes.cxx
@@ -17,15 +17,13 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <cassert>
-
-#include <vcl/gdimtf.hxx>
#include <vcl/metaact.hxx>
-#include <vcl/outdev.hxx>
#include <vcl/virdev.hxx>
#include <salgdi.hxx>
+#include <cassert>
+
void OutputDevice::DrawEllipse( const tools::Rectangle& rRect )
{
assert(!is_double_buffered_window());
diff --git a/vcl/source/outdev/gradient.cxx b/vcl/source/outdev/gradient.cxx
index 707ca47d960a..5a60184abfff 100644
--- a/vcl/source/outdev/gradient.cxx
+++ b/vcl/source/outdev/gradient.cxx
@@ -17,20 +17,19 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <memory>
-#include <cassert>
-
#include <tools/poly.hxx>
-#include <vcl/gdimtf.hxx>
+
#include <vcl/gradient.hxx>
#include <vcl/metaact.hxx>
#include <vcl/settings.hxx>
-#include <vcl/outdev.hxx>
#include <vcl/virdev.hxx>
#include <vcl/window.hxx>
#include <salgdi.hxx>
+#include <cassert>
+#include <memory>
+
#define GRADIENT_DEFAULT_STEPCOUNT 0
void OutputDevice::DrawGradient( const tools::Rectangle& rRect,
diff --git a/vcl/source/outdev/hatch.cxx b/vcl/source/outdev/hatch.cxx
index 3b92f6df5de9..0fc755864a5d 100644
--- a/vcl/source/outdev/hatch.cxx
+++ b/vcl/source/outdev/hatch.cxx
@@ -17,24 +17,21 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <cassert>
-#include <cstdlib>
-
#include <osl/diagnose.h>
#include <tools/line.hxx>
#include <tools/helpers.hxx>
-
#include <unotools/configmgr.hxx>
#include <vcl/hatch.hxx>
#include <vcl/metaact.hxx>
#include <vcl/settings.hxx>
-#include <vcl/outdev.hxx>
#include <vcl/virdev.hxx>
#include <drawmode.hxx>
#include <salgdi.hxx>
+#include <cassert>
+#include <cstdlib>
#include <memory>
#define HATCH_MAXPOINTS 1024
diff --git a/vcl/source/outdev/map.cxx b/vcl/source/outdev/map.cxx
index 85b5512a4416..67414cb2976c 100644
--- a/vcl/source/outdev/map.cxx
+++ b/vcl/source/outdev/map.cxx
@@ -19,16 +19,16 @@
#include <sal/config.h>
+#include <sal/log.hxx>
+#include <osl/diagnose.h>
#include <tools/bigint.hxx>
#include <tools/debug.hxx>
+
#include <vcl/cursor.hxx>
-#include <vcl/gdimtf.hxx>
#include <vcl/lineinfo.hxx>
#include <vcl/metaact.hxx>
#include <vcl/virdev.hxx>
#include <vcl/wrkwin.hxx>
-#include <sal/log.hxx>
-#include <osl/diagnose.h>
#include <ImplOutDevData.hxx>
#include <svdata.hxx>
diff --git a/vcl/source/outdev/mask.cxx b/vcl/source/outdev/mask.cxx
index c1c3e3b018f5..004b248785b5 100644
--- a/vcl/source/outdev/mask.cxx
+++ b/vcl/source/outdev/mask.cxx
@@ -17,16 +17,14 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <cassert>
-
-#include <vcl/gdimtf.hxx>
#include <vcl/metaact.hxx>
-#include <vcl/outdev.hxx>
#include <vcl/virdev.hxx>
#include <salgdi.hxx>
#include <salbmp.hxx>
+#include <cassert>
+
void OutputDevice::DrawMask( const Point& rDestPt,
const Bitmap& rBitmap, const Color& rMaskColor )
{
diff --git a/vcl/source/outdev/nativecontrols.cxx
b/vcl/source/outdev/nativecontrols.cxx
index a8557259adc7..cee9408d6cfb 100644
--- a/vcl/source/outdev/nativecontrols.cxx
+++ b/vcl/source/outdev/nativecontrols.cxx
@@ -17,18 +17,17 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <cassert>
-
-#include <vcl/outdev.hxx>
-#include <vcl/virdev.hxx>
-#include <vcl/window.hxx>
#include <sal/log.hxx>
-#include <toolbarvalue.hxx>
-#include <vcl/salnativewidgets.hxx>
#include <vcl/pdfextoutdevdata.hxx>
+#include <vcl/salnativewidgets.hxx>
+#include <vcl/virdev.hxx>
+#include <vcl/window.hxx>
#include <salgdi.hxx>
+#include <toolbarvalue.hxx>
+
+#include <cassert>
ImplControlValue::~ImplControlValue()
{
diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx
index ab677b468f73..b4c1eac4499e 100644
--- a/vcl/source/outdev/outdev.cxx
+++ b/vcl/source/outdev/outdev.cxx
@@ -18,19 +18,18 @@
*/
#include <sal/config.h>
-#include <sal/log.hxx>
+#include <sal/log.hxx>
+#include <comphelper/processfactory.hxx>
#include <tools/debug.hxx>
-#include <vcl/gdimtf.hxx>
+
#include <vcl/graph.hxx>
+#include <vcl/lazydelete.hxx>
#include <vcl/metaact.hxx>
-#include <vcl/virdev.hxx>
-#include <vcl/outdev.hxx>
#include <vcl/toolkit/unowrap.hxx>
#include <vcl/svapp.hxx>
#include <vcl/sysdata.hxx>
-#include <vcl/lazydelete.hxx>
-#include <comphelper/processfactory.hxx>
+#include <vcl/virdev.hxx>
#include <ImplOutDevData.hxx>
#include <font/PhysicalFontFaceCollection.hxx>
diff --git a/vcl/source/outdev/pixel.cxx b/vcl/source/outdev/pixel.cxx
index b051e6a5a119..dcb86f27cab8 100644
--- a/vcl/source/outdev/pixel.cxx
+++ b/vcl/source/outdev/pixel.cxx
@@ -17,16 +17,14 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <cassert>
-
-#include <vcl/gdimtf.hxx>
#include <vcl/metaact.hxx>
-#include <vcl/outdev.hxx>
#include <vcl/virdev.hxx>
#include <drawmode.hxx>
#include <salgdi.hxx>
+#include <cassert>
+
Color OutputDevice::GetPixel(const Point& rPoint) const
{
Color aColor;
diff --git a/vcl/source/outdev/polygon.cxx b/vcl/source/outdev/polygon.cxx
index 772c2dbdea07..fa56f507a921 100644
--- a/vcl/source/outdev/polygon.cxx
+++ b/vcl/source/outdev/polygon.cxx
@@ -17,20 +17,18 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <cassert>
-
#include <sal/types.h>
-
#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <memory>
#include <tools/poly.hxx>
-#include <vcl/gdimtf.hxx>
+
#include <vcl/metaact.hxx>
-#include <vcl/outdev.hxx>
#include <vcl/virdev.hxx>
#include <salgdi.hxx>
+#include <cassert>
+#include <memory>
+
#define OUTDEV_POLYPOLY_STACKBUF 32
void OutputDevice::DrawPolyPolygon( const tools::PolyPolygon& rPolyPoly )
diff --git a/vcl/source/outdev/polyline.cxx b/vcl/source/outdev/polyline.cxx
index 04b39c60415d..14bd3de2bc75 100644
--- a/vcl/source/outdev/polyline.cxx
+++ b/vcl/source/outdev/polyline.cxx
@@ -17,19 +17,17 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <cassert>
-
#include <sal/types.h>
-
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/polygon/b2dlinegeometry.hxx>
-#include <vcl/gdimtf.hxx>
+
#include <vcl/metaact.hxx>
-#include <vcl/outdev.hxx>
#include <vcl/virdev.hxx>
#include <salgdi.hxx>
+#include <cassert>
+
void OutputDevice::DrawPolyLine( const tools::Polygon& rPoly )
{
assert(!is_double_buffered_window());
diff --git a/vcl/source/outdev/rect.cxx b/vcl/source/outdev/rect.cxx
index 89c4ecaa00f2..63ec16c62c61 100644
--- a/vcl/source/outdev/rect.cxx
+++ b/vcl/source/outdev/rect.cxx
@@ -17,18 +17,17 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <cassert>
-
#include <sal/types.h>
-
#include <tools/poly.hxx>
#include <tools/helpers.hxx>
+
#include <vcl/metaact.hxx>
-#include <vcl/outdev.hxx>
#include <vcl/virdev.hxx>
#include <salgdi.hxx>
+#include <cassert>
+
void OutputDevice::DrawBorder(tools::Rectangle aBorderRect)
{
sal_uInt16 nPixel = static_cast<sal_uInt16>(PixelToLogic(Size(1,
1)).Width());
diff --git a/vcl/source/outdev/stack.cxx b/vcl/source/outdev/stack.cxx
index e11947de5b14..72ef63af551d 100644
--- a/vcl/source/outdev/stack.cxx
+++ b/vcl/source/outdev/stack.cxx
@@ -21,7 +21,6 @@
#include <sal/log.hxx>
#include <tools/debug.hxx>
-#include <vcl/gdimtf.hxx>
#include <vcl/metaact.hxx>
#include <vcl/rendercontext/State.hxx>
#include <vcl/virdev.hxx>
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index c3cdc2d6b8fd..029a49cc9acf 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -19,22 +19,16 @@
#include <sal/config.h>
-#include <memory>
-#include <basegfx/matrix/b2dhommatrix.hxx>
-
-#include <com/sun/star/i18n/WordType.hpp>
-#include <com/sun/star/i18n/XBreakIterator.hpp>
-#include <com/sun/star/linguistic2/LinguServiceManager.hpp>
-
-#include <comphelper/processfactory.hxx>
#include <osl/file.h>
#include <rtl/ustrbuf.hxx>
#include <sal/log.hxx>
+#include <basegfx/matrix/b2dhommatrix.hxx>
+#include <comphelper/processfactory.hxx>
#include <tools/lineend.hxx>
#include <tools/debug.hxx>
#include <unotools/configmgr.hxx>
+
#include <vcl/ctrl.hxx>
-#include <vcl/gdimtf.hxx>
#include <vcl/metaact.hxx>
#include <vcl/metric.hxx>
#include <vcl/mnemonic.hxx>
@@ -51,10 +45,16 @@
#include <textlayout.hxx>
#include <textlineinfo.hxx>
#include <impglyphitem.hxx>
-#include <optional>
#include <TextLayoutCache.hxx>
#include <font/PhysicalFontFace.hxx>
+#include <com/sun/star/i18n/WordType.hpp>
+#include <com/sun/star/i18n/XBreakIterator.hpp>
+#include <com/sun/star/linguistic2/LinguServiceManager.hpp>
+
+#include <memory>
+#include <optional>
+
#define TEXT_DRAW_ELLIPSIS (DrawTextFlags::EndEllipsis |
DrawTextFlags::PathEllipsis | DrawTextFlags::NewsEllipsis)
void OutputDevice::SetLayoutMode( vcl::text::ComplexTextLayoutFlags
nTextLayoutMode )
diff --git a/vcl/source/outdev/textline.cxx b/vcl/source/outdev/textline.cxx
index 4feb65fda1a2..7c0f2f55d7ce 100644
--- a/vcl/source/outdev/textline.cxx
+++ b/vcl/source/outdev/textline.cxx
@@ -17,26 +17,23 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <cassert>
-
#include <sal/types.h>
-#include <vcl/gdimtf.hxx>
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <basegfx/polygon/WaveLine.hxx>
+#include <tools/helpers.hxx>
+#include <o3tl/hash_combine.hxx>
+#include <o3tl/lru_map.hxx>
+
+#include <vcl/lazydelete.hxx>
#include <vcl/metaact.hxx>
-#include <vcl/outdev.hxx>
#include <vcl/settings.hxx>
#include <vcl/virdev.hxx>
-#include <vcl/lazydelete.hxx>
-
-#include <tools/helpers.hxx>
#include <drawmode.hxx>
#include <salgdi.hxx>
#include <impglyphitem.hxx>
-#include <basegfx/matrix/b2dhommatrixtools.hxx>
-#include <basegfx/polygon/WaveLine.hxx>
-#include <o3tl/hash_combine.hxx>
-#include <o3tl/lru_map.hxx>
+#include <cassert>
#define UNDERLINE_LAST LINESTYLE_BOLDWAVE
#define STRIKEOUT_LAST STRIKEOUT_X
