sc/source/filter/xcl97/xcl97rec.cxx | 2 +- sfx2/inc/SfxRedactionHelper.hxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit 5eeb1a9daf3c69da8b3d3f41d095195af871dfb6 Author: Julien Nabet <[email protected]> AuthorDate: Wed Jul 22 13:30:21 2020 +0200 Commit: Andras Timar <[email protected]> CommitDate: Tue Jul 28 16:11:04 2020 +0200 tdf#135032: autoredaction, take into account emails in lowercase Change-Id: Ie922a9e7203e46b19a0c7418983b1d0d7e787f02 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99216 Tested-by: Jenkins Reviewed-by: Julien Nabet <[email protected]> (cherry picked from commit 26357bcb3838698e041d7079105144dfb72856e1) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99209 Reviewed-by: Adolfo Jayme Barrientos <[email protected]> (cherry picked from commit 6360bea26ddc8e4d42c2f0c50b4f3974a07a8ce4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99490 Reviewed-by: Xisco Fauli <[email protected]> diff --git a/sfx2/inc/SfxRedactionHelper.hxx b/sfx2/inc/SfxRedactionHelper.hxx index d30284791439..efeb9222816b 100644 --- a/sfx2/inc/SfxRedactionHelper.hxx +++ b/sfx2/inc/SfxRedactionHelper.hxx @@ -129,7 +129,7 @@ public: private: static constexpr OUStringLiteral m_aPredefinedTargets[6] = { "\\b(?:\\d[ -]*?){13,16}\\b", //Credit card numbers - "\\b[A-Z0-9._%+-]+@[A-Z0-9.-]+\\.[A-Z]{2,}\\b", //Email addresses + "\\b[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}\\b", //Email addresses "\\b(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)" "\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)" "\\b", //IP addresses commit c2f13c3f509dc5e4a8ab05c6963f90c7411eb086 Author: Serge Krot <[email protected]> AuthorDate: Tue Jul 21 16:05:15 2020 +0200 Commit: Andras Timar <[email protected]> CommitDate: Tue Jul 28 16:10:58 2020 +0200 tdf#134769 XLSX export fix: unable to open with MS Excel Change-Id: I8fff01118e25768ca54c816fcb0eb522da6f38bb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99149 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <[email protected]> (cherry picked from commit 641dbafcb4c7b00bc9e56b58d12c95a6f05ee88d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99395 Reviewed-by: Xisco Fauli <[email protected]> diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx index 37c55e9d629c..4a4656f57a94 100644 --- a/sc/source/filter/xcl97/xcl97rec.cxx +++ b/sc/source/filter/xcl97/xcl97rec.cxx @@ -364,8 +364,8 @@ void XclExpObjList::SaveXml( XclExpXmlStream& rStrm ) return; SaveDrawingMLObjects( *this, rStrm ); - SaveFormControlObjects( *this, rStrm ); SaveVmlObjects( *this, rStrm, mnVmlCount ); + SaveFormControlObjects( *this, rStrm ); } void XclExpObjList::ResetCounters() _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
