diff options
| author | Noel <noelgrandin@gmail.com> | 2020-10-28 09:15:54 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-10-28 12:03:48 +0100 |
| commit | 7a09d67e1c76db7cb6a87a2ceaa6de7325342b75 (patch) | |
| tree | b768459ca830b343a3c53d1cea8b80de328ee1fb /svtools | |
| parent | 49a39d1abccc61b6dace3e92059ae50a6a2c298d (diff) | |
convert some more long -> tools::Long
Change-Id: Ide9811c1a7582454b3fcf655b70ea106ed56509a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104914
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/table/tablecontrol_impl.cxx | 8 | ||||
| -rw-r--r-- | svtools/source/table/tablecontrol_impl.hxx | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx index 26e96c063325..0327e33728b7 100644 --- a/svtools/source/table/tablecontrol_impl.cxx +++ b/svtools/source/table/tablecontrol_impl.cxx @@ -687,7 +687,7 @@ namespace svt::table tools::Long TableControl_Impl::impl_ni_calculateColumnWidths( ColPos const i_assumeInflexibleColumnsUpToIncluding, - bool const i_assumeVerticalScrollbar, ::std::vector< long >& o_newColWidthsPixel ) const + bool const i_assumeVerticalScrollbar, ::std::vector< tools::Long >& o_newColWidthsPixel ) const { // the available horizontal space tools::Long gridWidthPixel = m_rAntiImpl.GetOutputSizePixel().Width(); @@ -711,9 +711,9 @@ namespace svt::table // collect some meta data for our columns: // - their current (pixel) metrics tools::Long accumulatedCurrentWidth = 0; - ::std::vector< long > currentColWidths; + ::std::vector< tools::Long > currentColWidths; currentColWidths.reserve( colCount ); - typedef ::std::vector< ::std::pair< long, long > > ColumnLimits; + typedef ::std::vector< ::std::pair< tools::Long, long > > ColumnLimits; ColumnLimits effectiveColumnLimits; effectiveColumnLimits.reserve( colCount ); tools::Long accumulatedMinWidth = 0; @@ -963,7 +963,7 @@ namespace svt::table // - V-YES: all fine, result from 1. is still valid // - V-NO: redistribute the remaining space (if any) amongst all columns which allow it - ::std::vector< long > newWidthsPixel; + ::std::vector< tools::Long > newWidthsPixel; tools::Long gridWidthPixel = impl_ni_calculateColumnWidths( i_assumeInflexibleColumnsUpToIncluding, true, newWidthsPixel ); // the width/height of a scrollbar, needed several times below diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx index 998558ece08b..c435013606bb 100644 --- a/svtools/source/table/tablecontrol_impl.hxx +++ b/svtools/source/table/tablecontrol_impl.hxx @@ -375,7 +375,7 @@ namespace svt::table tools::Long impl_ni_calculateColumnWidths( ColPos const i_assumeInflexibleColumnsUpToIncluding, bool const i_assumeVerticalScrollbar, - ::std::vector< long >& o_newColWidthsPixel + ::std::vector< tools::Long >& o_newColWidthsPixel ) const; /** positions all child windows, e.g. the both scrollbars, the corner window, and the data window |