diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-02-15 15:26:43 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-02-15 15:41:09 +0100 |
| commit | 9ab0b38e95133dab720408cc2c80093b8a201c10 (patch) | |
| tree | 416dde227ed5c4ded99292feb94f36a64c327999 /starmath/source | |
| parent | 42422f2599220b678aa41c4aadeec28df113c3ec (diff) | |
Various string function clean up
Added:
* rtl::OString::matchL
* rtl::OString::endsWith
* rtl::OString::endsWithL
* rtl::OString::indexOfL
* rtl::OString::replaceFirst
* rtl::OString::replaceAll
* rtl::OString::getToken
* rtl::OUString::endsWith
* rtl::OUString::replaceFirst
* rtl::OUString::replaceFirstAsciiL
* rtl::OUString::replaceFirstAsciiLAsciiL
* rtl::OUString::replaceAll
* rtl::OUString::replaceAllAsciiL
* rtl::OUString::replaceAllAsciiLAsciiL
* rtl::OUString::getToken
plus underlying C functions where necessary
Deprecated:
* comphelper::string::remove
* comphelper::string::getToken
Removed:
* comphelper::string::searchAndReplaceAsciiL
* comphelper::string::searchAndReplaceAllAsciiWithAscii
* comphelper::string::searchAndReplaceAsciiI
* comphelper::string::replace
* comphelper::string::matchL
* comphelper::string::matchIgnoreAsciiCaseL
* comphelper::string::indexOfL
Also fixed some apparent misuses of RTL_CONSTASCII_USTRINGPARAM ->
RTL_CONSTASCII_STRINGPARAM.
Diffstat (limited to 'starmath/source')
| -rw-r--r-- | starmath/source/ooxmlimport.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/starmath/source/ooxmlimport.cxx b/starmath/source/ooxmlimport.cxx index a092462a0a85..141a114bc952 100644 --- a/starmath/source/ooxmlimport.cxx +++ b/starmath/source/ooxmlimport.cxx @@ -29,7 +29,6 @@ #include "ooxmlimport.hxx" -#include <comphelper/string.hxx> #include <oox/token/tokens.hxx> #include <oox/token/namespaces.hxx> #include <rtl/oustringostreaminserter.hxx> @@ -85,10 +84,12 @@ OUString SmOoxmlImport::handleStream() stream.ensureClosingTag( M_TOKEN( oMath )); // Placeholders are written out as nothing (i.e. nothing inside e.g. the <e> element), // which will result in "{}" in the formula text. Fix this up. - ret = comphelper::string::searchAndReplaceAllAsciiWithAscii( ret, "{}", "<?>" ); + ret = ret.replaceAllAsciiLAsciiL( + RTL_CONSTASCII_STRINGPARAM("{}"), RTL_CONSTASCII_STRINGPARAM("<?>")); // And as a result, empty parts of the formula that are not placeholders are written out // as a single space, so fix that up too. - ret = comphelper::string::searchAndReplaceAllAsciiWithAscii( ret, "{ }", "{}" ); + ret = ret.replaceAllAsciiLAsciiL( + RTL_CONSTASCII_STRINGPARAM("{ }"), RTL_CONSTASCII_STRINGPARAM("{}")); SAL_INFO( "starmath.ooxml", "Formula: " << ret ); return ret; } |