diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-09-24 14:11:25 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-09-24 14:12:39 +0100 |
commit | ad4026693a372fbc4037bd8d7ced839e0d0f545f (patch) | |
tree | e809a69b09978377c746d2b68d49492115b646e0 /sw/source/filter/ww8/ww8par.hxx | |
parent | 918834c04fd44fd863e34523dce73104e7d2232f (diff) |
this is a (dubious?) compareToIgnoreAsciiCase not compare, so restore
Change-Id: I2c4c4d20f2f2c06310b926fb573ba41820022b43
Diffstat (limited to 'sw/source/filter/ww8/ww8par.hxx')
-rw-r--r-- | sw/source/filter/ww8/ww8par.hxx | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index c5f42b1cbf45..39c7df745e1f 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -428,6 +428,14 @@ private: namespace SwWW8 { + struct ltstr + { + bool operator()(const OUString &r1, const OUString &r2) const + { + return r1.compareToIgnoreAsciiCase(r2)<0; + } + }; + struct ltnode { bool operator()(const SwTextNode *r1, const SwTextNode *r2) const @@ -447,7 +455,7 @@ public: // Keep track of referenced TOC bookmarks in order to suppress the import // of unreferenced ones. - std::set<OUString> aReferencedTOCBookmarks; + std::set<OUString, SwWW8::ltstr> aReferencedTOCBookmarks; protected: virtual void SetAttrInDoc( const SwPosition& rTmpPos, SwFltStackEntry& rEntry ) override; @@ -465,7 +473,7 @@ public: //Keep track of variable names created with fields, and the bookmark //mapped to their position, hopefully the same, but very possibly //an additional pseudo bookmark - std::map<OUString, OUString> aFieldVarNames; + std::map<OUString, OUString, SwWW8::ltstr> aFieldVarNames; protected: SwFltStackEntry *RefToVar(const SwField* pField,SwFltStackEntry& rEntry); virtual void SetAttrInDoc(const SwPosition& rTmpPos, |