diff options
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/tabpages/tabarea.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/tpcolor.cxx | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx index 3fcdbce92327..3d3b3f82a17b 100644 --- a/cui/source/tabpages/tabarea.cxx +++ b/cui/source/tabpages/tabarea.cxx @@ -191,7 +191,7 @@ void SvxAreaTabDialog::SavePalettes() } } - if( mnColorListState & CT_MODIFIED ) + if (mnColorListState & CT_MODIFIED && mpColorList.is()) { mpColorList->SetPath( aPath ); mpColorList->Save(); diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 52ead2371577..5c2ecd7bc6b4 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -584,15 +584,13 @@ bool SvxColorTabPage::FillItemSet( SfxItemSet* rSet ) void SvxColorTabPage::UpdateModified() { - bool bEnable = pColorList->Count(); + bool bEnable = pColorList.is() && pColorList->Count(); m_pBtnModify->Enable( bEnable ); m_pBtnWorkOn->Enable( bEnable ); m_pBtnDelete->Enable( bEnable ); EnableSave( bEnable ); } - - void SvxColorTabPage::Reset( const SfxItemSet* rSet ) { sal_uInt16 nState = rSet->GetItemState( XATTR_FILLCOLOR ); |