diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2012-10-15 16:42:15 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-10-19 20:11:30 +0000 |
| commit | b401b8977df3d9755f6d8999172ce2ecdaef93f0 (patch) | |
| tree | 9370ea231b0a99f19aad057dee81c74996ab6dd7 /sw | |
| parent | d401dcc51cec798c8c19febcc25c4325ddafa178 (diff) | |
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
Reviewed-on: https://gerrit.libreoffice.org/878
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/rtf/swparrtf.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx index 95ca3ddb7009..53b460dc1d4c 100644 --- a/sw/source/filter/rtf/swparrtf.cxx +++ b/sw/source/filter/rtf/swparrtf.cxx @@ -151,10 +151,12 @@ sal_uLong SwRTFReader::Read( SwDoc &rDoc, const String& /*rBaseURL*/, SwPaM& /*r xImporter->setTargetDocument(xDstDoc); uno::Reference<document::XFilter> xFilter(xInterface, uno::UNO_QUERY_THROW); - uno::Sequence<beans::PropertyValue> aDescriptor(1); + uno::Sequence<beans::PropertyValue> aDescriptor(2); aDescriptor[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InputStream")); uno::Reference<io::XStream> xStream(new utl::OStreamWrapper(*pStrm)); aDescriptor[0].Value <<= xStream; + aDescriptor[1].Name = "IsNewDoc"; + aDescriptor[1].Value <<= sal_False; xFilter->filter(aDescriptor); return 0; |