framework/source/accelerators/storageholder.cxx | 2 +- sw/qa/extras/ooxmlexport/ooxmlexport2.cxx | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-)
New commits: commit 21c5ef43ee51b4c9f4181b59a8926a48ea35e651 Author: Andrea Gelmini <andrea.gelm...@gelma.net> AuthorDate: Mon Jun 10 16:56:23 2019 +0000 Commit: Julien Nabet <serval2...@yahoo.fr> CommitDate: Fri Jun 14 07:23:46 2019 +0200 Fix typo Change-Id: I5e6ac32d6a0fca10362aa6a07186101e71e398eb Reviewed-on: https://gerrit.libreoffice.org/74006 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2...@yahoo.fr> diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx index ca807eabf684..567c7af65220 100644 --- a/framework/source/accelerators/storageholder.cxx +++ b/framework/source/accelerators/storageholder.cxx @@ -105,7 +105,7 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openPath(const OUStri aReadLock.reset(); // If we found an already open storage ... we must increase - // its use count. Otherwise it will may be closed to early :-) + // its use count. Otherwise it will may be closed too early :-) TPath2StorageInfo::iterator pCheck = m_lStorages.find(sCheckPath); TStorageInfo* pInfo = nullptr; if (pCheck != m_lStorages.end()) commit eec6989574a1bc51ac5eb9c764d4d6b5aa8bbf9b Author: Justin Luth <justin.l...@collabora.com> AuthorDate: Thu Jun 13 13:01:44 2019 +0300 Commit: Justin Luth <justin_l...@sil.org> CommitDate: Fri Jun 14 07:23:24 2019 +0200 add unit test to ensure revisionView is not added where unneeded related to tdf#89991. This is just a fail-safe to ensure that we don't start hiding "show changes" where we don't intend to. The default for a document that has recorded changes is to show the markup. Change-Id: I8c8b50b7947b9eea1e6dbedcbed091b2af9b5e87 Reviewed-on: https://gerrit.libreoffice.org/73951 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_l...@sil.org> diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx index 6090a0591bf4..2f7955c6c41e 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx @@ -596,6 +596,11 @@ DECLARE_OOXMLEXPORT_TEST(testFdo64826, "fdo64826.docx") { // 'Track-Changes' (Track Revisions) wasn't exported. CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(mxComponent, "RecordChanges")); + // 'Show-Changes' should not be exported - default is true. + if (xmlDocPtr pXmlSettings = parseExport("word/settings.xml")) + { + assertXPath(pXmlSettings, "/w:settings/w:revisionView", 0); + } } DECLARE_OOXMLEXPORT_TEST(testPageBackground, "page-background.docx") _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits