svx/source/tbxctrls/linectrl.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit 656a79ed1365851e7f8b0f3dacb29321c0264b6b Author: Stephan Bergmann <[email protected]> AuthorDate: Fri Oct 24 23:39:03 2025 +0200 Commit: Xisco Fauli <[email protected]> CommitDate: Mon Oct 27 10:36:45 2025 +0100 Fix presumed | vs. & typos ...introduced in 25e08e4ea0df956f46bd7ef81493fcf5a5c1879c "Resolves: tdf#164920 add scrollbar width to desired size if enabled" and causing > svx/source/tbxctrls/linectrl.cxx:435:15: error: bitwise or with non-zero value always evaluates to true [-Werror,-Wtautological-bitwise-compare] > 435 | if (nBits | WB_VSCROLL) > | ~~~~~~^~~~~~~~~~~~ > svx/source/tbxctrls/linectrl.cxx:576:15: error: bitwise or with non-zero value always evaluates to true [-Werror,-Wtautological-bitwise-compare] > 576 | if (nBits | WB_VSCROLL) > | ~~~~~~^~~~~~~~~~~~ Change-Id: I6f77cd30f3b98abb15afb665b336fba13d46ee01 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192963 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> (cherry picked from commit ad6e817e38545903f5fbbe11a2dcb033e5affead) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192968 Reviewed-by: Xisco Fauli <[email protected]> diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index bb01e8e31a90..4b6a3f2fc5b2 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -432,7 +432,7 @@ void SvxLineEndWindow::SetSize() aSize.AdjustWidth(6 ); aSize.AdjustHeight(6 ); aSize = mxLineEndSet->CalcWindowSizePixel( aSize ); - if (nBits | WB_VSCROLL) + if (nBits & WB_VSCROLL) aSize.AdjustWidth(mxLineEndSet->GetScrollWidth()); mxLineEndSet->GetDrawingArea()->set_size_request(aSize.Width(), aSize.Height()); mxLineEndSet->SetOutputSizePixel(aSize); @@ -573,7 +573,7 @@ void SvxLineBox::Fill( const XDashListRef &pList ) aSize.AdjustWidth(6); aSize.AdjustHeight(6); aSize = mxLineStyleSet->CalcWindowSizePixel(aSize); - if (nBits | WB_VSCROLL) + if (nBits & WB_VSCROLL) aSize.AdjustWidth(mxLineStyleSet->GetScrollWidth()); mxLineStyleSet->GetDrawingArea()->set_size_request(aSize.Width(), aSize.Height()); mxLineStyleSet->SetOutputSizePixel(aSize);
