diff options
| author | Armin Le Grand (allotropia) <armin.le.grand.extern@allotropia.de> | 2024-01-27 15:04:06 +0100 |
|---|---|---|
| committer | Armin Le Grand <Armin.Le.Grand@me.com> | 2024-01-27 19:02:54 +0100 |
| commit | 4790ef5cb574650c418591566eeb0babc69db59e (patch) | |
| tree | bdca4156b1da8bb3efc06cebcee77fa541866ca7 /extensions | |
| parent | d2d8f8bf82558d9aa548fb9f13bed410e0baf79b (diff) | |
ITEM: Cleanup some Pool stuff with Defaults
Sorted out some methods at ItemPool which process
Defaults to make more clear what is going on and
what which method is doing.
Change-Id: I2568d3e03d0a56a14b6fe4e04521e1a8e22c000b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162643
Tested-by: Jenkins
Reviewed-by: Armin Le Grand <Armin.Le.Grand@me.com>
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/propctrlr/fontdialog.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx index 5605560070e8..9a7078a869ab 100644 --- a/extensions/source/propctrlr/fontdialog.cxx +++ b/extensions/source/propctrlr/fontdialog.cxx @@ -566,14 +566,14 @@ namespace pcr void ControlCharacterDialog::destroyItemSet(std::unique_ptr<SfxItemSet>& _rpSet, rtl::Reference<SfxItemPool>& _rpPool, std::vector<SfxPoolItem*>*& _rpDefaults) { // from the pool, get and remember the font list (needs to be deleted) - const SvxFontListItem& rFontListItem = static_cast<const SvxFontListItem&>(_rpPool->GetDefaultItem(FontItemIds::CFID_FONTLIST)); + const SvxFontListItem& rFontListItem = static_cast<const SvxFontListItem&>(_rpPool->GetUserOrPoolDefaultItem(FontItemIds::CFID_FONTLIST)); const FontList* pFontList = rFontListItem.GetFontList(); // _first_ delete the set (referring the pool) _rpSet.reset(); // delete the pool - _rpPool->ReleaseDefaults(true); + _rpPool->ReleasePoolDefaults(true); // the "true" means delete the items, too _rpPool = nullptr; |