The problem is that inserting PARAGRAPH_BREAK also calls
AppendTextNode() internally, not SplitNode().
(regression from 6eb1c2304d
)
Change-Id: I2d33819a973c956ea04925458c904ce36ccb55a3
Reviewed-on: https://gerrit.libreoffice.org/85627
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
567 lines
21 KiB
C++
567 lines
21 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
*/
|
|
|
|
#include "XMLTextMarkImportContext.hxx"
|
|
|
|
|
|
#include <rtl/ustring.hxx>
|
|
#include <sal/log.hxx>
|
|
#include <osl/diagnose.h>
|
|
#include <xmloff/xmluconv.hxx>
|
|
#include <xmloff/xmltoken.hxx>
|
|
#include <xmloff/xmlimp.hxx>
|
|
#include <xmloff/nmspmap.hxx>
|
|
#include <xmloff/xmlnmspe.hxx>
|
|
#include <xmloff/odffields.hxx>
|
|
#include <xmloff/xmlement.hxx>
|
|
#include <com/sun/star/xml/sax/XAttributeList.hpp>
|
|
#include <com/sun/star/text/ControlCharacter.hpp>
|
|
#include <com/sun/star/text/XTextContent.hpp>
|
|
#include <com/sun/star/beans/XPropertySet.hpp>
|
|
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
|
|
#include <com/sun/star/container/XNamed.hpp>
|
|
#include <com/sun/star/rdf/XMetadatable.hpp>
|
|
|
|
#include <com/sun/star/text/XFormField.hpp>
|
|
|
|
#include <RDFaImportHelper.hxx>
|
|
|
|
|
|
using namespace ::com::sun::star;
|
|
using namespace ::com::sun::star::text;
|
|
using namespace ::com::sun::star::uno;
|
|
using namespace ::com::sun::star::beans;
|
|
using namespace ::com::sun::star::lang;
|
|
using namespace ::com::sun::star::container;
|
|
using namespace ::com::sun::star::xml::sax;
|
|
using namespace ::xmloff::token;
|
|
|
|
|
|
XMLFieldParamImportContext::XMLFieldParamImportContext(
|
|
SvXMLImport& rImport,
|
|
XMLTextImportHelper& rHlp,
|
|
sal_uInt16 nPrefix,
|
|
const OUString& rLocalName ) :
|
|
SvXMLImportContext(rImport, nPrefix, rLocalName),
|
|
rHelper(rHlp)
|
|
{
|
|
}
|
|
|
|
|
|
void XMLFieldParamImportContext::StartElement(const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList)
|
|
{
|
|
SvXMLImport& rImport = GetImport();
|
|
OUString sName;
|
|
OUString sValue;
|
|
|
|
sal_Int16 nLength = xAttrList->getLength();
|
|
for(sal_Int16 nAttr = 0; nAttr < nLength; nAttr++)
|
|
{
|
|
OUString sLocalName;
|
|
sal_uInt16 nPrefix = rImport.GetNamespaceMap().
|
|
GetKeyByAttrName( xAttrList->getNameByIndex(nAttr),
|
|
&sLocalName );
|
|
|
|
if ( (XML_NAMESPACE_FIELD == nPrefix) &&
|
|
IsXMLToken(sLocalName, XML_NAME) )
|
|
{
|
|
sName = xAttrList->getValueByIndex(nAttr);
|
|
}
|
|
if ( (XML_NAMESPACE_FIELD == nPrefix) &&
|
|
IsXMLToken(sLocalName, XML_VALUE) )
|
|
{
|
|
sValue = xAttrList->getValueByIndex(nAttr);
|
|
}
|
|
}
|
|
if (rHelper.hasCurrentFieldCtx() && !sName.isEmpty()) {
|
|
rHelper.addFieldParam(sName, sValue);
|
|
}
|
|
}
|
|
|
|
|
|
XMLTextMarkImportContext::XMLTextMarkImportContext(
|
|
SvXMLImport& rImport,
|
|
XMLTextImportHelper& rHlp,
|
|
uno::Reference<uno::XInterface> & io_rxCrossRefHeadingBookmark,
|
|
sal_uInt16 nPrefix,
|
|
const OUString& rLocalName )
|
|
: SvXMLImportContext(rImport, nPrefix, rLocalName)
|
|
, m_rHelper(rHlp)
|
|
, m_rxCrossRefHeadingBookmark(io_rxCrossRefHeadingBookmark)
|
|
, m_bHaveAbout(false)
|
|
{
|
|
}
|
|
|
|
namespace {
|
|
|
|
enum lcl_MarkType { TypeReference, TypeReferenceStart, TypeReferenceEnd,
|
|
TypeBookmark, TypeBookmarkStart, TypeBookmarkEnd,
|
|
TypeFieldmark, TypeFieldmarkStart, TypeFieldmarkEnd
|
|
};
|
|
|
|
}
|
|
|
|
static SvXMLEnumMapEntry<lcl_MarkType> const lcl_aMarkTypeMap[] =
|
|
{
|
|
{ XML_REFERENCE_MARK, TypeReference },
|
|
{ XML_REFERENCE_MARK_START, TypeReferenceStart },
|
|
{ XML_REFERENCE_MARK_END, TypeReferenceEnd },
|
|
{ XML_BOOKMARK, TypeBookmark },
|
|
{ XML_BOOKMARK_START, TypeBookmarkStart },
|
|
{ XML_BOOKMARK_END, TypeBookmarkEnd },
|
|
{ XML_FIELDMARK, TypeFieldmark },
|
|
{ XML_FIELDMARK_START, TypeFieldmarkStart },
|
|
{ XML_FIELDMARK_END, TypeFieldmarkEnd },
|
|
{ XML_TOKEN_INVALID, lcl_MarkType(0) },
|
|
};
|
|
|
|
|
|
static const char *lcl_getFormFieldmarkName(OUString const &name)
|
|
{
|
|
if (name == ODF_FORMCHECKBOX ||
|
|
name == "msoffice.field.FORMCHECKBOX" ||
|
|
name == "ecma.office-open-xml.field.FORMCHECKBOX")
|
|
return ODF_FORMCHECKBOX;
|
|
else if (name == ODF_FORMDROPDOWN ||
|
|
name == "ecma.office-open-xml.field.FORMDROPDOWN")
|
|
return ODF_FORMDROPDOWN;
|
|
else
|
|
return nullptr;
|
|
}
|
|
|
|
static OUString lcl_getFieldmarkName(OUString const& name)
|
|
{
|
|
if (name == "msoffice.field.FORMTEXT" ||
|
|
name == "ecma.office-open-xml.field.FORMTEXT")
|
|
return ODF_FORMTEXT;
|
|
else
|
|
return name;
|
|
}
|
|
|
|
|
|
void XMLTextMarkImportContext::StartElement(
|
|
const Reference<XAttributeList> & xAttrList)
|
|
{
|
|
if (!FindName(GetImport(), xAttrList))
|
|
{
|
|
m_sBookmarkName.clear();
|
|
}
|
|
|
|
if (IsXMLToken(GetLocalName(), XML_FIELDMARK_START) || IsXMLToken(GetLocalName(), XML_FIELDMARK))
|
|
{
|
|
if (m_sBookmarkName.isEmpty())
|
|
{
|
|
m_sBookmarkName = "Unknown";
|
|
}
|
|
m_rHelper.pushFieldCtx( m_sBookmarkName, m_sFieldName );
|
|
}
|
|
|
|
if (IsXMLToken(GetLocalName(), XML_BOOKMARK_START))
|
|
{
|
|
const OUString sHidden = xAttrList->getValueByName("loext:hidden");
|
|
const OUString sCondition = xAttrList->getValueByName("loext:condition");
|
|
m_rHelper.setBookmarkAttributes(m_sBookmarkName, sHidden == "true", sCondition);
|
|
}
|
|
}
|
|
|
|
static auto InsertFieldmark(SvXMLImport & rImport,
|
|
XMLTextImportHelper & rHelper, OUString const& rName) -> void
|
|
{
|
|
assert(rHelper.hasCurrentFieldCtx()); // was set up in StartElement()
|
|
|
|
// fdo#86795 check if it's actually a checkbox first
|
|
OUString const type(rHelper.getCurrentFieldType());
|
|
OUString const fieldmarkTypeName = lcl_getFieldmarkName(type);
|
|
if (fieldmarkTypeName == ODF_FORMCHECKBOX ||
|
|
fieldmarkTypeName == ODF_FORMDROPDOWN)
|
|
{ // sw can't handle checkbox with start+end
|
|
SAL_INFO("xmloff.text", "invalid fieldmark-start/fieldmark-end ignored");
|
|
return;
|
|
}
|
|
|
|
Reference<XTextContent> const xContent = XMLTextMarkImportContext::CreateAndInsertMark(
|
|
rImport, "com.sun.star.text.Fieldmark",
|
|
rName, rHelper.GetCursorAsRange());
|
|
|
|
if (xContent.is())
|
|
{
|
|
// setup fieldmark...
|
|
Reference<text::XFormField> const xFormField(xContent, UNO_QUERY);
|
|
assert(xFormField.is());
|
|
xFormField->setFieldType(fieldmarkTypeName);
|
|
rHelper.setCurrentFieldParamsTo(xFormField);
|
|
// move cursor after setFieldType as that may delete/re-insert
|
|
rHelper.GetCursor()->gotoRange(xContent->getAnchor()->getEnd(), false);
|
|
rHelper.GetCursor()->goLeft(1, false); // move before CH_TXT_ATR_FIELDEND
|
|
// tdf#129520: AppendTextNode() ignores the content index!
|
|
// plan B: insert a spurious paragraph break now and join
|
|
// it in PopFieldmark()!
|
|
rHelper.GetText()->insertControlCharacter(rHelper.GetCursor(),
|
|
text::ControlCharacter::PARAGRAPH_BREAK, false);
|
|
rHelper.GetCursor()->goLeft(1, false); // back to previous paragraph
|
|
}
|
|
}
|
|
|
|
static auto PopFieldmark(XMLTextImportHelper & rHelper) -> void
|
|
{
|
|
// can't verify name because it's not written as an attribute...
|
|
uno::Reference<text::XTextContent> const xField(rHelper.popFieldCtx(),
|
|
uno::UNO_QUERY);
|
|
if (xField.is())
|
|
{
|
|
if (rHelper.GetText() == xField->getAnchor()->getText())
|
|
{
|
|
try
|
|
{ // skip CH_TXT_ATR_FIELDEND
|
|
rHelper.GetCursor()->goRight(1, true);
|
|
rHelper.GetCursor()->setString(OUString()); // undo AppendTextNode from InsertFieldmark
|
|
rHelper.GetCursor()->gotoRange(xField->getAnchor()->getEnd(), false);
|
|
}
|
|
catch (uno::Exception const&)
|
|
{
|
|
assert(false); // must succeed
|
|
}
|
|
}
|
|
else
|
|
{
|
|
SAL_INFO("xmloff.text", "fieldmark has invalid positions");
|
|
// could either dispose it or leave it to end at the end of the document?
|
|
xField->dispose();
|
|
}
|
|
}
|
|
}
|
|
|
|
void XMLTextMarkImportContext::EndElement()
|
|
{
|
|
SvXMLImportContext::EndElement();
|
|
|
|
static const char sAPI_bookmark[] = "com.sun.star.text.Bookmark";
|
|
|
|
lcl_MarkType nTmp{};
|
|
if (SvXMLUnitConverter::convertEnum(nTmp, GetLocalName(), lcl_aMarkTypeMap))
|
|
{
|
|
if (!m_sBookmarkName.isEmpty() || TypeFieldmarkEnd == nTmp)
|
|
{
|
|
switch (nTmp)
|
|
{
|
|
case TypeReference:
|
|
// export point reference mark
|
|
CreateAndInsertMark(GetImport(),
|
|
"com.sun.star.text.ReferenceMark",
|
|
m_sBookmarkName,
|
|
m_rHelper.GetCursorAsRange()->getStart());
|
|
break;
|
|
|
|
case TypeBookmark:
|
|
{
|
|
// tdf#94804: detect duplicate heading cross reference bookmarks
|
|
if (m_sBookmarkName.startsWith("__RefHeading__"))
|
|
{
|
|
if (m_rxCrossRefHeadingBookmark.is())
|
|
{
|
|
uno::Reference<container::XNamed> const xNamed(
|
|
m_rxCrossRefHeadingBookmark, uno::UNO_QUERY);
|
|
m_rHelper.AddCrossRefHeadingMapping(
|
|
m_sBookmarkName, xNamed->getName());
|
|
break; // don't insert
|
|
}
|
|
}
|
|
}
|
|
[[fallthrough]];
|
|
case TypeFieldmark:
|
|
{
|
|
const char *formFieldmarkName=lcl_getFormFieldmarkName(m_sFieldName);
|
|
bool bImportAsField = (nTmp==TypeFieldmark && formFieldmarkName!=nullptr); //@TODO handle abbreviation cases...
|
|
// export point bookmark
|
|
const Reference<XInterface> xContent(
|
|
CreateAndInsertMark(GetImport(),
|
|
(bImportAsField ? OUString("com.sun.star.text.FormFieldmark") : OUString(sAPI_bookmark)),
|
|
m_sBookmarkName,
|
|
m_rHelper.GetCursorAsRange()->getStart(),
|
|
m_sXmlId) );
|
|
if (nTmp==TypeFieldmark) {
|
|
if (xContent.is() && bImportAsField) {
|
|
// setup fieldmark...
|
|
Reference< css::text::XFormField> xFormField(xContent, UNO_QUERY);
|
|
xFormField->setFieldType(OUString::createFromAscii(formFieldmarkName));
|
|
if (xFormField.is() && m_rHelper.hasCurrentFieldCtx()) {
|
|
m_rHelper.setCurrentFieldParamsTo(xFormField);
|
|
}
|
|
}
|
|
m_rHelper.popFieldCtx();
|
|
}
|
|
if (TypeBookmark == nTmp
|
|
&& m_sBookmarkName.startsWith("__RefHeading__"))
|
|
{
|
|
assert(xContent.is());
|
|
m_rxCrossRefHeadingBookmark = xContent;
|
|
}
|
|
}
|
|
break;
|
|
|
|
case TypeBookmarkStart:
|
|
// save XTextRange for later construction of bookmark
|
|
{
|
|
std::shared_ptr< ::xmloff::ParsedRDFaAttributes >
|
|
xRDFaAttributes;
|
|
if (m_bHaveAbout && TypeBookmarkStart == nTmp)
|
|
{
|
|
xRDFaAttributes =
|
|
GetImport().GetRDFaImportHelper().ParseRDFa(
|
|
m_sAbout, m_sProperty,
|
|
m_sContent, m_sDatatype);
|
|
}
|
|
m_rHelper.InsertBookmarkStartRange(
|
|
m_sBookmarkName,
|
|
m_rHelper.GetCursorAsRange()->getStart(),
|
|
m_sXmlId, xRDFaAttributes);
|
|
}
|
|
break;
|
|
|
|
case TypeBookmarkEnd:
|
|
{
|
|
// tdf#94804: detect duplicate heading cross reference bookmarks
|
|
if (m_sBookmarkName.startsWith("__RefHeading__"))
|
|
{
|
|
if (m_rxCrossRefHeadingBookmark.is())
|
|
{
|
|
uno::Reference<container::XNamed> const xNamed(
|
|
m_rxCrossRefHeadingBookmark, uno::UNO_QUERY);
|
|
m_rHelper.AddCrossRefHeadingMapping(
|
|
m_sBookmarkName, xNamed->getName());
|
|
break; // don't insert
|
|
}
|
|
}
|
|
|
|
// get old range, and construct
|
|
Reference<XTextRange> xStartRange;
|
|
std::shared_ptr< ::xmloff::ParsedRDFaAttributes >
|
|
xRDFaAttributes;
|
|
if (m_rHelper.FindAndRemoveBookmarkStartRange(
|
|
m_sBookmarkName, xStartRange,
|
|
m_sXmlId, xRDFaAttributes))
|
|
{
|
|
Reference<XTextRange> xEndRange(
|
|
m_rHelper.GetCursorAsRange()->getStart());
|
|
|
|
// check if beginning and end are in same XText
|
|
if (xStartRange.is() && xEndRange.is() && xStartRange->getText() == xEndRange->getText())
|
|
{
|
|
// create range for insertion
|
|
Reference<XTextCursor> xInsertionCursor =
|
|
m_rHelper.GetText()->createTextCursorByRange(
|
|
xEndRange);
|
|
try {
|
|
xInsertionCursor->gotoRange(xStartRange, true);
|
|
} catch (uno::Exception&) {
|
|
OSL_ENSURE(false,
|
|
"cannot go to end position of bookmark");
|
|
}
|
|
|
|
//DBG_ASSERT(! xInsertionCursor->isCollapsed(),
|
|
// "we want no point mark");
|
|
// can't assert, because someone could
|
|
// create a file with subsequence
|
|
// start/end elements
|
|
|
|
Reference<XInterface> xContent;
|
|
// insert reference
|
|
xContent = CreateAndInsertMark(GetImport(),
|
|
sAPI_bookmark,
|
|
m_sBookmarkName,
|
|
xInsertionCursor,
|
|
m_sXmlId);
|
|
if (xRDFaAttributes)
|
|
{
|
|
const Reference<rdf::XMetadatable>
|
|
xMeta(xContent, UNO_QUERY);
|
|
GetImport().GetRDFaImportHelper().AddRDFa(
|
|
xMeta, xRDFaAttributes);
|
|
}
|
|
const Reference<XPropertySet> xPropertySet(xContent, UNO_QUERY);
|
|
if (xPropertySet.is())
|
|
{
|
|
xPropertySet->setPropertyValue("BookmarkHidden", uno::Any(m_rHelper.getBookmarkHidden(m_sBookmarkName)));
|
|
xPropertySet->setPropertyValue("BookmarkCondition", uno::Any(m_rHelper.getBookmarkCondition(m_sBookmarkName)));
|
|
}
|
|
if (m_sBookmarkName.startsWith("__RefHeading__"))
|
|
{
|
|
assert(xContent.is());
|
|
m_rxCrossRefHeadingBookmark = xContent;
|
|
}
|
|
}
|
|
// else: beginning/end in different XText -> ignore!
|
|
}
|
|
// else: no start found -> ignore!
|
|
break;
|
|
}
|
|
case TypeFieldmarkStart: // no separator, so insert at start
|
|
{
|
|
InsertFieldmark(GetImport(), m_rHelper, m_sBookmarkName);
|
|
break;
|
|
}
|
|
case TypeFieldmarkEnd:
|
|
{
|
|
PopFieldmark(m_rHelper);
|
|
break;
|
|
}
|
|
case TypeReferenceStart:
|
|
case TypeReferenceEnd:
|
|
OSL_FAIL("reference start/end are handled in txtparai !");
|
|
break;
|
|
|
|
default:
|
|
OSL_FAIL("unknown mark type");
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
SvXMLImportContextRef XMLTextMarkImportContext::CreateChildContext( sal_uInt16 nPrefix,
|
|
const OUString& rLocalName,
|
|
const css::uno::Reference< css::xml::sax::XAttributeList >& )
|
|
{
|
|
return new XMLFieldParamImportContext(GetImport(), m_rHelper,
|
|
nPrefix, rLocalName);
|
|
}
|
|
|
|
|
|
Reference<XTextContent> XMLTextMarkImportContext::CreateAndInsertMark(
|
|
SvXMLImport& rImport,
|
|
const OUString& sServiceName,
|
|
const OUString& sMarkName,
|
|
const Reference<XTextRange> & rRange,
|
|
const OUString& i_rXmlId)
|
|
{
|
|
// create mark
|
|
const Reference<XMultiServiceFactory> xFactory(rImport.GetModel(),
|
|
UNO_QUERY);
|
|
Reference<XInterface> xIfc;
|
|
|
|
if (xFactory.is())
|
|
{
|
|
xIfc = xFactory->createInstance(sServiceName);
|
|
|
|
if (!xIfc.is())
|
|
{
|
|
OSL_FAIL("CreateAndInsertMark: cannot create service?");
|
|
return nullptr;
|
|
}
|
|
|
|
// set name (unless there is no name (text:meta))
|
|
const Reference<XNamed> xNamed(xIfc, UNO_QUERY);
|
|
if (xNamed.is())
|
|
{
|
|
xNamed->setName(sMarkName);
|
|
}
|
|
else
|
|
{
|
|
if (!sMarkName.isEmpty())
|
|
{
|
|
OSL_FAIL("name given, but XNamed not supported?");
|
|
return nullptr;
|
|
}
|
|
}
|
|
|
|
// cast to XTextContent and attach to document
|
|
const Reference<XTextContent> xTextContent(xIfc, UNO_QUERY);
|
|
if (xTextContent.is())
|
|
{
|
|
try
|
|
{
|
|
// if inserting marks, bAbsorb==sal_False will cause
|
|
// collapsing of the given XTextRange.
|
|
rImport.GetTextImport()->GetText()->insertTextContent(rRange,
|
|
xTextContent, true);
|
|
|
|
// xml:id for RDF metadata -- after insertion!
|
|
rImport.SetXmlId(xIfc, i_rXmlId);
|
|
|
|
return xTextContent;
|
|
}
|
|
catch (css::lang::IllegalArgumentException &)
|
|
{
|
|
OSL_FAIL("CreateAndInsertMark: cannot insert?");
|
|
return nullptr;
|
|
}
|
|
}
|
|
}
|
|
return nullptr;
|
|
}
|
|
|
|
bool XMLTextMarkImportContext::FindName(
|
|
SvXMLImport& rImport,
|
|
const Reference<XAttributeList> & xAttrList)
|
|
{
|
|
bool bNameOK = false;
|
|
|
|
// find name attribute first
|
|
const sal_Int16 nLength = xAttrList->getLength();
|
|
for(sal_Int16 nAttr = 0; nAttr < nLength; nAttr++)
|
|
{
|
|
OUString sLocalName;
|
|
const sal_uInt16 nPrefix = rImport.GetNamespaceMap().
|
|
GetKeyByAttrName( xAttrList->getNameByIndex(nAttr),
|
|
&sLocalName );
|
|
|
|
if ( (XML_NAMESPACE_TEXT == nPrefix) &&
|
|
IsXMLToken(sLocalName, XML_NAME) )
|
|
{
|
|
m_sBookmarkName = xAttrList->getValueByIndex(nAttr);
|
|
bNameOK = true;
|
|
}
|
|
else if ( (XML_NAMESPACE_XML == nPrefix) &&
|
|
IsXMLToken(sLocalName, XML_ID) )
|
|
{
|
|
m_sXmlId = xAttrList->getValueByIndex(nAttr);
|
|
}
|
|
else if ( XML_NAMESPACE_XHTML == nPrefix )
|
|
{
|
|
// RDFa
|
|
if ( IsXMLToken( sLocalName, XML_ABOUT) )
|
|
{
|
|
m_sAbout = xAttrList->getValueByIndex(nAttr);
|
|
m_bHaveAbout = true;
|
|
}
|
|
else if ( IsXMLToken( sLocalName, XML_PROPERTY) )
|
|
{
|
|
m_sProperty = xAttrList->getValueByIndex(nAttr);
|
|
}
|
|
else if ( IsXMLToken( sLocalName, XML_CONTENT) )
|
|
{
|
|
m_sContent = xAttrList->getValueByIndex(nAttr);
|
|
}
|
|
else if ( IsXMLToken( sLocalName, XML_DATATYPE) )
|
|
{
|
|
m_sDatatype = xAttrList->getValueByIndex(nAttr);
|
|
}
|
|
}
|
|
else if ( (XML_NAMESPACE_FIELD == nPrefix) &&
|
|
IsXMLToken(sLocalName, XML_TYPE) )
|
|
{
|
|
m_sFieldName = xAttrList->getValueByIndex(nAttr);
|
|
}
|
|
}
|
|
|
|
return bNameOK;
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|