[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - 2 commits - filter/source

[Svante Schubert (via logerrit)]

 filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl   |   71 
--
 filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl |   17 
+-
 filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl |5 
 3 files changed, 78 insertions(+), 15 deletions(-)

New commits:
commit a76264131c72f25b79a90a5ede50c7e43b903adb
Author: Svante Schubert 
AuthorDate: Mon Jul 10 22:33:13 2023 +0200
Commit: Michael Stahl 
CommitDate: Wed Jul 12 10:57:58 2023 +0200

tdf#156093 filter: XHTML export: Enabling previous test files ...

... again and neglecting @draw:fill-color in base style to avoid
duplication of fo:background

Change-Id: I4905a7f8371d422944172140ab04c6bad6e7bd77
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154296
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 0ee798d3a4cc90629e96f0f6c780c2887ae521d0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154312

diff --git 
a/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl 
b/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
index a120ab68052c..bdad6da4bf45 100644
--- a/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
@@ -576,7 +576,7 @@
 

-
+
 
 
 
commit bdf1de15b1f3d8ff2c474674f4248f875c630ffe
Author: Svante Schubert 
AuthorDate: Mon Jul 10 20:31:32 2023 +0200
Commit: Michael Stahl 
CommitDate: Wed Jul 12 10:57:54 2023 +0200

tdf#156093 filter: XHTML export: Enabled all three different ...

... influences for CSS background-color: fo:background-color,
draw:fill-color and draw:fill='none' the latter is the value
'transparent'

Change-Id: I8891bbaca224ad5f4340cded93182523e396223f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154295
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit e2735d07e4bd9af0edfa561112393b9ae92ff923)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154311

diff --git 
a/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl 
b/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
index bac0c5963ccd..a120ab68052c 100644
--- a/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
@@ -504,6 +504,8 @@
 
 
 
+
 
 
 
@@ -511,9 +513,59 @@

 
 
-
+
+
+
+
+
+
+transparent
+
+
+
+
+
+
+
+transparent
+
+
+
+
+
+
+
+
+
 
 
+
+
+
+transparent
+
+
+
+
+
+
+
+
+
+
+transparent
+
+
+
+
+
+
+
 
 
 
@@ -568,21 +620,20 @@
 
 
 
-all-doc-styles
+all-doc-styles:start
 
-style
-style:family=""
-style:name="" 
-   *
+***style:start
+style:family=""
+style:name=""
+   with properties:
 
 
 
 =""
 
-/
-/style
+***style:end
 
-/all-doc-styles
+all-doc-styles:end
 
 
 
diff --git 
a/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl 
b/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
index 06e22d7e2fed..56b17331a0b9 100644
--- a/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
@@ -22,11 +22,18 @@
 

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - 2 commits - filter/source

[Svante Schubert (via logerrit)]

 filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl   |   71 
--
 filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl |   17 
+-
 filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl |5 
 3 files changed, 78 insertions(+), 15 deletions(-)

New commits:
commit 8295682360042fd75c89066bb5d90ed58869c9e0
Author: Svante Schubert 
AuthorDate: Mon Jul 10 22:33:13 2023 +0200
Commit: Michael Stahl 
CommitDate: Wed Jul 12 10:57:42 2023 +0200

tdf#156093 filter: XHTML export: Enabling previous test files ...

... again and neglecting @draw:fill-color in base style to avoid
duplication of fo:background

Change-Id: I4905a7f8371d422944172140ab04c6bad6e7bd77
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154296
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 0ee798d3a4cc90629e96f0f6c780c2887ae521d0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154310

diff --git 
a/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl 
b/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
index a120ab68052c..bdad6da4bf45 100644
--- a/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
@@ -576,7 +576,7 @@
 

-
+
 
 
 
commit e4fd1eb62005eece26f712204b3ed8c28b9d4da4
Author: Svante Schubert 
AuthorDate: Mon Jul 10 20:31:32 2023 +0200
Commit: Michael Stahl 
CommitDate: Wed Jul 12 10:57:34 2023 +0200

tdf#156093 filter: XHTML export: Enabled all three different ...

... influences for CSS background-color: fo:background-color,
draw:fill-color and draw:fill='none' the latter is the value
'transparent'

Change-Id: I8891bbaca224ad5f4340cded93182523e396223f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154295
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit e2735d07e4bd9af0edfa561112393b9ae92ff923)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154269

diff --git 
a/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl 
b/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
index bac0c5963ccd..a120ab68052c 100644
--- a/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
@@ -504,6 +504,8 @@
 
 
 
+
 
 
 
@@ -511,9 +513,59 @@

 
 
-
+
+
+
+
+
+
+transparent
+
+
+
+
+
+
+
+transparent
+
+
+
+
+
+
+
+
+
 
 
+
+
+
+transparent
+
+
+
+
+
+
+
+
+
+
+transparent
+
+
+
+
+
+
+
 
 
 
@@ -568,21 +620,20 @@
 
 
 
-all-doc-styles
+all-doc-styles:start
 
-style
-style:family=""
-style:name="" 
-   *
+***style:start
+style:family=""
+style:name=""
+   with properties:
 
 
 
 =""
 
-/
-/style
+***style:end
 
-/all-doc-styles
+all-doc-styles:end
 
 
 
diff --git 
a/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl 
b/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
index 06e22d7e2fed..56b17331a0b9 100644
--- a/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
@@ -22,11 +22,18 @@
 

[Libreoffice-commits] core.git: 2 commits - filter/source

[Svante Schubert (via logerrit)]

 filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl   |   71 
--
 filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl |   17 
+-
 filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl |5 
 3 files changed, 78 insertions(+), 15 deletions(-)

New commits:
commit 0ee798d3a4cc90629e96f0f6c780c2887ae521d0
Author: Svante Schubert 
AuthorDate: Mon Jul 10 22:33:13 2023 +0200
Commit: Michael Stahl 
CommitDate: Tue Jul 11 15:22:53 2023 +0200

tdf#156093 filter: XHTML export: Enabling previous test files ...

... again and neglecting @draw:fill-color in base style to avoid
duplication of fo:background

Change-Id: I4905a7f8371d422944172140ab04c6bad6e7bd77
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154296
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git 
a/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl 
b/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
index a120ab68052c..bdad6da4bf45 100644
--- a/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
@@ -576,7 +576,7 @@
 

-
+
 
 
 
commit e2735d07e4bd9af0edfa561112393b9ae92ff923
Author: Svante Schubert 
AuthorDate: Mon Jul 10 20:31:32 2023 +0200
Commit: Michael Stahl 
CommitDate: Tue Jul 11 15:22:48 2023 +0200

tdf#156093 filter: XHTML export: Enabled all three different ...

... influences for CSS background-color: fo:background-color,
draw:fill-color and draw:fill='none' the latter is the value
'transparent'

Change-Id: I8891bbaca224ad5f4340cded93182523e396223f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154295
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git 
a/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl 
b/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
index bac0c5963ccd..a120ab68052c 100644
--- a/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
@@ -504,6 +504,8 @@
 
 
 
+
 
 
 
@@ -511,9 +513,59 @@

 
 
-
+
+
+
+
+
+
+transparent
+
+
+
+
+
+
+
+transparent
+
+
+
+
+
+
+
+
+
 
 
+
+
+
+transparent
+
+
+
+
+
+
+
+
+
+
+transparent
+
+
+
+
+
+
+
 
 
 
@@ -568,21 +620,20 @@
 
 
 
-all-doc-styles
+all-doc-styles:start
 
-style
-style:family=""
-style:name="" 
-   *
+***style:start
+style:family=""
+style:name=""
+   with properties:
 
 
 
 =""
 
-/
-/style
+***style:end
 
-/all-doc-styles
+all-doc-styles:end
 
 
 
diff --git 
a/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl 
b/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
index 06e22d7e2fed..56b17331a0b9 100644
--- a/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
@@ -22,11 +22,18 @@
 http://www.w3.org/1999/XSL/Transform; 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:dc="http://purl.org/dc/elements/1.1/; 
xmlns:dom="http://www.w3.org/2001/xml-

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - filter/source sc/CppunitTest_sc_html_export_test.mk sc/qa sw/qa

[Svante Schubert (via logerrit)]

 filter/source/xslt/odf2xhtml/export/common/table/table_rows.xsl |5 
 filter/source/xslt/odf2xhtml/export/common/table_of_content.xsl |   25 
 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl  |  345 
+-
 filter/source/xslt/odf2xhtml/export/xhtml/header.xsl|7 
 filter/source/xslt/odf2xhtml/export/xhtml/table.xsl |6 
 sc/CppunitTest_sc_html_export_test.mk   |5 
 sc/qa/extras/htmlexporttest.cxx |   25 
 sc/qa/extras/testdocuments/default-styles.ods   |binary
 sw/qa/extras/htmlexport/xhtmlexport.cxx |   23 
 9 files changed, 401 insertions(+), 40 deletions(-)

New commits:
commit 62fb87155c6edad3bb4e2d69b46ba4d2ef45f762
Author: Svante Schubert 
AuthorDate: Wed May 17 17:44:39 2023 +0200
Commit: Michael Stahl 
CommitDate: Mon Jun 12 10:42:49 2023 +0200

tdf#155244 filter: XHTML export: Making ODF style IDs unique for ...

... HTML/CSS by adding a prefix (the @style:family with '-' as glue 
character)
to their style name.

