diff options
| author | Serge Krot <Serge.Krot@cib.de> | 2018-01-29 12:17:06 +0100 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-01-31 01:30:39 +0100 |
| commit | deaa16bd24fba4a3a6b072ab2b94542a7dbd41c6 (patch) | |
| tree | e7692bd7aca0f4ac0ae041aaf82eddb8dc7cafcd /writerfilter | |
| parent | d88e9c4be7110c9cbafb98dffa7a3b7c4126459e (diff) | |
tdf#72942 Do not overwrite styles from the inserted doc
During inserting of the text from the external document
we should not change original default styles in
currently opened document.
Added unit test.
Change-Id: Ida754a0da5efaaa043464cd807c0b52cfb0d5670
Reviewed-on: https://gerrit.libreoffice.org/48826
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/StyleSheetTable.cxx | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index 433405feabf4..b947fbd86728 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -883,6 +883,13 @@ uno::Sequence< OUString > PropValVector::getNames() void StyleSheetTable::ApplyStyleSheets( const FontTablePtr& rFontTable ) { + if (!m_pImpl->m_bIsNewDoc) + { + // tdf#72942: do not import styles from document being inserted, + // while they corrupts original styles in master document + return; + } + try { uno::Reference< style::XStyleFamiliesSupplier > xStylesSupplier( m_pImpl->m_xTextDocument, uno::UNO_QUERY_THROW ); @@ -1493,6 +1500,14 @@ OUString StyleSheetTable::ConvertStyleName( const OUString& rWWName, bool bExten void StyleSheetTable::applyDefaults(bool bParaProperties) { try{ + + if (!m_pImpl->m_bIsNewDoc) + { + // tdf#72942: do not corrupts original styles in master document + // during inserting of text from second document + return; + } + if(!m_pImpl->m_xTextDefaults.is()) { m_pImpl->m_xTextDefaults.set( |