If someone could review this for 3.3 branch that would be great
thanks,
Noel
diff --git writerfilter/source/dmapper/DomainMapper_Impl.cxx writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 57b6bcc..77b09eb 100644
--- writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -3077,7 +3077,8 @@ void DomainMapper_Impl::CloseFieldCommand()
{
FFDataHandler::Pointer_t pFFDataHandler
(pContext->getFFDataHandler());
-
+ if ( !pFFDataHandler )
+ throw uno::RuntimeException();
xFieldProperties->setPropertyValue
(rPropNameSupplier.GetName(PROP_HINT),
uno::makeAny(pFFDataHandler->getStatusText()));
diff --git writerfilter/source/dmapper/FormControlHelper.cxx writerfilter/source/dmapper/FormControlHelper.cxx
index b47186c..4318567 100644
--- writerfilter/source/dmapper/FormControlHelper.cxx
+++ writerfilter/source/dmapper/FormControlHelper.cxx
@@ -156,6 +156,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());
_______________________________________________
LibreOffice mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
