diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:13:53 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:22 +0100 |
commit | 72c48b716640c76f0a8fa49341ce3b0099004991 (patch) | |
tree | 6aa8da1631e3d18272bd39ab55111885ab339b45 /desktop/qa | |
parent | 89c4edc13f203db1641c63e22774262bbe61f36f (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: I8204a300c98b891a842ef2e40b65f0810dd7817a
Diffstat (limited to 'desktop/qa')
-rw-r--r-- | desktop/qa/desktop_lib/test_desktop_lib.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx index 17002b7b75eb..f32f4bdd1ce6 100644 --- a/desktop/qa/desktop_lib/test_desktop_lib.cxx +++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx @@ -331,7 +331,7 @@ void DesktopLOKTest::testSaveAs() LibLODocument_Impl* pDocument = loadDoc("blank_text.odt"); utl::TempFile aTempFile; aTempFile.EnableKillingFile(); - CPPUNIT_ASSERT(pDocument->pClass->saveAs(pDocument, aTempFile.GetURL().toUtf8().getStr(), "png", 0)); + CPPUNIT_ASSERT(pDocument->pClass->saveAs(pDocument, aTempFile.GetURL().toUtf8().getStr(), "png", nullptr)); } void DesktopLOKTest::testSaveAsCalc() @@ -339,7 +339,7 @@ void DesktopLOKTest::testSaveAsCalc() LibLODocument_Impl* pDocument = loadDoc("search.ods"); utl::TempFile aTempFile; aTempFile.EnableKillingFile(); - CPPUNIT_ASSERT(pDocument->pClass->saveAs(pDocument, aTempFile.GetURL().toUtf8().getStr(), "png", 0)); + CPPUNIT_ASSERT(pDocument->pClass->saveAs(pDocument, aTempFile.GetURL().toUtf8().getStr(), "png", nullptr)); } void DesktopLOKTest::testPasteWriter() @@ -350,8 +350,8 @@ void DesktopLOKTest::testPasteWriter() CPPUNIT_ASSERT(pDocument->pClass->paste(pDocument, "text/plain;charset=utf-8", aText.getStr(), aText.getLength())); - pDocument->pClass->postUnoCommand(pDocument, ".uno:SelectAll", 0, false); - char* pText = pDocument->pClass->getTextSelection(pDocument, "text/plain;charset=utf-8", 0); + pDocument->pClass->postUnoCommand(pDocument, ".uno:SelectAll", nullptr, false); + char* pText = pDocument->pClass->getTextSelection(pDocument, "text/plain;charset=utf-8", nullptr); CPPUNIT_ASSERT_EQUAL(OString("hello"), OString(pText)); free(pText); @@ -467,7 +467,7 @@ void DesktopLOKTest::testCommandResult() // nothing is triggered when we have no callback yet, we just time out on // the condition var. m_aCommandResultCondition.reset(); - pDocument->pClass->postUnoCommand(pDocument, ".uno:Bold", 0, true); + pDocument->pClass->postUnoCommand(pDocument, ".uno:Bold", nullptr, true); m_aCommandResultCondition.wait(aTimeValue); CPPUNIT_ASSERT(m_aCommandResult.isEmpty()); @@ -476,7 +476,7 @@ void DesktopLOKTest::testCommandResult() pDocument->pClass->registerCallback(pDocument, &DesktopLOKTest::callback, this); m_aCommandResultCondition.reset(); - pDocument->pClass->postUnoCommand(pDocument, ".uno:Bold", 0, true); + pDocument->pClass->postUnoCommand(pDocument, ".uno:Bold", nullptr, true); m_aCommandResultCondition.wait(aTimeValue); boost::property_tree::ptree aTree; |