From 387a88fa252990ded26ee7ea6b89b11be7616986 Mon Sep 17 00:00:00 2001
From: Noel <noelgrandin@gmail.com>
Date: Wed, 21 Oct 2020 09:29:45 +0200
Subject: use tools::Long in basegfx..chart2

Change-Id: Ide4014348d51f0b5f59e1e91b8d41c7748853254
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104608
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 canvas/source/cairo/cairo_canvasfont.cxx   | 2 +-
 canvas/source/cairo/cairo_canvashelper.cxx | 4 ++--
 canvas/source/cairo/cairo_textlayout.cxx   | 2 +-
 canvas/source/cairo/cairo_textlayout.hxx   | 2 +-
 canvas/source/vcl/canvasfont.cxx           | 2 +-
 canvas/source/vcl/spritehelper.cxx         | 2 +-
 canvas/source/vcl/textlayout.cxx           | 2 +-
 canvas/source/vcl/textlayout.hxx           | 2 +-
 canvas/workben/canvasdemo.cxx              | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'canvas')

diff --git a/canvas/source/cairo/cairo_canvasfont.cxx b/canvas/source/cairo/cairo_canvasfont.cxx
index 6ba15411c9aa..cca052d167e0 100644
--- a/canvas/source/cairo/cairo_canvasfont.cxx
+++ b/canvas/source/cairo/cairo_canvasfont.cxx
@@ -78,7 +78,7 @@ namespace cairocanvas
         if( !::basegfx::fTools::equalZero( fDividend) )
             fStretch /= fDividend;
 
-        const long nNewWidth = ::basegfx::fround( aSize.Width() * fStretch );
+        const tools::Long nNewWidth = ::basegfx::fround( aSize.Width() * fStretch );
 
         maFont->SetAverageFontWidth( nNewWidth );
 
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx
index 0ca169ca1fe4..7d4cdba478f4 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -360,8 +360,8 @@ namespace cairocanvas
 
             if( !pSurface )
             {
-                long nWidth;
-                long nHeight;
+                tools::Long nWidth;
+                tools::Long nHeight;
                 vcl::bitmap::CanvasCairoExtractBitmapData(aBmpEx, aBitmap, data, bHasAlpha, nWidth, nHeight);
 
                 SurfaceSharedPtr pImageSurface = rSurfaceProvider->getOutputDevice()->CreateSurface(
diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx
index d81a739b4956..3d4b9ca5a7c3 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -324,7 +324,7 @@ namespace cairocanvas
         };
     }
 
-    void TextLayout::setupTextOffsets( long*                       outputOffsets,
+    void TextLayout::setupTextOffsets( tools::Long*                       outputOffsets,
                                        const uno::Sequence< double >&   inputOffsets,
                                        const rendering::ViewState&      viewState,
                                        const rendering::RenderState&    renderState     ) const
diff --git a/canvas/source/cairo/cairo_textlayout.hxx b/canvas/source/cairo/cairo_textlayout.hxx
index a2ca8c93afbb..b2e5c72d0b53 100644
--- a/canvas/source/cairo/cairo_textlayout.hxx
+++ b/canvas/source/cairo/cairo_textlayout.hxx
@@ -86,7 +86,7 @@ namespace cairocanvas
                    const css::rendering::ViewState&   viewState,
                    const css::rendering::RenderState& renderState ) const;
 
-        void setupTextOffsets( long*                                       outputOffsets,
+        void setupTextOffsets( tools::Long*                                       outputOffsets,
                                const css::uno::Sequence< double >& inputOffsets,
                                const css::rendering::ViewState&    viewState,
                                const css::rendering::RenderState&  renderState     ) const;
diff --git a/canvas/source/vcl/canvasfont.cxx b/canvas/source/vcl/canvasfont.cxx
index 173203a85bdf..e7fab0492549 100644
--- a/canvas/source/vcl/canvasfont.cxx
+++ b/canvas/source/vcl/canvasfont.cxx
@@ -78,7 +78,7 @@ namespace vclcanvas
             if( !::basegfx::fTools::equalZero( fDividend) )
                 fStretch /= fDividend;
 
-            const long nNewWidth = ::basegfx::fround( aSize.Width() * fStretch );
+            const ::tools::Long nNewWidth = ::basegfx::fround( aSize.Width() * fStretch );
 
             maFont->SetAverageFontWidth( nNewWidth );
 
diff --git a/canvas/source/vcl/spritehelper.cxx b/canvas/source/vcl/spritehelper.cxx
index 14be26c2aa6c..96300101b5ae 100644
--- a/canvas/source/vcl/spritehelper.cxx
+++ b/canvas/source/vcl/spritehelper.cxx
@@ -325,7 +325,7 @@ namespace vclcanvas
 
         // paint sprite prio
         vcl::Font aVCLFont;
-        aVCLFont.SetFontHeight( std::min(long(20),aOutputSize.Height()) );
+        aVCLFont.SetFontHeight( std::min(::tools::Long(20),aOutputSize.Height()) );
         aVCLFont.SetColor( COL_RED );
 
         rTargetSurface.SetTextAlign(ALIGN_TOP);
diff --git a/canvas/source/vcl/textlayout.cxx b/canvas/source/vcl/textlayout.cxx
index ab4a0084dc89..0e64c8f8a255 100644
--- a/canvas/source/vcl/textlayout.cxx
+++ b/canvas/source/vcl/textlayout.cxx
@@ -388,7 +388,7 @@ namespace vclcanvas
         };
     }
 
-    void TextLayout::setupTextOffsets( long*                       outputOffsets,
+    void TextLayout::setupTextOffsets( ::tools::Long*                       outputOffsets,
                                        const uno::Sequence< double >&   inputOffsets,
                                        const rendering::ViewState&      viewState,
                                        const rendering::RenderState&    renderState     ) const
diff --git a/canvas/source/vcl/textlayout.hxx b/canvas/source/vcl/textlayout.hxx
index b3c9acdb7de6..43853740588b 100644
--- a/canvas/source/vcl/textlayout.hxx
+++ b/canvas/source/vcl/textlayout.hxx
@@ -85,7 +85,7 @@ namespace vclcanvas
                    const css::rendering::RenderState&              renderState ) const;
 
     private:
-        void setupTextOffsets( long* outputOffsets,
+        void setupTextOffsets( ::tools::Long* outputOffsets,
                                const css::uno::Sequence< double >& inputOffsets,
                                const css::rendering::ViewState&    viewState,
                                const css::rendering::RenderState&  renderState     ) const;
diff --git a/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx
index 233f0ff3e7d8..4854a07d1ace 100644
--- a/canvas/workben/canvasdemo.cxx
+++ b/canvas/workben/canvasdemo.cxx
@@ -131,7 +131,7 @@ class DemoRenderer
 
         void drawGrid()
         {
-            long d, dIncr = maSize.Width() / 3;
+            tools::Long d, dIncr = maSize.Width() / 3;
             for ( d = 0; d <= maSize.Width(); d += dIncr )
                 mxCanvas->drawLine( geometry::RealPoint2D( d, 0 ),
                                     geometry::RealPoint2D( d, maSize.Height() ),
-- 
cgit