From bc413e15fae3672f580894a3cd7b077d533d8e6c Mon Sep 17 00:00:00 2001
From: Noel Grandin <noelgrandin@gmail.com>
Date: Sat, 30 Oct 2021 11:03:48 +0200
Subject: 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>
---
 vcl/source/gdi/metaact.cxx        | 6 +++---
 vcl/source/gdi/pdfwriter.cxx      | 2 +-
 vcl/source/gdi/pdfwriter_impl.cxx | 2 +-
 vcl/source/gdi/textlayout.cxx     | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'vcl/source/gdi')

diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 191c5c05539c..0135afd9d626 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -606,7 +606,7 @@ MetaTextArrayAction::MetaTextArrayAction( const MetaTextArrayAction& rAction ) :
 
 MetaTextArrayAction::MetaTextArrayAction( const Point& rStartPt,
                                           const OUString& rStr,
-                                          const std::vector<tools::Long>& rDXAry,
+                                          const std::vector<sal_Int32>& rDXAry,
                                           sal_Int32 nIndex,
                                           sal_Int32 nLen ) :
     MetaAction  ( MetaActionType::TEXTARRAY ),
@@ -620,7 +620,7 @@ MetaTextArrayAction::MetaTextArrayAction( const Point& rStartPt,
 
 MetaTextArrayAction::MetaTextArrayAction( const Point& rStartPt,
                                           const OUString& rStr,
-                                          o3tl::span<const tools::Long> pDXAry,
+                                          o3tl::span<const sal_Int32> pDXAry,
                                           sal_Int32 nIndex,
                                           sal_Int32 nLen ) :
     MetaAction  ( MetaActionType::TEXTARRAY ),
@@ -662,7 +662,7 @@ void MetaTextArrayAction::Scale( double fScaleX, double fScaleY )
     }
 }
 
-void MetaTextArrayAction::SetDXArray(std::vector<tools::Long> aArray)
+void MetaTextArrayAction::SetDXArray(std::vector<sal_Int32> aArray)
 {
     maDXAry = std::move(aArray);
 }
diff --git a/vcl/source/gdi/pdfwriter.cxx b/vcl/source/gdi/pdfwriter.cxx
index 2130b0fc30f7..f26f6c31705b 100644
--- a/vcl/source/gdi/pdfwriter.cxx
+++ b/vcl/source/gdi/pdfwriter.cxx
@@ -81,7 +81,7 @@ void PDFWriter::DrawTextLine(
 void PDFWriter::DrawTextArray(
                               const Point& rStartPt,
                               const OUString& rStr,
-                              o3tl::span<const tools::Long> pDXAry,
+                              o3tl::span<const sal_Int32> pDXAry,
                               sal_Int32 nIndex,
                               sal_Int32 nLen )
 {
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index ef77b6b691f6..6aa8cb0eec73 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -6500,7 +6500,7 @@ void PDFWriterImpl::drawText( const Point& rPos, const OUString& rText, sal_Int3
     }
 }
 
-void PDFWriterImpl::drawTextArray( const Point& rPos, const OUString& rText, o3tl::span<const tools::Long> pDXArray, sal_Int32 nIndex, sal_Int32 nLen )
+void PDFWriterImpl::drawTextArray( const Point& rPos, const OUString& rText, o3tl::span<const sal_Int32> pDXArray, sal_Int32 nIndex, sal_Int32 nLen )
 {
     MARK( "drawText with array" );
 
diff --git a/vcl/source/gdi/textlayout.cxx b/vcl/source/gdi/textlayout.cxx
index 6fdd0d72ffb8..760dba073750 100644
--- a/vcl/source/gdi/textlayout.cxx
+++ b/vcl/source/gdi/textlayout.cxx
@@ -86,7 +86,7 @@ namespace vcl
         tools::Rectangle   GetTextRect( const tools::Rectangle& _rRect, const OUString& _rText, DrawTextFlags _nStyle, Size* o_pDeviceSize );
 
     private:
-        tools::Long        GetTextArray( const OUString& _rText, std::vector<tools::Long>* _pDXAry, sal_Int32 _nStartIndex, sal_Int32 _nLength ) const;
+        tools::Long        GetTextArray( const OUString& _rText, std::vector<sal_Int32>* _pDXAry, sal_Int32 _nStartIndex, sal_Int32 _nLength ) const;
 
         OutputDevice&   m_rTargetDevice;
         OutputDevice&   m_rReferenceDevice;
@@ -159,7 +159,7 @@ namespace vcl
         }
     }
 
-    tools::Long ReferenceDeviceTextLayout::GetTextArray( const OUString& _rText, std::vector<tools::Long>* _pDXAry, sal_Int32 _nStartIndex, sal_Int32 _nLength ) const
+    tools::Long ReferenceDeviceTextLayout::GetTextArray( const OUString& _rText, std::vector<sal_Int32>* _pDXAry, sal_Int32 _nStartIndex, sal_Int32 _nLength ) const
     {
         if ( !lcl_normalizeLength( _rText, _nStartIndex, _nLength ) )
             return 0;
@@ -207,7 +207,7 @@ namespace vcl
             return;
         }
 
-        std::vector<tools::Long> aCharWidths;
+        std::vector<sal_Int32> aCharWidths;
         tools::Long nTextWidth = GetTextArray( _rText, &aCharWidths, _nStartIndex, _nLength );
         m_rTargetDevice.DrawTextArray( _rStartPoint, _rText, { aCharWidths.data(), aCharWidths.size() }, _nStartIndex, _nLength );
 
-- 
cgit