summaryrefslogtreecommitdiff
path: root/sc/source/ui
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-04-25 20:07:00 +0100
committerCaolán McNamara <caolanm@redhat.com>2020-04-25 22:43:15 +0200
commit33966ab25d21594a3a4f40ce30ece73fa4f45a27 (patch)
tree5493d1710748df78a43b177f8f21323a6ab6160a /sc/source/ui
parent34bb3c51783f6cd5d17bff1b259886eeb91f25da (diff)
rename ColorValueSet back to SvxColorValueSet
Change-Id: I2036a8986d2d53fc97f1c7724e4e0ab837edc1ba Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92900 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc/source/ui')
-rw-r--r--sc/source/ui/inc/tabbgcolordlg.hxx2
-rw-r--r--sc/source/ui/miscdlgs/tabbgcolordlg.cxx10
2 files changed, 6 insertions, 6 deletions
diff --git a/sc/source/ui/inc/tabbgcolordlg.hxx b/sc/source/ui/inc/tabbgcolordlg.hxx
index 4b23e3cccba2..62ee5cd1eaf7 100644
--- a/sc/source/ui/inc/tabbgcolordlg.hxx
+++ b/sc/source/ui/inc/tabbgcolordlg.hxx
@@ -34,7 +34,7 @@ public:
void GetSelectedColor( Color& rColor ) const;
- class ScTabBgColorValueSet : public ColorValueSet
+ class ScTabBgColorValueSet : public SvxColorValueSet
{
public:
ScTabBgColorValueSet(std::unique_ptr<weld::ScrolledWindow> pWindow);
diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
index a0317ca01c2d..84241f5b655f 100644
--- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
+++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
@@ -38,7 +38,7 @@ ScTabBgColorDlg::ScTabBgColorDlg(weld::Window* pParent, const OUString& rTitle,
, m_xBtnOk(m_xBuilder->weld_button("ok"))
{
m_xTabBgColorSet->SetDialog(this);
- m_xTabBgColorSet->SetColCount(ColorValueSet::getColumnCount());
+ m_xTabBgColorSet->SetColCount(SvxColorValueSet::getColumnCount());
m_xDialog->set_title(rTitle);
@@ -46,9 +46,9 @@ ScTabBgColorDlg::ScTabBgColorDlg(weld::Window* pParent, const OUString& rTitle,
m_xTabBgColorSet->SetStyle(nBits);
m_xTabBgColorSet->SetText(rTabBgColorNoColorText);
- const sal_uInt32 nColCount = ColorValueSet::getColumnCount();
+ const sal_uInt32 nColCount = SvxColorValueSet::getColumnCount();
const sal_uInt32 nRowCount(10);
- const sal_uInt32 nLength = ColorValueSet::getEntryEdgeLength();
+ const sal_uInt32 nLength = SvxColorValueSet::getEntryEdgeLength();
Size aSize(m_xTabBgColorSet->CalcWindowSizePixel(Size(nLength, nLength), nColCount, nRowCount));
m_xTabBgColorSetWin->set_size_request(aSize.Width() + 8, aSize.Height() + 8);
@@ -113,7 +113,7 @@ IMPL_LINK_NOARG(ScTabBgColorDlg, TabBgColorOKHdl_Impl, weld::Button&, void)
}
ScTabBgColorDlg::ScTabBgColorValueSet::ScTabBgColorValueSet(std::unique_ptr<weld::ScrolledWindow> pWindow)
- : ColorValueSet(std::move(pWindow))
+ : SvxColorValueSet(std::move(pWindow))
, m_pTabBgColorDlg(nullptr)
{
}
@@ -137,7 +137,7 @@ bool ScTabBgColorDlg::ScTabBgColorValueSet::KeyInput( const KeyEvent& rKEvt )
}
break;
}
- return ColorValueSet::KeyInput(rKEvt);
+ return SvxColorValueSet::KeyInput(rKEvt);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */