User: kz Date: 2006/10/05 06:04:08 Modified: dba/dbaccess/source/ui/dlg/adtabdlg.cxx
Log: INTEGRATION: CWS hsqlcsvstage1 (1.25.2); FILE MERGED 2006/09/20 11:43:58 fs 1.25.2.1: #i69696#, being stage 1 of issue #i69526#: merging changes from CWS hsqlcsv herein File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: adtabdlg.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/adtabdlg.cxx?r1=1.25&r2=1.26 Delta lines: +8 -4 ------------------- --- adtabdlg.cxx 17 Sep 2006 07:07:32 -0000 1.25 +++ adtabdlg.cxx 5 Oct 2006 13:04:05 -0000 1.26 @@ -98,10 +98,12 @@ #ifndef DBAUI_TOOLS_HXX #include "UITools.hxx" #endif +#ifndef DBACCESS_IMAGEPROVIDER_HXX +#include "imageprovider.hxx" +#endif #include <algorithm> - // slot ids using namespace dbaui; using namespace ::com::sun::star::uno; @@ -221,7 +223,7 @@ sViews = Sequence< ::rtl::OUString>(); } - m_rTableList.UpdateTableList( m_xConnection->getMetaData(), sTables, sViews ); + m_rTableList.UpdateTableList( m_xConnection, sTables, sViews ); SvLBoxEntry* pEntry = m_rTableList.First(); while( pEntry && m_rTableList.GetModel()->HasChilds( pEntry ) ) { @@ -270,8 +272,10 @@ m_rQueryList.Clear(); try { - Image aQueryImage( ModuleRes( QUERY_TREE_ICON ) ); - Image aQueryImageHC( ModuleRes( QUERY_TREE_ICON_SCH ) ); + ImageProvider aImageProvider( m_xConnection ); + Image aQueryImage( aImageProvider.getDefaultImage( DatabaseObject::QUERY, false ) ); + Image aQueryImageHC( aImageProvider.getDefaultImage( DatabaseObject::QUERY, true ) ); + m_rQueryList.SetDefaultExpandedEntryBmp( aQueryImage, BMP_COLOR_NORMAL ); m_rQueryList.SetDefaultCollapsedEntryBmp( aQueryImage, BMP_COLOR_NORMAL ); m_rQueryList.SetDefaultExpandedEntryBmp( aQueryImageHC, BMP_COLOR_HIGHCONTRAST ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
