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>
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index d046a50..9ccac25 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -648,8 +648,8 @@ private:
PaletteManager maPaletteManager;
SvxXRectPreview m_aCtlPreviewOld;
SvxXRectPreview m_aCtlPreviewNew;
std::unique_ptr<ColorValueSet> m_xValSetColorList;
std::unique_ptr<ColorValueSet> m_xValSetRecentList;
std::unique_ptr<SvxColorValueSet> m_xValSetColorList;
std::unique_ptr<SvxColorValueSet> m_xValSetRecentList;
std::unique_ptr<weld::ComboBox> m_xSelectPalette;
std::unique_ptr<weld::RadioButton> m_xRbRGB;
std::unique_ptr<weld::RadioButton> m_xRbCMYK;
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index 4ca091b..3d86942 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -95,7 +95,7 @@ SvxDefaultColorOptPage::SvxDefaultColorOptPage(weld::Container* pPage, weld::Dia
, m_xPBDefault(m_xBuilder->weld_button("default"))
, m_xPBAdd(m_xBuilder->weld_button("add"))
, m_xPBRemove(m_xBuilder->weld_button("delete"))
, m_xValSetColorBox(new ColorValueSet(m_xBuilder->weld_scrolled_window("tablewin")))
, m_xValSetColorBox(new SvxColorValueSet(m_xBuilder->weld_scrolled_window("tablewin")))
, m_xValSetColorBoxWin(new weld::CustomWeld(*m_xBuilder, "table", *m_xValSetColorBox))
{
m_xLbChartColors->set_size_request(-1, m_xLbChartColors->get_height_rows(16));
diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx
index f8b0dcb..807fd29 100644
--- a/cui/source/options/optchart.hxx
+++ b/cui/source/options/optchart.hxx
@@ -46,7 +46,7 @@ private:
std::unique_ptr<weld::Button> m_xPBDefault;
std::unique_ptr<weld::Button> m_xPBAdd;
std::unique_ptr<weld::Button> m_xPBRemove;
std::unique_ptr<ColorValueSet> m_xValSetColorBox;
std::unique_ptr<SvxColorValueSet> m_xValSetColorBox;
std::unique_ptr<weld::CustomWeld> m_xValSetColorBoxWin;
DECL_LINK(ResetToDefaults, weld::Button&, void);
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 4bae96a..b5f0983 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -46,8 +46,8 @@ SvxColorTabPage::SvxColorTabPage(weld::Container* pPage, weld::DialogController*
, rXFSet( aXFillAttr.GetItemSet() )
, eCM( ColorModel::RGB )
, m_context(comphelper::getProcessComponentContext())
, m_xValSetColorList(new ColorValueSet(m_xBuilder->weld_scrolled_window("colorsetwin")))
, m_xValSetRecentList(new ColorValueSet(nullptr))
, m_xValSetColorList(new SvxColorValueSet(m_xBuilder->weld_scrolled_window("colorsetwin")))
, m_xValSetRecentList(new SvxColorValueSet(nullptr))
, m_xSelectPalette(m_xBuilder->weld_combo_box("paletteselector"))
, m_xRbRGB(m_xBuilder->weld_radio_button("RGB"))
, m_xRbCMYK(m_xBuilder->weld_radio_button("CMYK"))
@@ -154,8 +154,8 @@ void SvxColorTabPage::ImpColorCountChanged()
{
if (!pColorList.is())
return;
m_xValSetColorList->SetColCount(ColorValueSet::getColumnCount());
m_xValSetRecentList->SetColCount(ColorValueSet::getColumnCount());
m_xValSetColorList->SetColCount(SvxColorValueSet::getColumnCount());
m_xValSetRecentList->SetColCount(SvxColorValueSet::getColumnCount());
}
void SvxColorTabPage::FillPaletteLB()
diff --git a/include/svx/Palette.hxx b/include/svx/Palette.hxx
index be8198f..c505eb41 100644
--- a/include/svx/Palette.hxx
+++ b/include/svx/Palette.hxx
@@ -23,7 +23,7 @@
#include <svx/svxdllapi.h>
class Color;
class ColorValueSet;
class SvxColorValueSet;
typedef std::pair<Color, OUString> NamedColor;
@@ -34,7 +34,7 @@ public:
virtual const OUString& GetName() = 0;
virtual const OUString& GetPath() = 0;
virtual void LoadColorSet( ColorValueSet& rColorSet ) = 0;
virtual void LoadColorSet(SvxColorValueSet& rColorSet) = 0;
virtual bool IsValid() = 0;
};
diff --git a/include/svx/PaletteManager.hxx b/include/svx/PaletteManager.hxx
index 42fbb04..637f7d0 100644
--- a/include/svx/PaletteManager.hxx
+++ b/include/svx/PaletteManager.hxx
@@ -53,8 +53,8 @@ public:
PaletteManager(const PaletteManager&) = delete;
PaletteManager& operator=(const PaletteManager&) = delete;
void LoadPalettes();
void ReloadColorSet(ColorValueSet& rColorSet);
void ReloadRecentColorSet(ColorValueSet& rColorSet);
void ReloadColorSet(SvxColorValueSet& rColorSet);
void ReloadRecentColorSet(SvxColorValueSet& rColorSet);
std::vector<OUString> GetPaletteList();
void SetPalette( sal_Int32 nPos );
sal_Int32 GetPalette() const;
diff --git a/include/svx/SvxColorValueSet.hxx b/include/svx/SvxColorValueSet.hxx
index ffdaf64..b78cb96 100644
--- a/include/svx/SvxColorValueSet.hxx
+++ b/include/svx/SvxColorValueSet.hxx
@@ -25,10 +25,10 @@
class XColorList;
class SVXCORE_DLLPUBLIC ColorValueSet : public SvtValueSet
class SVXCORE_DLLPUBLIC SvxColorValueSet : public SvtValueSet
{
public:
ColorValueSet(std::unique_ptr<weld::ScrolledWindow> pWindow);
SvxColorValueSet(std::unique_ptr<weld::ScrolledWindow> pWindow);
virtual void Resize() override;
diff --git a/include/svx/colorwindow.hxx b/include/svx/colorwindow.hxx
index 372470c..6ba24b9 100644
--- a/include/svx/colorwindow.hxx
+++ b/include/svx/colorwindow.hxx
@@ -90,8 +90,8 @@ private:
ColorStatus& mrColorStatus;
ColorSelectFunction maColorSelectFunction;
std::unique_ptr<ColorValueSet> mxColorSet;
std::unique_ptr<ColorValueSet> mxRecentColorSet;
std::unique_ptr<SvxColorValueSet> mxColorSet;
std::unique_ptr<SvxColorValueSet> mxRecentColorSet;
std::unique_ptr<weld::ComboBox> mxPaletteListBox;
std::unique_ptr<weld::Button> mxButtonAutoColor;
std::unique_ptr<weld::Button> mxButtonNoneColor;
@@ -107,7 +107,7 @@ private:
DECL_LINK(AutoColorClickHdl, weld::Button&, void);
DECL_LINK(OpenPickerClickHdl, weld::Button&, void);
static bool SelectValueSetEntry(ColorValueSet* pColorSet, const Color& rColor);
static bool SelectValueSetEntry(SvxColorValueSet* pColorSet, const Color& rColor);
static NamedColor GetSelectEntryColor(SvtValueSet const * pColorSet);
NamedColor GetAutoColor() const;
diff --git a/sc/source/ui/inc/tabbgcolordlg.hxx b/sc/source/ui/inc/tabbgcolordlg.hxx
index 4b23e3c..62ee5cd 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 a0317ca..84241f5 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: */
diff --git a/svx/inc/colrctrl.hxx b/svx/inc/colrctrl.hxx
index 361bef1..7f3ad6f 100644
--- a/svx/inc/colrctrl.hxx
+++ b/svx/inc/colrctrl.hxx
@@ -42,7 +42,7 @@ class SvxColorValueSetData;
|*
\************************************************************************/
class SAL_WARN_UNUSED SvxColorValueSet_docking final : public ColorValueSet
class SAL_WARN_UNUSED SvxColorValueSet_docking final : public SvxColorValueSet
{
bool mbLeftButton;
diff --git a/svx/inc/palettes.hxx b/svx/inc/palettes.hxx
index d993605..9469659 100644
--- a/svx/inc/palettes.hxx
+++ b/svx/inc/palettes.hxx
@@ -43,7 +43,7 @@ public:
virtual const OUString& GetName() override;
virtual const OUString& GetPath() override;
virtual void LoadColorSet( ColorValueSet& rColorSet ) override;
virtual void LoadColorSet(SvxColorValueSet& rColorSet) override;
virtual bool IsValid() override;
};
@@ -68,7 +68,7 @@ public:
virtual const OUString& GetName() override;
virtual const OUString& GetPath() override;
virtual void LoadColorSet( ColorValueSet& rColorSet ) override;
virtual void LoadColorSet(SvxColorValueSet& rColorSet) override;
virtual bool IsValid() override;
};
@@ -87,7 +87,7 @@ public:
virtual const OUString& GetName() override;
virtual const OUString& GetPath() override;
virtual void LoadColorSet( ColorValueSet& rColorSet ) override;
virtual void LoadColorSet(SvxColorValueSet& rColorSet) override;
virtual bool IsValid() override;
};
diff --git a/svx/source/tbxctrls/Palette.cxx b/svx/source/tbxctrls/Palette.cxx
index c9b790a..ccfe7b8 100644
--- a/svx/source/tbxctrls/Palette.cxx
+++ b/svx/source/tbxctrls/Palette.cxx
@@ -38,7 +38,7 @@ PaletteASE::PaletteASE( const OUString &rFPath, const OUString &rFName ) :
LoadPalette();
}
void PaletteASE::LoadColorSet( ColorValueSet& rColorSet )
void PaletteASE::LoadColorSet(SvxColorValueSet& rColorSet)
{
rColorSet.Clear();
int nIx = 1;
@@ -197,7 +197,7 @@ const OUString& PaletteGPL::GetPath()
return maFPath;
}
void PaletteGPL::LoadColorSet( ColorValueSet& rColorSet )
void PaletteGPL::LoadColorSet(SvxColorValueSet& rColorSet)
{
LoadPalette();
@@ -343,7 +343,7 @@ const OUString& PaletteSOC::GetPath()
return maFPath;
}
void PaletteSOC::LoadColorSet( ColorValueSet& rColorSet )
void PaletteSOC::LoadColorSet(SvxColorValueSet& rColorSet)
{
if( !mbLoadedPalette )
{
diff --git a/svx/source/tbxctrls/PaletteManager.cxx b/svx/source/tbxctrls/PaletteManager.cxx
index 8a4f4e5..1431793 100644
--- a/svx/source/tbxctrls/PaletteManager.cxx
+++ b/svx/source/tbxctrls/PaletteManager.cxx
@@ -125,8 +125,7 @@ void PaletteManager::LoadPalettes()
}
}
void PaletteManager::ReloadColorSet(ColorValueSet &rColorSet)
void PaletteManager::ReloadColorSet(SvxColorValueSet &rColorSet)
{
if( mnCurrentPalette == 0)
{
@@ -160,7 +159,7 @@ void PaletteManager::ReloadColorSet(ColorValueSet &rColorSet)
}
}
void PaletteManager::ReloadRecentColorSet(ColorValueSet& rColorSet)
void PaletteManager::ReloadRecentColorSet(SvxColorValueSet& rColorSet)
{
maRecentColors.clear();
rColorSet.Clear();
diff --git a/svx/source/tbxctrls/SvxColorValueSet.cxx b/svx/source/tbxctrls/SvxColorValueSet.cxx
index bed00e5..25ed247 100644
--- a/svx/source/tbxctrls/SvxColorValueSet.cxx
+++ b/svx/source/tbxctrls/SvxColorValueSet.cxx
@@ -23,32 +23,32 @@
#include <vcl/settings.hxx>
#include <osl/diagnose.h>
ColorValueSet::ColorValueSet(std::unique_ptr<weld::ScrolledWindow> pWindow)
SvxColorValueSet::SvxColorValueSet(std::unique_ptr<weld::ScrolledWindow> pWindow)
: SvtValueSet(std::move(pWindow))
{
SetEdgeBlending(true);
}
sal_uInt32 ColorValueSet::getMaxRowCount()
sal_uInt32 SvxColorValueSet::getMaxRowCount()
{
return StyleSettings::GetColorValueSetMaximumRowCount();
}
sal_uInt32 ColorValueSet::getEntryEdgeLength()
sal_uInt32 SvxColorValueSet::getEntryEdgeLength()
{
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
return rStyleSettings.GetListBoxPreviewDefaultPixelSize().Height() + 1;
}
sal_uInt32 ColorValueSet::getColumnCount()
sal_uInt32 SvxColorValueSet::getColumnCount()
{
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
return rStyleSettings.GetColorValueSetColumnCount();
}
void ColorValueSet::addEntriesForXColorList(const XColorList& rXColorList, sal_uInt32 nStartIndex)
void SvxColorValueSet::addEntriesForXColorList(const XColorList& rXColorList, sal_uInt32 nStartIndex)
{
const sal_uInt32 nColorCount(rXColorList.Count());
@@ -67,7 +67,7 @@ void ColorValueSet::addEntriesForXColorList(const XColorList& rXColorList, sal_u
}
}
void ColorValueSet::addEntriesForColorSet(const std::set<Color>& rColorSet, const OUString& rNamePrefix)
void SvxColorValueSet::addEntriesForColorSet(const std::set<Color>& rColorSet, const OUString& rNamePrefix)
{
sal_uInt32 nStartIndex = 1;
if(rNamePrefix.getLength() != 0)
@@ -88,18 +88,18 @@ void ColorValueSet::addEntriesForColorSet(const std::set<Color>& rColorSet, cons
}
}
Size ColorValueSet::layoutAllVisible(sal_uInt32 nEntryCount)
Size SvxColorValueSet::layoutAllVisible(sal_uInt32 nEntryCount)
{
if(!nEntryCount)
{
nEntryCount++;
}
const sal_uInt32 nRowCount(ceil(double(nEntryCount)/ColorValueSet::getColumnCount()));
const Size aItemSize(ColorValueSet::getEntryEdgeLength() - 2, ColorValueSet::getEntryEdgeLength() - 2);
const sal_uInt32 nRowCount(ceil(double(nEntryCount)/SvxColorValueSet::getColumnCount()));
const Size aItemSize(SvxColorValueSet::getEntryEdgeLength() - 2, SvxColorValueSet::getEntryEdgeLength() - 2);
const WinBits aWinBits(GetStyle() & ~WB_VSCROLL);
if (nRowCount > ColorValueSet::getMaxRowCount())
if (nRowCount > SvxColorValueSet::getMaxRowCount())
{
SetStyle(aWinBits|WB_VSCROLL);
}
@@ -108,38 +108,38 @@ Size ColorValueSet::layoutAllVisible(sal_uInt32 nEntryCount)
SetStyle(aWinBits);
}
SetColCount(ColorValueSet::getColumnCount());
SetLineCount(std::min(nRowCount, ColorValueSet::getMaxRowCount()));
SetColCount(SvxColorValueSet::getColumnCount());
SetLineCount(std::min(nRowCount, SvxColorValueSet::getMaxRowCount()));
SetItemWidth(aItemSize.Width());
SetItemHeight(aItemSize.Height());
return CalcWindowSizePixel(aItemSize);
}
void ColorValueSet::Resize()
void SvxColorValueSet::Resize()
{
layoutToGivenHeight(GetOutputSizePixel().Height(), GetItemCount());
SvtValueSet::Resize();
}
Size ColorValueSet::layoutToGivenHeight(sal_uInt32 nHeight, sal_uInt32 nEntryCount)
Size SvxColorValueSet::layoutToGivenHeight(sal_uInt32 nHeight, sal_uInt32 nEntryCount)
{
if(!nEntryCount)
{
nEntryCount++;
}
const Size aItemSize(ColorValueSet::getEntryEdgeLength() - 2, ColorValueSet::getEntryEdgeLength() - 2);
const Size aItemSize(SvxColorValueSet::getEntryEdgeLength() - 2, SvxColorValueSet::getEntryEdgeLength() - 2);
const WinBits aWinBits(GetStyle() & ~WB_VSCROLL);
// get size with all fields disabled
const WinBits aWinBitsNoScrollNoFields(GetStyle() & ~(WB_VSCROLL|WB_NAMEFIELD|WB_NONEFIELD));
SetStyle(aWinBitsNoScrollNoFields);
const Size aSizeNoScrollNoFields(CalcWindowSizePixel(aItemSize, ColorValueSet::getColumnCount()));
const Size aSizeNoScrollNoFields(CalcWindowSizePixel(aItemSize, SvxColorValueSet::getColumnCount()));
// get size with all needed fields
SetStyle(aWinBits);
Size aNewSize(CalcWindowSizePixel(aItemSize, ColorValueSet::getColumnCount()));
Size aNewSize(CalcWindowSizePixel(aItemSize, SvxColorValueSet::getColumnCount()));
const Size aItemSizePixel(CalcItemSizePixel(aItemSize));
// calculate field height and available height for requested height
@@ -148,7 +148,7 @@ Size ColorValueSet::layoutToGivenHeight(sal_uInt32 nHeight, sal_uInt32 nEntryCou
// calculate how many lines can be shown there
const sal_uInt32 nLineCount(nAvailableHeight / aItemSizePixel.Height());
const sal_uInt32 nLineMax(ceil(double(nEntryCount)/ColorValueSet::getColumnCount()));
const sal_uInt32 nLineMax(ceil(double(nEntryCount)/SvxColorValueSet::getColumnCount()));
if(nLineMax > nLineCount)
{
@@ -160,7 +160,7 @@ Size ColorValueSet::layoutToGivenHeight(sal_uInt32 nHeight, sal_uInt32 nEntryCou
SetItemWidth(aItemSize.Width());
SetItemHeight(aItemSize.Height());
SetColCount(ColorValueSet::getColumnCount());
SetColCount(SvxColorValueSet::getColumnCount());
SetLineCount(nLineCount);
return aNewSize;
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index 71b637e..a35e15e 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -84,13 +84,13 @@ bool SvxColorValueSetData::GetData( const css::datatransfer::DataFlavor& rFlavor
void SvxColorValueSet_docking::SetDrawingArea(weld::DrawingArea* pDrawingArea)
{
ColorValueSet::SetDrawingArea(pDrawingArea);
SvxColorValueSet::SetDrawingArea(pDrawingArea);
SetAccessibleName(SvxResId(STR_COLORTABLE));
SetStyle(GetStyle() | WB_ITEMBORDER);
}
SvxColorValueSet_docking::SvxColorValueSet_docking(std::unique_ptr<weld::ScrolledWindow> xWindow)
: ColorValueSet(std::move(xWindow))
: SvxColorValueSet(std::move(xWindow))
, mbLeftButton(true)
{
}
@@ -103,7 +103,7 @@ bool SvxColorValueSet_docking::MouseButtonDown( const MouseEvent& rMEvt )
if( rMEvt.IsLeft() )
{
mbLeftButton = true;
bRet = ColorValueSet::MouseButtonDown( rMEvt );
bRet = SvxColorValueSet::MouseButtonDown( rMEvt );
}
else
{
@@ -113,7 +113,7 @@ bool SvxColorValueSet_docking::MouseButtonDown( const MouseEvent& rMEvt )
rMEvt.GetMode(),
MOUSE_LEFT,
rMEvt.GetModifier() );
bRet = ColorValueSet::MouseButtonDown( aMEvt );
bRet = SvxColorValueSet::MouseButtonDown( aMEvt );
}
return bRet;
@@ -127,7 +127,7 @@ bool SvxColorValueSet_docking::MouseButtonUp( const MouseEvent& rMEvt )
if( rMEvt.IsLeft() )
{
mbLeftButton = true;
bRet = ColorValueSet::MouseButtonUp( rMEvt );
bRet = SvxColorValueSet::MouseButtonUp( rMEvt );
}
else
{
@@ -137,7 +137,7 @@ bool SvxColorValueSet_docking::MouseButtonUp( const MouseEvent& rMEvt )
rMEvt.GetMode(),
MOUSE_LEFT,
rMEvt.GetModifier() );
bRet = ColorValueSet::MouseButtonUp( aMEvt );
bRet = SvxColorValueSet::MouseButtonUp( aMEvt );
}
SetNoSelection();
@@ -208,10 +208,10 @@ SvxColorDockingWindow::SvxColorDockingWindow(SfxBindings* _pBindings, SfxChildWi
}
}
aItemSize = xColorSet->CalcItemSizePixel(Size(ColorValueSet::getEntryEdgeLength(), ColorValueSet::getEntryEdgeLength()));
aItemSize.setWidth( aItemSize.Width() + ColorValueSet::getEntryEdgeLength() );
aItemSize = xColorSet->CalcItemSizePixel(Size(SvxColorValueSet::getEntryEdgeLength(), SvxColorValueSet::getEntryEdgeLength()));
aItemSize.setWidth( aItemSize.Width() + SvxColorValueSet::getEntryEdgeLength() );
aItemSize.setWidth( aItemSize.Width() / 2 );
aItemSize.setHeight( aItemSize.Height() + ColorValueSet::getEntryEdgeLength() );
aItemSize.setHeight( aItemSize.Height() + SvxColorValueSet::getEntryEdgeLength() );
aItemSize.setHeight( aItemSize.Height() / 2 );
fprintf(stderr, "size is %ld %ld\n", aItemSize.Width(), aItemSize.Height());
@@ -256,7 +256,7 @@ void SvxColorDockingWindow::FillValueSet()
xColorSet->addEntriesForXColorList(*pColorList, 2);
// create the last entry for 'invisible/none'
const Size aColorSize(ColorValueSet::getEntryEdgeLength(), ColorValueSet::getEntryEdgeLength());
const Size aColorSize(SvxColorValueSet::getEntryEdgeLength(), SvxColorValueSet::getEntryEdgeLength());
long nPtX = aColorSize.Width() - 1;
long nPtY = aColorSize.Height() - 1;
ScopedVclPtrInstance< VirtualDevice > pVD;
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 1b4961c..3e13b0b 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1750,8 +1750,8 @@ ColorWindow::ColorWindow(const OUString& rCommand,
, mxPaletteManager(rPaletteManager)
, mrColorStatus(rColorStatus)
, maColorSelectFunction(aFunction)
, mxColorSet(new ColorValueSet(m_xBuilder->weld_scrolled_window("colorsetwin")))
, mxRecentColorSet(new ColorValueSet(nullptr))
, mxColorSet(new SvxColorValueSet(m_xBuilder->weld_scrolled_window("colorsetwin")))
, mxRecentColorSet(new SvxColorValueSet(nullptr))
, mxPaletteListBox(m_xBuilder->weld_combo_box("palette_listbox"))
, mxButtonAutoColor(m_xBuilder->weld_button("auto_color_button"))
, mxButtonNoneColor(m_xBuilder->weld_button("none_color_button"))
@@ -1826,7 +1826,7 @@ ColorWindow::ColorWindow(const OUString& rCommand,
mxColorSet->SetHelpId(HID_POPUP_COLOR_CTRL);
mxPaletteManager->ReloadColorSet(*mxColorSet);
const sal_uInt32 nMaxItems(ColorValueSet::getMaxRowCount() * ColorValueSet::getColumnCount());
const sal_uInt32 nMaxItems(SvxColorValueSet::getMaxRowCount() * SvxColorValueSet::getColumnCount());
Size aSize = mxColorSet->layoutAllVisible(nMaxItems);
mxColorSet->set_size_request(aSize.Width(), aSize.Height());
@@ -2026,7 +2026,7 @@ void ColorWindow::statusChanged( const css::frame::FeatureStateEvent& rEvent )
}
}
bool ColorWindow::SelectValueSetEntry(ColorValueSet* pColorSet, const Color& rColor)
bool ColorWindow::SelectValueSetEntry(SvxColorValueSet* pColorSet, const Color& rColor)
{
for (size_t i = 1; i <= pColorSet->GetItemCount(); ++i)
{
