diff options
| author | Ocke.Janssen <Ocke.Janssen@oracle.com> | 2010-11-26 08:52:49 +0100 |
|---|---|---|
| committer | Ocke.Janssen <Ocke.Janssen@oracle.com> | 2010-11-26 08:52:49 +0100 |
| commit | cc573b7553f60407d72571e660d3a14019cb50e4 (patch) | |
| tree | 5521f1e35c11d41d230ec0e6c38dc7c9d0eba3bc /reportdesign | |
| parent | 4e84dfc118800f7282423d60834c29ad9fa5e963 (diff) | |
dba34b: #i110907# check if design handle event
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/ui/report/DesignView.cxx | 7 | ||||
| -rw-r--r-- | reportdesign/source/ui/report/ReportController.cxx | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index 339e136c2fec..8f703ab57f4f 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -248,7 +248,12 @@ long ODesignView::PreNotify( NotifyEvent& rNEvt ) switch(rNEvt.GetType()) { case EVENT_KEYINPUT: - //if ( nRet != 1L ) + if ( (m_pPropWin && m_pPropWin->HasChildPathFocus()) ) + return 0L; + if ( (m_pAddField && m_pAddField->HasChildPathFocus()) ) + return 0L; + if ( (m_pReportExplorer && m_pReportExplorer->HasChildPathFocus()) ) + return 0L; { const KeyEvent* pKeyEvent = rNEvt.GetKeyEvent(); if ( handleKeyEvent(*pKeyEvent) ) diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 458f14dc9db4..cf303fb8e706 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -563,7 +563,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const case SID_EXPAND_SECTION: case SID_NEXT_MARK: case SID_PREV_MARK: - aReturn.bEnabled = isEditable(); + aReturn.bEnabled = isEditable() && !getDesignView()->isHandleEvent(_nId); break; case SID_SELECT: case SID_SELECT_REPORT: |