diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-09-22 16:58:29 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-09-22 20:32:02 +0100 |
| commit | 81202ae7487b139cb473ff85634003b36d67e8c4 (patch) | |
| tree | 5f204d5078b696b2f99aa360d3042a24b34a213b /sc | |
| parent | da2c3cf0aa78cb3363b3ded2bebc418d0cc7ffca (diff) | |
Related: fdo#38838 remove UniString::CompareIgnoreCaseToAscii
Change-Id: I4a9b34d63d2534a35aa9a878b8c2bec15262c2be
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/excel/xistyle.cxx | 6 | ||||
| -rw-r--r-- | sc/source/filter/html/htmlpars.cxx | 16 |
2 files changed, 11 insertions, 11 deletions
diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx index a22ef9b08dfb..c1d9d361fb34 100644 --- a/sc/source/filter/excel/xistyle.cxx +++ b/sc/source/filter/excel/xistyle.cxx @@ -1542,8 +1542,8 @@ namespace { /** Functor for case-insensitive string comparison, usable in maps etc. */ struct IgnoreCaseCompare { - inline bool operator()( const String& rName1, const String& rName2 ) const - { return rName1.CompareIgnoreCaseToAscii( rName2 ) == COMPARE_LESS; } + inline bool operator()( const OUString& rName1, const OUString& rName2 ) const + { return rName1.compareToIgnoreAsciiCase( rName2 ) < 0; } }; } // namespace @@ -1551,7 +1551,7 @@ struct IgnoreCaseCompare void XclImpXFBuffer::CreateUserStyles() { // calculate final names of all styles - typedef ::std::map< String, XclImpStyle*, IgnoreCaseCompare > CellStyleNameMap; + typedef ::std::map< OUString, XclImpStyle*, IgnoreCaseCompare > CellStyleNameMap; typedef ::std::vector< XclImpStyle* > XclImpStyleVector; CellStyleNameMap aCellStyles; diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index 565fc90a1a24..f28039b92baf 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -1021,12 +1021,12 @@ void ScHTMLLayoutParser::TableDataOn( ImportInfo* pInfo ) { bHorJustifyCenterTH = false; SvxCellHorJustify eVal; - const String& rOptVal = rOption.GetString(); - if ( rOptVal.CompareIgnoreCaseToAscii( OOO_STRING_SVTOOLS_HTML_AL_right ) == COMPARE_EQUAL ) + const OUString& rOptVal = rOption.GetString(); + if ( rOptVal.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_AL_right ) ) eVal = SVX_HOR_JUSTIFY_RIGHT; - else if ( rOptVal.CompareIgnoreCaseToAscii( OOO_STRING_SVTOOLS_HTML_AL_center ) == COMPARE_EQUAL ) + else if ( rOptVal.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_AL_center ) ) eVal = SVX_HOR_JUSTIFY_CENTER; - else if ( rOptVal.CompareIgnoreCaseToAscii( OOO_STRING_SVTOOLS_HTML_AL_left ) == COMPARE_EQUAL ) + else if ( rOptVal.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_AL_left ) ) eVal = SVX_HOR_JUSTIFY_LEFT; else eVal = SVX_HOR_JUSTIFY_STANDARD; @@ -1037,12 +1037,12 @@ void ScHTMLLayoutParser::TableDataOn( ImportInfo* pInfo ) case HTML_O_VALIGN: { SvxCellVerJustify eVal; - const String& rOptVal = rOption.GetString(); - if ( rOptVal.CompareIgnoreCaseToAscii( OOO_STRING_SVTOOLS_HTML_VA_top ) == COMPARE_EQUAL ) + const OUString& rOptVal = rOption.GetString(); + if ( rOptVal.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_VA_top ) ) eVal = SVX_VER_JUSTIFY_TOP; - else if ( rOptVal.CompareIgnoreCaseToAscii( OOO_STRING_SVTOOLS_HTML_VA_middle ) == COMPARE_EQUAL ) + else if ( rOptVal.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_VA_middle ) ) eVal = SVX_VER_JUSTIFY_CENTER; - else if ( rOptVal.CompareIgnoreCaseToAscii( OOO_STRING_SVTOOLS_HTML_VA_bottom ) == COMPARE_EQUAL ) + else if ( rOptVal.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_VA_bottom ) ) eVal = SVX_VER_JUSTIFY_BOTTOM; else eVal = SVX_VER_JUSTIFY_STANDARD; |