diff options
Diffstat (limited to 'sfx2/source')
| -rw-r--r-- | sfx2/source/view/lokhelper.cxx | 12 | ||||
| -rw-r--r-- | sfx2/source/view/viewsh.cxx | 27 |
2 files changed, 18 insertions, 21 deletions
diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx index 33464711852f..9af028916b69 100644 --- a/sfx2/source/view/lokhelper.cxx +++ b/sfx2/source/view/lokhelper.cxx @@ -144,15 +144,15 @@ void SfxLokHelper::notifyOtherViews(SfxViewShell* pThisView, int nType, const OS } } -void SfxLokHelper::notifyDialog(const OUString& rDialogID, +void SfxLokHelper::notifyDialog(vcl::DialogID nDialogID, const OUString& rAction, const std::vector<vcl::LOKPayloadItem>& rPayload) { - if (SfxLokHelper::getViewsCount() <= 0 || rDialogID.isEmpty()) + if (SfxLokHelper::getViewsCount() <= 0 || nDialogID == 0) return; SfxViewShell* pViewShell = SfxViewShell::GetFirst(); - OString aPayload = OString("{ \"dialogId\": \"") + OUStringToOString(rDialogID, RTL_TEXTENCODING_UTF8).getStr() + OString("\""); + OString aPayload = OString("{ \"dialogId\": \"") + OString::number(nDialogID) + OString("\""); aPayload += OString(", \"action\": \"") + OUStringToOString(rAction, RTL_TEXTENCODING_UTF8).getStr() + OString("\""); for (const auto& rItem: rPayload) @@ -172,13 +172,13 @@ void SfxLokHelper::notifyDialog(const OUString& rDialogID, } } -void SfxLokHelper::notifyDialogChild(const OUString& rDialogID, const OUString& rAction, const Point& rPos) +void SfxLokHelper::notifyDialogChild(vcl::DialogID nDialogID, const OUString& rAction, const Point& rPos) { - if (SfxLokHelper::getViewsCount() <= 0 || rDialogID.isEmpty()) + if (SfxLokHelper::getViewsCount() <= 0 || nDialogID == 0) return; SfxViewShell* pViewShell = SfxViewShell::GetFirst(); - const OString aPayload = OString("{ \"dialogId\": \"") + OUStringToOString(rDialogID, RTL_TEXTENCODING_UTF8).getStr() + + const OString aPayload = OString("{ \"dialogId\": \"") + OString::number(nDialogID) + OString("\", \"action\": \"") + OUStringToOString(rAction, RTL_TEXTENCODING_UTF8).getStr() + OString("\", \"position\": \"") + OString::number(rPos.getX()) + OString(", ") + OString::number(rPos.getY()) + + "\" }"; diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 2d4d8af19a70..92dcfa48cdcf 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -1948,31 +1948,28 @@ Reference< view::XRenderable > SfxViewShell::GetRenderable() return xRender; } -void SfxViewShell::notifyDialog(const vcl::DialogID& rDialogID, const OUString& rAction, const std::vector<vcl::LOKPayloadItem>& rPayload) +void SfxViewShell::notifyDialog(const vcl::DialogID& rDialogId, const OUString& rAction, const std::vector<vcl::LOKPayloadItem>& rPayload) { - SfxLokHelper::notifyDialog(rDialogID, rAction, rPayload); + SfxLokHelper::notifyDialog(rDialogId, rAction, rPayload); } -void SfxViewShell::notifyDialogChild(const vcl::DialogID& rDialogID, const OUString& rAction, const Point& rPos) +void SfxViewShell::notifyDialogChild(const vcl::DialogID& rDialogId, const OUString& rAction, const Point& rPos) { - SfxLokHelper::notifyDialog(rDialogID, rAction); + SfxLokHelper::notifyDialog(rDialogId, rAction); } -void SfxViewShell::RegisterDlg(const vcl::DialogID& rDialogId, VclPtr<Dialog> pDlg) +void SfxViewShell::RegisterDlg(vcl::DialogID nDialogId, VclPtr<Dialog> pDlg) { if (pDlg) - maOpenedDialogs.push_back(std::make_pair(rName, pDlg)); + maOpenedDialogs.push_back(std::make_pair(nDialogId, pDlg)); } -VclPtr<Dialog> SfxViewShell::GetOpenedDlg(const vcl::DialogID& rDialogId) +VclPtr<Dialog> SfxViewShell::GetOpenedDlg(vcl::DialogID nDialogId) { - if (rName.startsWith(".uno:")) - rName = rName.replaceFirst(".uno:", ""); - const auto it = std::find_if(maOpenedDialogs.begin(), maOpenedDialogs.end(), - [&rDialogId](const std::pair<vcl::DialogID, VclPtr<Dialog>> aItem) { - return rDialogId == aItem.first; + [&nDialogId](const std::pair<vcl::DialogID, VclPtr<Dialog>> aItem) { + return nDialogId == aItem.first; }); Dialog* ret = nullptr; @@ -1983,12 +1980,12 @@ VclPtr<Dialog> SfxViewShell::GetOpenedDlg(const vcl::DialogID& rDialogId) return ret; } -void SfxViewShell::UnregisterDlg(const OUString& rName) +void SfxViewShell::UnregisterDlg(vcl::DialogID nDialogId) { maOpenedDialogs.erase(std::remove_if(maOpenedDialogs.begin(), maOpenedDialogs.end(), - [&rDialogId](const std::pair<vcl::DialogID, VclPtr<Dialog>> aItem) { - return aItem.first == rDialogId; + [&nDialogId](const std::pair<vcl::DialogID, VclPtr<Dialog>> aItem) { + return aItem.first == nDialogId; })); } |