User: kz Date: 2008-06-25 12:50:58+0000 Modified: dba/dbaccess/source/ui/misc/UITools.cxx
Log: INTEGRATION: CWS dba30d (1.79.8); FILE MERGED 2008/06/10 06:41:20 fs 1.79.8.2: RESYNC: (1.79-1.80); FILE MERGED 2008/06/01 21:00:00 fs 1.79.8.1: fillTreeListNames had one client only - moved to the respective class File Changes: Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: UITools.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/UITools.cxx?r1=1.80&r2=1.81 Delta lines: +3 -45 -------------------- --- UITools.cxx 2008-06-06 14:11:33+0000 1.80 +++ UITools.cxx 2008-06-25 12:50:55+0000 1.81 @@ -1425,10 +1425,8 @@ return sName; } // ----------------------------------------------------------------------------- - void AppendConfigToken_Impl( ::rtl::OUString& _rURL, sal_Bool _bQuestionMark ) + void AppendConfigToken( ::rtl::OUString& _rURL, sal_Bool _bQuestionMark ) { - // this completes a help url with the system parameters "Language" and "System" - // detect installed locale Any aLocale = ::utl::ConfigManager::GetConfigManager()->GetDirectConfigProperty( ::utl::ConfigManager::LOCALE ); ::rtl::OUString sLocaleStr; @@ -1498,9 +1496,9 @@ ::rtl::OUString sAnchor; ::rtl::OUString sTempURL = aURL.Complete; - AppendConfigToken_Impl( sTempURL, sal_True ); + AppendConfigToken( sTempURL, sal_True ); sal_Bool bHasAnchor = GetHelpAnchor_Impl( sTempURL, sAnchor ); - AppendConfigToken_Impl(aURL.Complete,sal_True); + AppendConfigToken(aURL.Complete,sal_True); if ( bHasAnchor ) { aURL.Complete += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#")); @@ -1762,46 +1760,6 @@ } // ----------------------------------------------------------------------------- -void fillTreeListNames( const Reference< XNameAccess >& _xContainer, DBTreeListBox& _rList, - USHORT _nImageId, USHORT _nHighContrastImageId, SvLBoxEntry* _pParent, IContainerFoundListener* _pContainerFoundListener ) -{ - OSL_ENSURE(_xContainer.is(),"Data source is NULL! -> GPF"); - - if ( _xContainer.is() && _xContainer->hasElements() ) - { - Sequence< ::rtl::OUString> aSeq = _xContainer->getElementNames(); - const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); - for(;pIter != pEnd;++pIter) - { - SvLBoxEntry* pEntry = NULL; - Reference<XNameAccess> xSubElements(_xContainer->getByName(*pIter),UNO_QUERY); - if ( xSubElements.is() ) - { - pEntry = _rList.InsertEntry( *pIter, _pParent, FALSE, LIST_APPEND, reinterpret_cast< void* >( FOLDER_INDICATOR ) ); - if ( _pContainerFoundListener ) - { - Reference<XContainer> xCont(xSubElements,UNO_QUERY); - _pContainerFoundListener->containerFound(xCont); - } - fillTreeListNames( xSubElements, _rList, _nImageId, _nHighContrastImageId, pEntry, _pContainerFoundListener ); - } - else - { - pEntry = _rList.InsertEntry( *pIter, _pParent ); - - Image aImage = Image( ModuleRes( _nImageId ) ); - _rList.SetExpandedEntryBmp( pEntry, aImage, BMP_COLOR_NORMAL ); - _rList.SetCollapsedEntryBmp( pEntry, aImage, BMP_COLOR_NORMAL ); - - Image aHCImage = Image( ModuleRes( _nHighContrastImageId ) ); - _rList.SetExpandedEntryBmp( pEntry, aHCImage, BMP_COLOR_HIGHCONTRAST ); - _rList.SetCollapsedEntryBmp( pEntry, aHCImage, BMP_COLOR_HIGHCONTRAST ); - } - } - } -} -// ----------------------------------------------------------------------------- sal_Bool insertHierachyElement( Window* _pParent, const Reference< XMultiServiceFactory >& _rxORB, const Reference<XHierarchicalNameContainer>& _xNames, const String& _sParentFolder, --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
