diff options
| author | Kohei Yoshida <kyoshida@novell.com> | 2011-03-10 16:55:21 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2011-03-10 20:21:13 -0500 |
| commit | 12343c15568dcc2c9209d8ca41fda2263122448f (patch) | |
| tree | 3212a89c6cd8ea2e0aee7103aa9669bbb8a6f307 /sc/source/ui/docshell/pagedata.cxx | |
| parent | 99745dbcbb25b61437914c9782475d0b67a4b0bd (diff) | |
| parent | ce6308e4fad2281241bf4ca78280eba29f744d43 (diff) | |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sc/source/ui/docshell/pagedata.cxx')
| -rw-r--r-- | sc/source/ui/docshell/pagedata.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sc/source/ui/docshell/pagedata.cxx b/sc/source/ui/docshell/pagedata.cxx index e87c2322a228..b3ec3e31d010 100644 --- a/sc/source/ui/docshell/pagedata.cxx +++ b/sc/source/ui/docshell/pagedata.cxx @@ -43,7 +43,7 @@ ScPrintRangeData::ScPrintRangeData() nPagesX = nPagesY = 0; pPageEndX = NULL; pPageEndY = NULL; - bTopDown = bAutomatic = TRUE; + bTopDown = bAutomatic = sal_True; nFirstPage = 1; } @@ -109,18 +109,18 @@ ScPrintRangeData& ScPageBreakData::GetData(size_t nPos) return pData[nPos]; } -BOOL ScPageBreakData::IsEqual( const ScPageBreakData& rOther ) const +sal_Bool ScPageBreakData::IsEqual( const ScPageBreakData& rOther ) const { if ( nUsed != rOther.nUsed ) - return FALSE; + return false; - for (USHORT i=0; i<nUsed; i++) + for (sal_uInt16 i=0; i<nUsed; i++) if ( pData[i].GetPrintRange() != rOther.pData[i].GetPrintRange() ) - return FALSE; + return false; //! ScPrintRangeData komplett vergleichen ?? - return TRUE; + return sal_True; } void ScPageBreakData::AddPages() @@ -128,7 +128,7 @@ void ScPageBreakData::AddPages() if ( nUsed > 1 ) { long nPage = pData[0].GetFirstPage(); - for (USHORT i=0; sal::static_int_cast<size_t>(i+1)<nUsed; i++) + for (sal_uInt16 i=0; sal::static_int_cast<size_t>(i+1)<nUsed; i++) { nPage += ((long)pData[i].GetPagesX())*pData[i].GetPagesY(); pData[i+1].SetFirstPage( nPage ); |