diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2013-09-16 23:44:26 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-09-19 13:09:40 +0000 |
| commit | 4da39c170ff2d5bca16e991d244a73ff6b5945b0 (patch) | |
| tree | 8fde0475a5fd7244736b66e7586fc86e827c2ff8 /sw/source/filter/ww8/ww8par.hxx | |
| parent | 1bda6fd3c46cb6d82490839830b34327af3b6fdd (diff) | |
String to OUString
Change-Id: I463a42e7fa755aa534cddbd150ee0c82d2827b0f
Reviewed-on: https://gerrit.libreoffice.org/5968
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/filter/ww8/ww8par.hxx')
| -rw-r--r-- | sw/source/filter/ww8/ww8par.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 53f754eb5d23..946a3d7c923c 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -417,15 +417,15 @@ public: struct ltstr { - bool operator()(const String &r1, const String &r2) const + bool operator()(const OUString &r1, const OUString &r2) const { - return r1.CompareIgnoreCaseToAscii(r2) == COMPARE_LESS; + return r1.compareToIgnoreAsciiCase(r2)<0; } }; //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<String, String, ltstr> aFieldVarNames; + std::map<OUString, OUString, ltstr> aFieldVarNames; protected: SwFltStackEntry *RefToVar(const SwField* pFld,SwFltStackEntry& rEntry); virtual void SetAttrInDoc(const SwPosition& rTmpPos, @@ -1730,8 +1730,8 @@ public: // eigentlich private, geht aber leider nur public static sal_uInt32 ExtractColour(const sal_uInt8* &rpData, bool bVer67); void Read_UnderlineColor(sal_uInt16, const sal_uInt8* pData, short nLen); - long MapBookmarkVariables(const WW8FieldDesc* pF,String &rOrigName, - const String &rData); + long MapBookmarkVariables(const WW8FieldDesc* pF, OUString &rOrigName, + const OUString &rData); String GetMappedBookmark(const String &rOrigName); // Felder |