diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2021-07-12 12:24:09 +0200 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2021-07-19 09:00:44 +0200 |
| commit | 303c8bd00283dbaf3ca172d0245b9f9bf7bfafaa (patch) | |
| tree | d4a60af357e4c997b76d2251c08232a1bef88255 /sfx2 | |
| parent | 9b09b53f35a958b4115d126d12f37e9c24a03f15 (diff) | |
Revert "Notebookbar: skip early init in all apps"
This reverts commit 6af0a488a059982a8b5d72fe399c7e8841a2e9b4.
Delayed notebookbar init in Calc causes "number format" combobox
to not work. (it works after some number is typed into document only).
Original problem fixed by reverted change doesn't exist anymore
because new shortcuts for paste special and paste unformatted text were
introduced
Change-Id: Ie112ae0df7b6d3782916b98c96f1a17b15396115
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118771
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Pranam Lashkari <lpranam@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119100
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/notebookbar/SfxNotebookBar.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx b/sfx2/source/notebookbar/SfxNotebookBar.cxx index 6fe050e5d4b5..dd6781ae66c3 100644 --- a/sfx2/source/notebookbar/SfxNotebookBar.cxx +++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx @@ -365,7 +365,8 @@ bool SfxNotebookBar::StateMethod(SystemWindow* pSysWindow, // * in LOK: Paste Special feature was incorrectly initialized // Skip first request so Notebookbar will be initialized after document was loaded static std::map<const void*, bool> bSkippedFirstInit; - if (comphelper::LibreOfficeKit::isActive() && bSkippedFirstInit.find(pViewShell) == bSkippedFirstInit.end()) + if (comphelper::LibreOfficeKit::isActive() && eApp == vcl::EnumContext::Application::Writer + && bSkippedFirstInit.find(pViewShell) == bSkippedFirstInit.end()) { bSkippedFirstInit[pViewShell] = true; return false; |