diff options
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/sdrpagewindow.cxx | 6 | ||||
| -rw-r--r-- | svx/source/svdraw/sdrpaintwindow.cxx | 32 |
2 files changed, 10 insertions, 28 deletions
diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx index f4cccca0797a..bdd163d3c08c 100644 --- a/svx/source/svdraw/sdrpagewindow.cxx +++ b/svx/source/svdraw/sdrpagewindow.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/awt/PosSize.hpp> #include <com/sun/star/util/XModeChangeBroadcaster.hpp> #include <comphelper/processfactory.hxx> +#include <comphelper/random.hxx> #include <vcl/svapp.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <svx/svdouno.hxx> @@ -254,7 +255,10 @@ namespace for(sal_uInt32 a(0L); a < aResult.count(); a++) { - Color aColor(rand()%255, rand()%255, rand()%255); + int nR = comphelper::rng::uniform_int_distribution(0, 254); + int nG = comphelper::rng::uniform_int_distribution(0, 254); + int nB = comphelper::rng::uniform_int_distribution(0, 254); + Color aColor(nR, nG, nB); impPaintStrokePolygon(aResult.getB2DPolygon(a), rOutDev, aColor); } } diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx index f64aea30c499..ae6f6d58dd28 100644 --- a/svx/source/svdraw/sdrpaintwindow.cxx +++ b/svx/source/svdraw/sdrpaintwindow.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <comphelper/random.hxx> #include <svx/sdrpaintwindow.hxx> #include <sdr/overlay/overlaymanagerbuffered.hxx> #include <svx/svdpntv.hxx> @@ -174,7 +175,10 @@ void SdrPreRenderDevice::OutputPreRenderDevice(const vcl::Region& rExpandedRegio if(bDoPaintForVisualControlRegion) { - const Color aColor((((((rand()&0x7f)|0x80)<<8L)|((rand()&0x7f)|0x80))<<8L)|((rand()&0x7f)|0x80)); + int nR = comphelper::rng::uniform_int_distribution(0, 0x7F-1); + int nG = comphelper::rng::uniform_int_distribution(0, 0x7F-1); + int nB = comphelper::rng::uniform_int_distribution(0, 0x7F-1); + const Color aColor(((((nR|0x80)<<8L)|(nG|0x80))<<8L)|(nB|0x80)); mrOutputDevice.SetLineColor(aColor); mrOutputDevice.SetFillColor(); @@ -183,32 +187,6 @@ void SdrPreRenderDevice::OutputPreRenderDevice(const vcl::Region& rExpandedRegio #endif } -// while(aRegionPixel.GetEnumRects(aRegionHandle, aRegionRectanglePixel)) -// { -// // for each rectangle, copy the area -// const Point aTopLeft(aRegionRectanglePixel.TopLeft()); -// const Size aSize(aRegionRectanglePixel.GetSize()); - -// mrOutputDevice.DrawOutDev( -// aTopLeft, aSize, -// aTopLeft, aSize, -// maPreRenderDevice); - -//#ifdef DBG_UTIL -// // #i74769# -// static bool bDoPaintForVisualControlRegion(false); -// if(bDoPaintForVisualControlRegion) -// { -// Color aColor((((((rand()&0x7f)|0x80)<<8L)|((rand()&0x7f)|0x80))<<8L)|((rand()&0x7f)|0x80)); -// mrOutputDevice.SetLineColor(aColor); -// mrOutputDevice.SetFillColor(); -// mrOutputDevice.DrawRect(aRegionRectanglePixel); -// } -//#endif -// } - -// aRegionPixel.EndEnumRects(aRegionHandle); - mrOutputDevice.EnableMapMode(bMapModeWasEnabledDest); maPreRenderDevice.EnableMapMode(bMapModeWasEnabledSource); } |