diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2011-12-02 18:59:05 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2011-12-03 20:15:01 +0100 |
| commit | f131ccd53bd93495855d571ecbcf00aa79b4d9b3 (patch) | |
| tree | d741abf188d549bd17a774061ead07fc51c45b0b /sc/qa | |
| parent | eca5888eaaf3aa254b0e888ba328656e1d699a4d (diff) | |
some String->rtl::OUString cleanup in ucalc
Diffstat (limited to 'sc/qa')
| -rw-r--r-- | sc/qa/unit/ucalc.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index 4ff4cd03a15a..0808c3500af3 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -2694,11 +2694,11 @@ void Test::testCopyPaste() m_pDoc->CopyFromClip(aRange, aMarkData2, nFlags, NULL, pClipDoc); //check values after copying - String aString; + rtl::OUString aString; m_pDoc->GetValue(1,1,1, aValue); CPPUNIT_ASSERT_MESSAGE("copied formula should return 2", aValue == 2); m_pDoc->GetFormula(1,1,1, aString); - CPPUNIT_ASSERT_MESSAGE("formula string was not copied correctly", rtl::OUString(aString) == aFormulaString); + CPPUNIT_ASSERT_MESSAGE("formula string was not copied correctly", aString == aFormulaString); m_pDoc->GetValue(0,1,1, aValue); CPPUNIT_ASSERT_MESSAGE("copied value should be 1", aValue == 1); @@ -2717,15 +2717,15 @@ void Test::testCopyPaste() m_pDoc->GetValue(1,1,1, aValue); CPPUNIT_ASSERT_MESSAGE("after undo formula should return nothing", aValue == 0); m_pDoc->GetString(2,1,1, aString); - CPPUNIT_ASSERT_MESSAGE("after undo string should be removed", rtl::OUString(aString) == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(""))); + CPPUNIT_ASSERT_MESSAGE("after undo string should be removed", aString.equalsAscii("")); pUndo->Redo(); m_pDoc->GetValue(1,1,1, aValue); CPPUNIT_ASSERT_MESSAGE("formula should return 2 after redo", aValue == 2); m_pDoc->GetString(2,1,1, aString); - CPPUNIT_ASSERT_MESSAGE("Cell Sheet2.C2 should contain: test", rtl::OUString(aString) == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("test"))); + CPPUNIT_ASSERT_MESSAGE("Cell Sheet2.C2 should contain: test", aString.equalsAscii("test")); m_pDoc->GetFormula(1,1,1, aString); - CPPUNIT_ASSERT_MESSAGE("Formula should be correct again", rtl::OUString(aString) == aFormulaString); + CPPUNIT_ASSERT_MESSAGE("Formula should be correct again", aString == aFormulaString); //clear all variables delete pClipDoc; |