no text outside character group

This commit is contained in:
Henning Brinkmann 2007-04-20 13:31:32 +00:00
parent 47f2b77da2
commit 10098c106c

View file

@ -4,9 +4,9 @@
*
* $RCSfile: WW8DocumentImpl.cxx,v $
*
* $Revision: 1.13 $
* $Revision: 1.14 $
*
* last change: $Author: hbrinkm $ $Date: 2007-02-21 15:06:32 $
* last change: $Author: hbrinkm $ $Date: 2007-04-20 14:31:32 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -1643,6 +1643,7 @@ void WW8DocumentImpl::resolve(Stream & rStream)
WW8DocumentIterator::Pointer_t pIt = begin();
WW8DocumentIterator::Pointer_t pItEnd = end();
WW8DocumentIterator::Pointer_t pItChp;
bool bInParagraphGroup = false;
bool bInCharacterGroup = false;
@ -1699,6 +1700,8 @@ void WW8DocumentImpl::resolve(Stream & rStream)
rStream.startCharacterGroup();
bInCharacterGroup = true;
pItChp = pIt;
}
break;
@ -1775,6 +1778,15 @@ void WW8DocumentImpl::resolve(Stream & rStream)
rStream.props(pProperties);
}
if (pIt->getPropertyType() == PROP_PAP)
{
rStream.startCharacterGroup();
bInCharacterGroup = true;
if (pItChp.get() != NULL)
rStream.props(pItChp->getProperties());
}
resolveText(pIt, rStream);
++(*pIt);