[Libreoffice-commits] core.git: Branch 'feature/jsdialogs' - 4 commits - include/sfx2 include/vcl libreofficekit/source sfx2/source vcl/source

[Szymon Kłos (via logerrit)]

 include/sfx2/sidebar/Panel.hxx           |    1 +
 include/vcl/layout.hxx                   |    1 +
 libreofficekit/source/gtk/lokdocview.cxx |    4 ++++
 sfx2/source/sidebar/Panel.cxx            |    7 +++++++
 vcl/source/window/layout.cxx             |    7 +++++++
 5 files changed, 20 insertions(+)

New commits:
commit 50e601576eb24da7df671f199dd7ea5c7348533f
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Sep 24 14:18:16 2019 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Tue Sep 24 14:18:16 2019 +0200

    jsdialogs: set panel as a separate type
    
    Change-Id: I715915ddcaff807ae6a6593dd776dbdb86f2bf4a

diff --git a/include/sfx2/sidebar/Panel.hxx b/include/sfx2/sidebar/Panel.hxx
index 25687459def2..7ecf38b24b68 100644
--- a/include/sfx2/sidebar/Panel.hxx
+++ b/include/sfx2/sidebar/Panel.hxx
@@ -61,6 +61,7 @@ public:
     virtual void Resize() override;
     virtual void DataChanged (const DataChangedEvent& rEvent) override;
     virtual void ApplySettings(vcl::RenderContext& rRenderContext) override;
+    virtual boost::property_tree::ptree DumpAsPropertyTree() override;
 
 private:
     const OUString msPanelId;
diff --git a/sfx2/source/sidebar/Panel.cxx b/sfx2/source/sidebar/Panel.cxx
index 6570c0615188..02a5cc565407 100644
--- a/sfx2/source/sidebar/Panel.cxx
+++ b/sfx2/source/sidebar/Panel.cxx
@@ -79,6 +79,13 @@ void Panel::ApplySettings(vcl::RenderContext& rRenderContext)
     rRenderContext.SetBackground(Theme::GetPaint(Theme::Paint_PanelBackground).GetWallpaper());
 }
 
+boost::property_tree::ptree Panel::DumpAsPropertyTree()
+{
+    boost::property_tree::ptree aTree(vcl::Window::DumpAsPropertyTree());
+    aTree.put("type", "panel");
+    return aTree;
+}
+
 void Panel::dispose()
 {
     mxPanelComponent = nullptr;
commit 7fe8214311d3c3a57a733649497a4a06c400d56a
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Mon Sep 23 18:45:34 2019 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Mon Sep 23 18:45:34 2019 +0200

    jsdialogs: set frame as a separate type
    
    Change-Id: I7f56d49dbe3b403c3716798bb52691748974aaae

diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index cfc2b444eaef..ec40707c6306 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -409,6 +409,7 @@ public:
     virtual const vcl::Window *get_child() const override;
     vcl::Window *get_label_widget();
     const vcl::Window *get_label_widget() const;
+    virtual boost::property_tree::ptree DumpAsPropertyTree() override;
 protected:
     virtual Size calculateRequisition() const override;
     virtual void setAllocation(const Size &rAllocation) override;
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index cb8f311cdd0b..e487296de7a7 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1634,6 +1634,13 @@ OUString VclFrame::getDefaultAccessibleName() const
     return VclBin::getDefaultAccessibleName();
 }
 
+boost::property_tree::ptree VclFrame::DumpAsPropertyTree()
+{
+    boost::property_tree::ptree aTree(VclBin::DumpAsPropertyTree());
+    aTree.put("type", "frame");
+    return aTree;
+}
+
 Size VclAlignment::calculateRequisition() const
 {
     Size aRet(m_nLeftPadding + m_nRightPadding,
commit a9c0ab489dc933eafa02aac792cc7731e25d00ce
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Mon Sep 23 08:53:51 2019 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Mon Sep 23 08:55:09 2019 +0200

    GtkTiledViewer recognize missing table related callbacks
    
    Change-Id: Ib829b2c85fc2f3b0068b9ff5d1ff41694ed21b56

diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
index 706739ab554f..e82662076e9c 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -1359,6 +1359,9 @@ callback (gpointer pData)
         break;
     case LOK_CALLBACK_CLIPBOARD_CHANGED:
     case LOK_CALLBACK_CONTEXT_CHANGED:
+    case LOK_CALLBACK_CELL_SELECTION_AREA:
+    case LOK_CALLBACK_CELL_AUTO_FILL_AREA:
+    case LOK_CALLBACK_TABLE_SELECTED:
         break; // TODO
     default:
         g_error("Unknown callback type: %d", pCallback->m_nType);
commit 14c2c25a5bcc64aa1a71ae04aada7030329f0441
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Mon Sep 23 08:53:00 2019 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Mon Sep 23 08:53:00 2019 +0200

    GtkTiledViewer unknown callback error
    
    Change-Id: Id931aa65e0c868044131b454c02bcf412972a15e

diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
index 51e1e8e1e801..706739ab554f 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -1361,6 +1361,7 @@ callback (gpointer pData)
     case LOK_CALLBACK_CONTEXT_CHANGED:
         break; // TODO
     default:
+        g_error("Unknown callback type: %d", pCallback->m_nType);
         g_assert(false);
         break;
     }