Age | Commit message (Collapse) | Author |
|
The content type inside an OOXML file differs for DOCX and DOCM. These
must be in sync with the file extension, otherwise MSO refuses to open
the file. We used to always write the DOCX content-type even for files
which had the DOCM extension.
Allow users to recover those broken files by detecting a "has docm
extension but docx content-type" file as docm, so re-saving it will
produce output that's accepted by MSO as well.
(cherry picked from commit 97fa7024ce608b7908aca369e8c643a5de9ebf78)
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
Change-Id: I7d60c6f6c1d0421e95b3dc9e8fff617f101919f5
Reviewed-on: https://gerrit.libreoffice.org/38357
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
|
|
This is 'libreoffice-5-3' - the stable branch for the 5.3.x releases.
The commit rules are different according to the development phase:
A. 5.3.0 beta phase:
A. any bug fixes are allowed without review
B. late features need approval by 3 people with different affiliation
B. 5.3.0 rc phase and later:
A. fixes need approval by one reviewer
B. late features need approval by 3 more people with different affiliation
IMPORTANT: Every developer is responsible for pushing the fixes into all
appropriate branches. Note that we do not plan any merge
from this branch to master or vice versa.
Please, help use to make stable and usable release. If you want to build
something cool, unstable, and risky, use master.
Change-Id: I223da394fba39f113e984bed4d65873b23a9daf0
|
|
Change-Id: Iecb72ef80f66f1d84a764bdc2629ad45f14acfe7
|