[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - include/vcl vcl/jsdialog

[Szymon KÅ‚os (via logerrit)]

 include/vcl/tabctrl.hxx          |    1 +
 vcl/jsdialog/jsdialogbuilder.cxx |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 40bd36c8b1baf90b210de12e5c21b7835d3624b5
Author:     Szymon Kłos <eszkadev at gmail.com>
AuthorDate: Fri May 15 10:47:06 2020 +0200
Commit:     Szymon Kłos <eszkadev at gmail.com>
CommitDate: Fri May 15 10:47:06 2020 +0200

    fix build
    
    Change-Id: I69db24c8ab0173d2f695e371c772bb8094802fac

diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx
index 6789045b9c4e..fc90c1bbc365 100644
--- a/include/vcl/tabctrl.hxx
+++ b/include/vcl/tabctrl.hxx
@@ -26,6 +26,7 @@
 #include <vcl/button.hxx>
 #include <vcl/EnumContext.hxx>
 #include <vcl/NotebookbarContextControl.hxx>
+#include <boost/property_tree/json_parser.hpp>
 
 class ImplTabItem;
 struct ImplTabCtrlData;
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 2d104e424bd9..a9465a4de5bb 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -68,7 +68,7 @@ std::unique_ptr<weld::Label> JSInstanceBuilder::weld_label(const OString& id, bo
 std::unique_ptr<weld::Button> JSInstanceBuilder::weld_button(const OString& id, bool bTakeOwnership)
 {
     ::Button* pButton = m_xBuilder->get<::Button>(id);
-    return pButton ? o3tl::make_unique<JSButton>(m_aOwnedToplevel, pButton, this, bTakeOwnership)
+    return pButton ? std::make_unique<JSButton>(m_aOwnedToplevel, pButton, this, bTakeOwnership)
                    : nullptr;
 }