diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-03-30 14:00:12 +0200 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-03-30 16:38:03 +0200 |
| commit | cad8953432504451d50ae5d16048edfb06a164f9 (patch) | |
| tree | 28ef5ee57d432a22b0c746ceca10d2de075b4b06 | |
| parent | f3f866b5c0ea196b8df7528607244a13ac04849a (diff) | |
Constify some OUStrings and avoid some appends
Change-Id: Id90d02bab3c3a3b3e2e59097fdf741e2de2b331c
| -rw-r--r-- | sw/source/ui/fldui/flddok.cxx | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index c085d5ea1db7..95bc444fd064 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -153,10 +153,10 @@ void SwFldDokPage::Reset(const SfxItemSet& ) if( !IsRefresh() ) { - OUString sUserData = GetUserData(); + const OUString sUserData = GetUserData(); if (sUserData.getToken(0, ';').equalsIgnoreAsciiCase(USER_DATA_VERSION_1)) { - OUString sVal = sUserData.getToken(1, ';'); + const OUString sVal = sUserData.getToken(1, ';'); const sal_uInt16 nVal = static_cast< sal_uInt16 >(sVal.toInt32()); if(nVal != USHRT_MAX) { @@ -257,7 +257,7 @@ IMPL_LINK_NOARG(SwFldDokPage, TypeHdl) case TYP_AUTHORFLD: { - OUString sFmt(GetFldMgr().GetFormatStr(nTypeId, i)); + const OUString sFmt(GetFldMgr().GetFormatStr(nTypeId, i)); nPos = m_pSelectionLB->InsertEntry(sFmt); m_pSelectionLB->SetEntryData(nPos, reinterpret_cast<void*>(i)); m_pSelectionLB->SelectEntry(GetFldMgr().GetFormatStr(nTypeId, GetCurField()->GetFormat())); @@ -524,8 +524,8 @@ IMPL_LINK_NOARG(SwFldDokPage, FormatHdl) // Prev/Next - PageNumFields special treatment: sal_uInt16 nTmp = (sal_uInt16)(sal_uLong)m_pFormatLB->GetEntryData( m_pFormatLB->GetSelectEntryPos() ); - OUString sOldTxt( m_pValueFT->GetText() ); - OUString sNewTxt( SW_RES( SVX_NUM_CHAR_SPECIAL == nTmp ? STR_VALUE + const OUString sOldTxt( m_pValueFT->GetText() ); + const OUString sNewTxt( SW_RES( SVX_NUM_CHAR_SPECIAL == nTmp ? STR_VALUE : STR_OFFSET )); if( sOldTxt != sNewTxt ) @@ -643,15 +643,11 @@ sal_uInt16 SwFldDokPage::GetGroup() void SwFldDokPage::FillUserData() { - OUString sData(USER_DATA_VERSION); - sData += ";"; - sal_Int32 nTypeSel = m_pTypeLB->GetSelectEntryPos(); - if( LISTBOX_ENTRY_NOTFOUND == nTypeSel ) - nTypeSel = USHRT_MAX; - else - nTypeSel = sal::static_int_cast< sal_uInt16 >(reinterpret_cast< sal_uIntPtr >(m_pTypeLB->GetEntryData( nTypeSel ))); - sData += OUString::number( nTypeSel ); - SetUserData(sData); + const sal_Int32 nEntryPos = m_pTypeLB->GetSelectEntryPos(); + const sal_uInt16 nTypeSel = ( LISTBOX_ENTRY_NOTFOUND == nEntryPos ) + ? USHRT_MAX : sal::static_int_cast< sal_uInt16 > + (reinterpret_cast< sal_uIntPtr >(m_pTypeLB->GetEntryData( nEntryPos ))); + SetUserData(USER_DATA_VERSION ";" + OUString::number( nTypeSel )); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |