diff options
| author | Petr Mladek <pmladek@suse.cz> | 2011-04-05 18:54:48 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2011-04-05 18:54:48 +0200 |
| commit | ab8961db6f22acb5e34663ed8ad78ba8cf09e4e6 (patch) | |
| tree | b3e6131f6c911cb6a77356c3529baa24b1b6f408 /writerfilter/source/dmapper/FormControlHelper.cxx | |
| parent | 0db604e9f46113ac66c0a55a72fa117fe68fb52b (diff) | |
| parent | 94844f1a5db3657d0e649069f5a7f4d890b80568 (diff) | |
Merge remote-tracking branch 'origin/libreoffice-3-3' into libreoffice-3-4
Conflicts:
oox/prj/d.lst
unoxml/source/xpath/nodelist.cxx
unoxml/source/xpath/nodelist.hxx
unoxml/source/xpath/xpathobject.cxx
writerfilter/source/dmapper/DomainMapper_Impl.cxx
writerfilter/source/filter/ImportFilter.cxx
Diffstat (limited to 'writerfilter/source/dmapper/FormControlHelper.cxx')
| -rw-r--r-- | writerfilter/source/dmapper/FormControlHelper.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/FormControlHelper.cxx b/writerfilter/source/dmapper/FormControlHelper.cxx index 878a22f516a1..8311f94296dc 100644 --- a/writerfilter/source/dmapper/FormControlHelper.cxx +++ b/writerfilter/source/dmapper/FormControlHelper.cxx @@ -159,6 +159,8 @@ FormControlHelper::~FormControlHelper() bool FormControlHelper::createCheckbox(uno::Reference<text::XTextRange> xTextRange, const ::rtl::OUString & rControlName) { + if ( !m_pFFData ) + return false; uno::Reference<lang::XMultiServiceFactory> xServiceFactory(m_pImpl->getServiceFactory()); |