diff options
| -rw-r--r-- | solenv/clang-format/blacklist | 2 | ||||
| -rw-r--r-- | vcl/Library_vcl.mk | 2 | ||||
| -rw-r--r-- | vcl/source/bitmap/bitmap.cxx (renamed from vcl/source/gdi/bitmap.cxx) | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index 132012672e72..b2f6e761a6a3 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -18050,6 +18050,7 @@ vcl/source/app/timer.cxx vcl/source/app/unohelp.cxx vcl/source/app/unohelp2.cxx vcl/source/app/vclevent.cxx +vcl/source/bitmap/bitmap.cxx vcl/source/bitmap/BitmapProcessor.cxx vcl/source/bitmap/BitmapScaleConvolution.cxx vcl/source/bitmap/BitmapSymmetryCheck.cxx @@ -18163,7 +18164,6 @@ vcl/source/gdi/VerticalOrientationData.cxx vcl/source/gdi/alpha.cxx vcl/source/gdi/animate.cxx vcl/source/gdi/base14.cxx -vcl/source/gdi/bitmap.cxx vcl/source/gdi/bitmap3.cxx vcl/source/gdi/bitmap4.cxx vcl/source/gdi/bitmapex.cxx diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 0b684c6185a9..244bbd14cf72 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -248,7 +248,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/gdi/base14 \ vcl/source/gdi/bitmap3 \ vcl/source/gdi/bitmap4 \ - vcl/source/gdi/bitmap \ vcl/source/gdi/bitmapex \ vcl/source/gdi/bmpacc2 \ vcl/source/gdi/bmpacc3 \ @@ -301,6 +300,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/gdi/wall \ vcl/source/gdi/scrptrun \ vcl/source/gdi/CommonSalLayout \ + vcl/source/bitmap/bitmap \ vcl/source/bitmap/bitmapfilter \ vcl/source/bitmap/bitmapscalesuper \ vcl/source/bitmap/BitmapScaleConvolution \ diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/bitmap/bitmap.cxx index bf670f20ffce..bf670f20ffce 100644 --- a/vcl/source/gdi/bitmap.cxx +++ b/vcl/source/bitmap/bitmap.cxx |