diff options
| -rw-r--r-- | desktop/qa/desktop_lib/test_desktop_lib.cxx | 2 | ||||
| -rw-r--r-- | sc/qa/unit/ucalc.cxx | 2 | ||||
| -rw-r--r-- | sc/qa/unit/ucalc_formula.cxx | 10 | ||||
| -rw-r--r-- | sc/qa/unit/ucalc_pivottable.cxx | 2 | ||||
| -rw-r--r-- | sc/source/core/opencl/formulagroupcl.cxx | 4 | ||||
| -rw-r--r-- | writerperfect/source/calc/MSWorksCalcImportFilter.cxx | 2 | ||||
| -rw-r--r-- | writerperfect/source/writer/MSWorksImportFilter.cxx | 2 |
7 files changed, 12 insertions, 12 deletions
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx index c5ee03fb56ca..6862dfc0ccd6 100644 --- a/desktop/qa/desktop_lib/test_desktop_lib.cxx +++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx @@ -986,7 +986,7 @@ namespace { for (const auto& aItemPair: aRoot) { // This is an array, so no key - CPPUNIT_ASSERT_EQUAL(std::string(aItemPair.first.data()), std::string("")); + CPPUNIT_ASSERT_EQUAL(std::string(aItemPair.first), std::string("")); boost::property_tree::ptree aItemValue = aItemPair.second; boost::optional<boost::property_tree::ptree&> aText = aItemValue.get_child_optional("text"); diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index 9cb6f345ee1b..94d04e2f433f 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -759,7 +759,7 @@ void Test::testMarkedCellIteration() { std::ostringstream os; os << ScAddress(rCheck.mnCol, rCheck.mnRow, 0).GetColRowString() << " was expected, but not found."; - CPPUNIT_FAIL(os.str().data()); + CPPUNIT_FAIL(os.str()); } CPPUNIT_ASSERT_EQUAL(rCheck.mnRow, nRow); diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx index b5c5f9f85879..312ac3328a9e 100644 --- a/sc/qa/unit/ucalc_formula.cxx +++ b/sc/qa/unit/ucalc_formula.cxx @@ -844,12 +844,12 @@ void Test::testFormulaHashAndTag() if (aHashTests[i].bEqual) { os << " Error: these hashes should be equal." << endl; - CPPUNIT_ASSERT_EQUAL_MESSAGE(os.str().c_str(), nHashVal1, nHashVal2); + CPPUNIT_ASSERT_EQUAL_MESSAGE(os.str(), nHashVal1, nHashVal2); } else { os << " Error: these hashes should differ." << endl; - CPPUNIT_ASSERT_MESSAGE(os.str().c_str(), nHashVal1 != nHashVal2); + CPPUNIT_ASSERT_MESSAGE(os.str(), nHashVal1 != nHashVal2); } aPos1.IncRow(); @@ -896,7 +896,7 @@ void Test::testFormulaHashAndTag() { std::ostringstream os; os << "Unexpected vectorization state: expr: '" << aVectorTests[i].pFormula << "', using software interpreter: " << bForceSwInterpreter; - CPPUNIT_ASSERT_MESSAGE(os.str().c_str(), false); + CPPUNIT_ASSERT_MESSAGE(os.str(), false); } aPos1.IncRow(); } @@ -949,7 +949,7 @@ void Test::testFormulaTokenEquality() std::ostringstream os; os << "These two formulas should be evaluated equal: '" << aTests[i].mpFormula1 << "' vs '" << aTests[i].mpFormula2 << "'" << endl; - CPPUNIT_FAIL(os.str().c_str()); + CPPUNIT_FAIL(os.str()); } } else @@ -959,7 +959,7 @@ void Test::testFormulaTokenEquality() std::ostringstream os; os << "These two formulas should be evaluated non-equal: '" << aTests[i].mpFormula1 << "' vs '" << aTests[i].mpFormula2 << "'" << endl; - CPPUNIT_FAIL(os.str().c_str()); + CPPUNIT_FAIL(os.str()); } } } diff --git a/sc/qa/unit/ucalc_pivottable.cxx b/sc/qa/unit/ucalc_pivottable.cxx index a74b8d4793d2..7f286a6e3b89 100644 --- a/sc/qa/unit/ucalc_pivottable.cxx +++ b/sc/qa/unit/ucalc_pivottable.cxx @@ -932,7 +932,7 @@ void Test::testPivotTableCache() { std::ostringstream os; os << "Row " << i << " should be visible but it isn't."; - CPPUNIT_ASSERT_MESSAGE(os.str().c_str(), false); + CPPUNIT_ASSERT_MESSAGE(os.str(), false); } } } diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx index 35f1d7906006..057f804a03b1 100644 --- a/sc/source/core/opencl/formulagroupcl.cxx +++ b/sc/source/core/opencl/formulagroupcl.cxx @@ -3773,8 +3773,8 @@ void DynamicKernel::CreateKernel() ::opencl::KernelEnv kEnv; ::opencl::setKernelEnv(&kEnv); const char* src = mFullProgramSrc.c_str(); - static std::string lastOneKernelHash = ""; - static std::string lastSecondKernelHash = ""; + static std::string lastOneKernelHash; + static std::string lastSecondKernelHash; static cl_program lastOneProgram = nullptr; static cl_program lastSecondProgram = nullptr; std::string KernelHash = mKernelSignature + GetMD5(); diff --git a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx index 5233078da22b..eb5dd9d37d31 100644 --- a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx +++ b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx @@ -194,7 +194,7 @@ bool MSWorksCalcImportFilter::doImportDocument(librevenge::RVNGInputStream &rInp if ((kind != libwps::WPS_SPREADSHEET && kind != libwps::WPS_DATABASE) || (confidence == libwps::WPS_CONFIDENCE_NONE)) return false; - std::string fileEncoding(""); + std::string fileEncoding; if (needEncoding) { OUString title, encoding; diff --git a/writerperfect/source/writer/MSWorksImportFilter.cxx b/writerperfect/source/writer/MSWorksImportFilter.cxx index 7f713857f018..723ebf73f892 100644 --- a/writerperfect/source/writer/MSWorksImportFilter.cxx +++ b/writerperfect/source/writer/MSWorksImportFilter.cxx @@ -38,7 +38,7 @@ bool MSWorksImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput, bool needEncoding = false; const libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(&rInput, kind, creator, needEncoding); - std::string fileEncoding(""); + std::string fileEncoding; try { if ((kind == libwps::WPS_TEXT) && (confidence == libwps::WPS_CONFIDENCE_EXCELLENT) && needEncoding) |