diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2021-10-06 18:22:36 +0200 |
|---|---|---|
| committer | Henry Castro <hcastro@collabora.com> | 2022-02-18 15:48:48 +0100 |
| commit | 24bf5c002cbeecef109e4e409e51305f03ea9fe6 (patch) | |
| tree | 05d95fee6ddbf3f8ebbea3543c2c122bcef51119 /sc/source/ui/app/transobj.cxx | |
| parent | 321f6577cdafa728f73d1b679d86581f1c0db110 (diff) | |
lok: deglobalize SetDragObject
and other Drag and Drop related functions
Change-Id: Idbaec91c0ed396da9888c8ed562d2eff35686cca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123209
Tested-by: Szymon Kłos <szymon.klos@collabora.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129466
Tested-by: Jenkins
Reviewed-by: Henry Castro <hcastro@collabora.com>
Diffstat (limited to 'sc/source/ui/app/transobj.cxx')
| -rw-r--r-- | sc/source/ui/app/transobj.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx index 438e922297a4..245209e822bb 100644 --- a/sc/source/ui/app/transobj.cxx +++ b/sc/source/ui/app/transobj.cxx @@ -28,6 +28,7 @@ #include <unotools/tempfile.hxx> #include <unotools/ucbstreamhelper.hxx> #include <comphelper/fileformat.h> +#include <comphelper/lok.hxx> #include <comphelper/storagehelper.hxx> #include <comphelper/servicehelper.hxx> #include <sot/storage.hxx> @@ -51,6 +52,7 @@ #include <scmod.hxx> #include <dragdata.hxx> #include <sortparam.hxx> +#include <tabvwsh.hxx> #include <editeng/paperinf.hxx> #include <editeng/sizeitem.hxx> @@ -176,8 +178,9 @@ ScTransferObj::~ScTransferObj() { SolarMutexGuard aSolarGuard; + bool bIsDisposing = comphelper::LibreOfficeKit::isActive() && !ScTabViewShell::GetActiveViewShell(); ScModule* pScMod = SC_MOD(); - if (pScMod && pScMod->GetDragData().pCellTransfer == this) + if (pScMod && !bIsDisposing && pScMod->GetDragData().pCellTransfer == this) { OSL_FAIL("ScTransferObj wasn't released"); pScMod->ResetDragObject(); |