diff options
| author | Pranav Kant <pranavk@collabora.co.uk> | 2017-12-14 20:28:39 +0530 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2017-12-15 11:02:01 +0100 |
| commit | 4efd08f57e0d0a68f9c9786aa5f4729c42b77e26 (patch) | |
| tree | f2d97057883d6e7129710a0b19c990beb7561cb0 /vcl | |
| parent | 915d27cd6654208d55373f52b06c411865b106b2 (diff) | |
lokdialog: If we already have the title, emit it during creation
Some dialogs load the UI before we "Execute()" the dialog, or before the
dialog fires the InitShow event. In those cases, the title event has
already been fired and won't be fired after dialog is created.
Make sure that we send the title for such dialogs.
While at it, remove the superfluous std::make_pair calls to emplace_back.
And consistently use emplace_back everywhere, not push_back
Change-Id: Ib66238298ad9b0dc85bd269aff37aeadf1fc82e4
Reviewed-on: https://gerrit.libreoffice.org/46461
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/dialog.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/window/floatwin.cxx | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 77cb242f22db..8c352218d798 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -697,7 +697,7 @@ void Dialog::StateChanged( StateChangedType nType ) if (const vcl::ILibreOfficeKitNotifier* pNotifier = GetLOKNotifier()) { std::vector<vcl::LOKPayloadItem> aPayload; - aPayload.push_back(std::make_pair(OString("title"), GetText().toUtf8())); + aPayload.emplace_back("title", GetText().toUtf8()); pNotifier->notifyWindow(GetLOKWindowId(), "title_changed", aPayload); } } @@ -1212,7 +1212,7 @@ void Dialog::Resize() if (const vcl::ILibreOfficeKitNotifier* pNotifier = GetLOKNotifier()) { std::vector<vcl::LOKPayloadItem> aItems; - aItems.emplace_back(std::make_pair("size", GetOptimalSize().toString())); + aItems.emplace_back("size", GetOptimalSize().toString()); pNotifier->notifyWindow(GetLOKWindowId(), "size_changed", aItems); } } diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index e1b7d76638fe..7a03108495b1 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -619,16 +619,16 @@ void FloatingWindow::StateChanged( StateChangedType nType ) // we are a toplevel window, let's so far pretend to be a // dialog - but maybe we'll need a separate type for this // later - aItems.emplace_back(std::make_pair("type", "dialog")); + aItems.emplace_back("type", "dialog"); } else { SetLOKNotifier(pParent->GetLOKNotifier()); - aItems.emplace_back(std::make_pair("type", "child")); - aItems.emplace_back(std::make_pair("parentId", OString::number(pParent->GetLOKWindowId()))); + aItems.emplace_back("type", "child"); + aItems.emplace_back("parentId", OString::number(pParent->GetLOKWindowId())); } - aItems.emplace_back(std::make_pair("size", GetSizePixel().toString())); - aItems.emplace_back(std::make_pair("position", mpImplData->maPos.toString())); + aItems.emplace_back("size", GetSizePixel().toString()); + aItems.emplace_back("position", mpImplData->maPos.toString()); GetLOKNotifier()->notifyWindow(GetLOKWindowId(), "created", aItems); } else if (!IsVisible() && nType == StateChangedType::Visible) |