CWS-TOOLING: integrate CWS koheimultirangecopy

2009-08-29 08:19:57 +0200 kohei  r275558 : A bit of cleanup & comments.
2009-08-29 08:10:31 +0200 kohei  r275557 : removed duplicated code block.
2009-08-29 07:30:33 +0200 kohei  r275556 : #i104551# fixed it.
2009-08-28 17:23:28 +0200 kohei  r275541 : #i104553# fixed a crash on pasting over existing data.  This also fixes notes being destroyed as originally reported in the IZ entry.
2009-08-27 23:36:17 +0200 kohei  r275510 : #i104550# fixed.  All I had to do was to call MarkToSimple() before examining the geometry of the marked ranges.
2009-08-27 18:04:11 +0200 kohei  r275501 : CWS-TOOLING: rebase CWS koheimultirangecopy to trunk@275331 (milestone: DEV300:m56)
2009-08-21 11:37:20 +0200 dr  r275228 : #i10000# another wntmsci12 warning
2009-08-21 09:33:32 +0200 dr  r275218 : #i10000# sunncc warnings
2009-08-20 20:01:15 +0200 kohei  r275196 : Let's not initialize a variable with itself, which is not yet initialized.  This was obviously a silly human error.
2009-08-05 23:24:16 +0200 kohei  r274702 : correct error message on matrix fragment.
2009-08-05 20:00:12 +0200 kohei  r274699 : removed header includes for indexmap.hxx.
2009-08-05 19:54:24 +0200 kohei  r274698 : removed ScIndexMap entirely - we don't need this any more.
2009-08-05 19:53:01 +0200 kohei  r274697 : Removed duplicated methods that use ScIndexMap.  We should now use ScRangeData::IndexMap across the board.
2009-08-05 18:45:17 +0200 kohei  r274695 : Refactored code to remove redundant ScDocument::CopyToClip method.
2009-07-21 18:03:54 +0200 kohei  r274209 : #i25855# initial commit of the patch from ooo-build.  It's buildable.

1 files changed, 5 insertions, 2 deletions

diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx
index 2c6f706ff403..9963cf65c895 100644
--- a/sc/inc/rangenam.hxx
+++ b/sc/inc/rangenam.hxx
@@ -37,6 +37,8 @@
 #include "formula/grammar.hxx"
 #include "scdllapi.h"
 
+#include <map>
+
 //------------------------------------------------------------------------
 
 class ScDocument;
@@ -65,7 +67,6 @@ typedef USHORT RangeType;
 //------------------------------------------------------------------------
 
 class ScTokenArray;
-class ScIndexMap;
 
 class ScRangeData : public ScDataObject
 {
@@ -87,6 +88,8 @@ private:
     friend class ScRangeName;
     ScRangeData( USHORT nIndex );
 public:
+    typedef ::std::map<sal_uInt16, sal_uInt16> IndexMap;
+
     SC_DLLPUBLIC                ScRangeData( ScDocument* pDoc,
                                  const String& rName,
                                  const String& rSymbol,
@@ -152,7 +155,7 @@ public:
 
     void            ValidateTabRefs();
 
-    void            ReplaceRangeNamesInUse( const ScIndexMap& rMap );
+    void            ReplaceRangeNamesInUse( const IndexMap& rMap );
 
     static void     MakeValidName( String& rName );
     SC_DLLPUBLIC static BOOL        IsNameValid( const String& rName, ScDocument* pDoc );