summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2008-08-19 22:56:37 +0000
committerVladimir Glazounov <vg@openoffice.org>2008-08-19 22:56:37 +0000
commitd632aebaf9d9ef3a7cbd10ed4d5a75fbb9a76b6f (patch)
tree0234a71bab524ba251fa8aed1f7839f96045ba90
parentee4ceae317a9c10fcc2de99300105f947645ddee (diff)
INTEGRATION: CWS aw033 (1.11.2); FILE MERGED
2008/05/27 14:08:43 aw 1.11.2.5: #i39532# changes DEV300 m12 resync corrections 2008/05/14 14:43:41 aw 1.11.2.4: RESYNC: (1.13-1.14); FILE MERGED 2007/08/09 22:03:16 aw 1.11.2.3: RESYNC: (1.12-1.13); FILE MERGED 2006/05/12 14:33:56 aw 1.11.2.2: RESYNC: (1.11-1.12); FILE MERGED 2006/05/12 11:39:25 aw 1.11.2.1: code changes for primitive support
-rw-r--r--basegfx/inc/basegfx/range/basicrange.hxx8
1 files changed, 3 insertions, 5 deletions
diff --git a/basegfx/inc/basegfx/range/basicrange.hxx b/basegfx/inc/basegfx/range/basicrange.hxx
index c217ab9e3c85..e3ac22b7f2c1 100644
--- a/basegfx/inc/basegfx/range/basicrange.hxx
+++ b/basegfx/inc/basegfx/range/basicrange.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: basicrange.hxx,v $
- * $Revision: 1.14 $
+ * $Revision: 1.15 $
*
* This file is part of OpenOffice.org.
*
@@ -32,10 +32,7 @@
#define _BGFX_RANGE_BASICRANGE_HXX
#include <sal/types.h>
-
-#ifndef _INC_FLOAT
#include <float.h>
-#endif
#include <basegfx/numeric/ftools.hxx>
@@ -155,10 +152,11 @@ namespace basegfx
return (mnMinimum != rRange.mnMinimum || mnMaximum != rRange.mnMaximum);
}
- void operator=(const BasicRange& rRange)
+ BasicRange& operator=(const BasicRange& rRange)
{
mnMinimum = rRange.mnMinimum;
mnMaximum = rRange.mnMaximum;
+ return *this;
}
bool equal(const BasicRange& rRange) const