sc/source/ui/view/tabview3.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 0804835232b7a678990d2bb15a06aa4767020815
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Wed May 7 12:05:04 2025 +0200
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Wed May 7 14:15:15 2025 +0200
sc/source/ui/view/tabview3.cxx: Switch DBG_ASSERT to assert
This fixes Windows/MSVC build errors like the one reported in
https://ci.libreoffice.org/view/tb%20platform%20status/job/lo_tb_master_win_analyze/1135/console
C:/cygwin/home/tdf/lode/jenkins/workspace/lo_tb_master_win_analyze/sc/source/ui/view/tabview3.cxx(2335):
error C2220: the following warning is treated as an error
C: warning C6011: Dereferencing NULL pointer 'pEditView'. : Lines: 2300,
2302, 2303, 2304, 2309, 2310, 2313
C: warning C6011: Dereferencing NULL pointer 'pEditView'. : Lines: 2353,
2354, 2355, 2358, 2359
C: warning C6011: Dereferencing NULL pointer 'pEditView'. : Lines: 2440,
2443, 2444, 2445, 2449, 2452, 2458
Change-Id: I324adb67b207075a420b51726a8211d53257d3f9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185016
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
Tested-by: Julien Nabet <serval2...@yahoo.fr>
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index cd060978c5d3..708790f14e01 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -2301,7 +2301,7 @@ drawinglayer::primitive2d::Primitive2DContainer
ScTextEditOverlayObject::createO
ScViewData& rScViewData(mrScTabView.GetViewData());
const EditView* pEditView(rScViewData.GetEditView(maScSplitPos));
- DBG_ASSERT(nullptr != pEditView, "NO access to EditView in
ScTextEditOverlayObject!");
+ assert(pEditView && "NO access to EditView in ScTextEditOverlayObject!");
// use no transformations. The result will be in logic coordinates
// based on aEditRectangle and the EditEngine setup, see
@@ -2352,7 +2352,7 @@ void ScTextEditOverlayObject::EditViewSelectionChange()
{
ScViewData& rScViewData(mrScTabView.GetViewData());
EditView* pEditView(rScViewData.GetEditView(maScSplitPos));
- DBG_ASSERT(nullptr != pEditView, "NO access to EditView in
ScTextEditOverlayObject!");
+ assert(pEditView && "NO access to EditView in ScTextEditOverlayObject!");
// get the selection rectangles
std::vector<tools::Rectangle> aRects;
@@ -2442,7 +2442,7 @@ drawinglayer::primitive2d::Primitive2DContainer
ScTextEditOverlayObject::getOver
ScViewData& rScViewData(mrScTabView.GetViewData());
EditView* pEditView(rScViewData.GetEditView(maScSplitPos));
- DBG_ASSERT(nullptr != pEditView, "NO access to EditView in
ScTextEditOverlayObject!");
+ assert(pEditView && "NO access to EditView in ScTextEditOverlayObject!");
// call base implementation to get TextPrimitives in logic coordinates
// directly from the setup EditEngine
