sfx2/source/sidebar/Deck.cxx | 32 -------------------------------- 1 file changed, 32 deletions(-)
New commits: commit 811a431a986a419ea98922b142206362b613e1fb Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk> AuthorDate: Wed Oct 10 06:44:27 2018 -0400 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Tue Sep 3 13:45:04 2019 +0200 sfx2: LOK: route the parent sidebar window instead of the deck Correct previous mis-merge by removing the notification from Deck. (cherry picked from commit a4142984c4d8dc00fea438bd71bf2af4917c359a) Change-Id: I0269a67c637afbc63a81405918f620009e681ff6 Reviewed-on: https://gerrit.libreoffice.org/78456 Reviewed-by: Andras Timar <andras.ti...@collabora.com> Tested-by: Andras Timar <andras.ti...@collabora.com> diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx index 48f7291e8af7..15f591fd1e64 100644 --- a/sfx2/source/sidebar/Deck.cxx +++ b/sfx2/source/sidebar/Deck.cxx @@ -66,20 +66,6 @@ Deck::Deck(const DeckDescriptor& rDeckDescriptor, vcl::Window* pParentWindow, mpVerticalScrollBar->SetScrollHdl(LINK(this, Deck, HandleVerticalScrollBarChange)); - if (comphelper::LibreOfficeKit::isActive()) - { - SetLOKNotifier(SfxViewShell::Current()); - - if (const vcl::ILibreOfficeKitNotifier* pNotifier = GetLOKNotifier()) - { - std::vector<vcl::LOKPayloadItem> aItems; - aItems.emplace_back("type", "deck"); - aItems.emplace_back(std::make_pair("position", Point(GetOutOffXPixel(), GetOutOffYPixel()).toString())); - aItems.emplace_back(std::make_pair("size", GetSizePixel().toString())); - pNotifier->notifyWindow(GetLOKWindowId(), "created", aItems); - } - } - #ifdef DEBUG SetText(OUString("Deck")); mpScrollClipWindow->SetText(OUString("ScrollClipWindow")); @@ -193,15 +179,6 @@ bool Deck::EventNotify(NotifyEvent& rEvent) void Deck::Resize() { Window::Resize(); - - if (const vcl::ILibreOfficeKitNotifier* pNotifier = GetLOKNotifier()) - { - std::vector<vcl::LOKPayloadItem> aItems; - aItems.emplace_back("type", "deck"); - aItems.emplace_back(std::make_pair("position", Point(GetOutOffXPixel(), GetOutOffYPixel()).toString())); - aItems.emplace_back(std::make_pair("size", GetSizePixel().toString())); - pNotifier->notifyWindow(GetLOKWindowId(), "size_changed", aItems); - } } bool Deck::ProcessWheelEvent(CommandEvent const * pCommandEvent) @@ -255,15 +232,6 @@ void Deck::RequestLayoutInternal() DeckLayouter::LayoutDeck(GetContentArea(), mnMinimalWidth, mnMinimalHeight, maPanels, *GetTitleBar(), *mpScrollClipWindow, *mpScrollContainer, *mpFiller, *mpVerticalScrollBar); - - if (const vcl::ILibreOfficeKitNotifier* pNotifier = GetLOKNotifier()) - { - std::vector<vcl::LOKPayloadItem> aItems; - aItems.emplace_back("type", "deck"); - aItems.emplace_back(std::make_pair("position", Point(GetOutOffXPixel(), GetOutOffYPixel()).toString())); - aItems.emplace_back(std::make_pair("size", GetSizePixel().toString())); - pNotifier->notifyWindow(GetLOKWindowId(), "created", aItems); - } } void Deck::RequestLayout() _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits