use tools::Long in editeng

Change-Id: Ib7014c353489461ad9489d9f3fefd59a32f8f877
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104524
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

17 files changed, 74 insertions, 72 deletions

diff --git a/include/editeng/borderline.hxx b/include/editeng/borderline.hxx
index 64d7f2c5c3cb..e48b461a8b02 100644
--- a/include/editeng/borderline.hxx
+++ b/include/editeng/borderline.hxx
@@ -23,6 +23,7 @@
 #include <com/sun/star/table/BorderLineStyle.hpp>
 
 #include <tools/color.hxx>
+#include <tools/long.hxx>
 #include <tools/mapunit.hxx>
 #include <editeng/editengdllapi.h>
 #include <svtools/borderline.hxx>
@@ -144,11 +145,11 @@ class EDITENG_DLLPUBLIC SvxBorderLine final
 {
     Color  aColor;
 
-    long m_nWidth;
+    tools::Long m_nWidth;
     bool m_bMirrorWidths;
     BorderWidthImpl m_aWidthImpl;
-    long m_nMult;
-    long m_nDiv;
+    tools::Long m_nMult;
+    tools::Long m_nDiv;
 
     SvxBorderLineStyle   m_nStyle;
 
@@ -159,7 +160,7 @@ class EDITENG_DLLPUBLIC SvxBorderLine final
 
 public:
     SvxBorderLine( const Color *pCol = nullptr,
-            long nWidth = 0,
+            tools::Long nWidth = 0,
             SvxBorderLineStyle nStyle = SvxBorderLineStyle::SOLID,
             Color (*pColorOutFn)( Color ) = &darkColor,
             Color (*pColorInFn)( Color ) = &darkColor );
@@ -170,7 +171,7 @@ public:
     bool            HasGapColor() const { return m_pColorGapFn != nullptr; }
     Color           GetColorGap() const;
 
-    void SetWidth( long nWidth );
+    void SetWidth( tools::Long nWidth );
     /** Guess the style and width from the three lines widths values.
 
         When the value of nStyle is SvxBorderLine::DOUBLE, the style set will be guessed
@@ -200,7 +201,7 @@ public:
 
     // TODO Hacky method to mirror lines in only a few cases
     void            SetMirrorWidths() { m_bMirrorWidths = true; }
-    long            GetWidth( ) const { return m_nWidth; }
+    tools::Long            GetWidth( ) const { return m_nWidth; }
     sal_uInt16      GetOutWidth() const;
     sal_uInt16      GetInWidth() const;
     sal_uInt16      GetDistance() const;
@@ -209,7 +210,7 @@ public:
 
     void            SetColor( const Color &rColor ) { aColor = rColor; }
     void            SetBorderLineStyle( SvxBorderLineStyle nNew );
-    void            ScaleMetrics( long nMult, long nDiv );
+    void            ScaleMetrics( tools::Long nMult, tools::Long nDiv );
 
     bool            operator==( const SvxBorderLine &rCmp ) const;
 
diff --git a/include/editeng/boxitem.hxx b/include/editeng/boxitem.hxx
index 3ef4a05ff11c..6e0fc53d080c 100644
--- a/include/editeng/boxitem.hxx
+++ b/include/editeng/boxitem.hxx
@@ -84,7 +84,7 @@ public:
 
     virtual SvxBoxItem*      Clone( SfxItemPool *pPool = nullptr ) const override;
 
-    virtual void             ScaleMetrics( long nMult, long nDiv ) override;
+    virtual void             ScaleMetrics( tools::Long nMult, tools::Long nDiv ) override;
     virtual bool             HasMetrics() const override;
 
     const   editeng::SvxBorderLine* GetTop()    const { return pTop.get(); }
@@ -198,7 +198,7 @@ public:
     virtual bool            PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
 
     virtual SvxBoxInfoItem* Clone( SfxItemPool *pPool = nullptr ) const override;
-    virtual void            ScaleMetrics( long nMult, long nDiv ) override;
+    virtual void            ScaleMetrics( tools::Long nMult, tools::Long nDiv ) override;
     virtual bool            HasMetrics() const override;
 
     const editeng::SvxBorderLine*   GetHori() const { return pHori.get(); }
diff --git a/include/editeng/bulletitem.hxx b/include/editeng/bulletitem.hxx
index 35266d8a4e94..4e736b776323 100644
--- a/include/editeng/bulletitem.hxx
+++ b/include/editeng/bulletitem.hxx
@@ -52,7 +52,7 @@ class EDITENG_DLLPUBLIC SvxBulletItem final : public SfxPoolItem
     OUString        aFollowText;
     sal_uInt16      nStart;
     SvxBulletStyle  nStyle;
-    long            nWidth;
+    tools::Long            nWidth;
     sal_uInt16      nScale;
     sal_Unicode     cSymbol;
 
@@ -65,7 +65,7 @@ public:
 
     OUString            GetFullText() const;
 
-    long                GetWidth() const { return nWidth; }
+    tools::Long                GetWidth() const { return nWidth; }
     const vcl::Font&    GetFont() const { return aFont; }
 
     const GraphicObject& GetGraphicObject() const;
@@ -74,7 +74,7 @@ public:
     void                SetSymbol( sal_Unicode c) { cSymbol = c; }
 
     void                SetStart( sal_uInt16 nNew ) { nStart = nNew; }
-    void                SetWidth( long nNew ) { nWidth = nNew; }
+    void                SetWidth( tools::Long nNew ) { nWidth = nNew; }
     void                SetStyle( SvxBulletStyle nNew ) { nStyle = nNew; }
     void                SetFont( const vcl::Font& rNew) { aFont = rNew; }
     void                SetScale( sal_uInt16 nNew ) { nScale = nNew; }
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index f853a017bfab..3f896f09a23c 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -177,7 +177,7 @@ private:
         const EditSelection& rCurSelection,
         sal_Int16 nWordType = css::i18n::WordType::ANYWORD_IGNOREWHITESPACES);
 
-    EDITENG_DLLPRIVATE long GetXPos(
+    EDITENG_DLLPRIVATE tools::Long GetXPos(
         const ParaPortion* pParaPortion, const EditLine* pLine, sal_Int32 nIndex, bool bPreferPortionStart = false) const;
 
     EDITENG_DLLPRIVATE Range GetLineXPosStartEnd(
@@ -289,7 +289,7 @@ public:
     sal_uInt32      GetLineHeight( sal_Int32 nParagraph );
     tools::Rectangle GetParaBounds( sal_Int32 nPara );
     ParagraphInfos  GetParagraphInfos( sal_Int32 nPara );
-    sal_Int32       FindParagraph( long nDocPosY );
+    sal_Int32       FindParagraph( tools::Long nDocPosY );
     EPosition       FindDocPosition( const Point& rDocPos ) const;
     tools::Rectangle       GetCharacterBounds( const EPosition& rPos ) const;
 
@@ -364,7 +364,7 @@ public:
     void            StripPortions();
     void            GetPortions( sal_Int32 nPara, std::vector<sal_Int32>& rList );
 
-    long            GetFirstLineStartX( sal_Int32 nParagraph );
+    tools::Long            GetFirstLineStartX( sal_Int32 nParagraph );
     Point           GetDocPosTopLeft( sal_Int32 nParagraph );
     Point           GetDocPos( const Point& rPaperPos ) const;
     bool            IsTextPos( const Point& rPaperPos, sal_uInt16 nBorder );
@@ -480,7 +480,7 @@ public:
     void            SetBeginPasteOrDropHdl( const Link<PasteOrDropInfos&,void>& rLink );
     void            SetEndPasteOrDropHdl( const Link<PasteOrDropInfos&,void>& rLink );
 
-    virtual void    PaintingFirstLine( sal_Int32 nPara, const Point& rStartPos, long nBaseLineY, const Point& rOrigin, short nOrientation, OutputDevice* pOutDev );
+    virtual void    PaintingFirstLine( sal_Int32 nPara, const Point& rStartPos, tools::Long nBaseLineY, const Point& rOrigin, short nOrientation, OutputDevice* pOutDev );
     virtual void    ParagraphInserted( sal_Int32 nNewParagraph );
     virtual void    ParagraphDeleted( sal_Int32 nDeletedParagraph );
     virtual void    ParagraphConnected( sal_Int32 nLeftParagraph, sal_Int32 nRightParagraph );
@@ -490,7 +490,7 @@ public:
 
     virtual void DrawingText( const Point& rStartPos, const OUString& rText,
                               sal_Int32 nTextStart, sal_Int32 nTextLen,
-                              const long* pDXArray, const SvxFont& rFont,
+                              const tools::Long* pDXArray, const SvxFont& rFont,
                               sal_Int32 nPara, sal_uInt8 nRightToLeft,
                               const EEngineData::WrongSpellVector* pWrongSpellVector,
                               const SvxFieldData* pFieldData,
@@ -500,7 +500,7 @@ public:
                               const Color& rOverlineColor,
                               const Color& rTextLineColor);
 
-    virtual void DrawingTab( const Point& rStartPos, long nWidth, const OUString& rChar,
+    virtual void DrawingTab( const Point& rStartPos, tools::Long nWidth, const OUString& rChar,
                              const SvxFont& rFont, sal_Int32 nPara, sal_uInt8 nRightToLeft,
                              bool bEndOfLine,
                              bool bEndOfParagraph,
diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx
index 093e0d851ab6..a449eff4b742 100644
--- a/include/editeng/editview.hxx
+++ b/include/editeng/editview.hxx
@@ -170,7 +170,7 @@ public:
     void            InvalidateWindow(const tools::Rectangle& rClipRect);
     void            InvalidateOtherViewWindows( const tools::Rectangle& rInvRect );
     void            Invalidate();
-    Pair            Scroll( long nHorzScroll, long nVertScroll, ScrollRangeCheck nRangeCheck = ScrollRangeCheck::NoNegative );
+    Pair            Scroll( tools::Long nHorzScroll, tools::Long nVertScroll, ScrollRangeCheck nRangeCheck = ScrollRangeCheck::NoNegative );
 
     void            SetBroadcastLOKViewCursor(bool bSet);
     tools::Rectangle       GetEditCursor() const;
@@ -234,7 +234,7 @@ public:
     // especially for Oliver Specht
     Point           GetWindowPosTopLeft( sal_Int32 nParagraph );
     void            MoveParagraphs( Range aParagraphs, sal_Int32 nNewPos );
-    void            MoveParagraphs( long nDiff );
+    void            MoveParagraphs( tools::Long nDiff );
 
     const SfxItemSet& GetEmptyItemSet() const;
     SfxItemSet          GetAttribs();
diff --git a/include/editeng/fhgtitem.hxx b/include/editeng/fhgtitem.hxx
index 2bd3f583d293..f5b8ac3f9672 100644
--- a/include/editeng/fhgtitem.hxx
+++ b/include/editeng/fhgtitem.hxx
@@ -63,7 +63,7 @@ public:
                                     OUString &rText, const IntlWrapper& ) const override;
 
     virtual SvxFontHeightItem*   Clone( SfxItemPool *pPool = nullptr ) const override;
-    virtual void                 ScaleMetrics( long nMult, long nDiv ) override;
+    virtual void                 ScaleMetrics( tools::Long nMult, tools::Long nDiv ) override;
     virtual bool                 HasMetrics() const override;
 
     void SetHeight( sal_uInt32 nNewHeight, const sal_uInt16 nNewProp = 100,
diff --git a/include/editeng/itemtype.hxx b/include/editeng/itemtype.hxx
index 179460b32b07..19d2a19b4ee3 100644
--- a/include/editeng/itemtype.hxx
+++ b/include/editeng/itemtype.hxx
@@ -31,12 +31,12 @@ class IntlWrapper;
 
 const sal_Unicode cpDelim[] = { ',' , ' ', '\0' };
 
-EDITENG_DLLPUBLIC OUString GetMetricText( long nVal, MapUnit eSrcUnit, MapUnit eDestUnit, const IntlWrapper * pIntl );
+EDITENG_DLLPUBLIC OUString GetMetricText( tools::Long nVal, MapUnit eSrcUnit, MapUnit eDestUnit, const IntlWrapper * pIntl );
 OUString GetColorString( const Color& rCol );
 EDITENG_DLLPUBLIC const char* GetMetricId(MapUnit eUnit);
 
 
-inline long Scale( long nVal, long nMult, long nDiv )
+inline tools::Long Scale( tools::Long nVal, tools::Long nMult, tools::Long nDiv )
 {
     BigInt aVal( nVal );
     aVal *= nMult;
diff --git a/include/editeng/kernitem.hxx b/include/editeng/kernitem.hxx
index a95eae9efa8a..23a8c1909546 100644
--- a/include/editeng/kernitem.hxx
+++ b/include/editeng/kernitem.hxx
@@ -41,7 +41,7 @@ public:
 
     // "pure virtual Methods" from SfxPoolItem
     virtual SvxKerningItem* Clone( SfxItemPool *pPool = nullptr ) const override;
-    virtual void            ScaleMetrics( long nMult, long nDiv ) override;
+    virtual void            ScaleMetrics( tools::Long nMult, tools::Long nDiv ) override;
     virtual bool            HasMetrics() const override;
 
     virtual bool GetPresentation( SfxItemPresentation ePres,
diff --git a/include/editeng/lineitem.hxx b/include/editeng/lineitem.hxx
index 88a0bf768d91..0e481767a730 100644
--- a/include/editeng/lineitem.hxx
+++ b/include/editeng/lineitem.hxx
@@ -54,7 +54,7 @@ public:
                                   OUString &rText, const IntlWrapper& ) const override;
 
     virtual SvxLineItem*     Clone( SfxItemPool *pPool = nullptr ) const override;
-    virtual void             ScaleMetrics( long nMult, long nDiv ) override;
+    virtual void             ScaleMetrics( tools::Long nMult, tools::Long nDiv ) override;
     virtual bool             HasMetrics() const override;
 
     const editeng::SvxBorderLine*
diff --git a/include/editeng/lrspitem.hxx b/include/editeng/lrspitem.hxx
index 4fd809ae600e..b04944326407 100644
--- a/include/editeng/lrspitem.hxx
+++ b/include/editeng/lrspitem.hxx
@@ -48,9 +48,9 @@
 
 class EDITENG_DLLPUBLIC SvxLRSpaceItem final : public SfxPoolItem
 {
-    long    nTxtLeft;           // We spend a sal_uInt16
-    long    nLeftMargin;        // nLeft or the negative first-line indent
-    long    nRightMargin;       // The unproblematic right edge
+    tools::Long    nTxtLeft;           // We spend a sal_uInt16
+    tools::Long    nLeftMargin;        // nLeft or the negative first-line indent
+    tools::Long    nRightMargin;       // The unproblematic right edge
 
     sal_uInt16  nPropFirstLineOffset, nPropLeftMargin, nPropRightMargin;
     short   nFirstLineOffset;     // First-line indent _always_ relative to nTxtLeft
@@ -65,8 +65,8 @@ public:
     static SfxPoolItem* CreateDefault();
 
     explicit SvxLRSpaceItem( const sal_uInt16 nId  );
-    SvxLRSpaceItem( const long nLeft, const long nRight,
-                    const long nTLeft /*= 0*/, const short nOfset /*= 0*/,
+    SvxLRSpaceItem( const tools::Long nLeft, const tools::Long nRight,
+                    const tools::Long nTLeft /*= 0*/, const short nOfset /*= 0*/,
                     const sal_uInt16 nId  );
     SvxLRSpaceItem(SvxLRSpaceItem const &) = default; // SfxPoolItem copy function dichotomy
 
@@ -82,18 +82,18 @@ public:
                                   OUString &rText, const IntlWrapper& ) const override;
 
     virtual SvxLRSpaceItem*      Clone( SfxItemPool *pPool = nullptr ) const override;
