From 2d9f739ccfead38cdaa13780f7bb5172553dbd77 Mon Sep 17 00:00:00 2001
From: Svante Schubert <svante.schubert@gmail.com>
Date: Wed, 17 May 2023 17:44:39 +0200
Subject: [PATCH] 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 <michael.stahl@allotropia.de>
---
 .../export/common/table/table_rows.xsl        |   5 +-
 .../export/common/table_of_content.xsl        |  25 +-
 .../xslt/odf2xhtml/export/xhtml/body.xsl      | 345 ++++++++++++++++--
 .../xslt/odf2xhtml/export/xhtml/header.xsl    |   7 +-
 .../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 | Bin 0 -> 8881 bytes
 sw/qa/extras/htmlexport/xhtmlexport.cxx       |  23 +-
 9 files changed, 394 insertions(+), 40 deletions(-)
 create mode 100644 sc/qa/extras/testdocuments/default-styles.ods

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 @@
         <xsl:param name="node-position" />
 
         <xsl:attribute name="class">
-            <xsl:value-of select="translate(@table:style-name, '. %()/\+', '')" />
+            <xsl:call-template name="create-unique-style-id">
+                <xsl:with-param name="styleName" select="@table:style-name"/>
+                <xsl:with-param name="styleFamily" select="'table-row'"/>
+            </xsl:call-template>
         </xsl:attribute>
     </xsl:template>
 
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 @@
                     </xsl:attribute>
                 </xsl:if>
                 <xsl:attribute name="class">
-                    <xsl:value-of select="translate(parent::*/@text:style-name, '.,;: %()[]/\+', '_____________')"/>
+                    <xsl:call-template name="create-unique-style-id">
+                        <xsl:with-param name="styleName" select="parent::*/@text:style-name"/>
+                        <xsl:with-param name="styleFamily" select="'table'"/>
+                    </xsl:call-template>
                 </xsl:attribute>
             </xsl:if>
 
@@ -317,7 +320,10 @@ Scenarios unmatched:
                     <xsl:element namespace="{$namespace}" name="p">
                         <xsl:if test="$position = 1">
                             <xsl:attribute name="class">
-                                <xsl:value-of select="translate(@text:style-name, '.,;: %()[]/\+', '_____________')"/>
+                                <xsl:call-template name="create-unique-style-id">
+                                    <xsl:with-param name="styleName" select="@text:style-name"/>
+                                    <xsl:with-param name="styleFamily" select="'paragraph'"/>
+                                </xsl:call-template>
                             </xsl:attribute>
                         </xsl:if>
                         <xsl:apply-templates mode="content-table">
@@ -341,7 +347,10 @@ Scenarios unmatched:
                                     <xsl:element namespace="{$namespace}" name="p">
                                         <xsl:if test="$position = 1">
                                             <xsl:attribute name="class">
-                                                <xsl:value-of select="translate(@text:style-name, '.,;: %()[]/\+', '_____________')"/>
+                                                <xsl:call-template name="create-unique-style-id">
+                                                    <xsl:with-param name="styleName" select="@text:style-name"/>
+                                                    <xsl:with-param name="styleFamily" select="'paragraph'"/>
+                                                </xsl:call-template>
                                             </xsl:attribute>
                                         </xsl:if>
                                         <xsl:call-template name="grab-cell-content-before-tab-stop">
@@ -358,7 +367,10 @@ Scenarios unmatched:
                                     <xsl:element namespace="{$namespace}" name="p">
                                         <xsl:if test="$position = 1">
                                             <xsl:attribute name="class">
-                                                <xsl:value-of select="translate(@text:style-name, '.,;: %()[]/\+', '_____________')"/>
+                                                <xsl:call-template name="create-unique-style-id">
+                                                    <xsl:with-param name="styleName" select="@text:style-name"/>
+                                                    <xsl:with-param name="styleFamily" select="'paragraph'"/>
+                                                </xsl:call-template>
                                             </xsl:attribute>
                                         </xsl:if>
                                         <xsl:call-template name="grab-cell-content-before-tab-stop">
@@ -382,7 +394,10 @@ Scenarios unmatched:
                                 <xsl:element namespace="{$namespace}" name="p">
                                     <xsl:if test="$position = 1">
                                         <xsl:attribute name="class">
