From 3abfdd08caf588577c349f1e2cbe8778ec228c85 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Sun, 3 Mar 2013 15:43:33 +0000
Subject: it's surely a bad idea to not crash in dbgutil mode but crash in
 product mode

Change-Id: Ie72e23a5b3c49b08bcf25a9de2d7c4d4c4e7925d
---
 basegfx/Library_basegfx.mk                  |  1 -
 basegfx/inc/basegfx/pixel/bpixel.hxx        |  3 ---
 basegfx/inc/basegfx/raster/bpixelraster.hxx | 16 ++----------
 basegfx/source/pixel/bpixel.cxx             | 39 -----------------------------
 4 files changed, 2 insertions(+), 57 deletions(-)
 delete mode 100644 basegfx/source/pixel/bpixel.cxx

(limited to 'basegfx')

diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk
index 303d4376f434..21cfff6ce249 100644
--- a/basegfx/Library_basegfx.mk
+++ b/basegfx/Library_basegfx.mk
@@ -45,7 +45,6 @@ $(eval $(call gb_Library_add_exception_objects,basegfx,\
     basegfx/source/matrix/b2dhommatrixtools \
     basegfx/source/matrix/b3dhommatrix \
     basegfx/source/numeric/ftools \
-    basegfx/source/pixel/bpixel \
     basegfx/source/point/b2dpoint \
     basegfx/source/point/b2ipoint \
     basegfx/source/point/b3dpoint \
diff --git a/basegfx/inc/basegfx/pixel/bpixel.hxx b/basegfx/inc/basegfx/pixel/bpixel.hxx
index a2c59101fa78..09f0feaa808a 100644
--- a/basegfx/inc/basegfx/pixel/bpixel.hxx
+++ b/basegfx/inc/basegfx/pixel/bpixel.hxx
@@ -125,9 +125,6 @@ namespace basegfx
         {
             return (rPixel.maPixelUnion.maCombinedRGBO.mnValue != maPixelUnion.maCombinedRGBO.mnValue);
         }
-
-        // empty element
-        static const BPixel& getEmptyBPixel();
     };
 
     //////////////////////////////////////////////////////////////////////////
diff --git a/basegfx/inc/basegfx/raster/bpixelraster.hxx b/basegfx/inc/basegfx/raster/bpixelraster.hxx
index 60a5d5ab5e3a..ed7ac931d805 100644
--- a/basegfx/inc/basegfx/raster/bpixelraster.hxx
+++ b/basegfx/inc/basegfx/raster/bpixelraster.hxx
@@ -81,26 +81,14 @@ namespace basegfx
         // data access read only
         const BPixel& getBPixel(sal_uInt32 nIndex) const
         {
-#ifdef DBG_UTIL
-            if(nIndex >= mnCount)
-            {
-                OSL_FAIL("getBPixel: Access out of range (!)");
-                return BPixel::getEmptyBPixel();
-            }
-#endif
+            assert(nIndex < mnCount); //Access out of range
             return mpContent[nIndex];
         }
 
         // data access read/write
         BPixel& getBPixel(sal_uInt32 nIndex)
         {
-#ifdef DBG_UTIL
-            if(nIndex >= mnCount)
-            {
-                OSL_FAIL("getBPixel: Access out of range (!)");
-                return mpContent[0L];
-            }
-#endif
+            assert(nIndex < mnCount); //Access out of range
             return mpContent[nIndex];
         }
     };
diff --git a/basegfx/source/pixel/bpixel.cxx b/basegfx/source/pixel/bpixel.cxx
deleted file mode 100644
index 8d993ba1e642..000000000000
--- a/basegfx/source/pixel/bpixel.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <basegfx/pixel/bpixel.hxx>
-#include <rtl/instance.hxx>
-
-namespace { struct EmptyBPixel : public rtl::Static<basegfx::BPixel, EmptyBPixel> {}; }
-
-//////////////////////////////////////////////////////////////////////////////
-
-namespace basegfx
-{
-    const BPixel& BPixel::getEmptyBPixel()
-    {
-        return EmptyBPixel::get();
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    // external operators
-
-} // end of namespace basegfx
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-- 
cgit