[Libreoffice-commits] core.git: sd/source

[Stephan Bergmann (via logerrit)]

 sd/source/ui/dlg/BulletAndPositionDlg.cxx |    8 ++------
 sd/source/ui/inc/BulletAndPositionDlg.hxx |    7 +------
 2 files changed, 3 insertions(+), 12 deletions(-)

New commits:
commit 1541ac50819c59923e100e297fa7b4d4a3316126
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Jun 8 11:15:45 2021 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Jun 9 17:42:41 2021 +0200

    -Werror,-Wunused-but-set-variable (Clang 13 trunk)
    
    > sd/source/ui/dlg/BulletAndPositionDlg.cxx:707:14: error: variable 'sSelectStyle' set but not used [-Werror,-Wunused-but-set-variable]
    >     OUString sSelectStyle;
    >              ^
    
    ...ever since the code's introduction in
    e3015d7021e689c71c2ed8e5dd01a74d832c84f0 "Add new customize and position merged
    dialog", and which means that SvxBulletAndPositionDlg::m_sBulletCharFormatName
    and second parameter of SvxBulletAndPositionDlg::SetCharFmts, both also
    introduced in that commit, were equally unused
    
    Change-Id: Id07c05777817298073d85719689b391bda533221
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116821
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sd/source/ui/dlg/BulletAndPositionDlg.cxx b/sd/source/ui/dlg/BulletAndPositionDlg.cxx
index fc7d4d4dbb39..fb798956e4ef 100644
--- a/sd/source/ui/dlg/BulletAndPositionDlg.cxx
+++ b/sd/source/ui/dlg/BulletAndPositionDlg.cxx
@@ -189,11 +189,10 @@ SvxBulletAndPositionDlg::SvxBulletAndPositionDlg(weld::Window* pWindow, const Sf
     aSet.Put(SfxUInt16Item(SID_METRIC_ITEM, static_cast<sal_uInt16>(eMetric)));
 
     const SfxStringItem* pNumCharFmt = aSet.GetItem<SfxStringItem>(SID_NUM_CHAR_FMT, false);
-    const SfxStringItem* pBulletCharFmt = aSet.GetItem<SfxStringItem>(SID_BULLET_CHAR_FMT, false);
     const SfxUInt16Item* pMetricItem = aSet.GetItem<SfxUInt16Item>(SID_METRIC_ITEM, false);
 
-    if (pNumCharFmt && pBulletCharFmt)
-        SetCharFmts(pNumCharFmt->GetValue(), pBulletCharFmt->GetValue());
+    if (pNumCharFmt)
+        SetCharFmt(pNumCharFmt->GetValue());
 
     if (pMetricItem)
         SetMetric(static_cast<FieldUnit>(pMetricItem->GetValue()));
@@ -702,7 +701,6 @@ IMPL_LINK_NOARG(SvxBulletAndPositionDlg, PreviewInvalidateHdl_Impl, Timer*, void
 
 IMPL_LINK(SvxBulletAndPositionDlg, NumberTypeSelectHdl_Impl, weld::ComboBox&, rBox, void)
 {
-    OUString sSelectStyle;
     bool bBmp = false;
     sal_uInt16 nMask = 1;
     for (sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
@@ -737,7 +735,6 @@ IMPL_LINK(SvxBulletAndPositionDlg, NumberTypeSelectHdl_Impl, weld::ComboBox&, rB
                 pActNum->SetLevel(i, aNumFmt);
                 SwitchNumberType(SHOW_BULLET);
                 // allocation of the drawing pattern is automatic
-                sSelectStyle = m_sBulletCharFormatName;
             }
             else
             {
@@ -748,7 +745,6 @@ IMPL_LINK(SvxBulletAndPositionDlg, NumberTypeSelectHdl_Impl, weld::ComboBox&, rB
                 CheckForStartValue_Impl(nNumberingType);
 
                 // allocation of the drawing pattern is automatic
-                sSelectStyle = m_sNumCharFmtName;
             }
         }
         nMask <<= 1;
diff --git a/sd/source/ui/inc/BulletAndPositionDlg.hxx b/sd/source/ui/inc/BulletAndPositionDlg.hxx
index 6b33aff7098f..b6984af8ccb5 100644
--- a/sd/source/ui/inc/BulletAndPositionDlg.hxx
+++ b/sd/source/ui/inc/BulletAndPositionDlg.hxx
@@ -46,7 +46,6 @@ class View;
 class SvxBulletAndPositionDlg : public weld::GenericDialogController
 {
     OUString m_sNumCharFmtName;
-    OUString m_sBulletCharFormatName;
 
     Timer aInvalidateTimer;
 
@@ -148,11 +147,7 @@ public:
     bool IsSlideScope() const;
     void Reset(const SfxItemSet* rSet);
 
-    void SetCharFmts(const OUString& rNumName, const OUString& rBulletName)
-    {
-        m_sNumCharFmtName = rNumName;
-        m_sBulletCharFormatName = rBulletName;
-    }
+    void SetCharFmt(const OUString& rNumName) { m_sNumCharFmtName = rNumName; }
     void SetMetric(FieldUnit eSet);
 
     void SetModified(bool bRepaint = true);