[Libreoffice-commits] core.git: vcl/inc

[Stephan Bergmann (via logerrit)]

 vcl/inc/salvtables.hxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dd5852f47beceb4a3b3f869cf6d3c24f3bf90ef4
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue May 19 09:42:49 2020 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue May 19 10:41:38 2020 +0200

    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 at redhat.com>

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);