diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-02-26 14:32:42 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-02-26 14:32:42 +0000 |
| commit | 97e2f2f50fed3e8902555dfd3bb18372b06cf68a (patch) | |
| tree | 3f4bffc3c697d7218b97e6e451dc08d3a255b5b3 /sw/source/core/text/pormulti.cxx | |
| parent | ef112543074d257aef154f91980885c435058b37 (diff) | |
INTEGRATION: CWS hiddentext (1.77.56); FILE MERGED
2004/01/12 09:03:17 fme 1.77.56.2: RESYNC: (1.77-1.78); FILE MERGED
2003/12/16 15:46:40 fme 1.77.56.1: #i20197# Hidden text attribute
Diffstat (limited to 'sw/source/core/text/pormulti.cxx')
| -rw-r--r-- | sw/source/core/text/pormulti.cxx | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx index b71dcbf4dd94..c6ee72c5d3c3 100644 --- a/sw/source/core/text/pormulti.cxx +++ b/sw/source/core/text/pormulti.cxx @@ -2,9 +2,9 @@ * * $RCSfile: pormulti.cxx,v $ * - * $Revision: 1.78 $ + * $Revision: 1.79 $ * - * last change: $Author: rt $ $Date: 2003-12-01 17:22:56 $ + * last change: $Author: kz $ $Date: 2004-02-26 15:32:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1008,14 +1008,9 @@ sal_Bool lcl_HasRotation( const SwTxtAttr& rAttr, return sal_False; } -#ifdef BIDI SwMultiCreator* SwTxtSizeInfo::GetMultiCreator( xub_StrLen &rPos, SwMultiPortion* pMulti ) const -#else -SwMultiCreator* SwTxtSizeInfo::GetMultiCreator( xub_StrLen &rPos ) const -#endif { -#ifdef BIDI SwScriptInfo& rSI = ((SwParaPortion*)GetParaPortion())->GetScriptInfo(); // get the last embedding level @@ -1073,7 +1068,6 @@ SwMultiCreator* SwTxtSizeInfo::GetMultiCreator( xub_StrLen &rPos ) const // a bidi portion can only contain other bidi portions if ( pMulti ) return NULL; -#endif const SvxCharRotateItem* pRotate = NULL; const SfxPoolItem* pRotItem; |