1 files changed, 25 insertions, 32 deletions

diff --git a/cui/source/options/optaboutconfig.hxx b/cui/source/options/optaboutconfig.hxx
index 69a207da6712..2b9402369a26 100644
--- a/cui/source/options/optaboutconfig.hxx
+++ b/cui/source/options/optaboutconfig.hxx
@@ -11,6 +11,7 @@
 
 #include <com/sun/star/container/XNameAccess.hpp>
 
+#include <dlgname.hxx>
 #include <i18nutil/searchopt.hxx>
 #include <vcl/weld.hxx>
 
@@ -36,60 +37,52 @@ private:
     std::unique_ptr<weld::Button> m_xResetBtn;
     std::unique_ptr<weld::Button> m_xEditBtn;
     std::unique_ptr<weld::Button> m_xSearchBtn;
+    std::unique_ptr<weld::CheckButton> m_xModifiedCheckBtn;
     std::unique_ptr<weld::Entry> m_xSearchEdit;
     std::unique_ptr<weld::TreeView> m_xPrefBox;
     std::unique_ptr<weld::TreeIter> m_xScratchIter;
 
-    std::vector < std::unique_ptr<UserData> > m_vectorUserData;
+    std::vector<std::unique_ptr<UserData>> m_vectorUserData;
 
     std::vector<prefBoxEntry> m_modifiedPrefBoxEntries;
-    std::vector< std::shared_ptr< Prop_Impl > > m_vectorOfModified;
+    std::vector<std::shared_ptr<Prop_Impl>> m_vectorOfModified;
 
-     //for search
+    //for search
     i18nutil::SearchOptions2 m_options;
     std::vector<prefBoxEntry> m_prefBoxEntries;
 
     bool m_bSorted;
 
-    void AddToModifiedVector( const std::shared_ptr< Prop_Impl >& rProp );
-    static std::vector< OUString > commaStringToSequence( const OUString& rCommaSepString );
+    void AddToModifiedVector(const std::shared_ptr<Prop_Impl>& rProp);
+    static std::vector<OUString> commaStringToSequence(std::u16string_view rCommaSepString);
     void InsertEntry(const prefBoxEntry& rEntry);
 
+    DECL_LINK(QueryTooltip, const weld::TreeIter& rIter, OUString);
     DECL_LINK(StandardHdl_Impl, weld::Button&, void);
     DECL_LINK(DoubleClickHdl_Impl, weld::TreeView&, bool);
     DECL_LINK(ResetBtnHdl_Impl, weld::Button&, void);
     DECL_LINK(SearchHdl_Impl, weld::Button&, void);
+    DECL_LINK(ModifiedHdl_Impl, weld::Toggleable&, void);
     DECL_LINK(ExpandingHdl_Impl, const weld::TreeIter&, bool);
     DECL_LINK(HeaderBarClick, int, void);
+    DECL_STATIC_LINK(CuiAboutConfigTabPage, ValidNameHdl, SvxNameDialog&, bool);
 
 public:
-   explicit CuiAboutConfigTabPage(weld::Window* pParent);
-   virtual ~CuiAboutConfigTabPage() override;
-   void     InsertEntry(const OUString &rPropertyPath, const OUString& rProp, const OUString& rStatus, const OUString& rType, const OUString& rValue,
-                        const weld::TreeIter* pParentEntry, bool bInsertToPrefBox);
-   void     Reset();
-   void     FillItems(const css::uno::Reference<css::container::XNameAccess>& xNameAccess,
-                      const weld::TreeIter* pParentEntry = nullptr, int lineage = 0, bool bLoadAll = false);
-   static css::uno::Reference< css::container::XNameAccess > getConfigAccess( const OUString& sNodePath, bool bUpdate );
-   void FillItemSet();
-};
-
-class CuiAboutConfigValueDialog : public weld::GenericDialogController
-{
-private:
-    bool m_bNumericOnly;
-    std::unique_ptr<weld::Entry> m_xEDValue;
-
-    DECL_LINK(KeyInputHdl, const KeyEvent&, bool);
-
-public:
-    CuiAboutConfigValueDialog(weld::Window* pWindow, const OUString& rValue , int limit);
-    virtual ~CuiAboutConfigValueDialog() override;
-
-    OUString getValue() const
-    {
-        return m_xEDValue->get_text();
-    }
+    explicit CuiAboutConfigTabPage(weld::Window* pParent);
+    virtual ~CuiAboutConfigTabPage() override;
+    void InsertEntry(const OUString& rPropertyPath, css::uno::Any aPropertyValue,
+                     const OUString& rProp, const OUString& rStatus, const OUString& rType,
+                     const OUString& rValue, const OUString& rTooltip,
+                     const weld::TreeIter* pParentEntry, bool bInsertToPrefBox, bool bIsReadOnly,
+                     bool bWasMOdified);
+    void Reset();
+    void InputChanged();
+    void FillItems(const css::uno::Reference<css::container::XNameAccess>& xNameAccess,
+                   const weld::TreeIter* pParentEntry = nullptr, int lineage = 0,
+                   bool bLoadAll = false);
+    static css::uno::Reference<css::container::XNameAccess>
+    getConfigAccess(const OUString& sNodePath, bool bUpdate);
+    void FillItemSet();
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */