diff options
author | Rüdiger Timm <rt@openoffice.org> | 2007-07-06 07:17:29 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2007-07-06 07:17:29 +0000 |
commit | 599f63e6d27c597eac1bd8141c900ba275f08ec5 (patch) | |
tree | 45644dff995138c43175c2cae5064764c35ef503 /dbaccess/source/ui/dlg/indexdialog.cxx | |
parent | c636e27ae25dbcae8df63a0b9918cd1f80bd2e78 (diff) |
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
Diffstat (limited to 'dbaccess/source/ui/dlg/indexdialog.cxx')
-rw-r--r-- | dbaccess/source/ui/dlg/indexdialog.cxx | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index db17d785b0bb..fec342b6e8e5 100644 --- a/dbaccess/source/ui/dlg/indexdialog.cxx +++ b/dbaccess/source/ui/dlg/indexdialog.cxx @@ -4,9 +4,9 @@ * * $RCSfile: indexdialog.cxx,v $ * - * $Revision: 1.28 $ + * $Revision: 1.29 $ * - * last change: $Author: rt $ $Date: 2007-04-26 08:00:38 $ + * last change: $Author: rt $ $Date: 2007-07-06 08:17:29 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -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 @@ DBG_NAME(DbaIndexDialog) } } //------------------------------------------------------------------ - 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 @@ DBG_NAME(DbaIndexDialog) { 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) |