-                                            <xsl:value-of select="translate(@text:style-name, '.,;: %()[]/\+', '_____________')"/>
+                                            <xsl:call-template name="create-unique-style-id">
+                                                <xsl:with-param name="styleName" select="@text:style-name"/>
+                                                <xsl:with-param name="styleFamily" select="'paragraph'"/>
+                                            </xsl:call-template>
                                         </xsl:attribute>
                                     </xsl:if>
                                     <xsl:element namespace="{$namespace}" name="td">
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 @@
 <!--
     For further documentation and updates visit http://xml.openoffice.org/odf2xhtml
 -->
-<xsl:stylesheet version="1.0" xmlns:xsl="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:style="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">
+<xsl:stylesheet version="1.0" xmlns:xsl="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:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:style="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 presentation script style svg table text xforms xlink xsd xsi xt common xalan" xmlns="http://www.w3.org/1999/xhtml">
 
 
     <!--+++++ INCLUDED XSL MODULES +++++-->
@@ -1207,7 +1207,10 @@
             NOTE: Should be handled as CSS style in style header -->
             <xsl:variable name="min-label" select="$globalData/office:styles/text:outline-style/text:outline-level-style[@text:level = current()/@text:outline-level]/*/@text:min-label-width"/>
             <xsl:attribute name="class">
-                <xsl:value-of select="translate(@text:style-name, '.,;: %()[]/\+', '_____________')"/>
+                <xsl:call-template name="create-unique-style-id">
+                    <xsl:with-param name="styleName" select="@text:style-name"/>
+                    <xsl:with-param name="styleFamily" select="'paragraph'"/>
+                </xsl:call-template>
             </xsl:attribute>
 
             <xsl:call-template name="create-heading-anchor">
@@ -2847,29 +2850,329 @@
         </xsl:choose>
     </xsl:template>
 
-    <xsl:template match="@text:style-name | @draw:style-name | @draw:text-style-name | @table:style-name"><!-- | @presentation:style-name-->
+    <xsl:template match="@text:style-name | @draw:style-name | @draw:text-style-name | @table:style-name | @presentation:style-name">
         <xsl:param name="globalData"/>
 
-        <xsl:attribute name="class">
-        	<xsl:choose>
-        		<xsl:when test="name() = 'draw:text-style-name' or name() = 'draw:style-name'">
-                    <xsl:choose>
-                        <xsl:when test="parent::*/@draw:text-style-name and parent::*/@draw:style-name">
-                            <xsl:value-of select="translate(parent::*/@draw:style-name, '.,;: %()[]/\+', '_____________')" /><xsl:text> </xsl:text>
-                            <xsl:value-of select="translate(parent::*/@draw:text-style-name, '.,;: %()[]/\+', '_____________')" />
-                        </xsl:when>
-                        <xsl:otherwise>
-                            <xsl:value-of select="translate(., '.,;: %()[]/\+', '_____________')" />
-                        </xsl:otherwise>
-                    </xsl:choose>
-                </xsl:when>
-                <xsl:otherwise>
-                    <xsl:value-of select="translate(., '.,;: %()[]/\+', '_____________')"/>
-                </xsl:otherwise>	            
-	        </xsl:choose>    
-        </xsl:attribute>
+        <!-- the probem there can be more than one style-name attribute! We need to write class once with all style-name attribute values -->
+        <xsl:variable name="classAttributeValue">
+            <xsl:if test="parent::*/@text:style-name != ''"> 
+                <xsl:call-template name="create-unique-style-id">
+                    <xsl:with-param name="styleName" select="parent::*/@text:style-name"/>
+                    <xsl:with-param name="styleFamily">
+                        <xsl:call-template name="get-style-family-name">
+                            <xsl:with-param name="parentName" select="name(..)"/>
+                        </xsl:call-template>
+                    </xsl:with-param>
+                </xsl:call-template><xsl:text> </xsl:text>
+            </xsl:if>        
+            <xsl:if test="parent::*/@draw:style-name != ''"> 
+                <xsl:call-template name="create-unique-style-id">
+                    <xsl:with-param name="styleName" select="parent::*/@draw:style-name"/>
+                    <xsl:with-param name="styleFamily">
+                        <xsl:call-template name="get-style-family-name">
+                            <xsl:with-param name="parentName" select="name(..)"/>
+                        </xsl:call-template>
+                    </xsl:with-param>
+                </xsl:call-template><xsl:text> </xsl:text>
+            </xsl:if>
+            <xsl:if test="parent::*/@draw:text-style-name != ''"> 
+                <xsl:call-template name="create-unique-style-id">
+                    <xsl:with-param name="styleName" select="parent::*/@draw:text-style-name"/>
+                    <xsl:with-param name="styleFamily">
+                        <xsl:call-template name="get-style-family-name">
+                            <xsl:with-param name="parentName" select="name(..)"/>
+                        </xsl:call-template>
+                    </xsl:with-param>
+                </xsl:call-template><xsl:text> </xsl:text>
+            </xsl:if>
+            <xsl:if test="parent::*/@table:style-name != ''"> 
+                <xsl:call-template name="create-unique-style-id">
+                    <xsl:with-param name="styleName" select="parent::*/@table:style-name"/>
+                    <xsl:with-param name="styleFamily">
+                        <xsl:call-template name="get-style-family-name">
+                            <xsl:with-param name="parentName" select="name(..)"/>
+                        </xsl:call-template>
+                    </xsl:with-param>
+                </xsl:call-template><xsl:text> </xsl:text>
+            </xsl:if>
+            <xsl:if test="parent::*/@presentation:style-name != ''"> 
+                <xsl:call-template name="create-unique-style-id">
+                    <xsl:with-param name="styleName" select="parent::*/@presentation:style-name"/>
+                    <xsl:with-param name="styleFamily">
+                        <xsl:call-template name="get-style-family-name">
+                            <xsl:with-param name="parentName" select="name(..)"/>
+                        </xsl:call-template>
+                    </xsl:with-param>
+                </xsl:call-template><xsl:text> </xsl:text>
+            </xsl:if>
+        </xsl:variable>
+
+        <xsl:attribute name="class"><xsl:value-of select="normalize-space($classAttributeValue)"/></xsl:attribute>
     </xsl:template>
 
