sw/source/core/text/xmldump.cxx | 2 ++ writerfilter/source/dmapper/StyleSheetTable.cxx | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-)
New commits: commit eaab389113f45b298428b4285e76555ccedec48a Author: Cédric Bosdonnat <[email protected]> Date: Thu Sep 20 09:59:48 2012 +0200 n#779627: forgot to remove a debug fprintf Change-Id: Idba155358166db358b0ef36b71a0bcf5abf77ce9 (cherry picked from commit 823512d12d268e45c4ff6b13b6ed9e0db49d1d8a) diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index edbc393..d8e327c 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -454,7 +454,6 @@ void StyleSheetTable::lcl_attribute(Id Name, Value & val) case NS_ooxml::LN_CT_Style_styleId: m_pImpl->m_pCurrentEntry->sStyleIdentifierI = sValue; m_pImpl->m_pCurrentEntry->sStyleIdentifierD = sValue; - fprintf( stderr, "sStyleIdentifierI: %s\n", OUStringToOString( m_pImpl->m_pCurrentEntry->sStyleIdentifierI, RTL_TEXTENCODING_UTF8 ).getStr( ) ); break; case NS_ooxml::LN_CT_TblWidth_w: dynamic_cast< StyleSheetPropertyMap* >( m_pImpl->m_pCurrentEntry->pProperties.get() )->SetCT_TblWidth_w( nIntValue ); commit 61821a5aec6d42b54cb3b5e37bf742a402d08d72 Author: Cédric Bosdonnat <[email protected]> Date: Wed Sep 19 17:51:19 2012 +0200 n779627: docx import of table styles, why not copy the ids? Change-Id: I72188eef689c656b56e2c19e60e0104a1e6d87bf (cherry picked from commit c091b8fc526bed051295870b8b28f73f3ac908ae) diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index 61ff0ba..edbc393 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -73,7 +73,8 @@ TableStyleSheetEntry::TableStyleSheetEntry( StyleSheetEntry& rEntry, StyleSheetT StyleSheetEntry( ), m_pStyleSheet( pStyles ) { - + sStyleIdentifierI = rEntry.sStyleIdentifierI; + sStyleIdentifierD = rEntry.sStyleIdentifierD; bIsDefaultStyle = rEntry.bIsDefaultStyle; bInvalidHeight = rEntry.bInvalidHeight; bHasUPE = rEntry.bHasUPE; @@ -453,6 +454,7 @@ void StyleSheetTable::lcl_attribute(Id Name, Value & val) case NS_ooxml::LN_CT_Style_styleId: m_pImpl->m_pCurrentEntry->sStyleIdentifierI = sValue; m_pImpl->m_pCurrentEntry->sStyleIdentifierD = sValue; + fprintf( stderr, "sStyleIdentifierI: %s\n", OUStringToOString( m_pImpl->m_pCurrentEntry->sStyleIdentifierI, RTL_TEXTENCODING_UTF8 ).getStr( ) ); break; case NS_ooxml::LN_CT_TblWidth_w: dynamic_cast< StyleSheetPropertyMap* >( m_pImpl->m_pCurrentEntry->pProperties.get() )->SetCT_TblWidth_w( nIntValue ); commit b4f489b3144829c53800fcf4aa59bad5e82fbaed Author: Cédric Bosdonnat <[email protected]> Date: Fri Aug 31 11:08:08 2012 +0200 Output typeid().name( ) in layout dump for easier debugging Change-Id: I12c0583b73200fa9fa4d4d56be464b1467149630 (cherry picked from commit ba71c346d6ac60b2c49caed81673d4ca498a6f1e) diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx index 79edaed..431022f 100644 --- a/sw/source/core/text/xmldump.cxx +++ b/sw/source/core/text/xmldump.cxx @@ -306,6 +306,8 @@ void SwFrm::dumpAsXml( xmlTextWriterPtr writer ) xmlTextWriterEndElement( writer ); } + xmlTextWriterWriteElement( writer, BAD_CAST( "typeid" ), BAD_CAST( typeid( *this ).name() ) ); + // Dump the children if ( IsTxtFrm( ) ) {
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
