[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - writerfilter/source

[Miklos Vajna]

 writerfilter/source/dmapper/TablePropertiesHandler.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0693b37fec987a8d443847d9b98d611def5ebfc1
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Sat Mar 29 21:13:21 2014 +0100

    coverity#1194911 Unchecked dynamic_cast
    
    Change-Id: I1e7f4bcd8f54219d86ad7a003469d5a486090f47
    (cherry picked from commit 8736c5222a8e83a1310713a92492e63198749467)
    Reviewed-on: https://gerrit.libreoffice.org/10630
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
index b54b262..3aa4427 100644
--- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx
+++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
@@ -97,7 +97,7 @@ namespace dmapper {
 
                     DomainMapperTableManager* pManager = dynamic_cast<DomainMapperTableManager*>(m_pTableManager);
                     // In case any of the cells has the btLr cell direction, then an explicit minimal size will just hide the whole row, don't do that.
-                    if (pMeasureHandler->GetRowHeightSizeType() != text::SizeType::MIN || !pManager->HasBtlrCell())
+                    if (pMeasureHandler->GetRowHeightSizeType() != text::SizeType::MIN || !pManager || !pManager->HasBtlrCell())
                     {
                         // In case a cell already wanted fixed size, we should not overwrite it here.
                         if (!pManager || !pManager->IsRowSizeTypeInserted())