diff options
author | nadith <nadmalinda@gmail.com> | 2016-08-01 14:51:58 +0530 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-08-04 09:34:11 +0000 |
commit | bd4c80b856a145563ba38242705e87028b1e0ed6 (patch) | |
tree | 8a7ed5eefa17155b7c547ed9133dc1881d9fa6b4 /cui | |
parent | 7cbb0664b94bb9f4587098c1940de98e4f7aae16 (diff) |
tdf#100726: Improve readability of OUString concatenation
module cui and dbaccess fixed
Change-Id: Ief6fca46622fe4e0da804c9a874f7ec93a0fd7af
Reviewed-on: https://gerrit.libreoffice.org/27770
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/customize/cfg.cxx | 11 | ||||
-rw-r--r-- | cui/source/dialogs/about.cxx | 10 | ||||
-rw-r--r-- | cui/source/dialogs/cuigaldlg.cxx | 12 | ||||
-rw-r--r-- | cui/source/dialogs/hlmailtp.cxx | 3 | ||||
-rw-r--r-- | cui/source/dialogs/linkdlg.cxx | 8 | ||||
-rw-r--r-- | cui/source/dialogs/postdlg.cxx | 13 | ||||
-rw-r--r-- | cui/source/dialogs/scriptdlg.cxx | 20 | ||||
-rw-r--r-- | cui/source/dialogs/thesdlg.cxx | 4 | ||||
-rw-r--r-- | cui/source/options/dbregister.cxx | 4 | ||||
-rw-r--r-- | cui/source/options/fontsubs.cxx | 4 | ||||
-rw-r--r-- | cui/source/options/optdict.cxx | 12 | ||||
-rw-r--r-- | cui/source/options/personalization.cxx | 3 | ||||
-rw-r--r-- | cui/source/tabpages/autocdlg.cxx | 16 | ||||
-rw-r--r-- | cui/source/tabpages/grfpage.cxx | 6 | ||||
-rw-r--r-- | cui/source/tabpages/macroass.cxx | 9 | ||||
-rw-r--r-- | cui/source/tabpages/numpages.cxx | 22 | ||||
-rw-r--r-- | cui/source/tabpages/page.cxx | 4 | ||||
-rw-r--r-- | cui/source/tabpages/tpgradnt.cxx | 3 | ||||
-rw-r--r-- | cui/source/tabpages/tphatch.cxx | 3 | ||||
-rw-r--r-- | cui/source/tabpages/tplnedef.cxx | 4 | ||||
-rw-r--r-- | cui/source/tabpages/tplneend.cxx | 4 | ||||
-rw-r--r-- | cui/source/tabpages/tppattern.cxx | 7 |
22 files changed, 52 insertions, 130 deletions
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index ada85afcbdd1..a97db75d6f94 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -337,9 +337,7 @@ generateCustomMenuURL( SvxEntries* entries, sal_Int32 suffix = 1 ) { - OUString url(CUSTOM_MENU_STR ); - url += OUString::number( suffix ); - + OUString url = CUSTOM_MENU_STR + OUString::number( suffix ); if (!entries) return url; @@ -2163,9 +2161,7 @@ void SvxConfigPage::AddSubMenusToUI( if ( pEntryData->IsPopup() ) { - OUString subMenuTitle( rBaseTitle ); - subMenuTitle += aMenuSeparatorStr; - subMenuTitle += stripHotKey( pEntryData->GetName() ); + OUString subMenuTitle = rBaseTitle + aMenuSeparatorStr + stripHotKey( pEntryData->GetName() ); const sal_Int32 nPos = m_pTopLevelListBox->InsertEntry( subMenuTitle ); m_pTopLevelListBox->SetEntryData( nPos, pEntryData ); @@ -5429,8 +5425,7 @@ void SvxIconSelectorDialog::ImportGraphics( fPath = rPaths[0].copy(8) + "/"; for ( sal_Int32 i = 0; i < rejectedCount; ++i ) { - message += fPath + rejected[i]; - message += newLine; + message += fPath + rejected[i] + newLine; } ScopedVclPtrInstance< SvxIconChangeDialog > aDialog(this, message); diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index 22bb65972d56..6826c515eafe 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -287,8 +287,7 @@ OUString AboutDialog::GetVersionString() sVersion += m_sBuildStr.replaceAll("$BUILDID", sBuildId); } - sVersion += "\n"; - sVersion += Application::GetHWOSConfInfo(); + sVersion += "\n" + Application::GetHWOSConfInfo(); if (EXTRA_BUILDID[0] != '\0') { @@ -324,11 +323,8 @@ OUString AboutDialog::GetVersionString() OUString AboutDialog::GetCopyrightString() { - OUString aCopyrightString = m_aVendorTextStr; - aCopyrightString += "\n"; - - aCopyrightString += m_aCopyrightTextStr; - aCopyrightString += "\n"; + OUString aCopyrightString = m_aVendorTextStr + "\n" + + m_aCopyrightTextStr + "\n"; if (utl::ConfigManager::getProductName() == "LibreOffice") aCopyrightString += m_aBasedTextStr; diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index 9e6c715a106d..f12d42b7c456 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -572,9 +572,7 @@ IMPL_LINK_NOARG_TYPED(GalleryIdDialog, ClickOkHdl, Button*, void) { OUString aStr( CUI_RES( RID_SVXSTR_GALLERY_ID_EXISTS ) ); - aStr += " ("; - aStr += pInfo->GetThemeName(); - aStr += ")"; + aStr += " (" + pInfo->GetThemeName() + ")"; ScopedVclPtrInstance< InfoBox > aBox( this, aStr ); aBox->Execute(); @@ -602,9 +600,7 @@ GalleryThemeProperties::GalleryThemeProperties(vcl::Window* pParent, if( pData->pTheme->IsReadOnly() ) RemoveTabPage(m_nFilesPageId); - OUString aText( GetText() ); - - aText += pData->pTheme->GetName(); + OUString aText = GetText() + pData->pTheme->GetName(); if( pData->pTheme->IsReadOnly() ) aText += CUI_RES( RID_SVXSTR_GALLERY_READONLY ); @@ -831,9 +827,7 @@ OUString TPGalleryThemeProperties::addExtension( const OUString& _rDisplayText, if ( sRet.indexOf( sAllFilter ) == -1 ) { - sRet += sOpenBracket; - sRet += _rExtension; - sRet += sCloseBracket; + sRet += sOpenBracket + _rExtension + sCloseBracket; } return sRet; } diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx index cb40ed8b5280..1d8387ba855e 100644 --- a/cui/source/dialogs/hlmailtp.cxx +++ b/cui/source/dialogs/hlmailtp.cxx @@ -155,8 +155,7 @@ OUString SvxHyperlinkMailTp::CreateAbsoluteURL() const { if ( !m_pEdSubject->GetText().isEmpty() ) { - OUString aQuery("subject="); - aQuery += m_pEdSubject->GetText(); + OUString aQuery = "subject=" + m_pEdSubject->GetText(); aURL.SetParam(aQuery); } } diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index 75a9cda891b8..48e09601fdf1 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -639,16 +639,12 @@ void SvBaseLinksDlg::InsertEntry( const SvBaseLink& rLink, sal_uLong nPos, bool // filename not in string aTxt = aFileName; - aEntry = aTxt; - aEntry += "\t"; + aEntry = aTxt + "\t"; if( OBJECT_CLIENT_GRF == rLink.GetObjType() ) aEntry += sFilter; else aEntry += sLinkNm; - aEntry += "\t"; - aEntry += sTypeNm; - aEntry += "\t"; - aEntry += ImplGetStateStr( rLink ); + aEntry += "\t" + sTypeNm + "\t" + ImplGetStateStr( rLink ); SvTreeListEntry * pE = m_pTbLinks->InsertEntryToColumn( aEntry, nPos ); pE->SetUserData( const_cast<SvBaseLink *>(&rLink) ); diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx index d5c1f4474ac9..35c3500a96fd 100644 --- a/cui/source/dialogs/postdlg.cxx +++ b/cui/source/dialogs/postdlg.cxx @@ -142,9 +142,7 @@ void SvxPostItDialog::dispose() void SvxPostItDialog::ShowLastAuthor(const OUString& rAuthor, const OUString& rDate) { - OUString sTxt( rAuthor ); - sTxt += ", "; - sTxt += rDate; + OUString sTxt = rAuthor + ", " + rDate; m_pLastEditFT->SetText( sTxt ); } @@ -189,14 +187,9 @@ IMPL_LINK_NOARG_TYPED(SvxPostItDialog, Stamp, Button*, void) if ( !aTmp.isEmpty() ) { - aStr += aTmp; - aStr += ", "; + aStr += aTmp + ", "; } - aStr += rLocaleWrapper.getDate(aDate); - aStr += ", "; - aStr += rLocaleWrapper.getTime(aTime, false); - aStr += " ----\n"; - + aStr += rLocaleWrapper.getDate(aDate) + ", " + rLocaleWrapper.getTime(aTime, false) + " ----\n"; aStr = convertLineEnd(aStr, GetSystemLineEnd()); m_pEditED->SetText(aStr); diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index c68e5d1bf545..95e4fbc3ebc6 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -906,8 +906,7 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry ) if (aUserSuppliedName+extn == childNodes[index]->getName()) { bValid = false; - OUString aError( m_createErrStr ); - aError += m_createDupStr; + OUString aError = m_createErrStr + m_createDupStr; ScopedVclPtrInstance< MessageDialog > aErrorBox(static_cast<vcl::Window*>(this), aError); aErrorBox->SetText( m_createErrTitleStr ); aErrorBox->Execute(); @@ -1241,18 +1240,12 @@ OUString FormatErrorString( if ( !type.isEmpty() ) { - result += "\n\n" + - OUString(CUI_RES(RID_SVXSTR_ERROR_TYPE_LABEL)) + - " " + - type; + result += "\n\n" + OUString(CUI_RES(RID_SVXSTR_ERROR_TYPE_LABEL)) + " " + type; } if ( !message.isEmpty() ) { - result += "\n\n" + - OUString(CUI_RES(RID_SVXSTR_ERROR_MESSAGE_LABEL)) + - " " + - message; + result += "\n\n" + OUString(CUI_RES(RID_SVXSTR_ERROR_MESSAGE_LABEL)) + " " + message; } return result; @@ -1380,8 +1373,7 @@ OUString GetErrorMessage( OUString GetErrorMessage( const RuntimeException& re ) { Type t = cppu::UnoType<decltype(re)>::get(); - OUString message = t.getTypeName(); - message += re.Message; + OUString message = t.getTypeName() + re.Message; return message; } @@ -1389,9 +1381,7 @@ OUString GetErrorMessage( const RuntimeException& re ) OUString GetErrorMessage( const Exception& e ) { Type t = cppu::UnoType<decltype(e)>::get(); - OUString message = t.getTypeName(); - message += e.Message; - + OUString message = t.getTypeName() + e.Message; return message; } diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index ba03f6c5e6ba..511ff0c70dc4 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -546,9 +546,7 @@ void SvxThesaurusDialog::SetWindowTitle( LanguageType nLanguage ) sal_Int32 nIndex = aStr.indexOf( '(' ); if( nIndex != -1 ) aStr = aStr.copy( 0, nIndex - 1 ); - aStr += " ("; - aStr += SvtLanguageTable::GetLanguageString( nLanguage ); - aStr += ")"; + aStr += " (" + SvtLanguageTable::GetLanguageString( nLanguage ) + ")"; SetText( aStr ); // set window title } diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index 14420b0083b2..a8cd6ea7b4b7 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -387,9 +387,7 @@ IMPL_LINK_NOARG_TYPED(DbRegistrationOptionsPage, PathSelect_Impl, SvTreeListBox* void DbRegistrationOptionsPage::insertNewEntry( const OUString& _sName,const OUString& _sLocation, const bool _bReadOnly ) { - OUString aStr( _sName ); - aStr += "\t"; - aStr += _sLocation; + OUString aStr = _sName + "\t" + _sLocation; SvTreeListEntry* pEntry = nullptr; if ( _bReadOnly ) diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index 8c0a638ec7b8..458027530d46 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -371,9 +371,7 @@ void SvxFontSubstTabPage::CheckEnable() SvTreeListEntry* pEntry = m_pCheckLB->FirstSelected(); - OUString sEntry = m_pFont1CB->GetText(); - sEntry += "\t"; - sEntry += m_pFont2CB->GetText(); + OUString sEntry = m_pFont1CB->GetText() + "\t" + m_pFont2CB->GetText(); // because of OS/2 optimization error (Bug #56267) a bit more intricate: if (m_pFont1CB->GetText().isEmpty() || m_pFont2CB->GetText().isEmpty()) diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index 40ab495e6774..b3db8c2e6d6d 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -131,9 +131,9 @@ void SvxNewDictionaryDialog::dispose() IMPL_LINK_NOARG_TYPED(SvxNewDictionaryDialog, OKHdl_Impl, Button*, void) { - OUString sDict = comphelper::string::stripEnd(pNameEdit->GetText(), ' '); - // add extension for personal dictionaries - sDict += ".dic"; + + // add extension for personal dictionaries + OUString sDict = comphelper::string::stripEnd(pNameEdit->GetText(), ' ') + ".dic"; Reference< XSearchableDictionaryList > xDicList( LinguMgr::GetDictionaryList() ); @@ -532,8 +532,7 @@ void SvxEditDictionaryDialog::ShowWords_Impl( sal_uInt16 nId ) sal_uLong nPos = GetLBInsertPos( aStr ); if(pEntry[i]->isNegative()) { - aStr += "\t"; - aStr += pEntry[i]->getReplacementText(); + aStr += "\t" + pEntry[i]->getReplacementText(); } pWordsLB->InsertEntry(aStr, nullptr, false, nPos == TREELIST_ENTRY_NOTFOUND ? TREELIST_APPEND : nPos); } @@ -643,8 +642,7 @@ bool SvxEditDictionaryDialog::NewDelHdl(void* pBtn) if(pReplaceFT->IsVisible()) { - sEntry += "\t"; - sEntry += aReplaceStr; + sEntry += "\t" + aReplaceStr; } SvTreeListEntry* pNewEntry = nullptr; diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx index ad275efb5fb4..b570c0b7af4f 100644 --- a/cui/source/options/personalization.cxx +++ b/cui/source/options/personalization.cxx @@ -656,8 +656,7 @@ bool getPreviewFile( const OUString& rURL, OUString *pPreviewFile, OUString *pPe // copy the images to the user's gallery OUString gallery = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( "bootstrap") "::UserInstallation}"; rtl::Bootstrap::expandMacros( gallery ); - gallery += "/user/gallery/personas/"; - gallery += aName + "/"; + gallery += "/user/gallery/personas/" + aName + "/"; osl::Directory::createPath( gallery ); OUString aPreviewFile( INetURLObject( aPreviewURL ).getName() ); diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index f44230610441..f19be92a7cd8 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -1036,9 +1036,7 @@ void OfaAutocorrReplacePage::RefillReplaceBox(bool bFromReset, // formatted text is only in Writer if(bSWriter || bTextOnly) { - OUString sEntry(rDouble.sShort); - sEntry += "\t"; - sEntry += rDouble.sLong; + OUString sEntry = rDouble.sShort + "\t" + rDouble.sLong; SvTreeListEntry* pEntry = m_pReplaceTLB->InsertEntry(sEntry); m_pTextOnlyCB->Check(bTextOnly); if(!bTextOnly) @@ -1064,9 +1062,7 @@ void OfaAutocorrReplacePage::RefillReplaceBox(bool bFromReset, // formatted text is only in Writer if(bSWriter || bTextOnly) { - OUString sEntry(pWordPtr->GetShort()); - sEntry += "\t"; - sEntry += pWordPtr->GetLong(); + OUString sEntry = pWordPtr->GetShort() + "\t" + pWordPtr->GetLong(); SvTreeListEntry* pEntry = m_pReplaceTLB->InsertEntry(sEntry); m_pTextOnlyCB->Check(pWordPtr->IsTextOnly()); if(!bTextOnly) @@ -1246,8 +1242,7 @@ bool OfaAutocorrReplacePage::NewDelHdl(void* pBtn) NewEntry(m_pShortED->GetText(), m_pReplaceED->GetText(), bKeepSourceFormatting); m_pReplaceTLB->SetUpdateMode(false); sal_uLong nPos = TREELIST_ENTRY_NOTFOUND; - sEntry += "\t"; - sEntry += m_pReplaceED->GetText(); + sEntry += "\t" + m_pReplaceED->GetText(); if(_pNewEntry) { nPos = m_pReplaceTLB->GetModel()->GetAbsPos(_pNewEntry); @@ -1867,10 +1862,7 @@ OfaQuoteTabPage::OfaQuoteTabPage(vcl::Window* pParent, const SfxItemSet& rSet) m_pSwCheckLB->SetStyle(m_pSwCheckLB->GetStyle() | WB_HSCROLL| WB_VSCROLL); m_pSwCheckLB->SvSimpleTable::SetTabs(aStaticTabs); - OUString sHeader(get<vcl::Window>("m")->GetText()); - sHeader += "\t"; - sHeader += get<vcl::Window>("t")->GetText(); - sHeader += "\t"; + OUString sHeader = get<vcl::Window>("m")->GetText() + "\t" + get<vcl::Window>("t")->GetText() + "\t"; m_pSwCheckLB->InsertHeaderEntry( sHeader, HEADERBAR_APPEND, HeaderBarItemBits::CENTER | HeaderBarItemBits::VCENTER | HeaderBarItemBits::FIXEDPOS | HeaderBarItemBits::FIXED); m_pCheckLB->Hide(); diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index 4161199f0046..6eefbcefbdf8 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -699,8 +699,7 @@ void SvxGrfCropPage::GraphicHasChanged( bool bFound ) OUString sTemp = aFld->GetText(); aFld->SetValue( aFld->Normalize( aOrigSize.Height() ), eUnit ); // multiplication sign (U+00D7) - sTemp += OUString( sal_Unicode (0x00D7) ); - sTemp += aFld->GetText(); + sTemp += OUString( sal_Unicode (0x00D7) ) + aFld->GetText(); if ( aOrigPixelSize.Width() && aOrigPixelSize.Height() ) { sal_Int32 ax = sal_Int32(floor((float)aOrigPixelSize.Width() / @@ -711,8 +710,7 @@ void SvxGrfCropPage::GraphicHasChanged( bool bFound ) sTemp += CUI_RESSTR( RID_SVXSTR_PPI ); OUString sPPI = OUString::number(ax); if (abs(ax - ay) > 1) { - sPPI += OUString( sal_Unicode (0x00D7) ); - sPPI += OUString::number(ay); + sPPI += OUString( sal_Unicode (0x00D7) ) + OUString::number(ay); } sTemp = sTemp.replaceAll("%1", sPPI); } diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index 973b6b110ae3..7972967610f5 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -105,11 +105,7 @@ OUString ConvertToUIName_Impl( SvxMacro *pMacro ) aEntry = aName.getToken( nCount-1, '.' ); if ( nCount > 2 ) { - aEntry += "("; - aEntry += aName.getToken( 0, '.' ); - aEntry += "."; - aEntry += aName.getToken( nCount-2, '.' ); - aEntry += ")"; + aEntry += "(" + aName.getToken( 0, '.' ) + "." + aName.getToken( nCount-2, '.' ) + ")"; } return aEntry; } @@ -172,8 +168,7 @@ void SfxMacroTabPage::dispose() void SfxMacroTabPage::AddEvent( const OUString & rEventName, sal_uInt16 nEventId ) { - OUString sTmp( rEventName ); - sTmp += "\t"; + OUString sTmp = rEventName + "\t"; // if the table is valid already SvxMacro* pM = aTbl.Get( nEventId ); diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 1d9d220408e8..e3795cd3ee40 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -1345,8 +1345,7 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet* rSet ) m_pLevelLB->InsertEntry( OUString::number(i)); if(pSaveNum->GetLevelCount() > 1) { - OUString sEntry( "1 - " ); - sEntry += OUString::number( pSaveNum->GetLevelCount() ); + OUString sEntry = "1 - " + OUString::number( pSaveNum->GetLevelCount() ); m_pLevelLB->InsertEntry(sEntry); m_pLevelLB->SelectEntry(sEntry); } @@ -2811,20 +2810,16 @@ void lcl_PrintDebugOutput(FixedText& rFixed, const SvxNumberFormat& rNumFmt) OUString const sHash( " # " ); if ( rNumFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION ) { - OUString sDebugText( OUString::number( convertTwipToMm100(rNumFmt.GetAbsLSpace() ) ) ); - sDebugText += sHash; - sDebugText += OUString::number( convertTwipToMm100(rNumFmt.GetCharTextDistance() ) ); - sDebugText += sHash; - sDebugText += OUString::number( convertTwipToMm100(rNumFmt.GetFirstLineOffset() ) ); + OUString sDebugText = OUString::number( convertTwipToMm100(rNumFmt.GetAbsLSpace() ) ) + sHash + + OUString::number( convertTwipToMm100(rNumFmt.GetCharTextDistance() ) + sHash + + OUString::number( convertTwipToMm100(rNumFmt.GetFirstLineOffset() ) ); rFixed.SetText(sDebugText); } else if ( rNumFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT ) { - OUString sDebugText( OUString::number( convertTwipToMm100(rNumFmt.GetListtabPos() ) ) ); - sDebugText += sHash; - sDebugText += OUString::number( convertTwipToMm100(rNumFmt.GetFirstLineIndent() ) ); - sDebugText += sHash; - sDebugText += OUString::number( convertTwipToMm100(rNumFmt.GetIndentAt() ) ); + OUString sDebugText = OUString::number( convertTwipToMm100(rNumFmt.GetListtabPos() ) ) + sHash; + + OUString::number( convertTwipToMm100(rNumFmt.GetFirstLineIndent() ) ) + sHash + + OUString::number( convertTwipToMm100(rNumFmt.GetIndentAt() ) ); rFixed.SetText(sDebugText); } @@ -3123,8 +3118,7 @@ void SvxNumPositionTabPage::Reset( const SfxItemSet* rSet ) m_pLevelLB->InsertEntry( OUString::number(i) ); if(pSaveNum->GetLevelCount() > 1) { - OUString sEntry( "1 - " ); - sEntry += OUString::number( pSaveNum->GetLevelCount() ); + OUString sEntry = "1 - " + OUString::number( pSaveNum->GetLevelCount() ); m_pLevelLB->InsertEntry(sEntry); m_pLevelLB->SelectEntry(sEntry); } diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index f6fea2903635..2fdee55b1b53 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -936,9 +936,7 @@ IMPL_LINK_NOARG_TYPED(SvxPageDescPage, PaperBinHdl_Impl, Control&, void) if ( aName.isEmpty() ) { - aName = aPaperBin; - aName += " "; - aName += OUString::number( i+1 ); + aName = aPaperBin + " " + OUString::number( i+1 ); } nEntryPos = m_pPaperTrayBox->InsertEntry( aName ); m_pPaperTrayBox->SetEntryData( nEntryPos, reinterpret_cast<void*>((sal_uLong)i) ); diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index 7e9eba6c2eeb..d993c3ef5d7a 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -228,8 +228,7 @@ void SvxGradientTabPage::ActivatePage( const SfxItemSet& ) if ( aURL.getBase().getLength() > 18 ) { - aString += aURL.getBase().copy( 0, 15 ); - aString += "..."; + aString += aURL.getBase().copy( 0, 15 ) + "..."; } else aString += aURL.getBase(); diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 33eb0d30e147..ba7749bd3208 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -204,8 +204,7 @@ void SvxHatchTabPage::ActivatePage( const SfxItemSet& rSet ) if ( aURL.getBase().getLength() > 18 ) { - aString += aURL.getBase().copy( 0, 15 ); - aString += "..."; + aString += aURL.getBase().copy( 0, 15 ) + "..."; } else aString += aURL.getBase(); diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 499dfb54fa20..d689690cbf5b 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -543,9 +543,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickAddHdl_Impl, Button*, void) while ( !bDifferent ) { - aName = aNewName; - aName += " "; - aName += OUString::number( j++ ); + aName = aNewName + " " + OUString::number( j++ ); bDifferent = true; for ( long i = 0; i < nCount && bDifferent; i++ ) diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index 511b973870a4..c52ebf02134f 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -435,9 +435,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickAddHdl_Impl, Button*, void) while ( !bDifferent ) { - aName = aNewName; - aName += " "; - aName += OUString::number( j++ ); + aName = aNewName + " " + OUString::number( j++ ); bDifferent = true; for( long i = 0; i < nCount && bDifferent; i++ ) diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx index 4b2570b18273..10fcf5d6e86d 100644 --- a/cui/source/tabpages/tppattern.cxx +++ b/cui/source/tabpages/tppattern.cxx @@ -219,8 +219,7 @@ void SvxPatternTabPage::ActivatePage( const SfxItemSet& ) if( aURL.getBase().getLength() > 18 ) { - aString += aURL.getBase().copy( 0, 15 ); - aString += "..."; + aString += aURL.getBase().copy( 0, 15 ) + "..."; } else aString += aURL.getBase(); @@ -478,9 +477,7 @@ IMPL_LINK_NOARG_TYPED(SvxPatternTabPage, ClickAddHdl_Impl, Button*, void) while( !bDifferent ) { - aName = aNewName; - aName += " "; - aName += OUString::number( j++ ); + aName = aNewName + " " + OUString::number( j++ ); bDifferent = true; for( long i = 0; i < nCount && bDifferent; i++ ) |