1 files changed, 26 insertions, 0 deletions

diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index fb68ee0c605d..f1bc5c341d47 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -73,6 +73,8 @@
 #include <bitmaps.hlst>
 #include <wizdlg.hxx>
 
+#include <boost/property_tree/ptree.hpp>
+
 SalFrame::SalFrame()
     : m_pWindow(nullptr)
     , m_pProc(nullptr)
@@ -722,6 +724,11 @@ public:
         return m_xWidget->GetDropTarget();
     }
 
+    virtual boost::property_tree::ptree get_property_tree() const override
+    {
+        return m_xWidget->DumpAsPropertyTree();
+    }
+
     virtual void set_stack_background() override
     {
         set_background(m_xWidget->GetSettings().GetStyleSettings().GetWindowColor());
@@ -6153,6 +6160,11 @@ public:
         return false;
     }
 
+    virtual bool changed_by_menu() const override
+    {
+        return true;
+    }
+
     virtual void set_entry_message_type(weld::EntryMessageType /*eType*/) override
     {
         assert(false);
@@ -6225,6 +6237,11 @@ public:
         return true;
     }
 
+    virtual bool changed_by_menu() const override
+    {
+        return m_xComboBox->IsModifyByMenu(); // && !m_xComboBox->IsTravelSelect();
+    }
+
     virtual void set_entry_message_type(weld::EntryMessageType eType) override
     {
         if (eType == weld::EntryMessageType::Error)
@@ -6328,6 +6345,7 @@ private:
     DECL_LINK(KeyPressListener, VclWindowEvent&, void);
     SalInstanceEntry* m_pEntry;
     SalInstanceTreeView* m_pTreeView;
+    bool m_bTreeChange;
 public:
     SalInstanceEntryTreeView(vcl::Window *pContainer, SalInstanceBuilder* pBuilder, bool bTakeOwnership,
                              std::unique_ptr<weld::Entry> xEntry, std::unique_ptr<weld::TreeView> xTreeView)
@@ -6335,6 +6353,7 @@ public:
         , SalInstanceContainer(pContainer, pBuilder, bTakeOwnership)
         , m_pEntry(dynamic_cast<SalInstanceEntry*>(m_xEntry.get()))
         , m_pTreeView(dynamic_cast<SalInstanceTreeView*>(m_xTreeView.get()))
+        , m_bTreeChange(false)
     {
         assert(m_pEntry && m_pTreeView);
 
@@ -6373,6 +6392,11 @@ public:
         m_xEntry->connect_focus_out(rLink);
     }
 
+    virtual bool changed_by_menu() const override
+    {
+        return m_bTreeChange;
+    }
+
     virtual ~SalInstanceEntryTreeView() override
     {
         Edit& rEntry = m_pEntry->getEntry();
@@ -6398,7 +6422,9 @@ IMPL_LINK(SalInstanceEntryTreeView, KeyPressListener, VclWindowEvent&, rEvent, v
         m_xEntry->set_text(m_xTreeView->get_selected_text());
         m_xEntry->select_region(0, -1);
         m_pTreeView->enable_notify_events();
+        m_bTreeChange = true;
         m_pEntry->fire_signal_changed();
+        m_bTreeChange = false;
     }
 }