INTEGRATION: CWS sb59 (1.3.300); FILE MERGED
2006/07/28 15:24:22 sb 1.3.300.1: #i67487# Made code warning-free (wntmsci10).
This commit is contained in:
@@ -4,9 +4,9 @@
|
|||||||
*
|
*
|
||||||
* $RCSfile: adrparse.cxx,v $
|
* $RCSfile: adrparse.cxx,v $
|
||||||
*
|
*
|
||||||
* $Revision: 1.4 $
|
* $Revision: 1.5 $
|
||||||
*
|
*
|
||||||
* last change: $Author: obo $ $Date: 2006-09-17 15:14:42 $
|
* last change: $Author: obo $ $Date: 2006-10-12 15:24:37 $
|
||||||
*
|
*
|
||||||
* The Contents of this file are made available subject to
|
* The Contents of this file are made available subject to
|
||||||
* the terms of GNU Lesser General Public License Version 2.1.
|
* the terms of GNU Lesser General Public License Version 2.1.
|
||||||
@@ -652,14 +652,18 @@ SvAddressParser_Impl::SvAddressParser_Impl(SvAddressParser * pParser,
|
|||||||
m_pAddrSpec->m_pEnd, true);
|
m_pAddrSpec->m_pEnd, true);
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
xub_StrLen nLen
|
xub_StrLen nLen =
|
||||||
= m_pAddrSpec->m_pEnd - m_pAddrSpec->m_pBegin;
|
sal::static_int_cast< xub_StrLen >(
|
||||||
|
m_pAddrSpec->m_pEnd
|
||||||
|
- m_pAddrSpec->m_pBegin);
|
||||||
if (nLen == rInput.Len())
|
if (nLen == rInput.Len())
|
||||||
aTheAddrSpec = rInput;
|
aTheAddrSpec = rInput;
|
||||||
else
|
else
|
||||||
aTheAddrSpec
|
aTheAddrSpec
|
||||||
= rInput.Copy(m_pAddrSpec->m_pBegin
|
= rInput.Copy(
|
||||||
- rInput.GetBuffer(),
|
sal::static_int_cast< xub_StrLen >(
|
||||||
|
m_pAddrSpec->m_pBegin
|
||||||
|
- rInput.GetBuffer()),
|
||||||
nLen);
|
nLen);
|
||||||
}
|
}
|
||||||
UniString aTheRealName;
|
UniString aTheRealName;
|
||||||
@@ -677,23 +681,30 @@ SvAddressParser_Impl::SvAddressParser_Impl(SvAddressParser * pParser,
|
|||||||
m_pFirstCommentEnd);
|
m_pFirstCommentEnd);
|
||||||
else
|
else
|
||||||
aTheRealName
|
aTheRealName
|
||||||
= rInput.Copy(m_pFirstCommentBegin
|
= rInput.Copy(
|
||||||
- rInput.GetBuffer(),
|
sal::static_int_cast< xub_StrLen >(
|
||||||
|
m_pFirstCommentBegin
|
||||||
|
- rInput.GetBuffer()),
|
||||||
|
sal::static_int_cast< xub_StrLen >(
|
||||||
m_pFirstCommentEnd
|
m_pFirstCommentEnd
|
||||||
- m_pFirstCommentBegin);
|
- m_pFirstCommentBegin));
|
||||||
else if (m_bRealNameReparse)
|
else if (m_bRealNameReparse)
|
||||||
aTheRealName = reparse(m_pRealNameBegin,
|
aTheRealName = reparse(m_pRealNameBegin,
|
||||||
m_pRealNameEnd, false);
|
m_pRealNameEnd, false);
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
xub_StrLen nLen = m_pRealNameContentEnd
|
xub_StrLen nLen =
|
||||||
- m_pRealNameContentBegin;
|
sal::static_int_cast< xub_StrLen >(
|
||||||
|
m_pRealNameContentEnd
|
||||||
|
- m_pRealNameContentBegin);
|
||||||
if (nLen == rInput.Len())
|
if (nLen == rInput.Len())
|
||||||
aTheRealName = rInput;
|
aTheRealName = rInput;
|
||||||
else
|
else
|
||||||
aTheRealName
|
aTheRealName
|
||||||
= rInput.Copy(m_pRealNameContentBegin
|
= rInput.Copy(
|
||||||
- rInput.GetBuffer(),
|
sal::static_int_cast< xub_StrLen >(
|
||||||
|
m_pRealNameContentBegin
|
||||||
|
- rInput.GetBuffer()),
|
||||||
nLen);
|
nLen);
|
||||||
}
|
}
|
||||||
if (pParser->m_bHasFirst)
|
if (pParser->m_bHasFirst)
|
||||||
|
|||||||
Reference in New Issue
Block a user