Kaydet (Commit) 2914d52f authored tarafından Caolán McNamara's avatar Caolán McNamara

remove xmlreader from string now I don't need it anymore

Change-Id: I8d280a5fa352bf4514a5e593b34be767648f4e64
üst 1692cf68
......@@ -80,7 +80,6 @@ comphelper::detail::ConfigurationWrapper::getGroupReadWrite(boost::shared_ptr<co
comphelper::detail::ConfigurationWrapper::getLocalizedPropertyValue(rtl::OUString const&) const
comphelper::detail::ConfigurationWrapper::setLocalizedPropertyValue(boost::shared_ptr<comphelper::ConfigurationChanges> const&, rtl::OUString const&, com::sun::star::uno::Any const&) const
connectivity::file::OStatement_Base::reset()
connectivity::mork::MQueryHelper::next()
connectivity::mork::MQueryHelperResultEntry::insert(rtl::OString const&, rtl::OUString&)
connectivity::mork::OColumnAlias::OColumnAlias()
connectivity::mozab::MQueryHelper::next()
......
......@@ -44,10 +44,6 @@ public:
com::sun::star::container::NoSuchElementException,
com::sun::star::uno::RuntimeException));
//string is not copied so must persist for lifetime
//of XmlReader
explicit XmlReader(const char * str, sal_uInt64 len) SAL_THROW(());
~XmlReader();
enum { NAMESPACE_NONE = -2, NAMESPACE_UNKNOWN = -1, NAMESPACE_XML = 0 };
......@@ -174,8 +170,6 @@ private:
SAL_DLLPRIVATE int toNamespaceId(NamespaceIris::size_type pos);
SAL_DLLPRIVATE void init();
rtl::OUString fileUrl_;
oslFileHandle fileHandle_;
sal_uInt64 fileSize_;
......
......@@ -96,38 +96,19 @@ XmlReader::XmlReader(rtl::OUString const & fileUrl)
rtl::OUString::valueOf(static_cast< sal_Int32 >(e)) + ")"),
css::uno::Reference< css::uno::XInterface >());
}
init();
pos_ = static_cast< char * >(fileAddress_);
end_ = pos_ + fileSize_;
}
XmlReader::XmlReader(const char * str, sal_uInt64 len)
SAL_THROW(())
: fileHandle_(NULL)
, fileSize_(len)
, fileAddress_(NULL)
{
init();
pos_ = str;
end_ = pos_ + fileSize_;
}
void XmlReader::init()
{
namespaceIris_.push_back(
Span(
RTL_CONSTASCII_STRINGPARAM(
"http://www.w3.org/XML/1998/namespace")));
namespaces_.push_back(
NamespaceData(Span(RTL_CONSTASCII_STRINGPARAM("xml")), NAMESPACE_XML));
pos_ = static_cast< char * >(fileAddress_);
end_ = pos_ + fileSize_;
state_ = STATE_CONTENT;
firstAttribute_ = true;
}
XmlReader::~XmlReader() {
if (!fileHandle_)
return;
oslFileError e = osl_unmapMappedFile(fileHandle_, fileAddress_, fileSize_);
if (e != osl_File_E_None) {
SAL_WARN(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment