Attachment 133823 Details for Bug 82173 – part3 of the patch set - doesn't round-trip and breaks bug 82071

[patch] part3 of the patch set - doesn't round-trip and breaks bug 82071

tdf82173_part3.diff (text/plain), 2.04 KB, created by Justin L on 2017-06-03 13:15:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Justin L

Created: 2017-06-03 13:15:49 UTC

Size: 2.04 KB

patch

obsolete

>diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
>index 137aca9..8401d6d 100644
>--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
>+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
>@@ -503,6 +503,12 @@ DECLARE_OOXMLEXPORT_TEST(testTdf82173_footnoteStyle, "tdf82173_footnoteStyle.doc
>     uno::Reference<beans::XPropertySet> xPageStyle(getStyles("CharacterStyles")->getByName("Footnote Characters"), uno::UNO_QUERY);
>     CPPUNIT_ASSERT_EQUAL( sal_Int32(58),       getProperty< sal_Int32 >(xPageStyle, "CharEscapementHeight") );
>     CPPUNIT_ASSERT_EQUAL( sal_Int32(0x00FF00), getProperty< sal_Int32 >(xPageStyle, "CharColor") );
>+
>+    uno::Reference<text::XFootnotesSupplier> xFootnotesSupplier(mxComponent, uno::UNO_QUERY);
>+    uno::Reference<container::XIndexAccess> xFootnotes(xFootnotesSupplier->getFootnotes(), uno::UNO_QUERY);
>+    uno::Reference<text::XFootnote> xFootnote;
>+    xFootnotes->getByIndex(0) >>= xFootnote;
>+    CPPUNIT_ASSERT_EQUAL( sal_Int32(0x00FF00), getProperty< sal_Int32 >(xFootnote->getAnchor(), "CharColor") );
> }
> 
> DECLARE_OOXMLEXPORT_TEST(testTdf82173_endnoteStyle, "tdf82173_endnoteStyle.docx")
>diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
>index 5928fa4..8cddc52 100644
>--- a/writerfilter/source/dmapper/DomainMapper.cxx
>+++ b/writerfilter/source/dmapper/DomainMapper.cxx
>@@ -2150,7 +2150,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext )
>         {
>             OUString sConvertedName( m_pImpl->GetStyleSheetTable()->ConvertStyleName( sStringValue, true ) );
>             // First check if the style exists in the document.
>-            StyleSheetEntryPtr pEntry = m_pImpl->GetStyleSheetTable( )->FindStyleSheetByStyleName( sConvertedName );
>+            StyleSheetEntryPtr pEntry = m_pImpl->GetStyleSheetTable( )->FindStyleSheetByConvertedStyleName( sConvertedName );
>             bool bExists = pEntry.get( ) && ( pEntry->nStyleTypeCode == STYLE_TYPE_CHAR );
> 
>             // Add the property if the style exists

Actions: View

Attachments on bug 82173: 104046 | 104047 | 133420 | 133823 | 133825