diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-12 13:07:58 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-12 13:07:58 +0000 |
| commit | 22d84a1060700f92920e5009c59b450dba995834 (patch) | |
| tree | ad7b2fe63a16406ea01ae24260cdc49d0a8def74 /desktop | |
| parent | 1aeeeaa4bff942a072d452a6458cd06fdda04ef5 (diff) | |
INTEGRATION: CWS sb59 (1.10.2); FILE MERGED
2006/08/30 11:20:43 sb 1.10.2.3: #i67537# Made code warning-free (GCC 4.1.1).
2006/08/22 12:50:33 sb 1.10.2.2: #i67487# Made code warning-free (wntmsci10).
2006/07/20 07:55:24 sb 1.10.2.1: #i67537# Made code warning-free.
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_treelb.cxx | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_treelb.cxx b/desktop/source/deployment/gui/dp_gui_treelb.cxx index 655c601223cf..1cc12a3b02c3 100644 --- a/desktop/source/deployment/gui/dp_gui_treelb.cxx +++ b/desktop/source/deployment/gui/dp_gui_treelb.cxx @@ -4,9 +4,9 @@ * * $RCSfile: dp_gui_treelb.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: obo $ $Date: 2006-09-17 09:39:41 $ + * last change: $Author: obo $ $Date: 2006-10-12 14:07:58 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -161,7 +161,7 @@ Image NodeImpl::getIcon() const { const Reference<deployment::XPackageTypeInfo> xPackageType( m_xPackage->getPackageType() ); - sal_uInt16 id; + sal_uInt16 id = 0; if (xPackageType.is() && (xPackageType->getIcon( // works here, because getCppuType(unsigned short) is defined @@ -438,7 +438,7 @@ SvLBoxEntry * DialogImpl::TreeListBoxImpl::addNode( if (sortIn) { // sort in after top-level nodes after user, shared: - pos = parentNode == 0 ? 2 : pos = 0; + pos = parentNode == 0 ? 2 : 0; ULONG count = GetLevelChildCount(parentNode); for ( ; pos < count; ++pos ) { @@ -456,18 +456,16 @@ SvLBoxEntry * DialogImpl::TreeListBoxImpl::addNode( if (parentNode == 0) { // top-level node: - node->m_lbEntry = InsertEntry( displayName, - imgIcon, imgIcon, - 0, pos, 0xffff, node ); + node->m_lbEntry = InsertEntryToColumn( + displayName, imgIcon, imgIcon, NULL, pos, 0xffff, node ); node->m_xPackageManager->addModifyListener( xListener ); } else { String name( displayName ); name.AppendAscii( RTL_CONSTASCII_STRINGPARAM("\t") ); - node->m_lbEntry = InsertEntry( name, - imgIcon, imgIcon, - parentNode, pos, 0xffff, node ); + node->m_lbEntry = InsertEntryToColumn( + name, imgIcon, imgIcon, parentNode, pos, 0xffff, node ); // update status: node->modified( xCmdEnv ); node->m_xPackage->addModifyListener( xListener ); @@ -624,7 +622,7 @@ void DialogImpl::TreeListBoxImpl::MouseMove( MouseEvent const & evt ) } //______________________________________________________________________________ -IMPL_LINK( DialogImpl::TreeListBoxImpl, TimerHandler, Timer *, timer ) +IMPL_LINK( DialogImpl::TreeListBoxImpl, TimerHandler, Timer *, EMPTYARG ) { m_timer.Stop(); Point pos = GetPointerPosPixel(); @@ -791,7 +789,7 @@ void DialogImpl::TreeListBoxImpl::DataChanged( DataChangedEvent const & evt ) //############################################################################## //______________________________________________________________________________ -IMPL_STATIC_LINK( DialogImpl, destroyDialog, void *, p ) +IMPL_STATIC_LINK_NOINSTANCE( DialogImpl, destroyDialog, void *, EMPTYARG ) { if (s_dialog.is()) { |