Disabled debug output for style:family-name in XSL

add text:a to text family

... and add a unit test.

Change-Id: Ie846f5ea2a872872f38036aff59d29c8f530ed32
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152749
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 2d9f739ccfead38cdaa13780f7bb5172553dbd77)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152813

diff --git a/filter/source/xslt/odf2xhtml/export/common/table/table_rows.xsl 
b/filter/source/xslt/odf2xhtml/export/common/table/table_rows.xsl
index 2d6cd7285037..60b47be753ca 100644
--- a/filter/source/xslt/odf2xhtml/export/common/table/table_rows.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/table/table_rows.xsl
@@ -196,7 +196,10 @@
 
 
 
-
+
+
+
+
 
 
 
diff --git a/filter/source/xslt/odf2xhtml/export/common/table_of_content.xsl 
b/filter/source/xslt/odf2xhtml/export/common/table_of_content.xsl
index 7a04bee074a8..0f36b36486de 100644
--- a/filter/source/xslt/odf2xhtml/export/common/table_of_content.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/table_of_content.xsl
@@ -93,7 +93,10 @@
 
 
 
-
+
+
+
+
 
 
 
@@ -317,7 +320,10 @@ Scenarios unmatched:
 
 
 
-
+
+
+
+
 
 
 
@@ -341,7 +347,10 @@ Scenarios unmatched:
 
 
 
-
+
+
+
+
 
 
 
@@ -358,7 +367,10 @@ Scenarios unmatched:
 
 
 
-
+
+
+
+
 
 
 
@@ -382,7 +394,10 @@ Scenarios unmatched:
 
 
 
-
+
+
+
+
 
 
 
diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl 
b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index 0aa44114efa0..13b8d6a0a436 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -19,7 +19,7 @@
 
-http://www.w3.org/1999/XSL/Transform; 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xm

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - filter/source sc/CppunitTest_sc_html_export_test.mk sc/qa sw/qa

[Svante Schubert (via logerrit)]

 filter/source/xslt/odf2xhtml/export/common/table/table_rows.xsl |5 
 filter/source/xslt/odf2xhtml/export/common/table_of_content.xsl |   25 
 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl  |  345 
+-
 filter/source/xslt/odf2xhtml/export/xhtml/header.xsl|7 
 filter/source/xslt/odf2xhtml/export/xhtml/table.xsl |6 
 sc/CppunitTest_sc_html_export_test.mk   |5 
 sc/qa/extras/htmlexporttest.cxx |   18 
 sc/qa/extras/testdocuments/default-styles.ods   |binary
 sw/qa/extras/htmlexport/xhtmlexport.cxx |   23 
 9 files changed, 394 insertions(+), 40 deletions(-)

New commits:
commit ea5a96e10f93a285279da4ade8104f85c1a95dfc
Author: Svante Schubert 
AuthorDate: Wed May 17 17:44:39 2023 +0200
Commit: Michael Stahl 
CommitDate: Fri Jun 9 16:53:46 2023 +0200

tdf#155244 filter: XHTML export: Making ODF style IDs unique for ...

... HTML/CSS by adding a prefix (the @style:family with '-' as glue 
character)
to their style name.

Disabled debug output for style:family-name in XSL

add text:a to text family

... and add a unit test.

Change-Id: Ie846f5ea2a872872f38036aff59d29c8f530ed32
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152749
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 97c07f2ceca336f9659538fc63c600c0a1d51dfe)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152812

diff --git a/filter/source/xslt/odf2xhtml/export/common/table/table_rows.xsl 
b/filter/source/xslt/odf2xhtml/export/common/table/table_rows.xsl
index 2d6cd7285037..60b47be753ca 100644
--- a/filter/source/xslt/odf2xhtml/export/common/table/table_rows.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/table/table_rows.xsl
@@ -196,7 +196,10 @@
 
 
 
-
+
+
+
+
 
 
 
diff --git a/filter/source/xslt/odf2xhtml/export/common/table_of_content.xsl 
b/filter/source/xslt/odf2xhtml/export/common/table_of_content.xsl
index 7a04bee074a8..0f36b36486de 100644
--- a/filter/source/xslt/odf2xhtml/export/common/table_of_content.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/table_of_content.xsl
@@ -93,7 +93,10 @@
 
 
 
-
+
+
+
+
 
 
 
@@ -317,7 +320,10 @@ Scenarios unmatched:
 
 
 
-
+
+
+
+
 
 
 
@@ -341,7 +347,10 @@ Scenarios unmatched:
 
 
 
-
+
+
+
+
 
 
 
@@ -358,7 +367,10 @@ Scenarios unmatched:
 
 
 
-
+
+
+
+
 
 
 
@@ -382,7 +394,10 @@ Scenarios unmatched:
 
 
 
-
+
+
+
+
 
 
 
diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl 
b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index 9706c1df0615..7b3c7e4d3b17 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -19,7 +19,7 @@
 
-http://www.w3.org/1999/XSL/Transform; 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xm

[Libreoffice-commits] core.git: filter/source sc/CppunitTest_sc_html_export_test.mk sc/qa sw/qa

[Svante Schubert (via logerrit)]

 filter/source/xslt/odf2xhtml/export/common/table/table_rows.xsl |5 
 filter/source/xslt/odf2xhtml/export/common/table_of_content.xsl |   25 
 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl  |  345 
+-
 filter/source/xslt/odf2xhtml/export/xhtml/header.xsl|7 
 filter/source/xslt/odf2xhtml/export/xhtml/table.xsl |6 
 sc/CppunitTest_sc_html_export_test.mk   |5 
 sc/qa/extras/htmlexporttest.cxx |   18 
 sc/qa/extras/testdocuments/default-styles.ods   |binary
 sw/qa/extras/htmlexport/xhtmlexport.cxx |   23 
 9 files changed, 394 insertions(+), 40 deletions(-)

New commits:
commit 2d9f739ccfead38cdaa13780f7bb5172553dbd77
Author: Svante Schubert 
AuthorDate: Wed May 17 17:44:39 2023 +0200
Commit: Michael Stahl 
CommitDate: Fri Jun 9 15:12:40 2023 +0200

tdf#155244 filter: XHTML export: Making ODF style IDs unique for ...

... HTML/CSS by adding a prefix (the @style:family with '-' as glue 
character)
to their style name.

Disabled debug output for style:family-name in XSL

add text:a to text family

... and add a unit test.

Change-Id: Ie846f5ea2a872872f38036aff59d29c8f530ed32
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152749
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/filter/source/xslt/odf2xhtml/export/common/table/table_rows.xsl 
b/filter/source/xslt/odf2xhtml/export/common/table/table_rows.xsl
index 2d6cd7285037..60b47be753ca 100644
--- a/filter/source/xslt/odf2xhtml/export/common/table/table_rows.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/table/table_rows.xsl
@@ -196,7 +196,10 @@
 
 
 
-
+
+
+
+
 
 
 
diff --git a/filter/source/xslt/odf2xhtml/export/common/table_of_content.xsl 
b/filter/source/xslt/odf2xhtml/export/common/table_of_content.xsl
index 7a04bee074a8..0f36b36486de 100644
--- a/filter/source/xslt/odf2xhtml/export/common/table_of_content.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/table_of_content.xsl
@@ -93,7 +93,10 @@
 
 
 
-
+
+
+
+
 
 
 
@@ -317,7 +320,10 @@ Scenarios unmatched:
 
 
 
-
+
+
+
+
 
 
 
@@ -341,7 +347,10 @@ Scenarios unmatched:
 
 
 
-
+
+
+
+
 
 
 
@@ -358,7 +367,10 @@ Scenarios unmatched:
 
 
 
-
+
+
+
+
 
 
 
@@ -382,7 +394,10 @@ Scenarios unmatched:
 
 
 
-
+
+
+
+
 
 
 
diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl 
b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index 9706c1df0615..7b3c7e4d3b17 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -19,7 +19,7 @@
 
-http://www.w3.org/1999/XSL/Transform; 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:dc="http://purl.org/dc/elements/1.1/; 
xmlns:dom="htt

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - filter/source sd/qa sw/qa

[Svante Schubert (via logerrit)]

 filter/source/xslt/odf2xhtml/export/common/body.xsl |2 
 filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl |2 
 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl  |  118 
++
 sd/qa/unit/HtmlExportTest.cxx   |   30 
++
 sd/qa/unit/data/tdf154989.odg   |binary
 sw/qa/extras/htmlexport/xhtmlexport.cxx |   10 
 6 files changed, 110 insertions(+), 52 deletions(-)

New commits:
commit cb27c6c1b82272e8812bcb446e7179cc4f32bf34
Author: Svante Schubert 
AuthorDate: Fri May 5 12:26:53 2023 +0200
Commit: Michael Stahl 
CommitDate: Mon May 8 17:21:42 2023 +0200

tdf#154989 filter: XHTML export: avoid duplicated frames

Various updates on XSLT ODF2HTML triggered by TDF issue 154989 - esp. 
image/frame positioning by CSS position

(regression from commit f680b6d74209fd78c547201b2f14c6547e55c81b)

Change-Id: I4d08a67ebca7ae3808db07c828488bb9284623a3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151094
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit b70e2ee3ec5bfd21f27597195b745171932032e8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151510

