[Libreoffice-commits] core.git: include/svx svx/source

[Noel Grandin (via logerrit)]

 include/svx/SvxColorValueSet.hxx         |    2 +-
 svx/source/tbxctrls/SvxColorValueSet.cxx |    7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

New commits:
commit 4fbc246c7021248e4e9689f59b030b4b8f526954
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Jun 10 12:17:15 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Jun 11 13:38:04 2021 +0200

    loplugin:unnecessaryreturn in SvxColorValueSet::layoutToGivenHeight
    
    Change-Id: Ia42158597588fe802a2f06a6e8e59f372c62c022
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117031
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/svx/SvxColorValueSet.hxx b/include/svx/SvxColorValueSet.hxx
index dd8f93348153..1872b58fdf04 100644
--- a/include/svx/SvxColorValueSet.hxx
+++ b/include/svx/SvxColorValueSet.hxx
@@ -41,7 +41,7 @@ public:
     void addEntriesForXColorList(const XColorList& rXColorList, sal_uInt32 nStartIndex = 1);
     void addEntriesForColorSet(const std::set<Color>& rColorSet, const OUString& rNamePrefix);
     Size layoutAllVisible(sal_uInt32 nEntryCount);
-    Size layoutToGivenHeight(sal_uInt32 nHeight, sal_uInt32 nEntryCount);
+    void layoutToGivenHeight(sal_uInt32 nHeight, sal_uInt32 nEntryCount);
 
     virtual FactoryFunction GetUITestFactory() const override;
 };
diff --git a/svx/source/tbxctrls/SvxColorValueSet.cxx b/svx/source/tbxctrls/SvxColorValueSet.cxx
index 9176c00a2a8d..4b4547dfce59 100644
--- a/svx/source/tbxctrls/SvxColorValueSet.cxx
+++ b/svx/source/tbxctrls/SvxColorValueSet.cxx
@@ -124,7 +124,7 @@ void SvxColorValueSet::Resize()
     ValueSet::Resize();
 }
 
-Size SvxColorValueSet::layoutToGivenHeight(sal_uInt32 nHeight, sal_uInt32 nEntryCount)
+void SvxColorValueSet::layoutToGivenHeight(sal_uInt32 nHeight, sal_uInt32 nEntryCount)
 {
     if(!nEntryCount)
     {
@@ -157,15 +157,10 @@ Size SvxColorValueSet::layoutToGivenHeight(sal_uInt32 nHeight, sal_uInt32 nEntry
         SetStyle(aWinBits|WB_VSCROLL);
     }
 
-    // set height to wanted height
-    aNewSize.setHeight( nHeight );
-
     SetItemWidth(aItemSize.Width());
     SetItemHeight(aItemSize.Height());
     SetColCount(SvxColorValueSet::getColumnCount());
     SetLineCount(nLineCount);
-
-    return aNewSize;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */