diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-01-29 07:05:04 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-01-29 07:05:04 +0000 |
| commit | a63be2ebc5f4f05ab17fdf8337eb8f2f1bda17a8 (patch) | |
| tree | f92890875d6b08b16e8ad60be219028b6bb1b267 | |
| parent | b78b839dc36ed120752c277a6a2ac638de9aa8e7 (diff) | |
INTEGRATION: CWS thbpp10 (1.18.20); FILE MERGED
2008/01/14 14:55:16 thb 1.18.20.1: #i82103# Fix underline text on hyperlinks - patch courtesy of liujianli
| -rw-r--r-- | cppcanvas/source/mtfrenderer/textaction.cxx | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx index 887690b63cd1..e48642bd3eff 100644 --- a/cppcanvas/source/mtfrenderer/textaction.cxx +++ b/cppcanvas/source/mtfrenderer/textaction.cxx @@ -4,9 +4,9 @@ * * $RCSfile: textaction.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: obo $ $Date: 2007-01-22 11:51:50 $ + * last change: $Author: vg $ $Date: 2008-01-29 08:05:04 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1444,11 +1444,12 @@ namespace cppcanvas RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::EffectTextArrayAction::render( subset )" ); RTL_LOGFILE_CONTEXT_TRACE1( aLog, "::cppcanvas::internal::EffectTextArrayAction: 0x%X", this ); - rendering::RenderState aLocalState( maState ); - uno::Reference< rendering::XTextLayout > xTextLayout( mxTextLayout ); + rendering::RenderState aLocalState( maState ); + uno::Reference< rendering::XTextLayout > xTextLayout( mxTextLayout ); + const geometry::RealRectangle2D aTextBounds( mxTextLayout->queryTextBounds() ); double nMinPos(0.0); - double nMaxPos(0.0); + double nMaxPos(aTextBounds.X2 - aTextBounds.X1); createSubsetLayout( xTextLayout, aLocalState, @@ -1514,11 +1515,12 @@ namespace cppcanvas RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::EffectTextArrayAction::getBounds( subset )" ); RTL_LOGFILE_CONTEXT_TRACE1( aLog, "::cppcanvas::internal::EffectTextArrayAction: 0x%X", this ); - rendering::RenderState aLocalState( maState ); - uno::Reference< rendering::XTextLayout > xTextLayout( mxTextLayout ); + rendering::RenderState aLocalState( maState ); + uno::Reference< rendering::XTextLayout > xTextLayout( mxTextLayout ); + const geometry::RealRectangle2D aTextBounds( mxTextLayout->queryTextBounds() ); double nMinPos(0.0); - double nMaxPos(0.0); + double nMaxPos(aTextBounds.X2 - aTextBounds.X1); createSubsetLayout( xTextLayout, aLocalState, |