diff options
| author | Vladimir Glazunov <vg@openoffice.org> | 2011-02-01 11:12:15 +0100 |
|---|---|---|
| committer | Vladimir Glazunov <vg@openoffice.org> | 2011-02-01 11:12:15 +0100 |
| commit | b98b964dc2735ca4c42a3905ef5eddcddba411c1 (patch) | |
| tree | e8a26fed3d4b2ed7e8eb67c6885acd6bd3c58180 /reportdesign | |
| parent | bcd63e1dc2b5dcd9a181f032f62abb18396808d9 (diff) | |
| parent | eaddda5dee65769b378dea820f9aa565e058e32d (diff) | |
CWS-TOOLING: integrate CWS dba34b
Notes
split repo tag: base_ooo/DEV300_m99
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/ui/report/DesignView.cxx | 7 | ||||
| -rw-r--r-- | reportdesign/source/ui/report/ReportController.cxx | 6 |
2 files changed, 10 insertions, 3 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 885d605277f8..fc0a01dd715c 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -164,7 +164,9 @@ #include <unotools/confignode.hxx> #include <helpids.hrc> -#define MAX_ROWS_FOR_PREVIEW 50 +#include <ReportControllerObserver.hxx> + +#define MAX_ROWS_FOR_PREVIEW 20 using namespace ::com::sun::star; using namespace uno; @@ -578,7 +580,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: |