diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-05 11:10:36 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-05 13:01:33 +0100 |
| commit | ec920ed0ecc9cb42b900138a299bf070dc86103c (patch) | |
| tree | cdcd282559517d79ed68d8d4f75ea2993851c136 /editeng | |
| parent | a648c07de904c993daae71a27f2b4c4ebc2ece3b (diff) | |
Revert "GetTrueSlotId is dead"
This reverts commit 4f11182566b02f9f1c1821985a94b4b4de363fbb.
Turns out I was wrong, there are tons of place defining
slotid<->whichid mappings.
Change-Id: I2a124ecba02c45f14ee917727adb993c39994881
Reviewed-on: https://gerrit.libreoffice.org/47454
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/editeng/editdoc.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx index 0896b62af791..07a495d2bb1f 100644 --- a/editeng/source/editeng/editdoc.cxx +++ b/editeng/source/editeng/editdoc.cxx @@ -886,7 +886,14 @@ void ConvertAndPutItems( SfxItemSet& rDest, const SfxItemSet& rSource, const Map { // If possible go through SlotID ... - sal_uInt16 const nSourceWhich = nWhich; + sal_uInt16 nSourceWhich = nWhich; + sal_uInt16 nSlot = pDestPool->GetTrueSlotId( nWhich ); + if ( nSlot ) + { + sal_uInt16 nW = pSourcePool->GetTrueWhich( nSlot ); + if ( nW ) + nSourceWhich = nW; + } if ( rSource.GetItemState( nSourceWhich, false ) == SfxItemState::SET ) { |