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 | e7d2aac7856da787371e9904888774508d1a45d6 (patch) | |
| tree | 2f8c23fc943a4eccdfd2825065030f58b1695538 /reportdesign | |
| parent | 18e4e629073f8cabdc5dd116ced4683c7ae65dbe (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 0c5ebd8c3..9850d9925 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 034cc5607..b86f5f5b6 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: |