File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -39,13 +39,6 @@ FileMeta parse_meta(const abstract::ReadableFilesystem &files) {
3939 FileMeta result;
4040 result.document_meta = DocumentMeta ();
4141
42- if (files.is_file (AbsPath (" /EncryptionInfo" )) &&
43- files.is_file (AbsPath (" /EncryptedPackage" ))) {
44- result.type = FileType::office_open_xml_encrypted;
45- result.password_encrypted = true ;
46- return result;
47- }
48-
4942 for (const auto &[path, variant] : types) {
5043 if (files.is_file (path)) {
5144 result.type = variant.type ;
Original file line number Diff line number Diff line change 55#include < odr/internal/util/byte_stream_util.hpp>
66#include < odr/internal/util/string_util.hpp>
77
8+ #include < cstring>
9+
810namespace odr ::internal::oldms::text {
911
1012namespace {
@@ -130,8 +132,9 @@ void text::read(std::istream &in, ParsedFib &out) {
130132 throw std::runtime_error (" Unexpected cbRgFcLcb value: " +
131133 std::to_string (out.cbRgFcLcb ));
132134 }
133- return std::unique_ptr<FibRgFcLcb97>(
134- reinterpret_cast <FibRgFcLcb97 *>(fibRgFcLcb.release ()));
135+ auto result = std::make_unique<FibRgFcLcbType>();
136+ std::memcpy (result.get (), fibRgFcLcb.get (), out.cbRgFcLcb * 8 );
137+ return result;
135138 });
136139}
137140
You can’t perform that action at this time.
0 commit comments