diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2022-02-21 16:42:24 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2022-02-21 19:35:33 +0100 |
| commit | db345bee733fee8c7157c246979bed2c65799507 (patch) | |
| tree | a85e84444b859664ac78151b576917db38b23f4e | |
| parent | 8c2607ae3ce143586e623532b8ae5288277ec3ac (diff) | |
use 64bit for window sizes (tdf#147458)
Change-Id: Iaa240aeae8bacbff6bccd9bf0721a02414b6f47d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130288
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
| -rw-r--r-- | include/svx/svdpage.hxx | 8 | ||||
| -rw-r--r-- | sc/source/core/data/segmenttree.cxx | 5 | ||||
| -rw-r--r-- | svx/source/svdraw/svdpage.cxx | 4 |
3 files changed, 8 insertions, 9 deletions
diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx index 83c0592f060e..2ba7017a01a3 100644 --- a/include/svx/svdpage.hxx +++ b/include/svx/svdpage.hxx @@ -411,8 +411,8 @@ private: SdrModel& mrSdrModelFromSdrPage; private: - sal_Int32 mnWidth; // page size - sal_Int32 mnHeight; // page size + tools::Long mnWidth; // page size + tools::Long mnHeight; // page size sal_Int32 mnBorderLeft; // left page margin sal_Int32 mnBorderUpper; // top page margin sal_Int32 mnBorderRight; // right page margin @@ -477,8 +477,8 @@ public: Size GetSize() const; virtual void SetOrientation(Orientation eOri); virtual Orientation GetOrientation() const; - sal_Int32 GetWidth() const; - sal_Int32 GetHeight() const; + tools::Long GetWidth() const; + tools::Long GetHeight() const; virtual void SetBorder(sal_Int32 nLft, sal_Int32 nUpp, sal_Int32 nRgt, sal_Int32 Lwr); virtual void SetLeftBorder(sal_Int32 nBorder); virtual void SetUpperBorder(sal_Int32 nBorder); diff --git a/sc/source/core/data/segmenttree.cxx b/sc/source/core/data/segmenttree.cxx index a71e310ab641..aa10d32544cb 100644 --- a/sc/source/core/data/segmenttree.cxx +++ b/sc/source/core/data/segmenttree.cxx @@ -50,7 +50,7 @@ public: bool setValue(SCCOLROW nPos1, SCCOLROW nPos2, ValueType nValue); void setValueIf(SCCOLROW nPos1, SCCOLROW nPos2, ValueType nValue, const std::function<bool(ValueType)>& rPredicate); ValueType getValue(SCCOLROW nPos); - ExtValueType getSumValue(SCCOLROW nPos1, SCCOLROW nPos2); + sal_uInt64 getSumValue(SCCOLROW nPos1, SCCOLROW nPos2); bool getRangeData(SCCOLROW nPos, RangeData& rData); bool getRangeDataLeaf(SCCOLROW nPos, RangeData& rData); void removeSegment(SCCOLROW nPos1, SCCOLROW nPos2); @@ -144,8 +144,7 @@ typename ScFlatSegmentsImpl<ValueType_, ExtValueType_>::ValueType ScFlatSegments } template<typename ValueType_, typename ExtValueType_> -typename ScFlatSegmentsImpl<ValueType_, ExtValueType_>::ExtValueType -ScFlatSegmentsImpl<ValueType_, ExtValueType_>::getSumValue(SCCOLROW nPos1, SCCOLROW nPos2) +sal_uInt64 ScFlatSegmentsImpl<ValueType_, ExtValueType_>::getSumValue(SCCOLROW nPos1, SCCOLROW nPos2) { if (mbTreeSearchEnabled) { diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index 536167b04e56..b66ed3433d18 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -1447,7 +1447,7 @@ Size SdrPage::GetSize() const return Size(mnWidth,mnHeight); } -sal_Int32 SdrPage::GetWidth() const +tools::Long SdrPage::GetWidth() const { return mnWidth; } @@ -1473,7 +1473,7 @@ Orientation SdrPage::GetOrientation() const return eRet; } -sal_Int32 SdrPage::GetHeight() const +tools::Long SdrPage::GetHeight() const { return mnHeight; } |