summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-09-25 11:42:04 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-09-25 13:14:46 +0100
commit4e388f8b81afdb780c0f75df657b3a2063fc9ff1 (patch)
tree2d71dc6a7c0c62dc6466eb9f93df9965daeb2fdf
parentf6a6f240711d39df9669086453cb3bce34c93cab (diff)
coverity#1241102 Uninitialized pointer field
Change-Id: I10580e92da47b97d8d496366833e79a89cbd9260
-rw-r--r--svx/source/tbxctrls/PaletteManager.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/svx/source/tbxctrls/PaletteManager.cxx b/svx/source/tbxctrls/PaletteManager.cxx
index b104fe9095af..ce7e2efea0a2 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);