diff --git a/filter/source/xslt/odf2xhtml/export/common/body.xsl 
b/filter/source/xslt/odf2xhtml/export/common/body.xsl
index bcad3abd9ab3..8dfb78222186 100644
--- a/filter/source/xslt/odf2xhtml/export/common/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/body.xsl
@@ -81,7 +81,7 @@
 
 
 
-
+
 
 
 
diff --git 
a/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl 
b/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
index c81cc9a1e0be..06e22d7e2fed 100644
--- a/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
@@ -23,7 +23,7 @@
 
 
 
-
+
 background-color:
 
 ; 
diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl 
b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index ca7a6906b82c..6f64b5a83d82 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -141,15 +141,21 @@
 
 
 
+
 
 
 
 
-
+
 
 
 max-width:
-
+
+;
+
+
+max-height:
+
 ;
 
 
@@ -251,20 +257,20 @@
 Next 'div' was a 'draw:text-box'.
 
 
-
-
-
-
+
+
+
+
 
-
+
 
-
+
 
 
-
-
-
 
+
+
+
 
 
 
@@ -359,11 +365,12 @@
 
 
 
+
 
 
 
 
-
+
 
 
@@ -415,7 +422,7 @@
  is an unbreakable whitespace to give content to the 
element and force a browser not to ignore the element -->
 
 
-
+  
  
 
-
+
 
 
 
@@ -689,6 +696,7 @@
 
 
 
+
 
 
@@ -698,7 +706,10 @@
 p
 
 
-
+
+Next 'div' was a 'text:p'.
+
+
 
 
 
 
 
@@ -808,17 +819,17 @@
 
 
 
-
+
 
 
 
-
 
 
 
 
 
 
+
 
 
 
@@ -839,7 +850,7 @@
 
-
+
 
 
 
@@ -914,13 +925,13 @@
 
 
 
-
+
 
 
 
 
 
-
+
 
 
 
@@ -964,7 +97

[Libreoffice-commits] core.git: filter/source

[Svante Schubert (via logerrit)]

 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl |   20 +++-
 1 file changed, 3 insertions(+), 17 deletions(-)

New commits:
commit 603934447c19033acc5590c37efffe208b65bbd8
Author: Svante Schubert 
AuthorDate: Fri May 5 14:05:54 2023 +0200
Commit: Michael Stahl 
CommitDate: Mon May 8 09:43:11 2023 +0200

XHTML export: Removing former 'ugly' - now redundant- fix added by

tdf146264 as now made redundant by prior changes

Change-Id: I6747e33d1ffd4812d8881e10cda2300e7d79e1b3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151468
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 59636c5835f7..de1e9750aa43 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -367,7 +367,6 @@
 
 
 
-
 
 
 
@@ -702,7 +701,6 @@
 
 
 
-
 
 
@@ -825,7 +823,6 @@
 
 
 
-
 
 
 
@@ -835,7 +832,6 @@
 
 
 
-
 
 
 
@@ -855,14 +851,9 @@
 
 cm;
 
-
-
-
-
-
-
+
+
+
 
 
 
@@ -933,13 +924,11 @@
 
 
 
-
 
 
 
 
 
-
 
 
 
@@ -983,7 +972,6 @@
 
 
 
-
 
 
 
@@ -1063,7 +1051,6 @@
 
 
 
-
 
 
 
@@ -2603,7 +2590,6 @@
 
 
 
-
 
 
 

[Libreoffice-commits] core.git: 2 commits - filter/source

[Svante Schubert (via logerrit)]

 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 1f92ade0ae1e54f3220a62d17068f77d09e72e87
Author: Svante Schubert 
AuthorDate: Fri May 5 13:43:06 2023 +0200
Commit: Michael Stahl 
CommitDate: Mon May 8 09:42:56 2023 +0200

XHTML export: Removing bullet prefix, which is not viewed in LO - similar

to tdf146264

Change-Id: Iba9a3ca8591591300b4a432caf280935ef8d193a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151467
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 d7cfddc66a5d..59636c5835f7 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -2093,7 +2093,8 @@
 
 
 
-
+
 
 
commit 5178ade8a12cc52c02cd6288932e5a85dfbaea1b
Author: Svante Schubert 
AuthorDate: Fri May 5 13:09:17 2023 +0200
Commit: Michael Stahl 
CommitDate: Mon May 8 09:42:46 2023 +0200

XHTML export: Removing bullet suffix, which is not viewed in LO - see 
tdf146264

Change-Id: I017c0b6deb84f01f98beddf2b24c0b3500e23e89
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151466
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 6ad03e260d8c..d7cfddc66a5d 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -1115,7 +1115,7 @@
 cm; 
 
 
-
+
 
  position:absolute; left:
 
@@ -2095,7 +2095,8 @@
 
 
 
-
+
 
 
 

[Libreoffice-commits] core.git: filter/source sd/qa sw/qa

[Svante Schubert (via logerrit)]

 filter/source/xslt/odf2xhtml/export/common/body.xsl |2 
 filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl |2 
 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl  |  118 
++
 sd/qa/unit/HtmlExportTest.cxx   |   24 
++
 sd/qa/unit/data/tdf154989.odg   |binary
 sw/qa/extras/htmlexport/xhtmlexport.cxx |   10 
 6 files changed, 104 insertions(+), 52 deletions(-)

New commits:
commit e857b12dada1468cb3bdb49ed5ea636df0b6d153
Author: Svante Schubert 
AuthorDate: Fri May 5 12:26:53 2023 +0200
Commit: Michael Stahl 
CommitDate: Mon May 8 09:42:22 2023 +0200

tdf#154989 filter: XHTML export: avoid duplicated frames

Various updates on XSLT ODF2HTML triggered by TDF issue 154989 - esp. 
image/frame positioning by CSS position

(regression from commit f680b6d74209fd78c547201b2f14c6547e55c81b)

Change-Id: I4d08a67ebca7ae3808db07c828488bb9284623a3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151094
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/filter/source/xslt/odf2xhtml/export/common/body.xsl 
b/filter/source/xslt/odf2xhtml/export/common/body.xsl
index bcad3abd9ab3..8dfb78222186 100644
--- a/filter/source/xslt/odf2xhtml/export/common/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/body.xsl
@@ -81,7 +81,7 @@
 
 
 
-
+
 
 
 
diff --git 
a/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl 
b/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
index c81cc9a1e0be..06e22d7e2fed 100644
--- a/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
@@ -23,7 +23,7 @@
 
 
 
-
+
 background-color:
 
 ; 
diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl 
b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index fca8d9a763b7..6ad03e260d8c 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -141,15 +141,21 @@
 
 
 
+
 
 
 
 
-
+
 
 
 max-width:
-
+
+;
+
+
+max-height:
+
 ;
 
 
@@ -253,20 +259,20 @@
 
 
 
-
-
-
-
+
+
+
+
 
-
+
 
-
+
 
 
-
-
-
 
+
+
+
 
 
 
@@ -361,11 +367,12 @@
 
 
 
+
 
 
 
 
-
+
 
 
@@ -421,7 +428,7 @@
  is an unbreakable whitespace to give content to the 
element and force a browser not to ignore the element -->
 
 
-
+  
  
 
-
+
 
 
 
@@ -695,6 +702,7 @@
 
 
 
+
 
 
@@ -704,7 +712,10 @@
 p
 
 
-
+
+Next 'div' was a 'text:p'.
+
+
 
 
 
 
 
@@ -814,17 +825,17 @@
 
 
 
-
+
 
 
 
-
 
 
 
 
 
 
+
 
 
 
@@ -847,7 +858,7 @@
 
-
+
 
 
 
@@ -922,13 +933,13 @@
 
 
 
-
+
 
 
 
 
 
-
+
 
 
 
@@ -972,7 +983,7 @@
 
 
 
-
+
 
 
 
@@ -1052,15 +106

Re: Idea of a "strict" version of LO for publishers

[Svante Schubert]

Hi all,

there are different approaches to solving this scenario. Three that come
instantly to my mind:

   1. The existence of an ODF application where customers could select the
   allowed set of ODF features (e.g. disable all automatic styles for some
   scenarios - like translators) or allow only certain subsets of
   functionality (a certain type of tables and images must have a caption,
   etc.), has been a customer wish since my early times at StarOffice 1999. My
   bet would be that adding this ability to LibreOffice might be the most
   costly solution.
   2. The discipline of the editors and the alignment of requirements with
   predefined styles seem one of the easiest and cheapest solutions. But there
   would be no validation.
   3. Nevertheless, as Thorsten mentioned, TDF has well the ODF Toolkit
    in its portfolio, which contains for
   instance the ODF Validator  and the ODFDOM
   library  for
   creating, manipulating and reading ODF documents on the server-side using
   Java. Scenarios like, the listing and later elimination of automatic styles
   by exchanging them for adequate template styles might be handled by this
   library for the ODF specification. Also, as you required, some
   user-specific validation or constraint functions like the check that only
   one style is applied to a paragraph and one enrichment applied to a word
   could be added on top of ODFDOM. At least this would be likely my approach
   to solving the problem.

Have a nice weekend,
Svante


Am Sa., 9. Apr. 2022 um 18:30 Uhr schrieb Andreas Kage :

