summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2013-09-09 10:14:19 +0200
committerCaolán McNamara <caolanm@redhat.com>2013-09-09 10:43:23 +0000
commit2bf1604026fd4f69b4d727f931c9b33e2da30d8d (patch)
tree908dfb13e2d491b83b41c661cf47ddba583b2f61 /writerfilter
parent8911e50765073d45778fa8c37d336c58490668e4 (diff)
fdo#68291 RTF paste: don't set PageDescName during paste
In general, paste should not deal with page styles. In this case, it even caused an additional page break. (cherry picked from commit b226dcb50d6728b62f39c9fa2e016724324944e3) Change-Id: Ia7c5a9ad844821b6622babfbd94469ec3c04cf0a Reviewed-on: https://gerrit.libreoffice.org/5883 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/source/dmapper/PropertyMap.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index 21974a47c1f3..83868d4f7f5b 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -1047,7 +1047,7 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl )
0 - No break 1 - New Colunn 2 - New page 3 - Even page 4 - odd page */
if ((m_bTitlePage && m_bIsFirstSection) || !m_bTitlePage)
{
- if (xRangeProperties.is())
+ if (xRangeProperties.is() && rDM_Impl.IsNewDoc())
xRangeProperties->setPropertyValue(rPropNameSupplier.GetName( PROP_PAGE_DESC_NAME ),
uno::makeAny( m_bTitlePage ? m_sFirstPageStyleName : m_sFollowPageStyleName ));
}