-    virtual void                 ScaleMetrics( long nMult, long nDiv ) override;
+    virtual void                 ScaleMetrics( tools::Long nMult, tools::Long nDiv ) override;
     virtual bool                 HasMetrics() const override;
 
     // The "layout interface":
-    inline void   SetLeft ( const long nL, const sal_uInt16 nProp = 100 );
-    inline void   SetRight( const long nR, const sal_uInt16 nProp = 100 );
+    inline void   SetLeft ( const tools::Long nL, const sal_uInt16 nProp = 100 );
+    inline void   SetRight( const tools::Long nR, const sal_uInt16 nProp = 100 );
 
     // Query/direct setting of the absolute values
-    long GetLeft()  const { return nLeftMargin; }
-    long GetRight() const { return nRightMargin;}
-    void SetLeftValue( const long nL ) { nTxtLeft = nLeftMargin = nL; }
-    void SetRightValue( const long nR ) { nRightMargin = nR; }
+    tools::Long GetLeft()  const { return nLeftMargin; }
+    tools::Long GetRight() const { return nRightMargin;}
+    void SetLeftValue( const tools::Long nL ) { nTxtLeft = nLeftMargin = nL; }
+    void SetRightValue( const tools::Long nR ) { nRightMargin = nR; }
     bool IsAutoFirst()  const { return bAutoFirst; }
     void SetAutoFirst( const bool bNew ) { bAutoFirst = bNew; }
 
