INTEGRATION: CWS xmlfilter06 (1.25.6); FILE MERGED
2008/06/29 13:06:09 dr 1.25.6.3: RESYNC: (1.25-1.26); FILE MERGED 2008/05/30 12:21:06 hbrinkm 1.25.6.2: use TagLogger 2008/05/27 11:36:10 dr 1.25.6.1: joined changes from CWS xmlfilter05
This commit is contained in:
parent
926cbdd55f
commit
34e891d883
1 changed files with 5 additions and 23 deletions
|
@ -7,7 +7,7 @@
|
|||
* OpenOffice.org - a multi-platform office productivity suite
|
||||
*
|
||||
* $RCSfile: OOXMLPropertySetImpl.cxx,v $
|
||||
* $Revision: 1.26 $
|
||||
* $Revision: 1.27 $
|
||||
*
|
||||
* This file is part of OpenOffice.org.
|
||||
*
|
||||
|
@ -168,12 +168,6 @@ void OOXMLPropertyImpl::resolve(writerfilter::Properties & rProperties)
|
|||
rProperties.attribute(mId, *getValue());
|
||||
break;
|
||||
}
|
||||
|
||||
#ifdef DEBUG_RESOLVE
|
||||
logger("DEBUG", "<resolve>");
|
||||
logger("DEBUG", toString());
|
||||
logger("DEBUG", "</resolve>");
|
||||
#endif
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -424,7 +418,10 @@ void OOXMLPropertySetImpl::resolve(Properties & rHandler)
|
|||
pProp->resolve(rHandler);
|
||||
#ifdef DEBUG_RESOLVE
|
||||
else
|
||||
logger("DEBUG", "<error>zero-property</error>");
|
||||
{
|
||||
debug_logger->startElement("error");
|
||||
debug_logger->chars("zero-property");
|
||||
debug_logger->endElement("error");
|
||||
#endif
|
||||
|
||||
aIt++;
|
||||
|
@ -460,11 +457,6 @@ string OOXMLPropertySetImpl::getType() const
|
|||
|
||||
void OOXMLPropertySetImpl::add(OOXMLProperty::Pointer_t pProperty)
|
||||
{
|
||||
#ifdef DEBUG_RESOLVE
|
||||
if (pProperty->getId() == 0x0)
|
||||
logger("DEBUG", "<error>zero property</error>");
|
||||
#endif
|
||||
|
||||
if (pProperty.get() != NULL && pProperty->getId() != 0x0)
|
||||
mProperties.push_back(pProperty);
|
||||
}
|
||||
|
@ -478,11 +470,6 @@ void OOXMLPropertySetImpl::add(OOXMLPropertySet::Pointer_t pPropertySet)
|
|||
|
||||
if (pSet != NULL)
|
||||
{
|
||||
#ifdef DEBUG_RESOLVE
|
||||
logger("DEBUG", "<call class=\"OOXMLPropertySetImpl\" method=\"add\"><me>" + toString()
|
||||
+ "</me>" + pSet->toString() + "</call>");
|
||||
#endif
|
||||
|
||||
mProperties.resize(mProperties.size() + pSet->mProperties.size());
|
||||
for (OOXMLProperties_t::iterator aIt = pSet->mProperties.begin();
|
||||
aIt != pSet->mProperties.end(); aIt++)
|
||||
|
@ -756,11 +743,6 @@ void OOXMLPropertySetEntryToString::sprm(Sprm & /*rSprm*/)
|
|||
|
||||
void OOXMLPropertySetEntryToString::attribute(Id nId, Value & rValue)
|
||||
{
|
||||
#ifdef DEBUG_RESOLVE
|
||||
logger("DEBUG", "OOXMLPropertySetEntryToString::attribute("
|
||||
+ (*QNameToString::Instance())(nId) + ")");
|
||||
#endif
|
||||
|
||||
if (nId == mnId)
|
||||
mStr = rValue.getString();
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue