[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - filter/source
filter/source/xslt/odf2xhtml/export/xhtml/body.xsl |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 12b216ba8d9ca66924a2ed74c5e21b063f1ef6a3 Author: Franklin Weng AuthorDate: Wed May 10 14:18:45 2023 +0800 Commit: Michael Stahl CommitDate: Fri Jun 9 10:39:59 2023 +0200 tdf#155182 : fix test of $minLabelWidth which is always true Change-Id: I74e6e101ba16de1100e71ed950116bceb6862829 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151601 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit 7f5e2fc7c1ae7c0c2bec76809e11365b255601d5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152759 Tested-by: Michael Stahl diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl index da397ac9c24d..9706c1df0615 100644 --- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl +++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl @@ -2025,7 +2025,7 @@ - +
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - filter/source
filter/source/xslt/odf2xhtml/export/xhtml/body.xsl |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e66251c6a30e2ab6bd8052c07ff3f69bbe85ca54 Author: Franklin Weng AuthorDate: Wed May 10 14:18:45 2023 +0800 Commit: Michael Stahl CommitDate: Thu Jun 8 19:20:56 2023 +0200 tdf#155182 : fix test of $minLabelWidth which is always true Change-Id: I74e6e101ba16de1100e71ed950116bceb6862829 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151601 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit 7f5e2fc7c1ae7c0c2bec76809e11365b255601d5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152760 diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl index 6ad03e260d8c..0aa44114efa0 100644 --- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl +++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl @@ -2038,7 +2038,7 @@ - +
[Libreoffice-commits] core.git: filter/source
filter/source/xslt/odf2xhtml/export/xhtml/body.xsl |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7f5e2fc7c1ae7c0c2bec76809e11365b255601d5 Author: Franklin Weng AuthorDate: Wed May 10 14:18:45 2023 +0800 Commit: Michael Stahl CommitDate: Thu Jun 8 17:27:33 2023 +0200 tdf#155182 : fix test of $minLabelWidth which is always true Change-Id: I74e6e101ba16de1100e71ed950116bceb6862829 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151601 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl index da397ac9c24d..9706c1df0615 100644 --- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl +++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl @@ -2025,7 +2025,7 @@ - +
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - filter/source
filter/source/xslt/odf2xhtml/export/common/table/table.xsl |4 ++ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl | 19 ++--- 2 files changed, 20 insertions(+), 3 deletions(-) New commits: commit c910a1320c7247c111d4f7e2a61540fc646938ff Author: Franklin Weng AuthorDate: Wed Mar 22 12:33:38 2023 +0800 Commit: Adolfo Jayme Barrientos CommitDate: Tue May 9 18:26:48 2023 +0200 tdf#153839 : Further handling for adding newlines before and after some tags as described in comment 7 Change-Id: I6e2a6559a888d259c6d1cc848fad7d39a1ab653b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149280 Reviewed-by: Stéphane Guillou Tested-by: Ilmari Lauhakangas Reviewed-by: Ilmari Lauhakangas (cherry picked from commit ce4272c25426f0084e53735e80870b9339239078) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150729 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/filter/source/xslt/odf2xhtml/export/common/table/table.xsl b/filter/source/xslt/odf2xhtml/export/common/table/table.xsl index cfc1ebbc525b..d55948cab5b9 100644 --- a/filter/source/xslt/odf2xhtml/export/common/table/table.xsl +++ b/filter/source/xslt/odf2xhtml/export/common/table/table.xsl @@ -63,6 +63,7 @@ + @@ -71,6 +72,7 @@ + @@ -110,10 +112,12 @@ + + diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl index 6f64b5a83d82..6ad03e260d8c 100644 --- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl +++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl @@ -254,7 +254,9 @@ + Next 'div' was a 'draw:text-box'. + @@ -379,10 +381,14 @@ + Next 'div' was a 'text:p'. + + Next 'div' was a 'draw:page'. + @@ -840,7 +846,9 @@ + Next 'div' added for floating. + display:inline; position:relative; left: @@ -1031,7 +1039,9 @@ + Next 'div' is emulating the top height of a draw:frame. +
[Libreoffice-commits] core.git: filter/source
filter/source/xslt/odf2xhtml/export/common/table/table.xsl |4 ++ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl | 19 ++--- 2 files changed, 20 insertions(+), 3 deletions(-) New commits: commit ce4272c25426f0084e53735e80870b9339239078 Author: Franklin Weng AuthorDate: Wed Mar 22 12:33:38 2023 +0800 Commit: Ilmari Lauhakangas CommitDate: Fri Apr 21 11:35:16 2023 +0200 tdf#153839 : Further handling for adding newlines before and after some tags as described in comment 7 Change-Id: I6e2a6559a888d259c6d1cc848fad7d39a1ab653b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149280 Reviewed-by: Stéphane Guillou Tested-by: Ilmari Lauhakangas Reviewed-by: Ilmari Lauhakangas diff --git a/filter/source/xslt/odf2xhtml/export/common/table/table.xsl b/filter/source/xslt/odf2xhtml/export/common/table/table.xsl index cfc1ebbc525b..d55948cab5b9 100644 --- a/filter/source/xslt/odf2xhtml/export/common/table/table.xsl +++ b/filter/source/xslt/odf2xhtml/export/common/table/table.xsl @@ -63,6 +63,7 @@ + @@ -71,6 +72,7 @@ + @@ -110,10 +112,12 @@ + + diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl index ca7a6906b82c..fca8d9a763b7 100644 --- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl +++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl @@ -248,7 +248,9 @@ + Next 'div' was a 'draw:text-box'. + @@ -372,10 +374,14 @@ + Next 'div' was a 'text:p'. + + Next 'div' was a 'draw:page'. + @@ -829,7 +835,9 @@ + Next 'div' added for floating. + display:inline; position:relative; left: @@ -1020,7 +1028,9 @@ + Next 'div' is emulating the top height of a draw:frame. +
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - filter/source
filter/source/xslt/odf2xhtml/export/xhtml/body.xsl | 11 filter/source/xslt/odf2xhtml/export/xhtml/header.xsl| 31 filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl |6 ++ 3 files changed, 48 insertions(+) New commits: commit 5ee2f4ee7838401afdae5eef5669881601fb4ee6 Author: Franklin Weng AuthorDate: Wed Mar 1 00:04:11 2023 +0800 Commit: Caolán McNamara CommitDate: Thu Mar 16 11:46:09 2023 + tdf#153839: add newline after certain tags Add newline after certain tags in head section and paragraphs, to make generated xhtml easier to read. Change-Id: I9562ef48d9dd1283110be4a45527616dce186681 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148026 Tested-by: Jenkins Reviewed-by: Miklos Vajna (cherry picked from commit d2e8705c9cc503afdaed366b1f71ed012b0c568f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148869 Reviewed-by: Caolán McNamara diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl index 430b834b3cca..ca7a6906b82c 100644 --- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl +++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl @@ -50,9 +50,11 @@ + + @@ -178,6 +180,7 @@ + @@ -233,6 +236,7 @@ + @@ -472,10 +476,12 @@ + + @@ -547,6 +553,7 @@ + @@ -558,6 +565,7 @@ + @@ -565,6 +573,7 @@ + @@ -580,6 +589,7 @@ + @@ -1193,6 +1203,7 @@ + diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl b/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl index 2bd07d8d29e4..581b8b8d3421 100644 --- a/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl +++ b/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl @@ -55,12 +55,14 @@ + http://dublincore.org/documents/dcmi-terms/ CSS helper variable will be created... + CSS variable ready, header will be created... @@ -68,6 +70,7 @@ CSS header creation finished! + @@ -246,11 +249,13 @@ + + @@ -262,6 +267,7 @@ en-US + @@ -271,6 +277,7 @@ + @@ -280,13 +287,16 @@ , + + Content-Type application/xhtml+xml; charset=utf-8 + @@ -304,6 +314,7 @@ + @@ -315,6 +326,7 @@ + @@ -322,6 +334,7 @@ + @@ -329,18 +342,21 @@ + DCTERMS.source http://xml.openoffice.org/odf2xhtml + + @@ -348,12 +364,14 @@ + + @@ -361,6 +379,7 @@ + @@ -369,6 +388,7 @@ + @@ -380,6 +400,7 @@ + @@ -387,6 +408,7 @@
[Libreoffice-commits] core.git: filter/source
filter/source/xslt/odf2xhtml/export/xhtml/body.xsl | 11 filter/source/xslt/odf2xhtml/export/xhtml/header.xsl| 31 filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl |6 ++ 3 files changed, 48 insertions(+) New commits: commit d2e8705c9cc503afdaed366b1f71ed012b0c568f Author: Franklin Weng AuthorDate: Wed Mar 1 00:04:11 2023 +0800 Commit: Miklos Vajna CommitDate: Thu Mar 9 07:43:14 2023 + tdf#153839: add newline after certain tags Add newline after certain tags in head section and paragraphs, to make generated xhtml easier to read. Change-Id: I9562ef48d9dd1283110be4a45527616dce186681 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148026 Tested-by: Jenkins Reviewed-by: Miklos Vajna diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl index 430b834b3cca..ca7a6906b82c 100644 --- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl +++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl @@ -50,9 +50,11 @@ + + @@ -178,6 +180,7 @@ + @@ -233,6 +236,7 @@ + @@ -472,10 +476,12 @@ + + @@ -547,6 +553,7 @@ + @@ -558,6 +565,7 @@ + @@ -565,6 +573,7 @@ + @@ -580,6 +589,7 @@ + @@ -1193,6 +1203,7 @@ + diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl b/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl index 2bd07d8d29e4..581b8b8d3421 100644 --- a/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl +++ b/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl @@ -55,12 +55,14 @@ + http://dublincore.org/documents/dcmi-terms/ CSS helper variable will be created... + CSS variable ready, header will be created... @@ -68,6 +70,7 @@ CSS header creation finished! + @@ -246,11 +249,13 @@ + + @@ -262,6 +267,7 @@ en-US + @@ -271,6 +277,7 @@ + @@ -280,13 +287,16 @@ , + + Content-Type application/xhtml+xml; charset=utf-8 + @@ -304,6 +314,7 @@ + @@ -315,6 +326,7 @@ + @@ -322,6 +334,7 @@ + @@ -329,18 +342,21 @@ + DCTERMS.source http://xml.openoffice.org/odf2xhtml + + @@ -348,12 +364,14 @@ + + @@ -361,6 +379,7 @@ + @@ -369,6 +388,7 @@ + @@ -380,6 +400,7 @@ + @@ -387,6 +408,7 @@ + @@ -394,6 +416,7 @@
[Libreoffice-commits] core.git: xmlsecurity/source
xmlsecurity/source/dialogs/certificatechooser.cxx | 16 +---
1 file changed, 9 insertions(+), 7 deletions(-)
New commits:
commit 648990692c8253e3843c4c5954940e8b893d5f3e
Author: Franklin Weng
AuthorDate: Sun Aug 18 21:30:05 2019 +0800
Commit: Katarina Behrens
CommitDate: Tue Aug 20 15:14:48 2019 +0200
tdf#116862 do not encrypt to self when encryption key is not set
When "always encrypt to self" is checked but no encryption key is set,
encrypting a file with GPG key would cause error. So check if
msPreferredKey is empty or not before comparing with sIssuer.
Change-Id: I4d95f0b436cb1fafad1d57d50330fd2080902b69
Reviewed-on: https://gerrit.libreoffice.org/77665
Tested-by: Jenkins
Reviewed-by: Katarina Behrens
diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx
b/xmlsecurity/source/dialogs/certificatechooser.cxx
index 32c688f2a257..795e9bf3ae07 100644
--- a/xmlsecurity/source/dialogs/certificatechooser.cxx
+++ b/xmlsecurity/source/dialogs/certificatechooser.cxx
@@ -220,13 +220,15 @@ void CertificateChooser::ImplInitialize()
#if HAVE_FEATURE_GPGME
// only GPG has preferred keys
-if ( sIssuer == msPreferredKey )
-{
-if ( meAction == UserAction::Sign || meAction ==
UserAction::SelectSign )
-m_xCertLB->select(nRow);
-else if ( meAction == UserAction::Encrypt &&
- aUserOpts.GetEncryptToSelf() )
-mxEncryptToSelf = xCert;
+if ( !sIssuer.isEmpty() && !msPreferredKey.isEmpty() ) {
+if ( sIssuer == msPreferredKey )
+{
+if ( meAction == UserAction::Sign || meAction ==
UserAction::SelectSign )
+m_xCertLB->select(nRow);
+else if ( meAction == UserAction::Encrypt &&
+ aUserOpts.GetEncryptToSelf() )
+mxEncryptToSelf = xCert;
+}
}
#endif
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
