diff options
| author | Herbert Duerr <hdu@openoffice.org> | 2002-05-08 11:30:51 +0000 |
|---|---|---|
| committer | Herbert Duerr <hdu@openoffice.org> | 2002-05-08 11:30:51 +0000 |
| commit | 80ff4bc9657d8d37e254ac039a3bf99c7e5651ab (patch) | |
| tree | cbc3c6950582c3aa95f548131815fe613644923e /vcl | |
| parent | 8078597bcde7a3f291961e9d105438263d4f7c8f (diff) | |
#99076# fix CTL rotated text
Diffstat (limited to 'vcl')
| -rwxr-xr-x | vcl/source/gdi/sallayout.cxx | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx index 02690d568086..f35878192cf3 100755 --- a/vcl/source/gdi/sallayout.cxx +++ b/vcl/source/gdi/sallayout.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sallayout.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: hdu $ $Date: 2002-04-22 17:21:54 $ + * last change: $Author: hdu $ $Date: 2002-05-08 12:30:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -161,13 +161,13 @@ Point SalLayout::GetDrawPosition( const Point& rRelative ) const nOldOrientation = mnOrientation; double fRad = mnOrientation * (M_PI / 1800.0); fCos = cos( fRad ); - fSin = cos( fRad ); + fSin = sin( fRad ); } long nX0 = rRelative.X(); long nY0 = rRelative.Y(); - long nX = static_cast<long>( +fCos * nX0 - fSin * nY0 ); - long nY = static_cast<long>( +fCos * nY0 + fSin * nX0 ); + long nX = static_cast<long>( +fCos * nX0 + fSin * nY0 ); + long nY = static_cast<long>( +fCos * nY0 - fSin * nX0 ); aPos += Point( nX, nY ); } @@ -514,8 +514,7 @@ int GenericSalLayout::GetNextGlyphs( int nLen, long* pGlyphs, Point& rPos, // ----------------------------------------------------------------------- -#if 0 -SalLayout* GenericSalLayout::ExtractLayout( int nXorFlags, int nAndFlags ) +GenericSalLayout* GenericSalLayout::ExtractLayout( int nXorFlags, int nAndFlags ) { int nNewSize = 0; int nUsableSize = 0; @@ -532,7 +531,7 @@ SalLayout* GenericSalLayout::ExtractLayout( int nXorFlags, int nAndFlags ) ++nNewSize; } - SalLayout* pDstLayout = NULL; + GenericSalLayout* pDstLayout = NULL; if( !nNewSize ) return NULL; @@ -545,7 +544,7 @@ SalLayout* GenericSalLayout::ExtractLayout( int nXorFlags, int nAndFlags ) /*### else { - pDstLayout = new SalLayout( nNewSize ); + pDstLayout = new GenericSalLayout( nNewSize ); bool bWantFallback = false; if( nNewSize > 0 ) { @@ -578,11 +577,9 @@ SalLayout* GenericSalLayout::ExtractLayout( int nXorFlags, int nAndFlags ) return pDstLayout; } -#endif // ----------------------------------------------------------------------- -#if 0 void GenericSalLayout::MergeLayout( int nFlags, const GenericSalLayout& rSalLayout ) { GlyphItem* pG = mpGlyphItems; @@ -606,6 +603,5 @@ void GenericSalLayout::MergeLayout( int nFlags, const GenericSalLayout& rSalLayo } } } -#endif // ======================================================================= |