diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-07-14 09:41:18 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-07-14 09:41:18 +0000 |
| commit | 41163c3705ba4360ad1fb8c24070cf9248545d83 (patch) | |
| tree | 82e5538953da5daa0689116eac864c95164ebdec /svtools | |
| parent | e30710fb4780456ccbb7250dc5bff33377314d49 (diff) | |
INTEGRATION: CWS impress61 (1.23.356); FILE MERGED
2005/06/30 09:16:23 sj 1.23.356.1: #i37215# fixed a rtl bug
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/filter.vcl/wmf/winwmf.cxx | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/svtools/source/filter.vcl/wmf/winwmf.cxx b/svtools/source/filter.vcl/wmf/winwmf.cxx index 500c365c3438..c18422ea37f5 100644 --- a/svtools/source/filter.vcl/wmf/winwmf.cxx +++ b/svtools/source/filter.vcl/wmf/winwmf.cxx @@ -2,9 +2,9 @@ * * $RCSfile: winwmf.cxx,v $ * - * $Revision: 1.23 $ + * $Revision: 1.24 $ * - * last change: $Author: rt $ $Date: 2004-08-20 11:47:40 $ + * last change: $Author: kz $ $Date: 2005-07-14 10:41:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -448,11 +448,18 @@ void WMFReader::ReadRecordParams( USHORT nFunction ) pWMF->SeekRel(2); aPosition = ReadYX(); *pWMF >> nLen >> nOptions; + + sal_Int32 nTextLayoutMode = TEXT_LAYOUT_DEFAULT; + if ( nOptions & ETO_RTLREADING ) + nTextLayoutMode = TEXT_LAYOUT_BIDI_RTL | TEXT_LAYOUT_TEXTORIGIN_LEFT; + pOut->SetTextLayoutMode( nTextLayoutMode ); + DBG_ASSERT( ( nOptions & ( ETO_PDY | ETO_GLYPH_INDEX ) ) == 0, "SJ: ETO_PDY || ETO_GLYPH_INDEX in WMF" ); + // Nur wenn der Text auch Zeichen enthaelt, macht die Ausgabe Sinn if( nLen ) { nOriginalTextLen = nLen; - if( nOptions ) + if( nOptions & ETO_CLIPPED ) { const Point aPt1( ReadPoint() ); const Point aPt2( ReadPoint() ); |