[PATCH] Change in core[libreoffice-3-6]: fdo#46669 sw: RTF paste should not change page styles

[Miklos Vajna (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/878

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/78/878/1

fdo#46669 sw: RTF paste should not change page styles

(cherry picked from commit 4f1ba0486241bd239e46b71405662db8e10d9b96)

Conflicts:
	writerfilter/inc/dmapper/DomainMapper.hxx
	writerfilter/source/dmapper/DomainMapper.cxx
	writerfilter/source/dmapper/DomainMapper_Impl.cxx
	writerfilter/source/dmapper/DomainMapper_Impl.hxx
	writerfilter/source/filter/RtfFilter.cxx

Change-Id: Ic163a639fae9de838258b3cca9567a29ab875a35
---
M sw/source/filter/rtf/swparrtf.cxx
M writerfilter/inc/dmapper/DomainMapper.hxx
M writerfilter/source/dmapper/DomainMapper.cxx
M writerfilter/source/dmapper/DomainMapper_Impl.cxx
M writerfilter/source/dmapper/DomainMapper_Impl.hxx
M writerfilter/source/dmapper/PropertyMap.cxx
M writerfilter/source/filter/RtfFilter.cxx
7 files changed, 29 insertions(+), 10 deletions(-)


--
To view, visit https://gerrit.libreoffice.org/878
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic163a639fae9de838258b3cca9567a29ab875a35
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Miklos Vajna <vmiklos at suse.cz>