Attachment 125897 Details for Bug 96750 – working patch that makes the provided test document work correctly.

[patch] working patch that makes the provided test document work correctly.

tdf75750.diff (text/plain), 1.91 KB, created by Justin L on 2016-06-25 08:18:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Justin L

Created: 2016-06-25 08:18:51 UTC

Size: 1.91 KB

patch

obsolete

>diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
>index 9260cd1..519ed0e 100644
>--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
>+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
>@@ -350,6 +350,13 @@ DECLARE_OOXMLEXPORT_TEST(testNumberingFont, "numbering-font.docx")
>     CPPUNIT_ASSERT_EQUAL(OUString("Verdana"), getProperty<OUString>(xStyle, "CharFontName"));
> }
> 
>+DECLARE_OOXMLEXPORT_TEST(testTdf76750_landscapeFollow, "tdf76750_landscapeFollow.docx")
>+{
>+// If not defined, the follow page should inherit the settings of the first page.
>+    uno::Reference<beans::XPropertySet> xStyle(getStyles("PageStyles")->getByName("Standard"), uno::UNO_QUERY);
>+    CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(xStyle, "IsLandscape"));
>+}
>+
> DECLARE_OOXMLEXPORT_TEST(testDrawingmlFlipv, "drawingml-flipv.docx")
> {
>     // The problem was that the shape had vertical flip only, but then we added rotation as well on export.
>diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
>index 31001c1..6de88d3 100644
>--- a/writerfilter/source/dmapper/PropertyMap.cxx
>+++ b/writerfilter/source/dmapper/PropertyMap.cxx
>@@ -1158,7 +1158,12 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl )
>                     uno::Reference<beans::XPropertySet> xPageStyle (rDM_Impl.GetPageStyles()->getByName(aName), uno::UNO_QUERY_THROW);
>                     HandleMarginsHeaderFooter(rDM_Impl);
>                     if (rDM_Impl.IsNewDoc())
>+                    {
>                         ApplyProperties_(xPageStyle);
>+                        //in case the follow style is never defined, initialize it.
>+                        if( m_bIsFirstSection && m_bTitlePage && m_aFollowPageStyle.is() )
>+                            ApplyProperties_(m_aFollowPageStyle);
>+                    }
>                 }
>                 catch( const uno::Exception& )
>                 {

Actions: View

Attachments on bug 96750: 121583 | 121584 | 125897 | 126342