diff options
-rwxr-xr-x | unusedcode.easy | 1 | ||||
-rw-r--r-- | xmlreader/inc/xmlreader/xmlreader.hxx | 6 | ||||
-rw-r--r-- | xmlreader/source/xmlreader.cxx | 23 |
3 files changed, 2 insertions, 28 deletions
diff --git a/unusedcode.easy b/unusedcode.easy index bb758dabba0f..3ebbdd6bda96 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -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() diff --git a/xmlreader/inc/xmlreader/xmlreader.hxx b/xmlreader/inc/xmlreader/xmlreader.hxx index 1d3faf05c0c2..b6de02734e84 100644 --- a/xmlreader/inc/xmlreader/xmlreader.hxx +++ b/xmlreader/inc/xmlreader/xmlreader.hxx @@ -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_; diff --git a/xmlreader/source/xmlreader.cxx b/xmlreader/source/xmlreader.cxx index e297cd176c53..fcf6e157a246 100644 --- a/xmlreader/source/xmlreader.cxx +++ b/xmlreader/source/xmlreader.cxx @@ -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( |