INTEGRATION: CWS presentationengine01 (1.9.2); FILE MERGED

2004/11/20 00:00:35 thb 1.9.2.3: #110496# After-merge cleanups, finished BxD<->BxI conversions for range and tuples
2004/11/17 20:20:08 thb 1.9.2.2: #110496# Unified integer constructors/fround converters
2004/09/23 20:19:05 thb 1.9.2.1: #110496# Added intersect method to all range types

1 files changed, 17 insertions, 2 deletions

diff --git a/basegfx/inc/basegfx/range/b1drange.hxx b/basegfx/inc/basegfx/range/b1drange.hxx
index 4866a77ea71b..66f5e9c406aa 100644
--- a/basegfx/inc/basegfx/range/b1drange.hxx
+++ b/basegfx/inc/basegfx/range/b1drange.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: b1drange.hxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: thb $ $Date: 2004-02-16 17:03:07 $
+ *  last change: $Author: rt $ $Date: 2004-11-26 18:34:00 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,6 +69,8 @@
 
 namespace basegfx
 {
+    class B1IRange;
+
     class B1DRange
     {
         ::basegfx::BasicRange< double, DoubleTraits >   maRange;
@@ -94,6 +96,8 @@ namespace basegfx
         {
         }
 
+        explicit B1DRange( const B1IRange& rRange );
+
         bool isEmpty() const
         {
             return maRange.isEmpty();
@@ -164,11 +168,22 @@ namespace basegfx
             maRange.expand(rRange.maRange);
         }
 
+        void intersect(const B1DRange& rRange)
+        {
+            maRange.intersect(rRange.maRange);
+        }
+
         void grow(double fValue)
         {
             maRange.grow(fValue);
         }
     };
+
+    /** Round double to nearest integer for 1D range
+
+        @return the nearest integer for this range
+    */
+    B1IRange fround(const B1DRange& rRange);
 } // end of namespace basegfx