Move BitmapDevice to use B2IBox instead of B2IRange.

Semantically, B2IBox represents a pixel rect much better than
B2IRange - replaced all occurences in and around the software
renderer, and client code.

6 files changed, 26 insertions, 26 deletions

diff --git a/basebmp/test/bmpdemo.cxx b/basebmp/test/bmpdemo.cxx
index b3e7096c0da9..4f53c3c5f40e 100644
--- a/basebmp/test/bmpdemo.cxx
+++ b/basebmp/test/bmpdemo.cxx
@@ -56,7 +56,7 @@
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/numeric/ftools.hxx>
-#include <basegfx/range/b2irange.hxx>
+#include <basegfx/range/b2ibox.hxx>
 #include <basegfx/vector/b2isize.hxx>
 #include <basegfx/vector/b2enums.hxx>
 #include <basegfx/point/b2ipoint.hxx>
@@ -1109,7 +1109,7 @@ void TestWindow::Paint( const Rectangle& /*rRect*/ )
 
         basebmp::BitmapDeviceSharedPtr pSubsetDevice =
             basebmp::subsetBitmapDevice( pDevice,
-                                         basegfx::B2IRange(3,3,7,7) );
+                                         basegfx::B2IBox(3,3,7,7) );
 
         const basegfx::B2IPoint aPt1(0,0);
         const basegfx::B2IPoint aPt2(1,9);
diff --git a/basebmp/test/bmpmasktest.cxx b/basebmp/test/bmpmasktest.cxx
index 755128b303f1..e44aaeda0c8f 100644
--- a/basebmp/test/bmpmasktest.cxx
+++ b/basebmp/test/bmpmasktest.cxx
@@ -36,7 +36,7 @@
 #include "cppunit/extensions/HelperMacros.h"
 
 #include <basegfx/vector/b2isize.hxx>
-#include <basegfx/range/b2irange.hxx>
+#include <basegfx/range/b2ibox.hxx>
 #include <basegfx/point/b2ipoint.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
@@ -67,8 +67,8 @@ private:
         rDevice->clear(Color(0));
         const Color aCol(0xFFFFFFFF);
 
