summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-12-03 11:34:12 +0200
committerNoel Grandin <noel@peralex.com>2013-12-03 11:34:50 +0200
commit6b6254dfb16febd3e84dde30231f034331d1d2f7 (patch)
treefe7e51d79cde8f9828d60375d9444653b379680a /sw/source
parent6d31302d272ac5bc5ad5749cc703c3ddc610957c (diff)
convert callers of SwIndex::GetContent from xub_StrLen->sal_Int32
Change-Id: I542399d3ed3a3b42592bcabb70d7034b3a4cc93c
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/core/crsr/crsrsh.cxx2
-rw-r--r--sw/source/core/crsr/findattr.cxx2
-rw-r--r--sw/source/core/edit/edlingu.cxx2
-rw-r--r--sw/source/core/frmedt/fecopy.cxx6
-rw-r--r--sw/source/core/unocore/unorefmk.cxx4
-rw-r--r--sw/source/filter/html/htmltab.cxx2
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.cxx2
7 files changed, 10 insertions, 10 deletions
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index b6e0c329ba39..7e0cb2bf29c6 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -3055,7 +3055,7 @@ bool SwCrsrShell::SelectHiddenRange()
const SwTxtNode* pNode = rPt.nNode.GetNode().GetTxtNode();
if ( pNode )
{
- const xub_StrLen nPos = rPt.nContent.GetIndex();
+ const sal_Int32 nPos = rPt.nContent.GetIndex();
// check if nPos is in hidden range
xub_StrLen nHiddenStart;
diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx
index d183a1af9483..d39deb05643c 100644
--- a/sw/source/core/crsr/findattr.cxx
+++ b/sw/source/core/crsr/findattr.cxx
@@ -159,7 +159,7 @@ static sal_Bool lcl_Search( const SwTxtNode& rTxtNd, SwPaM& rPam,
const SwTxtAttr *pTxtHt = 0;
sal_Bool bForward = fnMove == fnMoveForward;
sal_uInt16 nPos = bForward ? 0 : rTxtNd.GetSwpHints().Count();
- xub_StrLen nCntntPos = rPam.GetPoint()->nContent.GetIndex();
+ sal_Int32 nCntntPos = rPam.GetPoint()->nContent.GetIndex();
while( 0 != ( pTxtHt=(*fnMove->fnGetHint)(rTxtNd.GetSwpHints(),nPos,nCntntPos)))
if( pTxtHt->Which() == rCmpItem.Which() &&
diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx
index 93d036f39dea..b8c09d67717c 100644
--- a/sw/source/core/edit/edlingu.cxx
+++ b/sw/source/core/edit/edlingu.cxx
@@ -1721,7 +1721,7 @@ void SwEditShell::IgnoreGrammarErrorAt( SwPaM& rErrorPosition )
SwWrongList *pWrong;
SwNodeIndex aIdx = rErrorPosition.Start()->nNode;
SwNodeIndex aEndIdx = rErrorPosition.Start()->nNode;
- xub_StrLen nStart = rErrorPosition.Start()->nContent.GetIndex();
+ sal_Int32 nStart = rErrorPosition.Start()->nContent.GetIndex();
xub_StrLen nEnd = STRING_LEN;
while( aIdx <= aEndIdx )
{
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index e695fcb3a241..0b93a963894b 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -1051,11 +1051,11 @@ sal_Bool SwFEShell::Paste( SwDoc* pClpDoc, sal_Bool bIncludingPageFrames )
// Update the rsid of each pasted text node.
{
- xub_StrLen nNodesCnt = aCpyPam.End()->nNode.GetIndex() - aCpyPam.Start()->nNode.GetIndex();
+ sal_Int32 nNodesCnt = aCpyPam.End()->nNode.GetIndex() - aCpyPam.Start()->nNode.GetIndex();
SwNodes &rDestNodes = GetDoc()->GetNodes();
- xub_StrLen nDestStart = PCURCRSR->GetPoint()->nNode.GetIndex() - nNodesCnt;
+ sal_Int32 nDestStart = PCURCRSR->GetPoint()->nNode.GetIndex() - nNodesCnt;
- for (xub_StrLen nIdx = 0; nIdx <= nNodesCnt; ++nIdx)
+ for (sal_Int32 nIdx = 0; nIdx <= nNodesCnt; ++nIdx)
{
SwTxtNode *pTxtNode = rDestNodes[ nDestStart + nIdx ]->GetTxtNode();
if ( pTxtNode )
diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx
index 690637765154..5d15fd486034 100644
--- a/sw/source/core/unocore/unorefmk.cxx
+++ b/sw/source/core/unocore/unorefmk.cxx
@@ -839,7 +839,7 @@ bool SwXMeta::CheckForOwnMemberMeta(const SwPaM & rPam, const bool bAbsorb)
0, 0);
}
bool bForceExpandHints(false);
- const xub_StrLen nStartPos(pStartPos->nContent.GetIndex());
+ const sal_Int32 nStartPos(pStartPos->nContent.GetIndex());
// not <= but < because nMetaStart is behind dummy char!
// not >= but > because == means insert at end!
if ((nStartPos < nMetaStart) || (nStartPos > nMetaEnd))
@@ -863,7 +863,7 @@ bool SwXMeta::CheckForOwnMemberMeta(const SwPaM & rPam, const bool bAbsorb)
"of text range not in same paragraph as text content",
0, 0);
}
- const xub_StrLen nEndPos(pEndPos->nContent.GetIndex());
+ const sal_Int32 nEndPos(pEndPos->nContent.GetIndex());
// not <= but < because nMetaStart is behind dummy char!
// not >= but > because == means insert at end!
if ((nEndPos < nMetaStart) || (nEndPos > nMetaEnd))
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index d67816c6058c..fdf628dd3cda 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -3460,7 +3460,7 @@ HTMLTableCnts *SwHTMLParser::InsertTableContents(
// Attributierungs-Anfang neu setzen
const SwNodeIndex& rSttPara = pPam->GetPoint()->nNode;
- xub_StrLen nSttCnt = pPam->GetPoint()->nContent.GetIndex();
+ sal_Int32 nSttCnt = pPam->GetPoint()->nContent.GetIndex();
_HTMLAttr** pTbl = (_HTMLAttr**)&aAttrTab;
for( sal_uInt16 nCnt = sizeof( _HTMLAttrTable ) / sizeof( _HTMLAttr* );
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index 21e0cf8da34a..62a7b4057dc6 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -1334,7 +1334,7 @@ void AddressMultiLineEdit::SetText( const OUString& rStr )
sal_uLong nParaCount = pTextEngine->GetParagraphCount();
for(sal_uLong nPara = 0; nPara < nParaCount; ++nPara)
{
- xub_StrLen nIndex = 0;
+ sal_Int32 nIndex = 0;
OUString sPara = pTextEngine->GetText( nPara );
if(!sPara.isEmpty() && !sPara.endsWith(" "))
{