diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-05-18 21:14:00 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-05-19 15:40:40 +0200 |
| commit | 2155e04d6343638ca9815d394cbc4f78c2b17c3a (patch) | |
| tree | 0378142f6ce9edb63074291aed45527568e7b254 /sw/source/ui/fldui/flddok.cxx | |
| parent | cee02e81cd3b55fb46eacf5db5713e8bf4363bcd (diff) | |
make string translation loading more uniform
change various ResId classes that use conversion operator to OUString to
functions that return a OUString
drop various defines
drop unnecessary toString calls
Change-Id: Ibeccdf2b91a46a2ed5b4b74e6024e301a023bc92
Reviewed-on: https://gerrit.libreoffice.org/37817
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/ui/fldui/flddok.cxx')
| -rw-r--r-- | sw/source/ui/fldui/flddok.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index df89661bcc2f..35c7df610a71 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -131,7 +131,7 @@ void SwFieldDokPage::Reset(const SfxItemSet* ) case TYP_PAGENUMBERFLD: if (!bPage) { - nPos = m_pTypeLB->InsertEntry(SW_RESSTR(FMT_REF_PAGE)); + nPos = m_pTypeLB->InsertEntry(SwResId(FMT_REF_PAGE)); m_pTypeLB->SetEntryData(nPos, reinterpret_cast<void*>(USHRT_MAX)); bPage = true; } @@ -384,14 +384,14 @@ IMPL_LINK_NOARG(SwFieldDokPage, TypeHdl, ListBox&, void) break; case TYP_CHAPTERFLD: - m_pValueFT->SetText(SW_RESSTR(STR_LEVEL)); + m_pValueFT->SetText(SwResId(STR_LEVEL)); if (IsFieldEdit()) m_pLevelED->SetText(OUString::number(static_cast<SwChapterField*>(GetCurField())->GetLevel() + 1)); bLevel = true; break; case TYP_PAGENUMBERFLD: - m_pValueFT->SetText( SW_RESSTR( STR_OFFSET )); + m_pValueFT->SetText( SwResId( STR_OFFSET )); if (IsFieldEdit()) m_pValueED->SetText(GetCurField()->GetPar2()); bValue = true; @@ -487,7 +487,7 @@ IMPL_LINK_NOARG(SwFieldDokPage, SubTypeHdl, ListBox&, void) } if( nTextRes ) - m_pValueFT->SetText( SW_RESSTR( nTextRes )); + m_pValueFT->SetText( SwResId( nTextRes )); } sal_Int32 SwFieldDokPage::FillFormatLB(sal_uInt16 nTypeId) @@ -511,10 +511,10 @@ sal_Int32 SwFieldDokPage::FillFormatLB(sal_uInt16 nTypeId) if( nSize && !m_pFormatLB->GetSelectEntryCount() ) { - m_pFormatLB->SelectEntry( SW_RESSTR(FMT_NUM_PAGEDESC) ); + m_pFormatLB->SelectEntry( SwResId(FMT_NUM_PAGEDESC) ); if( !m_pFormatLB->GetSelectEntryCount() ) { - m_pFormatLB->SelectEntry( SW_RESSTR(FMT_NUM_ARABIC) ); + m_pFormatLB->SelectEntry( SwResId(FMT_NUM_ARABIC) ); if( !m_pFormatLB->GetSelectEntryCount() ) m_pFormatLB->SelectEntryPos( 0 ); } @@ -544,7 +544,7 @@ IMPL_LINK_NOARG(SwFieldDokPage, FormatHdl, ListBox&, void) sal_uInt16 nTmp = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pFormatLB->GetEntryData( m_pFormatLB->GetSelectEntryPos() )); const OUString sOldText( m_pValueFT->GetText() ); - const OUString sNewText( SW_RES( SVX_NUM_CHAR_SPECIAL == nTmp ? STR_VALUE + const OUString sNewText( SwResId( SVX_NUM_CHAR_SPECIAL == nTmp ? STR_VALUE : STR_OFFSET )); if( sOldText != sNewText ) |