summaryrefslogtreecommitdiff
path: root/sw/qa/extras/inc
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2013-04-30 17:31:12 +0100
committerMichael Meeks <michael.meeks@suse.com>2013-04-30 17:32:20 +0100
commit06a8ebc878ff9bcab26556d5b5a46532e232d416 (patch)
tree57b426a4e47bd3ef165265eb0e78e4032c916f1e /sw/qa/extras/inc
parent102f68ea54e7b9420a8f13605289a5411db5512b (diff)
fdo#62336 - unit test for conversion failure.
Turns out this depends on not doing layout, and so is a real corner-case. Change-Id: If9d2db6b1a0df94fc809fb353f2dbf2cf9ac1c9a
Diffstat (limited to 'sw/qa/extras/inc')
-rw-r--r--sw/qa/extras/inc/swmodeltestbase.hxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx
index 5419a8c8a503..fc8682d39f1c 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -259,13 +260,14 @@ protected:
fprintf(stderr, "File tested,Execution Time (ms)\n");
}
- void load(const char* pDir, const char* pName)
+ void load(const char* pDir, const char* pName, bool bCalcLayout = true)
{
// 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), "com.sun.star.text.TextDocument");
- calcLayout();
+ if (bCalcLayout)
+ calcLayout();
}
void reload(OUString aFilter)