sw/qa/extras/inc/swmodeltestbase.hxx | 6 +++--- sw/qa/extras/ooxmlexport/data/activex.docx |binary sw/qa/extras/ooxmlexport/data/activexbin.docx |binary 3 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit 4a0f0d714cc73c22dd2d363fd111d34f8413b387 Author: Miklos Vajna <vmik...@collabora.co.uk> Date: Thu Nov 28 17:49:01 2013 +0100 CppunitTest_sw_ooxmlexport: speed up activex* There were quite some unrelated content in these test documents... 1m24.754s -> 1m4.757s Change-Id: I5e12a4c82c8c6f4454d2b2113d11aa289e125832 diff --git a/sw/qa/extras/ooxmlexport/data/activex.docx b/sw/qa/extras/ooxmlexport/data/activex.docx index e7c15e8..eb546d9 100644 Binary files a/sw/qa/extras/ooxmlexport/data/activex.docx and b/sw/qa/extras/ooxmlexport/data/activex.docx differ diff --git a/sw/qa/extras/ooxmlexport/data/activexbin.docx b/sw/qa/extras/ooxmlexport/data/activexbin.docx index e7c15e8..ecf4599 100644 Binary files a/sw/qa/extras/ooxmlexport/data/activexbin.docx and b/sw/qa/extras/ooxmlexport/data/activexbin.docx differ commit a7806c318e9aa87312107b775f695b3dfe483f34 Author: Miklos Vajna <vmik...@collabora.co.uk> Date: Thu Nov 28 17:28:15 2013 +0100 SwModelTestBase: write csv output to stdout This way a 2>/dev/null output still gives a csv, even if there were various other warnings in the meantime. Change-Id: I6ed3de4058c829e856286c7d484d6ed436c362a4 diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx index ba64155..a5a4ed7 100644 --- a/sw/qa/extras/inc/swmodeltestbase.hxx +++ b/sw/qa/extras/inc/swmodeltestbase.hxx @@ -402,7 +402,7 @@ protected: void header() { - std::cerr << "File tested,Execution Time (ms)" << std::endl; + std::cout << "File tested,Execution Time (ms)" << std::endl; } void load(const char* pDir, const char* pName) @@ -410,7 +410,7 @@ protected: if (mxComponent.is()) mxComponent->dispose(); // Output name early, so in the case of a hang, the name of the hanging input file is visible. - std::cerr << pName << ","; + std::cout << pName << ","; m_nStartTime = osl_getGlobalTimer(); mxComponent = loadFromDesktop(getURLFromSrc(pDir) + OUString::createFromAscii(pName), "com.sun.star.text.TextDocument"); if (mustCalcLayoutOf(pName)) @@ -452,7 +452,7 @@ protected: void finish() { sal_uInt32 nEndTime = osl_getGlobalTimer(); - std::cerr << (nEndTime - m_nStartTime) << std::endl; + std::cout << (nEndTime - m_nStartTime) << std::endl; if (mpXmlBuffer) { xmlBufferFree(mpXmlBuffer); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits