diff options
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/fntctrl.cxx | 2 | ||||
| -rw-r--r-- | svx/source/dialog/framelinkarray.cxx | 10 | ||||
| -rw-r--r-- | svx/source/dialog/rulritem.cxx | 4 | ||||
| -rw-r--r-- | svx/source/inc/fmshimp.hxx | 2 | ||||
| -rw-r--r-- | svx/source/svdraw/svdotext.cxx | 4 |
5 files changed, 11 insertions, 11 deletions
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index 4d86e4974f51..edf8b7881297 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -144,7 +144,7 @@ class FontPrevWin_Impl bool mbDelPrinter; Reference <XBreakIterator> mxBreak; - std::vector<long> maTextWidth; + std::vector<tools::Long> maTextWidth; std::deque<sal_Int32> maScriptChg; std::vector<sal_uInt16> maScriptType; SvxFont maCJKFont; diff --git a/svx/source/dialog/framelinkarray.cxx b/svx/source/dialog/framelinkarray.cxx index bf89b58dfba9..c54fc5167120 100644 --- a/svx/source/dialog/framelinkarray.cxx +++ b/svx/source/dialog/framelinkarray.cxx @@ -152,7 +152,7 @@ void Cell::MirrorSelfX() } -static void lclRecalcCoordVec( std::vector<long>& rCoords, const std::vector<long>& rSizes ) +static void lclRecalcCoordVec( std::vector<tools::Long>& rCoords, const std::vector<tools::Long>& rSizes ) { DBG_ASSERT( rCoords.size() == rSizes.size() + 1, "lclRecalcCoordVec - inconsistent vectors" ); auto aCIt = rCoords.begin(); @@ -185,10 +185,10 @@ const Cell OBJ_CELL_NONE; struct ArrayImpl { CellVec maCells; - std::vector<long> maWidths; - std::vector<long> maHeights; - mutable std::vector<long> maXCoords; - mutable std::vector<long> maYCoords; + std::vector<tools::Long> maWidths; + std::vector<tools::Long> maHeights; + mutable std::vector<tools::Long> maXCoords; + mutable std::vector<tools::Long> maYCoords; size_t mnWidth; size_t mnHeight; size_t mnFirstClipCol; diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx index 7943283364e8..c9973fdd7462 100644 --- a/svx/source/dialog/rulritem.cxx +++ b/svx/source/dialog/rulritem.cxx @@ -584,8 +584,8 @@ SvxColumnDescription::SvxColumnDescription(tools::Long start, tools::Long end, t nEnd (end), bVisible (bVis), // fdo#85858 hack: clamp these to smaller value to prevent overflow - nEndMin(std::min<long>(endMin, std::numeric_limits<unsigned short>::max())), - nEndMax(std::min<long>(endMax, std::numeric_limits<unsigned short>::max())) + nEndMin(std::min<tools::Long>(endMin, std::numeric_limits<unsigned short>::max())), + nEndMax(std::min<tools::Long>(endMax, std::numeric_limits<unsigned short>::max())) {} bool SvxColumnDescription::operator==(const SvxColumnDescription& rCmp) const diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index 0c30e1b8819d..affa74dfcaf9 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -178,7 +178,7 @@ class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) FmXFormShell final : public FmXFormShe // since I want to mark an SdrObject when searching for the treatment of the "found", // I get all relevant objects before yanking up of the search dialog // (the array is thus only valid during the search process) - std::vector<long> m_arrRelativeGridColumn; + std::vector<tools::Long> m_arrRelativeGridColumn; ::osl::Mutex m_aMutex; ImplSVEvent * m_nInvalidationEvent; diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 8919c5d1c7dd..b7450c83a44d 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -492,7 +492,7 @@ void SdrTextObj::AdaptTextMinSize() { // Set minimum width. const tools::Long nDist = GetTextLeftDistance() + GetTextRightDistance(); - const tools::Long nW = std::max<long>(0, maRect.GetWidth() - 1 - nDist); // text width without margins + const tools::Long nW = std::max<tools::Long>(0, maRect.GetWidth() - 1 - nDist); // text width without margins aSet.Put(makeSdrTextMinFrameWidthItem(nW)); @@ -507,7 +507,7 @@ void SdrTextObj::AdaptTextMinSize() { // Set Minimum height. const tools::Long nDist = GetTextUpperDistance() + GetTextLowerDistance(); - const tools::Long nH = std::max<long>(0, maRect.GetHeight() - 1 - nDist); // text height without margins + const tools::Long nH = std::max<tools::Long>(0, maRect.GetHeight() - 1 - nDist); // text height without margins aSet.Put(makeSdrTextMinFrameHeightItem(nH)); |