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 /svx/source/dialog/fontwork.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 'svx/source/dialog/fontwork.cxx')
| -rw-r--r-- | svx/source/dialog/fontwork.cxx | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx index 166277cc42b4..b86ce464a860 100644 --- a/svx/source/dialog/fontwork.cxx +++ b/svx/source/dialog/fontwork.cxx @@ -20,6 +20,7 @@ #include <sfx2/module.hxx> #include <sfx2/dispatch.hxx> +#include <svx/colorbox.hxx> #include <svx/svdobj.hxx> #include <svx/svdopath.hxx> #include <svx/svdview.hxx> @@ -791,23 +792,13 @@ IMPL_LINK_NOARG(SvxFontWorkDialog, InputTimoutHdl_Impl, Idle *, void) { &aDistItem, &aStartItem, &aShadowXItem, &aShadowYItem }); } -IMPL_LINK_NOARG(SvxFontWorkDialog, ColorSelectHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxFontWorkDialog, ColorSelectHdl_Impl, SvxColorListBox&, void) { XFormTextShadowColorItem aItem( "", m_pShadowColorLB->GetSelectEntryColor() ); GetBindings().GetDispatcher()->ExecuteList(SID_FORMTEXT_SHDWCOLOR, SfxCallMode::RECORD, { &aItem }); } -void SvxFontWorkDialog::SetColorList(const XColorListRef &pList) -{ - if ( pList.is() && pList != pColorList ) - { - pColorList = pList; - m_pShadowColorLB->Clear(); - m_pShadowColorLB->Fill(pColorList); - } -} - void SvxFontWorkDialog::ApplyImageList() { if (nLastShadowTbxId == nShadowSlantId) |