summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/redline.hxx2
-rw-r--r--sw/qa/extras/layout/layout.cxx20
-rw-r--r--sw/qa/extras/ww8export/ww8export2.cxx4
-rw-r--r--sw/source/core/doc/DocumentStatisticsManager.cxx2
-rw-r--r--sw/source/core/layout/dbg_lay.cxx2
-rw-r--r--sw/source/core/layout/newfrm.cxx2
-rw-r--r--sw/source/core/layout/tabfrm.cxx2
-rw-r--r--sw/source/core/layout/wsfrm.cxx2
-rw-r--r--sw/source/core/table/swnewtable.cxx2
-rw-r--r--sw/source/core/table/swtable.cxx12
-rw-r--r--sw/source/core/text/inftxt.hxx6
-rw-r--r--sw/source/core/text/itrform2.cxx6
-rw-r--r--sw/source/core/text/porlay.cxx2
-rw-r--r--sw/source/core/text/porlay.hxx4
-rw-r--r--sw/source/core/text/pormulti.cxx4
-rw-r--r--sw/source/core/text/txtfly.cxx2
-rw-r--r--sw/source/filter/html/htmlcss1.cxx4
-rw-r--r--sw/source/filter/writer/wrtswtbl.cxx2
-rw-r--r--sw/source/filter/ww8/WW8TableInfo.hxx2
-rw-r--r--sw/source/filter/ww8/ww8par.cxx2
-rw-r--r--sw/source/ui/index/cnttab.cxx10
-rw-r--r--sw/source/uibase/shells/tabsh.cxx4
22 files changed, 51 insertions, 47 deletions
diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx
index 8fbded6e61f1..35bacea29950 100644
--- a/sw/inc/redline.hxx
+++ b/sw/inc/redline.hxx
@@ -158,7 +158,7 @@ class SW_DLLPUBLIC SwRangeRedline : public SwPaM
bool m_bIsVisible : 1;
sal_uInt32 m_nId;
- std::optional<long> m_oLOKLastNodeTop;
+ std::optional<tools::Long> m_oLOKLastNodeTop;
void MoveToSection();
void CopyToSection();
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 95891b40d7b1..4b6e9c22bd62 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -851,10 +851,14 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, TestTdf137025)
CPPUNIT_ASSERT(pFrameFormat);
// The shape has these values to copy to the associated text frame after modification::
- const tools::Long nLPaddng = xShapeProps->getPropertyValue("TextLeftDistance").get<long>();
- const tools::Long nRPaddng = xShapeProps->getPropertyValue("TextRightDistance").get<long>();
- const tools::Long nTPaddng = xShapeProps->getPropertyValue("TextUpperDistance").get<long>();
- const tools::Long nBPaddng = xShapeProps->getPropertyValue("TextLowerDistance").get<long>();
+ const tools::Long nLPaddng
+ = xShapeProps->getPropertyValue("TextLeftDistance").get<tools::Long>();
+ const tools::Long nRPaddng
+ = xShapeProps->getPropertyValue("TextRightDistance").get<tools::Long>();
+ const tools::Long nTPaddng
+ = xShapeProps->getPropertyValue("TextUpperDistance").get<tools::Long>();
+ const tools::Long nBPaddng
+ = xShapeProps->getPropertyValue("TextLowerDistance").get<tools::Long>();
CPPUNIT_ASSERT_EQUAL(tools::Long(1000), nLPaddng);
CPPUNIT_ASSERT_EQUAL(tools::Long(2000), nRPaddng);
@@ -868,13 +872,13 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, TestTdf137025)
uno::Reference<beans::XPropertySet> xFrameProps(xTxFrm, uno::UNO_QUERY);
const tools::Long nFrameLeftPaddng
- = xFrameProps->getPropertyValue("LeftBorderDistance").get<long>();
+ = xFrameProps->getPropertyValue("LeftBorderDistance").get<tools::Long>();
const tools::Long nFrameRightPaddng
- = xFrameProps->getPropertyValue("RightBorderDistance").get<long>();
+ = xFrameProps->getPropertyValue("RightBorderDistance").get<tools::Long>();
const tools::Long nFrameTopPaddng
- = xFrameProps->getPropertyValue("TopBorderDistance").get<long>();
+ = xFrameProps->getPropertyValue("TopBorderDistance").get<tools::Long>();
const tools::Long nFrameBottomPaddng
- = xFrameProps->getPropertyValue("BottomBorderDistance").get<long>();
+ = xFrameProps->getPropertyValue("BottomBorderDistance").get<tools::Long>();
// Check if the shape and frame have different setting
CPPUNIT_ASSERT_EQUAL(nLPaddng, nFrameLeftPaddng);
diff --git a/sw/qa/extras/ww8export/ww8export2.cxx b/sw/qa/extras/ww8export/ww8export2.cxx
index bded9504b579..004451247cdf 100644
--- a/sw/qa/extras/ww8export/ww8export2.cxx
+++ b/sw/qa/extras/ww8export/ww8export2.cxx
@@ -343,8 +343,8 @@ DECLARE_WW8EXPORT_TEST(testTdf112074_RTLtableJustification, "tdf112074_RTLtableJ
CPPUNIT_ASSERT_EQUAL_MESSAGE("Right To Left writing mode", text::WritingMode2::RL_TB, getProperty<sal_Int16>(xTable, "WritingMode"));
CPPUNIT_ASSERT_EQUAL_MESSAGE("Horizontal Orientation", text::HoriOrientation::LEFT_AND_WIDTH, getProperty<sal_Int16>(xTable, "HoriOrient"));
- CPPUNIT_ASSERT_MESSAGE("Table Indent", getProperty<long>(xTable, "LeftMargin") > 3000);
- CPPUNIT_ASSERT_MESSAGE("Table Indent is 3750", getProperty<long>(xTable, "LeftMargin") < 4000 );
+ CPPUNIT_ASSERT_MESSAGE("Table Indent", getProperty<tools::Long>(xTable, "LeftMargin") > 3000);
+ CPPUNIT_ASSERT_MESSAGE("Table Indent is 3750", getProperty<tools::Long>(xTable, "LeftMargin") < 4000 );
CPPUNIT_ASSERT_EQUAL( style::ParagraphAdjust_RIGHT, static_cast<style::ParagraphAdjust>(getProperty<sal_Int16>(getParagraphOrTable(2), "ParaAdjust")) );
}
diff --git a/sw/source/core/doc/DocumentStatisticsManager.cxx b/sw/source/core/doc/DocumentStatisticsManager.cxx
index 91ca7aa498e9..dd67d88ea89e 100644
--- a/sw/source/core/doc/DocumentStatisticsManager.cxx
+++ b/sw/source/core/doc/DocumentStatisticsManager.cxx
@@ -93,7 +93,7 @@ void DocumentStatisticsManager::UpdateDocStat( bool bCompleteAsync, bool bFields
{
maStatsUpdateIdle.Stop();
while (IncrementalDocStatCalculate(
- std::numeric_limits<long>::max(), bFields)) {}
+ std::numeric_limits<tools::Long>::max(), bFields)) {}
}
else if (IncrementalDocStatCalculate(5000, bFields))
maStatsUpdateIdle.Start();
diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx
index 7816ed9c3c0e..97a514b8c79d 100644
--- a/sw/source/core/layout/dbg_lay.cxx
+++ b/sw/source/core/layout/dbg_lay.cxx
@@ -130,7 +130,7 @@ class SwImplProtocol
std::unique_ptr<SvFileStream> m_pStream; // output stream
std::unique_ptr<std::set<sal_uInt16>>
m_pFrameIds; // which FrameIds shall be logged ( NULL == all)
- std::vector<long> m_aVars; // variables
+ std::vector<tools::Long> m_aVars; // variables
OStringBuffer m_aLayer; // indentation of output (" " per start/end)
SwFrameType m_nTypes; // which types shall be logged
sal_uInt16 m_nLineCount; // printed lines
diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx
index 397de1daf5fb..8a62abd8aa54 100644
--- a/sw/source/core/layout/newfrm.cxx
+++ b/sw/source/core/layout/newfrm.cxx
@@ -106,7 +106,7 @@ static SwRectFnCollection aHorizontal = {
/*.fnXDiff =*/&FirstMinusSecond,
/*.fnYDiff =*/&FirstMinusSecond,
/*.fnXInc =*/&SwIncrement,
- /*.fnYInc =*/&o3tl::saturating_add<long>,
+ /*.fnYInc =*/&o3tl::saturating_add<tools::Long>,
/*.fnSetLeftAndWidth =*/&SwRect::SetLeftAndWidth,
/*.fnSetTopAndHeight =*/&SwRect::SetTopAndHeight
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 052b51b1b42d..b3c36051b661 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -3172,7 +3172,7 @@ SwTwips SwTabFrame::GrowFrame( SwTwips nDist, bool bTst, bool bInfo )
if ( nReal < nDist )
{
- tools::Long nTmp = GetUpper()->Grow( nDist - std::max<long>(nReal, 0), bTst, bInfo );
+ tools::Long nTmp = GetUpper()->Grow( nDist - std::max<tools::Long>(nReal, 0), bTst, bInfo );
if ( IsRestrictTableGrowth() )
{
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index 3927f405048c..ae422dc2ea46 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -2150,7 +2150,7 @@ SwTwips SwContentFrame::GrowFrame( SwTwips nDist, bool bTst, bool bInfo )
if( GetUpper() )
{
if( bTst || !GetUpper()->IsFooterFrame() )
- nReal = GetUpper()->Grow( nDist - std::max<long>(nReal, 0),
+ nReal = GetUpper()->Grow( nDist - std::max<tools::Long>(nReal, 0),
bTst, bInfo );
else
{
diff --git a/sw/source/core/table/swnewtable.cxx b/sw/source/core/table/swnewtable.cxx
index c0e4cbf9bae2..fdafc10df49c 100644
--- a/sw/source/core/table/swnewtable.cxx
+++ b/sw/source/core/table/swnewtable.cxx
@@ -2256,7 +2256,7 @@ void SwTable::ConvertSubtableBox(sal_uInt16 const nRow, sal_uInt16 const nBox)
else
{
newSourceRowSpan += pSubTableBox->GetTabLines().size() - 1;
- newBoxRowSpan = -(newSourceRowSpan - sal::static_int_cast<long>(i));
+ newBoxRowSpan = -(newSourceRowSpan - sal::static_int_cast<tools::Long>(i));
}
pNewLine->GetTabBoxes()[nInsPos]->setRowSpan(newBoxRowSpan);
if (i == pSubTableBox->GetTabLines().size() - 1)
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index c78c9ffdea89..4dda8e1d85fa 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -392,7 +392,7 @@ static void lcl_SortedTabColInsert( SwTabCols &rToFill, const SwTableBox *pBox,
{
const SwTwips nWidth = rBoxes[i]->GetFrameFormat()->GetFrameSize().GetWidth();
nSum += nWidth;
- const tools::Long nTmp = lcl_MulDiv64<long>(nSum, nAct, nWish);
+ const tools::Long nTmp = lcl_MulDiv64<tools::Long>(nSum, nAct, nWish);
if (rBoxes[i] != pCur)
{
@@ -648,7 +648,7 @@ static void lcl_ProcessBoxSet( SwTableBox *pBox, Parm &rParm )
const SwTableBoxes &rBoxes = pLine->GetTabBoxes();
for ( size_t i = 0; (i < rBoxes.size()) && (rBoxes[i] != pCur); ++i)
{
- nLeft += lcl_MulDiv64<long>(
+ nLeft += lcl_MulDiv64<tools::Long>(
rBoxes[i]->GetFrameFormat()->GetFrameSize().GetWidth(),
nOldAct, rParm.nOldWish);
}
@@ -660,7 +660,7 @@ static void lcl_ProcessBoxSet( SwTableBox *pBox, Parm &rParm )
if ( nLeft != rParm.rOld.GetLeft() ) // There are still boxes before this.
{
// Right edge is left edge plus width.
- const tools::Long nWidth = lcl_MulDiv64<long>(
+ const tools::Long nWidth = lcl_MulDiv64<tools::Long>(
pBox->GetFrameFormat()->GetFrameSize().GetWidth(),
nOldAct, rParm.nOldWish);
const tools::Long nRight = nLeft + nWidth;
@@ -694,7 +694,7 @@ static void lcl_ProcessBoxSet( SwTableBox *pBox, Parm &rParm )
if ( rParm.rOld.Count() )
{
// Calculate the difference to the edge touching the first box.
- const tools::Long nWidth = lcl_MulDiv64<long>(
+ const tools::Long nWidth = lcl_MulDiv64<tools::Long>(
pBox->GetFrameFormat()->GetFrameSize().GetWidth(),
nOldAct, rParm.nOldWish);
const tools::Long nTmp = nWidth + rParm.rOld.GetLeft();
@@ -1172,8 +1172,8 @@ void SwTable::NewSetTabCols( Parm &rParm, const SwTabCols &rNew,
nOldPos = rOld[i] - rParm.rOld.GetLeft();
nNewPos = rNew[i] - rParm.rNew.GetLeft();
}
- nNewPos = lcl_MulDiv64<long>(nNewPos, rParm.nNewWish, nNewWidth);
- nOldPos = lcl_MulDiv64<long>(nOldPos, rParm.nOldWish, nOldWidth);
+ nNewPos = lcl_MulDiv64<tools::Long>(nNewPos, rParm.nNewWish, nNewWidth);
+ nOldPos = lcl_MulDiv64<tools::Long>(nOldPos, rParm.nOldWish, nOldWidth);
if( nOldPos != nNewPos && nNewPos > 0 && nOldPos > 0 )
{
ColChange aChg( static_cast<sal_uInt16>(nOldPos), static_cast<sal_uInt16>(nNewPos) );
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index d3ce7116407b..26eaad505161 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -347,7 +347,7 @@ class SwTextPaintInfo : public SwTextSizeInfo
sw::WrongListIterator *m_pWrongList;
sw::WrongListIterator *m_pGrammarCheckList;
sw::WrongListIterator *m_pSmartTags;
- std::vector<long>* pSpaceAdd;
+ std::vector<tools::Long>* pSpaceAdd;
const SvxBrushItem *pBrushItem; // For the background
SwTextFly aTextFly; // Calculate the FlyFrame
Point aPos; // Paint position
@@ -448,8 +448,8 @@ public:
{ return ( pSpaceAdd && nSpaceIdx < pSpaceAdd->size() )
? (*pSpaceAdd)[nSpaceIdx] : 0; }
- void SetpSpaceAdd( std::vector<long>* pNew ){ pSpaceAdd = pNew; }
- std::vector<long>* GetpSpaceAdd() const { return pSpaceAdd; }
+ void SetpSpaceAdd( std::vector<tools::Long>* pNew ){ pSpaceAdd = pNew; }
+ std::vector<tools::Long>* GetpSpaceAdd() const { return pSpaceAdd; }
void SetWrongList(sw::WrongListIterator *const pNew) { m_pWrongList = pNew; }
sw::WrongListIterator* GetpWrongList() const { return m_pWrongList; }
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index aae48722464f..fb064af7d3c9 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -64,7 +64,7 @@ namespace {
tools::Long lcl_CalcOptRepaint( SwTextFormatter &rThis,
SwLineLayout const &rCurr,
TextFrameIndex nOldLineEnd,
- const std::vector<long> &rFlyStarts );
+ const std::vector<tools::Long> &rFlyStarts );
//! Determine if we need to build hidden portions
bool lcl_BuildHiddenPortion(const SwTextSizeInfo& rInf, TextFrameIndex &rPos);
@@ -1592,7 +1592,7 @@ TextFrameIndex SwTextFormatter::FormatLine(TextFrameIndex const nStartPos)
// before and after the BuildPortions call
const bool bOptimizeRepaint = AllowRepaintOpt();
TextFrameIndex const nOldLineEnd = nStartPos + m_pCurr->GetLen();
- std::vector<long> flyStarts;
+ std::vector<tools::Long> flyStarts;
// these are the conditions for a fly position comparison
if ( bOptimizeRepaint && m_pCurr->IsFly() )
@@ -2772,7 +2772,7 @@ namespace {
tools::Long lcl_CalcOptRepaint( SwTextFormatter &rThis,
SwLineLayout const &rCurr,
TextFrameIndex const nOldLineEnd,
- const std::vector<long> &rFlyStarts )
+ const std::vector<tools::Long> &rFlyStarts )
{
SwTextFormatInfo& txtFormatInfo = rThis.GetInfo();
if ( txtFormatInfo.GetIdx() < txtFormatInfo.GetReformatStart() )
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 7e9c2c25cbdc..bb3fb103260f 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -308,7 +308,7 @@ void SwLineLayout::InitSpaceAdd()
void SwLineLayout::CreateSpaceAdd( const tools::Long nInit )
{
- m_pLLSpaceAdd.reset( new std::vector<long> );
+ m_pLLSpaceAdd.reset( new std::vector<tools::Long> );
SetLLSpaceAdd( nInit, 0 );
}
diff --git a/sw/source/core/text/porlay.hxx b/sw/source/core/text/porlay.hxx
index ca2c4e0ae22f..255337d583c1 100644
--- a/sw/source/core/text/porlay.hxx
+++ b/sw/source/core/text/porlay.hxx
@@ -79,7 +79,7 @@ class SwLineLayout : public SwTextPortion
{
private:
SwLineLayout *m_pNext; // The next Line
- std::unique_ptr<std::vector<long>> m_pLLSpaceAdd; // Used for justified alignment
+ std::unique_ptr<std::vector<tools::Long>> m_pLLSpaceAdd; // Used for justified alignment
std::unique_ptr<std::deque<sal_uInt16>> m_pKanaComp; // Used for Kana compression
sal_uInt16 m_nRealHeight; // The height resulting from line spacing and register
sal_uInt16 m_nTextHeight; // The max height of all non-FlyCnt portions in this Line
@@ -187,7 +187,7 @@ public:
}
tools::Long GetLLSpaceAdd( sal_uInt16 nIdx ) { return (*m_pLLSpaceAdd)[ nIdx ]; }
void RemoveFirstLLSpaceAdd() { m_pLLSpaceAdd->erase( m_pLLSpaceAdd->begin() ); }
- std::vector<long>* GetpLLSpaceAdd() const { return m_pLLSpaceAdd.get(); }
+ std::vector<tools::Long>* GetpLLSpaceAdd() const { return m_pLLSpaceAdd.get(); }
// Stuff for Kana compression
void SetKanaComp( std::unique_ptr<std::deque<sal_uInt16>> pNew ){ m_pKanaComp = std::move(pNew); }
diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx
index e61c52b295aa..8050303942c2 100644
--- a/sw/source/core/text/pormulti.cxx
+++ b/sw/source/core/text/pormulti.cxx
@@ -515,7 +515,7 @@ bool SwDoubleLinePortion::ChgSpaceAdd( SwLineLayout* pCurr,
// pCurr->SetLLSpaceAdd( nMultiSpace, 0 );
// #i65711# SetLLSpaceAdd replaces the first value,
// instead we want to insert a new first value:
- std::vector<long>* pVec = pCurr->GetpLLSpaceAdd();
+ std::vector<tools::Long>* pVec = pCurr->GetpLLSpaceAdd();
pVec->insert( pVec->begin(), nMultiSpace );
bRet = true;
}
@@ -1411,7 +1411,7 @@ class SwSpaceManipulator
{
SwTextPaintInfo& rInfo;
SwMultiPortion& rMulti;
- std::vector<long>* pOldSpaceAdd;
+ std::vector<tools::Long>* pOldSpaceAdd;
sal_uInt16 nOldSpIdx;
tools::Long nSpaceAdd;
bool bSpaceChg;
diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx
index b1f9333ba04a..46851c08d7ad 100644
--- a/sw/source/core/text/txtfly.cxx
+++ b/sw/source/core/text/txtfly.cxx
@@ -273,7 +273,7 @@ SwRect SwContourCache::ContourRect( const SwFormat* pFormat,
Range aRange( std::min( nTmpTop, nTmpBottom ), std::max( nTmpTop, nTmpBottom ) );
- std::deque<long>* pTmp = mvItems[0].mxTextRanger->GetTextRanges( aRange );
+ std::deque<tools::Long>* pTmp = mvItems[0].mxTextRanger->GetTextRanges( aRange );
const size_t nCount = pTmp->size();
if( 0 != nCount )
diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx
index 69eccc08fd33..c404d77d58b1 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -2049,7 +2049,7 @@ void SwHTMLParser::SetVarSize( SvxCSS1PropertyInfo const &rPropInfo,
nWidth = MINFLY;
break;
case SVX_CSS1_LTYPE_TWIP:
- nWidth = std::max<long>(rPropInfo.m_nWidth, MINFLY);
+ nWidth = std::max<tools::Long>(rPropInfo.m_nWidth, MINFLY);
nPercentWidth = 0;
break;
default:
@@ -2063,7 +2063,7 @@ void SwHTMLParser::SetVarSize( SvxCSS1PropertyInfo const &rPropInfo,
case SVX_CSS1_LTYPE_TWIP:
// Netscape and MS-IE interpreting the height incorrectly as minimum height,
// therefore we are doing the same.
- nHeight = std::max<long>(rPropInfo.m_nHeight, MINFLY);
+ nHeight = std::max<tools::Long>(rPropInfo.m_nHeight, MINFLY);
break;
default:
;
diff --git a/sw/source/filter/writer/wrtswtbl.cxx b/sw/source/filter/writer/wrtswtbl.cxx
index 3c9c031c16fb..911bed91cc59 100644
--- a/sw/source/filter/writer/wrtswtbl.cxx
+++ b/sw/source/filter/writer/wrtswtbl.cxx
@@ -383,7 +383,7 @@ tools::Long SwWriteTable::GetAbsHeight(tools::Long nRawHeight, size_t const nRow
}
OSL_ENSURE( nRawHeight > 0, "Row Height <= 0. OK?" );
- return std::max<long>(nRawHeight, 0);
+ return std::max<tools::Long>(nRawHeight, 0);
}
bool SwWriteTable::ShouldExpandSub(const SwTableBox *pBox, bool /*bExpandedBefore*/,
diff --git a/sw/source/filter/ww8/WW8TableInfo.hxx b/sw/source/filter/ww8/WW8TableInfo.hxx
index ca2cfb2c9252..ce7dbbb5faa7 100644
--- a/sw/source/filter/ww8/WW8TableInfo.hxx
+++ b/sw/source/filter/ww8/WW8TableInfo.hxx
@@ -255,7 +255,7 @@ public:
class WW8TableCellGrid
{
- typedef std::set<long> RowTops_t;
+ typedef std::set<tools::Long> RowTops_t;
typedef std::map<long, WW8TableCellGridRow::Pointer_t> Rows_t;
RowTops_t m_aRowTops;
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index c535dd054588..544baec382ad 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -1246,7 +1246,7 @@ static tools::Long lcl_GetTrueMargin(const SvxLRSpaceItem &rLR, const SwNumForma
const tools::Long nReverseListIndented = GetListFirstLineIndent(rFormat);
tools::Long nExtraListIndent = nPseudoListBodyIndent + nReverseListIndented;
- return std::max<long>(nExtraListIndent, 0);
+ return std::max<tools::Long>(nExtraListIndent, 0);
}
// #i103711#
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 55235e71437d..a4d005fb9a64 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -152,7 +152,7 @@ protected:
virtual ::svt::CellController* GetController(tools::Long nRow, sal_uInt16 nCol) override;
virtual bool SaveModified() override;
- std::vector<long> GetOptimalColWidths() const;
+ std::vector<tools::Long> GetOptimalColWidths() const;
public:
SwEntryBrowseBox(const css::uno::Reference<css::awt::XWindow> &rParent);
@@ -3622,7 +3622,7 @@ void SwEntryBrowseBox::Resize()
SwEntryBrowseBox_Base::Resize();
tools::Long nWidth = GetSizePixel().Width();
- std::vector<long> aWidths = GetOptimalColWidths();
+ std::vector<tools::Long> aWidths = GetOptimalColWidths();
tools::Long nNaturalWidth(std::accumulate(aWidths.begin(), aWidths.end(), 0));
tools::Long nExcess = ((nWidth - nNaturalWidth) / aWidths.size()) - 1;
@@ -3630,9 +3630,9 @@ void SwEntryBrowseBox::Resize()
SetColumnWidth(i+1, aWidths[i] + nExcess);
}
-std::vector<long> SwEntryBrowseBox::GetOptimalColWidths() const
+std::vector<tools::Long> SwEntryBrowseBox::GetOptimalColWidths() const
{
- std::vector<long> aWidths;
+ std::vector<tools::Long> aWidths;
tools::Long nStandardColMinWidth = approximate_digit_width() * 15;
tools::Long nYesNoWidth = approximate_digit_width() * 5;
@@ -3661,7 +3661,7 @@ Size SwEntryBrowseBox::GetOptimalSize() const
{
Size aSize = LogicToPixel(Size(276 , 175), MapMode(MapUnit::MapAppFont));
- std::vector<long> aWidths = GetOptimalColWidths();
+ std::vector<tools::Long> aWidths = GetOptimalColWidths();
tools::Long nWidth(std::accumulate(aWidths.begin(), aWidths.end(), 0));
diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx
index 594a018828da..ce54bdd02e31 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -873,8 +873,8 @@ void SwTableShell::Execute(SfxRequest &rReq)
{
tools::Long maxX = 0;
tools::Long maxY = 0;
- tools::Long minX = std::numeric_limits<long>::max();
- tools::Long minY = std::numeric_limits<long>::max();
+ tools::Long minX = std::numeric_limits<tools::Long>::max();
+ tools::Long minY = std::numeric_limits<tools::Long>::max();
tools::Long nbBoxes = aBoxes.size();
for ( tools::Long i = 0; i < nbBoxes; i++ )
{
generated by cgit (git 2.34.1) at 2024-08-05 12:19:13 +0000