From: Frederik Gladhorn Date: Sat, 17 May 2008 13:37:35 +0000 (+0000) Subject: Only write personal pronoun tags when not empty. X-Git-Tag: v4.0.80^0 X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=cca86be97a8294bb851393236db9be7ef6574553;p=libqmvoc.git Only write personal pronoun tags when not empty. svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=808764 --- diff --git a/keduvocdocument/keduvockvtml2writer.cpp b/keduvocdocument/keduvockvtml2writer.cpp index 64dcdf9..2aff761 100644 --- a/keduvocdocument/keduvockvtml2writer.cpp +++ b/keduvocdocument/keduvockvtml2writer.cpp @@ -597,10 +597,14 @@ bool KEduVocKvtml2Writer::writePersonalPronoun(QDomElement & pronounElement, con for ( int num = KEduVocConjugation::Singular; num <= KEduVocConjugation::Plural; num++ ) { QDomElement numberElement = m_domDoc.createElement( KVTML_GRAMMATICAL_NUMBER[num] ); for ( int person = KEduVocConjugation::First; person <= KEduVocConjugation::ThirdNeutralCommon; person++ ) { - - numberElement.appendChild( newTextElement( KVTML_GRAMMATICAL_PERSON[person], pronoun.personalPronoun(KEduVocConjugation::ConjugationPerson(person), KEduVocConjugation::ConjugationNumber(num))) ); + QString pronounString = pronoun.personalPronoun(KEduVocConjugation::ConjugationPerson(person), KEduVocConjugation::ConjugationNumber(num)); + if (!pronounString.isEmpty()) { + numberElement.appendChild( newTextElement( KVTML_GRAMMATICAL_PERSON[person], pronounString )); + } + } + if (numberElement.hasChildNodes()) { + pronounElement.appendChild( numberElement ); } - pronounElement.appendChild( numberElement ); } return true; }