diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-10-09 13:31:44 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-10-09 16:59:42 +0100 |
| commit | ae95703819348938bf9e44bd635365e3e48cd05d (patch) | |
| tree | 673328fb2669241829e582e4d9824ef1ee7eb5e9 /sw/source/ui/dbui | |
| parent | 36c1239ae14ab7861f89db8efef121d0b1448636 (diff) | |
Related: fdo#38838 remove UniString::SetToken & UniString::SearchAscii
Change-Id: I5219578fbeb40a0fe363f03c64021a83f7e505fb
Diffstat (limited to 'sw/source/ui/dbui')
| -rw-r--r-- | sw/source/ui/dbui/mmoutputpage.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx index da72f2d395ec..395f3ee6cc0c 100644 --- a/sw/source/ui/dbui/mmoutputpage.cxx +++ b/sw/source/ui/dbui/mmoutputpage.cxx @@ -896,17 +896,17 @@ IMPL_LINK(SwMailMergeOutputPage, SendTypeHdl_Impl, ListBox*, pBox) if(bEnable) { //add the correct extension - String sAttach(m_aAttachmentED.GetText()); + OUString sAttach(m_aAttachmentED.GetText()); //do nothing if the user has removed the name - the warning will come early enough - if(sAttach.Len()) + if (!sAttach.isEmpty()) { - xub_StrLen nTokenCount = comphelper::string::getTokenCount(sAttach, '.'); + sal_Int32 nTokenCount = comphelper::string::getTokenCount(sAttach, '.'); if( 2 > nTokenCount) { sAttach += '.'; ++nTokenCount; } - sAttach.SetToken( nTokenCount - 1, '.', lcl_GetExtensionForDocType( nDocType )); + sAttach = comphelper::string::setToken(sAttach, nTokenCount - 1, '.', lcl_GetExtensionForDocType( nDocType )); m_aAttachmentED.SetText(sAttach); } } @@ -1054,14 +1054,14 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton) aQuery.SetIsEmptyTextAllowed(false); if(RET_OK == aQuery.Execute()) { - String sAttach(aQuery.GetValue()); - xub_StrLen nTokenCount = comphelper::string::getTokenCount(sAttach, '.'); - if( 2 > nTokenCount) + OUString sAttach(aQuery.GetValue()); + sal_Int32 nTokenCount = comphelper::string::getTokenCount(sAttach, '.'); + if (2 > nTokenCount) { sAttach += '.'; ++nTokenCount; } - sAttach.SetToken( nTokenCount - 1, '.', lcl_GetExtensionForDocType( + sAttach = comphelper::string::setToken(sAttach, nTokenCount - 1, '.', lcl_GetExtensionForDocType( (sal_uLong)m_aSendAsLB.GetEntryData(m_aSendAsLB.GetSelectEntryPos()))); m_aAttachmentED.SetText(sAttach); } @@ -1194,12 +1194,12 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton) { sBody = m_sBody; aDesc.sAttachmentURL = aName.GetValue(); - String sAttachment(m_aAttachmentED.GetText()); - xub_StrLen nTokenCount = comphelper::string::getTokenCount(sAttachment, '.'); - if( 2 > nTokenCount) + OUString sAttachment(m_aAttachmentED.GetText()); + sal_Int32 nTokenCount = comphelper::string::getTokenCount(sAttachment, '.'); + if (2 > nTokenCount) { sAttachment += '.'; - sAttachment.SetToken( nTokenCount, '.', sExtension); + sAttachment = comphelper::string::setToken(sAttachment, nTokenCount, '.', sExtension); } else if(sAttachment.GetToken( nTokenCount - 1, '.') != sExtension) sAttachment += sExtension; |