diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-07-18 18:21:12 +0200 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-07-20 22:10:59 +0200 |
| commit | cd3d26b7edbce67805259a71e4118223e02ebdd4 (patch) | |
| tree | fbb103d9877275f80eab075f22a8e0753fccf151 /filter/source/flash | |
| parent | 8e21a02520cbd2fdc09df1ca675f4aa46a02d5f6 (diff) | |
vcl consitent use of long for corrdinate
most of length in vcl are calculated in 'long'
but array of X position tend to be in sal_Int32.
As a prep work to be able to support 'double'
as the base type of Device Coordinate, harmonize
the use of 'long' for non-float coordinate.
Change-Id: I7cb33301ff6a5e2c62247b36a4e07e168a58a323
Diffstat (limited to 'filter/source/flash')
| -rw-r--r-- | filter/source/flash/swfwriter.hxx | 4 | ||||
| -rw-r--r-- | filter/source/flash/swfwriter1.cxx | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/filter/source/flash/swfwriter.hxx b/filter/source/flash/swfwriter.hxx index 4c31000dd4e8..7b3161fcaac8 100644 --- a/filter/source/flash/swfwriter.hxx +++ b/filter/source/flash/swfwriter.hxx @@ -345,8 +345,8 @@ private: void Impl_writePolygon( const Polygon& rPoly, bool bFilled, const Color& rFillColor, const Color& rLineColor ); void Impl_writePolyPolygon( const PolyPolygon& rPolyPoly, bool bFilled, sal_uInt8 nTransparence = 0); void Impl_writePolyPolygon( const PolyPolygon& rPolyPoly, bool bFilled, const Color& rFillColor, const Color& rLineColor ); - void Impl_writeText( const Point& rPos, const OUString& rText, const sal_Int32* pDXArray, long nWidth ); - void Impl_writeText( const Point& rPos, const OUString& rText, const sal_Int32* pDXArray, long nWidth, Color aTextColor ); + void Impl_writeText( const Point& rPos, const OUString& rText, const long* pDXArray, long nWidth ); + void Impl_writeText( const Point& rPos, const OUString& rText, const long* pDXArray, long nWidth, Color aTextColor ); void Impl_writeGradientEx( const PolyPolygon& rPolyPoly, const Gradient& rGradient ); void Impl_writeLine( const Point& rPt1, const Point& rPt2, const Color* pLineColor = NULL ); void Impl_writeRect( const Rectangle& rRect, long nRadX, long nRadY ); diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx index 9ea53e5bf819..dedcb983d14d 100644 --- a/filter/source/flash/swfwriter1.cxx +++ b/filter/source/flash/swfwriter1.cxx @@ -403,7 +403,7 @@ FlashFont& Writer::Impl_getFont( const Font& rFont ) -void Writer::Impl_writeText( const Point& rPos, const OUString& rText, const sal_Int32* pDXArray, long nWidth ) +void Writer::Impl_writeText( const Point& rPos, const OUString& rText, const long* pDXArray, long nWidth ) { const FontMetric aMetric( mpVDev->GetFontMetric() ); @@ -491,7 +491,7 @@ void Writer::Impl_writeText( const Point& rPos, const OUString& rText, const sal } } -void Writer::Impl_writeText( const Point& rPos, const OUString& rText, const sal_Int32* pDXArray, long nWidth, Color aTextColor ) +void Writer::Impl_writeText( const Point& rPos, const OUString& rText, const long* pDXArray, long nWidth, Color aTextColor ) { sal_Int32 nLen = rText.getLength(); @@ -524,18 +524,18 @@ void Writer::Impl_writeText( const Point& rPos, const OUString& rText, const sal else { Size aNormSize; - boost::scoped_array<sal_Int32> pOwnArray; - sal_Int32* pDX; + boost::scoped_array<long> pOwnArray; + long* pDX; // get text sizes if( pDXArray ) { aNormSize = Size( mpVDev->GetTextWidth( rText ), 0 ); - pDX = (sal_Int32*) pDXArray; + pDX = (long*) pDXArray; } else { - pOwnArray.reset(new sal_Int32[ nLen ]); + pOwnArray.reset(new long[ nLen ]); aNormSize = Size( mpVDev->GetTextArray( rText, pOwnArray.get() ), 0 ); pDX = pOwnArray.get(); } |