diff options
author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-02-05 14:38:43 -0500 |
---|---|---|
committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-02-05 14:40:58 -0500 |
commit | 7d3ddc2c6cc39fdd671f08059528464675cd6ecc (patch) | |
tree | b5e941937065d769dc9bdaa0ce144d1f91585360 /sw/qa/extras | |
parent | a0dd5a8d6a9213ad40d738f8639e1500a1b59caa (diff) |
Pass DocumentService to the loader during macro tests.
And disable user interaction during type detection, since that would
cause the test to fail.
With this change, 'make check' works once again.
Change-Id: I2f45a2e962e45ee64f7984e794cff814fbfe6dab
Diffstat (limited to 'sw/qa/extras')
-rw-r--r-- | sw/qa/extras/inc/swmodeltestbase.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx index d045780df12a..8edb76f32bc9 100644 --- a/sw/qa/extras/inc/swmodeltestbase.hxx +++ b/sw/qa/extras/inc/swmodeltestbase.hxx @@ -243,7 +243,7 @@ protected: // Output name early, so in the case of a hang, the name of the hanging input file is visible. fprintf(stderr, "%s,", pName); m_nStartTime = osl_getGlobalTimer(); - mxComponent = loadFromDesktop(getURLFromSrc(pDir) + OUString::createFromAscii(pName)); + mxComponent = loadFromDesktop(getURLFromSrc(pDir) + OUString::createFromAscii(pName), "com.sun.star.text.TextDocument"); calcLayout(); } @@ -258,7 +258,7 @@ protected: xStorable->storeToURL(aTempFile.GetURL(), aArgs); uno::Reference<lang::XComponent> xComponent(xStorable, uno::UNO_QUERY); xComponent->dispose(); - mxComponent = loadFromDesktop(aTempFile.GetURL()); + mxComponent = loadFromDesktop(aTempFile.GetURL(), "com.sun.star.text.TextDocument"); if (mpXmlBuffer) { xmlBufferFree(mpXmlBuffer); |