diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-02-27 10:57:35 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-02-27 10:57:35 +0000 |
| commit | e53efd02c4f4bb713b7fcb64d6482b0b888b3b7b (patch) | |
| tree | 31778babf8c8794a3dfb949a300b670f12abd537 | |
| parent | 943eef38f3a69341eca75794e07d2822485eaaf6 (diff) | |
INTEGRATION: CWS calcwarnings (1.11.116); FILE MERGED
2006/12/13 19:18:20 nn 1.11.116.3: #i69284# warning-free: core, unxsols4
2006/12/06 13:34:12 nn 1.11.116.2: #i69284# warning-free: core, unxlngi6
2006/11/28 13:24:33 nn 1.11.116.1: #i69284# warning-free: core, wntmsci10
| -rw-r--r-- | sc/inc/rangenam.hxx | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx index 48cb82322084..6947a23b7bcf 100644 --- a/sc/inc/rangenam.hxx +++ b/sc/inc/rangenam.hxx @@ -4,9 +4,9 @@ * * $RCSfile: rangenam.hxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: obo $ $Date: 2006-07-10 13:23:26 $ + * last change: $Author: vg $ $Date: 2007-02-27 11:57:35 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -80,9 +80,6 @@ class ScIndexMap; class ScRangeData : public DataObject { -#if defined( ICC ) && defined( OS2 ) - friend static int _Optlink ICCQsortNameCompare( const void* a, const void* b); -#endif private: String aName; String aUpperName; // #i62977# for faster searching (aName is never modified after ctor) @@ -174,11 +171,6 @@ public: static void MakeValidName( String& rName ); static BOOL IsNameValid( const String& rName, ScDocument* pDoc ); -#ifdef WNT - static int __cdecl QsortNameCompare( const void*, const void* ); -#else - static int QsortNameCompare( const void*, const void* ); -#endif }; inline BOOL ScRangeData::HasType( RangeType nType ) const @@ -186,9 +178,15 @@ inline BOOL ScRangeData::HasType( RangeType nType ) const return ( ( eType & nType ) == nType ); } +extern "C" int +#ifdef WNT +__cdecl +#endif +ScRangeData_QsortNameCompare( const void*, const void* ); + #if defined( ICC ) && defined( OS2 ) static int _Optlink ICCQsortNameCompare( const void* a, const void* b) - { ScRangeData::QsortNameCompare(a,b); } + { return ScRangeData_QsortNameCompare(a,b); } #endif //------------------------------------------------------------------------ @@ -198,6 +196,9 @@ class ScRangeName : public SortedCollection private: ScDocument* pDoc; USHORT nSharedMaxIndex; + + using SortedCollection::Clone; // calcwarnings: shouldn't be used + public: ScRangeName(USHORT nLim = 4, USHORT nDel = 4, BOOL bDup = FALSE, ScDocument* pDocument = NULL) : @@ -207,8 +208,8 @@ public: ScRangeName(const ScRangeName& rScRangeName, ScDocument* pDocument); - virtual DataObject* Clone(ScDocument* pDoc) const - { return new ScRangeName(*this, pDoc); } + virtual DataObject* Clone(ScDocument* pDocP) const + { return new ScRangeName(*this, pDocP); } ScRangeData* operator[]( const USHORT nIndex) const { return (ScRangeData*)At(nIndex); } virtual short Compare(DataObject* pKey1, DataObject* pKey2) const; |