Date: prev next · Thread: first prev next last
2011 Archives by date, by thread · List index


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());
 

Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.