vcl/inc/salvtables.hxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 1d0f946512c9b5271c0f68cdaba3be37c8e0a2d7
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue May 19 17:39:22 2020 +0200
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Wed May 20 09:52:44 2020 +0200
Drop workarounds for what looks like an MSVC compiler glitch
...now that 02b1a8f533d88c90004b1ea294f853f4b73f8c01 "Fix ambiguous symbol"
removed the---apparently unnecessary---using directive from
vcl/jsdialog/jsdialogbuilder.cxx, which had presumably caused the MSVC
compilation error documented in dd5852f47beceb4a3b3f869cf6d3c24f3bf90ef4
"Work
around what looks like an MSVC compiler glitch". I have no idea what the
other
::MenuButton qualification, added with
02b1a8f533d88c90004b1ea294f853f4b73f8c01
in addition to the using-directive removal, was supposed to be good for, but
lets assume that it is not actually needed as a workaround in any other
build
scenarios either and remove it too.
Change-Id: Ib896562579c81d1b49e7edab47bc7cded445d46c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94541
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index 7e6c879eb3a5..ad41e5707218 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -668,7 +668,7 @@ protected:
// owner for ListBox/ComboBox UserData
std::vector<std::shared_ptr<OUString>> m_aUserData;
VclPtr<vcl_type> m_xComboBox;
- ScopedVclPtr<::MenuButton> m_xMenuButton;
+ ScopedVclPtr<MenuButton> m_xMenuButton;
OUString m_sMenuButtonRow;
public:
@@ -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);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