> From the view of a publishing scientist and lecturer LO is quite perfect
> to generate a variety of formats (PDF, ePub etc ) out of the odt file. The
> odt XML style can excellently handle the different Paragraph Styles
> (regular, list, legends and such) but also the implementation of different
> languages (greek, Special European Unicode) as well as other objects such
> as formulas and more.
> What is still missing and might be able to realize with your available
> budget to s certain extent is a systematic format set of Styles for the
> different scientific journals and University styles.
>
> --
> Diese Nachricht wurde von meinem Android Mobiltelefon mit GMX Mail
> gesendet.
> Am 07.04.22, 19:13 schrieb Yves Picard :
>
>> Hello,
>> On the advice of Sophie Gautier, I would like to tell you about one of
>> our "research and development" projects, for which I have a budget of about
>> two thousand euros. As a university publisher, we maintain electronic
>> publishing channels from word processing to several publishing formats
>> (html, epub, InDesign, PDF), passing through a pivot format in XML TEI.
>> This pivot format is itself derived from an XML export from Libre Office.
>>
>> A significant part of our work consists of tracking down and containing
>> artefacts from the word processor (Word or Libre Office), in particular
>> style nesting, automatic styles or language attributes, etc.
>>
>> I'm looking to test the idea of a "strict" version of LO that would
>> ensure that one style and one style only is applied to a paragraph, that
>> one enrichment and one enrichment only is applied to a word (no use of
>> styles like "accentuation" for example) or that a web link is always
>> findable despite the style applied. This would probably be an "amnesiac"
>> version of LO (without memory of the various manipulations) which would
>> either be used by authors (difficult to set up) or would be used by the
>> editor by loading an author file in this strict version.
>>
>> An alternative (and probably better) idea would be a "big cleaner" tool
>> that would flatten all style or attribute nesting to the author's work.
>>
>> I'm looking for an opinion from the Libre Office community on the
>> feasibility of such a development, while being well aware that it goes
>> against the logic of the word processor in some way. But such a version, I
>> believe, would meet the expectations of the publishing world.
>>
>> Thank you for your attention,
>>
>> Regards,
>>
>> Yves Picard,
>> Presses universitaires de Rennes,
>> France.
>>
>

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - filter/source

[Svante Schubert (via logerrit)]

 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl |  112 ++---
 1 file changed, 34 insertions(+), 78 deletions(-)

New commits:
commit fb8714eebdb34d6f3604c1a2801777f624829fcc
Author: Svante Schubert 
AuthorDate: Thu Sep 10 16:17:37 2020 +0200
Commit: Xisco Fauli 
CommitDate: Fri May 21 09:34:05 2021 +0200

HTML MathML update - enabling inline MATHML & fixing duplication 
(regression from last commit)

Change-Id: I22dba4fef5d1de7e4ef056a2e7f33511fa91318d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111621
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115880

diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl 
b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index ad74d3716b45..b36a1e08fd46 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -386,6 +386,8 @@
 
 
 
+
+
 
-
-
-
+
 
-
+
 
 
-
-
+
 
 
 
@@ -808,14 +808,14 @@
 
 
 
-
+
 
 Next 'div' added for 
floating.
 
 
-position:relative; left:
+display:inline; position:relative; 
left:
 
 cm;
 
@@ -830,42 +830,38 @@
 
 
 
-
-
-
+
 
 
 
-
 
 
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
 
-
+
 
 
-
 
-
+
 
 
 
 
 
 
-
-
-
+
 
 
-
+
 
 
 
@@ -876,20 +872,16 @@
 
 
 
-
-
-
 
 
-
+
 
 
 
 
 
 
-
-
+
 
 
 
@@ -947,6 +939,7 @@
 
 
 
+
 
 
 
@@ -965,7 +958,7 @@
 
 
 
-
+
 
 
 
@@ -1018,37 +1011,6 @@
 
 
 
-
-
-  
 
 
 
@@ -1061,13 +1023,8 @@
 
 
 
-
-
+
 
-
 
 
 
@@ -1095,13 +1052,7 @@
 replacement image and keep only the id attribute.
 See fdo#66645 -->
 
- 
 
-
- 
 
 
 
@@ -3015,6 +2966,11 @@
 
 
 
+
+
+inline
+
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - filter/source

[Svante Schubert (via logerrit)]

 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl |   20 
 1 file changed, 16 insertions(+), 4 deletions(-)

New commits:
commit 932be9b55ce8b996184e724127925c436130cecd
Author: Svante Schubert 
AuthorDate: Wed Sep 9 15:27:54 2020 +0200
Commit: Xisco Fauli 
CommitDate: Fri May 21 09:32:48 2021 +0200

tdf#118637: HTML XSLT: Adding missing MathML siblings.

The floating draw:frame sibling content being text were not shown, nor 
further occuring draw:frame (other MathML)

Change-Id: Ifc5cdd4c58bdf01ceebcf10c01b85cdf96b60d26
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111620
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115879

diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl 
b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index 83171a1f4d1a..ad74d3716b45 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -380,8 +380,20 @@
 
 
 
-
-
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -876,7 +888,7 @@
 
 
 
-
+
 
 
 
@@ -1049,7 +1061,7 @@
 
 
 
-
+
 
 
 

[Libreoffice-commits] core.git: filter/source

[Svante Schubert (via logerrit)]

 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c66994690853445e37c6f66ebd25d130d3430293
Author: Svante Schubert 
AuthorDate: Fri Oct 9 14:08:31 2020 +0200
Commit: Michael Stahl 
CommitDate: Tue Mar 2 13:25:01 2021 +0100

HTML XSLT: Adding explicitly whitespace - prior been erased in patch - as 
it is often missing in our LO version used to create the MathML

Change-Id: I90468c89297b5f3d70e7ba61cde5481069fc600b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111622
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 71f6fa20ec4d..f55c7ee97009 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -1058,7 +1058,7 @@
 replacement image and keep only the id attribute.
 See fdo#66645 -->
 
-
+ 

 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: filter/source

[Svante Schubert (via logerrit)]

 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl |  112 ++---
 1 file changed, 34 insertions(+), 78 deletions(-)

New commits:
commit 06eb655e2c83df8eeeb0c0828f8ac34f13e386af
Author: Svante Schubert 
AuthorDate: Thu Sep 10 16:17:37 2020 +0200
Commit: Michael Stahl 
CommitDate: Tue Mar 2 13:24:37 2021 +0100

HTML MathML update - enabling inline MATHML & fixing duplication 
(regression from last commit)

Change-Id: I22dba4fef5d1de7e4ef056a2e7f33511fa91318d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111621
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 aa3c956d7c9f..71f6fa20ec4d 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -386,6 +386,8 @@
 
 
 
+
+
 
-
-
-
+
 
-
+
 
 
-
-
+
 
 
 
@@ -814,14 +814,14 @@
 
 
 
-
+
 
 Next 'div' added for 
floating.
 
 
-position:relative; left:
+display:inline; position:relative; 
left:
 
 cm;
 
@@ -836,42 +836,38 @@
 
 
 
-
-
-
+
 
 
 
-
 
 
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
 
-
+
 
 
-
 
-
+
 
 
 
 
 
 
-
-
-
+
 
 
-
+
 
 
 
@@ -882,20 +878,16 @@
 
 
 
-
-
-
 
 
-
+
 
 
 
 
 
 
-
-
+
 
 
 
@@ -953,6 +945,7 @@
 
 
 
+
 
 
 
@@ -971,7 +964,7 @@
 
 
 
-
+
 
 
 
@@ -1024,37 +1017,6 @@
 
 
 
-
-
-  
 
 
 
@@ -1067,13 +1029,8 @@
 
 
 
-
-
+
 
-
 
 
 
@@ -1101,13 +1058,7 @@
 replacement image and keep only the id attribute.
 See fdo#66645 -->
 
- 
 
-
- 
 
 
 
@@ -3047,6 +2998,11 @@
 
 
 
+
+
+inline
+
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: filter/source

[Svante Schubert (via logerrit)]

 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl |   20 
 1 file changed, 16 insertions(+), 4 deletions(-)

New commits:
commit f680b6d74209fd78c547201b2f14c6547e55c81b
Author: Svante Schubert 
AuthorDate: Wed Sep 9 15:27:54 2020 +0200
Commit: Michael Stahl 
CommitDate: Tue Mar 2 13:24:15 2021 +0100

HTML XSLT: Adding missing MathML siblings. The floating draw:frame sibling 
content being text were not shown, nor further occuring draw:frame (other 
MathML)

Change-Id: Ifc5cdd4c58bdf01ceebcf10c01b85cdf96b60d26
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111620
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 7754538e2ea5..aa3c956d7c9f 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -380,8 +380,20 @@
 
 
 
-
-
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -882,7 +894,7 @@
 
 
 
-
+
 
 
 
@@ -1055,7 +1067,7 @@
 
 
 
-
+
 
 
 

[Libreoffice-commits] core.git: filter/source

[Svante Schubert (via logerrit)]

 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl |   16 
 1 file changed, 12 insertions(+), 4 deletions(-)

New commits:
commit 86ca384cab26f2731e099c821edfa9636f8b55d5
Author: Svante Schubert 
AuthorDate: Fri Aug 28 10:31:54 2020 +0200
Commit: Michael Stahl 
CommitDate: Tue Mar 2 13:23:51 2021 +0100

HTML XSLT: Added missing listLevelStyle parameter otherwise prefix/suffix 
did not work for list level > 1

