diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-09-08 15:12:01 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-09-08 15:12:01 +0000 |
| commit | 6425c2884d6013a41adbd76728e15832af7a3220 (patch) | |
| tree | 1df78cb7fa173593ad1b81b099af04e9305db2c6 | |
| parent | 5f81d7adcc89b6b6e4f6e73b6e19f685f85075fe (diff) | |
INTEGRATION: CWS pdf01 (1.36.234); FILE MERGED
2004/07/13 07:43:55 fme 1.36.234.3: #i12836# Enhanced pdf export
2004/07/12 10:00:51 fme 1.36.234.2: #i12836# Enhanced pdf export
2004/07/09 12:47:14 fme 1.36.234.1: #i12836# Enhanced pdf export
| -rw-r--r-- | sw/source/core/text/itrpaint.cxx | 34 |
1 files changed, 27 insertions, 7 deletions
diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx index d0aca20add0d..34e26a0bc6c2 100644 --- a/sw/source/core/text/itrpaint.cxx +++ b/sw/source/core/text/itrpaint.cxx @@ -2,9 +2,9 @@ * * $RCSfile: itrpaint.cxx,v $ * - * $Revision: 1.37 $ + * $Revision: 1.38 $ * - * last change: $Author: obo $ $Date: 2004-08-12 12:35:55 $ + * last change: $Author: hr $ $Date: 2004-09-08 16:12:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -121,6 +121,13 @@ #include <tgrditem.hxx> #endif +// --> FME 2004-06-08 #i12836# enhanced pdf export +#ifndef _ENHANCEDPDFEXPORTHELPER_HXX +#include <EnhancedPDFExportHelper.hxx> +#endif +// <-- + + #include "flyfrms.hxx" #include "viewsh.hxx" #include "txtcfg.hxx" @@ -475,10 +482,17 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip, GetInfo().SetUnderFnt( 0 ); } - if( pPor->IsMultiPortion() ) - PaintMultiPortion( rPaint, (SwMultiPortion&)*pPor ); - else - pPor->Paint( GetInfo() ); + { + // --> FME 2004-06-24 #i16816# tagged pdf support + Por_Info aPorInfo( *pPor, *this ); + SwTaggedPDFHelper aTaggedPDFHelper( 0, &aPorInfo, *pOut ); + // <-- + + if( pPor->IsMultiPortion() ) + PaintMultiPortion( rPaint, (SwMultiPortion&)*pPor ); + else + pPor->Paint( GetInfo() ); + } // reset underline font if ( pOldUnderLineFnt ) @@ -496,7 +510,13 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip, if( pPor->IsArrowPortion() && GetInfo().OnWin() && !pArrow ) pArrow = (SwArrowPortion*)pPor; - pPor = !bDrawInWindow && GetInfo().X() > nMaxRight ? 0 : pNext; + pPor = bDrawInWindow || GetInfo().X() <= nMaxRight || + // --> FME 2004-06-24 #i16816# tagged pdf support + ( GetInfo().GetVsh()->GetViewOptions()->IsPDFExport() && + pNext && pNext->IsHolePortion() ) ? + // <-- + pNext : + 0; } // delete underline font |