include/svx/SvxColorValueSet.hxx | 4 +++-
include/vcl/settings.hxx | 4 ----
svx/source/tbxctrls/SvxColorValueSet.cxx | 5 -----
vcl/source/app/settings.cxx | 6 ------
4 files changed, 3 insertions(+), 16 deletions(-)
New commits:
commit 4474d167e1b69ab9ca8a97c636f0400a5084641a
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Sat Mar 6 08:38:12 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Mar 6 13:07:58 2021 +0100
drop StyleSettings::GetColorValueSetMaximumRowCount
pull it into the only place it is used.
Change-Id: I5923f1599e033d893cebea606138c53ab2cd02fe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112045
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/svx/SvxColorValueSet.hxx b/include/svx/SvxColorValueSet.hxx
index 82792acf64f4..dd8f93348153 100644
--- a/include/svx/SvxColorValueSet.hxx
+++ b/include/svx/SvxColorValueSet.hxx
@@ -32,7 +32,9 @@ public:
virtual void Resize() override;
- static sal_uInt32 getMaxRowCount();
+ /* Maximum row/line count for the ColorValueSet control. If more lines
would be needed, a scrollbar will
+ be used. */
+ static constexpr sal_uInt32 getMaxRowCount() { return 10; }
static sal_uInt32 getEntryEdgeLength();
static sal_uInt32 getColumnCount();
diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index 1e18e005cb70..38b7d423936c 100644
--- a/include/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
@@ -597,10 +597,6 @@ public:
void SetColorValueSetColumnCount(sal_uInt16
nCount);
sal_uInt16 GetColorValueSetColumnCount() const;
- // maximum row/line count for the ColorValueSet control. If more lines
would be needed, a scrollbar will
- // be used.
- static sal_uInt16 GetColorValueSetMaximumRowCount();
-
void SetListBoxPreviewDefaultLogicSize(Size
const & rSize);
const Size& GetListBoxPreviewDefaultPixelSize() const;
diff --git a/svx/source/tbxctrls/SvxColorValueSet.cxx
b/svx/source/tbxctrls/SvxColorValueSet.cxx
index e349083e34aa..9176c00a2a8d 100644
--- a/svx/source/tbxctrls/SvxColorValueSet.cxx
+++ b/svx/source/tbxctrls/SvxColorValueSet.cxx
@@ -36,11 +36,6 @@ FactoryFunction SvxColorValueSet::GetUITestFactory() const
return SvxColorValueSetUIObject::create;
}
-sal_uInt32 SvxColorValueSet::getMaxRowCount()
-{
- return StyleSettings::GetColorValueSetMaximumRowCount();
-}
-
sal_uInt32 SvxColorValueSet::getEntryEdgeLength()
{
const StyleSettings& rStyleSettings =
Application::GetSettings().GetStyleSettings();
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index bfce93a9736b..66a285288242 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -2136,12 +2136,6 @@ StyleSettings::GetColorValueSetColumnCount() const
return mxData->mnColorValueSetColumnCount;
}
-sal_uInt16
-StyleSettings::GetColorValueSetMaximumRowCount()
-{
- return 10;
-}
-
sal_uInt16
StyleSettings::GetListBoxPreviewDefaultLineWidth()
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
