User: rt Date: 2007-07-06 08:17:36+0000 Modified: dba/dbaccess/source/ui/dlg/indexdialog.cxx
Log: INTEGRATION: CWS oj14 (1.22.4); FILE MERGED 2007/06/04 18:26:23 oj 1.22.4.8: RESYNC: (1.27-1.28); FILE MERGED 2006/11/07 09:23:40 oj 1.22.4.7: RESYNC: (1.25-1.27); FILE MERGED 2006/07/04 07:59:15 oj 1.22.4.6: RESYNC: (1.24-1.25); FILE MERGED 2006/04/25 13:03:00 oj 1.22.4.5: new include 2006/03/20 13:57:26 oj 1.22.4.4: RESYNC: (1.23-1.24); FILE MERGED 2006/03/20 07:48:32 oj 1.22.4.3: use of module client helper 2006/01/03 13:21:24 oj 1.22.4.2: RESYNC: (1.22-1.23); FILE MERGED 2006/01/03 07:49:10 oj 1.22.4.1: changed module client File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: indexdialog.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/indexdialog.cxx?r1=1.28&r2=1.29 Delta lines: +3 -7 ------------------- --- indexdialog.cxx 2007-04-26 08:00:38+0000 1.28 +++ indexdialog.cxx 2007-07-06 08:17:29+0000 1.29 @@ -42,9 +42,6 @@ #ifndef _DBU_DLG_HRC_ #include "dbu_dlg.hrc" #endif -#ifndef _DBAUI_MODULE_DBU_HXX_ -#include "moduledbu.hxx" -#endif #ifndef _DBA_DBACCESS_HELPID_HRC_ #include "dbaccess_helpid.hrc" #endif @@ -922,7 +919,7 @@ } } //------------------------------------------------------------------ - sal_Int16 DbaIndexDialog::getImageListId(sal_Int16 _eBitmapSet,sal_Bool _bHiContast) const + ImageList DbaIndexDialog::getImageList(sal_Int16 _eBitmapSet,sal_Bool _bHiContast) const { sal_Int16 nN = IMG_INDEX_DLG_SC; sal_Int16 nH = IMG_INDEX_DLG_SCH; @@ -930,9 +927,8 @@ { nN = IMG_INDEX_DLG_LC; nH = IMG_INDEX_DLG_LCH; - } - - return _bHiContast ? nH : nN; + } // if ( _eBitmapSet == SFX_SYMBOLS_LARGE ) + return ImageList(ModuleRes( _bHiContast ? nH : nN )); } //------------------------------------------------------------------ void DbaIndexDialog::resizeControls(const Size& _rDiff) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
