diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-07-06 06:59:01 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-07-06 06:59:01 +0000 |
| commit | c9ea1e0bd1cc3b1bb8eff54981fb34cdac4ec708 (patch) | |
| tree | 9fcb16225197889486defb6acb677343466cb090 /dbaccess/source/ui/app/AppDetailView.cxx | |
| parent | INTEGRATION: CWS oj14 (1.9.4); FILE MERGED (diff) | |
| download | core-c9ea1e0bd1cc3b1bb8eff54981fb34cdac4ec708.tar.gz core-c9ea1e0bd1cc3b1bb8eff54981fb34cdac4ec708.zip | |
INTEGRATION: CWS oj14 (1.12.4); FILE MERGED
2007/06/25 20:14:22 fs 1.12.4.12: fixed merge error during resync
2007/06/25 05:59:58 fs 1.12.4.11: #i10000#
2007/06/23 21:21:47 fs 1.12.4.10: RESYNC: (1.21-1.22); FILE MERGED
2007/06/19 08:00:47 fs 1.12.4.9: merging (nearly all) changes from CWS dba23ui herein, which fixes #i78642
2007/06/04 18:01:49 oj 1.12.4.8: RESYNC: (1.20-1.21); FILE MERGED
2006/11/08 12:19:32 oj 1.12.4.7: use of new classes
2006/11/07 09:10:09 oj 1.12.4.6: RESYNC: (1.17-1.20); FILE MERGED
2006/07/04 07:46:15 oj 1.12.4.5: RESYNC: (1.15-1.17); FILE MERGED
2006/04/25 13:00:33 oj 1.12.4.4: new include
2006/03/20 13:53:01 oj 1.12.4.3: RESYNC: (1.12-1.15); FILE MERGED
2006/03/20 07:48:07 oj 1.12.4.2: use of module client helper
2006/01/03 07:48:58 oj 1.12.4.1: changed module client
Diffstat (limited to 'dbaccess/source/ui/app/AppDetailView.cxx')
| -rw-r--r-- | dbaccess/source/ui/app/AppDetailView.cxx | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx index be7cd16bbffe..adf110f9f3b5 100644 --- a/dbaccess/source/ui/app/AppDetailView.cxx +++ b/dbaccess/source/ui/app/AppDetailView.cxx @@ -4,9 +4,9 @@ * * $RCSfile: AppDetailView.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: obo $ $Date: 2007-06-12 05:32:38 $ + * last change: $Author: rt $ $Date: 2007-07-06 07:59:01 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -83,15 +83,15 @@ #ifndef _SV_MNEMONIC_HXX #include <vcl/mnemonic.hxx> #endif +#ifndef _SV_MNEMONIC_HXX +#include <vcl/mnemonic.hxx> +#endif #ifndef DBACCESS_UI_BROWSER_ID_HXX #include "browserids.hxx" #endif #ifndef DBAUI_APPDETAILPAGEHELPER_HXX #include "AppDetailPageHelper.hxx" #endif -#ifndef _DBAUI_MODULE_DBU_HXX_ -#include "moduledbu.hxx" -#endif #ifndef _SV_SVAPP_HXX //autogen #include <vcl/svapp.hxx> #endif @@ -101,9 +101,13 @@ #ifndef DBAUI_ICONTROLLER_HXX #include "IController.hxx" #endif +#ifndef _DBAUI_MODULE_DBU_HXX_ +#include "moduledbu.hxx" +#endif #ifndef _SVTOOLS_LOCALRESACCESS_HXX_ #include <svtools/localresaccess.hxx> #endif +#include <algorithm> using namespace ::dbaui; @@ -153,6 +157,7 @@ void OCreationList::Paint( const Rectangle& _rRect ) if ( m_pMouseDownEntry ) Control::SetFont( m_aOriginalFont ); } + // ----------------------------------------------------------------------------- void OCreationList::PreparePaint( SvLBoxEntry* _pEntry ) { @@ -558,6 +563,7 @@ void OTasksWindow::fillTaskEntryList( const TaskEntryList& _rList ) m_aDescription.Show(); m_aFL.Show(); m_aCreation.updateHelpText(); + Enable(!_rList.empty()); } // ----------------------------------------------------------------------------- void OTasksWindow::Clear() @@ -650,8 +656,11 @@ void OApplicationDetailView::DataChanged( const DataChangedEvent& rDCEvt ) DBG_CHKTHIS(OApplicationDetailView,NULL); OSplitterView::DataChanged( rDCEvt ); - if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && - (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + if ( (rDCEvt.GetType() == DATACHANGED_FONTS) || + (rDCEvt.GetType() == DATACHANGED_DISPLAY) || + (rDCEvt.GetType() == DATACHANGED_FONTSUBSTITUTION) || + ((rDCEvt.GetType() == DATACHANGED_SETTINGS) && + (rDCEvt.GetFlags() & SETTINGS_STYLE)) ) { ImplInitSettings( sal_True, sal_True, sal_True ); Invalidate(); @@ -757,6 +766,7 @@ void OApplicationDetailView::impl_fillTaskPaneData( ElementType _eType, TaskPane break; case E_REPORT: + rList.push_back( TaskEntry( ".uno:DBNewReport", RID_STR_REPORT_HELP_TEXT, RID_STR_NEW_REPORT, true ) ); rList.push_back( TaskEntry( ".uno:DBNewReportAutoPilot", RID_STR_REPORTS_HELP_TEXT_WIZARD, RID_STR_NEW_REPORT_AUTO ) ); _rData.nTitleId = RID_STR_REPORTS_CONTAINER; break; |