diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-11-05 20:28:27 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-11-07 21:04:50 +0000 |
commit | 64a708cba9b954afe3331f63c58218eb53b3d0ce (patch) | |
tree | ddc1bea3b63f32a1c6d377c1d1dd7aee0803fb70 /sw/source/ui/misc/pgfnote.cxx | |
parent | f01c49c4a89ecad2376fd0023625186e5cac642e (diff) |
Revert "Reverts a commit series that cripple windows ci."
with addition of...
- svxlo-SvxColorListBox
+ svxcorelo-SvxColorListBox
This reverts commit db380aab1063e8a5e40111c40ee9f7921aa82601.
Change-Id: I3af7aa0abb1a430bce64188244404fcbd480b128
Reviewed-on: https://gerrit.libreoffice.org/30598
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/ui/misc/pgfnote.cxx')
-rw-r--r-- | sw/source/ui/misc/pgfnote.cxx | 42 |
1 files changed, 5 insertions, 37 deletions
diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index 43a51888edf1..691105f269ad 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -93,9 +93,9 @@ IMPL_LINK_NOARG(SwFootNotePage, LineWidthChanged_Impl, Edit&, void) m_pLineTypeBox->SetWidth( nVal ); } -IMPL_LINK_NOARG(SwFootNotePage, LineColorSelected_Impl, ListBox&, void) +IMPL_LINK(SwFootNotePage, LineColorSelected_Impl, SvxColorListBox&, rColorBox, void) { - m_pLineTypeBox->SetColor( m_pLineColorBox->GetSelectEntryColor() ); + m_pLineTypeBox->SetColor(rColorBox.GetSelectEntryColor()); } SwFootNotePage::SwFootNotePage(vcl::Window *pParent, const SfxItemSet &rSet) @@ -211,41 +211,9 @@ void SwFootNotePage::Reset(const SfxItemSet *rSet) m_pLineTypeBox->SelectEntry( pFootnoteInfo->GetLineStyle() ); // Separator Color - SfxObjectShell* pDocSh = SfxObjectShell::Current(); - XColorListRef pColorList; - - OSL_ENSURE( pDocSh, "DocShell not found!" ); - - if ( pDocSh ) - { - const SfxPoolItem* pColorItem = pDocSh->GetItem( SID_COLOR_TABLE ); - if ( pColorItem != nullptr ) - pColorList = static_cast<const SvxColorListItem*>(pColorItem)->GetColorList(); - } - - OSL_ENSURE( pColorList.is(), "ColorTable not found!" ); - - if ( pColorList.is() ) - { - m_pLineColorBox->SetUpdateMode( false ); - - for ( long i = 0; i < pColorList->Count(); ++i ) - { - const XColorEntry* pEntry = pColorList->GetColor(i); - m_pLineColorBox->InsertEntry( pEntry->GetColor(), pEntry->GetName() ); - } - m_pLineColorBox->SetUpdateMode( true ); - } - - // select color in the list or add it as a user color - sal_Int32 nSelPos = m_pLineColorBox->GetEntryPos( pFootnoteInfo->GetLineColor() ); - if( nSelPos == LISTBOX_ENTRY_NOTFOUND ) - nSelPos = m_pLineColorBox->InsertEntry( pFootnoteInfo->GetLineColor(), - SVX_RESSTR(RID_SVXSTR_COLOR_USER) ); - - m_pLineColorBox->SetSelectHdl( LINK( this, SwFootNotePage, LineColorSelected_Impl ) ); - m_pLineColorBox->SelectEntryPos( nSelPos ); - m_pLineTypeBox->SetColor( pFootnoteInfo->GetLineColor() ); + m_pLineColorBox->SelectEntry(pFootnoteInfo->GetLineColor()); + m_pLineColorBox->SetSelectHdl(LINK(this, SwFootNotePage, LineColorSelected_Impl)); + m_pLineTypeBox->SetColor(pFootnoteInfo->GetLineColor()); // position m_pLinePosBox->SelectEntryPos( static_cast< sal_Int32 >(pFootnoteInfo->GetAdj()) ); |