diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-10-04 11:02:59 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-10-04 12:19:11 +0200 |
commit | 5ebe826caf75e8d00656b3333385bf0bbc05cb27 (patch) | |
tree | 407156d8bced1ce31e5a09606ab7e1f2176db700 /writerfilter | |
parent | fd2d14d5543c82eb875e720c98b51518699a8fbc (diff) |
fdo#69384 fix impress -> writer copy&paste
Regression from 2ade07126971b79c92f729fae5709f2e2e2b495c (fdo#62044 RTF
import: don't overwrite existing styles when pasting, 2013-06-04),
during paste, if existing style was found, then the intention was to
skip that style, but instead we tried to create one.
Change-Id: I83adaf9fe6b8a578fa60c21b9463fabde7707d7e
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/dmapper/StyleSheetTable.cxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index 44828b79b7ea..0a232f0e3ddd 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -725,9 +725,16 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr rFontTable ) uno::Reference< style::XStyle > xStyle; OUString sConvertedStyleName = ConvertStyleName( pEntry->sStyleName ); - // When pasting, don't update existing styles. - if(xStyles->hasByName( sConvertedStyleName ) && m_pImpl->m_bIsNewDoc) + if(xStyles->hasByName( sConvertedStyleName )) + { + // When pasting, don't update existing styles. + if (!m_pImpl->m_bIsNewDoc) + { + ++aIt; + continue; + } xStyles->getByName( sConvertedStyleName ) >>= xStyle; + } else { bInsert = true; |