Kaydet (Commit) 758dc9e3 authored tarafından Miklos Vajna's avatar Miklos Vajna

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
üst b8a4abdd
...@@ -38,7 +38,7 @@ private: ...@@ -38,7 +38,7 @@ private:
void preTest(const char* filename) SAL_OVERRIDE 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. // FIXME if padding-top gets exported as inches, not cms, we get rounding errors.
SwMasterUsrPref* pPref = const_cast<SwMasterUsrPref*>(SW_MOD()->GetUsrPref(false)); SwMasterUsrPref* pPref = const_cast<SwMasterUsrPref*>(SW_MOD()->GetUsrPref(false));
...@@ -49,7 +49,7 @@ private: ...@@ -49,7 +49,7 @@ private:
void postTest(const char* filename) SAL_OVERRIDE 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)); SwMasterUsrPref* pPref = const_cast<SwMasterUsrPref*>(SW_MOD()->GetUsrPref(false));
pPref->SetMetric(m_eUnit); pPref->SetMetric(m_eUnit);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment