summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-06-15 09:15:57 +0100
committerCaolán McNamara <caolanm@redhat.com>2020-06-15 11:56:03 +0200
commit4ce1ff56bb63f0e9a10a129f31e604c20007d5d1 (patch)
tree3aa2af35c93dd245586b3609f56a6808c07c0a37
parentb435c4fe82e77a82fde6464d6722281e5fc4f394 (diff)
fix DockingManager::EndPopupMode related build failure
undefined reference to `DockingManager::StartPopupMode(vcl::Window const*, tools::Rectangle const&, FloatWinPopupFlags)´ sc/source/ui/cctrl/checklistmenu.o: In function `ScCheckListMenuControl::handleMenuTimeout(ScCheckListMenuControl::SubMenuItemData const*)´: sc/source/ui/cctrl/checklistmenu.cxx:239: undefined reference to `DockingManager::EndPopupMode(vcl::Window const*)´ sc/source/ui/cctrl/checklistmenu.cxx:225: undefined reference to `DockingManager::EndPopupMode(vcl::Window const*)´ Change-Id: Ic665ab4e38b3886a13874d5e4c429e2a99836eef Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96319 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--include/vcl/dockwin.hxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx
index 689a2f4c60c3..820a8efe057a 100644
--- a/include/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
@@ -168,7 +168,7 @@ public:
Size GetSizePixel() const;
};
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) DockingManager
+class VCL_DLLPUBLIC DockingManager
{
std::vector<std::unique_ptr<ImplDockingWindowWrapper, o3tl::default_delete<ImplDockingWindowWrapper>>> mvDockingWindows;