summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorArmin Le Grand (allotropia) <armin.le.grand.extern@allotropia.de>2023-12-20 19:42:28 +0100
committerArmin Le Grand <Armin.Le.Grand@me.com>2023-12-21 21:13:55 +0100
commit789a737ac92c4f2b0eb9820b99c43cc8253c8b29 (patch)
treebc167ec04de29e63168844be973f59980fa36ac2 /sd
parent3430a2c639a9f714259f9d319515464a653d21ab (diff)
Remove DeleteItemOnIdlex
There are some CrashReports in 7.6 which have DeleteItemOnIdle on the stack, but there is nothing reproducable. So I took a look... I first thought it's a MCGR regression, due to classes on the stack. But the Item involved is just random, can happen with any Item. Then I thought it may have to do with ITEM refactorings, but it happens with DeleteItemOnIdle involved, so also not the case. I already saw DeleteItemOnIdle when doing these and qualified as 'hack' in the way. already It is only on Windows and DeleteItemOnIdle is involved. This again (took a deeper look now) is an old hack to keep an SfxPoolItem 'alive' for some 'time'. For that, it triggers an async reschedule which then deletes the Item when being called. If the Item will be used after that is pure coincidence - seems to work in most cases. It seems as if for Windows the timing slightly changed for some scenarios, so a reschedule is too early. This can happen with this hack anytime. DeleteItemOnIdle is used in scenarios where SfxPoolItem* is e.g. returned, but is *not* anchored, so e.g. not member of an SfxItemSet. Or in short: Lifetime is not safe. DeleteItemOnIdle exists since 1st import, but was changed to AsyncEvent ca. 4 months ago (see 57145acf9ec47c23e307b7a5c0029d21d937cc35), so that may have caused it. It is possible that these errors happen on Windows since then. Before something more complicated was used to delete it late, but surely also not really safe. Due to ITEM refactor I have the knowledge/tooling to solve this. It will not be a 1-5 lines fix, but it is a hack and in the way for further ITEM refactor anyways. What we have nowadays is a SfxPoolItemHolder -> it's like an SfxItemSet for a single Item. It safely holds/ controls the lifetime of an SfxPoolItem. It is already used in quite some places. It helps to solve many hacks, also the ones putting Items directly to the Pool - due to there never was an alternative for that. In principle the ItemPool/ItemSet/Item paradigm was never complete without SfxPoolItemHolder. Thus I started to fix that (and remove that hack for good, sooo many changes over the years, sigh), but as said is not straightforward. Will have to change retvals of involved stuff to SfxPoolItemHolder - it's just two pointers and designed to be copied (one is a Pool, needed to cleanup when destructing). CopyConstruct/destroy just counts the RefCnt up/down, so cheap. 1st version compiling, let's check on gerrit... Corrected one error in QueryState for securitypage, also added some security features/asserts. Change-Id: Ida49fd35ca88ead84b11d93e18b978cb9e395090 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161083 Tested-by: Jenkins Reviewed-by: Armin Le Grand <Armin.Le.Grand@me.com>
Diffstat (limited to 'sd')
-rw-r--r--sd/qa/unit/tiledrendering/tiledrendering.cxx4
-rw-r--r--sd/source/ui/app/sdmod1.cxx12
-rw-r--r--sd/source/ui/dlg/NavigatorChildWindow.cxx1
-rw-r--r--sd/source/ui/sidebar/LayoutMenu.cxx4
-rw-r--r--sd/source/ui/unoidl/unomodel.cxx5
-rw-r--r--sd/source/ui/unoidl/unomodule.cxx4
6 files changed, 16 insertions, 14 deletions
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 23d96e7595bd..2136cd378aba 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -1217,7 +1217,7 @@ CPPUNIT_TEST_FIXTURE(SdTiledRenderingTest, testUndoLimiting)
SfxRequest aReq2(SID_UNDO, SfxCallMode::SLOT, pXImpressDocument->GetDocShell()->GetDoc()->GetPool());
aReq2.AppendItem(SfxUInt16Item(SID_UNDO, 1));
pViewShell2->ExecuteSlot(aReq2);
- const auto* pReturnValue = aReq2.GetReturnValue();
+ const auto* pReturnValue = aReq2.GetReturnValue().getItem();
CPPUNIT_ASSERT(!pReturnValue);
}
@@ -1249,7 +1249,7 @@ CPPUNIT_TEST_FIXTURE(SdTiledRenderingTest, testUndoLimiting)
SfxRequest aReq2(SID_UNDO, SfxCallMode::SLOT, pXImpressDocument->GetDocShell()->GetDoc()->GetPool());
aReq2.AppendItem(SfxUInt16Item(SID_UNDO, 1));
pViewShell2->ExecuteSlot(aReq2);
- const SfxUInt32Item* pUInt32Item = dynamic_cast<const SfxUInt32Item*>(aReq2.GetReturnValue());
+ const SfxUInt32Item* pUInt32Item = dynamic_cast<const SfxUInt32Item*>(aReq2.GetReturnValue().getItem());
CPPUNIT_ASSERT(pUInt32Item);
CPPUNIT_ASSERT_EQUAL(static_cast< sal_uInt32 >(SID_REPAIRPACKAGE), pUInt32Item->GetValue());
}
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index b211d9c95f94..0d9e82f27802 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -322,17 +322,17 @@ void SdModule::GetState(SfxItemSet& rItemSet)
// state of SID_OPENDOC is determined by the base class
if (rItemSet.GetItemState(SID_OPENDOC) != SfxItemState::UNKNOWN)
{
- const SfxPoolItem* pItem = SfxGetpApp()->GetSlotState(SID_OPENDOC, SfxGetpApp()->GetInterface());
- if (pItem)
- rItemSet.Put(*pItem);
+ const SfxPoolItemHolder aItem(SfxGetpApp()->GetSlotState(SID_OPENDOC, SfxGetpApp()->GetInterface()));
+ if (nullptr != aItem.getItem())
+ rItemSet.Put(*aItem.getItem());
}
// state of SID_OPENHYPERLINK is determined by the base class
if (rItemSet.GetItemState(SID_OPENHYPERLINK) != SfxItemState::UNKNOWN)
{
- const SfxPoolItem* pItem = SfxGetpApp()->GetSlotState(SID_OPENHYPERLINK, SfxGetpApp()->GetInterface());
- if (pItem)
- rItemSet.Put(*pItem);
+ const SfxPoolItemHolder aItem(SfxGetpApp()->GetSlotState(SID_OPENHYPERLINK, SfxGetpApp()->GetInterface()));
+ if (nullptr != aItem.getItem())
+ rItemSet.Put(*aItem.getItem());
}
if( SfxItemState::DEFAULT == rItemSet.GetItemState( SID_AUTOSPELL_CHECK ) )
diff --git a/sd/source/ui/dlg/NavigatorChildWindow.cxx b/sd/source/ui/dlg/NavigatorChildWindow.cxx
index 6055c238a3c9..a9746b607601 100644
--- a/sd/source/ui/dlg/NavigatorChildWindow.cxx
+++ b/sd/source/ui/dlg/NavigatorChildWindow.cxx
@@ -24,6 +24,7 @@
#include <sfx2/dispatch.hxx>
#include <sfx2/sfxsids.hrc>
#include <svl/eitem.hxx>
+#include <svl/itemset.hxx>
namespace sd {
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index 8a730bb65a61..98ab853fb5bf 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -588,9 +588,9 @@ void LayoutMenu::ShowContextMenu(const Point* pPos)
// Disable the SID_INSERTPAGE_LAYOUT_MENU item when
// the document is read-only.
- const SfxPoolItem* pItem = nullptr;
+ SfxPoolItemHolder aResult;
const SfxItemState aState (
- mrBase.GetViewFrame().GetDispatcher()->QueryState(SID_INSERTPAGE, pItem));
+ mrBase.GetViewFrame().GetDispatcher()->QueryState(SID_INSERTPAGE, aResult));
if (aState == SfxItemState::DISABLED)
xMenu->set_sensitive("insert", false);
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 8ae4cd0818da..dd9d5739555b 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -2459,8 +2459,9 @@ bool SdXImpressDocument::isMasterViewMode()
if (pViewSh->GetDispatcher())
{
- const SfxBoolItem* isMasterViewMode = nullptr;
- pViewSh->GetDispatcher()->QueryState(SID_SLIDE_MASTER_MODE, isMasterViewMode);
+ SfxPoolItemHolder aResult;
+ pViewSh->GetDispatcher()->QueryState(SID_SLIDE_MASTER_MODE, aResult);
+ const SfxBoolItem* isMasterViewMode(static_cast<const SfxBoolItem*>(aResult.getItem()));
if (isMasterViewMode && isMasterViewMode->GetValue())
return true;
}
diff --git a/sd/source/ui/unoidl/unomodule.cxx b/sd/source/ui/unoidl/unomodule.cxx
index d862f7c9dd36..5ee3cab40d7e 100644
--- a/sd/source/ui/unoidl/unomodule.cxx
+++ b/sd/source/ui/unoidl/unomodule.cxx
@@ -48,8 +48,8 @@ void SAL_CALL SdUnoModule::dispatchWithNotification( const util::URL& aURL, cons
else
{
SfxRequest aReq( pSlot, aArgs, SfxCallMode::SYNCHRON, SD_MOD()->GetPool() );
- const SfxPoolItem* pResult = SD_MOD()->ExecuteSlot( aReq );
- if ( pResult )
+ const SfxPoolItemHolder aResult(SD_MOD()->ExecuteSlot(aReq));
+ if (nullptr != aResult.getItem())
aState = frame::DispatchResultState::SUCCESS;
else
aState = frame::DispatchResultState::FAILURE;