+    
+    <xsl:template name="create-unique-style-id">
+        <xsl:param name="styleName" />
+        <xsl:param name="styleFamily" />
+
+        <xsl:call-template name="abbreviate-style-family-name">
+            <xsl:with-param name="styleFamily" select="$styleFamily"/>
+        </xsl:call-template>
+        <xsl:text>-</xsl:text>
+        <xsl:value-of select="translate($styleName, '.,;: %()[]/\+', '_____________')"/>
+    </xsl:template>
+
+
+    <xsl:template name="abbreviate-style-family-name">
+            <xsl:param name="styleFamily" />
+        <!--<xsl:message>abbreviate-style-family-name: The style family is '<xsl:value-of select="$styleFamily"/>'</xsl:message>-->
+
+        <!-- 
+        	The complete set of family types (aka @style:family) is defined in the ODF specification:
+            	https://docs.oasis-open.org/office/OpenDocument/v1.3/os/part3-schema/OpenDocument-v1.3-os-part3-schema.html#attribute-style_family            
+            (realized style family 'section' is missing, see https://docs.oasis-open.org/office/OpenDocument/v1.3/os/schemas/OpenDocument-v1.3-schema-rng.html#12668 
+                and wrote an issue to ODF TC: https://github.com/oasis-tcs/odf-tc/issues/49
+        -->
+        <xsl:choose>
+            <!-- chart: family name of styles for charts. -->
+            <xsl:when test="$styleFamily='chart'">
+                <xsl:text>chart</xsl:text>
+            </xsl:when>
+            <!-- drawing-page: family name of styles for drawing pages. -->
+            <xsl:when test="$styleFamily='drawing-page'">
+                <xsl:text>page</xsl:text>
+            </xsl:when>
+            <!-- graphic: family name of styles for graphic elements. -->
+            <xsl:when test="$styleFamily='graphic'">
+                <xsl:text>graphic</xsl:text>
+            </xsl:when>
+            <!-- paragraph: family name of styles for paragraphs. -->
+            <xsl:when test="$styleFamily='paragraph'">
+                <xsl:text>paragraph</xsl:text>
+            </xsl:when>
+            <!-- presentation: family name of styles for presentations. -->
+            <xsl:when test="$styleFamily='presentation'">
+                <xsl:text>presentation</xsl:text>
+            </xsl:when>
+            <!-- ruby: family name of styles for ruby text. -->
+            <xsl:when test="$styleFamily='ruby'">
+                <xsl:text>ruby</xsl:text>
+            </xsl:when>
+            <!-- section: family name of styles for sections. -->
+            <xsl:when test="$styleFamily='section'">
+                <xsl:text>section</xsl:text>
+            </xsl:when>            
+            <!-- table: family name of styles for tables. -->
+            <xsl:when test="$styleFamily='table'">
+                <xsl:text>table</xsl:text>
+            </xsl:when>
+            <!-- table-cell: family name of styles for table cells. -->
+            <xsl:when test="$styleFamily='table-cell'">
+                <xsl:text>cell</xsl:text>
+            </xsl:when>
+            <!-- table-column: family name of styles for table columns. -->
+            <xsl:when test="$styleFamily='table-column'">
+                <xsl:text>col</xsl:text>
+            </xsl:when>
+            <!-- table-row: family name of styles for table rows. -->
+            <xsl:when test="$styleFamily='table-row'">
+                <xsl:text>row</xsl:text>
+            </xsl:when>
+            <!-- text: family name of styles for text. -->
+            <xsl:when test="$styleFamily='text'">
+                <xsl:text>text</xsl:text>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:message>WARNING: No style family found for <xsl:value-of select="$styleFamily"/></xsl:message>
+                <xsl:text>unknown-family</xsl:text>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+
+    <xsl:template name="get-style-family-name">
+        <xsl:param name="parentName" />
+
+
+        <!--<xsl:message>get-style-family-name: The style parent is '<xsl:value-of select="name(..)"/>'</xsl:message>-->
+        <!--
+        	The complete set of family types (aka @style:family) is defined in the ODF specification:
+            	https://docs.oasis-open.org/office/OpenDocument/v1.3/os/part3-schema/OpenDocument-v1.3-os-part3-schema.html#attribute-style_family
+            (realized style family 'section' is missing, see https://docs.oasis-open.org/office/OpenDocument/v1.3/os/schemas/OpenDocument-v1.3-schema-rng.html#12668
+                and wrote an issue to ODF TC: https://github.com/oasis-tcs/odf-tc/issues/49
+
+            in addition the mapping of styleable ODF elements to their @style:family attribute is availabe in structured form (XML) in the ODF Toolkit generator project:
+            	https://github.com/tdf/odftoolkit/blob/master/generator/schema2template/src/test/resources/test-input/odf/generation/odfdom-java/dom/grammar-additions.xml#LL43C52-L43C52r-additions.xml#LL43C52-L43C52
+        -->
+        <xsl:choose>
+            <!-- chart: family name of styles for charts. -->
+            <xsl:when test="
+            		$parentName='chart:axis' or
+					$parentName='chart:chart' or
+					$parentName='chart:data-point' or
+					$parentName='chart:error-indicator' or
+					$parentName='chart:floor' or
+					$parentName='chart:footer' or
+					$parentName='chart:grid' or
+					$parentName='chart:legend' or
+					$parentName='chart:mean-value' or
+					$parentName='chart:plot-area' or
+					$parentName='chart:regression-curve' or
+					$parentName='chart:series' or
+					$parentName='chart:stock-gain-marker' or
+					$parentName='chart:stock-loss-marker' or
+					$parentName='chart:stock-range-line' or
+					$parentName='chart:subtitle' or
+					$parentName='chart:title' or
+					$parentName='chart:wall'">
+                <xsl:text>chart</xsl:text>
+            </xsl:when>
+            <!-- drawing-page: family name of styles for drawing pages. -->
+            <xsl:when test="
+            		$parentName='draw:page' or
+            		$parentName='style:handout-master' or
+            		$parentName='style:master-page' or
+        			$parentName='presentation:notes'">
+                <xsl:text>drawing-page</xsl:text>
+            </xsl:when>
+            <!-- graphic: family name of styles for graphic elements. -->
+            <xsl:when test="
+            		$parentName='dr3d:cube' or
+					$parentName='dr3d:extrude' or
+					$parentName='dr3d:rotate' or
+					$parentName='dr3d:scene' or
+					$parentName='dr3d:sphere' or
+					$parentName='draw:caption' or
+					$parentName='draw:circle' or
+					$parentName='draw:connector' or
+					$parentName='draw:control' or
+					$parentName='draw:custom-shape' or
+					$parentName='draw:ellipse' or
+					$parentName='draw:frame' or
+					$parentName='draw:g' or
+					$parentName='draw:line' or
+					$parentName='draw:measure' or
+					$parentName='draw:page-thumbnail' or
+					$parentName='draw:path' or
+					$parentName='draw:polygon' or
+					$parentName='draw:polyline' or
+					$parentName='draw:rect' or
+					$parentName='draw:regular-polygon' or
+					$parentName='office:annotation'">
+                <xsl:text>graphic</xsl:text>
+            </xsl:when>
+            <!-- paragraph: family name of styles for paragraphs. -->
+            <xsl:when test="
+					$parentName='text:alphabetical-index-entry-template' or
+					$parentName='text:bibliography-entry-template' or
+					$parentName='text:h' or
+					$parentName='text:illustration-index-entry-template' or
+					$parentName='text:index-source-style' or
+					$parentName='text:index-title-template' or
+					$parentName='text:object-index-entry-template' or
+					$parentName='text:p' or
+					$parentName='text:table-index-entry-template' or
+					$parentName='text:table-of-content-entry-template' or
+					$parentName='text:user-index-entry-template'">
+                <xsl:text>paragraph</xsl:text>
+            </xsl:when>
+            <!-- presentation: family name of styles for presentations. -->
+            <xsl:when test="
+            		$parentName='dr3d:cube' or
+					$parentName='dr3d:extrude' or
+					$parentName='dr3d:rotate' or
+					$parentName='dr3d:scene' or
+					$parentName='dr3d:sphere' or
+					$parentName='draw:caption' or
+					$parentName='draw:circle' or
+					$parentName='draw:connector' or
+					$parentName='draw:control' or
+					$parentName='draw:custom-shape' or
+					$parentName='draw:ellipse' or
+					$parentName='draw:frame' or
+					$parentName='draw:g' or
+					$parentName='draw:line' or
+					$parentName='draw:measure' or
+					$parentName='draw:page-thumbnail' or
+					$parentName='draw:path' or
+					$parentName='draw:polygon' or
+					$parentName='draw:polyline' or
+					$parentName='draw:rect' or
+					$parentName='draw:regular-polygon' or
+					$parentName='office:annotation'">
+                <xsl:text>presentation</xsl:text>
+            </xsl:when>
+            <!-- ruby: family name of styles for ruby text. -->
+            <xsl:when test="$parentName='text:ruby' or
+            				$parentName='text:ruby-text'">
+                <xsl:text>ruby</xsl:text>
+            </xsl:when>
+            <!-- section: family name of styles for sections. -->
+            <xsl:when test="
+					$parentName='text:alphabetical-index' or
+					$parentName='text:bibliography' or
+					$parentName='text:illustration-index' or
+					$parentName='text:index-title' or
+					$parentName='text:object-index' or
+					$parentName='text:page' or
+					$parentName='text:section' or
+					$parentName='text:s' or
+					$parentName='text:table-index' or
+					$parentName='text:table-of-content' or
+					$parentName='text:user-index'">
+                <xsl:text>section</xsl:text>
+            </xsl:when>
+            <!-- table: family name of styles for tables. -->
+            <xsl:when test="$parentName='table:table'">
+                <xsl:text>table</xsl:text>
+            </xsl:when>
+            <!-- table-cell: family name of styles for table cells. -->
+            <xsl:when test="
+            	$parentName='table:table-cell' or
+				$parentName='table:body' or
+				$parentName='table:even-columns' or
+				$parentName='table:even-rows' or
+				$parentName='table:first-column' or
+				$parentName='table:first-row' or
+				$parentName='table:last-column' or
+				$parentName='table:last-row' or
+				$parentName='table:odd-columns' or
+				$parentName='table:odd-rows' or
+				$parentName='table:covered-table-cell'">
+                <xsl:text>table-cell</xsl:text>
+            </xsl:when>
+            <!-- table-column: family name of styles for table columns. -->
+            <xsl:when test="$parentName='table:table-column'">
+                <xsl:text>table-column</xsl:text>
+            </xsl:when>
+            <!-- table-row: family name of styles for table rows. -->
+            <xsl:when test="$parentName='table:table-row'">
+                <xsl:text>table-row</xsl:text>
+            </xsl:when>
+            <!-- text: family name of styles for text. -->
+            <xsl:when test="
+            	$parentName='text:index-entry-bibliography' or
+				$parentName='text:index-entry-chapter' or
+				$parentName='text:index-entry-link-end' or
+				$parentName='text:index-entry-link-start' or
+				$parentName='text:index-entry-page-number' or
+				$parentName='text:index-entry-span' or
+				$parentName='text:index-entry-tab-stop' or
+				$parentName='text:index-entry-text' or
+				$parentName='text:a' or
+				$parentName='text:span' or
+				$parentName='style:drop-cap' or
+				$parentName='text:line-break' or
+				$parentName='text:tab' or
+				$parentName='text:linenumbering-configuration'">
+                <xsl:text>text</xsl:text>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:message>WARNING: No style family found for parent element <xsl:value-of select="$parentName"/></xsl:message>
+                <xsl:text>unknown-family-parent</xsl:text>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+    
 
     <!-- ***************** -->
     <!-- *** Footnotes *** -->
diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl b/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
index 8ee38796ebdf..bdd2d05b0925 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
@@ -129,7 +129,12 @@
             <xsl:for-each select="$globalData/all-styles/style">
                     <xsl:if test="final-properties != ''">
                         <!-- NOTE: easy process, as only the style family in conjunction with the style name, makes the style unambiguous -->
-                        <xsl:text>.</xsl:text><!--<xsl:value-of select="@style:family" /><xsl:text>:</xsl:text>--><xsl:value-of select="translate(@style:name, '.,;: %()[]/\+', '_____________')"/><xsl:text> { </xsl:text> <xsl:value-of select="final-properties" /><xsl:text>}
+                        <xsl:text>.</xsl:text>
+                        <xsl:call-template name="create-unique-style-id">
+                            <xsl:with-param name="styleName" select="@style:name"/>
+                            <xsl:with-param name="styleFamily" select="@style:family"/>
+                        </xsl:call-template>
+                        <xsl:text>{ </xsl:text> <xsl:value-of select="final-properties" /><xsl:text>}
     </xsl:text>
                     </xsl:if>
 
diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/table.xsl b/filter/source/xslt/odf2xhtml/export/xhtml/table.xsl
index 8448665d20b3..0788b2bf52a9 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/table.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/table.xsl
@@ -206,8 +206,10 @@
 
        <!-- cell style header -->
        <xsl:attribute name="class">
-           <xsl:value-of select="translate($styleName, '.,;: %()[]/\+', '_____________')"/>
+            <xsl:call-template name="create-unique-style-id">
+                <xsl:with-param name="styleName" select="$styleName"/>
+                <xsl:with-param name="styleFamily" select="'table-cell'"/>
+            </xsl:call-template>
        </xsl:attribute>
     </xsl:template>
 </xsl:stylesheet>
-
diff --git a/sc/CppunitTest_sc_html_export_test.mk b/sc/CppunitTest_sc_html_export_test.mk
index f9da77710a29..bc64eb5b7803 100644
--- a/sc/CppunitTest_sc_html_export_test.mk
+++ b/sc/CppunitTest_sc_html_export_test.mk
@@ -67,6 +67,11 @@ $(eval $(call gb_CppunitTest_use_api,sc_html_export_test,\
 	oovbaapi \
 ))
 
+$(eval $(call gb_CppunitTest_use_packages,sc_html_export_test, \
+    filter_xhtml \
+    filter_xslt \
+))
+
 $(eval $(call gb_CppunitTest_use_ure,sc_html_export_test))
 $(eval $(call gb_CppunitTest_use_vcl,sc_html_export_test))
 
diff --git a/sc/qa/extras/htmlexporttest.cxx b/sc/qa/extras/htmlexporttest.cxx
index f65e027ae62e..6e28d791fbb3 100644
--- a/sc/qa/extras/htmlexporttest.cxx
+++ b/sc/qa/extras/htmlexporttest.cxx
@@ -50,8 +50,26 @@ public:
         assertXPath(pDoc, "/html/body/table/tr/td/img", 0);
     }
 
+    void testTdf155244()
+    {
+        loadFromURL(u"default-styles.ods");
+        save("XHTML Calc File");
+
+        xmlDocUniquePtr pXmlDoc = parseXml(maTempFile);
+        CPPUNIT_ASSERT(pXmlDoc);
+
+        assertXPath(pXmlDoc, "/xhtml:html", 1);
+        // the problem was that there were 2 CSS styles named "Default"
+        assertXPath(pXmlDoc, "/xhtml:html/xhtml:body/xhtml:table/xhtml:tr/xhtml:td", "class", "cell-Default");
+        OUString const styles = getXPathContent(pXmlDoc, "/xhtml:html/xhtml:head/xhtml:style");
+        CPPUNIT_ASSERT(styles.indexOf(".graphic-Default{ background-color:#729fcf;") != -1);
+        CPPUNIT_ASSERT(styles.indexOf(".cell-Default{ font-size:10pt; font-family:'Liberation Sans'; }") != -1);
+        CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), styles.indexOf(".Default"));
+    }
+
     CPPUNIT_TEST_SUITE(ScHTMLExportTest);
     CPPUNIT_TEST(testHtmlSkipImage);
