diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-07-28 18:01:57 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-07-30 11:06:14 +0200 |
commit | 70bfdd828b01e9db0713b87645ffe39f3dc21c7e (patch) | |
tree | b53e22d4c582e7cad6155f2c0c2536241cadb0f5 /sfx2 | |
parent | dead246b1955a99b66b0a69e8da3db1a61f3ab88 (diff) |
loplugin:stringloop in sfx2..svx
Change-Id: Ie4ca2421f00259f974b6d94f883adfa11600b1fe
Reviewed-on: https://gerrit.libreoffice.org/58251
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/appl/newhelp.cxx | 23 | ||||
-rw-r--r-- | sfx2/source/control/unoctitm.cxx | 7 | ||||
-rw-r--r-- | sfx2/source/dialog/filedlghelper.cxx | 6 | ||||
-rw-r--r-- | sfx2/source/dialog/styledlg.cxx | 12 | ||||
-rw-r--r-- | sfx2/source/dialog/templdlg.cxx | 10 | ||||
-rw-r--r-- | sfx2/source/doc/docfilt.cxx | 8 | ||||
-rw-r--r-- | sfx2/source/view/lokhelper.cxx | 14 |
7 files changed, 40 insertions, 40 deletions
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index c7bd7f9300ea..eebd30f46362 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -198,7 +198,7 @@ namespace sfx2 OUString PrepareSearchString( const OUString& rSearchString, const Reference< XBreakIterator >& xBreak, bool bForSearch ) { - OUString sSearchStr; + OUStringBuffer sSearchStr; sal_Int32 nStartPos = 0; const lang::Locale aLocale = Application::GetSettings().GetUILanguageTag().getLocale(); Boundary aBoundary = xBreak->getWordBoundary( @@ -220,18 +220,18 @@ namespace sfx2 if ( !sSearchStr.isEmpty() ) { if ( bForSearch ) - sSearchStr += " "; + sSearchStr.append(" "); else - sSearchStr += "|"; + sSearchStr.append("|"); } - sSearchStr += sSearchToken; + sSearchStr.append(sSearchToken); } } aBoundary = xBreak->nextWord( rSearchString, nStartPos, aLocale, WordType::ANYWORD_IGNOREWHITESPACES ); } - return sSearchStr; + return sSearchStr.makeStringAndClear(); } // namespace sfx2 @@ -954,20 +954,21 @@ SearchTabPage_Impl::~SearchTabPage_Impl() void SearchTabPage_Impl::dispose() { SvtViewOptions aViewOpt( EViewType::TabPage, CONFIGNAME_SEARCHPAGE ); - OUString aUserData = - OUString::number( m_pFullWordsCB->IsChecked() ? 1 : 0 ) + ";" + - OUString::number( m_pScopeCB->IsChecked() ? 1 : 0 ); + OUStringBuffer aUserData; + aUserData.append(OUString::number( m_pFullWordsCB->IsChecked() ? 1 : 0 )) + .append(";") + .append(OUString::number( m_pScopeCB->IsChecked() ? 1 : 0 )); sal_Int32 nCount = std::min( m_pSearchED->GetEntryCount(), sal_Int32(10) ); // save only 10 entries for ( sal_Int32 i = 0; i < nCount; ++i ) { - aUserData += ";" + INetURLObject::encode( + aUserData.append(";").append(INetURLObject::encode( m_pSearchED->GetEntry(i), INetURLObject::PART_UNO_PARAM_VALUE, - INetURLObject::EncodeMechanism::All ); + INetURLObject::EncodeMechanism::All )); } - Any aUserItem = makeAny( aUserData ); + Any aUserItem = makeAny( aUserData.makeStringAndClear() ); aViewOpt.SetUserItem( USERITEM_NAME, aUserItem ); m_pSearchED.clear(); diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index 15e488fb1f87..2bf002844284 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -531,13 +531,14 @@ void UsageInfo::save() if( file.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write | osl_File_OpenFlag_Create) == osl::File::E_None ) { - OString aUsageInfoMsg = "Document Type;Command;Count"; + OStringBuffer aUsageInfoMsg("Document Type;Command;Count"); for (auto const& elem : maUsage) - aUsageInfoMsg += "\n" + elem.first.toUtf8() + ";" + OString::number(elem.second); + aUsageInfoMsg.append("\n").append(elem.first.toUtf8()).append(";").append(OString::number(elem.second)); sal_uInt64 written = 0; - file.write(aUsageInfoMsg.pData->buffer, aUsageInfoMsg.getLength(), written); + auto s = aUsageInfoMsg.makeStringAndClear(); + file.write(s.getStr(), s.getLength(), written); file.close(); } } diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 040dd203dbb8..8b73bd03d52f 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -1862,10 +1862,9 @@ void FileDialogHelper_Impl::addGraphicFilter() for ( i = 0; i < nCount; i++ ) { j = 0; - OUString sWildcard; while( true ) { - sWildcard = mpGraphicFilter->GetImportWildcard( i, j++ ); + OUString sWildcard = mpGraphicFilter->GetImportWildcard( i, j++ ); if ( sWildcard.isEmpty() ) break; if ( aExtensions.indexOf( sWildcard ) == -1 ) @@ -1902,10 +1901,9 @@ void FileDialogHelper_Impl::addGraphicFilter() OUString aName = mpGraphicFilter->GetImportFormatName( i ); OUString aExt; j = 0; - OUString sWildcard; while( true ) { - sWildcard = mpGraphicFilter->GetImportWildcard( i, j++ ); + OUString sWildcard = mpGraphicFilter->GetImportWildcard( i, j++ ); if ( sWildcard.isEmpty() ) break; if ( aExt.indexOf( sWildcard ) == -1 ) diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx index 8cafb0ec0eba..baa1368d7c5b 100644 --- a/sfx2/source/dialog/styledlg.cxx +++ b/sfx2/source/dialog/styledlg.cxx @@ -133,15 +133,13 @@ IMPL_LINK_NOARG( SfxStyleDialog, CancelHdl, Button *, void ) OUString SfxStyleDialog::GenerateUnusedName(SfxStyleSheetBasePool &rPool) { - OUString aNoName(SfxResId(STR_NONAME)); - sal_uInt16 nNo = 1; - OUString aNo(aNoName); - aNoName += OUString::number(nNo); + OUString aNo(SfxResId(STR_NONAME)); + sal_uInt16 i = 1; + OUString aNoName = aNo + OUString::number(i); while (rPool.Find(aNoName)) { - ++nNo; - aNoName = aNo; - aNoName += OUString::number(nNo); + ++i; + aNoName = aNo + OUString::number(i); } return aNoName; } diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 118389f77427..4b68f20dd4e6 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -1842,8 +1842,8 @@ void SfxCommonTemplateDialog_Impl::DeleteHdl() SvTreeListEntry* pEntry = pTreeBox->IsVisible() ? pTreeBox->FirstSelected() : aFmtLb->FirstSelected(); const SfxStyleFamilyItem* pItem = GetFamilyItem_Impl(); - OUString aMsg = SfxResId(STR_DELETE_STYLE_USED) - + SfxResId(STR_DELETE_STYLE); + OUStringBuffer aMsg; + aMsg.append(SfxResId(STR_DELETE_STYLE_USED)).append(SfxResId(STR_DELETE_STYLE)); while (pEntry) { @@ -1856,8 +1856,8 @@ void SfxCommonTemplateDialog_Impl::DeleteHdl() if ( pStyle->IsUsed() ) // pStyle is in use in the document? { if (bUsedStyle) // add a separator for the second and later styles - aMsg += ", "; - aMsg += aTemplName; + aMsg.append(", "); + aMsg.append(aTemplName); bUsedStyle = true; } @@ -1871,7 +1871,7 @@ void SfxCommonTemplateDialog_Impl::DeleteHdl() { std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(GetFrameWeld(), VclMessageType::Question, VclButtonsType::YesNo, - aMsg)); + aMsg.makeStringAndClear())); aApproved = xBox->run() == RET_YES; } diff --git a/sfx2/source/doc/docfilt.cxx b/sfx2/source/doc/docfilt.cxx index c42de0b236f3..500b0ad224fc 100644 --- a/sfx2/source/doc/docfilt.cxx +++ b/sfx2/source/doc/docfilt.cxx @@ -68,16 +68,16 @@ SfxFilter::SfxFilter( const OUString &rName, mbEnabled(bEnabled) { OUString aExts = GetWildcard().getGlob(); - OUString glob; + OUStringBuffer glob; OUString aRet; sal_uInt16 nPos = 0; while (!(aRet = aExts.getToken(nPos++, ';')).isEmpty() ) { if (!glob.isEmpty()) - glob += ";"; - glob += aRet; + glob.append(";"); + glob.append(aRet); } - aWildCard.setGlob(glob); + aWildCard.setGlob(glob.makeStringAndClear()); } SfxFilter::~SfxFilter() diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx index be2d5e3887a2..20481ac61e15 100644 --- a/sfx2/source/view/lokhelper.cxx +++ b/sfx2/source/view/lokhelper.cxx @@ -172,20 +172,22 @@ void SfxLokHelper::notifyWindow(const SfxViewShell* pThisView, if (SfxLokHelper::getViewsCount() <= 0 || nLOKWindowId == 0) return; - OString aPayload = OString("{ \"id\": \"") + OString::number(nLOKWindowId) + OString("\""); - aPayload += OString(", \"action\": \"") + OUStringToOString(rAction, RTL_TEXTENCODING_UTF8).getStr() + OString("\""); + OStringBuffer aPayload; + aPayload.append("{ \"id\": \"").append(OString::number(nLOKWindowId)).append("\""); + aPayload.append(", \"action\": \"").append(OUStringToOString(rAction, RTL_TEXTENCODING_UTF8)).append("\""); for (const auto& rItem: rPayload) { if (!rItem.first.isEmpty() && !rItem.second.isEmpty()) { - aPayload += OString(", \"") + rItem.first + OString("\": \"") + - rItem.second + OString("\""); + aPayload.append(", \"").append(rItem.first).append("\": \"") + .append(rItem.second).append("\""); } } - aPayload += "}"; + aPayload.append("}"); - pThisView->libreOfficeKitViewCallback(LOK_CALLBACK_WINDOW, aPayload.getStr()); + auto s = aPayload.makeStringAndClear(); + pThisView->libreOfficeKitViewCallback(LOK_CALLBACK_WINDOW, s.getStr()); } void SfxLokHelper::notifyInvalidation(SfxViewShell const* pThisView, const OString& rPayload) |