Change-Id: I5bddde8ad620d91163688e6748b15e14693c41b8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111619
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 b3276a4ba358..7754538e2ea5 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -1724,6 +1724,8 @@
 
 
 
+
 
 
 
@@ -1974,7 +1976,7 @@
 
 
 
 
 
@@ -2496,7 +2504,6 @@
 
 
 
-
 
 
 
@@ -2504,10 +2511,10 @@
 
 
 
-
+
 
 
-
+
 
 
 
@@ -2734,6 +2741,7 @@
 
 
 
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - filter/source

[Svante Schubert (via logerrit)]

 filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl |   62 
+-
 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl|   44 
+--
 2 files changed, 66 insertions(+), 40 deletions(-)

New commits:
commit fbe545c4eeb48ec847f48afa9573d0514fc51f63
Author: Svante Schubert 
AuthorDate: Wed Aug 26 13:50:10 2020 +0200
Commit: Michael Stahl 
CommitDate: Tue Mar 2 13:23:33 2021 +0100

HTML XSLT: Appendix headings looked incorrect (in general heading within 
lists were missing HTML element heading number)

Change-Id: I125b095a436be3c6d9f5f64496564d63ea10a5fb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111618
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 53af56fa2f94..b3276a4ba358 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -2623,7 +2623,8 @@
 
 
 
-
+
+
 
 
 
commit 9d3b39cf9fed9a305ac23d1ecaaafc8f7caaeeb0
Author: Svante Schubert 
AuthorDate: Wed Aug 26 13:44:57 2020 +0200
Commit: Michael Stahl 
CommitDate: Tue Mar 2 13:23:17 2021 +0100

HTML XSLT: Missing paragraph BORDER of stand-alone border paragraph 
(@style:join-border problem)

Change-Id: I20afce950213d4d55541d66a438db14a54b6ddd1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111617
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git 
a/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl 
b/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
index d1c8f189be85..389be7da5638 100644
--- a/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
@@ -514,9 +514,17 @@
 
 
 
+
+
+
+
+
+
+
+

-
+
 
 
 
@@ -702,40 +710,28 @@
 
 
 
+
 
 
+and
+   (
+ not($style/*/@style:join-border)
+or  $style/*/@style:join-border = 'true'
+   )">
 
 
 
@@ -751,8 +747,7 @@
 
 
 
-
-
+
 
 
 
@@ -776,6 +771,17 @@
  border-top-style:none;
 
 
+
+
+
+
+
+
+
+
+
+
+
 
 
 
diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl 
b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index 62a2cf613b19..53af56fa2f94 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -704,13 +704,19 @@
 
 
 
-
+
+
 
-
+
 
 
 
 
+
+
+
+
+
 
 
 
@@ -1610,14 +1616,27 @@
 
 
 The indent of a list label is not only calculated by using the 
text:space-before of the list level (listLevelStyle), but
-as well taking the left margin of the first paragraph (or heading) of 
the list into account as loy match="" name="" use=""/>ng it is not negative.
-
-|   MARGIN LEFT |LABEL   |
-
-|   text:space-before (listlevelstyle)  | text:min-label-width   |
-| + fo:left-margin (firstParagraph) ||
-
-Further details beyond text:list-list...
+as well taking the left margin of the first paragraph (or heading) of 
the lis

[Libreoffice-commits] core.git: filter/source

[Svante Schubert (via logerrit)]

 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl |   48 +
 1 file changed, 21 insertions(+), 27 deletions(-)

New commits:
commit 3b7f5202cc7f799a692e6dd09e71926336727c25
Author: Svante Schubert 
AuthorDate: Tue Aug 25 14:25:05 2020 +0200
Commit: Michael Stahl 
CommitDate: Tue Mar 2 13:22:54 2021 +0100

HTML XSLT: 1)FEATURE: ODF @text:min-label-distance becomes CSS 
padding-right; 2) FIX: List @text:style-name only exists at root and have to be 
provided by parameter within recursion

Change-Id: I287482ddbe394815268ef84d3207af2b0fdd3e18
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111616
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 09d4ed43c5e2..62a2cf613b19 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -1628,7 +1628,7 @@
 
 
 
-
+
 
 
 
@@ -1976,6 +1976,7 @@
 
 
 
+
 
 
 
@@ -2007,20 +2008,13 @@
 
 
 
-
-
-
-
-
-
-
-
-

-

-
-
-
-
+
+
+
+
+
+
+
 
 
 
@@ -2049,6 +2043,9 @@
 
0
 
 cm;
+
+
padding-right:cm;
+
 
 
 
@@ -2086,16 +2083,6 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
 
 
 
@@ -2110,12 +2097,15 @@
 
 ;min-width:
 
-
-
+
+
 
 0
 
 cm
+
+
padding-right:cm;
+
 
 
 
@@ -2191,6 +2181,7 @@
 
 
 
+
 
 
 
@@ -2206,6 +2197,7 @@
 
 
 
+
 
 
 
@@ -2540,6 +2532,7 @@
 
 
 
+
 
 
 
@@ -2588,6 +2581,7 @@
 
 
 
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: filter/source sw/qa

[Svante Schubert (via logerrit)]

 filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl |7 
+++
 sw/qa/extras/htmlexport/xhtmlexport.cxx |2 
+-
 2 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 26271331c8da8c872f29463d9c390b1b570eb020
Author: Svante Schubert 
AuthorDate: Mon Aug 24 17:22:41 2020 +0200
Commit: Michael Stahl 
CommitDate: Tue Mar 2 13:22:27 2021 +0100

HTML XSLT: Overtaking masking ' for ODF font-family with spaces in names

Change-Id: I718fc232a3903d0b449a4c9a4ef4dff601744756
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111615
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git 
a/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl 
b/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
index d4418725f2fc..c81cc9a1e0be 100644
--- a/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
@@ -214,12 +214,11 @@
 
 
 
-font-family:"
+font-family:
 
-'
 
-
-"; 
+
+; 
 
 
 
