diff options
author | Noel <noelgrandin@gmail.com> | 2020-10-12 09:52:12 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-10-26 07:35:36 +0100 |
commit | 4fbd63860500b2db76df4d5aedbe5e3aa31fac69 (patch) | |
tree | 5fa96dc262ba651e82244b0f9e508f79e88ea2df /svx/source/table | |
parent | 62fa5bb8c1299469eacc21cb35ee670b65120713 (diff) |
switching long to a 64-bit type on 64-bit windows
(*) create a rewriting plugin to do most of the work, heavily
based on the fakebool plugin
(*) but there are still a number of "long"s in the codebase
that will need to be done by hand
(*) the plugin needs lots of handholding, due to needing to
add #include and update macros
Change-Id: I8184d7000ca482c0469514bb73178c3a1123b1e9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104203
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx/source/table')
-rw-r--r-- | svx/source/table/cell.cxx | 8 | ||||
-rw-r--r-- | svx/source/table/svdotable.cxx | 4 | ||||
-rw-r--r-- | svx/source/table/tablertfexporter.cxx | 4 | ||||
-rw-r--r-- | svx/source/table/tablertfimporter.cxx | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index 0a7844817c61..20b725491cf8 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -774,25 +774,25 @@ sal_Int32 Cell::getMinimumHeight() } -long Cell::GetTextLeftDistance() const +tools::Long Cell::GetTextLeftDistance() const { return GetItemSet().Get(SDRATTR_TEXT_LEFTDIST).GetValue(); } -long Cell::GetTextRightDistance() const +tools::Long Cell::GetTextRightDistance() const { return GetItemSet().Get(SDRATTR_TEXT_RIGHTDIST).GetValue(); } -long Cell::GetTextUpperDistance() const +tools::Long Cell::GetTextUpperDistance() const { return GetItemSet().Get(SDRATTR_TEXT_UPPERDIST).GetValue(); } -long Cell::GetTextLowerDistance() const +tools::Long Cell::GetTextLowerDistance() const { return GetItemSet().Get(SDRATTR_TEXT_LOWERDIST).GetValue(); } diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index 946f3b441748..8eec244b8fcc 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -1530,7 +1530,7 @@ void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, too Size aTextSiz(rOutliner.GetPaperSize()); if (eVAdj==SDRTEXTVERTADJUST_CENTER || eVAdj==SDRTEXTVERTADJUST_BOTTOM) { - long nFreeHgt=aAnkRect.GetHeight()-aTextSiz.Height(); + tools::Long nFreeHgt=aAnkRect.GetHeight()-aTextSiz.Height(); if (eVAdj==SDRTEXTVERTADJUST_CENTER) aTextPos.AdjustY(nFreeHgt/2 ); if (eVAdj==SDRTEXTVERTADJUST_BOTTOM) @@ -1677,7 +1677,7 @@ void SdrTableObj::TakeTextEditArea( const CellPos& rPos, Size* pPaperMin, Size* if (pViewMin!=nullptr) { *pViewMin=aViewInit; - long nYFree=aAnkSiz.Height()-aPaperMin.Height(); + tools::Long nYFree=aAnkSiz.Height()-aPaperMin.Height(); if (eVAdj==SDRTEXTVERTADJUST_TOP) { diff --git a/svx/source/table/tablertfexporter.cxx b/svx/source/table/tablertfexporter.cxx index 2073c1d39aac..10707cbc1c21 100644 --- a/svx/source/table/tablertfexporter.cxx +++ b/svx/source/table/tablertfexporter.cxx @@ -77,9 +77,9 @@ SdrTableRtfExporter::SdrTableRtfExporter( SvStream& rStrm, SdrTableObj& rObj ) { } -static long HundMMToTwips( long nIn ) +static tools::Long HundMMToTwips( tools::Long nIn ) { - long nRet = OutputDevice::LogicToLogic( nIn, MapUnit::Map100thMM, MapUnit::MapTwip ); + tools::Long nRet = OutputDevice::LogicToLogic( nIn, MapUnit::Map100thMM, MapUnit::MapTwip ); return nRet; } diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx index d4bc377df1d3..c2f510444f8a 100644 --- a/svx/source/table/tablertfimporter.cxx +++ b/svx/source/table/tablertfimporter.cxx @@ -381,9 +381,9 @@ void SdrTableRTFParser::NextColumn() mpActDefault = nullptr; } -static long TwipsToHundMM( long nIn ) +static tools::Long TwipsToHundMM( tools::Long nIn ) { - long nRet = OutputDevice::LogicToLogic( nIn, MapUnit::MapTwip, MapUnit::Map100thMM ); + tools::Long nRet = OutputDevice::LogicToLogic( nIn, MapUnit::MapTwip, MapUnit::Map100thMM ); return nRet; } |