[Libreoffice-commits] .: 4 commits - sw/source

[Caolán McNamara]

 sw/source/core/text/EnhancedPDFExportHelper.cxx |    2 +-
 sw/source/ui/dbui/dbmgr.cxx                     |    5 ++---
 sw/source/ui/dbui/mailmergechildwindow.cxx      |    4 ++--
 sw/source/ui/frmdlg/wrap.cxx                    |   11 ++++++++---
 4 files changed, 13 insertions(+), 9 deletions(-)

New commits:
commit d350a1f8ac997becd637f8f4e66b35817d6e5583
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Nov 24 09:48:20 2010 +0000

    cppcheck: Possible null pointer dereference

diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx
index 1255af0..6556ccd 100644
--- a/sw/source/ui/frmdlg/wrap.cxx
+++ b/sw/source/ui/frmdlg/wrap.cxx
@@ -646,10 +646,15 @@ IMPL_LINK( SwWrapTabPage, RangeModifyHdl, MetricField *, pEdit )
         else if (pEdit == &aBottomMarginED)
             pOpposite = &aTopMarginED;
 
-        sal_Int64 nOpposite = pOpposite->GetValue();
+        OSL_ASSERT(pOpposite);
 
-        if (nValue + nOpposite > Max(pEdit->GetMax(), pOpposite->GetMax()))
-            pOpposite->SetValue(pOpposite->GetMax() - nValue);
+        if (pOpposite)
+        {
+            sal_Int64 nOpposite = pOpposite->GetValue();
+
+            if (nValue + nOpposite > Max(pEdit->GetMax(), pOpposite->GetMax()))
+                pOpposite->SetValue(pOpposite->GetMax() - nValue);
+        }
     }
 
     return 0;
commit 430ee5314d204e30c918600600d62ed1cc10a68c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Nov 24 09:45:34 2010 +0000

    cppcheck: Possible null pointer dereference

diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index f745c1a..1023483 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -1102,7 +1102,7 @@ void SwTaggedPDFHelper::BeginBlockStructureElements()
                     static_cast<const SwTxtFrm*>(pFrm)->GetTxtNode();
 
                 const SwFmt* pTxtFmt = pTxtNd->GetFmtColl();
-                const SwFmt* pParentTxtFmt = pTxtFmt->DerivedFrom();
+                const SwFmt* pParentTxtFmt = pTxtFmt ? pTxtFmt->DerivedFrom() : NULL;
 
                 String sStyleName;
                 String sParentStyleName;
commit 0cf4dd5d1ef4c8dbf41f775b839d7148392e878e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Nov 24 09:26:00 2010 +0000

    cppcheck: silence bogus warning

diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
index e28ae1d..b2b4bee 100644
--- a/sw/source/ui/dbui/dbmgr.cxx
+++ b/sw/source/ui/dbui/dbmgr.cxx
@@ -1157,9 +1157,8 @@ BOOL SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
                                     }
                                     else
                                     {
-                                        SwMailMessage* pMessage = 0;
-                                        uno::Reference< mail::XMailMessage > xMessage =
-                                                                pMessage = new SwMailMessage;
+                                        SwMailMessage* pMessage = new SwMailMessage;
+                                        uno::Reference< mail::XMailMessage > xMessage = pMessage;
                                         if(rMergeDescriptor.pMailMergeConfigItem->IsMailReplyTo())
                                             pMessage->setReplyToAddress(rMergeDescriptor.pMailMergeConfigItem->GetMailReplyTo());
                                         pMessage->addRecipient( sMailAddress );
commit d89844a5c966061ebfbfb00db217adb8d6566dc7
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Nov 24 09:20:15 2010 +0000

    cppcheck: silence bogus warning

diff --git a/sw/source/ui/dbui/mailmergechildwindow.cxx b/sw/source/ui/dbui/mailmergechildwindow.cxx
index 4650fdf..610903c 100644
--- a/sw/source/ui/dbui/mailmergechildwindow.cxx
+++ b/sw/source/ui/dbui/mailmergechildwindow.cxx
@@ -574,8 +574,8 @@ void  SwSendMailDialog::IterateMails()
             pCurrentMailDescriptor = m_pImpl->GetNextDescriptor();
             continue;
         }
-        SwMailMessage* pMessage = 0;
-        uno::Reference< mail::XMailMessage > xMessage = pMessage = new SwMailMessage;
+        SwMailMessage* pMessage = new SwMailMessage;
+        uno::Reference< mail::XMailMessage > xMessage = pMessage;
         if(m_pConfigItem->IsMailReplyTo())
             pMessage->setReplyToAddress(m_pConfigItem->GetMailReplyTo());
         pMessage->addRecipient( pCurrentMailDescriptor->sEMail );