Kaydet (Commit) 86de78ce authored tarafından Caolán McNamara's avatar Caolán McNamara

Related: fdo#81147 check if colorlist is valid

Change-Id: Ifd48526974b7fcb10872d53d42e26add3fe878d1
üst c62e854e
...@@ -191,7 +191,7 @@ void SvxAreaTabDialog::SavePalettes() ...@@ -191,7 +191,7 @@ void SvxAreaTabDialog::SavePalettes()
} }
} }
if( mnColorListState & CT_MODIFIED ) if (mnColorListState & CT_MODIFIED && mpColorList.is())
{ {
mpColorList->SetPath( aPath ); mpColorList->SetPath( aPath );
mpColorList->Save(); mpColorList->Save();
......
...@@ -584,15 +584,13 @@ bool SvxColorTabPage::FillItemSet( SfxItemSet* rSet ) ...@@ -584,15 +584,13 @@ bool SvxColorTabPage::FillItemSet( SfxItemSet* rSet )
void SvxColorTabPage::UpdateModified() void SvxColorTabPage::UpdateModified()
{ {
bool bEnable = pColorList->Count(); bool bEnable = pColorList.is() && pColorList->Count();
m_pBtnModify->Enable( bEnable ); m_pBtnModify->Enable( bEnable );
m_pBtnWorkOn->Enable( bEnable ); m_pBtnWorkOn->Enable( bEnable );
m_pBtnDelete->Enable( bEnable ); m_pBtnDelete->Enable( bEnable );
EnableSave( bEnable ); EnableSave( bEnable );
} }
void SvxColorTabPage::Reset( const SfxItemSet* rSet ) void SvxColorTabPage::Reset( const SfxItemSet* rSet )
{ {
sal_uInt16 nState = rSet->GetItemState( XATTR_FILLCOLOR ); sal_uInt16 nState = rSet->GetItemState( XATTR_FILLCOLOR );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment