vcl/inc/salvtables.hxx | 2 +- vcl/jsdialog/jsdialogbuilder.cxx | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-)
New commits: commit 02b1a8f533d88c90004b1ea294f853f4b73f8c01 Author: Szymon Kłos <[email protected]> AuthorDate: Tue May 19 10:08:45 2020 +0200 Commit: Szymon Kłos <[email protected]> CommitDate: Tue May 19 11:26:41 2020 +0200 Fix ambiguous symbol Change-Id: I62aa1fcbc8dd80bf7ef377776a54d3af78248af9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94480 Tested-by: Jenkins Reviewed-by: Szymon Kłos <[email protected]> diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx index a1cb724f01a1..9aa01bcd81c9 100644 --- a/vcl/inc/salvtables.hxx +++ b/vcl/inc/salvtables.hxx @@ -668,7 +668,7 @@ protected: // owner for ListBox/ComboBox UserData std::vector<std::unique_ptr<OUString>> m_aUserData; VclPtr<vcl_type> m_xComboBox; - ScopedVclPtr<MenuButton> m_xMenuButton; + ScopedVclPtr<::MenuButton> m_xMenuButton; OUString m_sMenuButtonRow; public: diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx index 1d751ea42847..ff85796d3a09 100644 --- a/vcl/jsdialog/jsdialogbuilder.cxx +++ b/vcl/jsdialog/jsdialogbuilder.cxx @@ -5,8 +5,6 @@ #include <vcl/toolkit/dialog.hxx> #include <LibreOfficeKit/LibreOfficeKitEnums.h> -using namespace weld; - JSInstanceBuilder::JSInstanceBuilder(weld::Widget* pParent, const OUString& rUIRoot, const OUString& rUIFile) : SalInstanceBuilder(dynamic_cast<SalInstanceWidget*>(pParent) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
