diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-07-14 07:44:41 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-07-14 07:44:41 +0000 |
| commit | b0275d35ed495dda084ca5114a419a31f08d0b49 (patch) | |
| tree | 8d602fe877b6a8fff00db25d0a2e88972626af34 /svx/source/svrtf | |
| parent | 8482074d9fe629aedf7e69871ebf45763d5991cf (diff) | |
INTEGRATION: CWS tl21 (1.26.282); FILE MERGED
2006/06/12 14:30:59 tl 1.26.282.1: #i66167# font size problem when pasting (importing rtf) from sw to sd fixed
Diffstat (limited to 'svx/source/svrtf')
| -rw-r--r-- | svx/source/svrtf/rtfitem.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/svx/source/svrtf/rtfitem.cxx b/svx/source/svrtf/rtfitem.cxx index 68d8008d885d..ef847e2b5942 100644 --- a/svx/source/svrtf/rtfitem.cxx +++ b/svx/source/svrtf/rtfitem.cxx @@ -4,9 +4,9 @@ * * $RCSfile: rtfitem.cxx,v $ * - * $Revision: 1.27 $ + * $Revision: 1.28 $ * - * last change: $Author: hr $ $Date: 2006-06-19 16:49:21 $ + * last change: $Author: obo $ $Date: 2006-07-14 08:44:41 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -779,8 +779,12 @@ SET_FONTALIGNMENT: nTokenValue = 240; else nTokenValue *= 10; - if( IsCalcValue() ) - CalcValue(); +// #i66167# +// for the SwRTFParser 'IsCalcValue' will be false and for the EditRTFParser +// the converiosn takes now place in EditRTFParser since for other reasons +// the wrong MapUnit might still be use there +// if( IsCalcValue() ) +// CalcValue(); SvxFontHeightItem aTmpItem( (const USHORT)nTokenValue, 100, SID_ATTR_CHAR_FONTHEIGHT ); |