From 516bdf7989dc2e2650490893e1ead054d40eaf37 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Sat, 8 Jun 2019 12:39:25 +0200 Subject: loplugin:singlevalfields Change-Id: I7c00b7d932bf96a0725eac5482580461baea6977 Reviewed-on: https://gerrit.libreoffice.org/73697 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sd/source/ui/dlg/BulletAndPositionDlg.cxx | 11 ++--------- sd/source/ui/inc/BulletAndPositionDlg.hxx | 1 - 2 files changed, 2 insertions(+), 10 deletions(-) (limited to 'sd/source/ui') diff --git a/sd/source/ui/dlg/BulletAndPositionDlg.cxx b/sd/source/ui/dlg/BulletAndPositionDlg.cxx index 806506d8d292..6575850c6a6b 100644 --- a/sd/source/ui/dlg/BulletAndPositionDlg.cxx +++ b/sd/source/ui/dlg/BulletAndPositionDlg.cxx @@ -117,7 +117,6 @@ SvxBulletAndPositionDlg::SvxBulletAndPositionDlg(weld::Window* pWindow, const Sf : GenericDialogController(pWindow, "cui/ui/bulletandposition.ui", "BulletAndPosition") , bLastWidthModified(false) , bModified(false) - , bAutomaticCharStyles(true) , bInInitControl(false) , bLabelAlignmentPosAndSpaceModeActive(false) , bApplyToMaster(false) @@ -794,10 +793,7 @@ IMPL_LINK(SvxBulletAndPositionDlg, NumberTypeSelectHdl_Impl, weld::ComboBox&, rB pActNum->SetLevel(i, aNumFmt); SwitchNumberType(SHOW_BULLET); // allocation of the drawing pattern is automatic - if (bAutomaticCharStyles) - { - sSelectStyle = m_sBulletCharFormatName; - } + sSelectStyle = m_sBulletCharFormatName; } else { @@ -808,10 +804,7 @@ IMPL_LINK(SvxBulletAndPositionDlg, NumberTypeSelectHdl_Impl, weld::ComboBox&, rB CheckForStartValue_Impl(nNumberingType); // allocation of the drawing pattern is automatic - if (bAutomaticCharStyles) - { - sSelectStyle = m_sNumCharFmtName; - } + sSelectStyle = m_sNumCharFmtName; } } nMask <<= 1; diff --git a/sd/source/ui/inc/BulletAndPositionDlg.hxx b/sd/source/ui/inc/BulletAndPositionDlg.hxx index 3e2402eb0bef..fb95af11c6f0 100644 --- a/sd/source/ui/inc/BulletAndPositionDlg.hxx +++ b/sd/source/ui/inc/BulletAndPositionDlg.hxx @@ -62,7 +62,6 @@ class SvxBulletAndPositionDlg : public weld::GenericDialogController bool bLastWidthModified : 1; bool bModified : 1; - bool bAutomaticCharStyles : 1; bool bInInitControl : 1; // workaround for Modify-error, is said to be corrected from 391 on bool bLabelAlignmentPosAndSpaceModeActive; bool bApplyToMaster; -- cgit