diff --git a/sw/qa/extras/htmlexport/xhtmlexport.cxx 
b/sw/qa/extras/htmlexport/xhtmlexport.cxx
index 218bb4772eb4..f60d8b912fad 100644
--- a/sw/qa/extras/htmlexport/xhtmlexport.cxx
+++ b/sw/qa/extras/htmlexport/xhtmlexport.cxx
@@ -49,7 +49,7 @@ DECLARE_HTMLEXPORT_TEST(testTdf131812, "tdf131812.odt")
 sal_uInt64 nLength = pStream->TellEnd();
 OString aStream(read_uInt8s_ToOString(*pStream, nLength));
 CPPUNIT_ASSERT(
-aStream.indexOf(".P1 { font-size:12pt; font-family:\"Liberation 
Serif\"; "
+aStream.indexOf(".P1 { font-size:12pt; font-family:\'Liberation 
Serif\'; "
 "writing-mode:horizontal-tb; direction:rtl; 
text-align:right ! important;}")
 != -1);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: filter/source

[Svante Schubert (via logerrit)]

 filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit 795f89c7d1e4ade6cdaa12cb4ba0857ae3b1e02e
Author: Svante Schubert 
AuthorDate: Mon Aug 24 17:14:42 2020 +0200
Commit: Michael Stahl 
CommitDate: Tue Mar 2 13:22:03 2021 +0100

HTML XSLT: Adding default language for accessiblity

Change-Id: I1e608239bd2524f0d2372871f465d926ea24ba42
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111614
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl 
b/filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl
index e81b93ce4235..196b85eae859 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl
@@ -145,7 +145,18 @@
 
 
 
+
+ 
+ 
+ 
+ 
+ en-US
+ 
+
+
 
+
+
 This file was converted to xhtml by LibreOffice - see 
https://cgit.freedesktop.org/libreoffice/core/tree/filter/source/xslt for the 
code.
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: filter/source

[Svante Schubert (via logerrit)]

 filter/source/xslt/odf2xhtml/export/xhtml/header.xsl |5 -
 1 file changed, 5 deletions(-)

New commits:
commit c920bf759080159a323cc3bb58f275c020913223
Author: Svante Schubert 
AuthorDate: Mon Aug 24 12:39:00 2020 +0200
Commit: Michael Stahl 
CommitDate: Tue Mar 2 13:21:42 2021 +0100

HTML XSLT: Removing old IE7 fix, which was enabled by fixing invalid CSS 
and corrupts layout these days

Change-Id: Ic5531439521a94be9dadabff7278f964472aa39f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111613
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl 
b/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
index 110b88aeff43..2bd07d8d29e4 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
@@ -105,11 +105,6 @@
 
 li { list-style: none; margin:0; padding:0;}
 
-/* "li span.odfLiEnd" - IE 7 issue*/
-
-
-li span { clear: both; line-height:0; width:0; height:0; margin:0; 
padding:0; }
-
 span.footnodeNumber { padding-right:1em; }
 
 span.annotation_style_by_filter { font-size:95%; font-family:Arial; 
background-color:#fff000;  margin:0; border:0; padding:0;  }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - filter/source

[Svante Schubert (via logerrit)]

 filter/source/xslt/odf2xhtml/export/xhtml/header.xsl |   30 ++-
 1 file changed, 17 insertions(+), 13 deletions(-)

New commits:
commit a973087c2380738b20d8fe2b91f9f534169714f0
Author: Svante Schubert 
AuthorDate: Mon Aug 24 12:08:27 2020 +0200
Commit: Michael Stahl 
CommitDate: Tue Mar 2 13:21:23 2021 +0100

HTML XSLT: List empty CSS styles (ODF styles without CSS mappable styles) 
only as a comment

Change-Id: I0be491ff96d0b454d064618426da5aa3f861b7f3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111612
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl 
b/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
index d5043d07c4b0..110b88aeff43 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
@@ -137,8 +137,9 @@
 
 
 
-/* ODF styles with no properties representable as 
CSS */
- { }
+/* ODF styles with no properties representable as 
CSS:
+ { } */
+
 
 
 
commit 3282db181aa63dda00ca7c45af1037911762e5b3
Author: Svante Schubert 
AuthorDate: Mon Aug 24 11:48:01 2020 +0200
Commit: Michael Stahl 
CommitDate: Tue Mar 2 13:21:04 2021 +0100

HTML XSLT: Only write page {} information when they exist

Change-Id: I213645835745e992fe6f2aa79a678d177a97c45f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111611
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl 
b/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
index 8264aa50ad67..d5043d07c4b0 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
@@ -167,20 +167,23 @@
  
 
 
-@page { 
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
 
+
+@page { 
+
  }
 
-
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: filter/source sw/qa

[Svante Schubert (via logerrit)]

 filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl |   14 
+++---
 sw/qa/extras/htmlexport/xhtmlexport.cxx |2 
-
 2 files changed, 12 insertions(+), 4 deletions(-)

New commits:
commit 63b4f0c693cf181e63772170c0c2c6179ec1b621
Author: Svante Schubert 
AuthorDate: Mon Aug 24 11:47:07 2020 +0200
Commit: Michael Stahl 
CommitDate: Tue Mar 2 13:20:44 2021 +0100

HTML XSLT: Placing font-family names within 'double quotation marks' in 
case of spaces within the font name

Change-Id: I780845df636c6a07bd621fa01cb60134d3ead592
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111610
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git 
a/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl 
b/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
index ec5b680df150..d4418725f2fc 100644
--- a/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
@@ -79,13 +79,21 @@
 
 
 
-
+
 
 :
 
 ; 
 
 
+
+
+
+:"
+
+"; 
+
+
 
 
 
@@ -206,12 +214,12 @@
 
 
 
-font-family:
+font-family:"
 
 '
 
 
-; 
+"; 
 
 
 
diff --git a/sw/qa/extras/htmlexport/xhtmlexport.cxx 
b/sw/qa/extras/htmlexport/xhtmlexport.cxx
index 85adfa2b7b49..218bb4772eb4 100644
--- a/sw/qa/extras/htmlexport/xhtmlexport.cxx
+++ b/sw/qa/extras/htmlexport/xhtmlexport.cxx
@@ -49,7 +49,7 @@ DECLARE_HTMLEXPORT_TEST(testTdf131812, "tdf131812.odt")
 sal_uInt64 nLength = pStream->TellEnd();
 OString aStream(read_uInt8s_ToOString(*pStream, nLength));
 CPPUNIT_ASSERT(
-aStream.indexOf(".P1 { font-size:12pt; font-family:Liberation Serif; "
+aStream.indexOf(".P1 { font-size:12pt; font-family:\"Liberation 
Serif\"; "
 "writing-mode:horizontal-tb; direction:rtl; 
text-align:right ! important;}")
 != -1);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - filter/source

[Svante Schubert (via logerrit)]

 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl   |   14 --
 filter/source/xslt/odf2xhtml/export/xhtml/header.xsl |2 +-
 2 files changed, 13 insertions(+), 3 deletions(-)

New commits:
commit 83def17aa0c861b05582dc37c8a9d4ed39e3ba33
Author: Svante Schubert 
AuthorDate: Mon Aug 24 11:20:32 2020 +0200
Commit: Michael Stahl 
CommitDate: Tue Mar 2 13:20:24 2021 +0100

HTML XSLT: Set default to 0 in case of not-a-number: min-width:NaNcm

This had a conflict with commit 9804cb2f195451811eff8924d7997a3cbd6d679d

Fixing bodx.xsl: Invalid min-width:NaN check (Michael's GitHub Review)

Change-Id: I0bd5bbae1411c6b4892bf332e6ff3c7027f8c341
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111609
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 9408d971f9c6..09d4ed43c5e2 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -2042,7 +2042,12 @@
 
 
 ;min-width:
-
+
+
+
+
+
0
+
 cm;
 
 
@@ -2104,7 +2109,12 @@
 
 
 ;min-width:
-
+
+
+
+
+0
+
 cm
 
 
commit 7f2eb7b641a9864d2335ed4abdaaee1b79dd1028
Author: Svante Schubert 
AuthorDate: Mon Aug 24 09:30:58 2020 +0200
Commit: Michael Stahl 
CommitDate: Tue Mar 2 13:19:59 2021 +0100

HTML XSLT: Fixing CSS selector

Change-Id: I4c26f71936e6df655bb5c11bf9137b91ca894cce
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111608
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl 
b/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
index 4eeb9b0b9837..8264aa50ad67 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
@@ -108,7 +108,7 @@
 /* "li span.odfLiEnd" - IE 7 issue*/
 
 
-li span. { clear: both; line-height:0; width:0; height:0; margin:0; 
padding:0; }
+li span { clear: both; line-height:0; width:0; height:0; margin:0; 
padding:0; }
 
 span.footnodeNumber { padding-right:1em; }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: filter/source

[Svante Schubert (via logerrit)]

 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bae5202e00cd7af80d366f2a9a3e30f558856661
Author: Svante Schubert 
AuthorDate: Mon Aug 24 09:28:25 2020 +0200
Commit: Michael Stahl 
CommitDate: Tue Mar 2 13:19:29 2021 +0100

HTML XSLT: Excluding loext namespace from output

Change-Id: I603e8eec319c83b1cb1a47dd095d82761dda3cd5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111607
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 8c9cb705d967..9408d971f9c6 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -19,7 +19,7 @@
 
-http://www.w3.org/1999/XSL/Transform; 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:dc="http://purl.org/dc/elements/1.1/; 
xmlns:dom="http://www.w3.org/2001/xml-events; 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:ooo="http://openoffice.org/2004/office; 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:s
 tyle="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:xforms="http://www.w3.org/2002/xforms; 
xmlns:xlink="http://www.w3.org/1999/xlink; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xmlns:xt="http://www.jclark.com/xt; xmlns:common="http://exslt.org/common; 
xmlns:xalan="http://xml.apache.org/xalan; 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 exclude-result-prefixes="chart config dc dom dr3d draw fo form math meta 
number office ooo oooc ooow script style svg table text xforms xlink xsd xsi xt 
common xalan" xmlns="http://www.w3.org/1999/xhtml;>
+http://www.w3.org/1999/XSL/Transform; 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:dc="http://purl.org/dc/elements/1.1/; 
xmlns:dom="http://www.w3.org/2001/xml-events; 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:ooo="http://openoffice.org/2004/office; 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:s
 tyle="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:xforms="http://www.w3.org/2002/xforms; 
xmlns:xlink="http://www.w3.org/1999/xlink; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xmlns:xt="http://www.jclark.com/xt; xmlns:common="http://exslt.org/common; 
xmlns:xalan="http://xml.apache.org/xalan; 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 exclude-result-prefixes="chart config dc dom dr3d draw fo form loext math meta 
number office ooo oooc ooow script style svg table text xforms xlink xsd xsi xt 
common xalan" xmlns="http://www.w3.org/1999/xhtml;>
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: filter/source

[Svante Schubert (via logerrit)]

 filter/source/xslt/odf2xhtml/export/xhtml/header.xsl |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 5e2e94de2c1bcbb387de51328d1777ba3b92117c
Author: Svante Schubert 
AuthorDate: Mon Aug 24 09:27:07 2020 +0200
Commit: Michael Stahl 
CommitDate: Tue Mar 2 13:19:04 2021 +0100

HTML XSLT: Neglecting redundant @type of style

Change-Id: I64d26ba023910b6c7743c2c4f60bcc2ca4cd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111606
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl 
b/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
index a4b50816e033..4eeb9b0b9837 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
@@ -77,7 +77,9 @@
 
 
 
-text/css
+  
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: filter/source

[Svante Schubert (via logerrit)]

 filter/source/xslt/odf2xhtml/export/xhtml/header.xsl|   36 ++--
 filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl |1 
 2 files changed, 31 insertions(+), 6 deletions(-)

New commits:
commit 36c3db0ab81187830adf2443dd6b9d8efef6faee
Author: Svante Schubert 
AuthorDate: Mon Aug 10 17:56:12 2020 +0200
Commit: Michael Stahl 
CommitDate: Tue Mar 2 13:18:46 2021 +0100

Minor XSL updates to improve for the XHTML of our specification

Change-Id: I8a4f82e3e67c1f9f9e7c0b228216036cee22eb71
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111605
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl 
b/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
index 522ad4823d63..a4b50816e033 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
@@ -371,11 +371,31 @@
 
 
 
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -401,6 +421,10 @@
 
 
 
+
+
+
+
 
 http://purl.org/dc/elements/1.1/; 
hreflang="en" />
 http://purl.org/dc/terms/; 
hreflang="en" />
@@ -430,7 +454,7 @@
 
 
 
-
+
 
 
 
diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl 
b/filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl
index e872d58dbdad..e81b93ce4235 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl
@@ -132,6 +132,7 @@
 
 
 
+XSL Vendor: ''
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

EOL in sight for loext: namespace (?) / Smoke Tests & CodeCognita of LO Code - earlier: Re: Code Coverage LibreOffice

[Svante Schubert]

Hej,

Today at the FOSDEM <https://fosdem.org/2021/>, I did two lightning talks
(5min) on ODF Features in the LibreOffice developers room
<https://fosdem.org/2021/schedule/track/libreoffice/>.

   1. ODF Feature priority handling of the ODF TC
   <https://youtu.be/TjjhaF3rK3I>
   I would suggest in the future a priority handling for new ODF Features
   from ODF applications and create right away an ODF community specification
   to allow vendors to already use OASIS ODF namespaces instead
   intermediate ones. This would require a faster (semi-automated) creation of
   our specification as we started already on GitHub:
   http://github.com/oasis-tcs/odf-tc
   2. ODF Feature testing <https://youtu.be/GmKT91fkc1k>
   I would suggest to to use coverage tests of ODF Feature to create a
   'Code Cognita' (a map of the source codes, where features are being
   implemented).
   Especially, this approach is applicable to any ODF applications (e.g.
   Gnumeric & MS Office).
   ODF Features are likely to become the new denominator.

These are just drafts of ideas and quite far from being professional (kids
at home & too little time), but perhaps you are able to connect the dots...
;-)

Cheers,
Svante

Am Di., 3. Nov. 2020 um 13:11 Uhr schrieb Svante Schubert <
svante.schub...@gmail.com>:

> Dear LO developers,
>
> A simple/naive idea:
> Loading ODT files into LO while doing a coverage test.
> The source code coverage DIFF will reveal the source code being used
> exclusively for the ODT feature DIFF of the two documents.
>
> For example:
>
>1. Load a very simple test document, like a single paragraph with
>"Hello World" with LibreOffice and during load doing a code coverage test
>to identify all the source code, which is being used for loading the ODF
>test document.
>2. Enhance the simple test document by a single feature, like making
>the text bold and do the loading & code coverage again.
>3. The difference (DIFF) between the two source code coverages
>represents source code exclusively relevant to the feature bold.
>4. Future commits changing source code of such an "ODF feature area"
>would trigger the load/save roundtrip test of these special ODF test
>document(s).
>*The advantage is to have a relevant minimum regression test not
>taking long to execute.*
>
> I already interviewed Maarten, yesterday, who wrote some years ago scripts
> to run the coverage tests on LO, but they seem not to be executed for a
> long time:
> https://dev-builds.libreoffice.org/lcov_reports/master-2015-06-10_23.49.39/
>
> Is there some LO build VM available that can be extended to reactivate the
> code coverage tests, so interested parties might follow this approach?
> Especially, I am longing for a "black box script" where I can give a text
> file with a list of ODF files as an input parameter to be code-cover-tested
> and receive for each input ODF the code coverage as a text file. Is there
> any script that can e used?
> In post-processing, the source code DIFF would than be created afterwards.
> Shouldn't be too difficult (famous last words)... ;-)
>
> Is anyone interested to join this adventure? :-)
>
> Cheers,
> Svante
>
> -- Forwarded message -
> Von: Maarten Hoes 
> Date: Mo., 2. Nov. 2020 um 22:35 Uhr
> Subject: Re: Code Coverage LibreOffice
> To: Svante Schubert 
> Cc: Michael Stahl 
>
>
> Hi Svante/Michael,
>
>
> I'm glad to be of help, if I can be. :)
>
> First of all, a disclaimer: I'm not a developer. I can write Unix/Linux
> shell scripts, and used to be a professional Unix/Linux system
> administrator, but I couldn't write a 'hello world' program in C or C++ if
> my life depended on it.
>
> Perhaps I should start with some basics. When talking about 'code
> coverage', people generally mean 'measure what source code gets executed'
> (generally by the execution of a test suite), so that you can see how much
> and what parts of the source code gets covered by the test suite.
>
> There is a wiki page [1] that describes how to set up lcov/gcov on Linux
> for the LibreOffice codebase, but I can't tell how accurate or up to date
> that wiki page currently is. Years ago, I wrote a shell script to automate
> that [2] process. If I recall correctly, it used to be run automatically
> (daily ?) by Jenkins, but the host/vm the job ran on became unavailable
> ages ago, and no-one seemed to notice or care enough to restore it. Old
> examples of what the generated reports look like can be found on the
> dev-builds.libreoffice.org website [3].
>
> The process basically looks somewhat like this:
>
> - Compile your code using additional flags, so that a record will be 

Re: Calc memory consumption

[Svante Schubert]

Hi Daniel,

I share Michael's hobby of collecting 'shapes' of pathological spreadsheets.

Could you please ask someone with access to this interesting XLSX document
to be so gentle to:

   1. Validate the XLSX: https://archive.codeplex.com/?p=ooxmlvalidator
   (collect the results)
   2. Anonymize the document, e.g. exchanging business data via
   https://github.com/Motorrat/anonyxel
   3. Check if the problem still occurs being anonymized, otherwise please
   switch some relevant data back until it occurs (or remove sensitive data
   manually) ;-)
   4. Attach the anonymized XSLX & prior validation results to an issue:
   https://wiki.documentfoundation.org/QA/BugReport

Thanks in advance, Daniel.
Svante

Am Fr., 22. Jan. 2021 um 12:18 Uhr schrieb Daniel Armando Rodriguez <
drodrig...@documentfoundation.org>:

> El 2021-01-21 17:35, Michael Meeks escribió:
> > On 20/01/2021 10:29, Daniel A. Rodriguez wrote:
>  Hi, exists some kind of formula to estimate how much RAM a
>  spreadsheet
>  could use? For instance 468K rows and columns from A to AG.
> >>
> >> Well, trying to do something with such file using an i3 based PC with
> >> 4Gb freezes the software completely.
> >
> >   Both Tor and Noel are right; but I collect the 'shape' of
> pathological
> > spreadsheets as a hobby =)
> >
> >   Can you tell me:
> >
> >   + what data-type is in each column
> >   + whether the column is sparse (ie, are
> > there 'holes' in the data)
> >   + what formulae are used - and what their shape is ?
> >   + hopefully formulae are normally
> > non-confidential
>
> Don't have access to the file so have asked
>
> >   + what file format you're using.
>
> XLSX, it's exported from the software the company use
>
> >
> >   But of course, this really doesn't belong on the dev list, but in
> a
> > bug
> > if you have one ?
>
> Nope, just acting as an intermediate in this case
>
> >   In case nothing jumps out of the above data, possibly running a
> > sampling profiler under Linux like 'perf' might show what's being slow,
> > though I imagine it sounds like a memory issue (perhaps even a
> > transient
> > memory use) problem.
> >
> >   Thanks ! =)
> >
> >   Michael.
>
> --
> DAR
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Fwd: Code Coverage LibreOffice