+    CPPUNIT_TEST(testTdf155244);
     CPPUNIT_TEST_SUITE_END();
 
 };
diff --git a/sc/qa/extras/testdocuments/default-styles.ods b/sc/qa/extras/testdocuments/default-styles.ods
new file mode 100644
index 0000000000000000000000000000000000000000..d2167ed2023b4d1348b86d96e176892709e18ad7
GIT binary patch
literal 8881
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
Pa4$b5mqmw%;;Q#wzMt$s

literal 0
HcmV?d00001

diff --git a/sw/qa/extras/htmlexport/xhtmlexport.cxx b/sw/qa/extras/htmlexport/xhtmlexport.cxx
index 923c3fecda8a..299b5ff6b5c8 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(".paragraph-P1{ font-size:12pt; font-family:\'Liberation Serif\'; "
                         "writing-mode:horizontal-tb; direction:rtl; text-align:right ! important;}")
         != -1);
 }
@@ -138,18 +138,20 @@ DECLARE_HTMLEXPORT_TEST(testTdf107696, "tdf107696.odt")
     CPPUNIT_ASSERT(aStream.indexOf("span.heading_numbering { margin-right: 0.8rem; }* { margin:0;}")
                    != -1);
     CPPUNIT_ASSERT(
-        aStream.indexOf("<h2 class=\"Heading_20_2\"><a "
+        aStream.indexOf("<h2 class=\"paragraph-Heading_20_2\"><a "
                         "id=\"a__Level_2_without_number\"><span/></a>Level 2 without number</h2>")
         != -1);
     CPPUNIT_ASSERT(
-        aStream.indexOf("<h2 class=\"Heading_20_2\"><a id=\"a_3_1_Level_2__number_3_1\"><span "
-                        "class=\"heading_numbering\">3.1</span></a>Level <span "
-                        "class=\"T2\">2</span>, <span class=\"T1\">number 3.1</span></h2>")
+        aStream.indexOf(
+            "<h2 class=\"paragraph-Heading_20_2\"><a id=\"a_3_1_Level_2__number_3_1\"><span "
+            "class=\"heading_numbering\">3.1</span></a>Level <span "
+            "class=\"text-T2\">2</span>, <span class=\"text-T1\">number 3.1</span></h2>")
         != -1);
     CPPUNIT_ASSERT(
-        aStream.indexOf("<h2 class=\"Heading_20_2\"><a id=\"a_3_2_Level_2__number_3_2\"><span "
-                        "class=\"heading_numbering\">3.2</span></a>Level 2, <span "
-                        "class=\"T1\">number 3.2</span></h2>")
+        aStream.indexOf(
+            "<h2 class=\"paragraph-Heading_20_2\"><a id=\"a_3_2_Level_2__number_3_2\"><span "
+            "class=\"heading_numbering\">3.2</span></a>Level 2, <span "
+            "class=\"text-T1\">number 3.2</span></h2>")
         != -1);
 }
 
@@ -160,8 +162,9 @@ DECLARE_HTMLEXPORT_TEST(testTdf66305, "tdf66305.odt")
     sal_uInt64 nLength = pStream->TellEnd();
     OString aStream(read_uInt8s_ToOString(*pStream, nLength));
     CPPUNIT_ASSERT(
-        aStream.indexOf("<p class=\"P6\"><a href=\"#__RefHeading__82004_486970805\" "
-                        "class=\"Internet_20_link\">Introduction</a></p><p class=\"P7\"> </p>")
+        aStream.indexOf("<p class=\"paragraph-P6\"><a href=\"#__RefHeading__82004_486970805\" "
+                        "class=\"text-Internet_20_link\">Introduction</a></p><p "
+                        "class=\"paragraph-P7\"> </p>")
         != -1);
 }