INTEGRATION: CWS dr20 (1.2.12); FILE MERGED

2004/08/11 17:45:27 dr 1.2.12.5: #i10000# merge errors
2004/08/11 14:25:56 dr 1.2.12.4: RESYNC: (1.3-1.4); FILE MERGED
2004/08/11 11:14:45 dr 1.2.12.3: RESYNC: (1.2-1.3); FILE MERGED
2004/08/11 10:39:05 dr 1.2.12.2: #i12577# #i16277# #i24129# #i31482# #i24672# #i27407# #i30411# rework of cell table export - default row/column formats and shared formulas
2004/06/15 16:37:42 dr 1.2.12.1: #i30205# Excel filter code cleanup
- rowlimit changes: SCCOL/SCROW/SCTAB usage
- type correctness: USHORT vs. sal_uInt16, ULONG/size_t vs. sal_uInt32
- removed compiler warnings

1 files changed, 6 insertions, 8 deletions

diff --git a/sc/source/filter/excel/xlpivot.cxx b/sc/source/filter/excel/xlpivot.cxx
index ee775f4b60b2..e4d1d08572cd 100644
--- a/sc/source/filter/excel/xlpivot.cxx
+++ b/sc/source/filter/excel/xlpivot.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xlpivot.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: hr $ $Date: 2004-08-03 11:33:22 $
+ *  last change: $Author: hr $ $Date: 2004-09-08 15:39:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,8 +59,6 @@
  *
  ************************************************************************/
 
-// ============================================================================
-
 #ifndef SC_XLPIVOT_HXX
 #include "xlpivot.hxx"
 #endif
@@ -127,7 +125,7 @@ void XclPCItem::SetDouble( double fValue )
     //! TODO convert double to string
     maText.Erase();
     mfValue = fValue;
-    mnValue = ::lulimit< sal_Int16 >( fValue );
+    mnValue = limit_cast< sal_Int16 >( fValue );
     mnError = EXC_ERR_NULL;
     mbValue = fValue != 0.0;
 }
@@ -148,7 +146,7 @@ void XclPCItem::SetDate( double fDate )
     //! TODO convert date to string
     maText.Erase();
     mfValue = fDate;
-    mnValue = ::lulimit< sal_Int16 >( fDate );
+    mnValue = limit_cast< sal_Int16 >( fDate );
     mnError = EXC_ERR_NULL;
     mbValue = fDate != 0.0;
 }
@@ -159,7 +157,7 @@ void XclPCItem::SetError( sal_uInt16 nError )
     //! TODO convert error to string
     maText.Erase();
     mfValue = nError;
-    mnValue = ::lulimit< sal_Int16 >( nError );
+    mnValue = limit_cast< sal_Int16 >( nError );
     mnError = nError;
     mbValue = false;
 }
@@ -677,7 +675,7 @@ sal_Int32 XclPTFieldExtInfo::GetApiAutoShowCount() const
 
 void XclPTFieldExtInfo::SetApiAutoShowCount( sal_Int32 nShowCount )
 {
-    ::insert_value( mnFlags, ::lulimit< sal_uInt8 >( nShowCount ), 24, 8 );
+    ::insert_value( mnFlags, limit_cast< sal_uInt8 >( nShowCount ), 24, 8 );
 }
 
 sal_Int32 XclPTFieldExtInfo::GetApiLayoutMode() const