include/vcl/toolbox.hxx | 2 +- vcl/source/window/toolbox.cxx | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-)
New commits: commit d57617b79db35b1005007a16b84f17e699d59022 Author: Noel Grandin <[email protected]> AuthorDate: Sat Oct 30 18:53:16 2021 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Sun Oct 31 09:02:54 2021 +0100 tools::Long->sal_Int32 in Toolbox Change-Id: I1f337558e6fcd6ea552814611cd6fb8a4f3b2f42 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124493 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index cdbc032ea509..fe15d3b978f7 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -185,7 +185,7 @@ private: SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SAL_DLLPRIVATE ImplToolItem* ImplGetItem( ToolBoxItemId nId ) const; SAL_DLLPRIVATE bool ImplCalcItem(); - SAL_DLLPRIVATE ImplToolItems::size_type ImplCalcBreaks( tools::Long nWidth, tools::Long* pMaxLineWidth, bool bCalcHorz ) const; + SAL_DLLPRIVATE ImplToolItems::size_type ImplCalcBreaks( tools::Long nWidth, sal_Int32* pMaxLineWidth, bool bCalcHorz ) const; SAL_DLLPRIVATE void ImplFormat( bool bResize = false ); SAL_DLLPRIVATE void ImplDrawSpin(vcl::RenderContext& rRenderContext); SAL_DLLPRIVATE void ImplDrawSeparator(vcl::RenderContext& rRenderContext, ImplToolItems::size_type nPos, const tools::Rectangle& rRect); diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 37f9595561cd..e41c1288fbeb 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -638,7 +638,7 @@ const ImplToolItem *ToolBox::ImplGetFirstClippedItem() const Size ToolBox::ImplCalcSize( ImplToolItems::size_type nCalcLines, sal_uInt16 nCalcMode ) { - tools::Long nMax; + sal_Int32 nMax; tools::Long nLeft = 0; tools::Long nTop = 0; tools::Long nRight = 0; @@ -784,7 +784,7 @@ void ToolBox::ImplCalcFloatSizes() ImplToolItems::size_type nLines; ImplToolItems::size_type nCalcLines; ImplToolItems::size_type nTempLines; - tools::Long nMaxLineWidth; + sal_Int32 nMaxLineWidth; nCalcLines = ImplCalcBreaks( nCalcSize, &nMaxLineWidth, true ); maFloatSizes.reserve( nCalcLines ); @@ -1658,7 +1658,7 @@ bool ToolBox::ImplCalcItem() return false; } -ToolBox::ImplToolItems::size_type ToolBox::ImplCalcBreaks( tools::Long nWidth, tools::Long* pMaxLineWidth, bool bCalcHorz ) const +ToolBox::ImplToolItems::size_type ToolBox::ImplCalcBreaks( tools::Long nWidth, sal_Int32* pMaxLineWidth, bool bCalcHorz ) const { sal_uLong nLineStart = 0; sal_uLong nGroupStart = 0; @@ -1831,7 +1831,7 @@ Size ToolBox::ImplGetOptimalFloatingSize() int nBorderX = 2*TB_BORDER_OFFSET1 + mnLeftBorder + mnRightBorder; int nBorderY = 2*TB_BORDER_OFFSET2 + mnTopBorder + mnBottomBorder; Size aSz( aCurrentSize ); - tools::Long maxX; + sal_Int32 maxX; ImplToolItems::size_type nLines = ImplCalcBreaks( aSz.Width()-nBorderX, &maxX, mbHorz ); ImplToolItems::size_type manyLines = 1000;
