summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
authorNoel <noelgrandin@gmail.com>2020-10-26 14:17:32 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-10-28 07:21:59 +0100
commit6436302f40252bc6619e304e2051115fee902e20 (patch)
treea32659b4fecc9fbf8fad3e379ddd8645a2a52e0b /editeng
parent35f16614ee7ddf518d4c01de6b1d800f5ff1ba7e (diff)
convert some more long -> tools::Long
grepping for stuff in template params this time Change-Id: Ia37bfd85480b3a72c3c465489581d56ad8dde851 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104855 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'editeng')
-rw-r--r--editeng/inc/editdoc.hxx2
-rw-r--r--editeng/source/editeng/impedit3.cxx2
-rw-r--r--editeng/source/misc/txtrange.cxx24
3 files changed, 14 insertions, 14 deletions
diff --git a/editeng/inc/editdoc.hxx b/editeng/inc/editdoc.hxx
index 4b4f610772a5..440221bc047b 100644
--- a/editeng/inc/editdoc.hxx
+++ b/editeng/inc/editdoc.hxx
@@ -457,7 +457,7 @@ class ParaPortion;
class EditLine
{
public:
- typedef std::vector<long> CharPosArrayType;
+ typedef std::vector<tools::Long> CharPosArrayType;
private:
CharPosArrayType aPositions;
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index d070ec660786..4ffaeec6afaa 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -818,7 +818,7 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY )
tools::Long nTmpWidth = 0;
tools::Long nXWidth = nMaxLineWidth;
- std::deque<long>* pTextRanges = nullptr;
+ std::deque<tools::Long>* pTextRanges = nullptr;
tools::Long nTextExtraYOffset = 0;
tools::Long nTextXOffset = 0;
tools::Long nTextLineHeight = 0;
diff --git a/editeng/source/misc/txtrange.cxx b/editeng/source/misc/txtrange.cxx
index 8ae51a790899..b8c46e0cdcba 100644
--- a/editeng/source/misc/txtrange.cxx
+++ b/editeng/source/misc/txtrange.cxx
@@ -93,7 +93,7 @@ namespace {
class SvxBoundArgs
{
std::vector<bool> aBoolArr;
- std::deque<long>* pLongArr;
+ std::deque<tools::Long>* pLongArr;
TextRanger *pTextRanger;
tools::Long nMin;
tools::Long nMax;
@@ -126,7 +126,7 @@ class SvxBoundArgs
tools::Long A( const Point& rP ) const { return bRotate ? rP.Y() : rP.X(); }
tools::Long B( const Point& rP ) const { return bRotate ? rP.X() : rP.Y(); }
public:
- SvxBoundArgs( TextRanger* pRanger, std::deque<long>* pLong, const Range& rRange );
+ SvxBoundArgs( TextRanger* pRanger, std::deque<tools::Long>* pLong, const Range& rRange );
void NotePoint( const tools::Long nA ) { NoteMargin( nA - nStart, nA + nEnd ); }
void NoteMargin( const tools::Long nL, const tools::Long nR )
{ if( nMin > nL ) nMin = nL; if( nMax < nR ) nMax = nR; }
@@ -142,7 +142,7 @@ public:
}
-SvxBoundArgs::SvxBoundArgs( TextRanger* pRanger, std::deque<long>* pLong,
+SvxBoundArgs::SvxBoundArgs( TextRanger* pRanger, std::deque<tools::Long>* pLong,
const Range& rRange )
: pLongArr(pLong)
, pTextRanger(pRanger)
@@ -488,18 +488,18 @@ void SvxBoundArgs::Concat( const tools::PolyPolygon* pPoly )
{
SetConcat( true );
DBG_ASSERT( pPoly, "Nothing to do?" );
- std::deque<long>* pOld = pLongArr;
- pLongArr = new std::deque<long>;
+ std::deque<tools::Long>* pOld = pLongArr;
+ pLongArr = new std::deque<tools::Long>;
aBoolArr.clear();
bInner = false;
Calc( *pPoly ); // Note that this updates pLongArr, which is why we swapped it out earlier.
- std::deque<long>::size_type nCount = pLongArr->size();
- std::deque<long>::size_type nIdx = 0;
- std::deque<long>::size_type i = 0;
+ std::deque<tools::Long>::size_type nCount = pLongArr->size();
+ std::deque<tools::Long>::size_type nIdx = 0;
+ std::deque<tools::Long>::size_type i = 0;
bool bSubtract = pTextRanger->IsInner();
while( i < nCount )
{
- std::deque<long>::size_type nOldCount = pOld->size();
+ std::deque<tools::Long>::size_type nOldCount = pOld->size();
if( nIdx == nOldCount )
{ // Reached the end of the old Array...
if( !bSubtract )
@@ -508,7 +508,7 @@ void SvxBoundArgs::Concat( const tools::PolyPolygon* pPoly )
}
tools::Long nLeft = (*pLongArr)[ i++ ];
tools::Long nRight = (*pLongArr)[ i++ ];
- std::deque<long>::size_type nLeftPos = nIdx + 1;
+ std::deque<tools::Long>::size_type nLeftPos = nIdx + 1;
while( nLeftPos < nOldCount && nLeft > (*pOld)[ nLeftPos ] )
nLeftPos += 2;
if( nLeftPos >= nOldCount )
@@ -517,7 +517,7 @@ void SvxBoundArgs::Concat( const tools::PolyPolygon* pPoly )
pOld->insert( pOld->begin() + nOldCount, pLongArr->begin() + i - 2, pLongArr->end() );
break;
}
- std::deque<long>::size_type nRightPos = nLeftPos - 1;
+ std::deque<tools::Long>::size_type nRightPos = nLeftPos - 1;
while( nRightPos < nOldCount && nRight >= (*pOld)[ nRightPos ] )
nRightPos += 2;
if( nRightPos < nLeftPos )
@@ -630,7 +630,7 @@ void SvxBoundArgs::NoteUpLow( tools::Long nA, const sal_uInt8 nArea )
}
}
-std::deque<long>* TextRanger::GetTextRanges( const Range& rRange )
+std::deque<tools::Long>* TextRanger::GetTextRanges( const Range& rRange )
{
DBG_ASSERT( rRange.Min() || rRange.Max(), "Zero-Range not allowed, Bye Bye" );
//Can we find the result we need in the cache?