diff options
| author | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2018-10-10 06:44:27 -0400 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2019-10-10 19:41:03 +0200 |
| commit | 88d85f4a9ebcd6739f8683de73de85f245e5b0bb (patch) | |
| tree | f57bc15541bf6536090977f6747f68e675c22adc /sfx2 | |
| parent | 241bee7e4be6a205fae0d3f5508e084462c7ca55 (diff) | |
sfx2: LOK: route the parent sidebar window instead of the deck
Correct, correction of previous mis-merge.
(cherry picked from commit a4142984c4d8dc00fea438bd71bf2af4917c359a)
Change-Id: Id3457474bdc4de8bab7a70361ff0e2db1b813476
Reviewed-on: https://gerrit.libreoffice.org/80614
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/sidebar/Deck.cxx | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx index d54b4cea5c67..91ff5dc340a6 100644 --- a/sfx2/source/sidebar/Deck.cxx +++ b/sfx2/source/sidebar/Deck.cxx @@ -68,20 +68,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")); @@ -201,12 +187,6 @@ void Deck::Resize() comphelper::LibreOfficeKit::isMobile(SfxLokHelper::getView()) && (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); - try { std::stringstream aStream; @@ -271,15 +251,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() |