From 98272c886b9f7df1670f4ba38d951fc5937a8e89 Mon Sep 17 00:00:00 2001
From: Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>
Date: Mon, 15 Apr 2019 16:39:41 +0900
Subject: remove or change salbtype.hxx includes with the specific one
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We probably don't need salbtype.hxx include, but if we do we can
now change it with a more specific one - namely BitmapPalette.hxx
in most cases. This doesn't yet touch the includes in VCL.

Change-Id: Ie3067ccb2eec425650b41ce7fca48e368215f489
Reviewed-on: https://gerrit.libreoffice.org/70761
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
---
 canvas/source/vcl/impltools.cxx                   | 1 -
 cppcanvas/source/mtfrenderer/implrenderer.cxx     | 2 +-
 drawinglayer/source/tools/wmfemfhelper.cxx        | 2 +-
 filter/source/flash/swfwriter1.cxx                | 1 -
 filter/source/graphicfilter/icgm/bundles.hxx      | 1 -
 filter/source/graphicfilter/icgm/main.hxx         | 1 -
 filter/source/msfilter/util.cxx                   | 2 +-
 sd/source/ui/sidebar/SlideBackground.cxx          | 1 -
 svx/inc/pch/precompiled_svx.hxx                   | 1 -
 svx/source/sidebar/area/AreaPropertyPanelBase.cxx | 1 -
 svx/source/xoutdev/xattrbmp.cxx                   | 1 -
 sw/source/filter/ww8/wrtww8.cxx                   | 1 -
 sw/source/filter/ww8/ww8atr.cxx                   | 1 -
 13 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/canvas/source/vcl/impltools.cxx b/canvas/source/vcl/impltools.cxx
index 2ccc4e2c4139..71501e744040 100644
--- a/canvas/source/vcl/impltools.cxx
+++ b/canvas/source/vcl/impltools.cxx
@@ -45,7 +45,6 @@
 #include <vcl/canvastools.hxx>
 #include <vcl/BitmapTools.hxx>
 #include <vcl/metric.hxx>
-#include <vcl/salbtype.hxx>
 
 #include <canvas/canvastools.hxx>
 
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index e4b94d86cd1b..241edaa17bb2 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -52,12 +52,12 @@
 #include <basegfx/polygon/b2dpolypolygoncutter.hxx>
 #include <canvas/canvastools.hxx>
 #include <vcl/canvastools.hxx>
-#include <vcl/salbtype.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/graphictools.hxx>
+#include <vcl/BitmapPalette.hxx>
 #include <tools/poly.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <implrenderer.hxx>
diff --git a/drawinglayer/source/tools/wmfemfhelper.cxx b/drawinglayer/source/tools/wmfemfhelper.cxx
index 3db26a755c3b..40ce19383f50 100644
--- a/drawinglayer/source/tools/wmfemfhelper.cxx
+++ b/drawinglayer/source/tools/wmfemfhelper.cxx
@@ -28,7 +28,7 @@
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <drawinglayer/primitive2d/discretebitmapprimitive2d.hxx>
 #include <drawinglayer/primitive2d/bitmapprimitive2d.hxx>
-#include <vcl/salbtype.hxx>
+#include <vcl/BitmapPalette.hxx>
 #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx>
 #include <drawinglayer/primitive2d/fillgradientprimitive2d.hxx>
 #include <drawinglayer/primitive2d/transparenceprimitive2d.hxx>
diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx
index 68c4135e0c27..09c46a88a126 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -36,7 +36,6 @@
 
 #include <zlib.h>
 
-#include <vcl/salbtype.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <memory>
diff --git a/filter/source/graphicfilter/icgm/bundles.hxx b/filter/source/graphicfilter/icgm/bundles.hxx
index 80910adda578..1f9bf7bb29df 100644
--- a/filter/source/graphicfilter/icgm/bundles.hxx
+++ b/filter/source/graphicfilter/icgm/bundles.hxx
@@ -22,7 +22,6 @@
 
 #include <sal/types.h>
 #include "cgmtypes.hxx"
-#include <vcl/salbtype.hxx>
 #include <vector>
 #include <memory>
 
diff --git a/filter/source/graphicfilter/icgm/main.hxx b/filter/source/graphicfilter/icgm/main.hxx
index 508c8f3ebf6b..3d02d5b1f68d 100644
--- a/filter/source/graphicfilter/icgm/main.hxx
+++ b/filter/source/graphicfilter/icgm/main.hxx
@@ -22,7 +22,6 @@
 
 #include "cgm.hxx"
 
-#include <vcl/salbtype.hxx>
 #include <tools/stream.hxx>
 #include "bundles.hxx"
 #include "bitmap.hxx"
diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx
index 53b5d8a810c0..4342eed296f7 100644
--- a/filter/source/msfilter/util.cxx
+++ b/filter/source/msfilter/util.cxx
@@ -14,7 +14,7 @@
 #include <unotools/fontcvt.hxx>
 #include <unotools/fontdefs.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/salbtype.hxx>
+#include <vcl/BitmapPalette.hxx>
 #include <filter/msfilter/escherex.hxx>
 #include <filter/msfilter/util.hxx>
 #include <memory>
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx
index 4789890abce0..e140049a0f2e 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -66,7 +66,6 @@
 #include <sfx2/sidebar/Panel.hxx>
 #include <algorithm>
 #include <EventMultiplexer.hxx>
-#include <vcl/salbtype.hxx>
 #include <vcl/EnumContext.hxx>
 
 #include <editeng/ulspitem.hxx>
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index 1915ff143fd7..e5f7944c8a90 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -123,7 +123,6 @@
 #include <vcl/metric.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/region.hxx>
-#include <vcl/salbtype.hxx>
 #include <vcl/salgtype.hxx>
 #include <vcl/scopedbitmapaccess.hxx>
 #include <vcl/scrbar.hxx>
diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
index 3df26b91e0f6..1f3b439289e8 100644
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
@@ -31,7 +31,6 @@
 #include <unotools/pathoptions.hxx>
 #include <svx/svxitems.hrc>
 #include <vcl/toolbox.hxx>
-#include <vcl/salbtype.hxx>
 #include <svtools/toolbarmenu.hxx>
 #include <svx/tbcontrl.hxx>
 #include <sfx2/opengrf.hxx>
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index 140718bd056f..9a2d47d631ff 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -35,7 +35,6 @@
 #include <svx/svdmodel.hxx>
 #include <svx/xbitmap.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <vcl/salbtype.hxx>
 #include <vcl/bitmapaccess.hxx>
 #include <vcl/BitmapTools.hxx>
 #include <vcl/GraphicLoader.hxx>
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 094e6b3ec68c..bd2008df4a25 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -34,7 +34,6 @@
 #include <drawdoc.hxx>
 
 #include <unotools/fltrcfg.hxx>
-#include <vcl/salbtype.hxx>
 #include <sot/storage.hxx>
 #include <svl/zformat.hxx>
 #include <sfx2/docinf.hxx>
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 2100a9b5b52f..160e0f931115 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -25,7 +25,6 @@
 #include <hintids.hxx>
 
 #include <vcl/svapp.hxx>
-#include <vcl/salbtype.hxx>
 #include <vcl/settings.hxx>
 #include <sal/log.hxx>
 
-- 
cgit