Kaydet (Commit) f7d9e052 authored tarafından Thorsten Behrens's avatar Thorsten Behrens

ODF conformance - Impress table markup fixes

Fix for fdo#35190 - Impress writes invalid ODF for the table
styles (text:style-name instead of table:style-name).
üst e1ef3ad5
...@@ -564,7 +564,7 @@ void XMLTableExport::exportTableTemplates() ...@@ -564,7 +564,7 @@ void XMLTableExport::exportTableTemplates()
Reference< XStyle > xStyle( xStyleNames->getByName( pElements->msStyleName ), UNO_QUERY ); Reference< XStyle > xStyle( xStyleNames->getByName( pElements->msStyleName ), UNO_QUERY );
if( xStyle.is() ) if( xStyle.is() )
{ {
mrExport.AddAttribute(XML_NAMESPACE_TEXT, XML_STYLE_NAME, GetExport().EncodeStyleName( xStyle->getName() ) ); mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_STYLE_NAME, GetExport().EncodeStyleName( xStyle->getName() ) );
SvXMLElementExport element( mrExport, XML_NAMESPACE_TABLE, pElements->meElement, sal_True, sal_True ); SvXMLElementExport element( mrExport, XML_NAMESPACE_TABLE, pElements->meElement, sal_True, sal_True );
} }
} }
......
...@@ -812,7 +812,8 @@ SvXMLImportContext * XMLTableTemplateContext::CreateChildContext( sal_uInt16 nPr ...@@ -812,7 +812,8 @@ SvXMLImportContext * XMLTableTemplateContext::CreateChildContext( sal_uInt16 nPr
{ {
OUString sAttrName; OUString sAttrName;
sal_uInt16 nAttrPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( xAttrList->getNameByIndex( i ), &sAttrName ); sal_uInt16 nAttrPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( xAttrList->getNameByIndex( i ), &sAttrName );
if( (nAttrPrefix == XML_NAMESPACE_TEXT) && IsXMLToken( sAttrName, XML_STYLE_NAME ) ) if( (nAttrPrefix == XML_NAMESPACE_TEXT || nAttrPrefix == XML_NAMESPACE_TABLE) &&
IsXMLToken( sAttrName, XML_STYLE_NAME ) )
{ {
maTableTemplate[pElements->msStyleName] = xAttrList->getValueByIndex( i ); maTableTemplate[pElements->msStyleName] = xAttrList->getValueByIndex( i );
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment