diff options
| author | Kshitij Pathania <kshitijpathania@gmail.com> | 2018-07-02 18:48:19 +0530 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2018-07-10 12:10:30 +0200 |
| commit | 2cad889d498bf48bdcf88138c53cb9d601ba17ec (patch) | |
| tree | 6ba6b09e9d1b57380e34bdc4e3a45fb5c7adf6ee /include | |
| parent | d8911b6848fccf92a8310c77eef40eafab0325f0 (diff) | |
Notebookbar:Context for printpreview is working.
This is a combination of 3 commits.
Notebookbar:Context for printpreview is now working
Also the context stuff is now working well even
after print preview is set
Change-Id: Ia43f512394cf4d162b4019257c039aecb664df22
Reviewed-on: https://gerrit.libreoffice.org/56740
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
tdf#118546: GetNotebookBar() may return nullptr
Change-Id: I411ea0abcb5fd5fac0db7fe0c4bad16a0c1b9d77
Reviewed-on: https://gerrit.libreoffice.org/57006
Reviewed-by: Kshitij Pathania <kshitijpathania@gmail.com>
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Conserved the alphabetical order in contexts.
ThreeDObject is remained on top as its entry begin with 3.
All others are sorted now except the generalised ones in last.
Change-Id: Id56550da450f0d2a0dd770a78360d20ada90f048
Reviewed-on: https://gerrit.libreoffice.org/56984
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/57190
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/EnumContext.hxx | 1 | ||||
| -rw-r--r-- | include/vcl/notebookbar.hxx | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/vcl/EnumContext.hxx b/include/vcl/EnumContext.hxx index fb64302ccf4d..dfdc8e8a8c94 100644 --- a/include/vcl/EnumContext.hxx +++ b/include/vcl/EnumContext.hxx @@ -90,6 +90,7 @@ public: OLE, OutlineText, Pivot, + Printpreview, Series, SlidesorterPage, Table, diff --git a/include/vcl/notebookbar.hxx b/include/vcl/notebookbar.hxx index f3490bfeea89..535f157e7810 100644 --- a/include/vcl/notebookbar.hxx +++ b/include/vcl/notebookbar.hxx @@ -41,10 +41,13 @@ public: void DataChanged(const DataChangedEvent& rDCEvt) override; + void ControlListener(bool bListen); + private: VclPtr<SystemWindow> m_pSystemWindow; css::uno::Reference<css::ui::XContextChangeEventListener> m_pEventListener; std::vector<NotebookbarContextControl*> m_pContextContainers; + css::uno::Reference<css::frame::XFrame> mxFrame; AllSettings DefaultSettings; AllSettings PersonaSettings; |