diff options
Diffstat (limited to 'sw/source/ui/dbui')
| -rw-r--r-- | sw/source/ui/dbui/dbmgr.cxx | 6 | ||||
| -rw-r--r-- | sw/source/ui/dbui/mmaddressblockpage.cxx | 3 | ||||
| -rw-r--r-- | sw/source/ui/dbui/mmlayoutpage.cxx | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index eada5cc81b4d..6cb447382c3b 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -102,8 +102,9 @@ #include <com/sun/star/sdbc/ResultSetType.hpp> #include <com/sun/star/mail/MailAttachment.hpp> #include <comphelper/processfactory.hxx> -#include <comphelper/types.hxx> #include <comphelper/property.hxx> +#include <comphelper/string.hxx> +#include <comphelper/types.hxx> #include <mailmergehelper.hxx> #include <maildispatcher.hxx> #include <svtools/htmlcfg.hxx> @@ -1012,8 +1013,7 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell, sLeading = aEntry.GetBase(); aEntry.removeSegment(); sPath = aEntry.GetMainURL( INetURLObject::NO_DECODE ); - String sExt( pStoreToFilter->GetDefaultExtension() ); - sExt.EraseLeadingChars('*'); + String sExt(comphelper::string::stripStart(pStoreToFilter->GetDefaultExtension(), '*')); aTempFile = std::auto_ptr< utl::TempFile >( new utl::TempFile(sLeading,&sExt,&sPath )); if( bAsSingleFile ) diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index 28bf2e75be43..d9734eefb0fc 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -1684,8 +1684,7 @@ String AddressMultiLineEdit::GetAddress() sal_uLong nParaCount = pTextEngine->GetParagraphCount(); for(sal_uLong nPara = nParaCount; nPara; --nPara) { - String sPara = pTextEngine->GetText( nPara - 1); - sPara.EraseTrailingChars(' '); + String sPara = comphelper::string::stripEnd(pTextEngine->GetText(nPara - 1), ' '); //don't add empty trailing paragraphs if(sRet.Len() || sPara.Len()) { diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx index d9d96d92fbaf..2e3403e7afbb 100644 --- a/sw/source/ui/dbui/mmlayoutpage.cxx +++ b/sw/source/ui/dbui/mmlayoutpage.cxx @@ -35,6 +35,7 @@ #include <mmconfigitem.hxx> #include <mailmergehelper.hxx> #include <unotools.hxx> +#include <comphelper/string.hxx> #include <unotools/tempfile.hxx> #include <uitool.hxx> #include <svx/dlgutil.hxx> @@ -126,8 +127,7 @@ SwMailMergeLayoutPage::SwMailMergeLayoutPage( SwMailMergeWizard* _pParent) : //temp file needs it's own block //creating with extension is not supported by a static method :-( String sLeading; - String sExt(pSfxFlt->GetDefaultExtension()); - sExt.EraseLeadingChars('*'); + String sExt(comphelper::string::stripStart(pSfxFlt->GetDefaultExtension(), '*')); utl::TempFile aTempFile( sLeading, &sExt ); m_sExampleURL = aTempFile.GetURL(); aTempFile.EnableKillingFile(); |