13 files changed, 19 insertions, 18 deletions
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 292d5abce166..8fed24e6b933 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -14895,8 +14895,18 @@ vcl/source/bitmap/BitmapScaleConvolutionFilter.cxx
 vcl/source/bitmap/BitmapScaleSuperFilter.cxx
 vcl/source/bitmap/BitmapSymmetryCheck.cxx
 vcl/source/bitmap/BitmapTools.cxx
+vcl/source/bitmap/alpha.cxx
 vcl/source/bitmap/bitmap.cxx
+vcl/source/bitmap/bitmap3.cxx
+vcl/source/bitmap/BitmapEx.cxx
+vcl/source/bitmap/bmpacc.cxx
+vcl/source/bitmap/bmpacc2.cxx
+vcl/source/bitmap/bmpfast.cxx
 vcl/source/bitmap/checksum.cxx
+vcl/source/bitmap/dibtools.cxx
+vcl/source/bitmap/floyd.hxx
+vcl/source/bitmap/impvect.cxx
+vcl/source/bitmap/impvect.hxx
 vcl/source/bitmap/salbmp.cxx
 vcl/source/cnttype/mcnttfactory.cxx
 vcl/source/cnttype/mcnttfactory.hxx
@@ -15002,17 +15012,9 @@ vcl/source/fontsubset/ttcr.hxx
 vcl/source/fontsubset/xlat.cxx
 vcl/source/gdi/CommonSalLayout.cxx
 vcl/source/gdi/VerticalOrientationData.cxx
-vcl/source/gdi/alpha.cxx
-vcl/source/gdi/bitmap3.cxx
-vcl/source/gdi/bitmapex.cxx
-vcl/source/gdi/bmpacc.cxx
-vcl/source/gdi/bmpacc2.cxx
-vcl/source/gdi/bmpfast.cxx
 vcl/source/gdi/configsettings.cxx
 vcl/source/gdi/cvtgrf.cxx
-vcl/source/gdi/dibtools.cxx
 vcl/source/gdi/embeddedfontshelper.cxx
-vcl/source/gdi/floyd.hxx
 vcl/source/gdi/gdimetafiletools.cxx
 vcl/source/gdi/gdimtf.cxx
 vcl/source/gdi/gfxlink.cxx
@@ -15022,7 +15024,6 @@ vcl/source/gdi/graphictools.cxx
 vcl/source/gdi/hatch.cxx
 vcl/source/gdi/impanmvw.cxx
 vcl/source/gdi/impgraph.cxx
-vcl/source/gdi/impvect.cxx
 vcl/source/gdi/impvect.hxx
 vcl/source/gdi/jobset.cxx
 vcl/source/gdi/lineinfo.cxx
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index ff8c4182af2f..9ac604a3d1d3 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -267,17 +267,9 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/treelist/svimpbox \
     vcl/source/treelist/svlbitm \
     vcl/source/treelist/uiobject \
-    vcl/source/gdi/alpha \
-    vcl/source/gdi/bitmap3 \
-    vcl/source/gdi/bitmapex \
-    vcl/source/gdi/bmpacc2 \
-    vcl/source/gdi/bmpacc3 \
-    vcl/source/gdi/bmpacc \
-    vcl/source/gdi/bmpfast \
     vcl/source/gdi/configsettings \
     vcl/source/gdi/cvtgrf \
     vcl/source/gdi/svmconverter \
-    vcl/source/gdi/dibtools \
     vcl/source/gdi/embeddedfontshelper \
     vcl/source/gdi/FileDefinitionWidgetDraw \
     vcl/source/gdi/WidgetDefinitionReader \
@@ -294,7 +286,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/gdi/impanmvw \
     vcl/source/gdi/impglyphitem \
     vcl/source/gdi/impgraph \
-    vcl/source/gdi/impvect \
     vcl/source/gdi/jobset \
     vcl/source/gdi/lineinfo \
     vcl/source/gdi/mapmod \
@@ -343,7 +334,16 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/graphic/UnoGraphicProvider \
     vcl/source/graphic/UnoGraphicTransformer \
     vcl/source/graphic/VectorGraphicSearch \
+    vcl/source/bitmap/impvect \
     vcl/source/bitmap/bitmap \
+    vcl/source/bitmap/bitmap3 \
+    vcl/source/bitmap/BitmapEx \
+    vcl/source/bitmap/alpha \
+    vcl/source/bitmap/dibtools \
+    vcl/source/bitmap/bmpacc2 \
+    vcl/source/bitmap/bmpacc3 \
+    vcl/source/bitmap/bmpacc \
+    vcl/source/bitmap/bmpfast \
     vcl/source/bitmap/bitmapfilter \
     vcl/source/bitmap/BitmapAlphaClampFilter \
     vcl/source/bitmap/BitmapBasicMorphologyFilter \
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/bitmap/BitmapEx.cxx
index 7c50435c6fc7..7c50435c6fc7 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/bitmap/BitmapEx.cxx
diff --git a/vcl/source/gdi/alpha.cxx b/vcl/source/bitmap/alpha.cxx
index a8042aeaed6f..a8042aeaed6f 100644
--- a/vcl/source/gdi/alpha.cxx
+++ b/vcl/source/bitmap/alpha.cxx
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/bitmap/bitmap3.cxx
index af9e55bf5f05..af9e55bf5f05 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/bitmap/bitmap3.cxx
diff --git a/vcl/source/gdi/bmpacc.cxx b/vcl/source/bitmap/bmpacc.cxx
index 18c5769678c5..18c5769678c5 100644
--- a/vcl/source/gdi/bmpacc.cxx
+++ b/vcl/source/bitmap/bmpacc.cxx
diff --git a/vcl/source/gdi/bmpacc2.cxx b/vcl/source/bitmap/bmpacc2.cxx
index 88f0c7f7482b..88f0c7f7482b 100644
--- a/vcl/source/gdi/bmpacc2.cxx
+++ b/vcl/source/bitmap/bmpacc2.cxx
diff --git a/vcl/source/gdi/bmpacc3.cxx b/vcl/source/bitmap/bmpacc3.cxx
index 0bf75b12d743..0bf75b12d743 100644
--- a/vcl/source/gdi/bmpacc3.cxx
+++ b/vcl/source/bitmap/bmpacc3.cxx
diff --git a/vcl/source/gdi/bmpfast.cxx b/vcl/source/bitmap/bmpfast.cxx
index a1f9927bf626..a1f9927bf626 100644
--- a/vcl/source/gdi/bmpfast.cxx
+++ b/vcl/source/bitmap/bmpfast.cxx
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/bitmap/dibtools.cxx
index a284d2022d24..a284d2022d24 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/bitmap/dibtools.cxx
diff --git a/vcl/source/gdi/floyd.hxx b/vcl/source/bitmap/floyd.hxx
index 8bd4bb8c5fcc..8bd4bb8c5fcc 100644
--- a/vcl/source/gdi/floyd.hxx
+++ b/vcl/source/bitmap/floyd.hxx
diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/bitmap/impvect.cxx
index 1b340780aa8f..1b340780aa8f 100644
--- a/vcl/source/gdi/impvect.cxx
+++ b/vcl/source/bitmap/impvect.cxx
diff --git a/vcl/source/gdi/impvect.hxx b/vcl/source/bitmap/impvect.hxx
index 41f0884e9626..41f0884e9626 100644
--- a/vcl/source/gdi/impvect.hxx
+++ b/vcl/source/bitmap/impvect.hxx