diff options
| author | Noel <noelgrandin@gmail.com> | 2020-11-10 10:14:12 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-11-11 11:25:43 +0100 |
| commit | 941f2c866a98ca7caf71a11732853da012cd25e4 (patch) | |
| tree | d5879ca5a6c50c8258e62d343f4c90cf9a6127f5 /sfx2 | |
| parent | cd3990d1d8f212474dee1c1d989f005e4d9913a4 (diff) | |
convert more long -> tools::Long
found by grepping and changed by hand.
Change-Id: I3c720859dba430fde3abc76c6c5cb58269efaf4b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105512
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/splitwin.cxx | 8 | ||||
| -rw-r--r-- | sfx2/source/doc/objcont.cxx | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx index dff0a88d0d60..2e910f8d2fb0 100644 --- a/sfx2/source/dialog/splitwin.cxx +++ b/sfx2/source/dialog/splitwin.cxx @@ -375,7 +375,7 @@ void SfxSplitWindow::Split() SplitWindow::Split(); - std::vector< std::pair< sal_uInt16, long > > aNewOrgSizes; + std::vector< std::pair< sal_uInt16, tools::Long > > aNewOrgSizes; sal_uInt16 nCount = maDockArr.size(); for ( sal_uInt16 n=0; n<nCount; n++ ) @@ -409,7 +409,7 @@ void SfxSplitWindow::Split() // apply FIXED item size as 'original' item size to improve layouting of undock-dock-cycle of a window { DeactivateUpdateMode aDeactivateUpdateMode( *this ); - for (const std::pair< sal_uInt16, long > & rNewOrgSize : aNewOrgSizes) + for (const std::pair< sal_uInt16, tools::Long > & rNewOrgSize : aNewOrgSizes) { SetItemSize( rNewOrgSize.first, rNewOrgSize.second ); } @@ -733,7 +733,7 @@ void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl const * pDock, // workaround insufficiency of <SplitWindow> regarding dock layouting: // apply FIXED item size as 'original' item size to improve layouting of undock-dock-cycle of a window { - std::vector< std::pair< sal_uInt16, long > > aNewOrgSizes; + std::vector< std::pair< sal_uInt16, tools::Long > > aNewOrgSizes; // get FIXED item sizes sal_uInt16 nCount = maDockArr.size(); for ( sal_uInt16 n=0; n<nCount; ++n ) @@ -748,7 +748,7 @@ void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl const * pDock, } // apply new item sizes DeactivateUpdateMode aDeactivateUpdateMode( *this ); - for (const std::pair< sal_uInt16, long > & rNewOrgSize : aNewOrgSizes) + for (const std::pair< sal_uInt16, tools::Long > & rNewOrgSize : aNewOrgSizes) { SetItemSize( rNewOrgSize.first, rNewOrgSize.second ); } diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index fc1ce7cceedd..8d3faa98a8a0 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -163,9 +163,9 @@ bool SfxObjectShell::CreatePreview_Impl( bool bFullContent, VirtualDevice* pDevi // determine size that has the same aspect ratio as image size and // fits into the rectangle determined by nMaximumExtent if ( aSizePix.Width() && aSizePix.Height() - && ( sal::static_int_cast< unsigned long >(aSizePix.Width()) > + && ( sal::static_int_cast< tools::ULong >(aSizePix.Width()) > nMaximumExtent || - sal::static_int_cast< unsigned long >(aSizePix.Height()) > + sal::static_int_cast< tools::ULong >(aSizePix.Height()) > nMaximumExtent ) ) { double fWH = static_cast< double >( aSizePix.Width() ) / aSizePix.Height(); |