summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Luth <justin_luth@sil.org>2017-06-22 17:53:00 -0400
committerJustin Luth <justin_luth@sil.org>2017-06-29 04:38:13 +0200
commit803a17533f25d9174c6a19aa913a6713980c193d (patch)
tree623ed7cdf25e4d885d1b10f30098e7870e1214a8
parent068755d9313b61a1e4691c27eea122116d3623df (diff)
revert related tdf#82173 writerfilter: ignore case when mapping styles
and added the missing lowercase "footnote reference" mapping. Word can create both Heading1 and heading1 styles in the same document. So case CAN be important. Unfortunately, these mappings precede git history, so it will require trial and error to judge which mappings are obsolete or simply invalid. At least one of the existing mappings was not really correct anyway (Endnote Text"->"Endnote Symbol") so reverting the change to prevent other unanticipated regressions. Change-Id: Ia8669c975debcb3074e758b42c24fb65233f8369 Reviewed-on: https://gerrit.libreoffice.org/39132 Reviewed-by: Justin Luth <justin_luth@sil.org> Tested-by: Justin Luth <justin_luth@sil.org>
-rw-r--r--writerfilter/source/dmapper/StyleSheetTable.cxx34
1 files changed, 22 insertions, 12 deletions
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 699f605a52a6..27e0ade07925 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -46,22 +46,11 @@
using namespace ::com::sun::star;
-namespace {
-
-/** Functor for case-insensitive string comparison, usable in maps etc. */
-struct IgnoreCaseCompare
-{
- bool operator()( const OUString& rName1, const OUString& rName2 ) const
- { return rName1.compareToIgnoreAsciiCase( rName2 ) < 0; }
-};
-
-} // namespace
-
namespace writerfilter {
namespace dmapper
{
-typedef ::std::map< OUString, OUString, IgnoreCaseCompare> StringPairMap_t;
+typedef ::std::map< OUString, OUString> StringPairMap_t;
StyleSheetEntry::StyleSheetEntry() :
@@ -1302,6 +1291,15 @@ const StyleSheetEntryPtr StyleSheetTable::FindParentStyleSheet(const OUString& _
static const sal_Char* const aStyleNamePairs[] =
{
"Normal", "Standard",
+ "heading 1", "Heading 1",
+ "heading 2", "Heading 2",
+ "heading 3", "Heading 3",
+ "heading 4", "Heading 4",
+ "heading 5", "Heading 5",
+ "heading 6", "Heading 6",
+ "heading 7", "Heading 7",
+ "heading 8", "Heading 8",
+ "heading 9", "Heading 9",
"Heading1", "Heading 1",
"Heading2", "Heading 2",
"Heading3", "Heading 3",
@@ -1339,6 +1337,15 @@ static const sal_Char* const aStyleNamePairs[] =
"TOC 8", "Contents 8",
"TOC 9", "Contents 9",
"TOCHeading", "Contents Heading",
+ "toc 1", "Contents 1",
+ "toc 2", "Contents 2",
+ "toc 3", "Contents 3",
+ "toc 4", "Contents 4",
+ "toc 5", "Contents 5",
+ "toc 6", "Contents 6",
+ "toc 7", "Contents 7",
+ "toc 8", "Contents 8",
+ "toc 9", "Contents 9",
"TOC1", "Contents 1",
"TOC2", "Contents 2",
"TOC3", "Contents 3",
@@ -1352,12 +1359,15 @@ static const sal_Char* const aStyleNamePairs[] =
"Footnote Text", "Footnote",
"Annotation Text", "",
"Header", "Header",
+ "header", "Header",
"Footer", "Footer",
+ "footer", "Footer",
"Index Heading", "Index Heading",
"Caption", "",
"Table of Figures", "",
"Envelope Address", "Addressee",
"Envelope Return", "Sender",
+ "footnote reference", "Footnote Characters",
"Footnote Reference", "Footnote Characters",
"Annotation Reference", "",
"Line Number", "Line numbering",