diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-02 10:57:21 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-02 13:06:37 +0000 |
| commit | b1f8cf37828d5f37527e54774aa4935610aa6325 (patch) | |
| tree | 33348c0208f76237f1b08823923f22f99d78b256 /sw | |
| parent | c3a3b876a3a2a739b266622f51a00016a81b0cdf (diff) | |
loplugin:singlevalfields
Change-Id: I65f96d9cd24572c8d0946acf4d2d45eb3db83a76
Reviewed-on: https://gerrit.libreoffice.org/30476
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/txatritr.hxx | 1 | ||||
| -rw-r--r-- | sw/source/core/txtnode/txatritr.cxx | 9 |
2 files changed, 4 insertions, 6 deletions
diff --git a/sw/inc/txatritr.hxx b/sw/inc/txatritr.hxx index 9843094fbe7e..178bf94cf4f6 100644 --- a/sw/inc/txatritr.hxx +++ b/sw/inc/txatritr.hxx @@ -58,7 +58,6 @@ class SwLanguageIterator const SfxPoolItem* pCurItem; size_t nAttrPos; sal_Int32 nChgPos; - sal_uInt16 nWhichId; void AddToStack( const SwTextAttr& rAttr ); void SearchNextChg(); diff --git a/sw/source/core/txtnode/txatritr.cxx b/sw/source/core/txtnode/txatritr.cxx index d98607e1e9e7..9048fde21b2a 100644 --- a/sw/source/core/txtnode/txatritr.cxx +++ b/sw/source/core/txtnode/txatritr.cxx @@ -99,8 +99,7 @@ SwLanguageIterator::SwLanguageIterator( const SwTextNode& rTNd, rTextNd( rTNd ), pParaItem( nullptr ), nAttrPos( 0 ), - nChgPos( nStt ), - nWhichId( RES_CHRATR_LANGUAGE ) + nChgPos( nStt ) { SearchNextChg(); } @@ -138,7 +137,7 @@ bool SwLanguageIterator::Next() if( RES_TXTATR_CHARFMT == pHt->Which() ) { - const sal_uInt16 nWId = GetWhichOfScript( nWhichId, aSIter.GetCurrScript() ); + const sal_uInt16 nWId = GetWhichOfScript( RES_CHRATR_LANGUAGE, aSIter.GetCurrScript() ); pCurItem = &pHt->GetCharFormat().GetCharFormat()->GetFormatAttr(nWId); } else @@ -179,7 +178,7 @@ void SwLanguageIterator::SearchNextChg() } if( !pParaItem ) { - nWh = GetWhichOfScript( nWhichId, aSIter.GetCurrScript() ); + nWh = GetWhichOfScript( RES_CHRATR_LANGUAGE, aSIter.GetCurrScript() ); pParaItem = &rTextNd.GetSwAttrSet().Get( nWh ); } @@ -192,7 +191,7 @@ void SwLanguageIterator::SearchNextChg() { if( !nWh ) { - nWh = GetWhichOfScript( nWhichId, aSIter.GetCurrScript() ); + nWh = GetWhichOfScript( RES_CHRATR_LANGUAGE, aSIter.GetCurrScript() ); } const SfxPoolItem* pItem = nullptr; |