summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorAndreas Martens <ama@openoffice.org>2000-11-14 07:21:35 +0000
committerAndreas Martens <ama@openoffice.org>2000-11-14 07:21:35 +0000
commit5cfcf42492f3756f6f2e00153b935a645863b47e (patch)
treeff06cfc2fb0383c2205fdc60fa0d8417dfecf9c9 /sw
parentf3434b6fba96d285daa80b8e7e4d2bec1d90a34f (diff)
Fix/New: Nested ruby and 2-line attributes
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/text/itrform2.cxx11
1 files changed, 4 insertions, 7 deletions
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 0604f72c6d4f..cf7b97a60129 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: itrform2.cxx,v $
*
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
*
- * last change: $Author: ama $ $Date: 2000-11-09 13:38:10 $
+ * last change: $Author: ama $ $Date: 2000-11-14 08:21:35 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1247,11 +1247,8 @@ SwLinePortion *SwTxtFormatter::NewPortion( SwTxtFormatInfo &rInf )
SwMultiPortion* pTmp = NULL;
if( RES_TXTATR_CJK_RUBY == pTwoLines->Which() )
pTmp = new SwRubyPortion( *pTwoLines,*rInf.GetFont(),nEnd );
-
- //pTmp = new SwDoubleLinePortion(*pTwoLines->GetEnd());
-#ifdef DEBUG
- //pTmp->SetBrackets( '(', ')' );
-#endif
+ else
+ pTmp = new SwDoubleLinePortion( *pTwoLines, nEnd );
return pTmp;
}
}