diff options
| author | Katarina Behrens <Katarina.Behrens@cib.de> | 2018-11-01 13:57:56 +0100 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-11-12 23:04:54 +0100 |
| commit | 927f58bd997b6c1b60e354ee247a119d3f0af64b (patch) | |
| tree | 9340100b2051a547d73e559f6209accd06e46952 /vcl/inc | |
| parent | 8fb0881a3e5b2c5120af18823f6f58a1bda7cadd (diff) | |
tdf#119856: thread-proof creating frames and setting menus
This finally enables opening a new frame and setting its menu from
an extension, but it is still far from stable, loads of threading
landmines like this all over the code
Change-Id: Icf4b67796b0669425ecb7c2c142c21e184024534
Reviewed-on: https://gerrit.libreoffice.org/62737
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/qt5/Qt5Instance.hxx | 1 | ||||
| -rw-r--r-- | vcl/inc/qt5/Qt5Menu.hxx | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/vcl/inc/qt5/Qt5Instance.hxx b/vcl/inc/qt5/Qt5Instance.hxx index 473f26c58b13..254c81445997 100644 --- a/vcl/inc/qt5/Qt5Instance.hxx +++ b/vcl/inc/qt5/Qt5Instance.hxx @@ -52,6 +52,7 @@ private Q_SLOTS: Q_SIGNALS: bool ImplYieldSignal(bool bWait, bool bHandleAllCurrentEvents); + std::unique_ptr<SalMenu> createMenuSignal(bool, Menu*); public: explicit Qt5Instance(bool bUseCairo = false); diff --git a/vcl/inc/qt5/Qt5Menu.hxx b/vcl/inc/qt5/Qt5Menu.hxx index f3111d01aa8a..366b68307182 100644 --- a/vcl/inc/qt5/Qt5Menu.hxx +++ b/vcl/inc/qt5/Qt5Menu.hxx @@ -59,6 +59,9 @@ public: unsigned GetItemCount() { return maItems.size(); } Qt5MenuItem* GetItemAtPos(unsigned nPos) { return maItems[nPos]; } +Q_SIGNALS: + void setFrameSignal(const SalFrame* pFrame); + private slots: void slotMenuTriggered(Qt5MenuItem* pQItem); }; |