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/pggrid.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/pggrid.cxx')
-rw-r--r-- | sw/source/ui/misc/pggrid.cxx | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index 583e2c2332dc..e622569496ca 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -23,6 +23,7 @@ #include <hintids.hxx> #include <swtypes.hxx> #include <globals.hrc> +#include <svx/colorbox.hxx> #include <svx/xtable.hxx> #include <uitool.hxx> #include <editeng/sizeitem.hxx> @@ -102,23 +103,12 @@ SwTextGridPage::SwTextGridPage(vcl::Window *pParent, const SfxItemSet &rSet) : m_pLinesGridRB->SetClickHdl(aGridTypeHdl); m_pCharsGridRB->SetClickHdl(aGridTypeHdl); - m_pColorLB->SetSelectHdl(LINK(this, SwTextGridPage, GridModifyHdl)); + m_pColorLB->SetSelectHdl(LINK(this, SwTextGridPage, ColorModifyHdl)); m_pPrintCB->SetClickHdl(LINK(this, SwTextGridPage, GridModifyClickHdl)); m_pRubyBelowCB->SetClickHdl(LINK(this, SwTextGridPage, GridModifyClickHdl)); m_pDisplayCB->SetClickHdl(LINK(this, SwTextGridPage, DisplayGridHdl)); - XColorListRef pColorLst = XColorList::GetStdColorList(); - m_pColorLB->InsertAutomaticEntryColor( Color( COL_AUTO ) ); - const long nCount = pColorLst->Count(); - for( long i = 0; i < nCount; ++i ) - { - const XColorEntry* pEntry = pColorLst->GetColor(i); - Color aColor = pEntry->GetColor(); - OUString sName = pEntry->GetName(); - m_pColorLB->InsertEntry( aColor, sName ); - } - m_pColorLB->SetUpdateMode( true ); //Get the default paper mode SwView *pView = ::GetActiveView(); if( pView ) @@ -434,7 +424,7 @@ IMPL_LINK(SwTextGridPage, CharorLineChangedHdl, SpinField&, rField, void) SetLinesOrCharsRanges( *m_pCharsRangeFT , m_pCharsPerLineNF->GetMax() ); } } - GridModifyHdl(*m_pColorLB); + GridModifyHdl(); } IMPL_LINK(SwTextGridPage, TextSizeLoseFocusHdl, Control&, rControl, void) @@ -489,7 +479,7 @@ IMPL_LINK(SwTextGridPage, TextSizeChangedHdl, SpinField&, rField, void) } //rubySize is disabled } - GridModifyHdl(*m_pColorLB); + GridModifyHdl(); } IMPL_LINK(SwTextGridPage, GridTypeHdl, Button*, pButton, void) @@ -515,7 +505,7 @@ IMPL_LINK(SwTextGridPage, GridTypeHdl, Button*, pButton, void) m_pCharWidthMF->Enable(false); } - GridModifyHdl(*m_pColorLB); + GridModifyHdl(); } IMPL_LINK_NOARG(SwTextGridPage, DisplayGridHdl, Button*, void) @@ -527,9 +517,15 @@ IMPL_LINK_NOARG(SwTextGridPage, DisplayGridHdl, Button*, void) IMPL_LINK_NOARG(SwTextGridPage, GridModifyClickHdl, Button*, void) { - GridModifyHdl(*m_pColorLB); + GridModifyHdl(); +} + +IMPL_LINK_NOARG(SwTextGridPage, ColorModifyHdl, SvxColorListBox&, void) +{ + GridModifyHdl(); } -IMPL_LINK_NOARG(SwTextGridPage, GridModifyHdl, ListBox&, void) + +void SwTextGridPage::GridModifyHdl() { const SfxItemSet& rOldSet = GetItemSet(); SfxItemSet aSet(rOldSet); |