Kaydet (Commit) 18eba6a6 authored tarafından Caolán McNamara's avatar Caolán McNamara

bounds can be -1 for not-found

Change-Id: I941ef1dae00167460f2f0de39e472ed047539f27
üst 967b6230
......@@ -595,6 +595,15 @@ void SwTxtNode::RstAttr(const SwIndex &rIdx, xub_StrLen nLen, sal_uInt16 nWhich,
}
}
sal_Int32 clipIndexBounds(const OUString &rStr, sal_Int32 nPos)
{
if (nPos < 0)
return 0;
if (nPos > rStr.getLength())
return rStr.getLength();
return nPos;
}
/*************************************************************************
* SwTxtNode::GetCurWord()
*
......@@ -640,6 +649,10 @@ XubString SwTxtNode::GetCurWord( xub_StrLen nPos ) const
if (aBndry.endPos != aBndry.startPos && IsSymbol( (xub_StrLen)aBndry.startPos ))
aBndry.endPos = aBndry.startPos;
// can have -1 as start/end of bounds not found
aBndry.startPos = clipIndexBounds(m_Text, aBndry.startPos);
aBndry.endPos = clipIndexBounds(m_Text, aBndry.endPos);
return m_Text.copy(aBndry.startPos,
aBndry.endPos - aBndry.startPos);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment