tools::Long->sal_Int32 in the DX arrays

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

5 files changed, 9 insertions, 9 deletions

diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx
index acf2672be51d..7dc992a8c360 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -263,7 +263,7 @@ namespace cairocanvas
         ::osl::MutexGuard aGuard( m_aMutex );
         setupLayoutMode( rOutDev, mnTextDirection );
 
-        std::vector<tools::Long> aOffsets(maLogicalAdvancements.getLength());
+        std::vector<sal_Int32> aOffsets(maLogicalAdvancements.getLength());
 
         if( maLogicalAdvancements.hasElements() )
             setupTextOffsets( aOffsets.data(), maLogicalAdvancements, viewState, renderState );
@@ -314,7 +314,7 @@ namespace cairocanvas
         };
     }
 
-    void TextLayout::setupTextOffsets( tools::Long*                       outputOffsets,
+    void TextLayout::setupTextOffsets( sal_Int32*                       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 b4159e737e48..3349a9d830e6 100644
--- a/canvas/source/cairo/cairo_textlayout.hxx
+++ b/canvas/source/cairo/cairo_textlayout.hxx
@@ -85,7 +85,7 @@ namespace cairocanvas
                    const css::rendering::ViewState&   viewState,
                    const css::rendering::RenderState& renderState ) const;
 
-        void setupTextOffsets( tools::Long*                                       outputOffsets,
+        void setupTextOffsets( sal_Int32*                          outputOffsets,
                                const css::uno::Sequence< double >& inputOffsets,
                                const css::rendering::ViewState&    viewState,
                                const css::rendering::RenderState&  renderState     ) const;
diff --git a/canvas/source/opengl/ogl_canvashelper.cxx b/canvas/source/opengl/ogl_canvashelper.cxx
index fdd4a7ac541b..b3c79bd4f6e8 100644
--- a/canvas/source/opengl/ogl_canvashelper.cxx
+++ b/canvas/source/opengl/ogl_canvashelper.cxx
@@ -729,7 +729,7 @@ namespace oglcanvas
                 {
                     // create the DXArray
                     const sal_Int32 nLen( aLogicalAdvancements.getLength() );
-                    std::vector<tools::Long> aDXArray(nLen);
+                    std::vector<sal_Int32> aDXArray(nLen);
                     for( sal_Int32 i=0; i<nLen; ++i )
                         aDXArray[i] = basegfx::fround( aLogicalAdvancements[i] );
 
diff --git a/canvas/source/vcl/textlayout.cxx b/canvas/source/vcl/textlayout.cxx
index 1c1f1317b865..b5c2ffce5154 100644
--- a/canvas/source/vcl/textlayout.cxx
+++ b/canvas/source/vcl/textlayout.cxx
@@ -117,7 +117,7 @@ namespace vclcanvas
             uno::Sequence<double>(4),
             rendering::CompositeOperation::SOURCE);
 
-        std::vector<::tools::Long> aOffsets(maLogicalAdvancements.getLength());
+        std::vector<sal_Int32> aOffsets(maLogicalAdvancements.getLength());
         setupTextOffsets(aOffsets.data(), maLogicalAdvancements, aViewState, aRenderState);
 
         std::vector< uno::Reference< rendering::XPolyPolygon2D> > aOutlineSequence;
@@ -165,7 +165,7 @@ namespace vclcanvas
             uno::Sequence<double>(4),
             rendering::CompositeOperation::SOURCE);
 
-        std::unique_ptr< ::tools::Long []> aOffsets(new ::tools::Long[maLogicalAdvancements.getLength()]);
+        std::unique_ptr< sal_Int32 []> aOffsets(new sal_Int32[maLogicalAdvancements.getLength()]);
         setupTextOffsets(aOffsets.get(), maLogicalAdvancements, aViewState, aRenderState);
 
         std::vector< ::tools::Rectangle > aMetricVector;
@@ -335,7 +335,7 @@ namespace vclcanvas
         if( maLogicalAdvancements.hasElements() )
         {
             // TODO(P2): cache that
-            std::vector<::tools::Long> aOffsets(maLogicalAdvancements.getLength());
+            std::vector<sal_Int32> aOffsets(maLogicalAdvancements.getLength());
             setupTextOffsets( aOffsets.data(), maLogicalAdvancements, viewState, renderState );
 
             // TODO(F3): ensure correct length and termination for DX
@@ -388,7 +388,7 @@ namespace vclcanvas
         };
     }
 
-    void TextLayout::setupTextOffsets( ::tools::Long*                       outputOffsets,
+    void TextLayout::setupTextOffsets( sal_Int32*                       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 43853740588b..6471aa5a67d1 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( ::tools::Long* outputOffsets,
+        void setupTextOffsets( sal_Int32* outputOffsets,
                                const css::uno::Sequence< double >& inputOffsets,
                                const css::rendering::ViewState&    viewState,
                                const css::rendering::RenderState&  renderState     ) const;