summaryrefslogtreecommitdiff
path: root/distro-configs
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2014-03-04 14:47:13 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-03-05 04:23:23 -0600
commitf57fa998035cb5f859b89451a563137fdaf1b465 (patch)
tree84789d97647d74f386d2ed098ffa7fb9c48a7adc /distro-configs
parentf856667ee6ae786575aa8e82f71ff2dabf16a659 (diff)
bnc#821208 DOC import: don't overwrite WW8Num* character styles
In general we're overwriting styles on import in case we're not pasting. But these WW8Num* character styles are in general not from the document, they are created because Writer needs a character style for each numbering level to handle what's in the DOC file. So, in case there is a character style with the same name as our "character style for numbering" styles, prefer the later ones, as that's intended most likely. (cherry picked from commit e88ee8aa307ecec1cc22cda56b97dcfd8b838ce8) Conflicts: sw/qa/extras/ww8import/ww8import.cxx Change-Id: I675f867722360aca765bb96b0b43ea47deab9847 Reviewed-on: https://gerrit.libreoffice.org/8449 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'distro-configs')
0 files changed, 0 insertions, 0 deletions