diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-11-15 18:37:00 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-11-15 18:40:42 +0100 |
| commit | 758dc9e3051514ff5d5441ac2ebe782a57533a7c (patch) | |
| tree | a18f40a237f6411a2f335010039f16cd3ca0f60e /sw/qa/extras/htmlexport | |
| parent | b8a4abdda4e6a95535992c26a906226ede7f050a (diff) | |
CppunitTest_sw_htmlexport: check for nullptr
I couldn't reproduce this one, but JBFaure says on IRC it helps in his
case.
Change-Id: Ib0a22996bdfc758326c4910b5b652f0772c08912
Diffstat (limited to 'sw/qa/extras/htmlexport')
| -rw-r--r-- | sw/qa/extras/htmlexport/htmlexport.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx b/sw/qa/extras/htmlexport/htmlexport.cxx index c86b2f40b8e6..ed264e22e500 100644 --- a/sw/qa/extras/htmlexport/htmlexport.cxx +++ b/sw/qa/extras/htmlexport/htmlexport.cxx @@ -38,7 +38,7 @@ private: void preTest(const char* filename) SAL_OVERRIDE { - if (OString(filename) == "charborder.odt") + if (OString(filename) == "charborder.odt" && SW_MOD()) { // FIXME if padding-top gets exported as inches, not cms, we get rounding errors. SwMasterUsrPref* pPref = const_cast<SwMasterUsrPref*>(SW_MOD()->GetUsrPref(false)); @@ -49,7 +49,7 @@ private: void postTest(const char* filename) SAL_OVERRIDE { - if (OString(filename) == "charborder.odt") + if (OString(filename) == "charborder.odt" && SW_MOD()) { SwMasterUsrPref* pPref = const_cast<SwMasterUsrPref*>(SW_MOD()->GetUsrPref(false)); pPref->SetMetric(m_eUnit); |