summaryrefslogtreecommitdiff
path: root/sw/source/uibase/inc/num.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/uibase/inc/num.hxx')
-rw-r--r--sw/source/uibase/inc/num.hxx34
1 files changed, 17 insertions, 17 deletions
diff --git a/sw/source/uibase/inc/num.hxx b/sw/source/uibase/inc/num.hxx
index 9d536066915c..9dfa2bf9ea4f 100644
--- a/sw/source/uibase/inc/num.hxx
+++ b/sw/source/uibase/inc/num.hxx
@@ -27,19 +27,19 @@ class SwWrtShell;
class SvxBrushItem;
class SwOutlineTabDialog;
-class SwNumPositionTabPage : public SfxTabPage
+class SwNumPositionTabPage final : public SfxTabPage
{
- std::unique_ptr<SwNumRule> pActNum;
- SwNumRule* pSaveNum;
- SwWrtShell* pWrtSh;
+ std::unique_ptr<SwNumRule> m_pActNum;
+ SwNumRule* m_pSaveNum;
+ SwWrtShell* m_pWrtSh;
- SwOutlineTabDialog* pOutlineDlg;
- sal_uInt16 nActNumLvl;
+ SwOutlineTabDialog* m_pOutlineDlg;
+ sal_uInt16 m_nActNumLvl;
- bool bModified : 1;
- bool bPreset : 1;
- bool bInInintControl : 1; // work around modify-error; should be resolved from 391 on
- bool bLabelAlignmentPosAndSpaceModeActive;
+ bool m_bModified : 1;
+ bool m_bPreset : 1;
+ bool m_bInInintControl : 1; // work around modify-error; should be resolved from 391 on
+ bool m_bLabelAlignmentPosAndSpaceModeActive;
NumberingPreview m_aPreviewWIN;
@@ -79,7 +79,7 @@ class SwNumPositionTabPage : public SfxTabPage
DECL_LINK(LevelHdl, weld::TreeView&, void);
DECL_LINK(EditModifyHdl, weld::ComboBox&, void);
DECL_LINK(DistanceHdl, weld::MetricSpinButton&, void);
- DECL_LINK(RelativeHdl, weld::ToggleButton&, void);
+ DECL_LINK(RelativeHdl, weld::Toggleable&, void);
DECL_LINK(StandardHdl, weld::Button&, void);
void InitPosAndSpaceMode();
@@ -103,15 +103,15 @@ public:
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet);
- void SetOutlineTabDialog(SwOutlineTabDialog* pDlg){pOutlineDlg = pDlg;}
+ void SetOutlineTabDialog(SwOutlineTabDialog* pDlg){m_pOutlineDlg = pDlg;}
void SetWrtShell(SwWrtShell* pSh);
#ifdef DBG_UTIL
void SetModified();
#else
void SetModified()
{
- bModified = true;
- m_aPreviewWIN.SetLevel(nActNumLvl);
+ m_bModified = true;
+ m_aPreviewWIN.SetLevel(m_nActNumLvl);
m_aPreviewWIN.Invalidate();
}
#endif
@@ -119,17 +119,17 @@ public:
class SwSvxNumBulletTabDialog final : public SfxTabDialogController
{
- SwWrtShell& rWrtSh;
+ SwWrtShell& m_rWrtSh;
virtual short Ok() override;
- virtual void PageCreated(const OString& rPageId, SfxTabPage& rPage) override;
+ virtual void PageCreated(const OUString& rPageId, SfxTabPage& rPage) override;
DECL_LINK(RemoveNumberingHdl, weld::Button&, void);
std::unique_ptr<weld::ComboBox> m_xDummyCombo;
public:
SwSvxNumBulletTabDialog(weld::Window* pParent,
- const SfxItemSet* pSwItemSet,
+ const SfxItemSet& rSwItemSet,
SwWrtShell &);
virtual ~SwSvxNumBulletTabDialog() override;
};