diff options
| -rw-r--r-- | canvas/source/cairo/cairo_textlayout.cxx | 16 | ||||
| -rw-r--r-- | svtools/source/filter.vcl/jpeg/jpeg.cxx | 4 | ||||
| -rw-r--r-- | svtools/source/filter.vcl/jpeg/jpegc.c | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx index 725a6ae0f2a6..7556e76fba42 100644 --- a/canvas/source/cairo/cairo_textlayout.cxx +++ b/canvas/source/cairo/cairo_textlayout.cxx @@ -214,8 +214,8 @@ namespace cairocanvas return geometry::RealRectangle2D( 0, nAboveBaseline, aVDev.GetTextWidth( maText.Text, - ::canvas::tools::numeric_cast<USHORT>(maText.StartPosition), - ::canvas::tools::numeric_cast<USHORT>(maText.Length) ), + ::canvas::tools::numeric_cast<sal_uInt16>(maText.StartPosition), + ::canvas::tools::numeric_cast<sal_uInt16>(maText.Length) ), nBelowBaseline ); } } @@ -404,8 +404,8 @@ namespace cairocanvas } aSysLayoutData = rOutDev.GetSysTextLayoutData(rOutpos, maText.Text, - ::canvas::tools::numeric_cast<USHORT>(maText.StartPosition), - ::canvas::tools::numeric_cast<USHORT>(maText.Length), + ::canvas::tools::numeric_cast<sal_uInt16>(maText.StartPosition), + ::canvas::tools::numeric_cast<sal_uInt16>(maText.Length), maLogicalAdvancements.getLength() ? aOffsets.get() : NULL); // Sort them so that all glyphs on the same glyph fallback level are consecutive @@ -446,15 +446,15 @@ namespace cairocanvas if (maLogicalAdvancements.getLength()) // VCL FALLBACK - with glyph advances { rOutDev.DrawTextArray( rOutpos, maText.Text, aOffsets.get(), - ::canvas::tools::numeric_cast<USHORT>(maText.StartPosition), - ::canvas::tools::numeric_cast<USHORT>(maText.Length) ); + ::canvas::tools::numeric_cast<sal_uInt16>(maText.StartPosition), + ::canvas::tools::numeric_cast<sal_uInt16>(maText.Length) ); return true; } else // VCL FALLBACK - without advances { rOutDev.DrawText( rOutpos, maText.Text, - ::canvas::tools::numeric_cast<USHORT>(maText.StartPosition), - ::canvas::tools::numeric_cast<USHORT>(maText.Length) ); + ::canvas::tools::numeric_cast<sal_uInt16>(maText.StartPosition), + ::canvas::tools::numeric_cast<sal_uInt16>(maText.Length) ); return true; } } diff --git a/svtools/source/filter.vcl/jpeg/jpeg.cxx b/svtools/source/filter.vcl/jpeg/jpeg.cxx index dff6ec8ff51f..da1edf8449e4 100644 --- a/svtools/source/filter.vcl/jpeg/jpeg.cxx +++ b/svtools/source/filter.vcl/jpeg/jpeg.cxx @@ -34,8 +34,8 @@ extern "C" { #include "stdio.h" #include "jpeg.h" - #include "jpeglib.h" - #include "jerror.h" + #include "jpeg/jpeglib.h" + #include "jpeg/jerror.h" } #define _JPEGPRIVATE diff --git a/svtools/source/filter.vcl/jpeg/jpegc.c b/svtools/source/filter.vcl/jpeg/jpegc.c index 8d3a82a86ef3..b51d37a4a163 100644 --- a/svtools/source/filter.vcl/jpeg/jpegc.c +++ b/svtools/source/filter.vcl/jpeg/jpegc.c @@ -28,8 +28,8 @@ #include <stdio.h> #include <stdlib.h> #include "setjmp.h" -#include "jpeglib.h" -#include "jerror.h" +#include "jpeg/jpeglib.h" +#include "jpeg/jerror.h" #include "jpeg.h" #include "rtl/alloc.h" #include "osl/diagnose.h" |