diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-12-14 14:04:31 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-12-14 14:04:31 +0000 |
| commit | d82f298b3527ab6ffd2698d52ffc6a9528d86625 (patch) | |
| tree | ab0d8ca6900c9698883656258e0f5bf10fed3635 /sc/source | |
| parent | 7667324612cceaff738eaf86f8c59b854c2e216b (diff) | |
INTEGRATION: CWS numberformat (1.67.28); FILE MERGED
2005/11/01 14:00:51 kendy 1.67.28.2: #i55546#
Rename Svsal_uInt32Table and SvULONGTable to SvNumberFormatterIndexTable.
2005/10/26 17:51:45 kendy 1.67.28.1: #i55546#
The ULONG -> sal_uInt32 patches related to NumberFormat extracted from ooo64bit02 CWS.
Diffstat (limited to 'sc/source')
| -rw-r--r-- | sc/source/core/data/document.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index ddbf4c161e0b..505d4cc32719 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -4,9 +4,9 @@ * * $RCSfile: document.cxx,v $ * - * $Revision: 1.67 $ + * $Revision: 1.68 $ * - * last change: $Author: hr $ $Date: 2005-09-28 11:31:44 $ + * last change: $Author: rt $ $Date: 2005-12-14 15:04:31 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1657,7 +1657,7 @@ void ScDocument::CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMar SvNumberFormatter* pOtherFormatter = pClipDoc->xPoolHelper->GetFormTable(); if (pOtherFormatter && pOtherFormatter != pThisFormatter) { - SvULONGTable* pExchangeList = + SvNumberFormatterIndexTable* pExchangeList = pThisFormatter->MergeFormatter(*(pOtherFormatter)); if (pExchangeList->Count() > 0) pFormatExchangeList = pExchangeList; @@ -2147,7 +2147,7 @@ double ScDocument::GetValue( const ScAddress& rPos ) void ScDocument::GetNumberFormat( SCCOL nCol, SCROW nRow, SCTAB nTab, - ULONG& rFormat ) + sal_uInt32& rFormat ) { if (VALIDTAB(nTab)) if (pTab[nTab]) @@ -2159,7 +2159,7 @@ void ScDocument::GetNumberFormat( SCCOL nCol, SCROW nRow, SCTAB nTab, } -ULONG ScDocument::GetNumberFormat( const ScAddress& rPos ) const +sal_uInt32 ScDocument::GetNumberFormat( const ScAddress& rPos ) const { SCTAB nTab = rPos.Tab(); if ( pTab[nTab] ) |