-        const basegfx::B2IRange aSourceRect(0,0,10,10);
-        const basegfx::B2IRange aDestAll(0,0,10,10);
+        const basegfx::B2IBox aSourceRect(0,0,10,10);
+        const basegfx::B2IBox aDestAll(0,0,10,10);
 
         rDevice->drawMaskedBitmap(
             rBmp,
@@ -86,8 +86,8 @@ private:
         rDevice->clear(Color(0));
         const Color aCol(0xFFFFFFFF);
 
-        const basegfx::B2IRange aSourceRect(0,0,10,10);
-        const basegfx::B2IRange aDestLeftTop(0,0,6,6);
+        const basegfx::B2IBox aSourceRect(0,0,10,10);
+        const basegfx::B2IBox aDestLeftTop(0,0,6,6);
 
         rDevice->drawMaskedBitmap(
             rBmp,
diff --git a/basebmp/test/bmptest.cxx b/basebmp/test/bmptest.cxx
index 6a42c6149f50..65109239e42b 100644
--- a/basebmp/test/bmptest.cxx
+++ b/basebmp/test/bmptest.cxx
@@ -36,7 +36,7 @@
 #include "cppunit/extensions/HelperMacros.h"
 
 #include <basegfx/vector/b2isize.hxx>
-#include <basegfx/range/b2irange.hxx>
+#include <basegfx/range/b2ibox.hxx>
 #include <basegfx/point/b2ipoint.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
@@ -66,11 +66,11 @@ private:
         rDevice->clear(Color(0));
         const Color aCol(0xFFFFFFFF);
 
-        const basegfx::B2IRange aSourceRect(0,0,10,10);
-        const basegfx::B2IRange aDestLeftTop(0,0,4,4);
-        const basegfx::B2IRange aDestRightTop(6,0,10,4);
-        const basegfx::B2IRange aDestLeftBottom(0,6,4,10);
-        const basegfx::B2IRange aDestRightBottom(6,6,10,10);
+        const basegfx::B2IBox aSourceRect(0,0,10,10);
+        const basegfx::B2IBox aDestLeftTop(0,0,4,4);
+        const basegfx::B2IBox aDestRightTop(6,0,10,4);
+        const basegfx::B2IBox aDestLeftBottom(0,6,4,10);
+        const basegfx::B2IBox aDestRightBottom(6,6,10,10);
 
         rDevice->drawBitmap(
             rBmp,
@@ -111,11 +111,11 @@ private:
         rDevice->clear(Color(0));
         const Color aCol(0xFFFFFFFF);
 
-        const basegfx::B2IRange aSourceRect(0,0,10,10);
-        const basegfx::B2IRange aDestLeftTop(-2,-2,2,2);
-        const basegfx::B2IRange aDestRightTop(8,-2,12,2);
-        const basegfx::B2IRange aDestLeftBottom(-2,8,2,12);
-        const basegfx::B2IRange aDestRightBottom(8,8,12,12);
+        const basegfx::B2IBox aSourceRect(0,0,10,10);
+        const basegfx::B2IBox aDestLeftTop(-2,-2,2,2);
+        const basegfx::B2IBox aDestRightTop(8,-2,12,2);
+        const basegfx::B2IBox aDestLeftBottom(-2,8,2,12);
+        const basegfx::B2IBox aDestRightBottom(8,8,12,12);
 
         rDevice->drawBitmap(
             rBmp,
diff --git a/basebmp/test/cliptest.cxx b/basebmp/test/cliptest.cxx
index 08812a9354ce..dd5ff85f44d9 100644
--- a/basebmp/test/cliptest.cxx
+++ b/basebmp/test/cliptest.cxx
@@ -38,7 +38,7 @@
 #include <basegfx/vector/b2isize.hxx>
 #include <basegfx/point/b2ipoint.hxx>
 #include <basegfx/range/b2drange.hxx>
-#include <basegfx/range/b2irange.hxx>
+#include <basegfx/range/b2ibox.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
@@ -155,8 +155,8 @@ private:
 
         rDevice->clear(aCol1);
         rDevice->drawBitmap(pBmp,
-                            basegfx::B2IRange(0,0,3,3),
-                            basegfx::B2IRange(-1,-1,4,4),
+                            basegfx::B2IBox(0,0,3,3),
+                            basegfx::B2IBox(-1,-1,4,4),
                             DrawMode_PAINT,
                             mpClipMask);
 
@@ -183,7 +183,7 @@ private:
             aCol,
             basebmp::DrawMode_PAINT );
 
-        const basegfx::B2IRange aSourceRect(0,0,10,10);
+        const basegfx::B2IBox aSourceRect(0,0,10,10);
         const basegfx::B2IPoint aDestLeftTop(0,0);
         const Color aCol2(0xF0F0F0F0);
         rDevice->drawMaskedColor(
diff --git a/basebmp/test/masktest.cxx b/basebmp/test/masktest.cxx
index 3847d60c3657..8918a7a53e28 100644
--- a/basebmp/test/masktest.cxx
+++ b/basebmp/test/masktest.cxx
@@ -36,7 +36,7 @@
 #include "cppunit/extensions/HelperMacros.h"
 
 #include <basegfx/vector/b2isize.hxx>
-#include <basegfx/range/b2irange.hxx>
+#include <basegfx/range/b2ibox.hxx>
 #include <basegfx/point/b2ipoint.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
@@ -65,7 +65,7 @@ private:
         const Color aCol(0);
         const Color aCol2(0xF0F0F0F0);
 
-        const basegfx::B2IRange aSourceRect(0,0,10,10);
+        const basegfx::B2IBox aSourceRect(0,0,10,10);
         const basegfx::B2IPoint aDestLeftTop(0,0);
         const basegfx::B2IPoint aDestRightTop(5,0);
         const basegfx::B2IPoint aDestLeftBottom(0,5);
diff --git a/basebmp/test/polytest.cxx b/basebmp/test/polytest.cxx
index 0be253ead882..177557cec565 100644
--- a/basebmp/test/polytest.cxx
+++ b/basebmp/test/polytest.cxx
@@ -36,7 +36,7 @@
 #include "cppunit/extensions/HelperMacros.h"
 
 #include <basegfx/vector/b2isize.hxx>
-#include <basegfx/range/b2irange.hxx>
+#include <basegfx/range/b2ibox.hxx>
 #include <basegfx/point/b2ipoint.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
@@ -191,7 +191,7 @@ private:
 
         BitmapDeviceSharedPtr pClippedDevice(
             subsetBitmapDevice( rDevice,
-                                basegfx::B2IRange(3,3,5,8) ));
+                                basegfx::B2IBox(3,3,5,8) ));
 
         rDevice->clear(aBgCol);
         pClippedDevice->fillPolyPolygon(