[Svante Schubert]

Dear LO developers,

A simple/naive idea:
Loading ODT files into LO while doing a coverage test.
The source code coverage DIFF will reveal the source code being used
exclusively for the ODT feature DIFF of the two documents.

For example:

   1. Load a very simple test document, like a single paragraph with "Hello
   World" with LibreOffice and during load doing a code coverage test to
   identify all the source code, which is being used for loading the ODF test
   document.
   2. Enhance the simple test document by a single feature, like making the
   text bold and do the loading & code coverage again.
   3. The difference (DIFF) between the two source code coverages
   represents source code exclusively relevant to the feature bold.
   4. Future commits changing source code of such an "ODF feature area"
   would trigger the load/save roundtrip test of these special ODF test
   document(s).
   *The advantage is to have a relevant minimum regression test not taking
   long to execute.*

I already interviewed Maarten, yesterday, who wrote some years ago scripts
to run the coverage tests on LO, but they seem not to be executed for a
long time:
https://dev-builds.libreoffice.org/lcov_reports/master-2015-06-10_23.49.39/

Is there some LO build VM available that can be extended to reactivate the
code coverage tests, so interested parties might follow this approach?
Especially, I am longing for a "black box script" where I can give a text
file with a list of ODF files as an input parameter to be code-cover-tested
and receive for each input ODF the code coverage as a text file. Is there
any script that can e used?
In post-processing, the source code DIFF would than be created afterwards.
Shouldn't be too difficult (famous last words)... ;-)

Is anyone interested to join this adventure? :-)

Cheers,
Svante

-- Forwarded message -
Von: Maarten Hoes 
Date: Mo., 2. Nov. 2020 um 22:35 Uhr
Subject: Re: Code Coverage LibreOffice
To: Svante Schubert 
Cc: Michael Stahl 


Hi Svante/Michael,


I'm glad to be of help, if I can be. :)

First of all, a disclaimer: I'm not a developer. I can write Unix/Linux
shell scripts, and used to be a professional Unix/Linux system
administrator, but I couldn't write a 'hello world' program in C or C++ if
my life depended on it.

Perhaps I should start with some basics. When talking about 'code
coverage', people generally mean 'measure what source code gets executed'
(generally by the execution of a test suite), so that you can see how much
and what parts of the source code gets covered by the test suite.

