1 files changed, 13 insertions, 12 deletions

diff --git a/sw/source/uibase/inc/swuiidxmrk.hxx b/sw/source/uibase/inc/swuiidxmrk.hxx
index ee738021fc13..7f5460a8be45 100644
--- a/sw/source/uibase/inc/swuiidxmrk.hxx
+++ b/sw/source/uibase/inc/swuiidxmrk.hxx
@@ -87,6 +87,7 @@ class SwIndexMarkPane
     std::unique_ptr<weld::Button> m_xNextSameBT;
     std::unique_ptr<weld::Button> m_xPrevBT;
     std::unique_ptr<weld::Button> m_xNextBT;
+    std::unique_ptr<weld::Label> m_xForSelectedEntry;
 
     void            Apply();
     void            InitControls();
@@ -106,7 +107,7 @@ class SwIndexMarkPane
     void ModifyHdl(const weld::Widget& rWidget);
     DECL_LINK( KeyDCBModifyHdl, weld::ComboBox&, void );
     DECL_LINK( NewUserIdxHdl, weld::Button&, void );
-    DECL_LINK( SearchTypeHdl, weld::ToggleButton&, void );
+    DECL_LINK( SearchTypeHdl, weld::Toggleable&, void );
     DECL_LINK( PhoneticEDModifyHdl, weld::Entry&, void );
 
     //this method updates the values from 'nLangForPhoneticReading' and 'bIsPhoneticReadingEnabled'
@@ -124,7 +125,7 @@ class SwIndexMarkPane
 
 public:
 
-    SwIndexMarkPane(const std::shared_ptr<weld::Dialog>& rDialog, weld::Builder& rBuilder,
+    SwIndexMarkPane(std::shared_ptr<weld::Dialog> xDialog, weld::Builder& rBuilder,
                     bool bNewDlg, SwWrtShell* pWrtShell);
 
     ~SwIndexMarkPane();
@@ -133,7 +134,7 @@ public:
     bool    IsTOXType(const OUString& rName) { return m_xTypeDCB->find_text(rName) != -1; }
 };
 
-class SwIndexMarkFloatDlg : public SfxModelessDialogController
+class SwIndexMarkFloatDlg final : public SfxModelessDialogController
 {
     SwIndexMarkPane m_aContent;
 
@@ -147,7 +148,7 @@ public:
     void    ReInitDlg(SwWrtShell& rWrtShell);
 };
 
-class SwIndexMarkModalDlg : public SfxDialogController
+class SwIndexMarkModalDlg final : public SfxDialogController
 {
     SwIndexMarkPane m_aContent;
 public:
@@ -162,22 +163,22 @@ class SwAuthorMarkPane
 {
     weld::DialogController& m_rDialog;
 
-    static bool     bIsFromComponent;
+    static bool     s_bIsFromComponent;
 
     friend class SwAuthMarkModalDlg;
     friend class SwAuthMarkFloatDlg;
 
-    bool            bNewEntry;
-    bool            bBibAccessInitialized;
+    bool            m_bNewEntry;
+    bool            m_bBibAccessInitialized;
 
-    SwWrtShell*     pSh;
+    SwWrtShell*     m_pSh;
 
     OUString        m_sColumnTitles[AUTH_FIELD_END];
     OUString        m_sFields[AUTH_FIELD_END];
 
     OUString        m_sCreatedEntry[AUTH_FIELD_END];
 
-    css::uno::Reference< css::container::XNameAccess >    xBibAccess;
+    css::uno::Reference< css::container::XNameAccess >    m_xBibAccess;
 
     std::unique_ptr<weld::RadioButton> m_xFromComponentRB;
     std::unique_ptr<weld::RadioButton> m_xFromDocContentRB;
@@ -194,7 +195,7 @@ class SwAuthorMarkPane
     DECL_LINK(CloseHdl, weld::Button&, void);
     DECL_LINK(CreateEntryHdl, weld::Button&, void);
     DECL_LINK(CompEntryHdl, weld::ComboBox&, void);
-    DECL_LINK(ChangeSourceHdl, weld::ToggleButton&, void);
+    DECL_LINK(ChangeSourceHdl, weld::Toggleable&, void);
     DECL_LINK(IsEditAllowedHdl, weld::Entry&, bool);
     DECL_LINK(IsEntryAllowedHdl, weld::Entry&, bool);
     DECL_LINK(EditModifyHdl, weld::Entry&, void);
@@ -207,7 +208,7 @@ public:
     void ReInitDlg(SwWrtShell& rWrtShell);
 };
 
-class SwAuthMarkFloatDlg : public SfxModelessDialogController
+class SwAuthMarkFloatDlg final : public SfxModelessDialogController
 {
     SwAuthorMarkPane m_aContent;
     virtual void    Activate() override;
@@ -220,7 +221,7 @@ public:
     void    ReInitDlg(SwWrtShell& rWrtShell);
 };
 
-class SwAuthMarkModalDlg : public SfxDialogController
+class SwAuthMarkModalDlg final : public SfxDialogController
 {
     SwAuthorMarkPane m_aContent;