include/vcl/layout.hxx | 1 +
vcl/inc/jsdialog/jsdialogbuilder.hxx | 9 +++++++++
vcl/jsdialog/jsdialogbuilder.cxx | 22 ++++++++++++++++++++++
vcl/source/window/layout.cxx | 6 ++++++
4 files changed, 38 insertions(+)
New commits:
commit 6c8dad40a18e588a0404485ff5cae0f9cd4a5ea7
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Wed Dec 16 10:18:15 2020 +0100
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Tue Dec 29 06:03:55 2020 +0100
jsdialog: update JSON on treeview modification
Change-Id: Ibaf186768f9be0cb2dc893082590c851abae29b5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107819
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108413
Tested-by: Jenkins
diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx
b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index cf7b17dca2d1..0a02e64cf890 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -382,6 +382,15 @@ public:
virtual weld::TreeView* get_drag_source() const override;
+ using SalInstanceTreeView::insert;
+ virtual void insert(const weld::TreeIter* pParent, int pos, const
OUString* pStr,
+ const OUString* pId, const OUString* pIconName,
+ VirtualDevice* pImageSurface, bool bChildrenOnDemand,
+ weld::TreeIter* pRet) override;
+
+ virtual void set_text(int row, const OUString& rText, int col = -1)
override;
+ virtual void set_text(const weld::TreeIter& rIter, const OUString& rStr,
int col = -1) override;
+
void drag_start();
void drag_end();
};
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index aa1febfe5d2a..1bef2653ae11 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -1031,6 +1031,28 @@ IMPL_LINK(JSTreeView, on_window_event, VclWindowEvent&,
rEvent, void)
}
}
+void JSTreeView::insert(const weld::TreeIter* pParent, int pos, const
OUString* pStr,
+ const OUString* pId, const OUString* pIconName,
+ VirtualDevice* pImageSurface, bool bChildrenOnDemand,
weld::TreeIter* pRet)
+{
+ SalInstanceTreeView::insert(pParent, pos, pStr, pId, pIconName,
pImageSurface,
+ bChildrenOnDemand, pRet);
+
+ notifyDialogState();
+}
+
+void JSTreeView::set_text(int row, const OUString& rText, int col)
+{
+ SalInstanceTreeView::set_text(row, rText, col);
+ notifyDialogState();
+}
+
+void JSTreeView::set_text(const weld::TreeIter& rIter, const OUString& rStr,
int col)
+{
+ SalInstanceTreeView::set_text(rIter, rStr, col);
+ notifyDialogState();
+}
+
JSExpander::JSExpander(VclPtr<vcl::Window> aNotifierWindow,
VclPtr<vcl::Window> aContentWindow,
::VclExpander* pExpander, SalInstanceBuilder* pBuilder,
bool bTakeOwnership,
std::string sTypeOfJSON)
commit d6b2835e0f98e751f0161ff8f3be33013dab5cfd
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Fri Dec 11 11:37:49 2020 +0100
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Tue Dec 29 06:03:47 2020 +0100
jsdialog: export alignment type
Change-Id: I846f51d522fb0639b22148c73563b177d091178c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107589
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108412
Tested-by: Jenkins
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index cbcb6d2373f0..5c4a60c4f5e8 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -461,6 +461,7 @@ public:
{
}
virtual bool set_property(const OString &rKey, const OUString &rValue)
override;
+ virtual void DumpAsPropertyTree(tools::JsonWriter&) override;
private:
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 b8407e84afba..1c503194b5ae 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1580,6 +1580,12 @@ bool VclAlignment::set_property(const OString &rKey,
const OUString &rValue)
return true;
}
+void VclAlignment::DumpAsPropertyTree(tools::JsonWriter& rJsonWriter)
+{
+ VclContainer::DumpAsPropertyTree(rJsonWriter);
+ rJsonWriter.put("type", "alignment");
+}
+
class DisclosureButton final : public CheckBox
{
virtual void ImplDrawCheckBoxState(vcl::RenderContext& rRenderContext)
override
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
