diff options
Diffstat (limited to 'vcl/source/window/toolbox.cxx')
| -rw-r--r-- | vcl/source/window/toolbox.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 5e7b424c1392..094d9cc1589a 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -1387,7 +1387,7 @@ ImplToolItem* ToolBox::ImplGetItem( sal_uInt16 nItemId ) const return nullptr; } -static void ImplAddButtonBorder( long &rWidth, long& rHeight, bool bNativeButtons ) +static void ImplAddButtonBorder( sal_Int32 &rWidth, sal_Int32& rHeight, bool bNativeButtons ) { rWidth += SMALLBUTTON_HSIZE; rHeight += SMALLBUTTON_VSIZE; @@ -1411,8 +1411,8 @@ bool ToolBox::ImplCalcItem() long nDefWidth; long nDefHeight; - long nMaxWidth = 0; - long nMaxHeight = 0; + sal_Int32 nMaxWidth = 0; + sal_Int32 nMaxHeight = 0; long nMinWidth = 6; long nMinHeight = 6; long nDropDownArrowWidth = TB_DROPDOWNARROWWIDTH; @@ -1625,16 +1625,16 @@ bool ToolBox::ImplCalcItem() if ( item.meType == ToolBoxItemType::BUTTON || item.meType == ToolBoxItemType::SPACE ) { // add borders - long w = item.maItemSize.Width(); - long h = item.maItemSize.Height(); + sal_Int32 w = item.maItemSize.Width(); + sal_Int32 h = item.maItemSize.Height(); ImplAddButtonBorder( w, h, mpData->mbNativeButtons ); item.maItemSize.setWidth(w); item.maItemSize.setHeight(h); if( item.meType == ToolBoxItemType::BUTTON ) { - long nMinW = std::max(nMinWidth, item.maMinimalItemSize.Width()); - long nMinH = std::max(nMinHeight, item.maMinimalItemSize.Height()); + long nMinW = std::max<sal_Int32>(nMinWidth, item.maMinimalItemSize.Width()); + long nMinH = std::max<sal_Int32>(nMinHeight, item.maMinimalItemSize.Height()); long nGrowContentWidth = 0; long nGrowContentHeight = 0; @@ -1679,8 +1679,8 @@ bool ToolBox::ImplCalcItem() // as this is used for alignment of multiple toolbars // it is only required for docked toolbars - long nFixedWidth = nDefWidth+nDropDownArrowWidth; - long nFixedHeight = nDefHeight; + sal_Int32 nFixedWidth = nDefWidth+nDropDownArrowWidth; + sal_Int32 nFixedHeight = nDefHeight; ImplAddButtonBorder( nFixedWidth, nFixedHeight, mpData->mbNativeButtons ); if( mbHorz ) |