diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-10-04 11:02:59 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-04 14:11:55 +0000 |
| commit | 68fc31104299588f92cac3169a01ec926826f95a (patch) | |
| tree | ae07e3104309e46b421459f9fcb30e2c48f7f10b /basegfx | |
| parent | fb8db80319d5a88ee12b30064d89d4a176f8b537 (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.
(cherry picked from commit 5ebe826caf75e8d00656b3333385bf0bbc05cb27)
Conflicts:
sw/qa/extras/rtfimport/rtfimport.cxx
writerfilter/source/dmapper/StyleSheetTable.cxx
Change-Id: I83adaf9fe6b8a578fa60c21b9463fabde7707d7e
Reviewed-on: https://gerrit.libreoffice.org/6129
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'basegfx')
0 files changed, 0 insertions, 0 deletions