@@ -105,8 +105,8 @@ public:
     sal_uInt16 GetPropRight() const { return nPropRightMargin;}
 
     // The UI/text interface:
-    inline void SetTextLeft( const long nL, const sal_uInt16 nProp = 100 );
-    long GetTextLeft() const { return nTxtLeft; }
+    inline void SetTextLeft( const tools::Long nL, const sal_uInt16 nProp = 100 );
+    tools::Long GetTextLeft() const { return nTxtLeft; }
 
     inline void   SetTextFirstLineOffset( const short nF, const sal_uInt16 nProp = 100 );
     short  GetTextFirstLineOffset() const { return nFirstLineOffset; }
@@ -121,13 +121,13 @@ public:
     virtual boost::property_tree::ptree dumpAsJSON() const override;
 };
 
-inline void SvxLRSpaceItem::SetLeft( const long nL, const sal_uInt16 nProp )
+inline void SvxLRSpaceItem::SetLeft( const tools::Long nL, const sal_uInt16 nProp )
 {
     nLeftMargin = (nL * nProp) / 100;
     nTxtLeft = nLeftMargin;
     nPropLeftMargin = nProp;
 }
-inline void SvxLRSpaceItem::SetRight( const long nR, const sal_uInt16 nProp )
+inline void SvxLRSpaceItem::SetRight( const tools::Long nR, const sal_uInt16 nProp )
 {
     if (0 == nR)
     {
@@ -139,12 +139,12 @@ inline void SvxLRSpaceItem::SetRight( const long nR, const sal_uInt16 nProp )
 inline void SvxLRSpaceItem::SetTextFirstLineOffset( const short nF,
                                                  const sal_uInt16 nProp )
 {
-    nFirstLineOffset = short((long(nF) * nProp ) / 100);
+    nFirstLineOffset = short((tools::Long(nF) * nProp ) / 100);
     nPropFirstLineOffset = nProp;
     AdjustLeft();
 }
 
-inline void SvxLRSpaceItem::SetTextLeft( const long nL, const sal_uInt16 nProp )
+inline void SvxLRSpaceItem::SetTextLeft( const tools::Long nL, const sal_uInt16 nProp )
 {
     if (0 == nL)
     {
diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx
index 46b34bd41abe..961b5301206f 100644
--- a/include/editeng/numitem.hxx
+++ b/include/editeng/numitem.hxx
@@ -137,11 +137,11 @@ private:
     // of the list item starts
     LabelFollowedBy     meLabelFollowedBy;
     // specifies an additional list tab stop position for meLabelFollowedBy = LISTTAB
-    long                mnListtabPos;
+    tools::Long                mnListtabPos;
     // specifies the first line indent
-    long                mnFirstLineIndent;
+    tools::Long                mnFirstLineIndent;
     // specifies the indent before the text, e.g. in L2R-layout the left margin
-    long                mnIndentAt;
+    tools::Long                mnIndentAt;
 
     std::unique_ptr<SvxBrushItem>
                         pGraphicBrush;
@@ -212,12 +212,12 @@ public:
 
     void SetLabelFollowedBy( const LabelFollowedBy eLabelFollowedBy );
     LabelFollowedBy GetLabelFollowedBy() const { return meLabelFollowedBy;}
-    void SetListtabPos( const long nListtabPos );
-    long GetListtabPos() const { return mnListtabPos;}
-    void SetFirstLineIndent( const long nFirstLineIndent );
-    long GetFirstLineIndent() const { return mnFirstLineIndent;}
-    void SetIndentAt( const long nIndentAt );
-    long GetIndentAt() const { return mnIndentAt;}
+    void SetListtabPos( const tools::Long nListtabPos );
+    tools::Long GetListtabPos() const { return mnListtabPos;}
+    void SetFirstLineIndent( const tools::Long nFirstLineIndent );
+    tools::Long GetFirstLineIndent() const { return mnFirstLineIndent;}
+    void SetIndentAt( const tools::Long nIndentAt );
+    tools::Long GetIndentAt() const { return mnIndentAt;}
 
     static Size     GetGraphicSizeMM100(const Graphic* pGraphic);
     static OUString CreateRomanString( sal_uLong nNo, bool bUpper );
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 12bda7b26ae9..083cee135e99 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -207,7 +207,7 @@ public:
 
     EditView&   GetEditView() const { return *pEditView; }
 
-    void        Scroll( long nHorzScroll, long nVertScroll );
+    void        Scroll( tools::Long nHorzScroll, tools::Long nVertScroll );
 
     void        Paint( const tools::Rectangle& rRect, OutputDevice* pTargetDevice = nullptr );
     bool        PostKeyEvent( const KeyEvent& rKEvt, vcl::Window const * pFrameWin = nullptr );
@@ -242,7 +242,7 @@ public:
     void        Indent( short nDiff );
     void        AdjustDepth( short nDX );   // Later replace with Indent!
 
-    void        AdjustHeight( long nDY );
+    void        AdjustHeight( tools::Long nDY );
 
     void        Read( SvStream& rInput, EETextFormat eFormat, SvKeyValueIterator* pHTTPHeaderAttrs );
 
@@ -391,7 +391,7 @@ public:
     sal_Int32           mnTextLen;
     sal_Int32           mnPara;
     const SvxFont&      mrFont;
-    const long*         mpDXArray;
+    const tools::Long*         mpDXArray;
 
     const EEngineData::WrongSpellVector*  mpWrongSpellVector;
     const SvxFieldData* mpFieldData;
@@ -402,7 +402,7 @@ public:
     sal_uInt8           mnBiDiLevel;
 
     bool                mbFilled;
-    long                mnWidthToFill;
+    tools::Long                mnWidthToFill;
 
     bool                mbEndOfLine : 1;
     bool                mbEndOfParagraph : 1;
@@ -417,7 +417,7 @@ public:
         sal_Int32 nTxtLen,
         const SvxFont& rFnt,
         sal_Int32 nPar,
-        const long* pDXArr,
+        const tools::Long* pDXArr,
         const EEngineData::WrongSpellVector* pWrongSpellVector,
         const SvxFieldData* pFieldData,
         const css::lang::Locale* pLocale,
@@ -425,7 +425,7 @@ public:
         const Color& rTextLineColor,
         sal_uInt8 nBiDiLevel,
         bool bFilled,
-        long nWidthToFill,
+        tools::Long nWidthToFill,
         bool bEndOfLine,
         bool bEndOfParagraph,
         bool bEndOfBullet)
@@ -806,7 +806,7 @@ public:
 
     void DrawingText( const Point& rStartPos, const OUString& rText,
                               sal_Int32 nTextStart, sal_Int32 nTextLen,
-                              const long* pDXArray, const SvxFont& rFont,
+                              const tools::Long* pDXArray, const SvxFont& rFont,
                               sal_Int32 nPara, sal_uInt8 nRightToLeft,
                               const EEngineData::WrongSpellVector* pWrongSpellVector,
                               const SvxFieldData* pFieldData,
@@ -817,7 +817,7 @@ public:
                               const Color& rOverlineColor,
                               const Color& rTextLineColor);
 
-    void DrawingTab( const Point& rStartPos, long nWidth, const OUString& rChar,
+    void DrawingTab( const Point& rStartPos, tools::Long nWidth, const OUString& rChar,
                              const SvxFont& rFont, sal_Int32 nPara, sal_uInt8 nRightToLeft,
                              bool bEndOfLine,
                              bool bEndOfParagraph,
diff --git a/include/editeng/paperinf.hxx b/include/editeng/paperinf.hxx
index e4b08014515c..2ccc8fbf96fa 100644
--- a/include/editeng/paperinf.hxx
+++ b/include/editeng/paperinf.hxx
@@ -40,7 +40,7 @@ public:
     static Size     GetPaperSize( Paper ePaper, MapUnit eUnit = MapUnit::MapTwip );
     static Size     GetPaperSize( const Printer* pPrinter );
     static Paper    GetSvxPaper( const Size &rSize, MapUnit eUnit );
-    static long     GetSloppyPaperDimension( long nSize );
+    static tools::Long     GetSloppyPaperDimension( tools::Long nSize );
     static OUString GetName( Paper ePaper );
 };
 
@@ -48,7 +48,7 @@ public:
 
 inline Size &Swap(Size &rSize)
 {
-    const long lVal = rSize.Width();
+    const tools::Long lVal = rSize.Width();
     rSize.setWidth( rSize.Height() );
     rSize.setHeight( lVal );
     return rSize;
diff --git a/include/editeng/shaditem.hxx b/include/editeng/shaditem.hxx
index 8a843c84b19a..bed848215985 100644
--- a/include/editeng/shaditem.hxx
+++ b/include/editeng/shaditem.hxx
@@ -58,7 +58,7 @@ public:
                                   OUString &rText, const IntlWrapper& ) const override;
 
     virtual SvxShadowItem*   Clone( SfxItemPool *pPool = nullptr ) const override;
-    virtual void             ScaleMetrics( long nMult, long nDiv ) override;
+    virtual void             ScaleMetrics( tools::Long nMult, tools::Long nDiv ) override;
     virtual bool             HasMetrics() const override;
 
     const Color& GetColor() const { return aShadowColor;}
diff --git a/include/editeng/sizeitem.hxx b/include/editeng/sizeitem.hxx
index c1ff51f5ae3e..2247c76d9e79 100644
--- a/include/editeng/sizeitem.hxx
+++ b/include/editeng/sizeitem.hxx
@@ -52,16 +52,16 @@ public:
                                   OUString &rText, const IntlWrapper& ) const override;
 
     virtual SvxSizeItem*     Clone( SfxItemPool *pPool = nullptr ) const override;
-    virtual void             ScaleMetrics( long nMult, long nDiv ) override;
+    virtual void             ScaleMetrics( tools::Long nMult, tools::Long nDiv ) override;
     virtual bool             HasMetrics() const override;
 
     const Size& GetSize() const { return m_aSize; }
     void        SetSize(const Size& rSize) { m_aSize = rSize; }
 
-    long GetWidth() const { return m_aSize.getWidth();  }
-    long GetHeight() const { return m_aSize.getHeight(); }
-    void SetWidth(long n) { m_aSize.setWidth(n); }
-    void SetHeight(long n) { m_aSize.setHeight(n); }
+    tools::Long GetWidth() const { return m_aSize.getWidth();  }
+    tools::Long GetHeight() const { return m_aSize.getHeight(); }
+    void SetWidth(tools::Long n) { m_aSize.setWidth(n); }
+    void SetHeight(tools::Long n) { m_aSize.setHeight(n); }
 };
 
 #endif
diff --git a/include/editeng/svxfont.hxx b/include/editeng/svxfont.hxx
index 1a33e73189f2..c8e8c6670b12 100644
--- a/include/editeng/svxfont.hxx
+++ b/include/editeng/svxfont.hxx
@@ -20,6 +20,7 @@
 #define INCLUDED_EDITENG_SVXFONT_HXX
 
 #include <editeng/svxenum.hxx>
+#include <tools/long.hxx>
 #include <vcl/font.hxx>
 #include <editeng/editengdllapi.h>
 
@@ -55,7 +56,7 @@ public:
     sal_uInt8 GetPropr() const { return nPropr; }
     void SetPropr( const sal_uInt8 nNewPropr ) { nPropr = nNewPropr; }
     void SetProprRel( const sal_uInt8 nNewPropr )
-        { SetPropr( static_cast<sal_uInt8>( static_cast<long>(nNewPropr) * static_cast<long>(nPropr) / 100 ) ); }
+        { SetPropr( static_cast<sal_uInt8>( static_cast<tools::Long>(nNewPropr) * static_cast<tools::Long>(nPropr) / 100 ) ); }
 
     // Kerning
     short GetFixKerning() const { return nKern; }
@@ -93,10 +94,10 @@ public:
                       const sal_Int32 nIdx = 0, const sal_Int32 nLen = SAL_MAX_INT32 ) const;
 
     void QuickDrawText( OutputDevice *pOut, const Point &rPos, const OUString &rTxt,
-                        const sal_Int32 nIdx = 0, const sal_Int32 nLen = SAL_MAX_INT32, const long* pDXArray = nullptr ) const;
+                        const sal_Int32 nIdx = 0, const sal_Int32 nLen = SAL_MAX_INT32, const tools::Long* pDXArray = nullptr ) const;
 
     Size QuickGetTextSize( const OutputDevice *pOut, const OUString &rTxt,
-                         const sal_Int32 nIdx, const sal_Int32 nLen, long* pDXArray = nullptr ) const;
+                         const sal_Int32 nIdx, const sal_Int32 nLen, tools::Long* pDXArray = nullptr ) const;
 
     void DrawPrev( OutputDevice* pOut, Printer* pPrinter,
                    const Point &rPos, const OUString &rTxt,
diff --git a/include/editeng/ulspitem.hxx b/include/editeng/ulspitem.hxx
index e6686d658911..b0131ab9904d 100644
--- a/include/editeng/ulspitem.hxx
+++ b/include/editeng/ulspitem.hxx
@@ -57,7 +57,7 @@ public:
                                   OUString &rText, const IntlWrapper& ) const override;
 
     virtual SvxULSpaceItem*      Clone( SfxItemPool *pPool = nullptr ) const override;
-    virtual void                 ScaleMetrics( long nMult, long nDiv ) override;
+    virtual void                 ScaleMetrics( tools::Long nMult, tools::Long nDiv ) override;
     virtual bool                 HasMetrics() const override;
 
     inline void SetUpper( const sal_uInt16 nU, const sal_uInt16 nProp = 100 );