summaryrefslogtreecommitdiff
path: root/editeng/source/editeng
diff options
context:
space:
mode:
Diffstat (limited to 'editeng/source/editeng')
-rw-r--r--editeng/source/editeng/editdbg.cxx4
-rw-r--r--editeng/source/editeng/editdoc.cxx128
-rw-r--r--editeng/source/editeng/editdoc.hxx50
-rw-r--r--editeng/source/editeng/editeng.cxx160
-rw-r--r--editeng/source/editeng/editobj.cxx81
-rw-r--r--editeng/source/editeng/editobj2.hxx20
-rw-r--r--editeng/source/editeng/editundo.cxx18
-rw-r--r--editeng/source/editeng/editundo.hxx26
-rw-r--r--editeng/source/editeng/editview.cxx28
-rw-r--r--editeng/source/editeng/edtspell.cxx6
-rw-r--r--editeng/source/editeng/eehtml.cxx8
-rw-r--r--editeng/source/editeng/eertfpar.cxx22
-rw-r--r--editeng/source/editeng/eertfpar.hxx4
-rw-r--r--editeng/source/editeng/impedit.cxx37
-rw-r--r--editeng/source/editeng/impedit.hxx92
-rw-r--r--editeng/source/editeng/impedit2.cxx157
-rw-r--r--editeng/source/editeng/impedit3.cxx56
-rw-r--r--editeng/source/editeng/impedit4.cxx56
-rw-r--r--editeng/source/editeng/impedit5.cxx54
19 files changed, 532 insertions, 475 deletions
diff --git a/editeng/source/editeng/editdbg.cxx b/editeng/source/editeng/editdbg.cxx
index 88aa0e3e8573..b0b780e6a847 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -323,7 +323,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, sal_Bool bInfoBox )
fprintf( fp, "================================================================================" );
fprintf( fp, "\n================== Document ================================================" );
fprintf( fp, "\n================================================================================" );
- for ( sal_uInt16 nPortion = 0; nPortion < pEE->pImpEditEngine->GetParaPortions(). Count(); nPortion++)
+ for ( sal_Int32 nPortion = 0; nPortion < pEE->pImpEditEngine->GetParaPortions().Count(); nPortion++)
{
ParaPortion* pPPortion = pEE->pImpEditEngine->GetParaPortions()[nPortion];
fprintf( fp, "\nParagraph %i: Length = %i, Invalid = %i\nText = '%s'",
@@ -463,7 +463,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, sal_Bool bInfoBox )
aR = pV->GetVisArea();
fprintf( fp, "\n VisArea: nX=%li, nY=%li, dX=%li, dY=%li", aR.TopLeft().X(), aR.TopLeft().Y(), aR.GetSize().Width(), aR.GetSize().Height() );
ESelection aSel = pV->GetSelection();
- fprintf( fp, "\n Selection: Start=%u,%u, End=%u,%u", aSel.nStartPara, aSel.nStartPos, aSel.nEndPara, aSel.nEndPos );
+ fprintf( fp, "\n Selection: Start=%d,%u, End=%d,%u", aSel.nStartPara, aSel.nStartPos, aSel.nEndPara, aSel.nEndPos );
}
if ( pEE->GetActiveView() )
{
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index 80556b98c562..3f103b015198 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -702,8 +702,8 @@ size_t FastGetPos(const _Array& rArray, const _Val* p, size_t& rLastPos)
if (&rArray.at(nIdx) == p)
return rLastPos = nIdx;
- // 0xFFFF is used to signify "not found" condition. We need to change this.
- return std::numeric_limits<sal_uInt16>::max();
+ // XXX "not found" condition for sal_Int32 indexes
+ return EE_PARA_NOT_FOUND;
}
}
@@ -716,33 +716,48 @@ ParaPortionList::~ParaPortionList()
{
}
-sal_uInt16 ParaPortionList::GetPos(const ParaPortion* p) const
+sal_Int32 ParaPortionList::GetPos(const ParaPortion* p) const
{
return FastGetPos(maPortions, p, nLastCache);
}
-ParaPortion* ParaPortionList::operator [](size_t nPos)
+ParaPortion* ParaPortionList::operator [](sal_Int32 nPos)
{
- return nPos < maPortions.size() ? &maPortions[nPos] : NULL;
+ return 0 <= nPos && static_cast<size_t>(nPos) < maPortions.size() ? &maPortions[nPos] : NULL;
}
-const ParaPortion* ParaPortionList::operator [](size_t nPos) const
+const ParaPortion* ParaPortionList::operator [](sal_Int32 nPos) const
{
- return nPos < maPortions.size() ? &maPortions[nPos] : NULL;
+ return 0 <= nPos && static_cast<size_t>(nPos) < maPortions.size() ? &maPortions[nPos] : NULL;
}
-ParaPortion* ParaPortionList::Release(size_t nPos)
+ParaPortion* ParaPortionList::Release(sal_Int32 nPos)
{
+ if (nPos < 0 || maPortions.size() <= static_cast<size_t>(nPos))
+ {
+ SAL_WARN( "editeng", "ParaPortionList::Release - out of bounds pos " << nPos);
+ return NULL;
+ }
return maPortions.release(maPortions.begin()+nPos).release();
}
-void ParaPortionList::Remove(size_t nPos)
+void ParaPortionList::Remove(sal_Int32 nPos)
{
+ if (nPos < 0 || maPortions.size() <= static_cast<size_t>(nPos))
+ {
+ SAL_WARN( "editeng", "ParaPortionList::Remove - out of bounds pos " << nPos);
+ return;
+ }
maPortions.erase(maPortions.begin()+nPos);
}
-void ParaPortionList::Insert(size_t nPos, ParaPortion* p)
+void ParaPortionList::Insert(sal_Int32 nPos, ParaPortion* p)
{
+ if (nPos < 0 || maPortions.size() < static_cast<size_t>(nPos))
+ {
+ SAL_WARN( "editeng", "ParaPortionList::Insert - out of bounds pos " << nPos);
+ return;
+ }
maPortions.insert(maPortions.begin()+nPos, p);
}
@@ -751,9 +766,15 @@ void ParaPortionList::Append(ParaPortion* p)
maPortions.push_back(p);
}
-size_t ParaPortionList::Count() const
+sal_Int32 ParaPortionList::Count() const
{
- return maPortions.size();
+ size_t nSize = maPortions.size();
+ if (nSize > SAL_MAX_INT32)
+ {
+ SAL_WARN( "editeng", "ParaPortionList::Count - overflow " << nSize);
+ return SAL_MAX_INT32;
+ }
+ return nSize;
}
void ParaPortionList::Reset()
@@ -775,26 +796,26 @@ long ParaPortionList::GetYOffset(const ParaPortion* pPPortion) const
return nHeight;
}
-sal_uInt16 ParaPortionList::FindParagraph(long nYOffset) const
+sal_Int32 ParaPortionList::FindParagraph(long nYOffset) const
{
long nY = 0;
for (size_t i = 0, n = maPortions.size(); i < n; ++i)
{
nY += maPortions[i].GetHeight(); // should also be correct even in bVisible!
if ( nY > nYOffset )
- return i;
+ return i <= SAL_MAX_INT32 ? static_cast<sal_Int32>(i) : SAL_MAX_INT32;
}
return EE_PARA_NOT_FOUND;
}
-const ParaPortion* ParaPortionList::SafeGetObject(size_t nPos) const
+const ParaPortion* ParaPortionList::SafeGetObject(sal_Int32 nPos) const
{
- return nPos < maPortions.size() ? &maPortions[nPos] : NULL;
+ return 0 <= nPos && static_cast<size_t>(nPos) < maPortions.size() ? &maPortions[nPos] : NULL;
}
-ParaPortion* ParaPortionList::SafeGetObject(size_t nPos)
+ParaPortion* ParaPortionList::SafeGetObject(sal_Int32 nPos)
{
- return nPos < maPortions.size() ? &maPortions[nPos] : NULL;
+ return 0 <= nPos && static_cast<size_t>(nPos) < maPortions.size() ? &maPortions[nPos] : NULL;
}
#if OSL_DEBUG_LEVEL > 2
@@ -1230,11 +1251,11 @@ sal_Bool EditSelection::Adjust( const EditDoc& rNodes )
const ContentNode* pStartNode = aStartPaM.GetNode();
const ContentNode* pEndNode = aEndPaM.GetNode();
- sal_uInt16 nStartNode = rNodes.GetPos( pStartNode );
- sal_uInt16 nEndNode = rNodes.GetPos( pEndNode );
+ sal_Int32 nStartNode = rNodes.GetPos( pStartNode );
+ sal_Int32 nEndNode = rNodes.GetPos( pEndNode );
- DBG_ASSERT( nStartNode != USHRT_MAX, "Node out of range in Adjust(1)" );
- DBG_ASSERT( nEndNode != USHRT_MAX, "Node out of range in Adjust(2)" );
+ DBG_ASSERT( nStartNode != SAL_MAX_INT32, "Node out of range in Adjust(1)" );
+ DBG_ASSERT( nEndNode != SAL_MAX_INT32, "Node out of range in Adjust(2)" );
sal_Bool bSwap = sal_False;
if ( nStartNode > nEndNode )
@@ -1963,7 +1984,7 @@ void EditDoc::CreateDefFont( sal_Bool bUseStyles )
aDefFont.SetVertical( IsVertical() );
aDefFont.SetOrientation( IsVertical() ? 2700 : 0 );
- for ( sal_uInt16 nNode = 0; nNode < Count(); nNode++ )
+ for ( sal_Int32 nNode = 0; nNode < Count(); nNode++ )
{
ContentNode* pNode = GetObject( nNode );
pNode->GetCharAttribs().GetDefFont() = aDefFont;
@@ -1976,55 +1997,70 @@ static const sal_Unicode aCR[] = { 0x0d, 0x00 };
static const sal_Unicode aLF[] = { 0x0a, 0x00 };
static const sal_Unicode aCRLF[] = { 0x0d, 0x0a, 0x00 };
-size_t EditDoc::GetPos(const ContentNode* p) const
+sal_Int32 EditDoc::GetPos(const ContentNode* p) const
{
return FastGetPos(maContents, p, nLastCache);
}
-const ContentNode* EditDoc::GetObject(size_t nPos) const
+const ContentNode* EditDoc::GetObject(sal_Int32 nPos) const
{
- return nPos < maContents.size() ? &maContents[nPos] : NULL;
+ return 0 <= nPos && static_cast<size_t>(nPos) < maContents.size() ? &maContents[nPos] : NULL;
}
-ContentNode* EditDoc::GetObject(size_t nPos)
+ContentNode* EditDoc::GetObject(sal_Int32 nPos)
{
- return nPos < maContents.size() ? &maContents[nPos] : NULL;
+ return 0 <= nPos && static_cast<size_t>(nPos) < maContents.size() ? &maContents[nPos] : NULL;
}
-const ContentNode* EditDoc::operator[](size_t nPos) const
+const ContentNode* EditDoc::operator[](sal_Int32 nPos) const
{
return GetObject(nPos);
}
-ContentNode* EditDoc::operator[](size_t nPos)
+ContentNode* EditDoc::operator[](sal_Int32 nPos)
{
return GetObject(nPos);
}
-void EditDoc::Insert(size_t nPos, ContentNode* p)
+void EditDoc::Insert(sal_Int32 nPos, ContentNode* p)
{
+ if (nPos < 0 || nPos == SAL_MAX_INT32)
+ {
+ SAL_WARN( "editeng", "EditDoc::Insert - overflow pos " << nPos);
+ return;
+ }
maContents.insert(maContents.begin()+nPos, p);
}
-void EditDoc::Remove(size_t nPos)
+void EditDoc::Remove(sal_Int32 nPos)
{
- if (nPos >= maContents.size())
+ if (nPos < 0 || static_cast<size_t>(nPos) >= maContents.size())
+ {
+ SAL_WARN( "editeng", "EditDoc::Remove - out of bounds pos " << nPos);
return;
-
+ }
maContents.erase(maContents.begin() + nPos);
}
-void EditDoc::Release(size_t nPos)
+void EditDoc::Release(sal_Int32 nPos)
{
- if (nPos >= maContents.size())
+ if (nPos < 0 || static_cast<size_t>(nPos) >= maContents.size())
+ {
+ SAL_WARN( "editeng", "EditDoc::Release - out of bounds pos " << nPos);
return;
-
+ }
maContents.release(maContents.begin() + nPos).release();
}
-size_t EditDoc::Count() const
+sal_Int32 EditDoc::Count() const
{
- return maContents.size();
+ size_t nSize = maContents.size();
+ if (nSize > SAL_MAX_INT32)
+ {
+ SAL_WARN( "editeng", "EditDoc::Count - overflow " << nSize);
+ return SAL_MAX_INT32;
+ }
+ return static_cast<sal_Int32>(nSize);
}
rtl::OUString EditDoc::GetSepStr( LineEnd eEnd )
@@ -2042,7 +2078,7 @@ rtl::OUString EditDoc::GetSepStr( LineEnd eEnd )
XubString EditDoc::GetText( LineEnd eEnd ) const
{
sal_uLong nLen = GetTextLen();
- size_t nNodes = Count();
+ sal_Int32 nNodes = Count();
if (nNodes == 0)
return rtl::OUString();
@@ -2054,8 +2090,8 @@ XubString EditDoc::GetText( LineEnd eEnd ) const
rtl_uString* newStr = comphelper::string::rtl_uString_alloc(nLen);
sal_Unicode* pCur = newStr->buffer;
- size_t nLastNode = nNodes-1;
- for ( sal_uInt16 nNode = 0; nNode < nNodes; nNode++ )
+ sal_Int32 nLastNode = nNodes-1;
+ for ( sal_Int32 nNode = 0; nNode < nNodes; nNode++ )
{
String aTmp( GetParaAsString( GetObject(nNode) ) );
memcpy( pCur, aTmp.GetBuffer(), aTmp.Len()*sizeof(sal_Unicode) );
@@ -2070,7 +2106,7 @@ XubString EditDoc::GetText( LineEnd eEnd ) const
return rtl::OUString(newStr, SAL_NO_ACQUIRE);
}
-XubString EditDoc::GetParaAsString( sal_uInt16 nNode ) const
+XubString EditDoc::GetParaAsString( sal_Int32 nNode ) const
{
return GetParaAsString( GetObject( nNode ) );
}
@@ -2136,7 +2172,7 @@ EditPaM EditDoc::GetEndPaM() const
sal_uLong EditDoc::GetTextLen() const
{
sal_uLong nLen = 0;
- for ( sal_uInt16 nNode = 0; nNode < Count(); nNode++ )
+ for ( sal_Int32 nNode = 0; nNode < Count(); nNode++ )
{
const ContentNode* pNode = GetObject( nNode );
nLen += pNode->Len();
@@ -2225,7 +2261,7 @@ EditPaM EditDoc::InsertParaBreak( EditPaM aPaM, sal_Bool bKeepEndingAttribs )
{
DBG_ASSERT( aPaM.GetNode(), "Blinder PaM in EditDoc::InsertParaBreak" );
ContentNode* pCurNode = aPaM.GetNode();
- sal_uInt16 nPos = GetPos( pCurNode );
+ sal_Int32 nPos = GetPos( pCurNode );
XubString aStr = aPaM.GetNode()->Copy( aPaM.GetIndex() );
aPaM.GetNode()->Erase( aPaM.GetIndex() );
@@ -2292,7 +2328,7 @@ EditPaM EditDoc::ConnectParagraphs( ContentNode* pLeft, ContentNode* pRight )
// the one to the right disappears.
RemoveItemsFromPool(*pRight);
- sal_uInt16 nRight = GetPos( pRight );
+ sal_Int32 nRight = GetPos( pRight );
Remove( nRight );
SetModified(true);
diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx
index 59e7ea11229d..dc12a6e192c3 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -54,11 +54,11 @@ class EditDoc;
struct EPaM
{
- sal_uInt16 nPara;
+ sal_Int32 nPara;
sal_uInt16 nIndex;
EPaM() { nPara = 0; nIndex = 0; }
- EPaM( sal_uInt16 nP, sal_uInt16 nI ) { nPara = nP; nIndex = nI; }
+ EPaM( sal_Int32 nP, sal_uInt16 nI ) { nPara = nP; nIndex = nI; }
EPaM( const EPaM& r) { nPara = r.nPara; nIndex = r.nIndex; }
EPaM& operator = ( const EPaM& r ) { nPara = r.nPara; nIndex = r.nIndex; return *this; }
inline sal_Bool operator == ( const EPaM& r ) const;
@@ -649,20 +649,20 @@ public:
void Reset();
long GetYOffset(const ParaPortion* pPPortion) const;
- sal_uInt16 FindParagraph(long nYOffset) const;
+ sal_Int32 FindParagraph(long nYOffset) const;
- const ParaPortion* SafeGetObject(size_t nPos) const;
- ParaPortion* SafeGetObject(size_t nPos);
+ const ParaPortion* SafeGetObject(sal_Int32 nPos) const;
+ ParaPortion* SafeGetObject(sal_Int32 nPos);
- sal_uInt16 GetPos(const ParaPortion* p) const;
- ParaPortion* operator[](size_t nPos);
- const ParaPortion* operator[](size_t nPos) const;
+ sal_Int32 GetPos(const ParaPortion* p) const;
+ ParaPortion* operator[](sal_Int32 nPos);
+ const ParaPortion* operator[](sal_Int32 nPos) const;
- ParaPortion* Release(size_t nPos);
- void Remove(size_t nPos);
- void Insert(size_t nPos, ParaPortion* p);
+ ParaPortion* Release(sal_Int32 nPos);
+ void Remove(sal_Int32 nPos);
+ void Insert(sal_Int32 nPos, ParaPortion* p);
void Append(ParaPortion* p);
- size_t Count() const;
+ sal_Int32 Count() const;
#if OSL_DEBUG_LEVEL > 2
// temporary:
@@ -711,15 +711,15 @@ class DeletedNodeInfo
{
private:
sal_uIntPtr nInvalidAdressPtr;
- sal_uInt16 nInvalidParagraph;
+ sal_Int32 nInvalidParagraph;
public:
- DeletedNodeInfo( sal_uIntPtr nInvAdr, sal_uInt16 nPos )
+ DeletedNodeInfo( sal_uIntPtr nInvAdr, sal_Int32 nPos )
{ nInvalidAdressPtr = nInvAdr;
nInvalidParagraph = nPos; }
sal_uIntPtr GetInvalidAdress() const { return nInvalidAdressPtr; }
- sal_uInt16 GetPosition() const { return nInvalidParagraph; }
+ sal_Int32 GetPosition() const { return nInvalidParagraph; }
};
// -------------------------------------------------------------------------
@@ -778,7 +778,7 @@ public:
String GetText( LineEnd eEnd ) const;
sal_uLong GetTextLen() const;
- XubString GetParaAsString( sal_uInt16 nNode ) const;
+ XubString GetParaAsString( sal_Int32 nNode ) const;
XubString GetParaAsString(const ContentNode* pNode, sal_uInt16 nStartPos = 0, sal_uInt16 nEndPos = 0xFFFF, bool bResolveFields = true) const;
EditPaM GetStartPaM() const;
@@ -796,17 +796,17 @@ public:
sal_Bool RemoveAttribs( ContentNode* pNode, sal_uInt16 nStart, sal_uInt16 nEnd, EditCharAttrib*& rpStarting, EditCharAttrib*& rpEnding, sal_uInt16 nWhich = 0 );
void FindAttribs( ContentNode* pNode, sal_uInt16 nStartPos, sal_uInt16 nEndPos, SfxItemSet& rCurSet );
- size_t GetPos(const ContentNode* pNode) const;
- const ContentNode* GetObject(size_t nPos) const;
- ContentNode* GetObject(size_t nPos);
- size_t Count() const;
- const ContentNode* operator[](size_t nPos) const;
- ContentNode* operator[](size_t nPos);
- void Insert(size_t nPos, ContentNode* p);
+ sal_Int32 GetPos(const ContentNode* pNode) const;
+ const ContentNode* GetObject(sal_Int32 nPos) const;
+ ContentNode* GetObject(sal_Int32 nPos);
+ sal_Int32 Count() const;
+ const ContentNode* operator[](sal_Int32 nPos) const;
+ ContentNode* operator[](sal_Int32 nPos);
+ void Insert(sal_Int32 nPos, ContentNode* p);
/// deletes
- void Remove(size_t nPos);
+ void Remove(sal_Int32 nPos);
/// does not delete
- void Release(size_t nPos);
+ void Release(sal_Int32 nPos);
static rtl::OUString GetSepStr( LineEnd eEnd );
};
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 6a42c910ee67..7da4dc15472e 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -513,7 +513,7 @@ LanguageType EditEngine::GetLanguage(const EditPaM& rPaM) const
return pImpEditEngine->GetLanguage(rPaM);
}
-LanguageType EditEngine::GetLanguage( sal_uInt16 nPara, sal_uInt16 nPos ) const
+LanguageType EditEngine::GetLanguage( sal_Int32 nPara, sal_uInt16 nPos ) const
{
DBG_CHKTHIS( EditEngine, 0 );
ContentNode* pNode = pImpEditEngine->GetEditDoc().GetObject( nPara );
@@ -625,13 +625,13 @@ sal_uInt32 EditEngine::GetTextLen() const
return pImpEditEngine->GetEditDoc().GetTextLen();
}
-sal_uInt16 EditEngine::GetParagraphCount() const
+sal_Int32 EditEngine::GetParagraphCount() const
{
DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->aEditDoc.Count();
}
-sal_uInt16 EditEngine::GetLineCount( sal_uInt16 nParagraph ) const
+sal_uInt16 EditEngine::GetLineCount( sal_Int32 nParagraph ) const
{
DBG_CHKTHIS( EditEngine, 0 );
if ( !pImpEditEngine->IsFormatted() )
@@ -639,7 +639,7 @@ sal_uInt16 EditEngine::GetLineCount( sal_uInt16 nParagraph ) const
return pImpEditEngine->GetLineCount( nParagraph );
}
-sal_uInt16 EditEngine::GetLineLen( sal_uInt16 nParagraph, sal_uInt16 nLine ) const
+sal_uInt16 EditEngine::GetLineLen( sal_Int32 nParagraph, sal_uInt16 nLine ) const
{
DBG_CHKTHIS( EditEngine, 0 );
if ( !pImpEditEngine->IsFormatted() )
@@ -647,7 +647,7 @@ sal_uInt16 EditEngine::GetLineLen( sal_uInt16 nParagraph, sal_uInt16 nLine ) con
return pImpEditEngine->GetLineLen( nParagraph, nLine );
}
-void EditEngine::GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nParagraph, sal_uInt16 nLine ) const
+void EditEngine::GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_Int32 nParagraph, sal_uInt16 nLine ) const
{
DBG_CHKTHIS( EditEngine, 0 );
if ( !pImpEditEngine->IsFormatted() )
@@ -655,7 +655,7 @@ void EditEngine::GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16
return pImpEditEngine->GetLineBoundaries( rStart, rEnd, nParagraph, nLine );
}
-sal_uInt16 EditEngine::GetLineNumberAtIndex( sal_uInt16 nPara, sal_uInt16 nIndex ) const
+sal_uInt16 EditEngine::GetLineNumberAtIndex( sal_Int32 nPara, sal_uInt16 nIndex ) const
{
DBG_CHKTHIS( EditEngine, 0 );
if ( !pImpEditEngine->IsFormatted() )
@@ -663,7 +663,7 @@ sal_uInt16 EditEngine::GetLineNumberAtIndex( sal_uInt16 nPara, sal_uInt16 nIndex
return pImpEditEngine->GetLineNumberAtIndex( nPara, nIndex );
}
-sal_uInt32 EditEngine::GetLineHeight( sal_uInt16 nParagraph, sal_uInt16 nLine )
+sal_uInt32 EditEngine::GetLineHeight( sal_Int32 nParagraph, sal_uInt16 nLine )
{
DBG_CHKTHIS( EditEngine, 0 );
// If someone calls GetLineHeight() with an empty Engine.
@@ -672,7 +672,7 @@ sal_uInt32 EditEngine::GetLineHeight( sal_uInt16 nParagraph, sal_uInt16 nLine )
return pImpEditEngine->GetLineHeight( nParagraph, nLine );
}
-sal_uInt32 EditEngine::GetTextHeight( sal_uInt16 nParagraph ) const
+sal_uInt32 EditEngine::GetTextHeight( sal_Int32 nParagraph ) const
{
DBG_CHKTHIS( EditEngine, 0 );
@@ -683,7 +683,7 @@ sal_uInt32 EditEngine::GetTextHeight( sal_uInt16 nParagraph ) const
return nHeight;
}
-XubString EditEngine::GetWord( sal_uInt16 nPara, sal_uInt16 nIndex )
+XubString EditEngine::GetWord( sal_Int32 nPara, sal_uInt16 nIndex )
{
ESelection aESel( nPara, nIndex, nPara, nIndex );
EditSelection aSel( pImpEditEngine->CreateSel( aESel ) );
@@ -736,7 +736,7 @@ sal_uInt16 EditEngine::GetScriptType(const EditSelection& rSel) const
return pImpEditEngine->GetScriptType(rSel);
}
-void EditEngine::RemoveParaPortion(size_t nNode)
+void EditEngine::RemoveParaPortion(sal_Int32 nNode)
{
pImpEditEngine->GetParaPortions().Remove(nNode);
}
@@ -761,17 +761,17 @@ void EditEngine::UpdateSelections()
pImpEditEngine->UpdateSelections();
}
-void EditEngine::InsertContent(ContentNode* pNode, sal_uInt16 nPos)
+void EditEngine::InsertContent(ContentNode* pNode, sal_Int32 nPos)
{
pImpEditEngine->InsertContent(pNode, nPos);
}
-EditPaM EditEngine::SplitContent(sal_uInt16 nNode, sal_uInt16 nSepPos)
+EditPaM EditEngine::SplitContent(sal_Int32 nNode, sal_uInt16 nSepPos)
{
return pImpEditEngine->SplitContent(nNode, nSepPos);
}
-EditPaM EditEngine::ConnectContents(sal_uInt16 nLeftNode, bool bBackward)
+EditPaM EditEngine::ConnectContents(sal_Int32 nLeftNode, bool bBackward)
{
return pImpEditEngine->ConnectContents(nLeftNode, bBackward);
}
@@ -781,12 +781,12 @@ EditPaM EditEngine::InsertFeature(const EditSelection& rEditSelection, const Sfx
return pImpEditEngine->ImpInsertFeature(rEditSelection, rItem);
}
-EditSelection EditEngine::MoveParagraphs(const Range& rParagraphs, sal_uInt16 nNewPos, EditView* pCurView)
+EditSelection EditEngine::MoveParagraphs(const Range& rParagraphs, sal_Int32 nNewPos, EditView* pCurView)
{
return pImpEditEngine->MoveParagraphs(rParagraphs, nNewPos, pCurView);
}
-void EditEngine::RemoveCharAttribs(sal_uInt16 nPara, sal_uInt16 nWhich, bool bRemoveFeatures)
+void EditEngine::RemoveCharAttribs(sal_Int32 nPara, sal_uInt16 nWhich, bool bRemoveFeatures)
{
pImpEditEngine->RemoveCharAttribs(nPara, nWhich, bRemoveFeatures);
}
@@ -963,12 +963,12 @@ EditSelection EditEngine::CreateSelection(const ESelection& rSel)
return pImpEditEngine->CreateSel(rSel);
}
-const SfxItemSet& EditEngine::GetBaseParaAttribs(sal_uInt16 nPara) const
+const SfxItemSet& EditEngine::GetBaseParaAttribs(sal_Int32 nPara) const
{
return pImpEditEngine->GetParaAttribs(nPara);
}
-void EditEngine::SetParaAttribsOnly(sal_uInt16 nPara, const SfxItemSet& rSet)
+void EditEngine::SetParaAttribsOnly(sal_Int32 nPara, const SfxItemSet& rSet)
{
pImpEditEngine->SetParaAttribs(nPara, rSet);
}
@@ -1080,11 +1080,11 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
{
if ( rKeyEvent.GetKeyCode().IsMod1() && rKeyEvent.GetKeyCode().IsMod2() )
{
- sal_uInt16 nParas = GetParagraphCount();
+ sal_Int32 nParas = GetParagraphCount();
Point aPos;
Point aViewStart( pEditView->GetOutputArea().TopLeft() );
long n20 = 40 * pImpEditEngine->nOnePixelInRef;
- for ( sal_uInt16 n = 0; n < nParas; n++ )
+ for ( sal_Int32 n = 0; n < nParas; n++ )
{
long nH = GetTextHeight( n );
Point P1( aViewStart.X() + n20 + n20*(n%2), aViewStart.Y() + aPos.Y() );
@@ -1191,7 +1191,7 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
// now on and that will be all. Otherwise continue as usual.
// ...
- sal_uInt16 nPara = pImpEditEngine->GetEditDoc().GetPos( pNode );
+ sal_Int32 nPara = pImpEditEngine->GetEditDoc().GetPos( pNode );
SfxBoolItem aBulletState( (const SfxBoolItem&) pImpEditEngine->GetParaAttrib( nPara, EE_PARA_BULLETSTATE ) );
bool bBulletIsVisible = aBulletState.GetValue() ? true : false;
@@ -1579,7 +1579,7 @@ void EditEngine::SetText( const EditTextObject& rTextObject )
pImpEditEngine->LeaveBlockNotifications();
}
-void EditEngine::ShowParagraph( sal_uInt16 nParagraph, sal_Bool bShow )
+void EditEngine::ShowParagraph( sal_Int32 nParagraph, sal_Bool bShow )
{
DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->ShowParagraph( nParagraph, bShow );
@@ -1646,10 +1646,10 @@ void EditEngine::SetEndPasteOrDropHdl( const Link& rLink )
pImpEditEngine->aEndPasteOrDropHdl = rLink;
}
-EditTextObject* EditEngine::CreateTextObject( sal_uInt16 nPara, sal_uInt16 nParas )
+EditTextObject* EditEngine::CreateTextObject( sal_Int32 nPara, sal_Int32 nParas )
{
DBG_CHKTHIS( EditEngine, 0 );
- DBG_ASSERT( nPara < pImpEditEngine->GetEditDoc().Count(), "CreateTextObject: Startpara out of Range" );
+ DBG_ASSERT( 0 <= nPara && nPara < pImpEditEngine->GetEditDoc().Count(), "CreateTextObject: Startpara out of Range" );
DBG_ASSERT( nParas <= pImpEditEngine->GetEditDoc().Count() - nPara, "CreateTextObject: Endpara out of Range" );
ContentNode* pStartNode = pImpEditEngine->GetEditDoc().GetObject( nPara );
@@ -1667,7 +1667,7 @@ EditTextObject* EditEngine::CreateTextObject( sal_uInt16 nPara, sal_uInt16 nPara
return 0;
}
-void EditEngine::RemoveParagraph( sal_uInt16 nPara )
+void EditEngine::RemoveParagraph( sal_Int32 nPara )
{
DBG_CHKTHIS( EditEngine, 0 );
DBG_ASSERT( pImpEditEngine->GetEditDoc().Count() > 1, "The first paragraph should not be deleted!" );
@@ -1687,7 +1687,7 @@ void EditEngine::RemoveParagraph( sal_uInt16 nPara )
}
}
-sal_uInt16 EditEngine::GetTextLen( sal_uInt16 nPara ) const
+sal_uInt16 EditEngine::GetTextLen( sal_Int32 nPara ) const
{
DBG_CHKTHIS( EditEngine, 0 );
ContentNode* pNode = pImpEditEngine->GetEditDoc().GetObject( nPara );
@@ -1697,11 +1697,11 @@ sal_uInt16 EditEngine::GetTextLen( sal_uInt16 nPara ) const
return 0;
}
-XubString EditEngine::GetText( sal_uInt16 nPara ) const
+XubString EditEngine::GetText( sal_Int32 nPara ) const
{
DBG_CHKTHIS( EditEngine, 0 );
XubString aStr;
- if ( nPara < pImpEditEngine->GetEditDoc().Count() )
+ if ( 0 <= nPara && nPara < pImpEditEngine->GetEditDoc().Count() )
aStr = pImpEditEngine->GetEditDoc().GetParaAsString( nPara );
return aStr;
}
@@ -1744,12 +1744,12 @@ sal_Bool EditEngine::IsInSelectionMode() const
pImpEditEngine->GetSelEngine().IsInSelection() );
}
-void EditEngine::InsertParagraph( sal_uInt16 nPara, const EditTextObject& rTxtObj )
+void EditEngine::InsertParagraph( sal_Int32 nPara, const EditTextObject& rTxtObj )
{
DBG_CHKTHIS( EditEngine, 0 );
if ( nPara > GetParagraphCount() )
{
- DBG_ASSERTWARNING( nPara == USHRT_MAX, "Paragraph number to large, but not LIST_APPEND!" );
+ DBG_ASSERTWARNING( nPara == EE_PARA_APPEND, "Paragraph number too large, but not EE_PARA_APPEND!" );
nPara = GetParagraphCount();
}
@@ -1767,12 +1767,12 @@ void EditEngine::InsertParagraph( sal_uInt16 nPara, const EditTextObject& rTxtOb
pImpEditEngine->FormatAndUpdate();
}
-void EditEngine::InsertParagraph( sal_uInt16 nPara, const XubString& rTxt )
+void EditEngine::InsertParagraph( sal_Int32 nPara, const XubString& rTxt )
{
DBG_CHKTHIS( EditEngine, 0 );
if ( nPara > GetParagraphCount() )
{
- DBG_ASSERTWARNING( nPara == USHRT_MAX, "Paragraph number to large, but not LIST_APPEND!" );
+ DBG_ASSERTWARNING( nPara == EE_PARA_APPEND, "Paragraph number too large, but not EE_PARA_APPEND!" );
nPara = GetParagraphCount();
}
@@ -1786,7 +1786,7 @@ void EditEngine::InsertParagraph( sal_uInt16 nPara, const XubString& rTxt )
pImpEditEngine->FormatAndUpdate();
}
-void EditEngine::SetText( sal_uInt16 nPara, const XubString& rTxt )
+void EditEngine::SetText( sal_Int32 nPara, const XubString& rTxt )
{
DBG_CHKTHIS( EditEngine, 0 );
EditSelection* pSel = pImpEditEngine->SelectParagraph( nPara );
@@ -1800,32 +1800,32 @@ void EditEngine::SetText( sal_uInt16 nPara, const XubString& rTxt )
}
}
-void EditEngine::SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& rSet )
+void EditEngine::SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet )
{
DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->SetParaAttribs( nPara, rSet );
pImpEditEngine->FormatAndUpdate();
}
-const SfxItemSet& EditEngine::GetParaAttribs( sal_uInt16 nPara ) const
+const SfxItemSet& EditEngine::GetParaAttribs( sal_Int32 nPara ) const
{
DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->GetParaAttribs( nPara );
}
-sal_Bool EditEngine::HasParaAttrib( sal_uInt16 nPara, sal_uInt16 nWhich ) const
+sal_Bool EditEngine::HasParaAttrib( sal_Int32 nPara, sal_uInt16 nWhich ) const
{
DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->HasParaAttrib( nPara, nWhich );
}
-const SfxPoolItem& EditEngine::GetParaAttrib( sal_uInt16 nPara, sal_uInt16 nWhich )
+const SfxPoolItem& EditEngine::GetParaAttrib( sal_Int32 nPara, sal_uInt16 nWhich )
{
DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->GetParaAttrib( nPara, nWhich );
}
-void EditEngine::GetCharAttribs( sal_uInt16 nPara, std::vector<EECharAttrib>& rLst ) const
+void EditEngine::GetCharAttribs( sal_Int32 nPara, std::vector<EECharAttrib>& rLst ) const
{
DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->GetCharAttribs( nPara, rLst );
@@ -1839,7 +1839,7 @@ SfxItemSet EditEngine::GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAtt
return pImpEditEngine->GetAttribs( aSel, bOnlyHardAttrib );
}
-SfxItemSet EditEngine::GetAttribs( sal_uInt16 nPara, sal_uInt16 nStart, sal_uInt16 nEnd, sal_uInt8 nFlags ) const
+SfxItemSet EditEngine::GetAttribs( sal_Int32 nPara, sal_uInt16 nStart, sal_uInt16 nEnd, sal_uInt8 nFlags ) const
{
DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->GetAttribs( nPara, nStart, nEnd, nFlags );
@@ -1856,13 +1856,13 @@ void EditEngine::RemoveAttribs( const ESelection& rSelection, sal_Bool bRemovePa
pImpEditEngine->FormatAndUpdate();
}
-Font EditEngine::GetStandardFont( sal_uInt16 nPara )
+Font EditEngine::GetStandardFont( sal_Int32 nPara )
{
DBG_CHKTHIS( EditEngine, 0 );
return GetStandardSvxFont( nPara );
}
-SvxFont EditEngine::GetStandardSvxFont( sal_uInt16 nPara )
+SvxFont EditEngine::GetStandardSvxFont( sal_Int32 nPara )
{
DBG_CHKTHIS( EditEngine, 0 );
ContentNode* pNode = pImpEditEngine->GetEditDoc().GetObject( nPara );
@@ -1882,7 +1882,7 @@ void EditEngine::StripPortions()
pImpEditEngine->Paint( &aTmpDev, aBigRec, Point(), sal_True );
}
-void EditEngine::GetPortions( sal_uInt16 nPara, std::vector<sal_uInt16>& rList )
+void EditEngine::GetPortions( sal_Int32 nPara, std::vector<sal_uInt16>& rList )
{
if ( !pImpEditEngine->IsFormatted() )
pImpEditEngine->FormatFullDoc();
@@ -1953,8 +1953,8 @@ void EditEngine::SetControlWord( sal_uInt32 nWord )
if ( bSpellingChanged && ( nWord & EE_CNTRL_ONLINESPELLING ) )
{
// Create WrongList, start timer...
- sal_uInt16 nNodes = pImpEditEngine->GetEditDoc().Count();
- for ( sal_uInt16 n = 0; n < nNodes; n++ )
+ sal_Int32 nNodes = pImpEditEngine->GetEditDoc().Count();
+ for ( sal_Int32 n = 0; n < nNodes; n++ )
{
ContentNode* pNode = pImpEditEngine->GetEditDoc().GetObject( n );
pNode->CreateWrongList();
@@ -1965,8 +1965,8 @@ void EditEngine::SetControlWord( sal_uInt32 nWord )
else
{
long nY = 0;
- sal_uInt16 nNodes = pImpEditEngine->GetEditDoc().Count();
- for ( sal_uInt16 n = 0; n < nNodes; n++ )
+ sal_Int32 nNodes = pImpEditEngine->GetEditDoc().Count();
+ for ( sal_Int32 n = 0; n < nNodes; n++ )
{
ContentNode* pNode = pImpEditEngine->GetEditDoc().GetObject( n );
const ParaPortion* pPortion = pImpEditEngine->GetParaPortions()[n];
@@ -1994,7 +1994,7 @@ sal_uInt32 EditEngine::GetControlWord() const
return pImpEditEngine->aStatus.GetControlWord();
}
-long EditEngine::GetFirstLineStartX( sal_uInt16 nParagraph )
+long EditEngine::GetFirstLineStartX( sal_Int32 nParagraph )
{
DBG_CHKTHIS( EditEngine, 0 );
@@ -2022,7 +2022,7 @@ Point EditEngine::GetDocPos( const Point& rPaperPos ) const
return aDocPos;
}
-Point EditEngine::GetDocPosTopLeft( sal_uInt16 nParagraph )
+Point EditEngine::GetDocPosTopLeft( sal_Int32 nParagraph )
{
DBG_CHKTHIS( EditEngine, 0 );
const ParaPortion* pPPortion = pImpEditEngine->GetParaPortions().SafeGetObject( nParagraph );
@@ -2058,7 +2058,7 @@ Point EditEngine::GetDocPosTopLeft( sal_uInt16 nParagraph )
return aPoint;
}
-const SvxNumberFormat* EditEngine::GetNumberFormat( sal_uInt16 nPara ) const
+const SvxNumberFormat* EditEngine::GetNumberFormat( sal_Int32 nPara ) const
{
// derived objects may overload this function to give access to
// bullet information (see Outliner)
@@ -2066,7 +2066,7 @@ const SvxNumberFormat* EditEngine::GetNumberFormat( sal_uInt16 nPara ) const
return 0;
}
-sal_Bool EditEngine::IsRightToLeft( sal_uInt16 nPara ) const
+sal_Bool EditEngine::IsRightToLeft( sal_Int32 nPara ) const
{
DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->IsRightToLeft( nPara );
@@ -2131,7 +2131,7 @@ void EditEngine::QuickMarkInvalid( const ESelection& rSel )
DBG_CHKTHIS( EditEngine, 0 );
DBG_ASSERT( rSel.nStartPara < pImpEditEngine->GetEditDoc().Count(), "MarkInvalid: Start out of Range!" );
DBG_ASSERT( rSel.nEndPara < pImpEditEngine->GetEditDoc().Count(), "MarkInvalid: End out of Range!" );
- for ( sal_uInt16 nPara = rSel.nStartPara; nPara <= rSel.nEndPara; nPara++ )
+ for ( sal_Int32 nPara = rSel.nStartPara; nPara <= rSel.nEndPara; nPara++ )
{
ParaPortion* pPortion = pImpEditEngine->GetParaPortions().SafeGetObject( nPara );
if ( pPortion )
@@ -2159,7 +2159,7 @@ void EditEngine::QuickDelete( const ESelection& rSel )
pImpEditEngine->ImpDeleteSelection( aSel );
}
-void EditEngine::QuickMarkToBeRepainted( sal_uInt16 nPara )
+void EditEngine::QuickMarkToBeRepainted( sal_Int32 nPara )
{
DBG_CHKTHIS( EditEngine, 0 );
ParaPortion* pPortion = pImpEditEngine->GetParaPortions().SafeGetObject( nPara );
@@ -2199,7 +2199,7 @@ void EditEngine::QuickFormatDoc( sal_Bool bFull )
pImpEditEngine->UpdateViews( NULL );
}
-void EditEngine::QuickRemoveCharAttribs( sal_uInt16 nPara, sal_uInt16 nWhich )
+void EditEngine::QuickRemoveCharAttribs( sal_Int32 nPara, sal_uInt16 nWhich )
{
DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->RemoveCharAttribs( nPara, nWhich );
@@ -2210,19 +2210,19 @@ void EditEngine::SetStyleSheet(const EditSelection& aSel, SfxStyleSheet* pStyle)
pImpEditEngine->SetStyleSheet(aSel, pStyle);
}
-void EditEngine::SetStyleSheet( sal_uInt16 nPara, SfxStyleSheet* pStyle )
+void EditEngine::SetStyleSheet( sal_Int32 nPara, SfxStyleSheet* pStyle )
{
DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->SetStyleSheet( nPara, pStyle );
}
-const SfxStyleSheet* EditEngine::GetStyleSheet( sal_uInt16 nPara ) const
+const SfxStyleSheet* EditEngine::GetStyleSheet( sal_Int32 nPara ) const
{
DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->GetStyleSheet( nPara );
}
-SfxStyleSheet* EditEngine::GetStyleSheet( sal_uInt16 nPara )
+SfxStyleSheet* EditEngine::GetStyleSheet( sal_Int32 nPara )
{
DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->GetStyleSheet( nPara );
@@ -2368,9 +2368,9 @@ void EditEngine::GetGlobalCharStretching( sal_uInt16& rX, sal_uInt16& rY )
sal_Bool EditEngine::ShouldCreateBigTextObject() const
{
DBG_CHKTHIS( EditEngine, 0 );
- sal_uInt16 nTextPortions = 0;
- sal_uInt16 nParas = pImpEditEngine->GetEditDoc().Count();
- for ( sal_uInt16 nPara = 0; nPara < nParas; nPara++ )
+ sal_uInt32 nTextPortions = 0;
+ sal_Int32 nParas = pImpEditEngine->GetEditDoc().Count();
+ for ( sal_Int32 nPara = 0; nPara < nParas; nPara++ )
{
ParaPortion* pParaPortion = pImpEditEngine->GetParaPortions()[nPara];
nTextPortions = nTextPortions + pParaPortion->GetTextPortions().Count();
@@ -2378,7 +2378,7 @@ sal_Bool EditEngine::ShouldCreateBigTextObject() const
return ( nTextPortions >= pImpEditEngine->GetBigTextObjectStart() ) ? sal_True : sal_False;
}
-sal_uInt16 EditEngine::GetFieldCount( sal_uInt16 nPara ) const
+sal_uInt16 EditEngine::GetFieldCount( sal_Int32 nPara ) const
{
sal_uInt16 nFields = 0;
ContentNode* pNode = pImpEditEngine->GetEditDoc().GetObject( nPara );
@@ -2396,7 +2396,7 @@ sal_uInt16 EditEngine::GetFieldCount( sal_uInt16 nPara ) const
return nFields;
}
-EFieldInfo EditEngine::GetFieldInfo( sal_uInt16 nPara, sal_uInt16 nField ) const
+EFieldInfo EditEngine::GetFieldInfo( sal_Int32 nPara, sal_uInt16 nField ) const
{
ContentNode* pNode = pImpEditEngine->GetEditDoc().GetObject( nPara );
if ( pNode )
@@ -2446,8 +2446,8 @@ void EditEngine::RemoveFields( sal_Bool bKeepFieldText, TypeId aType )
if ( bKeepFieldText )
pImpEditEngine->UpdateFields();
- sal_uInt16 nParas = pImpEditEngine->GetEditDoc().Count();
- for ( sal_uInt16 nPara = 0; nPara < nParas; nPara++ )
+ sal_Int32 nParas = pImpEditEngine->GetEditDoc().Count();
+ for ( sal_Int32 nPara = 0; nPara < nParas; nPara++ )
{
ContentNode* pNode = pImpEditEngine->GetEditDoc().GetObject( nPara );
const CharAttribList::AttribsType& rAttrs = pNode->GetCharAttribs().GetAttribs();
@@ -2472,8 +2472,8 @@ void EditEngine::RemoveFields( sal_Bool bKeepFieldText, TypeId aType )
sal_Bool EditEngine::HasOnlineSpellErrors() const
{
DBG_CHKTHIS( EditEngine, 0 );
- sal_uInt16 nNodes = pImpEditEngine->GetEditDoc().Count();
- for ( sal_uInt16 n = 0; n < nNodes; n++ )
+ sal_Int32 nNodes = pImpEditEngine->GetEditDoc().Count();
+ for ( sal_Int32 n = 0; n < nNodes; n++ )
{
ContentNode* pNode = pImpEditEngine->GetEditDoc().GetObject( n );
if ( pNode->GetWrongList() && !pNode->GetWrongList()->empty() )
@@ -2495,7 +2495,7 @@ void EditEngine::CompleteOnlineSpelling()
}
}
-sal_uInt16 EditEngine::FindParagraph( long nDocPosY )
+sal_Int32 EditEngine::FindParagraph( long nDocPosY )
{
return pImpEditEngine->GetParaPortions().FindParagraph( nDocPosY );
}
@@ -2529,7 +2529,7 @@ Rectangle EditEngine::GetCharacterBounds( const EPosition& rPos ) const
return aBounds;
}
-ParagraphInfos EditEngine::GetParagraphInfos( sal_uInt16 nPara )
+ParagraphInfos EditEngine::GetParagraphInfos( sal_Int32 nPara )
{
DBG_CHKTHIS( EditEngine, 0 );
@@ -2571,7 +2571,7 @@ ParagraphInfos EditEngine::GetParagraphInfos( sal_uInt16 nPara )
// ====================== Virtual Methods ========================
// =====================================================================
void EditEngine::DrawingText( const Point&, const XubString&, sal_uInt16, sal_uInt16,
- const sal_Int32*, const SvxFont&, sal_uInt16, sal_uInt16, sal_uInt8,
+ const sal_Int32*, const SvxFont&, sal_Int32, sal_uInt16, sal_uInt8,
const EEngineData::WrongSpellVector*, const SvxFieldData*, bool, bool, bool,
const ::com::sun::star::lang::Locale*, const Color&, const Color&)
@@ -2581,7 +2581,7 @@ void EditEngine::DrawingText( const Point&, const XubString&, sal_uInt16, sal_uI
void EditEngine::DrawingTab( const Point& /*rStartPos*/, long /*nWidth*/,
const String& /*rChar*/, const SvxFont& /*rFont*/,
- sal_uInt16 /*nPara*/, xub_StrLen /*nIndex*/,
+ sal_Int32 /*nPara*/, xub_StrLen /*nIndex*/,
sal_uInt8 /*nRightToLeft*/, bool /*bEndOfLine*/,
bool /*bEndOfParagraph*/, const Color& /*rOverlineColor*/,
const Color& /*rTextLineColor*/)
@@ -2589,12 +2589,12 @@ void EditEngine::DrawingTab( const Point& /*rStartPos*/, long /*nWidth*/,
DBG_CHKTHIS( EditEngine, 0 );
}
-void EditEngine::PaintingFirstLine( sal_uInt16, const Point&, long, const Point&, short, OutputDevice* )
+void EditEngine::PaintingFirstLine( sal_Int32, const Point&, long, const Point&, short, OutputDevice* )
{
DBG_CHKTHIS( EditEngine, 0 );
}
-void EditEngine::ParagraphInserted( sal_uInt16 nPara )
+void EditEngine::ParagraphInserted( sal_Int32 nPara )
{
DBG_CHKTHIS( EditEngine, 0 );
@@ -2607,7 +2607,7 @@ void EditEngine::ParagraphInserted( sal_uInt16 nPara )
}
}
-void EditEngine::ParagraphDeleted( sal_uInt16 nPara )
+void EditEngine::ParagraphDeleted( sal_Int32 nPara )
{
DBG_CHKTHIS( EditEngine, 0 );
@@ -2619,19 +2619,19 @@ void EditEngine::ParagraphDeleted( sal_uInt16 nPara )
pImpEditEngine->CallNotify( aNotify );
}
}
-void EditEngine::ParagraphConnected( sal_uInt16 /*nLeftParagraph*/, sal_uInt16 /*nRightParagraph*/ )
+void EditEngine::ParagraphConnected( sal_Int32 /*nLeftParagraph*/, sal_Int32 /*nRightParagraph*/ )
{
DBG_CHKTHIS( EditEngine, 0 );
}
-sal_Bool EditEngine::FormattingParagraph( sal_uInt16 )
+sal_Bool EditEngine::FormattingParagraph( sal_Int32 )
{
// return sal_True, if the Attribute was changed ...
DBG_CHKTHIS( EditEngine, 0 );
return sal_False;
}
-void EditEngine::ParaAttribsChanged( sal_uInt16 /* nParagraph */ )
+void EditEngine::ParaAttribsChanged( sal_Int32 /* nParagraph */ )
{
DBG_CHKTHIS( EditEngine, 0 );
}
@@ -2641,7 +2641,7 @@ void EditEngine::StyleSheetChanged( SfxStyleSheet* /* pStyle */ )
DBG_CHKTHIS( EditEngine, 0 );
}
-void EditEngine::ParagraphHeightChanged( sal_uInt16 nPara )
+void EditEngine::ParagraphHeightChanged( sal_Int32 nPara )
{
DBG_CHKTHIS( EditEngine, 0 );
@@ -2707,23 +2707,23 @@ XubString EditEngine::GetUndoComment( sal_uInt16 nId ) const
return aComment;
}
-Rectangle EditEngine::GetBulletArea( sal_uInt16 )
+Rectangle EditEngine::GetBulletArea( sal_Int32 )
{
return Rectangle( Point(), Point() );
}
-XubString EditEngine::CalcFieldValue( const SvxFieldItem&, sal_uInt16, sal_uInt16, Color*&, Color*& )
+XubString EditEngine::CalcFieldValue( const SvxFieldItem&, sal_Int32, sal_uInt16, Color*&, Color*& )
{
DBG_CHKTHIS( EditEngine, 0 );
return rtl::OUString(' ');
}
-void EditEngine::FieldClicked( const SvxFieldItem&, sal_uInt16, sal_uInt16 )
+void EditEngine::FieldClicked( const SvxFieldItem&, sal_Int32, sal_uInt16 )
{
DBG_CHKTHIS( EditEngine, 0 );
}
-void EditEngine::FieldSelected( const SvxFieldItem&, sal_uInt16, sal_uInt16 )
+void EditEngine::FieldSelected( const SvxFieldItem&, sal_Int32, sal_uInt16 )
{
DBG_CHKTHIS( EditEngine, 0 );
}
@@ -2936,7 +2936,7 @@ EFieldInfo::EFieldInfo()
}
-EFieldInfo::EFieldInfo( const SvxFieldItem& rFieldItem, sal_uInt16 nPara, sal_uInt16 nPos ) : aPosition( nPara, nPos )
+EFieldInfo::EFieldInfo( const SvxFieldItem& rFieldItem, sal_Int32 nPara, sal_uInt16 nPos ) : aPosition( nPara, nPos )
{
pFieldItem = new SvxFieldItem( rFieldItem );
}
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index 669f003fa607..20561cd7303d 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -194,30 +194,30 @@ EditTextObject::~EditTextObject()
DBG_DTOR( EE_EditTextObject, 0 );
}
-size_t EditTextObject::GetParagraphCount() const
+sal_Int32 EditTextObject::GetParagraphCount() const
{
OSL_FAIL( "Virtual method direct from EditTextObject!" );
return 0;
}
-String EditTextObject::GetText(size_t /* nParagraph */) const
+String EditTextObject::GetText(sal_Int32 /* nParagraph */) const
{
OSL_FAIL( "Virtual method direct from EditTextObject!" );
return String();
}
-void EditTextObject::Insert(const EditTextObject& /* rObj */, size_t /* nPara */)
+void EditTextObject::Insert(const EditTextObject& /* rObj */, sal_Int32 /* nPara */)
{
OSL_FAIL( "Virtual method direct from EditTextObject!" );
}
-EditTextObject* EditTextObject::CreateTextObject(size_t /*nPara*/, size_t /*nParas*/) const
+EditTextObject* EditTextObject::CreateTextObject(sal_Int32 /*nPara*/, sal_Int32 /*nParas*/) const
{
OSL_FAIL( "Virtual method direct from EditTextObject!" );
return 0;
}
-void EditTextObject::RemoveParagraph(size_t /*nPara*/)
+void EditTextObject::RemoveParagraph(sal_Int32 /*nPara*/)
{
OSL_FAIL( "Virtual method direct from EditTextObject!" );
}
@@ -245,7 +245,7 @@ sal_Bool EditTextObject::HasCharAttribs( sal_uInt16 ) const
return false;
}
-void EditTextObject::GetCharAttribs( sal_uInt16 /*nPara*/, std::vector<EECharAttrib>& /*rLst*/ ) const
+void EditTextObject::GetCharAttribs( sal_Int32 /*nPara*/, std::vector<EECharAttrib>& /*rLst*/ ) const
{
OSL_FAIL( "Virtual method direct from EditTextObject!" );
}
@@ -273,13 +273,13 @@ sal_Bool EditTextObject::HasField( TypeId /*aType*/ ) const
return false;
}
-SfxItemSet EditTextObject::GetParaAttribs(size_t /*nPara*/) const
+SfxItemSet EditTextObject::GetParaAttribs(sal_Int32 /*nPara*/) const
{
OSL_FAIL( "Virtual method direct from EditTextObject!" );
return SfxItemSet( *(SfxItemPool*)NULL );
}
-void EditTextObject::SetParaAttribs(size_t /*nPara*/, const SfxItemSet& /*rAttribs*/)
+void EditTextObject::SetParaAttribs(sal_Int32 /*nPara*/, const SfxItemSet& /*rAttribs*/)
{
OSL_FAIL( "Virtual method direct from EditTextObject!" );
}
@@ -302,12 +302,12 @@ sal_Bool EditTextObject::HasStyleSheet( const XubString& /*rName*/, SfxStyleFami
return false;
}
-void EditTextObject::GetStyleSheet(size_t /*nPara*/, String& /*rName*/, SfxStyleFamily& /*eFamily*/) const
+void EditTextObject::GetStyleSheet(sal_Int32 /*nPara*/, String& /*rName*/, SfxStyleFamily& /*eFamily*/) const
{
OSL_FAIL( "Virtual method direct from EditTextObject!" );
}
-void EditTextObject::SetStyleSheet(size_t /*nPara*/, const String& /*rName*/, const SfxStyleFamily& /*eFamily*/)
+void EditTextObject::SetStyleSheet(sal_Int32 /*nPara*/, const String& /*rName*/, const SfxStyleFamily& /*eFamily*/)
{
OSL_FAIL( "Virtual method direct from EditTextObject!" );
}
@@ -676,27 +676,33 @@ ContentInfo* BinTextObject::CreateAndInsertContent()
return &aContents.back();
}
-size_t BinTextObject::GetParagraphCount() const
+sal_Int32 BinTextObject::GetParagraphCount() const
{
- return aContents.size();
+ size_t nSize = aContents.size();
+ if (nSize > EE_PARA_MAX_COUNT)
+ {
+ SAL_WARN( "editeng", "EditTextObjectImpl::GetParagraphCount - overflow " << nSize);
+ return EE_PARA_MAX_COUNT;
+ }
+ return static_cast<sal_Int32>(nSize);
}
-String BinTextObject::GetText(size_t nPara) const
+String BinTextObject::GetText(sal_Int32 nPara) const
{
- if (nPara >= aContents.size())
+ if (nPara < 0 || static_cast<size_t>(nPara) >= aContents.size())
return String();
return aContents[nPara].GetText();
}
-void BinTextObject::Insert(const EditTextObject& rObj, size_t nDestPara)
+void BinTextObject::Insert(const EditTextObject& rObj, sal_Int32 nDestPara)
{
DBG_ASSERT( rObj.Which() == EE_FORMAT_BIN, "UTO: unknown Textobjekt" );
const BinTextObject& rBinObj = (const BinTextObject&)rObj;
- if (nDestPara > aContents.size())
- nDestPara = aContents.size();
+ if (static_cast<size_t>(nDestPara) > aContents.size())
+ nDestPara = static_cast<sal_Int32>(aContents.size());
const ContentInfosType& rCIs = rBinObj.aContents;
for (size_t i = 0, n = rCIs.size(); i < n; ++i)
@@ -710,9 +716,9 @@ void BinTextObject::Insert(const EditTextObject& rObj, size_t nDestPara)
ClearPortionInfo();
}
-EditTextObject* BinTextObject::CreateTextObject(size_t nPara, size_t nParas) const
+EditTextObject* BinTextObject::CreateTextObject(sal_Int32 nPara, sal_Int32 nParas) const
{
- if (nPara >= aContents.size() || !nParas)
+ if (nPara < 0 || static_cast<size_t>(nPara) >= aContents.size() || nParas <= 0)
return NULL;
// Only split the Pool, when a the Pool is set externally.
@@ -734,10 +740,10 @@ EditTextObject* BinTextObject::CreateTextObject(size_t nPara, size_t nParas) con
return pObj;
}
-void BinTextObject::RemoveParagraph(size_t nPara)
+void BinTextObject::RemoveParagraph(sal_Int32 nPara)
{
- DBG_ASSERT( nPara < aContents.size(), "BinTextObject::GetText: Paragraph does not exist!" );
- if (nPara >= aContents.size())
+ DBG_ASSERT( nPara >= 0 && static_cast<size_t>(nPara) < aContents.size(), "BinTextObject::GetText: Paragraph does not exist!" );
+ if (nPara < 0 || static_cast<size_t>(nPara) >= aContents.size())
return;
ContentInfosType::iterator it = aContents.begin();
@@ -791,8 +797,11 @@ sal_Bool BinTextObject::HasCharAttribs( sal_uInt16 _nWhich ) const
return false;
}
-void BinTextObject::GetCharAttribs( sal_uInt16 nPara, std::vector<EECharAttrib>& rLst ) const
+void BinTextObject::GetCharAttribs( sal_Int32 nPara, std::vector<EECharAttrib>& rLst ) const
{
+ if (nPara < 0 || static_cast<size_t>(nPara) >= aContents.size())
+ return;
+
rLst.clear();
const ContentInfo& rC = aContents[nPara];
for (size_t nAttr = 0; nAttr < rC.aAttribs.size(); ++nAttr)
@@ -878,14 +887,17 @@ sal_Bool BinTextObject::HasField( TypeId aType ) const
return false;
}
-SfxItemSet BinTextObject::GetParaAttribs(size_t nPara) const
+SfxItemSet BinTextObject::GetParaAttribs(sal_Int32 nPara) const
{
const ContentInfo& rC = aContents[nPara];
return rC.GetParaAttribs();
}
-void BinTextObject::SetParaAttribs(size_t nPara, const SfxItemSet& rAttribs)
+void BinTextObject::SetParaAttribs(sal_Int32 nPara, const SfxItemSet& rAttribs)
{
+ if (nPara < 0 || static_cast<size_t>(nPara) >= aContents.size())
+ return;
+
ContentInfo& rC = aContents[nPara];
rC.GetParaAttribs().Set(rAttribs);
ClearPortionInfo();
@@ -895,7 +907,7 @@ sal_Bool BinTextObject::RemoveCharAttribs( sal_uInt16 _nWhich )
{
sal_Bool bChanged = false;
- for ( sal_uInt16 nPara = aContents.size(); nPara; )
+ for ( size_t nPara = aContents.size(); nPara; )
{
ContentInfo& rC = aContents[--nPara];
@@ -959,9 +971,9 @@ sal_Bool BinTextObject::HasStyleSheet( const XubString& rName, SfxStyleFamily eF
return false;
}
-void BinTextObject::GetStyleSheet(size_t nPara, String& rName, SfxStyleFamily& rFamily) const
+void BinTextObject::GetStyleSheet(sal_Int32 nPara, String& rName, SfxStyleFamily& rFamily) const
{
- if (nPara >= aContents.size())
+ if (nPara < 0 || static_cast<size_t>(nPara) >= aContents.size())
return;
const ContentInfo& rC = aContents[nPara];
@@ -969,9 +981,9 @@ void BinTextObject::GetStyleSheet(size_t nPara, String& rName, SfxStyleFamily& r
rFamily = rC.GetFamily();
}
-void BinTextObject::SetStyleSheet(size_t nPara, const String& rName, const SfxStyleFamily& rFamily)
+void BinTextObject::SetStyleSheet(sal_Int32 nPara, const String& rName, const SfxStyleFamily& rFamily)
{
- if (nPara >= aContents.size())
+ if (nPara < 0 || static_cast<size_t>(nPara) >= aContents.size())
return;
ContentInfo& rC = aContents[nPara];
@@ -1060,13 +1072,16 @@ void BinTextObject::StoreData( SvStream& rOStream ) const
// The number of paragraphs ...
size_t nParagraphs = aContents.size();
- rOStream << static_cast<sal_uInt16>(nParagraphs);
+ // FIXME: this truncates, check usage of stream and if it can be changed,
+ // i.e. is not persistent, adapt this and reader.
+ sal_uInt16 nParagraphs_Stream = static_cast<sal_uInt16>(nParagraphs);
+ rOStream << nParagraphs_Stream;
sal_Unicode nUniChar = CH_FEATURE;
char cFeatureConverted = rtl::OString(&nUniChar, 1, eEncoding).toChar();
// The individual paragraphs ...
- for (size_t nPara = 0; nPara < nParagraphs; ++nPara)
+ for (size_t nPara = 0; nPara < nParagraphs_Stream; ++nPara)
{
const ContentInfo& rC = aContents[nPara];
@@ -1191,7 +1206,7 @@ void BinTextObject::StoreData( SvStream& rOStream ) const
rOStream << static_cast<sal_Bool>(bStoreUnicodeStrings);
if ( bStoreUnicodeStrings )
{
- for ( sal_uInt16 nPara = 0; nPara < nParagraphs; nPara++ )
+ for ( size_t nPara = 0; nPara < nParagraphs_Stream; nPara++ )
{
const ContentInfo& rC = aContents[nPara];
sal_uInt16 nL = rC.GetText().Len();
diff --git a/editeng/source/editeng/editobj2.hxx b/editeng/source/editeng/editobj2.hxx
index 4b89ade1a510..fb58f107272f 100644
--- a/editeng/source/editeng/editobj2.hxx
+++ b/editeng/source/editeng/editobj2.hxx
@@ -211,11 +211,11 @@ public:
void SetPortionInfo( XParaPortionList* pP )
{ pPortionInfo = pP; }
- virtual size_t GetParagraphCount() const;
- virtual String GetText(size_t nParagraph) const;
- virtual void Insert(const EditTextObject& rObj, size_t nPara);
- virtual EditTextObject* CreateTextObject(size_t nPara, size_t nParas = 1) const;
- virtual void RemoveParagraph(size_t nPara);
+ virtual sal_Int32 GetParagraphCount() const;
+ virtual String GetText(sal_Int32 nParagraph) const;
+ virtual void Insert(const EditTextObject& rObj, sal_Int32 nPara);
+ virtual EditTextObject* CreateTextObject(sal_Int32 nPara, sal_Int32 nParas = 1) const;
+ virtual void RemoveParagraph(sal_Int32 nPara);
virtual sal_Bool HasPortionInfo() const;
virtual void ClearPortionInfo();
@@ -223,7 +223,7 @@ public:
virtual sal_Bool HasOnlineSpellErrors() const;
virtual sal_Bool HasCharAttribs( sal_uInt16 nWhich = 0 ) const;
- virtual void GetCharAttribs( sal_uInt16 nPara, std::vector<EECharAttrib>& rLst ) const;
+ virtual void GetCharAttribs( sal_Int32 nPara, std::vector<EECharAttrib>& rLst ) const;
virtual sal_Bool RemoveCharAttribs( sal_uInt16 nWhich = 0 );
virtual sal_Bool RemoveParaAttribs( sal_uInt16 nWhich = 0 );
@@ -234,12 +234,12 @@ public:
virtual const SvxFieldItem* GetField() const;
virtual sal_Bool HasField( TypeId Type = NULL ) const;
- virtual SfxItemSet GetParaAttribs(size_t nPara) const;
- virtual void SetParaAttribs(size_t nPara, const SfxItemSet& rAttribs);
+ virtual SfxItemSet GetParaAttribs(sal_Int32 nPara) const;
+ virtual void SetParaAttribs(sal_Int32 nPara, const SfxItemSet& rAttribs);
virtual sal_Bool HasStyleSheet( const XubString& rName, SfxStyleFamily eFamily ) const;
- virtual void GetStyleSheet(size_t nPara, String& rName, SfxStyleFamily& eFamily) const;
- virtual void SetStyleSheet(size_t nPara, const String& rName, const SfxStyleFamily& eFamily);
+ virtual void GetStyleSheet(sal_Int32 nPara, String& rName, SfxStyleFamily& eFamily) const;
+ virtual void SetStyleSheet(sal_Int32 nPara, const String& rName, const SfxStyleFamily& eFamily);
virtual sal_Bool ChangeStyleSheets( const XubString& rOldName, SfxStyleFamily eOldFamily,
const String& rNewName, SfxStyleFamily eNewFamily );
virtual void ChangeStyleSheetName( SfxStyleFamily eFamily, const XubString& rOldName, const XubString& rNewName );
diff --git a/editeng/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx
index 22e00661d625..688b316ff074 100644
--- a/editeng/source/editeng/editundo.cxx
+++ b/editeng/source/editeng/editundo.cxx
@@ -148,7 +148,7 @@ rtl::OUString EditUndo::GetComment() const
}
EditUndoDelContent::EditUndoDelContent(
- EditEngine* pEE, ContentNode* pNode, size_t nPortion) :
+ EditEngine* pEE, ContentNode* pNode, sal_Int32 nPortion) :
EditUndo(EDITUNDO_DELCONTENT, pEE),
bDelObject(true),
nNode(nPortion),
@@ -203,7 +203,7 @@ void EditUndoDelContent::Redo()
}
EditUndoConnectParas::EditUndoConnectParas(
- EditEngine* pEE, sal_uInt16 nN, sal_uInt16 nSP,
+ EditEngine* pEE, sal_Int32 nN, sal_uInt16 nSP,
const SfxItemSet& rLeftParaAttribs, const SfxItemSet& rRightParaAttribs,
const SfxStyleSheet* pLeftStyle, const SfxStyleSheet* pRightStyle, bool bBkwrd) :
EditUndo(EDITUNDO_CONNECTPARAS, pEE),
@@ -251,7 +251,7 @@ void EditUndoConnectParas::Undo()
if (GetEditEngine()->GetStyleSheetPool())
{
if ( aLeftStyleName.Len() )
- GetEditEngine()->SetStyleSheet( (sal_uInt16)nNode, (SfxStyleSheet*)GetEditEngine()->GetStyleSheetPool()->Find( aLeftStyleName, eLeftStyleFamily ) );
+ GetEditEngine()->SetStyleSheet( nNode, (SfxStyleSheet*)GetEditEngine()->GetStyleSheetPool()->Find( aLeftStyleName, eLeftStyleFamily ) );
if ( aRightStyleName.Len() )
GetEditEngine()->SetStyleSheet( nNode+1, (SfxStyleSheet*)GetEditEngine()->GetStyleSheetPool()->Find( aRightStyleName, eRightStyleFamily ) );
}
@@ -268,7 +268,7 @@ void EditUndoConnectParas::Redo()
}
EditUndoSplitPara::EditUndoSplitPara(
- EditEngine* pEE, sal_uInt16 nN, sal_uInt16 nSP) :
+ EditEngine* pEE, sal_Int32 nN, sal_uInt16 nSP) :
EditUndo(EDITUNDO_SPLITPARA, pEE),
nNode(nN), nSepPos(nSP) {}
@@ -394,7 +394,7 @@ void EditUndoInsertFeature::Redo()
}
EditUndoMoveParagraphs::EditUndoMoveParagraphs(
- EditEngine* pEE, const Range& rParas, sal_uInt16 n) :
+ EditEngine* pEE, const Range& rParas, sal_Int32 n) :
EditUndo(EDITUNDO_MOVEPARAGRAPHS, pEE), nParagraphs(rParas), nDest(n) {}
EditUndoMoveParagraphs::~EditUndoMoveParagraphs() {}
@@ -418,7 +418,7 @@ void EditUndoMoveParagraphs::Undo()
else
nTmpDest += aTmpRange.Len();
- EditSelection aNewSel = GetEditEngine()->MoveParagraphs(aTmpRange, (sal_uInt16)nTmpDest, 0);
+ EditSelection aNewSel = GetEditEngine()->MoveParagraphs(aTmpRange, nTmpDest, 0);
GetEditEngine()->GetActiveView()->GetImpEditView()->SetEditSelection( aNewSel );
}
@@ -430,7 +430,7 @@ void EditUndoMoveParagraphs::Redo()
}
EditUndoSetStyleSheet::EditUndoSetStyleSheet(
- EditEngine* pEE, sal_uInt16 nP, const String& rPrevName, SfxStyleFamily ePrevFam,
+ EditEngine* pEE, sal_Int32 nP, const String& rPrevName, SfxStyleFamily ePrevFam,
const String& rNewName, SfxStyleFamily eNewFam, const SfxItemSet& rPrevParaAttribs) :
EditUndo(EDITUNDO_STYLESHEET, pEE),
aPrevName(rPrevName),
@@ -462,7 +462,7 @@ void EditUndoSetStyleSheet::Redo()
}
EditUndoSetParaAttribs::EditUndoSetParaAttribs(
- EditEngine* pEE, sal_uInt16 nP, const SfxItemSet& rPrevItems, const SfxItemSet& rNewItems) :
+ EditEngine* pEE, sal_Int32 nP, const SfxItemSet& rPrevItems, const SfxItemSet& rNewItems) :
EditUndo(EDITUNDO_PARAATTRIBS, pEE),
nPara(nP),
aPrevItems(rPrevItems),
@@ -524,7 +524,7 @@ void EditUndoSetAttribs::Undo()
DBG_ASSERT( GetEditEngine()->GetActiveView(), "Undo/Redo: No Active View!" );
EditEngine* pEE = GetEditEngine();
bool bFields = false;
- for ( sal_uInt16 nPara = aESel.nStartPara; nPara <= aESel.nEndPara; nPara++ )
+ for ( sal_Int32 nPara = aESel.nStartPara; nPara <= aESel.nEndPara; nPara++ )
{
const ContentAttribsInfo& rInf = aPrevAttribs[nPara-aESel.nStartPara];
diff --git a/editeng/source/editeng/editundo.hxx b/editeng/source/editeng/editundo.hxx
index dbd0e4e3e671..b5d3658bbe5e 100644
--- a/editeng/source/editeng/editundo.hxx
+++ b/editeng/source/editeng/editundo.hxx
@@ -34,12 +34,12 @@ class EditUndoDelContent : public EditUndo
{
private:
bool bDelObject;
- size_t nNode;
+ sal_Int32 nNode;
ContentNode* pContentNode; // Points to the valid,
// undestroyed object!
public:
- EditUndoDelContent(EditEngine* pEE, ContentNode* pNode, size_t nPortion);
+ EditUndoDelContent(EditEngine* pEE, ContentNode* pNode, sal_Int32 nPortion);
virtual ~EditUndoDelContent();
virtual void Undo();
@@ -52,8 +52,8 @@ public:
class EditUndoConnectParas : public EditUndo
{
private:
- sal_uInt16 nNode;
- sal_uInt16 nSepPos;
+ sal_Int32 nNode;
+ sal_uInt16 nSepPos;
SfxItemSet aLeftParaAttribs;
SfxItemSet aRightParaAttribs;
@@ -66,7 +66,7 @@ private:
bool bBackward;
public:
- EditUndoConnectParas(EditEngine* pEE, sal_uInt16 nNode, sal_uInt16 nSepPos,
+ EditUndoConnectParas(EditEngine* pEE, sal_Int32 nNode, sal_uInt16 nSepPos,
const SfxItemSet& rLeftParaAttribs, const SfxItemSet& rRightParaAttribs,
const SfxStyleSheet* pLeftStyle, const SfxStyleSheet* pRightStyle, bool bBackward);
virtual ~EditUndoConnectParas();
@@ -81,11 +81,11 @@ public:
class EditUndoSplitPara : public EditUndo
{
private:
- sal_uInt16 nNode;
+ sal_Int32 nNode;
sal_uInt16 nSepPos;
public:
- EditUndoSplitPara(EditEngine* pEE, sal_uInt16 nNode, sal_uInt16 nSepPos);
+ EditUndoSplitPara(EditEngine* pEE, sal_Int32 nNode, sal_uInt16 nSepPos);
~EditUndoSplitPara();
virtual void Undo();
@@ -156,10 +156,10 @@ class EditUndoMoveParagraphs: public EditUndo
{
private:
Range nParagraphs;
- sal_uInt16 nDest;
+ sal_Int32 nDest;
public:
- EditUndoMoveParagraphs(EditEngine* pEE, const Range& rParas, sal_uInt16 nDest);
+ EditUndoMoveParagraphs(EditEngine* pEE, const Range& rParas, sal_Int32 nDest);
virtual ~EditUndoMoveParagraphs();
virtual void Undo();
@@ -172,7 +172,7 @@ public:
class EditUndoSetStyleSheet: public EditUndo
{
private:
- sal_uInt16 nPara;
+ sal_Int32 nPara;
String aPrevName;
String aNewName;
SfxStyleFamily ePrevFamily;
@@ -180,7 +180,7 @@ private:
SfxItemSet aPrevParaAttribs;
public:
- EditUndoSetStyleSheet(EditEngine* pEE, sal_uInt16 nPara,
+ EditUndoSetStyleSheet(EditEngine* pEE, sal_Int32 nPara,
const String& rPrevName, SfxStyleFamily ePrevFamily,
const String& rNewName, SfxStyleFamily eNewFamily,
const SfxItemSet& rPrevParaAttribs);
@@ -196,12 +196,12 @@ public:
class EditUndoSetParaAttribs: public EditUndo
{
private:
- sal_uInt16 nPara;
+ sal_Int32 nPara;
SfxItemSet aPrevItems;
SfxItemSet aNewItems;
public:
- EditUndoSetParaAttribs(EditEngine* pEE, sal_uInt16 nPara, const SfxItemSet& rPrevItems, const SfxItemSet& rNewItems);
+ EditUndoSetParaAttribs(EditEngine* pEE, sal_Int32 nPara, const SfxItemSet& rPrevItems, const SfxItemSet& rNewItems);
virtual ~EditUndoSetParaAttribs();
virtual void Undo();
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index 980a6a0e8d0a..e0a338c28eeb 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -510,7 +510,7 @@ void EditView::RemoveAttribs( sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich )
PIMPE->FormatAndUpdate( this );
}
-void EditView::RemoveCharAttribs( sal_uInt16 nPara, sal_uInt16 nWhich )
+void EditView::RemoveCharAttribs( sal_Int32 nPara, sal_uInt16 nWhich )
{
DBG_CHKTHIS( EditView, 0 );
DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
@@ -600,7 +600,7 @@ void EditView::PasteSpecial()
pImpEditView->Paste(aClipBoard, sal_True );
}
-Point EditView::GetWindowPosTopLeft( sal_uInt16 nParagraph )
+Point EditView::GetWindowPosTopLeft( sal_Int32 nParagraph )
{
DBG_CHKTHIS( EditView, 0 );
DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
@@ -621,7 +621,7 @@ XubString EditView::GetSelected()
return PIMPEE->GetSelected( pImpEditView->GetEditSelection() );
}
-void EditView::MoveParagraphs( Range aParagraphs, sal_uInt16 nNewPos )
+void EditView::MoveParagraphs( Range aParagraphs, sal_Int32 nNewPos )
{
DBG_CHKTHIS( EditView, 0 );
DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
@@ -641,8 +641,7 @@ void EditView::MoveParagraphs( long nDiff )
if ( nDiff > 0 )
nDest++;
DBG_ASSERT( ( nDest >= 0 ) && ( nDest <= pImpEditView->pEditEngine->GetParagraphCount() ), "MoveParagraphs - wrong Parameters!" );
- MoveParagraphs( aRange,
- sal::static_int_cast< sal_uInt16 >( nDest ) );
+ MoveParagraphs( aRange, sal::static_int_cast< sal_Int32 >( nDest ) );
}
void EditView::SetBackgroundColor( const Color& rColor )
@@ -731,11 +730,11 @@ SfxStyleSheet* EditView::GetStyleSheet()
EditSelection aSel( pImpEditView->GetEditSelection() );
aSel.Adjust( PIMPE->GetEditDoc() );
- sal_uInt16 nStartPara = PIMPE->GetEditDoc().GetPos( aSel.Min().GetNode() );
- sal_uInt16 nEndPara = PIMPE->GetEditDoc().GetPos( aSel.Max().GetNode() );
+ sal_Int32 nStartPara = PIMPE->GetEditDoc().GetPos( aSel.Min().GetNode() );
+ sal_Int32 nEndPara = PIMPE->GetEditDoc().GetPos( aSel.Max().GetNode() );
SfxStyleSheet* pStyle = NULL;
- for ( sal_uInt16 n = nStartPara; n <= nEndPara; n++ )
+ for ( sal_Int32 n = nStartPara; n <= nEndPara; n++ )
{
SfxStyleSheet* pTmpStyle = PIMPE->GetStyleSheet( n );
if ( ( n != nStartPara ) && ( pStyle != pTmpStyle ) )
@@ -1084,7 +1083,7 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack )
{
ESelection aSel = GetSelection();
aSel.nStartPos = 0;
- aSel.nEndPos = 0xFFFF;
+ aSel.nEndPos = EE_TEXTPOS_ALL;
SetSelection( aSel );
}
SetAttribs( aAttrs );
@@ -1198,18 +1197,19 @@ void EditView::InsertField( const SvxFieldItem& rFld )
const SvxFieldItem* EditView::GetFieldUnderMousePointer() const
{
DBG_CHKTHIS( EditView, 0 );
- sal_uInt16 nPara, nPos;
+ sal_Int32 nPara;
+ sal_uInt16 nPos;
return GetFieldUnderMousePointer( nPara, nPos );
}
-const SvxFieldItem* EditView::GetField( const Point& rPos, sal_uInt16* pPara, sal_uInt16* pPos ) const
+const SvxFieldItem* EditView::GetField( const Point& rPos, sal_Int32* pPara, sal_uInt16* pPos ) const
{
DBG_CHKTHIS( EditView, 0 );
DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
return pImpEditView->GetField( rPos, pPara, pPos );
}
-const SvxFieldItem* EditView::GetFieldUnderMousePointer( sal_uInt16& nPara, sal_uInt16& nPos ) const
+const SvxFieldItem* EditView::GetFieldUnderMousePointer( sal_Int32& nPara, sal_uInt16& nPos ) const
{
DBG_CHKTHIS( EditView, 0 );
DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
@@ -1290,7 +1290,7 @@ void EditView::ChangeFontSize( bool bGrow, const FontList* pFontList )
if( aSel.HasRange() )
{
- for( sal_uInt16 nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
+ for( sal_Int32 nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
{
std::vector<sal_uInt16> aPortions;
rEditEngine.GetPortions( nPara, aPortions );
@@ -1299,7 +1299,7 @@ void EditView::ChangeFontSize( bool bGrow, const FontList* pFontList )
aPortions.push_back( rEditEngine.GetTextLen(nPara) );
const sal_uInt16 nBeginPos = (nPara == aSel.nStartPara) ? aSel.nStartPos : 0;
- const sal_uInt16 nEndPos = (nPara == aSel.nEndPara) ? aSel.nEndPos : 0xffff;
+ const sal_uInt16 nEndPos = (nPara == aSel.nEndPara) ? aSel.nEndPos : EE_TEXTPOS_ALL;
for ( size_t nPos = 0; nPos < aPortions.size(); ++nPos )
{
diff --git a/editeng/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx
index 4e44fe7772eb..8e8e977d2e22 100644
--- a/editeng/source/editeng/edtspell.cxx
+++ b/editeng/source/editeng/edtspell.cxx
@@ -712,7 +712,7 @@ const String* EdtAutoCorrDoc::GetPrevPara( sal_Bool )
bAllowUndoAction = sal_False; // Not anymore ...
EditDoc& rNodes = mpEditEngine->GetEditDoc();
- sal_uInt16 nPos = rNodes.GetPos( pCurNode );
+ sal_Int32 nPos = rNodes.GetPos( pCurNode );
// Special case: Bullet => Paragraph start => simply return NULL...
const SfxBoolItem& rBulletState = (const SfxBoolItem&)
@@ -729,7 +729,7 @@ const String* EdtAutoCorrDoc::GetPrevPara( sal_Bool )
if ( bBullet )
return NULL;
- for ( sal_uInt16 n = nPos; n; )
+ for ( sal_Int32 n = nPos; n; )
{
n--;
ContentNode* pNode = rNodes[n];
@@ -782,7 +782,7 @@ LanguageType EdtAutoCorrDoc::GetLanguage( sal_uInt16 nPos, sal_Bool ) const
void EdtAutoCorrDoc::ImplStartUndoAction()
{
- sal_uInt16 nPara = mpEditEngine->GetEditDoc().GetPos( pCurNode );
+ sal_Int32 nPara = mpEditEngine->GetEditDoc().GetPos( pCurNode );
ESelection aSel( nPara, nCursor, nPara, nCursor );
mpEditEngine->UndoActionStart( EDITUNDO_INSERT, aSel );
bUndoAction = sal_True;
diff --git a/editeng/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx
index cae0a756d057..62447dc157ea 100644
--- a/editeng/source/editeng/eehtml.cxx
+++ b/editeng/source/editeng/eehtml.cxx
@@ -223,7 +223,7 @@ void EditHTMLParser::NextToken( int nToken )
case HTML_CENTER_ON:
case HTML_CENTER_OFF:
{
- sal_uInt16 nNode = mpEditEngine->GetEditDoc().GetPos( aCurSel.Max().GetNode() );
+ sal_Int32 nNode = mpEditEngine->GetEditDoc().GetPos( aCurSel.Max().GetNode() );
SfxItemSet aItems( aCurSel.Max().GetNode()->GetContentAttribs().GetItems() );
aItems.ClearItem( EE_PARA_JUST );
if ( nToken == HTML_CENTER_ON )
@@ -549,7 +549,7 @@ void EditHTMLParser::ImpSetAttribs( const SfxItemSet& rItems, EditSelection* pSe
}
ContentNode* pSN = aStartPaM.GetNode();
- sal_uInt16 nStartNode = mpEditEngine->GetEditDoc().GetPos( pSN );
+ sal_Int32 nStartNode = mpEditEngine->GetEditDoc().GetPos( pSN );
// If an attribute goes from 0 to current Paragraph length,
// then it should be a paragraph attribute!
@@ -560,7 +560,7 @@ void EditHTMLParser::ImpSetAttribs( const SfxItemSet& rItems, EditSelection* pSe
// not really HTML:
#ifdef DBG_UTIL
ContentNode* pEN = aEndPaM.GetNode();
- sal_uInt16 nEndNode = mpEditEngine->GetEditDoc().GetPos( pEN );
+ sal_Int32 nEndNode = mpEditEngine->GetEditDoc().GetPos( pEN );
DBG_ASSERT( nStartNode == nEndNode, "ImpSetAttribs: Several paragraphs?" );
#endif
@@ -586,7 +586,7 @@ void EditHTMLParser::ImpSetStyleSheet( sal_uInt16 nHLevel )
// Enough for Calc, would have to be clarified with StyleSheets
// that they should also be in the app so that when they are feed
// in a different engine still are here ...
- sal_uInt16 nNode = mpEditEngine->GetEditDoc().GetPos( aCurSel.Max().GetNode() );
+ sal_Int32 nNode = mpEditEngine->GetEditDoc().GetPos( aCurSel.Max().GetNode() );
SfxItemSet aItems( aCurSel.Max().GetNode()->GetContentAttribs().GetItems() );
diff --git a/editeng/source/editeng/eertfpar.cxx b/editeng/source/editeng/eertfpar.cxx
index 479b2f638fba..fc629d11cfd6 100644
--- a/editeng/source/editeng/eertfpar.cxx
+++ b/editeng/source/editeng/eertfpar.cxx
@@ -126,7 +126,7 @@ SvParserState EditRTFParser::CallParser()
if ( nLastAction == ACTION_INSERTPARABRK )
{
ContentNode* pCurNode = aCurSel.Max().GetNode();
- sal_uInt16 nPara = mpEditEngine->GetEditDoc().GetPos(pCurNode);
+ sal_Int32 nPara = mpEditEngine->GetEditDoc().GetPos(pCurNode);
ContentNode* pPrevNode = mpEditEngine->GetEditDoc().GetObject(nPara-1);
DBG_ASSERT( pPrevNode, "Invalid RTF-Document?!" );
EditSelection aSel;
@@ -169,9 +169,9 @@ void EditRTFParser::AddRTFDefaultValues( const EditPaM& rStart, const EditPaM& r
SvxFontItem aFontItem( aDefFont.GetFamily(), aDefFont.GetName(),
aDefFont.GetStyleName(), aDefFont.GetPitch(), aDefFont.GetCharSet(), EE_CHAR_FONTINFO );
- sal_uInt16 nStartPara = mpEditEngine->GetEditDoc().GetPos( rStart.GetNode() );
- sal_uInt16 nEndPara = mpEditEngine->GetEditDoc().GetPos( rEnd.GetNode() );
- for ( sal_uInt16 nPara = nStartPara; nPara <= nEndPara; nPara++ )
+ sal_Int32 nStartPara = mpEditEngine->GetEditDoc().GetPos( rStart.GetNode() );
+ sal_Int32 nEndPara = mpEditEngine->GetEditDoc().GetPos( rEnd.GetNode() );
+ for ( sal_Int32 nPara = nStartPara; nPara <= nEndPara; nPara++ )
{
ContentNode* pNode = mpEditEngine->GetEditDoc().GetObject( nPara );
DBG_ASSERT( pNode, "AddRTFDefaultValues - No paragraph?!" );
@@ -289,7 +289,7 @@ void EditRTFParser::SetEndPrevPara( SvxNodeIdx*& rpNodePos,
// This "\pard" always apply on the right paragraph.
ContentNode* pN = aCurSel.Max().GetNode();
- sal_uInt16 nCurPara = mpEditEngine->GetEditDoc().GetPos( pN );
+ sal_Int32 nCurPara = mpEditEngine->GetEditDoc().GetPos( pN );
DBG_ASSERT( nCurPara != 0, "Paragraph equal to 0: SetEnfPrevPara" );
if ( nCurPara )
nCurPara--;
@@ -362,8 +362,8 @@ void EditRTFParser::SetAttrInDoc( SvxRTFItemStackType &rSet )
ContentNode* pSN = aStartPaM.GetNode();
ContentNode* pEN = aEndPaM.GetNode();
- sal_uInt16 nStartNode = mpEditEngine->GetEditDoc().GetPos( pSN );
- sal_uInt16 nEndNode = mpEditEngine->GetEditDoc().GetPos( pEN );
+ sal_Int32 nStartNode = mpEditEngine->GetEditDoc().GetPos( pSN );
+ sal_Int32 nEndNode = mpEditEngine->GetEditDoc().GetPos( pEN );
sal_Int16 nOutlLevel = 0xff;
if (rSet.StyleNo() && mpEditEngine->GetStyleSheetPool() && mpEditEngine->IsImportRTFStyleSheetsSet())
@@ -385,7 +385,7 @@ void EditRTFParser::SetAttrInDoc( SvxRTFItemStackType &rSet )
// Note: Selection can reach over several paragraphs.
// All Complete paragraphs are paragraph attributes ...
- for ( sal_uInt16 z = nStartNode+1; z < nEndNode; z++ )
+ for ( sal_Int32 z = nStartNode+1; z < nEndNode; z++ )
{
DBG_ASSERT(mpEditEngine->GetEditDoc().GetObject(z), "Node does not exist yet(RTF)");
mpEditEngine->SetParaAttribsOnly(z, rSet.GetAttrSet());
@@ -426,7 +426,7 @@ void EditRTFParser::SetAttrInDoc( SvxRTFItemStackType &rSet )
// OutlLevel...
if ( nOutlLevel != 0xff )
{
- for ( sal_uInt16 n = nStartNode; n <= nEndNode; n++ )
+ for ( sal_Int32 n = nStartNode; n <= nEndNode; n++ )
{
ContentNode* pNode = mpEditEngine->GetEditDoc().GetObject( n );
pNode->GetContentAttribs().GetItems().Put( SfxInt16Item( EE_PARA_OUTLLEVEL, nOutlLevel ) );
@@ -607,7 +607,7 @@ void EditRTFParser::SkipGroup()
EditNodeIdx::EditNodeIdx(EditEngine* pEE, ContentNode* pNd) :
mpEditEngine(pEE), mpNode(pNd) {}
-sal_uLong EditNodeIdx::GetIdx() const
+sal_Int32 EditNodeIdx::GetIdx() const
{
return mpEditEngine->GetEditDoc().GetPos(mpNode);
}
@@ -630,7 +630,7 @@ SvxNodeIdx* EditPosition::MakeNodeIdx() const
return new EditNodeIdx(mpEditEngine, mpCurSel->Max().GetNode());
}
-sal_uLong EditPosition::GetNodeIdx() const
+sal_Int32 EditPosition::GetNodeIdx() const
{
ContentNode* pN = mpCurSel->Max().GetNode();
return mpEditEngine->GetEditDoc().GetPos(pN);
diff --git a/editeng/source/editeng/eertfpar.hxx b/editeng/source/editeng/eertfpar.hxx
index d868b25514bb..32d97c0b2458 100644
--- a/editeng/source/editeng/eertfpar.hxx
+++ b/editeng/source/editeng/eertfpar.hxx
@@ -35,7 +35,7 @@ private:
public:
EditNodeIdx(EditEngine* pEE, ContentNode* pNd = NULL);
- virtual sal_uLong GetIdx() const;
+ virtual sal_Int32 GetIdx() const;
virtual SvxNodeIdx* Clone() const;
ContentNode* GetNode() { return mpNode; }
};
@@ -49,7 +49,7 @@ private:
public:
EditPosition(EditEngine* pIEE, EditSelection* pSel);
- virtual sal_uLong GetNodeIdx() const;
+ virtual sal_Int32 GetNodeIdx() const;
virtual sal_uInt16 GetCntIdx() const;
// clone
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index 4caa60222e06..ceced7baccba 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -171,9 +171,9 @@ void ImpEditView::DrawSelection( EditSelection aTmpSel, Region* pRegion )
ContentNode* pStartNode = aTmpSel.Min().GetNode();
ContentNode* pEndNode = aTmpSel.Max().GetNode();
- sal_uInt16 nStartPara = pEditEngine->GetEditDoc().GetPos( pStartNode );
- sal_uInt16 nEndPara = pEditEngine->GetEditDoc().GetPos( pEndNode );
- for ( sal_uInt16 nPara = nStartPara; nPara <= nEndPara; nPara++ )
+ sal_Int32 nStartPara = pEditEngine->GetEditDoc().GetPos( pStartNode );
+ sal_Int32 nEndPara = pEditEngine->GetEditDoc().GetPos( pEndNode );
+ for ( sal_Int32 nPara = nStartPara; nPara <= nEndPara; nPara++ )
{
ParaPortion* pTmpPortion = pEditEngine->GetParaPortions().SafeGetObject( nPara );
DBG_ASSERT( pTmpPortion, "Portion in Selection not found!" );
@@ -638,8 +638,8 @@ void ImpEditView::ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, sa
EditPaM aPaM( aEditSelection.Max() );
sal_uInt16 nTextPortionStart = 0;
- sal_uInt16 nPara = pEditEngine->GetEditDoc().GetPos( aPaM.GetNode() );
- if (nPara == USHRT_MAX) // #i94322
+ sal_Int32 nPara = pEditEngine->GetEditDoc().GetPos( aPaM.GetNode() );
+ if (nPara == EE_PARA_NOT_FOUND) // #i94322
return;
const ParaPortion* pParaPortion = pEditEngine->GetParaPortions()[nPara];
@@ -1130,8 +1130,8 @@ String ImpEditView::SpellIgnoreOrAddWord( sal_Bool bAdd )
xDic->add( aWord, sal_False, String() );
}
EditDoc& rDoc = pEditEngine->GetEditDoc();
- sal_uInt16 nNodes = rDoc.Count();
- for ( sal_uInt16 n = 0; n < nNodes; n++ )
+ sal_Int32 nNodes = rDoc.Count();
+ for ( sal_Int32 n = 0; n < nNodes; n++ )
{
ContentNode* pNode = rDoc.GetObject( n );
pNode->GetWrongList()->MarkWrongsInvalid();
@@ -1158,7 +1158,7 @@ void ImpEditView::DeleteSelected()
ShowCursor( DoAutoScroll(), sal_True );
}
-const SvxFieldItem* ImpEditView::GetField( const Point& rPos, sal_uInt16* pPara, sal_uInt16* pPos ) const
+const SvxFieldItem* ImpEditView::GetField( const Point& rPos, sal_Int32* pPara, sal_uInt16* pPos ) const
{
if( !GetOutputArea().IsInside( rPos ) )
return 0;
@@ -1193,10 +1193,10 @@ const SvxFieldItem* ImpEditView::GetField( const Point& rPos, sal_uInt16* pPara,
return NULL;
}
-sal_Bool ImpEditView::IsBulletArea( const Point& rPos, sal_uInt16* pPara )
+sal_Bool ImpEditView::IsBulletArea( const Point& rPos, sal_Int32* pPara )
{
if ( pPara )
- *pPara = 0xFFFF;
+ *pPara = EE_PARA_NOT_FOUND;
if( !GetOutputArea().IsInside( rPos ) )
return sal_False;
@@ -1206,7 +1206,7 @@ sal_Bool ImpEditView::IsBulletArea( const Point& rPos, sal_uInt16* pPara )
if ( aPaM.GetIndex() == 0 )
{
- sal_uInt16 nPara = pEditEngine->GetEditDoc().GetPos( aPaM.GetNode() );
+ sal_Int32 nPara = pEditEngine->GetEditDoc().GetPos( aPaM.GetNode() );
Rectangle aBulletArea = pEditEngine->GetBulletArea( nPara );
long nY = pEditEngine->GetDocPosTopLeft( nPara ).Y();
const ParaPortion* pParaPortion = pEditEngine->GetParaPortions()[nPara];
@@ -1341,9 +1341,9 @@ sal_Bool ImpEditView::IsInSelection( const EditPaM& rPaM )
aSel.Adjust( pEditEngine->GetEditDoc() );
- sal_uInt16 nStartNode = pEditEngine->GetEditDoc().GetPos( aSel.Min().GetNode() );
- sal_uInt16 nEndNode = pEditEngine->GetEditDoc().GetPos( aSel.Max().GetNode() );
- sal_uInt16 nCurNode = pEditEngine->GetEditDoc().GetPos( rPaM.GetNode() );
+ sal_Int32 nStartNode = pEditEngine->GetEditDoc().GetPos( aSel.Min().GetNode() );
+ sal_Int32 nEndNode = pEditEngine->GetEditDoc().GetPos( aSel.Max().GetNode() );
+ sal_Int32 nCurNode = pEditEngine->GetEditDoc().GetPos( rPaM.GetNode() );
if ( ( nCurNode > nStartNode ) && ( nCurNode < nEndNode ) )
return sal_True;
@@ -1531,7 +1531,8 @@ void ImpEditView::dragGestureRecognized( const ::com::sun::star::datatransfer::d
else
{
// Field?!
- sal_uInt16 nPara, nPos;
+ sal_Int32 nPara;
+ sal_uInt16 nPos;
Point aMousePos = GetWindow()->PixelToLogic( aMousePosPixel );
const SvxFieldItem* pField = GetField( aMousePos, &nPara, &nPos );
if ( pField )
@@ -1553,7 +1554,7 @@ void ImpEditView::dragGestureRecognized( const ::com::sun::star::datatransfer::d
EditPaM aStartPaM( pEditEngine->GetEditDoc().GetObject( nPara ), 0 );
EditPaM aEndPaM( aStartPaM );
const SfxInt16Item& rLevel = (const SfxInt16Item&) pEditEngine->GetParaAttrib( nPara, EE_PARA_OUTLLEVEL );
- for ( sal_uInt16 n = nPara +1; n < pEditEngine->GetEditDoc().Count(); n++ )
+ for ( sal_Int32 n = nPara +1; n < pEditEngine->GetEditDoc().Count(); n++ )
{
const SfxInt16Item& rL = (const SfxInt16Item&) pEditEngine->GetParaAttrib( n, EE_PARA_OUTLLEVEL );
if ( rL.GetValue() > rLevel.GetValue() )
@@ -1612,7 +1613,7 @@ void ImpEditView::dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSo
ESelection aNewSel( pDragAndDropInfo->aDropSel.nEndPara, pDragAndDropInfo->aDropSel.nEndPos,
pDragAndDropInfo->aDropSel.nEndPara, pDragAndDropInfo->aDropSel.nEndPos );
sal_Bool bBeforeSelection = aDropPos.IsLess( pDragAndDropInfo->aBeginDragSel );
- sal_uInt16 nParaDiff = pDragAndDropInfo->aBeginDragSel.nEndPara - pDragAndDropInfo->aBeginDragSel.nStartPara;
+ sal_Int32 nParaDiff = pDragAndDropInfo->aBeginDragSel.nEndPara - pDragAndDropInfo->aBeginDragSel.nStartPara;
if ( bBeforeSelection )
{
// Adjust aToBeDelSel.
@@ -1843,7 +1844,7 @@ void ImpEditView::dragOver( const ::com::sun::star::datatransfer::dnd::DropTarge
pDragAndDropInfo->aDropDest = aPaM;
if ( pDragAndDropInfo->bOutlinerMode )
{
- sal_uInt16 nPara = pEditEngine->GetEditDoc().GetPos( aPaM.GetNode() );
+ sal_Int32 nPara = pEditEngine->GetEditDoc().GetPos( aPaM.GetNode() );
ParaPortion* pPPortion = pEditEngine->GetParaPortions().SafeGetObject( nPara );
long nDestParaStartY = pEditEngine->GetParaPortions().GetYOffset( pPPortion );
long nRel = aDocPos.Y() - nDestParaStartY;
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index 0f1ee4359e73..1d3cbf9b3489 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -108,7 +108,7 @@ struct DragAndDropInfo
sal_uInt16 nCursorWidth;
ESelection aBeginDragSel;
EditPaM aDropDest;
- sal_uInt16 nOutlinerDropDest;
+ sal_Int32 nOutlinerDropDest;
ESelection aDropSel;
VirtualDevice* pBackground;
const SvxFieldItem* pField;
@@ -317,7 +317,7 @@ public:
void AddDragAndDropListeners();
void RemoveDragAndDropListeners();
- sal_Bool IsBulletArea( const Point& rPos, sal_uInt16* pPara );
+ sal_Bool IsBulletArea( const Point& rPos, sal_Int32* pPara );
// For the Selection Engine...
void CreateAnchor();
@@ -357,7 +357,7 @@ public:
sal_Bool IsWrongSpelledWord( const EditPaM& rPaM, sal_Bool bMarkIfWrong );
String SpellIgnoreOrAddWord( sal_Bool bAdd );
- const SvxFieldItem* GetField( const Point& rPos, sal_uInt16* pPara, sal_uInt16* pPos ) const;
+ const SvxFieldItem* GetField( const Point& rPos, sal_Int32* pPara, sal_uInt16* pPos ) const;
void DeleteSelected();
// If possible invalidate more than OutputArea, for the DrawingEngine text frame
@@ -519,7 +519,7 @@ private:
sal_uInt16 GetParaAttrib( sal_uInt8 nFunc, EditSelection aSel );
void SetCharAttrib( EditSelection aSel, const SfxPoolItem& rItem );
void ParaAttribsToCharAttribs( ContentNode* pNode );
- void GetCharAttribs( sal_uInt16 nPara, std::vector<EECharAttrib>& rLst ) const;
+ void GetCharAttribs( sal_Int32 nPara, std::vector<EECharAttrib>& rLst ) const;
EditTextObject* CreateBinTextObject( EditSelection aSelection, SfxItemPool*, sal_Bool bAllowBigObjects = sal_False, sal_uInt16 nBigObjStart = 0 );
EditSelection InsertBinTextObject( BinTextObject&, EditPaM aPaM );
@@ -528,7 +528,7 @@ private:
EditPaM Clear();
EditPaM RemoveText();
EditPaM RemoveText( EditSelection aEditSelection );
- sal_Bool CreateLines( sal_uInt16 nPara, sal_uInt32 nStartPosY );
+ sal_Bool CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY );
void CreateAndInsertEmptyLine( ParaPortion* pParaPortion, sal_uInt32 nStartPosY );
sal_Bool FinishCreateLines( ParaPortion* pParaPortion );
void CalcCharPositions( ParaPortion* pParaPortion );
@@ -548,11 +548,11 @@ private:
EditPaM ImpInsertText(const EditSelection& aCurEditSelection, const String& rStr);
EditPaM ImpInsertFeature(const EditSelection& rCurSel, const SfxPoolItem& rItem);
void ImpRemoveChars( const EditPaM& rPaM, sal_uInt16 nChars, EditUndoRemoveChars* pCurUndo = 0 );
- void ImpRemoveParagraph( sal_uInt16 nPara );
- EditSelection ImpMoveParagraphs( Range aParagraphs, sal_uInt16 nNewPos );
+ void ImpRemoveParagraph( sal_Int32 nPara );
+ EditSelection ImpMoveParagraphs( Range aParagraphs, sal_Int32 nNewPos );
EditPaM ImpFastInsertText( EditPaM aPaM, const String& rStr );
- EditPaM ImpFastInsertParagraph( sal_uInt16 nPara );
+ EditPaM ImpFastInsertParagraph( sal_Int32 nPara );
sal_Bool ImpCheckRefMapMode();
@@ -560,11 +560,11 @@ private:
void ImpFindKashidas( ContentNode* pNode, sal_uInt16 nStart, sal_uInt16 nEnd, std::vector<sal_uInt16>& rArray );
- void InsertContent( ContentNode* pNode, sal_uInt16 nPos );
- EditPaM SplitContent( sal_uInt16 nNode, sal_uInt16 nSepPos );
- EditPaM ConnectContents( sal_uInt16 nLeftNode, sal_Bool bBackward );
+ void InsertContent( ContentNode* pNode, sal_Int32 nPos );
+ EditPaM SplitContent( sal_Int32 nNode, sal_uInt16 nSepPos );
+ EditPaM ConnectContents( sal_Int32 nLeftNode, sal_Bool bBackward );
- void ShowParagraph( sal_uInt16 nParagraph, bool bShow );
+ void ShowParagraph( sal_Int32 nParagraph, bool bShow );
EditPaM PageUp( const EditPaM& rPaM, EditView* pView);
EditPaM PageDown( const EditPaM& rPaM, EditView* pView);
@@ -588,16 +588,16 @@ private:
EditPaM CursorVisualStartEnd( EditView* pEditView, const EditPaM& rPaM, sal_Bool bStart );
- void InitScriptTypes( sal_uInt16 nPara );
+ void InitScriptTypes( sal_Int32 nPara );
sal_uInt16 GetScriptType( const EditPaM& rPaM, sal_uInt16* pEndPos = NULL ) const;
sal_uInt16 GetScriptType( const EditSelection& rSel ) const;
sal_Bool IsScriptChange( const EditPaM& rPaM ) const;
- sal_Bool HasScriptType( sal_uInt16 nPara, sal_uInt16 nType ) const;
+ sal_Bool HasScriptType( sal_Int32 nPara, sal_uInt16 nType ) const;
sal_Bool ImplCalcAsianCompression( ContentNode* pNode, TextPortion* pTextPortion, sal_uInt16 nStartPos, sal_Int32* pDXArray, sal_uInt16 n100thPercentFromMax, sal_Bool bManipulateDXArray );
void ImplExpandCompressedPortions( EditLine* pLine, ParaPortion* pParaPortion, long nRemainingWidth );
- void ImplInitLayoutMode( OutputDevice* pOutDev, sal_uInt16 nPara, sal_uInt16 nIndex );
+ void ImplInitLayoutMode( OutputDevice* pOutDev, sal_Int32 nPara, sal_uInt16 nIndex );
void ImplInitDigitMode( OutputDevice* pOutDev, String* pString, xub_StrLen nStt, xub_StrLen nLen, LanguageType eLang );
EditPaM ReadText( SvStream& rInput, EditSelection aSel );
@@ -611,9 +611,9 @@ private:
sal_uInt32 WriteHTML( SvStream& rOutput, EditSelection aSel );
sal_uInt32 WriteBin( SvStream& rOutput, EditSelection aSel, sal_Bool bStoreUnicode = sal_False );
- void WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, sal_uInt16 nPara, sal_uInt16 nPos,
+ void WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, sal_Int32 nPara, sal_uInt16 nPos,
std::vector<SvxFontItem*>& rFontTable, SvxColorList& rColorList );
- sal_Bool WriteItemListAsRTF( ItemList& rLst, SvStream& rOutput, sal_uInt16 nPara, sal_uInt16 nPos,
+ sal_Bool WriteItemListAsRTF( ItemList& rLst, SvStream& rOutput, sal_Int32 nPara, sal_uInt16 nPos,
std::vector<SvxFontItem*>& rFontTable, SvxColorList& rColorList );
sal_Int32 LogicToTwips( sal_Int32 n );
@@ -699,9 +699,9 @@ public:
EEHorizontalTextDirection GetDefaultHorizontalTextDirection() const { return eDefaultHorizontalTextDirection; }
- void InitWritingDirections( sal_uInt16 nPara );
- sal_Bool IsRightToLeft( sal_uInt16 nPara ) const;
- sal_uInt8 GetRightToLeft( sal_uInt16 nPara, sal_uInt16 nChar, sal_uInt16* pStart = NULL, sal_uInt16* pEnd = NULL );
+ void InitWritingDirections( sal_Int32 nPara );
+ sal_Bool IsRightToLeft( sal_Int32 nPara ) const;
+ sal_uInt8 GetRightToLeft( sal_Int32 nPara, sal_uInt16 nChar, sal_uInt16* pStart = NULL, sal_uInt16* pEnd = NULL );
sal_Bool HasDifferentRTLLevels( const ContentNode* pNode );
void SetTextRanger( TextRanger* pRanger );
@@ -764,32 +764,32 @@ public:
EditSelection MoveCursor( const KeyEvent& rKeyEvent, EditView* pEditView );
- EditSelection MoveParagraphs( Range aParagraphs, sal_uInt16 nNewPos, EditView* pCurView );
+ EditSelection MoveParagraphs( Range aParagraphs, sal_Int32 nNewPos, EditView* pCurView );
sal_uInt32 CalcTextHeight( sal_uInt32* pHeightNTP );
sal_uInt32 GetTextHeight() const;
sal_uInt32 GetTextHeightNTP() const;
sal_uInt32 CalcTextWidth( sal_Bool bIgnoreExtraSpace );
sal_uInt32 CalcLineWidth( ParaPortion* pPortion, EditLine* pLine, sal_Bool bIgnoreExtraSpace );
- sal_uInt16 GetLineCount( sal_uInt16 nParagraph ) const;
- sal_uInt16 GetLineLen( sal_uInt16 nParagraph, sal_uInt16 nLine ) const;
- void GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nParagraph, sal_uInt16 nLine ) const;
- sal_uInt16 GetLineNumberAtIndex( sal_uInt16 nPara, sal_uInt16 nIndex ) const;
- sal_uInt16 GetLineHeight( sal_uInt16 nParagraph, sal_uInt16 nLine );
- sal_uInt32 GetParaHeight( sal_uInt16 nParagraph );
-
- SfxItemSet GetAttribs( sal_uInt16 nPara, sal_uInt16 nStart, sal_uInt16 nEnd, sal_uInt8 nFlags = 0xFF ) const;
+ sal_uInt16 GetLineCount( sal_Int32 nParagraph ) const;
+ sal_uInt16 GetLineLen( sal_Int32 nParagraph, sal_uInt16 nLine ) const;
+ void GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_Int32 nParagraph, sal_uInt16 nLine ) const;
+ sal_uInt16 GetLineNumberAtIndex( sal_Int32 nPara, sal_uInt16 nIndex ) const;
+ sal_uInt16 GetLineHeight( sal_Int32 nParagraph, sal_uInt16 nLine );
+ sal_uInt32 GetParaHeight( sal_Int32 nParagraph );
+
+ SfxItemSet GetAttribs( sal_Int32 nPara, sal_uInt16 nStart, sal_uInt16 nEnd, sal_uInt8 nFlags = 0xFF ) const;
SfxItemSet GetAttribs( EditSelection aSel, sal_Bool bOnlyHardAttrib = sal_False );
void SetAttribs( EditSelection aSel, const SfxItemSet& rSet, sal_uInt8 nSpecial = 0 );
void RemoveCharAttribs( EditSelection aSel, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich = 0 );
- void RemoveCharAttribs( sal_uInt16 nPara, sal_uInt16 nWhich = 0, sal_Bool bRemoveFeatures = sal_False );
+ void RemoveCharAttribs( sal_Int32 nPara, sal_uInt16 nWhich = 0, sal_Bool bRemoveFeatures = sal_False );
void SetFlatMode( sal_Bool bFlat );
- void SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& rSet );
- const SfxItemSet& GetParaAttribs( sal_uInt16 nPara ) const;
+ void SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet );
+ const SfxItemSet& GetParaAttribs( sal_Int32 nPara ) const;
- bool HasParaAttrib( sal_uInt16 nPara, sal_uInt16 nWhich ) const;
- const SfxPoolItem& GetParaAttrib( sal_uInt16 nPara, sal_uInt16 nWhich ) const;
+ bool HasParaAttrib( sal_Int32 nPara, sal_uInt16 nWhich ) const;
+ const SfxPoolItem& GetParaAttrib( sal_Int32 nPara, sal_uInt16 nWhich ) const;
Rectangle PaMtoEditCursor( EditPaM aPaM, sal_uInt16 nFlags = 0 );
Rectangle GetEditCursor( ParaPortion* pPortion, sal_uInt16 nIndex, sal_uInt16 nFlags = 0 );
@@ -809,9 +809,9 @@ public:
sal_Bool Redo( EditView* pView );
// OV-Special
- void InvalidateFromParagraph( sal_uInt16 nFirstInvPara );
- EditPaM InsertParagraph( sal_uInt16 nPara );
- EditSelection* SelectParagraph( sal_uInt16 nPara );
+ void InvalidateFromParagraph( sal_Int32 nFirstInvPara );
+ EditPaM InsertParagraph( sal_Int32 nPara );
+ EditSelection* SelectParagraph( sal_Int32 nPara );
void SetStatusEventHdl( const Link& rLink ) { aStatusHdlLink = rLink; }
Link GetStatusEventHdl() const { return aStatusHdlLink; }
@@ -826,7 +826,7 @@ public:
sal_Bool IsVisualCursorTravelingEnabled();
sal_Bool DoVisualCursorTraveling( const ContentNode* pNode );
- EditSelection ConvertSelection( sal_uInt16 nStartPara, sal_uInt16 nStartPos, sal_uInt16 nEndPara, sal_uInt16 nEndPos );
+ EditSelection ConvertSelection( sal_Int32 nStartPara, sal_uInt16 nStartPos, sal_Int32 nEndPara, sal_uInt16 nEndPos );
inline EPaM CreateEPaM( const EditPaM& rPaM );
inline EditPaM CreateEditPaM( const EPaM& rEPaM );
inline ESelection CreateESel( const EditSelection& rSel );
@@ -837,9 +837,9 @@ public:
SfxStyleSheetPool* GetStyleSheetPool() const { return pStylePool; }
void SetStyleSheet( EditSelection aSel, SfxStyleSheet* pStyle );
- void SetStyleSheet( sal_uInt16 nPara, SfxStyleSheet* pStyle );
- const SfxStyleSheet* GetStyleSheet( sal_uInt16 nPara ) const;
- SfxStyleSheet* GetStyleSheet( sal_uInt16 nPara );
+ void SetStyleSheet( sal_Int32 nPara, SfxStyleSheet* pStyle );
+ const SfxStyleSheet* GetStyleSheet( sal_Int32 nPara ) const;
+ SfxStyleSheet* GetStyleSheet( sal_Int32 nPara );
void UpdateParagraphsWithStyleSheet( SfxStyleSheet* pStyle );
void RemoveStyleFromParagraphs( SfxStyleSheet* pStyle );
@@ -945,9 +945,9 @@ public:
sal_Int32 GetSpaceBeforeAndMinLabelWidth( const ContentNode *pNode, sal_Int32 *pnSpaceBefore = 0, sal_Int32 *pnMinLabelWidth = 0 ) const;
const SvxLRSpaceItem& GetLRSpaceItem( ContentNode* pNode );
- SvxAdjust GetJustification( sal_uInt16 nPara ) const;
- SvxCellJustifyMethod GetJustifyMethod( sal_uInt16 nPara ) const;
- SvxCellVerJustify GetVerJustification( sal_uInt16 nPara ) const;
+ SvxAdjust GetJustification( sal_Int32 nPara ) const;
+ SvxCellJustifyMethod GetJustifyMethod( sal_Int32 nPara ) const;
+ SvxCellVerJustify GetVerJustification( sal_Int32 nPara ) const;
void SetCharStretching( sal_uInt16 nX, sal_uInt16 nY );
inline void GetCharStretching( sal_uInt16& rX, sal_uInt16& rY );
@@ -1069,14 +1069,14 @@ inline EditUndoManager& ImpEditEngine::GetUndoManager()
inline const ParaPortion* ImpEditEngine::FindParaPortion( const ContentNode* pNode ) const
{
- sal_uInt16 nPos = aEditDoc.GetPos( pNode );
+ sal_Int32 nPos = aEditDoc.GetPos( pNode );
DBG_ASSERT( nPos < GetParaPortions().Count(), "Portionloser Node?" );
return GetParaPortions()[ nPos ];
}
inline ParaPortion* ImpEditEngine::FindParaPortion( ContentNode* pNode )
{
- sal_uInt16 nPos = aEditDoc.GetPos( pNode );
+ sal_Int32 nPos = aEditDoc.GetPos( pNode );
DBG_ASSERT( nPos < GetParaPortions().Count(), "Portionloser Node?" );
return GetParaPortions()[ nPos ];
}
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index 1c3e6584266f..86cf9335878d 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -230,8 +230,8 @@ void ImpEditEngine::SetRefMapMode( const MapMode& rMapMode )
void ImpEditEngine::InitDoc(bool bKeepParaAttribs)
{
- sal_uInt16 nParas = aEditDoc.Count();
- for ( sal_uInt16 n = bKeepParaAttribs ? 1 : 0; n < nParas; n++ )
+ sal_Int32 nParas = aEditDoc.Count();
+ for ( sal_Int32 n = bKeepParaAttribs ? 1 : 0; n < nParas; n++ )
{
if ( aEditDoc[n]->GetStyleSheet() )
EndListening( *aEditDoc[n]->GetStyleSheet(), sal_False );
@@ -278,13 +278,13 @@ XubString ImpEditEngine::GetSelected( const EditSelection& rSel, const LineEnd e
ContentNode* pStartNode = aSel.Min().GetNode();
ContentNode* pEndNode = aSel.Max().GetNode();
- sal_uInt16 nStartNode = aEditDoc.GetPos( pStartNode );
- sal_uInt16 nEndNode = aEditDoc.GetPos( pEndNode );
+ sal_Int32 nStartNode = aEditDoc.GetPos( pStartNode );
+ sal_Int32 nEndNode = aEditDoc.GetPos( pEndNode );
OSL_ENSURE( nStartNode <= nEndNode, "Selection not sorted ?" );
// iterate over the paragraphs ...
- for ( sal_uInt16 nNode = nStartNode; nNode <= nEndNode; nNode++ )
+ for ( sal_Int32 nNode = nStartNode; nNode <= nEndNode; nNode++ )
{
OSL_ENSURE( aEditDoc.GetObject( nNode ), "Node not found: GetSelected" );
const ContentNode* pNode = aEditDoc.GetObject( nNode );
@@ -660,7 +660,7 @@ sal_Bool ImpEditEngine::MouseButtonUp( const MouseEvent& rMEvt, EditView* pView
if ( pFld )
{
EditPaM aPaM( aCurSel.Max() );
- sal_uInt16 nPara = GetEditDoc().GetPos( aPaM.GetNode() );
+ sal_Int32 nPara = GetEditDoc().GetPos( aPaM.GetNode() );
GetEditEnginePtr()->FieldClicked( *pFld, nPara, aPaM.GetIndex() );
}
}
@@ -805,7 +805,7 @@ void ImpEditEngine::ParaAttribsChanged( ContentNode* pNode )
OSL_ENSURE( pPortion, "ParaAttribsChanged: Portion?" );
pPortion->MarkSelectionInvalid( 0, pNode->Len() );
- sal_uInt16 nPara = aEditDoc.GetPos( pNode );
+ sal_Int32 nPara = aEditDoc.GetPos( pNode );
pEditEngine->ParaAttribsChanged( nPara );
ParaPortion* pNextPortion = GetParaPortions().SafeGetObject( nPara+1 );
@@ -994,7 +994,7 @@ EditPaM ImpEditEngine::CursorVisualStartEnd( EditView* pEditView, const EditPaM&
{
EditPaM aPaM( rPaM );
- sal_uInt16 nPara = GetEditDoc().GetPos( aPaM.GetNode() );
+ sal_Int32 nPara = GetEditDoc().GetPos( aPaM.GetNode() );
ParaPortion* pParaPortion = GetParaPortions().SafeGetObject( nPara );
sal_uInt16 nLine = pParaPortion->GetLines().FindLine( aPaM.GetIndex(), sal_False );
@@ -1050,7 +1050,7 @@ EditPaM ImpEditEngine::CursorVisualLeftRight( EditView* pEditView, const EditPaM
{
EditPaM aPaM( rPaM );
- sal_uInt16 nPara = GetEditDoc().GetPos( aPaM.GetNode() );
+ sal_Int32 nPara = GetEditDoc().GetPos( aPaM.GetNode() );
ParaPortion* pParaPortion = GetParaPortions().SafeGetObject( nPara );
sal_uInt16 nLine = pParaPortion->GetLines().FindLine( aPaM.GetIndex(), sal_False );
@@ -1486,7 +1486,7 @@ EditPaM ImpEditEngine::WordLeft( const EditPaM& rPaM, sal_Int16 nWordType )
if ( nCurrentPos == 0 )
{
// Previous paragraph...
- sal_uInt16 nCurPara = aEditDoc.GetPos( aNewPaM.GetNode() );
+ sal_Int32 nCurPara = aEditDoc.GetPos( aNewPaM.GetNode() );
ContentNode* pPrevNode = aEditDoc.GetObject( --nCurPara );
if ( pPrevNode )
{
@@ -1537,7 +1537,7 @@ EditPaM ImpEditEngine::WordRight( const EditPaM& rPaM, sal_Int16 nWordType )
if ( aNewPaM.GetIndex() >= nMax )
{
// Next paragraph ...
- sal_uInt16 nCurPara = aEditDoc.GetPos( aNewPaM.GetNode() );
+ sal_Int32 nCurPara = aEditDoc.GetPos( aNewPaM.GetNode() );
ContentNode* pNextNode = aEditDoc.GetObject( ++nCurPara );
if ( pNextNode )
{
@@ -1681,7 +1681,7 @@ static bool lcl_HasStrongLTR ( const String& rTxt, xub_StrLen nStart, xub_StrLe
-void ImpEditEngine::InitScriptTypes( sal_uInt16 nPara )
+void ImpEditEngine::InitScriptTypes( sal_Int32 nPara )
{
ParaPortion* pParaPortion = GetParaPortions().SafeGetObject( nPara );
ScriptTypePosInfos& rTypes = pParaPortion->aScriptInfos;
@@ -1824,7 +1824,7 @@ sal_uInt16 ImpEditEngine::GetScriptType( const EditPaM& rPaM, sal_uInt16* pEndPo
if ( rPaM.GetNode()->Len() )
{
- sal_uInt16 nPara = GetEditDoc().GetPos( rPaM.GetNode() );
+ sal_Int32 nPara = GetEditDoc().GetPos( rPaM.GetNode() );
const ParaPortion* pParaPortion = GetParaPortions().SafeGetObject( nPara );
if ( pParaPortion->aScriptInfos.empty() )
((ImpEditEngine*)this)->InitScriptTypes( nPara );
@@ -1852,10 +1852,10 @@ sal_uInt16 ImpEditEngine::GetScriptType( const EditSelection& rSel ) const
short nScriptType = 0;
- sal_uInt16 nStartPara = GetEditDoc().GetPos( aSel.Min().GetNode() );
- sal_uInt16 nEndPara = GetEditDoc().GetPos( aSel.Max().GetNode() );
+ sal_Int32 nStartPara = GetEditDoc().GetPos( aSel.Min().GetNode() );
+ sal_Int32 nEndPara = GetEditDoc().GetPos( aSel.Max().GetNode() );
- for ( sal_uInt16 nPara = nStartPara; nPara <= nEndPara; nPara++ )
+ for ( sal_Int32 nPara = nStartPara; nPara <= nEndPara; nPara++ )
{
const ParaPortion* pParaPortion = GetParaPortions().SafeGetObject( nPara );
if ( pParaPortion->aScriptInfos.empty() )
@@ -1897,7 +1897,7 @@ sal_Bool ImpEditEngine::IsScriptChange( const EditPaM& rPaM ) const
if ( rPaM.GetNode()->Len() )
{
- sal_uInt16 nPara = GetEditDoc().GetPos( rPaM.GetNode() );
+ sal_Int32 nPara = GetEditDoc().GetPos( rPaM.GetNode() );
const ParaPortion* pParaPortion = GetParaPortions().SafeGetObject( nPara );
if ( pParaPortion->aScriptInfos.empty() )
((ImpEditEngine*)this)->InitScriptTypes( nPara );
@@ -1916,7 +1916,7 @@ sal_Bool ImpEditEngine::IsScriptChange( const EditPaM& rPaM ) const
return bScriptChange;
}
-sal_Bool ImpEditEngine::HasScriptType( sal_uInt16 nPara, sal_uInt16 nType ) const
+sal_Bool ImpEditEngine::HasScriptType( sal_Int32 nPara, sal_uInt16 nType ) const
{
bool bTypeFound = false;
@@ -1933,7 +1933,7 @@ sal_Bool ImpEditEngine::HasScriptType( sal_uInt16 nPara, sal_uInt16 nType ) cons
return bTypeFound;
}
-void ImpEditEngine::InitWritingDirections( sal_uInt16 nPara )
+void ImpEditEngine::InitWritingDirections( sal_Int32 nPara )
{
ParaPortion* pParaPortion = GetParaPortions().SafeGetObject( nPara );
WritingDirectionInfos& rInfos = pParaPortion->aWritingDirectionInfos;
@@ -1988,7 +1988,7 @@ void ImpEditEngine::InitWritingDirections( sal_uInt16 nPara )
}
-sal_Bool ImpEditEngine::IsRightToLeft( sal_uInt16 nPara ) const
+sal_Bool ImpEditEngine::IsRightToLeft( sal_Int32 nPara ) const
{
sal_Bool bR2L = sal_False;
const SvxFrameDirectionItem* pFrameDirItem = NULL;
@@ -2020,7 +2020,7 @@ sal_Bool ImpEditEngine::IsRightToLeft( sal_uInt16 nPara ) const
sal_Bool ImpEditEngine::HasDifferentRTLLevels( const ContentNode* pNode )
{
- sal_uInt16 nPara = GetEditDoc().GetPos( (ContentNode*)pNode );
+ sal_Int32 nPara = GetEditDoc().GetPos( (ContentNode*)pNode );
ParaPortion* pParaPortion = GetParaPortions().SafeGetObject( nPara );
sal_Bool bHasDifferentRTLLevels = sal_False;
@@ -2039,7 +2039,7 @@ sal_Bool ImpEditEngine::HasDifferentRTLLevels( const ContentNode* pNode )
}
-sal_uInt8 ImpEditEngine::GetRightToLeft( sal_uInt16 nPara, sal_uInt16 nPos, sal_uInt16* pStart, sal_uInt16* pEnd )
+sal_uInt8 ImpEditEngine::GetRightToLeft( sal_Int32 nPara, sal_uInt16 nPos, sal_uInt16* pStart, sal_uInt16* pEnd )
{
sal_uInt8 nRightToLeft = 0;
@@ -2067,7 +2067,7 @@ sal_uInt8 ImpEditEngine::GetRightToLeft( sal_uInt16 nPara, sal_uInt16 nPos, sal_
return nRightToLeft;
}
-SvxAdjust ImpEditEngine::GetJustification( sal_uInt16 nPara ) const
+SvxAdjust ImpEditEngine::GetJustification( sal_Int32 nPara ) const
{
SvxAdjust eJustification = SVX_ADJUST_LEFT;
@@ -2086,14 +2086,14 @@ SvxAdjust ImpEditEngine::GetJustification( sal_uInt16 nPara ) const
return eJustification;
}
-SvxCellJustifyMethod ImpEditEngine::GetJustifyMethod( sal_uInt16 nPara ) const
+SvxCellJustifyMethod ImpEditEngine::GetJustifyMethod( sal_Int32 nPara ) const
{
const SvxJustifyMethodItem& rItem = static_cast<const SvxJustifyMethodItem&>(
GetParaAttrib(nPara, EE_PARA_JUST_METHOD));
return static_cast<SvxCellJustifyMethod>(rItem.GetEnumValue());
}
-SvxCellVerJustify ImpEditEngine::GetVerJustification( sal_uInt16 nPara ) const
+SvxCellVerJustify ImpEditEngine::GetVerJustification( sal_Int32 nPara ) const
{
const SvxVerJustifyItem& rItem = static_cast<const SvxVerJustifyItem&>(
GetParaAttrib(nPara, EE_PARA_VER_JUST));
@@ -2136,7 +2136,7 @@ void ImpEditEngine::ImpRemoveChars( const EditPaM& rPaM, sal_uInt16 nChars, Edit
TextModified();
}
-EditSelection ImpEditEngine::ImpMoveParagraphs( Range aOldPositions, sal_uInt16 nNewPos )
+EditSelection ImpEditEngine::ImpMoveParagraphs( Range aOldPositions, sal_Int32 nNewPos )
{
aOldPositions.Justify();
sal_Bool bValidAction = ( (long)nNewPos < aOldPositions.Min() ) || ( (long)nNewPos > aOldPositions.Max() );
@@ -2151,7 +2151,7 @@ EditSelection ImpEditEngine::ImpMoveParagraphs( Range aOldPositions, sal_uInt16
return aSelection;
}
- size_t nParaCount = GetParaPortions().Count();
+ sal_Int32 nParaCount = GetParaPortions().Count();
if ( nNewPos >= nParaCount )
nNewPos = nParaCount;
@@ -2185,7 +2185,7 @@ EditSelection ImpEditEngine::ImpMoveParagraphs( Range aOldPositions, sal_uInt16
pRecalc4 = GetParaPortions()[aOldPositions.Min()-1];
}
- MoveParagraphsInfo aMoveParagraphsInfo( sal::static_int_cast< sal_uInt16 >(aOldPositions.Min()), sal::static_int_cast< sal_uInt16 >(aOldPositions.Max()), nNewPos );
+ MoveParagraphsInfo aMoveParagraphsInfo( aOldPositions.Min(), aOldPositions.Max(), nNewPos );
aBeginMovingParagraphsHdl.Call( &aMoveParagraphsInfo );
if ( IsUndoEnabled() && !IsInUndo())
@@ -2195,18 +2195,18 @@ EditSelection ImpEditEngine::ImpMoveParagraphs( Range aOldPositions, sal_uInt16
ParaPortion* pDestPortion = GetParaPortions().SafeGetObject( nNewPos );
ParaPortionList aTmpPortionList;
- for (sal_uInt16 i = (sal_uInt16)aOldPositions.Min(); i <= (sal_uInt16)aOldPositions.Max(); i++ )
+ for (sal_Int32 i = aOldPositions.Min(); i <= aOldPositions.Max(); i++ )
{
// always aOldPositions.Min(), since Remove().
ParaPortion* pTmpPortion = GetParaPortions().Release(aOldPositions.Min());
- aEditDoc.Release( (sal_uInt16)aOldPositions.Min() );
+ aEditDoc.Release( aOldPositions.Min() );
aTmpPortionList.Append(pTmpPortion);
}
- sal_uInt16 nRealNewPos = pDestPortion ? GetParaPortions().GetPos( pDestPortion ) : GetParaPortions().Count();
- OSL_ENSURE( nRealNewPos != USHRT_MAX, "ImpMoveParagraphs: Invalid Position!" );
+ sal_Int32 nRealNewPos = pDestPortion ? GetParaPortions().GetPos( pDestPortion ) : GetParaPortions().Count();
+ OSL_ENSURE( nRealNewPos != EE_PARA_NOT_FOUND, "ImpMoveParagraphs: Invalid Position!" );
- for (size_t i = 0; i < aTmpPortionList.Count(); ++i)
+ for (sal_Int32 i = 0; i < aTmpPortionList.Count(); ++i)
{
ParaPortion* pTmpPortion = aTmpPortionList[i];
if ( i == 0 )
@@ -2228,8 +2228,8 @@ EditSelection ImpEditEngine::ImpMoveParagraphs( Range aOldPositions, sal_uInt16
EENotify aNotify( EE_NOTIFY_PARAGRAPHSMOVED );
aNotify.pEditEngine = GetEditEnginePtr();
aNotify.nParagraph = nNewPos;
- aNotify.nParam1 = sal::static_int_cast< sal_uInt16 >(aOldPositions.Min());
- aNotify.nParam2 = sal::static_int_cast< sal_uInt16 >(aOldPositions.Max());
+ aNotify.nParam1 = aOldPositions.Min();
+ aNotify.nParam2 = aOldPositions.Max();
CallNotify( aNotify );
}
@@ -2257,11 +2257,11 @@ EditSelection ImpEditEngine::ImpMoveParagraphs( Range aOldPositions, sal_uInt16
EditPaM ImpEditEngine::ImpConnectParagraphs( ContentNode* pLeft, ContentNode* pRight, sal_Bool bBackward )
{
OSL_ENSURE( pLeft != pRight, "Join together the same paragraph ?" );
- OSL_ENSURE( aEditDoc.GetPos( pLeft ) != USHRT_MAX, "Inserted node not found (1)" );
- OSL_ENSURE( aEditDoc.GetPos( pRight ) != USHRT_MAX, "Inserted node not found (2)" );
+ OSL_ENSURE( aEditDoc.GetPos( pLeft ) != EE_PARA_NOT_FOUND, "Inserted node not found (1)" );
+ OSL_ENSURE( aEditDoc.GetPos( pRight ) != EE_PARA_NOT_FOUND, "Inserted node not found (2)" );
- sal_uInt16 nParagraphTobeDeleted = aEditDoc.GetPos( pRight );
- DeletedNodeInfo* pInf = new DeletedNodeInfo( (sal_uLong)pRight, nParagraphTobeDeleted );
+ sal_Int32 nParagraphTobeDeleted = aEditDoc.GetPos( pRight );
+ DeletedNodeInfo* pInf = new DeletedNodeInfo( (sal_uIntPtr)pRight, nParagraphTobeDeleted );
aDeletedNodes.push_back(pInf);
GetEditEnginePtr()->ParagraphConnected( aEditDoc.GetPos( pLeft ), aEditDoc.GetPos( pRight ) );
@@ -2320,7 +2320,7 @@ EditPaM ImpEditEngine::ImpConnectParagraphs( ContentNode* pLeft, ContentNode* pR
// By joining together the two, the left is although reformatted,
// however if its height does not change then the formatting receives
// the change of the total text hight too late...
- for ( sal_uInt16 n = nParagraphTobeDeleted; n < GetParaPortions().Count(); n++ )
+ for ( sal_Int32 n = nParagraphTobeDeleted; n < GetParaPortions().Count(); n++ )
{
ParaPortion* pPP = GetParaPortions()[n];
pPP->MarkSelectionInvalid( 0, pPP->GetNode()->Len() );
@@ -2434,14 +2434,14 @@ EditPaM ImpEditEngine::ImpDeleteSelection(const EditSelection& rCurSel)
OSL_ENSURE( aStartPaM.GetIndex() <= aStartPaM.GetNode()->Len(), "Index out of range in ImpDeleteSelection" );
OSL_ENSURE( aEndPaM.GetIndex() <= aEndPaM.GetNode()->Len(), "Index out of range in ImpDeleteSelection" );
- sal_uInt16 nStartNode = aEditDoc.GetPos( aStartPaM.GetNode() );
- sal_uInt16 nEndNode = aEditDoc.GetPos( aEndPaM.GetNode() );
+ sal_Int32 nStartNode = aEditDoc.GetPos( aStartPaM.GetNode() );
+ sal_Int32 nEndNode = aEditDoc.GetPos( aEndPaM.GetNode() );
- OSL_ENSURE( nEndNode != USHRT_MAX, "Start > End ?!" );
+ OSL_ENSURE( nEndNode != EE_PARA_NOT_FOUND, "Start > End ?!" );
OSL_ENSURE( nStartNode <= nEndNode, "Start > End ?!" );
// Remove all nodes in between ....
- for ( sal_uLong z = nStartNode+1; z < nEndNode; z++ )
+ for ( sal_Int32 z = nStartNode+1; z < nEndNode; z++ )
{
// Always nStartNode+1, due to Remove()!
ImpRemoveParagraph( nStartNode+1 );
@@ -2482,14 +2482,14 @@ EditPaM ImpEditEngine::ImpDeleteSelection(const EditSelection& rCurSel)
return aStartPaM;
}
-void ImpEditEngine::ImpRemoveParagraph( sal_uInt16 nPara )
+void ImpEditEngine::ImpRemoveParagraph( sal_Int32 nPara )
{
ContentNode* pNode = aEditDoc.GetObject( nPara );
ContentNode* pNextNode = aEditDoc.GetObject( nPara+1 );
OSL_ENSURE( pNode, "Blind Node in ImpRemoveParagraph" );
- DeletedNodeInfo* pInf = new DeletedNodeInfo( (sal_uLong)pNode, nPara );
+ DeletedNodeInfo* pInf = new DeletedNodeInfo( (sal_uIntPtr)pNode, nPara );
aDeletedNodes.push_back(pInf);
// The node is managed by the undo and possibly destroyed!
@@ -2842,9 +2842,10 @@ EditPaM ImpEditEngine::ImpInsertParaBreak( const EditSelection& rCurSel, bool bK
EditPaM ImpEditEngine::ImpInsertParaBreak( EditPaM& rPaM, bool bKeepEndingAttribs )
{
- if ( aEditDoc.Count() >= 0xFFFE )
+ if ( aEditDoc.Count() >= EE_PARA_MAX_COUNT )
{
- OSL_FAIL( "Can't process more than 64K paragraphs!" );
+ SAL_WARN( "editeng", "ImpEditEngine::ImpInsertParaBreak - can't process more than "
+ << EE_PARA_MAX_COUNT << " paragraphs!");
return rPaM;
}
@@ -2889,7 +2890,7 @@ EditPaM ImpEditEngine::ImpInsertParaBreak( EditPaM& rPaM, bool bKeepEndingAttrib
// Optimization: Do not place unnecessarily many getPos to Listen!
// Here, as in undo, but also in all other methods.
- sal_uInt16 nPos = GetParaPortions().GetPos( pPortion );
+ sal_Int32 nPos = GetParaPortions().GetPos( pPortion );
ParaPortion* pNewPortion = new ParaPortion( aPaM.GetNode() );
GetParaPortions().Insert(nPos+1, pNewPortion);
ParaAttribsChanged( pNewPortion->GetNode() );
@@ -2901,7 +2902,7 @@ EditPaM ImpEditEngine::ImpInsertParaBreak( EditPaM& rPaM, bool bKeepEndingAttrib
return aPaM;
}
-EditPaM ImpEditEngine::ImpFastInsertParagraph( sal_uInt16 nPara )
+EditPaM ImpEditEngine::ImpFastInsertParagraph( sal_Int32 nPara )
{
if ( IsUndoEnabled() && !IsInUndo() )
{
@@ -2936,7 +2937,7 @@ EditPaM ImpEditEngine::InsertParaBreak( EditSelection aCurSel )
EditPaM aPaM( ImpInsertParaBreak( aCurSel ) );
if ( aStatus.DoAutoIndenting() )
{
- sal_uInt16 nPara = aEditDoc.GetPos( aPaM.GetNode() );
+ sal_Int32 nPara = aEditDoc.GetPos( aPaM.GetNode() );
OSL_ENSURE( nPara > 0, "AutoIndenting: Error!" );
XubString aPrevParaText( GetEditDoc().GetParaAsString( nPara-1 ) );
sal_uInt16 n = 0;
@@ -2968,8 +2969,8 @@ EditPaM ImpEditEngine::InsertField(const EditSelection& rCurSel, const SvxFieldI
sal_Bool ImpEditEngine::UpdateFields()
{
bool bChanges = false;
- sal_uInt16 nParas = GetEditDoc().Count();
- for ( sal_uInt16 nPara = 0; nPara < nParas; nPara++ )
+ sal_Int32 nParas = GetEditDoc().Count();
+ for ( sal_Int32 nPara = 0; nPara < nParas; nPara++ )
{
bool bChangesInPara = false;
ContentNode* pNode = GetEditDoc().GetObject( nPara );
@@ -3026,7 +3027,7 @@ Rectangle ImpEditEngine::PaMtoEditCursor( EditPaM aPaM, sal_uInt16 nFlags )
Rectangle aEditCursor;
long nY = 0;
- for ( sal_uInt16 nPortion = 0; nPortion < GetParaPortions().Count(); nPortion++ )
+ for ( sal_Int32 nPortion = 0; nPortion < GetParaPortions().Count(); nPortion++ )
{
ParaPortion* pPortion = GetParaPortions()[nPortion];
ContentNode* pNode = pPortion->GetNode();
@@ -3054,7 +3055,7 @@ EditPaM ImpEditEngine::GetPaM( Point aDocPos, sal_Bool bSmart )
long nY = 0;
long nTmpHeight;
EditPaM aPaM;
- sal_uInt16 nPortion;
+ sal_Int32 nPortion;
for ( nPortion = 0; nPortion < GetParaPortions().Count(); nPortion++ )
{
ParaPortion* pPortion = GetParaPortions()[nPortion];
@@ -3109,8 +3110,8 @@ sal_uInt32 ImpEditEngine::CalcTextWidth( sal_Bool bIgnoreExtraSpace )
// --------------------------------------------------
// Over all the paragraphs ...
// --------------------------------------------------
- sal_uInt16 nParas = GetParaPortions().Count();
- for ( sal_uInt16 nPara = 0; nPara < nParas; nPara++ )
+ sal_Int32 nParas = GetParaPortions().Count();
+ for ( sal_Int32 nPara = 0; nPara < nParas; nPara++ )
{
ParaPortion* pPortion = GetParaPortions()[nPara];
if ( pPortion->IsVisible() )
@@ -3161,7 +3162,7 @@ sal_uInt32 ImpEditEngine::CalcTextWidth( sal_Bool bIgnoreExtraSpace )
sal_uInt32 ImpEditEngine::CalcLineWidth( ParaPortion* pPortion, EditLine* pLine, sal_Bool bIgnoreExtraSpace )
{
- sal_uInt16 nPara = GetEditDoc().GetPos( pPortion->GetNode() );
+ sal_Int32 nPara = GetEditDoc().GetPos( pPortion->GetNode() );
// #114278# Saving both layout mode and language (since I'm
// potentially changing both)
@@ -3224,7 +3225,7 @@ sal_uInt32 ImpEditEngine::CalcTextHeight( sal_uInt32* pHeightNTP )
sal_uInt32 nY = 0;
sal_uInt32 nPH;
sal_uInt32 nEmptyHeight = 0;
- for ( sal_uInt16 nPortion = 0; nPortion < GetParaPortions().Count(); nPortion++ ) {
+ for ( sal_Int32 nPortion = 0; nPortion < GetParaPortions().Count(); nPortion++ ) {
ParaPortion* pPortion = GetParaPortions()[nPortion];
nPH = pPortion->GetHeight();
nY += nPH;
@@ -3242,9 +3243,9 @@ sal_uInt32 ImpEditEngine::CalcTextHeight( sal_uInt32* pHeightNTP )
return nY;
}
-sal_uInt16 ImpEditEngine::GetLineCount( sal_uInt16 nParagraph ) const
+sal_uInt16 ImpEditEngine::GetLineCount( sal_Int32 nParagraph ) const
{
- OSL_ENSURE( nParagraph < GetParaPortions().Count(), "GetLineCount: Out of range" );
+ OSL_ENSURE( 0 <= nParagraph && nParagraph < GetParaPortions().Count(), "GetLineCount: Out of range" );
const ParaPortion* pPPortion = GetParaPortions().SafeGetObject( nParagraph );
OSL_ENSURE( pPPortion, "Paragraph not found: GetLineCount" );
if ( pPPortion )
@@ -3253,9 +3254,9 @@ sal_uInt16 ImpEditEngine::GetLineCount( sal_uInt16 nParagraph ) const
return 0xFFFF;
}
-xub_StrLen ImpEditEngine::GetLineLen( sal_uInt16 nParagraph, sal_uInt16 nLine ) const
+xub_StrLen ImpEditEngine::GetLineLen( sal_Int32 nParagraph, sal_uInt16 nLine ) const
{
- OSL_ENSURE( nParagraph < GetParaPortions().Count(), "GetLineLen: Out of range" );
+ OSL_ENSURE( 0 <= nParagraph && nParagraph < GetParaPortions().Count(), "GetLineLen: Out of range" );
const ParaPortion* pPPortion = GetParaPortions().SafeGetObject( nParagraph );
OSL_ENSURE( pPPortion, "Paragraph not found: GetLineLen" );
if ( pPPortion && ( nLine < pPPortion->GetLines().Count() ) )
@@ -3268,9 +3269,9 @@ xub_StrLen ImpEditEngine::GetLineLen( sal_uInt16 nParagraph, sal_uInt16 nLine )
return 0xFFFF;
}
-void ImpEditEngine::GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nParagraph, sal_uInt16 nLine ) const
+void ImpEditEngine::GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_Int32 nParagraph, sal_uInt16 nLine ) const
{
- OSL_ENSURE( nParagraph < GetParaPortions().Count(), "GetLineCount: Out of range" );
+ OSL_ENSURE( 0 <= nParagraph && nParagraph < GetParaPortions().Count(), "GetLineCount: Out of range" );
const ParaPortion* pPPortion = GetParaPortions().SafeGetObject( nParagraph );
OSL_ENSURE( pPPortion, "Paragraph not found: GetLineBoundaries" );
rStart = rEnd = 0xFFFF; // default values in case of error
@@ -3283,7 +3284,7 @@ void ImpEditEngine::GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uIn
}
}
-sal_uInt16 ImpEditEngine::GetLineNumberAtIndex( sal_uInt16 nPara, sal_uInt16 nIndex ) const
+sal_uInt16 ImpEditEngine::GetLineNumberAtIndex( sal_Int32 nPara, sal_uInt16 nIndex ) const
{
sal_uInt16 nLineNo = 0xFFFF;
const ContentNode* pNode = GetEditDoc().GetObject( nPara );
@@ -3310,9 +3311,9 @@ sal_uInt16 ImpEditEngine::GetLineNumberAtIndex( sal_uInt16 nPara, sal_uInt16 nIn
return nLineNo;
}
-sal_uInt16 ImpEditEngine::GetLineHeight( sal_uInt16 nParagraph, sal_uInt16 nLine )
+sal_uInt16 ImpEditEngine::GetLineHeight( sal_Int32 nParagraph, sal_uInt16 nLine )
{
- OSL_ENSURE( nParagraph < GetParaPortions().Count(), "GetLineCount: Out of range" );
+ OSL_ENSURE( 0 <= nParagraph && nParagraph < GetParaPortions().Count(), "GetLineCount: Out of range" );
ParaPortion* pPPortion = GetParaPortions().SafeGetObject( nParagraph );
OSL_ENSURE( pPPortion, "Paragraph not found: GetLineHeight" );
if ( pPPortion && ( nLine < pPPortion->GetLines().Count() ) )
@@ -3325,7 +3326,7 @@ sal_uInt16 ImpEditEngine::GetLineHeight( sal_uInt16 nParagraph, sal_uInt16 nLine
return 0xFFFF;
}
-sal_uInt32 ImpEditEngine::GetParaHeight( sal_uInt16 nParagraph )
+sal_uInt32 ImpEditEngine::GetParaHeight( sal_Int32 nParagraph )
{
sal_uInt32 nHeight = 0;
@@ -3356,7 +3357,7 @@ void ImpEditEngine::UpdateSelections()
{
// Use ParaPortions, as now also hidden paragraphs have to be
// taken into account!
- sal_uInt16 nPara = rInf.GetPosition();
+ sal_Int32 nPara = rInf.GetPosition();
ParaPortion* pPPortion = GetParaPortions().SafeGetObject( nPara );
if ( !pPPortion ) // Last paragraph
{
@@ -3365,8 +3366,8 @@ void ImpEditEngine::UpdateSelections()
}
OSL_ENSURE( pPPortion, "Empty Document in UpdateSelections ?" );
// Do not end up from a hidden paragraph:
- sal_uInt16 nCurPara = nPara;
- sal_uInt16 nLastPara = GetParaPortions().Count()-1;
+ sal_Int32 nCurPara = nPara;
+ sal_Int32 nLastPara = GetParaPortions().Count()-1;
while ( nPara <= nLastPara && !GetParaPortions()[nPara]->IsVisible() )
nPara++;
if ( nPara > nLastPara ) // then also backwards ...
@@ -3404,7 +3405,7 @@ void ImpEditEngine::UpdateSelections()
}
EditSelection ImpEditEngine::ConvertSelection(
- sal_uInt16 nStartPara, sal_uInt16 nStartPos, sal_uInt16 nEndPara, sal_uInt16 nEndPos )
+ sal_Int32 nStartPara, sal_uInt16 nStartPos, sal_Int32 nEndPara, sal_uInt16 nEndPos )
{
EditSelection aNewSelection;
@@ -3836,7 +3837,7 @@ Range ImpEditEngine::GetLineXPosStartEnd( const ParaPortion* pParaPortion, const
{
Range aLineXPosStartEnd;
- sal_uInt16 nPara = GetEditDoc().GetPos( pParaPortion->GetNode() );
+ sal_Int32 nPara = GetEditDoc().GetPos( pParaPortion->GetNode() );
if ( !IsRightToLeft( nPara ) )
{
aLineXPosStartEnd.Min() = pLine->GetStartPosX();
@@ -3873,7 +3874,7 @@ long ImpEditEngine::GetPortionXOffset(
}
}
- sal_uInt16 nPara = GetEditDoc().GetPos( pParaPortion->GetNode() );
+ sal_Int32 nPara = GetEditDoc().GetPos( pParaPortion->GetNode() );
sal_Bool bR2LPara = IsRightToLeft( nPara );
const TextPortion* pDestPortion = pParaPortion->GetTextPortions()[nTextPortion];
@@ -4100,7 +4101,7 @@ void ImpEditEngine::CalcHeight( ParaPortion* pPortion )
pPortion->nHeight += nSBL;
}
- sal_uInt16 nPortion = GetParaPortions().GetPos( pPortion );
+ sal_Int32 nPortion = GetParaPortions().GetPos( pPortion );
if ( nPortion || aStatus.ULSpaceFirstParagraph() )
{
sal_uInt16 nUpper = GetYValue( rULItem.GetUpper() );
@@ -4287,7 +4288,7 @@ void ImpEditEngine::IndentBlock( EditView* pEditView, sal_Bool bRight )
{
ESelection aNewSel = aESel;
aNewSel.nStartPos = 0;
- aNewSel.nEndPos = 0xFFFF;
+ aNewSel.nEndPos = EE_TEXTPOS_ALL;
if ( aESel.nEndPos == 0 )
{
@@ -4300,7 +4301,7 @@ void ImpEditEngine::IndentBlock( EditView* pEditView, sal_Bool bRight )
pEditView->pImpEditView->GetEditSelection().Max() );
UndoActionStart( bRight ? EDITUNDO_INDENTBLOCK : EDITUNDO_UNINDENTBLOCK );
- for ( sal_uInt16 nPara = aESel.nStartPara; nPara <= aESel.nEndPara; nPara++ )
+ for ( sal_Int32 nPara = aESel.nStartPara; nPara <= aESel.nEndPara; nPara++ )
{
ContentNode* pNode = GetEditDoc().GetObject( nPara );
if ( bRight )
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index d56ea0e11faf..a247a2cd5265 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -350,7 +350,7 @@ void ImpEditEngine::CheckIdleFormatter()
void ImpEditEngine::FormatFullDoc()
{
- for ( sal_uInt16 nPortion = 0; nPortion < GetParaPortions().Count(); nPortion++ )
+ for ( sal_Int32 nPortion = 0; nPortion < GetParaPortions().Count(); nPortion++ )
GetParaPortions()[nPortion]->MarkSelectionInvalid( 0, GetParaPortions()[nPortion]->GetNode()->Len() );
FormatDoc();
}
@@ -377,7 +377,7 @@ void ImpEditEngine::FormatDoc()
sal_Bool bMapChanged = ImpCheckRefMapMode();
aInvalidRec = Rectangle(); // make empty
- for ( sal_uInt16 nPara = 0; nPara < GetParaPortions().Count(); nPara++ )
+ for ( sal_Int32 nPara = 0; nPara < GetParaPortions().Count(); nPara++ )
{
ParaPortion* pParaPortion = GetParaPortions()[nPara];
if ( pParaPortion->MustRepaint() || ( pParaPortion->IsInvalid() && pParaPortion->IsVisible() ) )
@@ -398,7 +398,7 @@ void ImpEditEngine::FormatDoc()
if ( !bGrow && GetTextRanger() )
{
// For a change in height all below must be reformatted ...
- for ( sal_uInt16 n = nPara+1; n < GetParaPortions().Count(); n++ )
+ for ( sal_Int32 n = nPara+1; n < GetParaPortions().Count(); n++ )
{
ParaPortion* pPP = GetParaPortions()[n];
pPP->MarkSelectionInvalid( 0, pPP->GetNode()->Len() );
@@ -532,7 +532,7 @@ void ImpEditEngine::CheckAutoPageSize()
{
// If ahead is centered / right or tabs ...
aStatus.GetStatusWord() |= !IsVertical() ? EE_STAT_TEXTWIDTHCHANGED : EE_STAT_TEXTHEIGHTCHANGED;
- for ( sal_uInt16 nPara = 0; nPara < GetParaPortions().Count(); nPara++ )
+ for ( sal_Int32 nPara = 0; nPara < GetParaPortions().Count(); nPara++ )
{
// Only paragraphs which are not aligned to the left need to be
// reformatted, the height can not be changed here anymore.
@@ -575,7 +575,7 @@ static sal_Int32 ImplCalculateFontIndependentLineSpacing( const sal_Int32 nFontH
return ( nFontHeight * 12 ) / 10; // + 20%
}
-sal_Bool ImpEditEngine::CreateLines( sal_uInt16 nPara, sal_uInt32 nStartPosY )
+sal_Bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY )
{
ParaPortion* pParaPortion = GetParaPortions()[nPara];
@@ -1631,7 +1631,7 @@ void ImpEditEngine::CreateAndInsertEmptyLine( ParaPortion* pParaPortion, sal_uIn
if ( !aStatus.IsOutliner() )
{
- sal_uInt16 nPara = GetParaPortions().GetPos( pParaPortion );
+ sal_Int32 nPara = GetParaPortions().GetPos( pParaPortion );
SvxAdjust eJustification = GetJustification( nPara );
long nMaxLineWidth = !IsVertical() ? aPaperSize.Width() : aPaperSize.Height();
nMaxLineWidth -= GetXValue( rLRItem.GetRight() );
@@ -1672,7 +1672,7 @@ void ImpEditEngine::CreateAndInsertEmptyLine( ParaPortion* pParaPortion, sal_uIn
}
else if ( rLSItem.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_PROP )
{
- sal_uInt16 nPara = GetParaPortions().GetPos( pParaPortion );
+ sal_Int32 nPara = GetParaPortions().GetPos( pParaPortion );
if ( nPara || IsFixedCellHeight() || pTmpLine->GetStartPortion() ) // Not the very first line
{
// There are documents with PropLineSpace 0, why?
@@ -2503,7 +2503,7 @@ void ImpEditEngine::SetTextRanger( TextRanger* pRanger )
delete pTextRanger;
pTextRanger = pRanger;
- for ( sal_uInt16 nPara = 0; nPara < GetParaPortions().Count(); nPara++ )
+ for ( sal_Int32 nPara = 0; nPara < GetParaPortions().Count(); nPara++ )
{
ParaPortion* pParaPortion = GetParaPortions()[nPara];
pParaPortion->MarkSelectionInvalid( 0, pParaPortion->GetNode()->Len() );
@@ -2874,7 +2874,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta
// --------------------------------------------------
// Over all the paragraphs ...
// --------------------------------------------------
- for ( sal_uInt16 n = 0; n < GetParaPortions().Count(); n++ )
+ for ( sal_Int32 n = 0; n < GetParaPortions().Count(); n++ )
{
const ParaPortion* pPortion = GetParaPortions()[n];
DBG_ASSERT( pPortion, "NULL-Pointer in TokenList in Paint" );
@@ -3837,7 +3837,7 @@ void ImpEditEngine::Paint( ImpEditView* pView, const Rectangle& rRec, sal_Bool b
}
-void ImpEditEngine::InsertContent( ContentNode* pNode, sal_uInt16 nPos )
+void ImpEditEngine::InsertContent( ContentNode* pNode, sal_Int32 nPos )
{
DBG_ASSERT( pNode, "NULL-Pointer in InsertContent! " );
DBG_ASSERT( IsInUndo(), "InsertContent only for Undo()!" );
@@ -3848,7 +3848,7 @@ void ImpEditEngine::InsertContent( ContentNode* pNode, sal_uInt16 nPos )
GetEditEnginePtr()->ParagraphInserted( nPos );
}
-EditPaM ImpEditEngine::SplitContent( sal_uInt16 nNode, sal_uInt16 nSepPos )
+EditPaM ImpEditEngine::SplitContent( sal_Int32 nNode, sal_uInt16 nSepPos )
{
ContentNode* pNode = aEditDoc.GetObject( nNode );
DBG_ASSERT( pNode, "Invalid Node in SplitContent" );
@@ -3858,7 +3858,7 @@ EditPaM ImpEditEngine::SplitContent( sal_uInt16 nNode, sal_uInt16 nSepPos )
return ImpInsertParaBreak( aPaM );
}
-EditPaM ImpEditEngine::ConnectContents( sal_uInt16 nLeftNode, sal_Bool bBackward )
+EditPaM ImpEditEngine::ConnectContents( sal_Int32 nLeftNode, sal_Bool bBackward )
{
ContentNode* pLeftNode = aEditDoc.GetObject( nLeftNode );
ContentNode* pRightNode = aEditDoc.GetObject( nLeftNode+1 );
@@ -3883,7 +3883,7 @@ void ImpEditEngine::SetUpdateMode( bool bUp, EditView* pCurView, sal_Bool bForce
FormatAndUpdate( pCurView );
}
-void ImpEditEngine::ShowParagraph( sal_uInt16 nParagraph, bool bShow )
+void ImpEditEngine::ShowParagraph( sal_Int32 nParagraph, bool bShow )
{
ParaPortion* pPPortion = GetParaPortions().SafeGetObject( nParagraph );
DBG_ASSERT( pPPortion, "ShowParagraph: Paragraph does not exist! ");
@@ -3935,7 +3935,7 @@ void ImpEditEngine::ShowParagraph( sal_uInt16 nParagraph, bool bShow )
}
}
-EditSelection ImpEditEngine::MoveParagraphs( Range aOldPositions, sal_uInt16 nNewPos, EditView* pCurView )
+EditSelection ImpEditEngine::MoveParagraphs( Range aOldPositions, sal_Int32 nNewPos, EditView* pCurView )
{
DBG_ASSERT( GetParaPortions().Count() != 0, "No paragraphs found: MoveParagraphs" );
if ( GetParaPortions().Count() == 0 )
@@ -3954,8 +3954,8 @@ EditSelection ImpEditEngine::MoveParagraphs( Range aOldPositions, sal_uInt16 nNe
{
// in this case one can redraw directly whithout invalidating the
// Portions
- sal_uInt16 nFirstPortion = Min( (sal_uInt16)aOldPositions.Min(), nNewPos );
- sal_uInt16 nLastPortion = Max( (sal_uInt16)aOldPositions.Max(), nNewPos );
+ sal_Int32 nFirstPortion = std::min( static_cast<sal_Int32>(aOldPositions.Min()), nNewPos );
+ sal_Int32 nLastPortion = std::max( static_cast<sal_Int32>(aOldPositions.Max()), nNewPos );
ParaPortion* pUpperPortion = GetParaPortions().SafeGetObject( nFirstPortion );
ParaPortion* pLowerPortion = GetParaPortions().SafeGetObject( nLastPortion );
@@ -3971,13 +3971,13 @@ EditSelection ImpEditEngine::MoveParagraphs( Range aOldPositions, sal_uInt16 nNe
else
{
// redraw from the upper invalid position
- sal_uInt16 nFirstInvPara = Min( (sal_uInt16)aOldPositions.Min(), nNewPos );
+ sal_Int32 nFirstInvPara = std::min( static_cast<sal_Int32>(aOldPositions.Min()), nNewPos );
InvalidateFromParagraph( nFirstInvPara );
}
return aSel;
}
-void ImpEditEngine::InvalidateFromParagraph( sal_uInt16 nFirstInvPara )
+void ImpEditEngine::InvalidateFromParagraph( sal_Int32 nFirstInvPara )
{
// The following paragraphs are not invalidated, since ResetHeight()
// => size change => all the following are re-issued anyway.
@@ -4037,7 +4037,7 @@ ContentNode* ImpEditEngine::GetNextVisNode( ContentNode* pCurNode )
const ParaPortion* ImpEditEngine::GetPrevVisPortion( const ParaPortion* pCurPortion ) const
{
- sal_uInt16 nPara = GetParaPortions().GetPos( pCurPortion );
+ sal_Int32 nPara = GetParaPortions().GetPos( pCurPortion );
DBG_ASSERT( nPara < GetParaPortions().Count() , "Portion not found: GetPrevVisPortion" );
const ParaPortion* pPortion = nPara ? GetParaPortions()[--nPara] : 0;
while ( pPortion && !pPortion->IsVisible() )
@@ -4048,7 +4048,7 @@ const ParaPortion* ImpEditEngine::GetPrevVisPortion( const ParaPortion* pCurPort
const ParaPortion* ImpEditEngine::GetNextVisPortion( const ParaPortion* pCurPortion ) const
{
- sal_uInt16 nPara = GetParaPortions().GetPos( pCurPortion );
+ sal_Int32 nPara = GetParaPortions().GetPos( pCurPortion );
DBG_ASSERT( nPara < GetParaPortions().Count() , "Portion not found: GetPrevVisNode" );
const ParaPortion* pPortion = GetParaPortions().SafeGetObject( ++nPara );
while ( pPortion && !pPortion->IsVisible() )
@@ -4062,9 +4062,9 @@ long ImpEditEngine::CalcVertLineSpacing(Point& rStartPos) const
long nTotalOccupiedHeight = 0;
sal_uInt16 nTotalLineCount = 0;
const ParaPortionList& rParaPortions = GetParaPortions();
- sal_uInt16 nParaCount = rParaPortions.Count();
+ sal_Int32 nParaCount = rParaPortions.Count();
- for (sal_uInt16 i = 0; i < nParaCount; ++i)
+ for (sal_Int32 i = 0; i < nParaCount; ++i)
{
if (GetVerJustification(i) != SVX_VER_JUSTIFY_BLOCK)
// All paragraphs must have the block justification set.
@@ -4105,7 +4105,7 @@ long ImpEditEngine::CalcVertLineSpacing(Point& rStartPos) const
return nTotalSpace / (nTotalLineCount-1);
}
-EditPaM ImpEditEngine::InsertParagraph( sal_uInt16 nPara )
+EditPaM ImpEditEngine::InsertParagraph( sal_Int32 nPara )
{
EditPaM aPaM;
if ( nPara != 0 )
@@ -4125,7 +4125,7 @@ EditPaM ImpEditEngine::InsertParagraph( sal_uInt16 nPara )
return ImpInsertParaBreak( aPaM );
}
-EditSelection* ImpEditEngine::SelectParagraph( sal_uInt16 nPara )
+EditSelection* ImpEditEngine::SelectParagraph( sal_Int32 nPara )
{
EditSelection* pSel = 0;
ContentNode* pNode = GetEditDoc().GetObject( nPara );
@@ -4200,9 +4200,9 @@ const SvxNumberFormat* ImpEditEngine::GetNumberFormat( const ContentNode *pNode
if (pNode)
{
// get index of paragraph
- sal_uInt16 nPara = GetEditDoc().GetPos( const_cast< ContentNode * >(pNode) );
- DBG_ASSERT( nPara < USHRT_MAX, "node not found in array" );
- if (nPara < USHRT_MAX)
+ sal_Int32 nPara = GetEditDoc().GetPos( const_cast< ContentNode * >(pNode) );
+ DBG_ASSERT( nPara < EE_PARA_NOT_FOUND, "node not found in array" );
+ if (nPara < EE_PARA_NOT_FOUND)
{
// the called function may be overloaded by an OutlinerEditEng object to provide
// access to the SvxNumberFormat of the Outliner.
@@ -4304,7 +4304,7 @@ void ImpEditEngine::ImplInitDigitMode( OutputDevice* pOutDev, String* pString, x
}
}
-void ImpEditEngine::ImplInitLayoutMode( OutputDevice* pOutDev, sal_uInt16 nPara, sal_uInt16 nIndex )
+void ImpEditEngine::ImplInitLayoutMode( OutputDevice* pOutDev, sal_Int32 nPara, sal_uInt16 nIndex )
{
sal_Bool bCTL = sal_False;
sal_Bool bR2L = sal_False;
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index d66e1b55d31b..76f0246fdeb0 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -233,7 +233,7 @@ void ImpEditEngine::Write( SvStream& rOutput, EETextFormat eFormat, EditSelectio
sal_uInt32 ImpEditEngine::WriteText( SvStream& rOutput, EditSelection aSel )
{
- sal_uInt16 nStartNode, nEndNode;
+ sal_Int32 nStartNode, nEndNode;
sal_Bool bRange = aSel.HasRange();
if ( bRange )
{
@@ -248,7 +248,7 @@ sal_uInt32 ImpEditEngine::WriteText( SvStream& rOutput, EditSelection aSel )
}
// iterate over the paragraphs ...
- for ( sal_uInt16 nNode = nStartNode; nNode <= nEndNode; nNode++ )
+ for ( sal_Int32 nNode = nStartNode; nNode <= nEndNode; nNode++ )
{
ContentNode* pNode = aEditDoc.GetObject( nNode );
DBG_ASSERT( pNode, "Node not founden: Search&Replace" );
@@ -269,7 +269,7 @@ sal_uInt32 ImpEditEngine::WriteText( SvStream& rOutput, EditSelection aSel )
return rOutput.GetError();
}
-sal_Bool ImpEditEngine::WriteItemListAsRTF( ItemList& rLst, SvStream& rOutput, sal_uInt16 nPara, sal_uInt16 nPos,
+sal_Bool ImpEditEngine::WriteItemListAsRTF( ItemList& rLst, SvStream& rOutput, sal_Int32 nPara, sal_uInt16 nPos,
std::vector<SvxFontItem*>& rFontTable, SvxColorList& rColorList )
{
const SfxPoolItem* pAttrItem = rLst.First();
@@ -336,7 +336,7 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel )
if ( !IsFormatted() )
FormatDoc();
- sal_uInt16 nStartNode, nEndNode;
+ sal_Int32 nStartNode, nEndNode;
aSel.Adjust( aEditDoc );
nStartNode = aEditDoc.GetPos( aSel.Min().GetNode() );
@@ -540,7 +540,7 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel )
// iterate over the paragraphs ...
rOutput << '{' << endl;
- for ( sal_uInt16 nNode = nStartNode; nNode <= nEndNode; nNode++ )
+ for ( sal_Int32 nNode = nStartNode; nNode <= nEndNode; nNode++ )
{
ContentNode* pNode = aEditDoc.GetObject( nNode );
DBG_ASSERT( pNode, "Node not found: Search&Replace" );
@@ -699,7 +699,7 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel )
}
-void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, sal_uInt16 nPara, sal_uInt16 nPos,
+void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, sal_Int32 nPara, sal_uInt16 nPos,
std::vector<SvxFontItem*>& rFontTable, SvxColorList& rColorList )
{
sal_uInt16 nWhich = rItem.Which();
@@ -1029,7 +1029,7 @@ EditTextObject* ImpEditEngine::CreateBinTextObject( EditSelection aSel, SfxItemP
if ( pTxtObj->IsOwnerOfPool() )
pTxtObj->GetPool()->SetDefaultMetric( (SfxMapUnit) eMapUnit );
- sal_uInt16 nStartNode, nEndNode;
+ sal_Int32 nStartNode, nEndNode;
sal_uInt32 nTextPortions = 0;
aSel.Adjust( aEditDoc );
@@ -1045,7 +1045,7 @@ EditTextObject* ImpEditEngine::CreateBinTextObject( EditSelection aSel, SfxItemP
pTxtObj->SetScriptType( GetScriptType( aSel ) );
// iterate over the paragraphs ...
- sal_uInt16 nNode;
+ sal_Int32 nNode;
for ( nNode = nStartNode; nNode <= nEndNode; nNode++ )
{
ContentNode* pNode = aEditDoc.GetObject( nNode );
@@ -1230,10 +1230,14 @@ EditSelection ImpEditEngine::InsertBinTextObject( BinTextObject& rTextObject, Ed
bConvertItems = sal_True;
}
- size_t nContents = rTextObject.GetContents().size();
- sal_uInt16 nPara = aEditDoc.GetPos( aPaM.GetNode() );
+ // Before, paragraph count was of type sal_uInt16 so if nContents exceeded
+ // 0xFFFF this wouldn't had worked anyway, given that nPara is used to
+ // number paragraphs and is fearlessly incremented.
+ sal_Int32 nContents = static_cast<sal_Int32>(rTextObject.GetContents().size());
+ SAL_WARN_IF( nContents < 0, "editeng", "ImpEditEngine::InsertTextObject - contents overflow " << nContents);
+ sal_Int32 nPara = aEditDoc.GetPos( aPaM.GetNode() );
- for (size_t n = 0; n < nContents; ++n, ++nPara)
+ for (sal_Int32 n = 0; n < nContents; ++n, ++nPara)
{
ContentInfo* pC = &rTextObject.GetContents()[n];
sal_Bool bNewContent = aPaM.GetNode()->Len() ? sal_False: sal_True;
@@ -1483,8 +1487,8 @@ sal_Bool ImpEditEngine::HasConvertibleTextPortion( LanguageType nSrcLang )
{
sal_Bool bHasConvTxt = sal_False;
- sal_uInt16 nParas = pEditEngine->GetParagraphCount();
- for (sal_uInt16 k = 0; k < nParas; ++k)
+ sal_Int32 nParas = pEditEngine->GetParagraphCount();
+ for (sal_Int32 k = 0; k < nParas; ++k)
{
std::vector<sal_uInt16> aPortions;
pEditEngine->GetPortions( k, aPortions );
@@ -1661,7 +1665,7 @@ void ImpEditEngine::ImpConvert( rtl::OUString &rConvTxt, LanguageType &rConvTxtL
if (bAllowImplicitChangesForNotConvertibleText &&
!pEditEngine->GetText( pConvInfo->aConvContinue.nPara ).Len())
{
- sal_uInt16 nPara = pConvInfo->aConvContinue.nPara;
+ sal_Int32 nPara = pConvInfo->aConvContinue.nPara;
ESelection aESel( nPara, 0, nPara, 0 );
// see comment for below same function call
SetLanguageAndFont( aESel,
@@ -1679,7 +1683,7 @@ void ImpEditEngine::ImpConvert( rtl::OUString &rConvTxt, LanguageType &rConvTxtL
sal_uInt16 nCurPos = USHRT_MAX;
EPaM aCurStart = CreateEPaM( aCurSel.Min() );
std::vector<sal_uInt16> aPortions;
- pEditEngine->GetPortions( (sal_uInt16)aCurStart.nPara, aPortions );
+ pEditEngine->GetPortions( aCurStart.nPara, aPortions );
for ( size_t nPos = 0; nPos < aPortions.size(); ++nPos )
{
sal_uInt16 nEnd = aPortions[ nPos ];
@@ -2238,10 +2242,10 @@ void ImpEditEngine::DoOnlineSpelling( ContentNode* pThisNodeOnly, sal_Bool bSpel
sal_Bool bRestartTimer = sal_False;
ContentNode* pLastNode = aEditDoc.GetObject( aEditDoc.Count() - 1 );
- sal_uInt16 nNodes = GetEditDoc().Count();
- sal_uInt16 nInvalids = 0;
+ sal_Int32 nNodes = GetEditDoc().Count();
+ sal_Int32 nInvalids = 0;
Sequence< PropertyValue > aEmptySeq;
- for ( sal_uInt16 n = 0; n < nNodes; n++ )
+ for ( sal_Int32 n = 0; n < nNodes; n++ )
{
ContentNode* pNode = GetEditDoc().GetObject( n );
if ( pThisNodeOnly )
@@ -2580,8 +2584,8 @@ sal_Bool ImpEditEngine::ImpSearch( const SvxSearchItem& rSearchItem,
sal_Bool bBack = rSearchItem.GetBackward();
sal_Bool bSearchInSelection = rSearchItem.GetSelection();
- sal_uInt16 nStartNode = aEditDoc.GetPos( rStartPos.GetNode() );
- sal_uInt16 nEndNode;
+ sal_Int32 nStartNode = aEditDoc.GetPos( rStartPos.GetNode() );
+ sal_Int32 nEndNode;
if ( bSearchInSelection )
{
nEndNode = aEditDoc.GetPos( bBack ? rSearchSelection.Min().GetNode() : rSearchSelection.Max().GetNode() );
@@ -2594,12 +2598,12 @@ sal_Bool ImpEditEngine::ImpSearch( const SvxSearchItem& rSearchItem,
utl::TextSearch aSearcher( aSearchOptions );
// iterate over the paragraphs ...
- for ( sal_uInt16 nNode = nStartNode;
+ for ( sal_Int32 nNode = nStartNode;
bBack ? ( nNode >= nEndNode ) : ( nNode <= nEndNode) ;
bBack ? nNode-- : nNode++ )
{
// For backwards-search if nEndNode = 0:
- if ( nNode >= 0xFFFF )
+ if ( nNode < 0 )
return sal_False;
ContentNode* pNode = aEditDoc.GetObject( nNode );
@@ -2689,8 +2693,8 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection,
EditSelection aNewSel( aSel );
- const sal_uInt16 nStartNode = aEditDoc.GetPos( aSel.Min().GetNode() );
- const sal_uInt16 nEndNode = aEditDoc.GetPos( aSel.Max().GetNode() );
+ const sal_Int32 nStartNode = aEditDoc.GetPos( aSel.Min().GetNode() );
+ const sal_Int32 nEndNode = aEditDoc.GetPos( aSel.Max().GetNode() );
sal_Bool bChanges = sal_False;
sal_Bool bLenChanged = sal_False;
@@ -2699,7 +2703,7 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection,
utl::TransliterationWrapper aTranslitarationWrapper( ::comphelper::getProcessComponentContext(), nTransliterationMode );
sal_Bool bConsiderLanguage = aTranslitarationWrapper.needLanguageForTheMode();
- for ( sal_uInt16 nNode = nStartNode; nNode <= nEndNode; nNode++ )
+ for ( sal_Int32 nNode = nStartNode; nNode <= nEndNode; nNode++ )
{
ContentNode* pNode = aEditDoc.GetObject( nNode );
const XubString& aNodeStr = pNode->GetString();
@@ -2965,7 +2969,7 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection,
if (aSel.Max().GetNode() == rData.aSelection.Max().GetNode())
aNewSel.Max().GetIndex() = aNewSel.Max().GetIndex() + nDiffs;
- sal_uInt16 nSelNode = aEditDoc.GetPos( rData.aSelection.Min().GetNode() );
+ sal_Int32 nSelNode = aEditDoc.GetPos( rData.aSelection.Min().GetNode() );
ParaPortion* pParaPortion = GetParaPortions()[nSelNode];
pParaPortion->MarkSelectionInvalid( rData.nStart,
std::max< sal_uInt16 >( rData.nStart + rData.nLen,
diff --git a/editeng/source/editeng/impedit5.cxx b/editeng/source/editeng/impedit5.cxx
index 0918594ee59d..e3ed4f7d8f2e 100644
--- a/editeng/source/editeng/impedit5.cxx
+++ b/editeng/source/editeng/impedit5.cxx
@@ -35,13 +35,13 @@ void ImpEditEngine::SetStyleSheetPool( SfxStyleSheetPool* pSPool )
}
}
-const SfxStyleSheet* ImpEditEngine::GetStyleSheet( sal_uInt16 nPara ) const
+const SfxStyleSheet* ImpEditEngine::GetStyleSheet( sal_Int32 nPara ) const
{
const ContentNode* pNode = aEditDoc.GetObject( nPara );
return pNode ? pNode->GetContentAttribs().GetStyleSheet() : NULL;
}
-SfxStyleSheet* ImpEditEngine::GetStyleSheet( sal_uInt16 nPara )
+SfxStyleSheet* ImpEditEngine::GetStyleSheet( sal_Int32 nPara )
{
ContentNode* pNode = aEditDoc.GetObject( nPara );
return pNode ? pNode->GetContentAttribs().GetStyleSheet() : NULL;
@@ -51,19 +51,19 @@ void ImpEditEngine::SetStyleSheet( EditSelection aSel, SfxStyleSheet* pStyle )
{
aSel.Adjust( aEditDoc );
- sal_uInt16 nStartPara = aEditDoc.GetPos( aSel.Min().GetNode() );
- sal_uInt16 nEndPara = aEditDoc.GetPos( aSel.Max().GetNode() );
+ sal_Int32 nStartPara = aEditDoc.GetPos( aSel.Min().GetNode() );
+ sal_Int32 nEndPara = aEditDoc.GetPos( aSel.Max().GetNode() );
sal_Bool _bUpdate = GetUpdateMode();
SetUpdateMode( sal_False );
- for ( sal_uInt16 n = nStartPara; n <= nEndPara; n++ )
+ for ( sal_Int32 n = nStartPara; n <= nEndPara; n++ )
SetStyleSheet( n, pStyle );
SetUpdateMode( _bUpdate, 0 );
}
-void ImpEditEngine::SetStyleSheet( sal_uInt16 nPara, SfxStyleSheet* pStyle )
+void ImpEditEngine::SetStyleSheet( sal_Int32 nPara, SfxStyleSheet* pStyle )
{
DBG_ASSERT( GetStyleSheetPool() || !pStyle, "SetStyleSheet: No StyleSheetPool registered!" );
ContentNode* pNode = aEditDoc.GetObject( nPara );
@@ -102,7 +102,7 @@ void ImpEditEngine::UpdateParagraphsWithStyleSheet( SfxStyleSheet* pStyle )
CreateFont( aFontFromStyle, pStyle->GetItemSet() );
sal_Bool bUsed = sal_False;
- for ( sal_uInt16 nNode = 0; nNode < aEditDoc.Count(); nNode++ )
+ for ( sal_Int32 nNode = 0; nNode < aEditDoc.Count(); nNode++ )
{
ContentNode* pNode = aEditDoc.GetObject( nNode );
if ( pNode->GetStyleSheet() == pStyle )
@@ -125,7 +125,7 @@ void ImpEditEngine::UpdateParagraphsWithStyleSheet( SfxStyleSheet* pStyle )
void ImpEditEngine::RemoveStyleFromParagraphs( SfxStyleSheet* pStyle )
{
- for ( sal_uInt16 nNode = 0; nNode < aEditDoc.Count(); nNode++ )
+ for ( sal_Int32 nNode = 0; nNode < aEditDoc.Count(); nNode++ )
{
ContentNode* pNode = aEditDoc.GetObject(nNode);
if ( pNode->GetStyleSheet() == pStyle )
@@ -184,8 +184,8 @@ EditUndoSetAttribs* ImpEditEngine::CreateAttribUndo( EditSelection aSel, const S
ESelection aESel( CreateESel( aSel ) );
- sal_uInt16 nStartNode = aEditDoc.GetPos( aSel.Min().GetNode() );
- sal_uInt16 nEndNode = aEditDoc.GetPos( aSel.Max().GetNode() );
+ sal_Int32 nStartNode = aEditDoc.GetPos( aSel.Min().GetNode() );
+ sal_Int32 nEndNode = aEditDoc.GetPos( aSel.Max().GetNode() );
DBG_ASSERT( nStartNode <= nEndNode, "CreateAttribUndo: Start > End ?!" );
@@ -203,7 +203,7 @@ EditUndoSetAttribs* ImpEditEngine::CreateAttribUndo( EditSelection aSel, const S
SfxItemPool* pPool = pUndo->GetNewAttribs().GetPool();
- for ( sal_uInt16 nPara = nStartNode; nPara <= nEndNode; nPara++ )
+ for ( sal_Int32 nPara = nStartNode; nPara <= nEndNode; nPara++ )
{
ContentNode* pNode = aEditDoc.GetObject( nPara );
DBG_ASSERT( aEditDoc.GetObject( nPara ), "Node not found: CreateAttribUndo" );
@@ -312,11 +312,11 @@ SfxItemSet ImpEditEngine::GetAttribs( EditSelection aSel, sal_Bool bOnlyHardAttr
SfxItemSet aCurSet( GetEmptyItemSet() );
- sal_uInt16 nStartNode = aEditDoc.GetPos( aSel.Min().GetNode() );
- sal_uInt16 nEndNode = aEditDoc.GetPos( aSel.Max().GetNode() );
+ sal_Int32 nStartNode = aEditDoc.GetPos( aSel.Min().GetNode() );
+ sal_Int32 nEndNode = aEditDoc.GetPos( aSel.Max().GetNode() );
// iterate over the paragraphs ...
- for ( sal_uInt16 nNode = nStartNode; nNode <= nEndNode; nNode++ )
+ for ( sal_Int32 nNode = nStartNode; nNode <= nEndNode; nNode++ )
{
ContentNode* pNode = aEditDoc.GetObject( nNode );
DBG_ASSERT( aEditDoc.GetObject( nNode ), "Node not found: GetAttrib" );
@@ -397,7 +397,7 @@ SfxItemSet ImpEditEngine::GetAttribs( EditSelection aSel, sal_Bool bOnlyHardAttr
}
-SfxItemSet ImpEditEngine::GetAttribs( sal_uInt16 nPara, sal_uInt16 nStart, sal_uInt16 nEnd, sal_uInt8 nFlags ) const
+SfxItemSet ImpEditEngine::GetAttribs( sal_Int32 nPara, sal_uInt16 nStart, sal_uInt16 nEnd, sal_uInt8 nFlags ) const
{
// Optimized function with less Puts(), which cause unnecessary cloning from default items.
// If this works, change GetAttribs( EditSelection ) to use this for each paragraph and merge the results!
@@ -498,8 +498,8 @@ void ImpEditEngine::SetAttribs( EditSelection aSel, const SfxItemSet& rSet, sal_
if ( ( nSpecial == ATTRSPECIAL_WHOLEWORD ) && !aSel.HasRange() )
aSel = SelectWord( aSel, ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES, sal_False );
- sal_uInt16 nStartNode = aEditDoc.GetPos( aSel.Min().GetNode() );
- sal_uInt16 nEndNode = aEditDoc.GetPos( aSel.Max().GetNode() );
+ sal_Int32 nStartNode = aEditDoc.GetPos( aSel.Min().GetNode() );
+ sal_Int32 nEndNode = aEditDoc.GetPos( aSel.Max().GetNode() );
if ( IsUndoEnabled() && !IsInUndo() && aStatus.DoUndoAttribs() )
{
@@ -517,7 +517,7 @@ void ImpEditEngine::SetAttribs( EditSelection aSel, const SfxItemSet& rSet, sal_
}
// iterate over the paragraphs ...
- for ( sal_uInt16 nNode = nStartNode; nNode <= nEndNode; nNode++ )
+ for ( sal_Int32 nNode = nStartNode; nNode <= nEndNode; nNode++ )
{
sal_Bool bParaAttribFound = sal_False;
sal_Bool bCharAttribFound = sal_False;
@@ -591,8 +591,8 @@ void ImpEditEngine::RemoveCharAttribs( EditSelection aSel, sal_Bool bRemoveParaA
{
aSel.Adjust( aEditDoc );
- sal_uInt16 nStartNode = aEditDoc.GetPos( aSel.Min().GetNode() );
- sal_uInt16 nEndNode = aEditDoc.GetPos( aSel.Max().GetNode() );
+ sal_Int32 nStartNode = aEditDoc.GetPos( aSel.Min().GetNode() );
+ sal_Int32 nEndNode = aEditDoc.GetPos( aSel.Max().GetNode() );
const SfxItemSet* _pEmptyItemSet = bRemoveParaAttribs ? &GetEmptyItemSet() : 0;
@@ -607,7 +607,7 @@ void ImpEditEngine::RemoveCharAttribs( EditSelection aSel, sal_Bool bRemoveParaA
}
// iterate over the paragraphs ...
- for ( sal_uInt16 nNode = nStartNode; nNode <= nEndNode; nNode++ )
+ for ( sal_Int32 nNode = nStartNode; nNode <= nEndNode; nNode++ )
{
ContentNode* pNode = aEditDoc.GetObject( nNode );
ParaPortion* pPortion = GetParaPortions()[nNode];
@@ -653,7 +653,7 @@ void ImpEditEngine::RemoveCharAttribs( EditSelection aSel, sal_Bool bRemoveParaA
}
}
-void ImpEditEngine::RemoveCharAttribs( sal_uInt16 nPara, sal_uInt16 nWhich, sal_Bool bRemoveFeatures )
+void ImpEditEngine::RemoveCharAttribs( sal_Int32 nPara, sal_uInt16 nWhich, sal_Bool bRemoveFeatures )
{
ContentNode* pNode = aEditDoc.GetObject( nPara );
ParaPortion* pPortion = GetParaPortions().SafeGetObject( nPara );
@@ -682,7 +682,7 @@ void ImpEditEngine::RemoveCharAttribs( sal_uInt16 nPara, sal_uInt16 nWhich, sal_
pPortion->MarkSelectionInvalid( 0, pNode->Len() );
}
-void ImpEditEngine::SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& rSet )
+void ImpEditEngine::SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet )
{
ContentNode* pNode = aEditDoc.GetObject( nPara );
@@ -712,14 +712,14 @@ void ImpEditEngine::SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& rSet )
}
}
-const SfxItemSet& ImpEditEngine::GetParaAttribs( sal_uInt16 nPara ) const
+const SfxItemSet& ImpEditEngine::GetParaAttribs( sal_Int32 nPara ) const
{
const ContentNode* pNode = aEditDoc.GetObject( nPara );
DBG_ASSERT( pNode, "Node not found: GetParaAttribs" );
return pNode->GetContentAttribs().GetItems();
}
-bool ImpEditEngine::HasParaAttrib( sal_uInt16 nPara, sal_uInt16 nWhich ) const
+bool ImpEditEngine::HasParaAttrib( sal_Int32 nPara, sal_uInt16 nWhich ) const
{
const ContentNode* pNode = aEditDoc.GetObject( nPara );
DBG_ASSERT( pNode, "Node not found: HasParaAttrib" );
@@ -727,7 +727,7 @@ bool ImpEditEngine::HasParaAttrib( sal_uInt16 nPara, sal_uInt16 nWhich ) const
return pNode->GetContentAttribs().HasItem( nWhich );
}
-const SfxPoolItem& ImpEditEngine::GetParaAttrib( sal_uInt16 nPara, sal_uInt16 nWhich ) const
+const SfxPoolItem& ImpEditEngine::GetParaAttrib( sal_Int32 nPara, sal_uInt16 nWhich ) const
{
const ContentNode* pNode = aEditDoc.GetObject( nPara );
DBG_ASSERT( pNode, "Node not found: GetParaAttrib" );
@@ -735,7 +735,7 @@ const SfxPoolItem& ImpEditEngine::GetParaAttrib( sal_uInt16 nPara, sal_uInt16 nW
return pNode->GetContentAttribs().GetItem( nWhich );
}
-void ImpEditEngine::GetCharAttribs( sal_uInt16 nPara, std::vector<EECharAttrib>& rLst ) const
+void ImpEditEngine::GetCharAttribs( sal_Int32 nPara, std::vector<EECharAttrib>& rLst ) const
{
rLst.clear();
const ContentNode* pNode = aEditDoc.GetObject( nPara );
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 04:31:50 +0000