[Libreoffice-commits] core.git: 4 commits - cppcanvas/qa svx/source sw/source vcl/source

[Caolán McNamara]

 cppcanvas/qa/extras/emfplus/emfplus.cxx |    1 +
 svx/source/tbxctrls/PaletteManager.cxx  |    4 +++-
 sw/source/filter/html/htmlflywriter.cxx |    2 +-
 vcl/source/window/layout.cxx            |    2 ++
 4 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit d7fdf70c4433a41debb4729607df081f15b4ed54
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Sep 25 13:11:13 2014 +0100

    coverity#1241427 Unchecked dynamic_cast
    
    Change-Id: Ie011d0bcc504c6c17a525abb368e69009a3d2d2e

diff --git a/cppcanvas/qa/extras/emfplus/emfplus.cxx b/cppcanvas/qa/extras/emfplus/emfplus.cxx
index 68694b4..70ee827 100644
--- a/cppcanvas/qa/extras/emfplus/emfplus.cxx
+++ b/cppcanvas/qa/extras/emfplus/emfplus.cxx
@@ -51,6 +51,7 @@ public:
     {
         mxComponent = loadFromDesktop(getURLFromSrc(mpTestDocumentPath) + OUString::createFromAscii(pName), "com.sun.star.drawing.DrawingDocument");
         SfxBaseModel* pModel = dynamic_cast<SfxBaseModel*>(mxComponent.get());
+        CPPUNIT_ASSERT(pModel);
         SfxObjectShell* pShell = pModel->GetObjectShell();
         boost::shared_ptr<GDIMetaFile> pMetaFile = pShell->GetPreviewMetaFile();
         BitmapEx aResultBitmap;
commit cadcbae92323cc715fc7e8241e5b9a6369d20eb8
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Sep 25 11:46:00 2014 +0100

    coverity#1241396 Uninitialized pointer field
    
    Change-Id: Ib9c38ae857125036252ba27ebd03f428046724e0

diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 9eb085b..3a898f5 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1940,6 +1940,8 @@ MessageDialog::MessageDialog(vcl::Window* pParent, WinBits nStyle)
     : Dialog(pParent, nStyle)
     , m_eButtonsType(VCL_BUTTONS_NONE)
     , m_eMessageType(VCL_MESSAGE_INFO)
+    , m_pOwnedContentArea(NULL)
+    , m_pOwnedActionArea(NULL)
     , m_pGrid(NULL)
     , m_pImage(NULL)
     , m_pPrimaryMessage(NULL)
commit 4e388f8b81afdb780c0f75df657b3a2063fc9ff1
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Sep 25 11:42:04 2014 +0100

    coverity#1241102 Uninitialized pointer field
    
    Change-Id: I10580e92da47b97d8d496366833e79a89cbd9260

diff --git a/svx/source/tbxctrls/PaletteManager.cxx b/svx/source/tbxctrls/PaletteManager.cxx
index b104fe9..ce7e2ef 100644
--- a/svx/source/tbxctrls/PaletteManager.cxx
+++ b/svx/source/tbxctrls/PaletteManager.cxx
@@ -34,6 +34,7 @@ PaletteManager::PaletteManager() :
     mnNumOfPalettes(2),
     mnCurrentPalette(0),
     mnColorCount(0),
+    mpBtnUpdater(NULL),
     mLastColor(COL_AUTO)
 {
     LoadPalettes();
@@ -201,7 +202,8 @@ void PaletteManager::PopupColorPicker(const OUString& aCommand)
     aColorDlg.SetMode( svtools::ColorPickerMode_MODIFY );
     if( aColorDlg.Execute() == RET_OK )
     {
-        mpBtnUpdater->Update( aColorDlg.GetColor() );
+        if (mpBtnUpdater)
+            mpBtnUpdater->Update( aColorDlg.GetColor() );
         mLastColor = aColorDlg.GetColor();
         AddRecentColor( mLastColor );
         DispatchColorCommand(aCommand, mLastColor);
commit f6a6f240711d39df9669086453cb3bce34c93cab
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Sep 25 11:38:57 2014 +0100

    coverity#1240270 Copy-paste error
    
    regression from
    
    commit 03fe839d6e76ed8b1dfb65093ab59a8904852ff6
    Date:   Sat Sep 20 15:41:13 2014 +0200
        html export: rework image output to use HTML writer
    
    Change-Id: If50d4e3cc2d19ea35d41e848cb5b9f92f356bc59

diff --git a/sw/source/filter/html/htmlflywriter.cxx b/sw/source/filter/html/htmlflywriter.cxx
index 94b5118..6a0d313 100644
--- a/sw/source/filter/html/htmlflywriter.cxx
+++ b/sw/source/filter/html/htmlflywriter.cxx
@@ -988,7 +988,7 @@ void SwHTMLWriter::writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrmFmt& rF
             ((nPrcHeight && nPrcHeight!=255) || aPixelSz.Height()) )
         {
             OString sHeight;
-            if (nPrcWidth)
+            if (nPrcHeight)
                 sHeight = OString::number(static_cast<sal_Int32>(nPrcHeight)) + "%";
             else
                 sHeight = OString::number(static_cast<sal_Int32>(aPixelSz.Height()));