diff options
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/data/postit.cxx | 10 | ||||
| -rw-r--r-- | sc/source/ui/cctrl/tbzoomsliderctrl.cxx | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx index 342e4f539d12..a5fe92ca91a0 100644 --- a/sc/source/core/data/postit.cxx +++ b/sc/source/core/data/postit.cxx @@ -245,13 +245,13 @@ void ScCaptionCreator::FitCaptionToRect( const tools::Rectangle* pVisRect ) tools::Rectangle aCaptRect = mxCaption->GetLogicRect(); Point aCaptPos = aCaptRect.TopLeft(); // move textbox inside right border of visible area - aCaptPos.setX( ::std::min< long >( aCaptPos.X(), rVisRect.Right() - aCaptRect.GetWidth() ) ); + aCaptPos.setX( ::std::min< tools::Long >( aCaptPos.X(), rVisRect.Right() - aCaptRect.GetWidth() ) ); // move textbox inside left border of visible area (this may move it outside on right side again) - aCaptPos.setX( ::std::max< long >( aCaptPos.X(), rVisRect.Left() ) ); + aCaptPos.setX( ::std::max< tools::Long >( aCaptPos.X(), rVisRect.Left() ) ); // move textbox inside bottom border of visible area - aCaptPos.setY( ::std::min< long >( aCaptPos.Y(), rVisRect.Bottom() - aCaptRect.GetHeight() ) ); + aCaptPos.setY( ::std::min< tools::Long >( aCaptPos.Y(), rVisRect.Bottom() - aCaptRect.GetHeight() ) ); // move textbox inside top border of visible area (this may move it outside on bottom side again) - aCaptPos.setY( ::std::max< long >( aCaptPos.Y(), rVisRect.Top() ) ); + aCaptPos.setY( ::std::max< tools::Long >( aCaptPos.Y(), rVisRect.Top() ) ); // update caption aCaptRect.SetPos( aCaptPos ); mxCaption->SetLogicRect( aCaptRect ); @@ -1207,7 +1207,7 @@ ScCaptionPtr ScNoteUtil::CreateTempCaption( pCaption->SetText( aBuffer.makeStringAndClear() ); ScCaptionUtil::SetDefaultItems( *pCaption, rDoc, nullptr ); // adjust caption size to text size - tools::Long nMaxWidth = ::std::min< long >( aVisRect.GetWidth() * 2 / 3, SC_NOTECAPTION_MAXWIDTH_TEMP ); + tools::Long nMaxWidth = ::std::min< tools::Long >( aVisRect.GetWidth() * 2 / 3, SC_NOTECAPTION_MAXWIDTH_TEMP ); pCaption->SetMergedItem( makeSdrTextAutoGrowWidthItem( true ) ); pCaption->SetMergedItem( makeSdrTextMinFrameWidthItem( SC_NOTECAPTION_WIDTH ) ); pCaption->SetMergedItem( makeSdrTextMaxFrameWidthItem( nMaxWidth ) ); diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx index 416a2baa66de..12d12c19beda 100644 --- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx +++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx @@ -91,7 +91,7 @@ struct ScZoomSlider::ScZoomSliderWnd_Impl sal_uInt16 mnCurrentZoom; sal_uInt16 mnMinZoom; sal_uInt16 mnMaxZoom; - std::vector< long > maSnappingPointOffsets; + std::vector< tools::Long > maSnappingPointOffsets; std::vector< sal_uInt16 > maSnappingPointZooms; Image maSliderButton; Image maIncreaseButton; |