Kaydet (Commit) 64bc2eff authored tarafından Rishabh Kumar's avatar Rishabh Kumar Kaydeden (comit) Katarina Behrens

Minor bugfix for the Color tab

Bugs fixed:
1. Allow resizing of SvxColorValueSet on Addition and deletion of colors.
2. Refresh color in SvxColorValueSet on modifying the color.
3. Select the second last color on deleting the last color.

Change-Id: Id01a1347683ea183dfb9fbc5c14a4e101eeef9aa
Reviewed-on: https://gerrit.libreoffice.org/26084Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarKatarina Behrens <Katarina.Behrens@cib.de>
üst c3acc062
...@@ -787,6 +787,7 @@ IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickAddHdl_Impl, Button*, void) ...@@ -787,6 +787,7 @@ IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickAddHdl_Impl, Button*, void)
m_pLbColor->Append( *pEntry ); m_pLbColor->Append( *pEntry );
m_pValSetColorList->InsertItem( m_pValSetColorList->GetItemCount() + 1, pEntry->GetColor(), pEntry->GetName() ); m_pValSetColorList->InsertItem( m_pValSetColorList->GetItemCount() + 1, pEntry->GetColor(), pEntry->GetName() );
m_pValSetColorList->Resize();
ImpColorCountChanged(); ImpColorCountChanged();
m_pLbColor->SelectEntryPos( m_pLbColor->GetEntryCount() - 1 ); m_pLbColor->SelectEntryPos( m_pLbColor->GetEntryCount() - 1 );
...@@ -855,8 +856,9 @@ IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickModifyHdl_Impl, Button*, void) ...@@ -855,8 +856,9 @@ IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickModifyHdl_Impl, Button*, void)
m_pLbColor->Modify( *pEntry, nPos ); m_pLbColor->Modify( *pEntry, nPos );
m_pLbColor->SelectEntryPos( nPos ); m_pLbColor->SelectEntryPos( nPos );
m_pValSetColorList->SetItemColor( nPos + 1, pEntry->GetColor() ); m_pValSetColorList->Clear();
m_pValSetColorList->SetItemText( nPos + 1, pEntry->GetName() ); m_pValSetColorList->addEntriesForXColorList( *pColorList );
m_pValSetColorList->SelectItem( nPos + 1 );
m_pEdtName->SetText( aName ); m_pEdtName->SetText( aName );
m_pCtlPreviewOld->Invalidate(); m_pCtlPreviewOld->Invalidate();
...@@ -907,11 +909,21 @@ IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickDeleteHdl_Impl, Button*, void) ...@@ -907,11 +909,21 @@ IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickDeleteHdl_Impl, Button*, void)
m_pLbColor->RemoveEntry( nPos ); m_pLbColor->RemoveEntry( nPos );
m_pValSetColorList->Clear(); m_pValSetColorList->Clear();
m_pValSetColorList->addEntriesForXColorList(*pColorList); m_pValSetColorList->addEntriesForXColorList(*pColorList);
m_pValSetColorList->Resize();
ImpColorCountChanged(); ImpColorCountChanged();
//FillValueSet_Impl(*m_pValSetColorList); //FillValueSet_Impl(*m_pValSetColorList);
// positioning // positioning
m_pLbColor->SelectEntryPos( nPos ); long nColorCount = pColorList->Count();
if( nColorCount != 0 )
{
if( nPos >= nColorCount )
nPos = nColorCount - 1;
m_pLbColor->SelectEntryPos( nPos );
}
else
m_pLbColor->SetNoSelection();
SelectColorLBHdl_Impl( *m_pLbColor ); SelectColorLBHdl_Impl( *m_pLbColor );
m_pCtlPreviewOld->Invalidate(); m_pCtlPreviewOld->Invalidate();
......
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