There is a wiki page [1] that describes how to set up lcov/gcov on Linux
for the LibreOffice codebase, but I can't tell how accurate or up to date
that wiki page currently is. Years ago, I wrote a shell script to automate
that [2] process. If I recall correctly, it used to be run automatically
(daily ?) by Jenkins, but the host/vm the job ran on became unavailable
ages ago, and no-one seemed to notice or care enough to restore it. Old
examples of what the generated reports look like can be found on the
dev-builds.libreoffice.org website [3].

The process basically looks somewhat like this:

- Compile your code using additional flags, so that a record will be kept
of what code gets executed.
- Run the test suite (or whatever else of which you want to see what source
code gets executed by running it).
- Generate a human readable report that shows what sourcecode got executed.

Now, on to your specific questions:

1. Yes, lcov/gcov code coverage will show you all the source code lines
that get executed by loading your 'Hello World' test document.
2. Yes, loading the same document multiple times will execute the exact
same source code every time you do it, provided you don't change any of the
conditions (like changing the source code in between runs).
3. Yes, I believe that if you take your 'Hello World' test document, and
make that text bold, then the difference between the two runs should be the
additional code that gets executed by making the text bold.

One thing to note though, as it may not be immediately obvious: When you
start LibreOffice, and open a document, a lot more code will get executed
than 'just' the code needed to display the text in the document. All of
this additional code will get marked as having been executed in the report.
I know of no way around that. So I am assUming (but you know what happens
when we assUme) that you need to be intimately familiar with the entire
LibreOffice codebase in order to differentiate between 'this is code that
gets executed on startup, this is code needed for the GUI, this is code
needed for parsing the document' and 'this is the code for the bold feature
I want to test'. So I'm not so sure if this gets you specifically what you
are looking for. (PS: There is a way to filter out / omit source code that
you are not interested in in the final report, but this filtering is done
on

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 2 commits - filter/source sw/source

[Svante Schubert (via logerrit)]

 filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl   |   13 
++
 filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl |3 
++
 sw/source/filter/ww8/ww8par2.cxx|3 
++
 3 files changed, 15 insertions(+), 4 deletions(-)

New commits:
commit 96ec38abd90a637f3dd0ba497bf84fb9ef060b06
Author: Svante Schubert 
AuthorDate: Wed Jul 8 00:57:33 2020 +0200
Commit: Michael Meeks 
CommitDate: Sat Jul 11 12:08:55 2020 +0200

Fixing top border style by fixing three XSLT issues triggered by...

... new properties in ODF 1.3

* check for fo:border='none'
* missing @ in @fo:background-color
* without default case (xsl:otherwise), end delimiter for "page"
  missing in CSS

Change-Id: Ie5d0c3e8a32de0403534c5a4fa33a5f20393ce69
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98365
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 646cf598633bacc3959fc126c9117f06f3d0f9e3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98335
Reviewed-by: Adolfo Jayme Barrientos 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98515
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 

diff --git 
a/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl 
b/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
index f9b5aff1b363..d1c8f189be85 100644
--- a/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
@@ -705,11 +705,16 @@
 
 
+)">
 
 
 
diff --git 
a/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl 
b/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
index dc07f7e2918b..ec5b680df150 100644
--- a/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
@@ -303,6 +303,9 @@
 
 vertical-lr; 
 
+
+horizontal-tb; direction:ltr;
+
 
 
 
commit 93df58aea6684b9e38b4dd6886c8e707b6458770
Author: Caolán McNamara 
AuthorDate: Tue Jul 7 16:05:19 2020 +0100
Commit: Michael Meeks 
CommitDate: Sat Jul 11 12:08:41 2020 +0200

ofz#23961 pad back to original length

in case of multi-byte input encoding resulting in a shorter output string 
than
input

Change-Id: Ieb4bb7b5f4551ca22e87c573233f083901f3d3c0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98273
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98516
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 

diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 058662e47c12..c96f74b28559 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -615,6 +615,9 @@ void SwWW8ImplReader::SetAnlvStrings(SwNumFormat , 
WW8_ANLV const ,
 return;
 }
 sText = OUString(reinterpret_cast(pText), nLen, 
eCharSet);
+// ofz#23961 in case of multi-byte input encoding resulting in shorter
+// output pad to full length with something semi-arbitrary
+comphelper::string::padToLength(sText, nLen, cBulletChar);
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - filter/source

[Svante Schubert (via logerrit)]

 filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl   |   13 
++
 filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl |3 
++
 2 files changed, 12 insertions(+), 4 deletions(-)

New commits:
commit 340ab639ed3e65e6b3d2b54cbb3c70fddf25f23a
Author: Svante Schubert 
AuthorDate: Wed Jul 8 00:57:33 2020 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Jul 8 20:40:05 2020 +0200

Fixing top border style by fixing three XSLT issues triggered by...

... new properties in ODF 1.3

* check for fo:border='none'
* missing @ in @fo:background-color
* without default case (xsl:otherwise), end delimiter for "page"
  missing in CSS

Change-Id: Ie5d0c3e8a32de0403534c5a4fa33a5f20393ce69
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98365
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 646cf598633bacc3959fc126c9117f06f3d0f9e3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98335
Reviewed-by: Adolfo Jayme Barrientos 

diff --git 
a/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl 
b/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
index f9b5aff1b363..d1c8f189be85 100644
--- a/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
@@ -705,11 +705,16 @@
 
 
+)">
 
 
 
diff --git 
a/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl 
b/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
index dc07f7e2918b..ec5b680df150 100644
--- a/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
@@ -303,6 +303,9 @@
 
 vertical-lr; 
 
+
+horizontal-tb; direction:ltr;
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - filter/source

[Svante Schubert (via logerrit)]

 filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl   |   13 
++
 filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl |3 
++
 2 files changed, 12 insertions(+), 4 deletions(-)

New commits:
commit a7cf0151eb8068d0aa418171a6acdaddfe8722e2
Author: Svante Schubert 
AuthorDate: Wed Jul 8 00:57:33 2020 +0200
Commit: Michael Stahl 
CommitDate: Wed Jul 8 17:10:28 2020 +0200

Fixing top border style by fixing three XSLT issues triggered by...

... new properties in ODF 1.3

* check for fo:border='none'
* missing @ in @fo:background-color
* without default case (xsl:otherwise), end delimiter for "page"
  missing in CSS

Change-Id: Ie5d0c3e8a32de0403534c5a4fa33a5f20393ce69
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98365
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 646cf598633bacc3959fc126c9117f06f3d0f9e3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98334

diff --git 
a/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl 
b/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
index f9b5aff1b363..d1c8f189be85 100644
--- a/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
@@ -705,11 +705,16 @@
 
 
+)">
 
 
 
diff --git 
a/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl 
b/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
index dc07f7e2918b..ec5b680df150 100644
--- a/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
@@ -303,6 +303,9 @@
 
 vertical-lr; 
 
+
+horizontal-tb; direction:ltr;
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac filter/source

[Svante Schubert (via logerrit)]

 configure.ac|5 
+++
 filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl   |   13 
++
 filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl |3 
++
 3 files changed, 17 insertions(+), 4 deletions(-)

New commits:
commit 646cf598633bacc3959fc126c9117f06f3d0f9e3
Author: Svante Schubert 
AuthorDate: Wed Jul 8 00:57:33 2020 +0200
Commit: Michael Stahl 
CommitDate: Wed Jul 8 14:57:32 2020 +0200

Fixing top border style by fixing three XSLT issues triggered by...

... new properties in ODF 1.3

* check for fo:border='none'
* missing @ in @fo:background-color
* without default case (xsl:otherwise), end delimiter for "page"
  missing in CSS

Change-Id: Ie5d0c3e8a32de0403534c5a4fa33a5f20393ce69
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98365
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git 
a/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl 
b/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
index f9b5aff1b363..d1c8f189be85 100644
--- a/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
@@ -705,11 +705,16 @@
 
 
+)">
 
 
 
diff --git 
a/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl 
b/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
index dc07f7e2918b..ec5b680df150 100644
--- a/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
@@ -303,6 +303,9 @@
 
 vertical-lr; 
 
+
+horizontal-tb; direction:ltr;
+
 
 
 
commit fa654ada6f6a9bd3daf9639119759164cd9ff5a3
Author: Michael Stahl 
AuthorDate: Wed Jul 8 09:51:56 2020 +0200
Commit: Michael Stahl 
CommitDate: Wed Jul 8 14:57:21 2020 +0200

configure: try to fix qconfig.h check

Change-Id: Ie88d36d2f00c920a2d2a3e8fc6a84fdca4552b86
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98314
Reviewed-by: Michael Weghorn 
Reviewed-by: Michael Stahl 
Tested-by: Jenkins

diff --git a/configure.ac b/configure.ac
index 0be03f347d2a..ba23b7211e27 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11930,8 +11930,13 @@ then
 AC_MSG_ERROR([Qt5 headers not found.  Please specify the root of your 
Qt5 installation by exporting QT5DIR before running "configure".])
 fi
 # check for scenario: qt5-qtbase-devel-*.86_64 installed but host is i686
+AC_LANG_PUSH([C++])
+save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="${CPPFLAGS} -I${qt5_incdir}"
 AC_CHECK_HEADER(QtCore/qconfig.h, [],
 [AC_MSG_ERROR(qconfig.h header not found.)], [])
+CPPFLAGS=$save_CPPFLAGS
+AC_LANG_POP([C++])
 
 AC_MSG_CHECKING([for Qt5 libraries])
 qt5_libdir="no"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits