sc/source/ui/view/cellsh2.cxx | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-)
New commits: commit 5298aa07d2b7acd266c85440c7c25ae1d7e77c1a Author: Xisco Fauli <[email protected]> AuthorDate: Wed Feb 25 10:07:37 2026 +0100 Commit: Tomaž Vajngerl <[email protected]> CommitDate: Thu Feb 26 16:21:48 2026 +0100 sc: fix warning C6011: Dereferencing NULL pointer... ... 'pTabViewShell->GetDBData(1, SC_DB_MAKE, Keep)' After commit a8ae0abbd646443a65dc2e5f44c395fb5a454a29 Author: Tomaž Vajngerl <[email protected]> Date: Mon Feb 23 13:39:24 2026 +0900 tdf#158196 Shuffle operation to randomly shuffle a cell range Change-Id: Ia09ca430a6edddf6da4b2d7bfe5bddd3dd2b882c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200292 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins (cherry picked from commit 6c1867b8776f7417b4cda6531037fd42bfe8711b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200436 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Tomaž Vajngerl <[email protected]> diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx index 6bb34d55b74d..23c91c8c0d68 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -432,25 +432,28 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) break; case SID_SHUFFLE: { - ScSortParam aSortParam; - ScViewData& rData = GetViewData(); - pTabViewShell->GetDBData()->GetSortParam(aSortParam); - - if (lcl_GetSortParam(rData, aSortParam)) + if (ScDBData* pDBData = pTabViewShell->GetDBData()) { - pTabViewShell->GetDBData()->GetSortParam(aSortParam); + ScSortParam aSortParam; + ScViewData& rData = GetViewData(); + pDBData->GetSortParam(aSortParam); - ScDocument& rDoc = rData.GetDocument(); - SCTAB nTab = rData.CurrentTabForData(); - bool bHasHeader = rDoc.HasColHeader( - aSortParam.nCol1, aSortParam.nRow1, - aSortParam.nCol2, aSortParam.nRow2, nTab); - aSortParam.bHasHeader = bHasHeader; - aSortParam.bByRow = true; - aSortParam.meSortOrderType = SortOrderType::Random; - - pTabViewShell->Sort(aSortParam); - rReq.Done(); + if (lcl_GetSortParam(rData, aSortParam)) + { + pDBData->GetSortParam(aSortParam); + + ScDocument& rDoc = rData.GetDocument(); + SCTAB nTab = rData.CurrentTabForData(); + bool bHasHeader = rDoc.HasColHeader( + aSortParam.nCol1, aSortParam.nRow1, + aSortParam.nCol2, aSortParam.nRow2, nTab); + aSortParam.bHasHeader = bHasHeader; + aSortParam.bByRow = true; + aSortParam.meSortOrderType = SortOrderType::Random; + + pTabViewShell->Sort(aSortParam); + rReq.Done(); + } } } break;
