From 30ebcbb6e0595a13c32f1294fb1918a2a9e808c0 Mon Sep 17 00:00:00 2001 From: Mikhail Voytenko Date: Mon, 24 Jan 2011 14:55:49 +0100 Subject: removetooltypes01: #i112600# adjust rebase for windows --- chart2/source/view/axes/VCartesianAxis.cxx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'chart2') diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx index c17e56ce6bc5..a7bfa6a50640 100644 --- a/chart2/source/view/axes/VCartesianAxis.cxx +++ b/chart2/source/view/axes/VCartesianAxis.cxx @@ -336,17 +336,17 @@ bool lcl_hasWordBreak( const Reference< drawing::XShape >& rxShape ) SvxTextForwarder* pTextForwarder = pTextEditSource->GetTextForwarder(); if ( pTextForwarder ) { - USHORT nParaCount = pTextForwarder->GetParagraphCount(); - for ( USHORT nPara = 0; nPara < nParaCount; ++nPara ) + sal_uInt16 nParaCount = pTextForwarder->GetParagraphCount(); + for ( sal_uInt16 nPara = 0; nPara < nParaCount; ++nPara ) { - USHORT nLineCount = pTextForwarder->GetLineCount( nPara ); - for ( USHORT nLine = 0; nLine < nLineCount; ++nLine ) + sal_uInt16 nLineCount = pTextForwarder->GetLineCount( nPara ); + for ( sal_uInt16 nLine = 0; nLine < nLineCount; ++nLine ) { - USHORT nLineStart = 0; - USHORT nLineEnd = 0; + sal_uInt16 nLineStart = 0; + sal_uInt16 nLineEnd = 0; pTextForwarder->GetLineBoundaries( nLineStart, nLineEnd, nPara, nLine ); - USHORT nWordStart = 0; - USHORT nWordEnd = 0; + sal_uInt16 nWordStart = 0; + sal_uInt16 nWordEnd = 0; if ( pTextForwarder->GetWordIndices( nPara, nLineStart, nWordStart, nWordEnd ) && ( nWordStart != nLineStart ) ) { -- cgit