diff options
| author | Armin Le Grand (allotropia) <armin.le.grand.extern@allotropia.de> | 2024-02-18 19:17:48 +0100 |
|---|---|---|
| committer | Armin Le Grand <Armin.Le.Grand@me.com> | 2024-02-18 21:37:52 +0100 |
| commit | cebbd5795d6256fb346ac8d70c15daceca48c554 (patch) | |
| tree | 40e5c20c2728c67a64f1156b1ca6099e4d16a081 /editeng | |
| parent | d367142731f09c7be03ce1707e3aeab3c55b4f21 (diff) | |
ITEM: Rename for more control over SlotID usages
Change-Id: I51585f1c15984a066262023184f668662853d20f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163556
Tested-by: Jenkins
Reviewed-by: Armin Le Grand <Armin.Le.Grand@me.com>
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/editeng/editdoc.cxx | 2 | ||||
| -rw-r--r-- | editeng/source/editeng/edtspell.cxx | 2 | ||||
| -rw-r--r-- | editeng/source/items/textitem.cxx | 6 | ||||
| -rw-r--r-- | editeng/source/rtf/svxrtf.cxx | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx index bf9fca26f36c..e482eea38652 100644 --- a/editeng/source/editeng/editdoc.cxx +++ b/editeng/source/editeng/editdoc.cxx @@ -639,7 +639,7 @@ void ConvertAndPutItems( SfxItemSet& rDest, const SfxItemSet& rSource, const Map sal_uInt16 nSlot = pDestPool->GetTrueSlotId( nWhich ); if ( nSlot ) { - sal_uInt16 nW = pSourcePool->GetTrueWhich( nSlot ); + sal_uInt16 nW = pSourcePool->GetTrueWhichIDFromSlotID( nSlot ); if ( nW ) nSourceWhich = nW; } diff --git a/editeng/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx index c9fdc2bfde3b..514e70f93025 100644 --- a/editeng/source/editeng/edtspell.cxx +++ b/editeng/source/editeng/edtspell.cxx @@ -569,7 +569,7 @@ void EdtAutoCorrDoc::SetAttr(sal_Int32 nStt, sal_Int32 nEnd, pPool = pPool->GetSecondaryPool(); } - sal_uInt16 nWhich = pPool->GetWhich( nSlotId ); + sal_uInt16 nWhich = pPool->GetWhichIDFromSlotID( nSlotId ); if ( nWhich ) { rItem.SetWhich( nWhich ); diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index 758208f7db81..b4fa77d59d6f 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -2878,9 +2878,9 @@ void SvxScriptSetItem::GetWhichIds( sal_uInt16 nSlotId, const SfxItemSet& rSet, { const SfxItemPool& rPool = *rSet.GetPool(); GetSlotIds( nSlotId, rLatin, rAsian, rComplex ); - rLatin = rPool.GetWhich( rLatin ); - rAsian = rPool.GetWhich( rAsian ); - rComplex = rPool.GetWhich( rComplex ); + rLatin = rPool.GetWhichIDFromSlotID( rLatin ); + rAsian = rPool.GetWhichIDFromSlotID( rAsian ); + rComplex = rPool.GetWhichIDFromSlotID( rComplex ); } void SvxScriptSetItem::GetWhichIds( sal_uInt16& rLatin, sal_uInt16& rAsian, diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx index 24bbf69da88c..f24b61b0b4f6 100644 --- a/editeng/source/rtf/svxrtf.cxx +++ b/editeng/source/rtf/svxrtf.cxx @@ -917,7 +917,7 @@ void SvxRTFParser::BuildWhichTable() }; for (sal_uInt16 nWid : WIDS1) { - sal_uInt16 nTrueWid = pAttrPool->GetTrueWhich(nWid, false); + sal_uInt16 nTrueWid = pAttrPool->GetTrueWhichIDFromSlotID(nWid, false); aPardMap.data[nWid] = nTrueWid; if (nTrueWid == 0) continue; @@ -942,7 +942,7 @@ void SvxRTFParser::BuildWhichTable() }; for (sal_uInt16 nWid : WIDS) { - sal_uInt16 nTrueWid = pAttrPool->GetTrueWhich(nWid, false); + sal_uInt16 nTrueWid = pAttrPool->GetTrueWhichIDFromSlotID(nWid, false); aPlainMap.data[nWid] = nTrueWid; if (nTrueWid == 0) continue; |