diff options
Diffstat (limited to 'sw/source/uibase/inc')
-rw-r--r-- | sw/source/uibase/inc/break.hxx | 12 | ||||
-rw-r--r-- | sw/source/uibase/inc/drpcps.hxx | 16 | ||||
-rw-r--r-- | sw/source/uibase/inc/swuiccoll.hxx | 4 |
3 files changed, 16 insertions, 16 deletions
diff --git a/sw/source/uibase/inc/break.hxx b/sw/source/uibase/inc/break.hxx index 79cf295eb353..0e39075107e4 100644 --- a/sw/source/uibase/inc/break.hxx +++ b/sw/source/uibase/inc/break.hxx @@ -39,13 +39,13 @@ class SwBreakDlg final : public weld::GenericDialogController std::unique_ptr<weld::SpinButton> m_xPageNumEdit; std::unique_ptr<weld::Button> m_xOkBtn; - SwWrtShell& rSh; + SwWrtShell& m_rSh; OUString m_aTemplate; - sal_uInt16 nKind; - ::std::optional<sal_uInt16> oPgNum; + sal_uInt16 m_nKind; + ::std::optional<sal_uInt16> m_oPgNum; std::optional<SwLineBreakClear> m_eClear; - bool bHtmlMode; + bool m_bHtmlMode; DECL_LINK(ToggleHdl, weld::Toggleable&, void); DECL_LINK(ChangeHdl, weld::ComboBox&, void); @@ -59,8 +59,8 @@ class SwBreakDlg final : public weld::GenericDialogController public: SwBreakDlg(weld::Window* pParent, SwWrtShell& rSh); const OUString& GetTemplateName() const { return m_aTemplate; } - sal_uInt16 GetKind() const { return nKind; } - const ::std::optional<sal_uInt16>& GetPageNumber() const { return oPgNum; } + sal_uInt16 GetKind() const { return m_nKind; } + const ::std::optional<sal_uInt16>& GetPageNumber() const { return m_oPgNum; } const std::optional<SwLineBreakClear>& GetClear() const { return m_eClear; } }; diff --git a/sw/source/uibase/inc/drpcps.hxx b/sw/source/uibase/inc/drpcps.hxx index d1b0a09d082a..7eca0dbd7958 100644 --- a/sw/source/uibase/inc/drpcps.hxx +++ b/sw/source/uibase/inc/drpcps.hxx @@ -65,7 +65,7 @@ class SwDropCapsPict final : public weld::CustomWidgetController SvxFont maCJKFont; SvxFont maCTLFont; Size maTextSize; - css::uno::Reference< css::i18n::XBreakIterator > xBreak; + css::uno::Reference< css::i18n::XBreakIterator > m_xBreak; virtual void Paint(vcl::RenderContext& /*rRenderContext*/, const tools::Rectangle &rRect) override; void CheckScript(); @@ -112,11 +112,11 @@ class SwDropCapsPage final : public SfxTabPage friend class SwDropCapsPict; SwDropCapsPict m_aPict; - bool bModified; - bool bFormat; - bool bHtmlMode; + bool m_bModified; + bool m_bFormat; + bool m_bHtmlMode; - SwWrtShell &rSh; + SwWrtShell &m_rSh; std::unique_ptr<weld::CheckButton> m_xDropCapsBox; std::unique_ptr<weld::CheckButton> m_xWholeWordCB; @@ -144,20 +144,20 @@ friend class SwDropCapsPict; DECL_LINK(SelectHdl, weld::ComboBox&, void); DECL_LINK(WholeWordHdl, weld::Toggleable&, void); - static const WhichRangesContainer aPageRg; + static const WhichRangesContainer s_aPageRg; public: SwDropCapsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet); virtual ~SwDropCapsPage() override; static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet); - static WhichRangesContainer GetRanges() { return aPageRg; } + static WhichRangesContainer GetRanges() { return s_aPageRg; } virtual bool FillItemSet( SfxItemSet *rSet) override; virtual void Reset (const SfxItemSet *rSet) override; - void SetFormat(bool bSet){bFormat = bSet;} + void SetFormat(bool bSet){m_bFormat = bSet;} }; #endif diff --git a/sw/source/uibase/inc/swuiccoll.hxx b/sw/source/uibase/inc/swuiccoll.hxx index 66cd1410115e..aff7f533ab11 100644 --- a/sw/source/uibase/inc/swuiccoll.hxx +++ b/sw/source/uibase/inc/swuiccoll.hxx @@ -50,14 +50,14 @@ class SwCondCollPage final : public SfxTabPage void AssignRemove(const weld::Widget*); void SelectHdl(const weld::Widget*); - static const WhichRangesContainer m_aPageRg; + static const WhichRangesContainer s_aPageRg; public: SwCondCollPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet); virtual ~SwCondCollPage() override; static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet); - static WhichRangesContainer GetRanges() { return m_aPageRg; } + static WhichRangesContainer GetRanges() { return s_aPageRg; } virtual bool FillItemSet( SfxItemSet *rSet) override; virtual void Reset (const SfxItemSet *rSet) override; |