Kaydet (Commit) 2dee7d62 authored tarafından Noel Power's avatar Noel Power

Revert "another partial fix for bnc#693238" ( and fixes fdo#44292 )

This reverts commit cd1c434c.

Conflicts:

	writerfilter/source/dmapper/PropertyMap.cxx

Change-Id: I I83ae3418438aa02db744e6b6eb5a9c199938c91f
üst 24c125f4
...@@ -835,6 +835,8 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl ) ...@@ -835,6 +835,8 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl )
if( m_nColumnCount > 0 && xSection.is()) if( m_nColumnCount > 0 && xSection.is())
ApplyColumnProperties( xSection ); ApplyColumnProperties( xSection );
} }
else
{
//get the properties and create appropriate page styles //get the properties and create appropriate page styles
uno::Reference< beans::XPropertySet > xFollowPageStyle = GetPageStyle( rDM_Impl.GetPageStyles(), rDM_Impl.GetTextFactory(), false ); uno::Reference< beans::XPropertySet > xFollowPageStyle = GetPageStyle( rDM_Impl.GetPageStyles(), rDM_Impl.GetTextFactory(), false );
...@@ -957,8 +959,6 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl ) ...@@ -957,8 +959,6 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl )
ApplyBorderToPageStyles( rDM_Impl.GetPageStyles( ), rDM_Impl.GetTextFactory( ), m_nBorderParams ); ApplyBorderToPageStyles( rDM_Impl.GetPageStyles( ), rDM_Impl.GetTextFactory( ), m_nBorderParams );
if ( m_nBreakType != 0 )
{
try try
{ {
{ {
......
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