diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2010-11-16 14:32:13 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2010-11-16 16:25:16 +0000 |
| commit | 9330494b42cc0be349292f49cddb7596c051fb7f (patch) | |
| tree | d0e99a38854dbbbbc3eae8a5849fab79667376f7 /cui/source/tabpages | |
| parent | 788f2f94347ab5c17760fbfc67408ee16bb1d7b8 (diff) | |
get this building again
Diffstat (limited to 'cui/source/tabpages')
| -rw-r--r-- | cui/source/tabpages/labdlg.cxx | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index 568a215a7499..e63ea5855ce4 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -126,9 +126,7 @@ SvxCaptionTabPage::SvxCaptionTabPage(Window* pParent, const SfxItemSet& rInAttrs sal_uInt16 nBitmap; for( nBitmap = 0; nBitmap < CAPTYPE_BITMAPS_COUNT; nBitmap++ ) - { mpBmpCapTypes[nBitmap] = new Image(Bitmap(CUI_RES(BMP_CAPTTYPE_1 + nBitmap)), COL_LIGHTMAGENTA ); - } //------------ValueSet installieren-------------------------- aCT_CAPTTYPE.SetStyle( aCT_CAPTTYPE.GetStyle() | WB_ITEMBORDER | WB_DOUBLEBORDER | WB_NAMEFIELD ); @@ -156,10 +154,7 @@ SvxCaptionTabPage::~SvxCaptionTabPage() { sal_uInt16 nBitmap; for( nBitmap = 0; nBitmap < CAPTYPE_BITMAPS_COUNT; nBitmap++ ) - { delete mpBmpCapTypes[nBitmap]; - delete mpBmpCapTypesH[nBitmap]; - } } // ----------------------------------------------------------------------- @@ -567,9 +562,7 @@ void SvxCaptionTabPage::DataChanged( const DataChangedEvent& rDCEvt ) void SvxCaptionTabPage::FillValueSet() { - bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - - Image** ppBitmaps = bHighContrast ? mpBmpCapTypesH : mpBmpCapTypes; + Image** ppBitmaps = mpBmpCapTypes; aCT_CAPTTYPE.SetItemImage(BMP_CAPTTYPE_1, *(ppBitmaps[0]) ); aCT_CAPTTYPE.SetItemImage(BMP_CAPTTYPE_2, *(ppBitmaps[1]) ); aCT_CAPTTYPE.SetItemImage(BMP_CAPTTYPE_3, *(ppBitmaps[2]) ); |