diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-05-05 13:27:54 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-05-05 16:27:35 +0200 |
| commit | 828ca509f4a025d86ce3104331b2df6fba42c05c (patch) | |
| tree | b98a40a575ad2949cc41e1787c7cdd1eee2f5da1 /sw | |
| parent | 076758857a98d6f35517c74e991509239135d997 (diff) | |
sw: avoid warning duplicate style name of family 101: "Default_20_Style"
Change-Id: If0c0ae10d56b0153b4686b9c8ec66adc52c42c72
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/xml/xmlimp.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index 225850bb13cb..7cebf5a4d561 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -153,7 +153,8 @@ SwXMLBodyContext_Impl::SwXMLBodyContext_Impl( SwXMLImport& rImport, bool isEncoded(false); OUString const defaultEncoded( rImport.GetMM100UnitConverter().encodeStyleName(sDefault, &isEncoded)); - if (isEncoded && !xStyles->hasByName(defaultEncoded)) + if (isEncoded && defaultEncoded != "Default_20_Style" + && !xStyles->hasByName(defaultEncoded)) { // new name may contain a space which is converted to _20_ on export rImport.AddStyleDisplayName(XML_STYLE_FAMILY_TEXT_TEXT, defaultEncoded, sDefault); } |