Tag: cws_src680_hsqlcsv User: fs Date: 2008-01-17 02:19:53+0000 Modified: dba/dbaccess/source/ui/app/AppView.cxx
Log: RESYNC: (1.17-1.21); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppView.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppView.cxx?r1=1.14.32.3&r2=1.14.32.4 Delta lines: +47 -28 --------------------- --- AppView.cxx 2006-10-11 08:52:37+0000 1.14.32.3 +++ AppView.cxx 2008-01-17 02:19:50+0000 1.14.32.4 @@ -146,7 +146,7 @@ m_pPanel = new OTitleWindow(this,STR_DATABASE,WB_BORDER | WB_DIALOGCONTROL ,FALSE); m_pPanel->SetBorderStyle(WINDOW_BORDER_MONO); - OApplicationSwapWindow* pSwap = new OApplicationSwapWindow(m_pPanel,this); + OApplicationSwapWindow* pSwap = new OApplicationSwapWindow( m_pPanel, *this ); pSwap->Show(); pSwap->SetUniqueId(UID_APP_SWAP_VIEW); @@ -216,8 +216,11 @@ { Window::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(); Invalidate(); @@ -249,9 +252,23 @@ SetTextFillColor( Application::GetSettings().GetStyleSettings().GetDialogColor() );*/ } // ----------------------------------------------------------------------------- -OApplicationView* OAppBorderWindow::getView() const { return m_pView; } -OApplicationSwapWindow* OAppBorderWindow::getPanel() const { return static_cast<OApplicationSwapWindow*>(m_pPanel->getChildWindow()); } -OApplicationDetailView* OAppBorderWindow::getDetailView() const { return m_pDetailView; } +OApplicationView* OAppBorderWindow::getView() const +{ + return m_pView; +} + +// ----------------------------------------------------------------------------- +OApplicationSwapWindow* OAppBorderWindow::getPanel() const +{ + return static_cast< OApplicationSwapWindow* >( m_pPanel->getChildWindow() ); +} + +// ----------------------------------------------------------------------------- +OApplicationDetailView* OAppBorderWindow::getDetailView() const +{ + return m_pDetailView; +} + //================================================================== // class OApplicationView //================================================================== @@ -306,10 +323,17 @@ m_pElementNotification = NULL; } // ----------------------------------------------------------------------------- -void OApplicationView::createIconAutoMnemonics() +void OApplicationView::createIconAutoMnemonics( MnemonicGenerator& _rMnemonics ) { if ( m_pWin && m_pWin->getPanel() ) - m_pWin->getPanel()->createIconAutoMnemonics(); + m_pWin->getPanel()->createIconAutoMnemonics( _rMnemonics ); +} + +// ----------------------------------------------------------------------------- +void OApplicationView::setTaskExternalMnemonics( MnemonicGenerator& _rMnemonics ) +{ + if ( m_pWin && m_pWin->getDetailView() ) + m_pWin->getDetailView()->setTaskExternalMnemonics( _rMnemonics ); } // ----------------------------------------------------------------------------- @@ -317,8 +341,11 @@ { ODataView::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(); Invalidate(); @@ -360,6 +387,10 @@ // #i34790# - 2004-09-30 - [EMAIL PROTECTED] if ( getPanel() && getPanel()->interceptKeyInput( *pKeyEvent ) ) return 1L; + // and ditto the detail view + // #i72799# - 2006-12-20 / [EMAIL PROTECTED] + if ( getDetailView() && getDetailView()->interceptKeyInput( *pKeyEvent ) ) + return 1L; } break; } @@ -486,6 +517,12 @@ getDetailView()->getSelectionElementNames( _rNames ); } // ----------------------------------------------------------------------------- +void OApplicationView::selectElements(const Sequence< ::rtl::OUString>& _aNames) +{ + OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF"); + getDetailView()->selectElements( _aNames ); +} +// ----------------------------------------------------------------------------- SvLBoxEntry* OApplicationView::elementAdded(ElementType eType,const ::rtl::OUString& _rName, const Any& _rObject ) { OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF"); @@ -513,12 +550,6 @@ getDetailView()->clearPages(_bTaskAlso); } // ----------------------------------------------------------------------------- -void OApplicationView::clearSelection() -{ - OSL_ENSURE(m_pWin && getPanel(),"Detail view is NULL! -> GPF"); - getPanel()->clearSelection(); -} -// ----------------------------------------------------------------------------- void OApplicationView::changeContainer(ElementType _eType) { OSL_ENSURE(m_pWin && getPanel(),"Detail view is NULL! -> GPF"); @@ -544,12 +575,6 @@ return getDetailView()->isPreviewEnabled(); } // ----------------------------------------------------------------------------- -void OApplicationView::switchPreview() -{ - OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF"); - getDetailView()->switchPreview(); -} -// ----------------------------------------------------------------------------- void OApplicationView::switchPreview(PreviewMode _eMode) { OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF"); @@ -610,12 +635,6 @@ } } // ----------------------------------------------------------------------------- -void OApplicationView::disableControls(sal_Bool _bDisable) -{ - OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF"); - getDetailView()->disableControls(_bDisable); -} -// ----------------------------------------------------------------------------- void OApplicationView::_disposing( const ::com::sun::star::lang::EventObject& /*_rSource*/ ) { if ( m_pWin && getDetailView() ) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
