diff options
| author | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2019-05-29 23:33:25 -0400 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2019-12-18 01:50:41 +0100 |
| commit | c2f8929ed76085bc81f390f90e06bd6781206537 (patch) | |
| tree | 57861cb7462411f16a4eff3705616e23d97846df /vcl/source/window/menubarwindow.cxx | |
| parent | 9e63d328691014bc97f6b66b708ed9dec53618e6 (diff) | |
vcl: sfx2: LOK: Support per-view popup windows
While we do support multiple views, there is only
one state for popup/floating windows, that also
includes the dialogs open and related windows/data.
This adds support to allow each view to have its own
popups and state, thus allowing multiple users to
interact with the dialogs independently of one
another.
(cherry picked from commit b50c341a53911f1d725947a4d8d3d2f782c94079)
Change-Id: I3786a561ca6ca113ad12425bdb491e5a30bd1a28
Reviewed-on: https://gerrit.libreoffice.org/82440
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/85221
Tested-by: Jenkins
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'vcl/source/window/menubarwindow.cxx')
| -rw-r--r-- | vcl/source/window/menubarwindow.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx index c09eadaed322..41a51b79ce5b 100644 --- a/vcl/source/window/menubarwindow.cxx +++ b/vcl/source/window/menubarwindow.cxx @@ -478,13 +478,13 @@ void MenuBarWindow::ChangeHighlightItem( sal_uInt16 n, bool bSelectEntry, bool b bool bJustActivated = false; if ( ( m_nHighlightedItem == ITEMPOS_INVALID ) && ( n != ITEMPOS_INVALID ) ) { - ImplGetSVData()->maWinData.mbNoDeactivate = true; + ImplGetSVData()->mpWinData->mbNoDeactivate = true; // #105406# avoid saving the focus when we already have the focus - bool bNoSaveFocus = (this == ImplGetSVData()->maWinData.mpFocusWin.get() ); + bool bNoSaveFocus = (this == ImplGetSVData()->mpWinData->mpFocusWin.get()); if( m_xSaveFocusId != nullptr ) { - if( !ImplGetSVData()->maWinData.mbNoSaveFocus ) + if (!ImplGetSVData()->mpWinData->mbNoSaveFocus) { m_xSaveFocusId = nullptr; if( !bNoSaveFocus ) @@ -509,8 +509,8 @@ void MenuBarWindow::ChangeHighlightItem( sal_uInt16 n, bool bSelectEntry, bool b m_pMenu->bInCallback = true; m_pMenu->Deactivate(); m_pMenu->bInCallback = false; - ImplGetSVData()->maWinData.mbNoDeactivate = false; - if( !ImplGetSVData()->maWinData.mbNoSaveFocus ) + ImplGetSVData()->mpWinData->mbNoDeactivate = false; + if (!ImplGetSVData()->mpWinData->mbNoSaveFocus) { VclPtr<vcl::Window> xTempFocusId; if (m_xSaveFocusId && !m_xSaveFocusId->isDisposed()) @@ -523,7 +523,7 @@ void MenuBarWindow::ChangeHighlightItem( sal_uInt16 n, bool bSelectEntry, bool b // focus window, so we could avoid sending superfluous activate events // to top window listeners. if (xTempFocusId || bDefaultToDocument) - ImplGetSVData()->maWinData.mpFocusWin = this; + ImplGetSVData()->mpWinData->mpFocusWin = this; // #105406# restore focus to document if we could not save focus before if (!xTempFocusId && bDefaultToDocument) |