diff options
| author | Noel Grandin <noel@peralex.com> | 2013-10-16 15:43:54 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-10-18 09:59:31 +0200 |
| commit | d08ef4d26594f7bd2711615d90796e1613e82f9f (patch) | |
| tree | 2580222eded64912d176b72db0850470bf931e69 /starmath | |
| parent | 218775e19cee88cdf7dae1ead787cb4274f52cd4 (diff) | |
random OUString to String conversions
Change-Id: I9cfb8e7183b9cce7c690f3a43a64b61a2aa8c754
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/qa/cppunit/test_nodetotextvisitors.cxx | 6 | ||||
| -rw-r--r-- | starmath/source/cfgitem.cxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/starmath/qa/cppunit/test_nodetotextvisitors.cxx b/starmath/qa/cppunit/test_nodetotextvisitors.cxx index e1d10b1ce312..e2da017d554a 100644 --- a/starmath/qa/cppunit/test_nodetotextvisitors.cxx +++ b/starmath/qa/cppunit/test_nodetotextvisitors.cxx @@ -20,14 +20,14 @@ namespace CppUnit { template<> -struct assertion_traits<String> +struct assertion_traits<OUString> { - static bool equal(const String& x, const String& y) + static bool equal(const OUString& x, const OUString& y) { return x == y; } - static std::string toString(const String& x) + static std::string toString(const OUString& x) { OStringStream ost; ost << OUStringToOString(x, RTL_TEXTENCODING_UTF8).getStr(); diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx index df339aff6f9f..57886b7e7611 100644 --- a/starmath/source/cfgitem.cxx +++ b/starmath/source/cfgitem.cxx @@ -819,7 +819,7 @@ void SmMathConfig::StripFontFormatList( const std::vector< SmSym > &rSymbols ) SmFontFormatList &rFntFmtList = GetFontFormatList(); size_t nCnt = rFntFmtList.GetCount(); SmFontFormat *pTmpFormat = new SmFontFormat[ nCnt ]; - String *pId = new String [ nCnt ]; + OUString *pId = new OUString [ nCnt ]; size_t k; for (k = 0; k < nCnt; ++k) { |