diff options
| author | Noel <noelgrandin@gmail.com> | 2020-10-28 09:15:54 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-10-28 12:03:48 +0100 |
| commit | 7a09d67e1c76db7cb6a87a2ceaa6de7325342b75 (patch) | |
| tree | b768459ca830b343a3c53d1cea8b80de328ee1fb /canvas | |
| parent | 49a39d1abccc61b6dace3e92059ae50a6a2c298d (diff) | |
convert some more long -> tools::Long
Change-Id: Ide9811c1a7582454b3fcf655b70ea106ed56509a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104914
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/source/cairo/cairo_textlayout.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/vcl/textlayout.cxx | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx index 3d4b9ca5a7c3..b7235b30d3c1 100644 --- a/canvas/source/cairo/cairo_textlayout.cxx +++ b/canvas/source/cairo/cairo_textlayout.cxx @@ -273,7 +273,7 @@ namespace cairocanvas ::osl::MutexGuard aGuard( m_aMutex ); setupLayoutMode( rOutDev, mnTextDirection ); - std::unique_ptr< long []> aOffsets(new long[maLogicalAdvancements.getLength()]); + std::unique_ptr< tools::Long []> aOffsets(new tools::Long[maLogicalAdvancements.getLength()]); if( maLogicalAdvancements.hasElements() ) setupTextOffsets( aOffsets.get(), maLogicalAdvancements, viewState, renderState ); diff --git a/canvas/source/vcl/textlayout.cxx b/canvas/source/vcl/textlayout.cxx index 0e64c8f8a255..2a0e1fec1a70 100644 --- a/canvas/source/vcl/textlayout.cxx +++ b/canvas/source/vcl/textlayout.cxx @@ -21,7 +21,7 @@ #include <sal/config.h> #include <tools/diagnose_ex.h> - +#include <tools/long.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/numeric/ftools.hxx> #include <basegfx/utils/canvastools.hxx> @@ -118,7 +118,7 @@ namespace vclcanvas uno::Sequence<double>(4), rendering::CompositeOperation::SOURCE); - std::unique_ptr< long []> aOffsets(new long[maLogicalAdvancements.getLength()]); + std::unique_ptr< ::tools::Long []> aOffsets(new ::tools::Long[maLogicalAdvancements.getLength()]); setupTextOffsets(aOffsets.get(), maLogicalAdvancements, aViewState, aRenderState); std::vector< uno::Reference< rendering::XPolyPolygon2D> > aOutlineSequence; @@ -166,7 +166,7 @@ namespace vclcanvas uno::Sequence<double>(4), rendering::CompositeOperation::SOURCE); - std::unique_ptr< long []> aOffsets(new long[maLogicalAdvancements.getLength()]); + std::unique_ptr< ::tools::Long []> aOffsets(new ::tools::Long[maLogicalAdvancements.getLength()]); setupTextOffsets(aOffsets.get(), maLogicalAdvancements, aViewState, aRenderState); MetricVector aMetricVector; @@ -335,7 +335,7 @@ namespace vclcanvas if( maLogicalAdvancements.hasElements() ) { // TODO(P2): cache that - std::unique_ptr< long []> aOffsets(new long[maLogicalAdvancements.getLength()]); + std::unique_ptr< ::tools::Long []> aOffsets(new ::tools::Long[maLogicalAdvancements.getLength()]); setupTextOffsets( aOffsets.get(), maLogicalAdvancements, viewState, renderState ); // TODO(F3): ensure correct length and termination for DX |