diff options
| author | Oliver Bolte <obo@openoffice.org> | 2003-09-04 10:48:13 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2003-09-04 10:48:13 +0000 |
| commit | 77814fa86289afd5f9ae4904ab2a65c60bf9becb (patch) | |
| tree | 2a523a82da0ce95e9b096db7374845a4d1d10b02 /sw/source/core | |
| parent | 28c3b69f91b79b977e6fc62958bb5b8a8ab1402b (diff) | |
INTEGRATION: CWS geordi2q04 (1.21.106); FILE MERGED
2003/09/02 10:38:08 rt 1.21.106.1: #111934#: Join CWS sw7pp1.
Diffstat (limited to 'sw/source/core')
| -rw-r--r-- | sw/source/core/text/porfly.cxx | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/sw/source/core/text/porfly.cxx b/sw/source/core/text/porfly.cxx index 4ba3ab13a388..2c8beb5e2edb 100644 --- a/sw/source/core/text/porfly.cxx +++ b/sw/source/core/text/porfly.cxx @@ -2,9 +2,9 @@ * * $RCSfile: porfly.cxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: vg $ $Date: 2003-07-04 13:24:36 $ + * last change: $Author: obo $ $Date: 2003-09-04 11:48:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -69,6 +69,9 @@ #include "frmfmt.hxx" // SwFrmFmt #include "viewsh.hxx" +#ifndef _OUTDEV_HXX //autogen +#include <vcl/outdev.hxx> +#endif #ifndef _SVX_LRSPITEM_HXX //autogen #include <svx/lrspitem.hxx> #endif @@ -321,6 +324,10 @@ void SwFlyCntPortion::Paint( const SwTxtPaintInfo &rInf ) const // Baseline-Ausgabe ! // 7922: Bei CompletePaint alles painten SwRect aRepaintRect( rInf.GetPaintRect() ); + + if ( rInf.GetTxtFrm()->IsRightToLeft() ) + rInf.GetTxtFrm()->SwitchLTRtoRTL( aRepaintRect ); + if ( rInf.GetTxtFrm()->IsVertical() ) rInf.GetTxtFrm()->SwitchHorizontalToVertical( aRepaintRect ); @@ -333,7 +340,15 @@ void SwFlyCntPortion::Paint( const SwTxtPaintInfo &rInf ) const if( !GetFlyFrm()->IsCompletePaint() ) aRect._Intersection( aRepaintRect ); - GetFlyFrm()->Paint( aRect ); + + // GetFlyFrm() may change the layout mode at the output device. + { + SwLayoutModeModifier aLayoutModeModifier( *rInf.GetOut() ); + GetFlyFrm()->Paint( aRect ); + } + ((SwTxtPaintInfo&)rInf).GetRefDev()->SetLayoutMode( + rInf.GetOut()->GetLayoutMode() ); + // Es hilft alles nichts, im zeichengebundenen Frame kann wer weiss // was am OutputDevice eingestellt sein, wir muessen unseren Font // wieder hineinselektieren. Dass wir im const stehen, soll uns |