summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2016-04-23 20:23:29 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-05-27 07:21:45 +0000
commit9eb2e683ab051edd0bce18841f0ac05df5038854 (patch)
tree71e7a4d4b8389c09ff17024fceaed94668751082 /extensions
parentfd964e3b9f60bf2043fdc39ab8161a586049b481 (diff)
tdf#34465 remove calls to SfxItemSet::Put(const SfxPoolItem&, sal_uInt16)
and put an assert in SfxPoolItem::SetWhich() so nothing new creeps in. Change-Id: I6497650fa61ffb2b6941ffff2d471c8f117be1df Reviewed-on: https://gerrit.libreoffice.org/24324 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'extensions')
-rw-r--r--extensions/source/propctrlr/fontdialog.cxx22
1 files changed, 11 insertions, 11 deletions
diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx
index 868260454b60..89461f28257f 100644
--- a/extensions/source/propctrlr/fontdialog.cxx
+++ b/extensions/source/propctrlr/fontdialog.cxx
@@ -248,17 +248,17 @@ namespace pcr
SvxCharReliefItem aFontReliefItem((FontRelief)nFontRelief, CFID_RELIEF);
SvxEmphasisMarkItem aEmphasisMarkitem((FontEmphasisMark)nFontEmphasisMark, CFID_EMPHASIS);
- _pSet->Put(aFontItem, CFID_FONT);
- _pSet->Put(aSvxFontHeightItem,CFID_HEIGHT);
- _pSet->Put(aWeightItem, CFID_WEIGHT);
- _pSet->Put(aPostureItem, CFID_POSTURE);
- _pSet->Put(aLanguageItem, CFID_LANGUAGE);
- _pSet->Put(aUnderlineItem,CFID_UNDERLINE);
- _pSet->Put(aCrossedOutItem,CFID_STRIKEOUT);
- _pSet->Put(aWordLineModeItem, CFID_WORDLINEMODE);
- _pSet->Put(aSvxColorItem, CFID_CHARCOLOR);
- _pSet->Put(aFontReliefItem, CFID_RELIEF);
- _pSet->Put(aEmphasisMarkitem, CFID_EMPHASIS);
+ _pSet->Put(aFontItem);
+ _pSet->Put(aSvxFontHeightItem);
+ _pSet->Put(aWeightItem);
+ _pSet->Put(aPostureItem);
+ _pSet->Put(aLanguageItem);
+ _pSet->Put(aUnderlineItem);
+ _pSet->Put(aCrossedOutItem);
+ _pSet->Put(aWordLineModeItem);
+ _pSet->Put(aSvxColorItem);
+ _pSet->Put(aFontReliefItem);
+ _pSet->Put(aEmphasisMarkitem);
aPropExtractor.invalidateItem(PROPERTY_FONT_NAME, CFID_FONT, *_pSet);
aPropExtractor.invalidateItem(PROPERTY_FONT_HEIGHT, CFID_HEIGHT, *_pSet);