Tag: cws_src680_hsqlcsv User: fs Date: 2006/12/17 23:51:13 Modified: dba/dbaccess/source/ui/app/AppDetailPageHelper.cxx
Log: RESYNC: (1.17-1.20); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppDetailPageHelper.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppDetailPageHelper.cxx?r1=1.15.12.6&r2=1.15.12.7 Delta lines: +5 -4 ------------------- --- AppDetailPageHelper.cxx 11 Oct 2006 08:50:59 -0000 1.15.12.6 +++ AppDetailPageHelper.cxx 18 Dec 2006 07:51:11 -0000 1.15.12.7 @@ -454,7 +454,7 @@ if ( getElementType() == E_TABLE ) { const OTableTreeListBox& rTreeView = dynamic_cast< const OTableTreeListBox& >( *m_pLists[nPos] ); - sComposedName = rTreeView.getQualifiedTableName( _pEntry ); + sComposedName = rTreeView.getQualifiedTableName( pEntry ); } else { @@ -872,8 +872,8 @@ // ----------------------------------------------------------------------------- IMPL_LINK(OAppDetailPageHelper, OnEntryDoubleClick, SvTreeListBox*, _pTree) { - getBorderWin().getView()->getElementNotification()->onEntryDoubleClick(_pTree); - return 1L; + bool bHandled = getBorderWin().getView()->getElementNotification()->onEntryDoubleClick(_pTree); + return bHandled ? 1L : 0L; } // ----------------------------------------------------------------------------- IMPL_LINK(OAppDetailPageHelper, OnDeSelectHdl, SvTreeListBox*, _pTree) @@ -1131,7 +1131,8 @@ if ( !bClearPreview ) { Reference<awt::XTabController> xController(xFrame->getController(),UNO_QUERY); - if ( !(bClearPreview = !xController.is()) ) + bClearPreview = !xController.is(); + if ( !bClearPreview ) { Reference<XLoadable> xLoadable(xController->getModel(),UNO_QUERY); bClearPreview = !(xLoadable.is() && xLoadable->isLoaded()); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
