diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-26 09:50:06 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-03 10:37:51 +0200 |
| commit | 8bc951daf79decbd8a599a409c6d33c5456710e0 (patch) | |
| tree | 61d220d83e90a176fbcbe667827eee4b9631a4ca /sc/source/ui/Accessibility | |
| parent | 10eefdfa6c0250c6069e641e404f34e5a91fe993 (diff) | |
long->sal_Int32 in tools/gen.hxx
which triggered a lot of changes in sw/
Change-Id: Ia2aa22ea3f76463a85ea077a411246fcfed00bf6
Reviewed-on: https://gerrit.libreoffice.org/48806
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/source/ui/Accessibility')
| -rw-r--r-- | sc/source/ui/Accessibility/AccessibleText.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx index 66bcc5f4ad88..b61983665892 100644 --- a/sc/source/ui/Accessibility/AccessibleText.cxx +++ b/sc/source/ui/Accessibility/AccessibleText.cxx @@ -750,9 +750,9 @@ SvxTextForwarder* ScAccessibleCellTextData::GetTextForwarder() const SfxInt32Item* pItem = rDoc.GetAttr( aCellPos, ATTR_ROTATE_VALUE ); if( pItem && (pItem->GetValue() != 0) ) { - pEditEngine->SetPaperSize( Size( LONG_MAX, aSize.getHeight() ) ); + pEditEngine->SetPaperSize( Size( RECT_MAX, aSize.getHeight() ) ); long nTxtWidth = static_cast< long >( pEditEngine->CalcTextWidth() ); - aSize.setWidth( std::max( aSize.getWidth(), nTxtWidth + 2 ) ); + aSize.setWidth( std::max<sal_Int32>( aSize.getWidth(), nTxtWidth + 2 ) ); } else { @@ -762,7 +762,7 @@ SvxTextForwarder* ScAccessibleCellTextData::GetTextForwarder() if ( !bLineBreak ) { long nTxtWidth = static_cast< long >( pEditEngine->CalcTextWidth() ); - aSize.setWidth( ::std::max( aSize.getWidth(), nTxtWidth ) ); + aSize.setWidth( ::std::max<sal_Int32>( aSize.getWidth(), nTxtWidth ) ); } } |