diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2024-05-22 08:16:00 +0100 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2024-05-22 11:05:03 +0200 |
| commit | 554c06b2f66ff7c26df0ac29f89894fff89eecd6 (patch) | |
| tree | 8073376a46d011d879e245f4596a4230f3780807 | |
| parent | 080afd6a345e5dffd924100b5a3ff9c028f5b094 (diff) | |
sw: Change OSL_ENSURE -> assert
This fixes my local Windows/MSVC build that previously
failed like this:
C:/tools/cygwin/home/user/development/git/libreoffice/sw/source/core/doc/tblrwcl.cxx(3187): error C2220: the following warning is treated as an error
C:\tools\cygwin\home\user\development\git\libreoffice\sw\source\core\doc\tblrwcl.cxx(3105) : warning C6011: Dereferencing NULL pointer 'pLineFrame'. : Lines: 3031, 3033, 3034, 3037, 3038, 3039, 3040, 3042, 3044, 3046, 3049, 3061, 3063, 3083, 3084, 3085, 3086, 3093, 3094, 3098, 3100, 3102, 3103, 3104, 3105
make[1]: *** [C:/tools/cygwin/home/user/development/git/libreoffice/solenv/gbuild/LinkTarget.mk:338: C:/tools/cygwin/home/user/development/git/libreoffice/workdir/CxxObject/sw/source/core/doc/tblrwcl.o] Error 2
make: *** [Makefile:294: build] Error 2
Change-Id: I50faeba555d307ec27d1dccec7dbc3034c543830
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167918
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
| -rw-r--r-- | sw/source/core/doc/tblrwcl.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx index b13dc38ebcef..38c5074f0e89 100644 --- a/sw/source/core/doc/tblrwcl.cxx +++ b/sw/source/core/doc/tblrwcl.cxx @@ -3100,7 +3100,7 @@ bool SwTable::SetRowHeight( SwTableBox& rCurrentBox, TableChgWidthHeightType eTy for( auto n = nStt; n < nEnd; ++n ) { SwLayoutFrame* pLineFrame = GetRowFrame( *(*pLines)[ n ] ); - OSL_ENSURE( pLineFrame, "Where is the Frame from the SwTableLine??" ); + assert(pLineFrame && "Where is the Frame from the SwTableLine??"); aParam.nMaxSpace += CalcRowRstHeight( pLineFrame ); aParam.nMaxHeight += pLineFrame->getFrameArea().Height(); } |