diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2015-07-15 15:37:57 -0700 |
|---|---|---|
| committer | Jean-Michel Trivi <jmtrivi@google.com> | 2015-07-15 17:09:51 -0700 |
| commit | a9be2d378b7ad84e679a48efa81f42fb54f85d9a (patch) | |
| tree | 587d34728dac3517a213d6d2a9a6ebdecd4e7531 /xmlserializer/XmlMemoryDocSource.cpp | |
| parent | c99720d29f2ee618cc74c9336d2cd2a26544c020 (diff) | |
| download | external_parameter-framework-a9be2d378b7ad84e679a48efa81f42fb54f85d9a.zip external_parameter-framework-a9be2d378b7ad84e679a48efa81f42fb54f85d9a.tar.gz external_parameter-framework-a9be2d378b7ad84e679a48efa81f42fb54f85d9a.tar.bz2 | |
Drop release v2.6.0+no-stlport
Bug 246391
Change-Id: I662b7b0f90c97cb169978e1b64ad1fe32c440cf5
Signed-off-by: Jean-Michel Trivi <jmtrivi@google.com>
Diffstat (limited to 'xmlserializer/XmlMemoryDocSource.cpp')
| -rw-r--r-- | xmlserializer/XmlMemoryDocSource.cpp | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/xmlserializer/XmlMemoryDocSource.cpp b/xmlserializer/XmlMemoryDocSource.cpp index 411d98a..2929b79 100644 --- a/xmlserializer/XmlMemoryDocSource.cpp +++ b/xmlserializer/XmlMemoryDocSource.cpp @@ -34,26 +34,17 @@ #define base CXmlDocSource -CXmlMemoryDocSource::CXmlMemoryDocSource(const IXmlSource* pXmlSource, +CXmlMemoryDocSource::CXmlMemoryDocSource(const IXmlSource* pXmlSource, bool bValidateWithSchema, const std::string& strRootElementType, const std::string& strXmlSchemaFile, const std::string& strProduct, - const std::string& strVersion, - bool bValidateWithSchema): - base(xmlNewDoc(BAD_CAST "1.0"), xmlNewNode(NULL, BAD_CAST strRootElementType.c_str()), - bValidateWithSchema), - _pXmlSource(pXmlSource), _strXmlSchemaFile(strXmlSchemaFile), _bWithHeader(true), - _strProduct(strProduct), _strVersion(strVersion) -{ - init(); -} - -CXmlMemoryDocSource::CXmlMemoryDocSource(const IXmlSource* pXmlSource, - const std::string& strRootElementType, - bool bValidateWithSchema): - base(xmlNewDoc(BAD_CAST "1.0"), xmlNewNode(NULL, BAD_CAST strRootElementType.c_str()), - bValidateWithSchema), - _pXmlSource(pXmlSource), _bWithHeader(false) + const std::string& strVersion): + base(xmlNewDoc(BAD_CAST "1.0"), bValidateWithSchema, + xmlNewNode(NULL, BAD_CAST strRootElementType.c_str())), + _pXmlSource(pXmlSource), + _strXmlSchemaFile(strXmlSchemaFile), + _strProduct(strProduct), + _strVersion(strVersion) { init(); } @@ -80,7 +71,7 @@ bool CXmlMemoryDocSource::populate(CXmlSerializingContext& serializingContext) // Create Xml element with the Doc CXmlElement docElement(_pRootNode); - if (_bWithHeader) { + if (!_strXmlSchemaFile.empty()) { // Schema namespace docElement.setAttributeString("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance"); |