[Libreoffice-commits] core.git: solenv/clang-format vcl/Library_vcl.mk vcl/source

[Chris Sherlock]

 solenv/clang-format/blacklist |    2 +-
 vcl/Library_vcl.mk            |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1b51bca4ce77bdeefd2461e3b8a8b6b38bda6d43
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Thu Mar 1 06:25:40 2018 +1100

    vcl: move vcl/source/gdi/bitmap.cxx to vcl/source/bitmap/bitmap.cxx
    
    Change-Id: Ib74ac5016b6f99adef41b6ee562701b5158cffd3
    Reviewed-on: https://gerrit.libreoffice.org/50532
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

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
similarity index 100%
rename from vcl/source/gdi/bitmap.cxx
rename to vcl/source/bitmap/bitmap.cxx