diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2013-08-15 20:10:00 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-08-16 22:07:46 +0000 |
| commit | 714b30109d0f145d669aebdf08ded251c7f78d52 (patch) | |
| tree | b01bb9daac1044e80e82994e45dd60c7a05b20ea /sw/source/ui/dialog/uiregionsw.cxx | |
| parent | 985df3aa867a5ebba22e3d7805baa53022c1ee2a (diff) | |
String to OUString and use helper function
Change-Id: I4c554eb5bf8f15eece755453398d1f1bce24b98b
Reviewed-on: https://gerrit.libreoffice.org/5442
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sw/source/ui/dialog/uiregionsw.cxx')
| -rw-r--r-- | sw/source/ui/dialog/uiregionsw.cxx | 39 |
1 files changed, 18 insertions, 21 deletions
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 6f90f318c5ad..b3a3b4dcc3a5 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -1168,13 +1168,13 @@ IMPL_LINK( SwEditRegionDlg, FileNameHdl, Edit *, pEdit ) m_pSubRegionED->Clear(); if (m_pDDECB->IsChecked()) { - String sLink( pEdit->GetText() ); - sal_uInt16 nPos = 0; - while( STRING_NOTFOUND != (nPos = sLink.SearchAscii( " ", nPos )) ) - sLink.Erase( nPos--, 1 ); - - nPos = sLink.SearchAndReplace( ' ', sfx2::cTokenSeparator ); - sLink.SearchAndReplace( ' ', sfx2::cTokenSeparator, nPos ); + OUString sLink( SwSectionData::CollapseWhiteSpaces(pEdit->GetText()) ); + sal_Int32 nPos = 0; + sLink = sLink.replaceFirst( " ", OUString(sfx2::cTokenSeparator), &nPos ); + if (nPos>=0) + { + sLink = sLink.replaceFirst( " ", OUString(sfx2::cTokenSeparator), &nPos ); + } pSectRepr->GetSectionData().SetLinkFileName( sLink ); pSectRepr->GetSectionData().SetType( DDE_LINK_SECTION ); @@ -1635,17 +1635,16 @@ sal_Bool SwInsertSectionTabPage::FillItemSet( SfxItemSet& ) sal_Bool bDDe = m_pDDECB->IsChecked(); if(m_pFileCB->IsChecked() && (sFileName.Len() || sSubRegion.Len() || bDDe)) { - String aLinkFile; + OUString aLinkFile; if( bDDe ) { - aLinkFile = sFileName; - - sal_uInt16 nPos = 0; - while( STRING_NOTFOUND != (nPos = aLinkFile.SearchAscii( " ", nPos )) ) - aLinkFile.Erase( nPos--, 1 ); - - nPos = aLinkFile.SearchAndReplace( ' ', sfx2::cTokenSeparator ); - aLinkFile.SearchAndReplace( ' ', sfx2::cTokenSeparator, nPos ); + aLinkFile = SwSectionData::CollapseWhiteSpaces(sFileName); + sal_Int32 nPos = 0; + aLinkFile = aLinkFile.replaceFirst( " ", OUString(sfx2::cTokenSeparator), &nPos ); + if (nPos>=0) + { + aLinkFile = aLinkFile.replaceFirst( " ", OUString(sfx2::cTokenSeparator), &nPos ); + } } else { @@ -1660,14 +1659,12 @@ sal_Bool SwInsertSectionTabPage::FillItemSet( SfxItemSet& ) aSection.SetLinkFilePassword( m_sFilePasswd ); } - aLinkFile += sfx2::cTokenSeparator; - aLinkFile += m_sFilterName; - aLinkFile += sfx2::cTokenSeparator; - aLinkFile += sSubRegion; + aLinkFile += OUString(sfx2::cTokenSeparator) + m_sFilterName + + OUString(sfx2::cTokenSeparator) + sSubRegion; } aSection.SetLinkFileName(aLinkFile); - if(aLinkFile.Len()) + if (!aLinkFile.isEmpty()) { aSection.SetType( m_pDDECB->IsChecked() ? DDE_LINK_SECTION : |