include/svtools/brwbox.hxx | 2 +- svtools/source/brwbox/brwbox2.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit 63fe0d6c07eed6a4b125c6ee0fb2d53ed689385f Author: HakimOttey <hakimotteybusin...@gmail.com> AuthorDate: Sat Jun 1 16:26:54 2024 -0400 Commit: Hossein <hoss...@libreoffice.org> CommitDate: Sun Jul 14 09:33:38 2024 +0200 tdf#114441 replace sal_uLong with tools::Long Make variable nHScrX have tools::Long data type as it is expected to be tools::Long when used in SetPostSizePixel Change-Id: If7e0c1ee1a9832b215c766cbf8bf916c731edfd9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167804 Tested-by: Jenkins Reviewed-by: Hossein <hoss...@libreoffice.org> diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx index 1452ee111bb0..2100eac9e592 100644 --- a/include/svtools/brwbox.hxx +++ b/include/svtools/brwbox.hxx @@ -277,7 +277,7 @@ private: tools::Long m_nCornerWidth; // width of scrollbox corner tools::Long m_nActualCornerWidth; // size of scrollbox corner sal_uInt16 nTitleLines; // number of lines in title row - sal_uLong nControlAreaWidth; // width of fixed area beneath hscroll + sal_uInt16 nControlAreaWidth; // width of fixed area beneath hscroll bool bColumnCursor; // single columns and fields selectable bool bMultiSelection;// allow multiple selected rows bool bKeepHighlight; // don't hide selection on LoseFocus diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx index 08bfe6c7f460..3d3d2f36ba05 100644 --- a/svtools/source/brwbox/brwbox2.cxx +++ b/svtools/source/brwbox/brwbox2.cxx @@ -1124,7 +1124,7 @@ void BrowseBox::UpdateScrollbars() } // adjust position and Width of horizontal scrollbar - sal_uLong nHScrX = nControlAreaWidth == USHRT_MAX + tools::Long nHScrX = nControlAreaWidth == USHRT_MAX ? 0 : nControlAreaWidth;