diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-05-19 09:42:49 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-05-19 10:41:38 +0200 |
| commit | dd5852f47beceb4a3b3f869cf6d3c24f3bf90ef4 (patch) | |
| tree | 80c0d72ece1e85c36781fa58dca474a024f84eab | |
| parent | 97e9b250426ff09bba4546835ee9138d91e03fbb (diff) | |
Work around what looks like an MSVC compiler glitch
I got
> [build CXX] vcl/jsdialog/jsdialogbuilder.cxx
> C:\lo\core\vcl\inc\salvtables.hxx(841): error C2872: 'MenuButton': ambiguous symbol
> C:\lo\core\include\vcl/menubtn.hxx(31): note: could be 'MenuButton'
> C:\lo\core\include\vcl/weld.hxx(1320): note: or 'weld::MenuButton'
> C:\lo\core\vcl\inc\salvtables.hxx(834): note: while compiling class template member function 'void SalInstanceComboBox<ComboBox>::set_item_menu(const rtl::OString &,weld::Menu *)'
> C:\lo\core\vcl\inc\salvtables.hxx(932): note: see reference to class template instantiation 'SalInstanceComboBox<ComboBox>' being compiled
> make[1]: *** [C:/lo/core/solenv/gbuild/LinkTarget.mk:306: C:/lo/core/workdir/CxxObject/vcl/jsdialog/jsdialogbuilder.o] Error 2
now with VS 2019 16.5.5 (and --disable-pch, should that make a difference), for
reasons that are not clear to me.
Change-Id: Id6aeef671f807ca59cad9d65578031b323ed697c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94476
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
| -rw-r--r-- | vcl/inc/salvtables.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx index c95f093c898f..a1cb724f01a1 100644 --- a/vcl/inc/salvtables.hxx +++ b/vcl/inc/salvtables.hxx @@ -838,7 +838,7 @@ public: if (!m_xMenuButton) m_xMenuButton - = VclPtr<MenuButton>::Create(m_xComboBox, WB_FLATBUTTON | WB_NOPOINTERFOCUS); + = VclPtr<::MenuButton>::Create(m_xComboBox, WB_FLATBUTTON | WB_NOPOINTERFOCUS); m_xMenuButton->SetPopupMenu(pPopup); m_xMenuButton->Show(pPopup != nullptr); |