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 /sc/source/ui/dbgui/scendlg.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 'sc/source/ui/dbgui/scendlg.cxx')
| -rw-r--r-- | sc/source/ui/dbgui/scendlg.cxx | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx index 3cd9044ca12d..efcd657caed7 100644 --- a/sc/source/ui/dbgui/scendlg.cxx +++ b/sc/source/ui/dbgui/scendlg.cxx @@ -21,6 +21,7 @@ #include "scitems.hxx" #include <comphelper/string.hxx> +#include <svx/colorbox.hxx> #include <svx/drawitem.hxx> #include <svx/xtable.hxx> #include <sfx2/objsh.hxx> @@ -58,27 +59,6 @@ ScNewScenarioDlg::ScNewScenarioDlg( vcl::Window* pParent, const OUString& rName, if (bIsEdit) SetText(get<FixedText>("alttitle")->GetText()); - SfxObjectShell* pDocSh = SfxObjectShell::Current(); - if ( pDocSh ) - { - const SfxPoolItem* pItem = pDocSh->GetItem( SID_COLOR_TABLE ); - if ( pItem ) - { - XColorListRef pColorList = static_cast<const SvxColorListItem*>(pItem)->GetColorList(); - if (pColorList.is()) - { - m_pLbColor->SetUpdateMode( false ); - long nCount = pColorList->Count(); - for ( long n=0; n<nCount; n++ ) - { - const XColorEntry* pEntry = pColorList->GetColor(n); - m_pLbColor->InsertEntry( pEntry->GetColor(), pEntry->GetName() ); - } - m_pLbColor->SetUpdateMode( true ); - } - } - } - SvtUserOptions aUserOpt; OUString sCreatedBy(get<FixedText>("createdft")->GetText()); |