[Libreoffice-commits] .: 3 commits - starmath/inc starmath/source sw/inc sw/source
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Nov 16 09:11:51 PST 2010
starmath/inc/dialog.hxx | 8 --
starmath/inc/toolbox.hxx | 3
starmath/source/dialog.cxx | 25 -------
starmath/source/smres.src | 103 -----------------------------
starmath/source/toolbox.cxx | 22 +-----
sw/inc/envelp.hrc | 5 -
sw/source/ui/config/mailconfigpage.cxx | 2
sw/source/ui/config/mailconfigpage.hrc | 1
sw/source/ui/dbui/mailmergechildwindow.cxx | 12 ---
sw/source/ui/dbui/mailmergechildwindow.hrc | 2
sw/source/ui/dbui/mmoutputpage.hxx | 1
sw/source/ui/dialog/regionsw.hrc | 1
sw/source/ui/dialog/uiregionsw.cxx | 13 +--
sw/source/ui/envelp/envprt.cxx | 25 +++----
sw/source/ui/envelp/envprt.hrc | 19 -----
sw/source/ui/fldui/changedb.cxx | 2
sw/source/ui/frmdlg/frmpage.cxx | 8 --
sw/source/ui/frmdlg/frmpage.hrc | 1
sw/source/ui/inc/bmpwin.hxx | 3
sw/source/ui/inc/changedb.hxx | 2
sw/source/ui/inc/regionsw.hxx | 3
sw/source/ui/inc/utlui.hrc | 8 --
sw/source/ui/lingu/olmenu.cxx | 8 +-
sw/source/ui/ribbar/workctrl.cxx | 6 -
sw/source/ui/uno/unotxdoc.cxx | 3
sw/source/ui/utlui/content.cxx | 6 -
sw/source/ui/utlui/glbltree.cxx | 6 -
sw/source/ui/utlui/viewlayoutctrl.cxx | 13 +--
28 files changed, 57 insertions(+), 254 deletions(-)
New commits:
commit dff8bed93ca474403f334427f244f8e32b87b55f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Nov 16 16:16:52 2010 +0000
get this to build again
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index be2719d..42336b2 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -202,11 +202,9 @@ class SmCategoryDesc : public Resource
XubString Name;
XubString *Strings[4];
Bitmap *Graphics[4]; /* regular bitmaps */
- Bitmap *GraphicsH[4]; /* high contrast bitmaps */
USHORT Minimum[4];
USHORT Maximum[4];
USHORT Value[4];
- bool bIsHighContrast;
public:
SmCategoryDesc(const ResId &rResId, USHORT nCategoryIdx);
@@ -219,10 +217,9 @@ public:
USHORT GetValue(USHORT Index) const { return Value[Index]; }
void SetValue(USHORT Index, USHORT nVal) { Value[Index] = nVal;}
- void SetHighContrast( bool bVal ) { bIsHighContrast = bVal; }
const Bitmap * GetGraphic(USHORT Index) const
{
- return bIsHighContrast ? GraphicsH[Index] : Graphics[Index];
+ return Graphics[Index];
}
};
@@ -258,8 +255,6 @@ class SmDistanceDialog : public ModalDialog
void SetHelpId(MetricField &rField, ULONG nHelpId);
void SetCategory(USHORT Category);
- void ApplyImages();
-
public:
SmDistanceDialog(Window *pParent, bool bFreeRes = true);
~SmDistanceDialog();
@@ -437,7 +432,6 @@ class SmSymDefineDialog : public ModalDialog
PushButton aDeleteBtn;
FixedImage aRightArrow;
Image aRigthArrow_Im;
- Image aRigthArrow_Im_HC; // hi-contrast version
SmSymbolManager aSymbolMgrCopy,
&rSymbolMgr;
diff --git a/starmath/inc/toolbox.hxx b/starmath/inc/toolbox.hxx
index a11affb..77d3fb5 100644
--- a/starmath/inc/toolbox.hxx
+++ b/starmath/inc/toolbox.hxx
@@ -48,7 +48,6 @@ protected:
ToolBox *pToolBoxCmd;
ToolBox *vToolBoxCategories[NUM_TBX_CATEGORIES];
ImageList *aImageLists [NUM_TBX_CATEGORIES + 1]; /* regular */
- ImageList *aImageListsH[NUM_TBX_CATEGORIES + 1]; /* high contrast */
USHORT nActiveCategoryRID;
virtual BOOL Close();
@@ -60,7 +59,7 @@ protected:
DECL_LINK( CmdSelectHdl, ToolBox* );
SmViewShell * GetView();
- const ImageList * GetImageList( USHORT nResId, bool bHighContrast );
+ const ImageList * GetImageList( USHORT nResId );
public:
SmToolBoxWindow(SfxBindings *pBindings,
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index ec2361c..f5a2a81 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -654,8 +654,7 @@ static const FieldMinMax pMinMaxData[10][4] =
};
SmCategoryDesc::SmCategoryDesc(const ResId& rResId, USHORT nCategoryIdx) :
- Resource(rResId),
- bIsHighContrast(false)
+ Resource(rResId)
{
if (IsAvailableRes(ResId(1,*rResId.GetResMgr()).SetRT(RSC_STRING)))
{
@@ -670,13 +669,11 @@ SmCategoryDesc::SmCategoryDesc(const ResId& rResId, USHORT nCategoryIdx) :
{
Strings [i] = new XubString(ResId(nI2,*rResId.GetResMgr()));
Graphics [i] = new Bitmap(ResId(10*nI2,*rResId.GetResMgr()));
- GraphicsH[i] = new Bitmap(ResId(10*nI2+1,*rResId.GetResMgr()));
}
else
{
Strings [i] = 0;
Graphics [i] = 0;
- GraphicsH[i] = 0;
}
}
@@ -698,7 +695,6 @@ SmCategoryDesc::~SmCategoryDesc()
{
delete Strings [i];
delete Graphics [i];
- delete GraphicsH[i];
}
}
@@ -937,8 +933,6 @@ SmDistanceDialog::SmDistanceDialog(Window *pParent, bool bFreeRes)
if (bFreeRes)
FreeResource();
- ApplyImages();
-
// preview like controls should have a 2D look
aBitmap.SetBorderStyle( WINDOW_BORDER_MONO );
@@ -960,22 +954,8 @@ SmDistanceDialog::~SmDistanceDialog()
DELETEZ(Categories[i]);
}
-void SmDistanceDialog::ApplyImages()
-{
- bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
- for (int i = 0; i < NOCATEGORIES; ++i)
- {
- SmCategoryDesc *pCat = Categories[i];
- if (pCat)
- pCat->SetHighContrast( bHighContrast );
- }
-}
-
void SmDistanceDialog::DataChanged( const DataChangedEvent &rEvt )
{
- if ( (rEvt.GetType() == DATACHANGED_SETTINGS) && (rEvt.GetFlags() & SETTINGS_STYLE) )
- ApplyImages();
-
ModalDialog::DataChanged( rEvt );
}
@@ -2059,7 +2039,6 @@ SmSymDefineDialog::SmSymDefineDialog(Window * pParent,
aDeleteBtn (this, SmResId(3)),
aRightArrow (this, SmResId(1)),
aRigthArrow_Im (SmResId(1)),
- aRigthArrow_Im_HC (SmResId(2)), // hi-contrast version
rSymbolMgr (rMgr),
pSubsetMap (NULL),
pFontList (NULL)
@@ -2136,7 +2115,7 @@ void SmSymDefineDialog::InitColor_Impl()
aSymbolDisplay .SetBackground( aWall );
aSymbolDisplay .SetTextColor( aTxtColor );
- const Image &rArrowRight = bHighContrast ? aRigthArrow_Im_HC : aRigthArrow_Im;
+ const Image &rArrowRight = aRigthArrow_Im;
aRightArrow.SetImage( rArrowRight );
}
diff --git a/starmath/source/smres.src b/starmath/source/smres.src
index d4493d3..1fb5aea 100644
--- a/starmath/source/smres.src
+++ b/starmath/source/smres.src
@@ -33,8 +33,6 @@
#include "toolbox.hrc"
#define IMAGE_STDBTN_COLOR Color { Red = 0xff00; Green = 0x0000; Blue = 0xff00; }
-#define IMAGE_STDBTN_COLOR_HC IMAGE_STDBTN_COLOR
-
#define MN_SUB_TOOLBAR 32
#define WORKARROUND_1 1
#define WORKARROUND_3 3
@@ -567,10 +565,6 @@ ModalDialog RID_DISTANCEDIALOG
{
File = "dist11.bmp" ;
};
- Bitmap 21
- {
- File = "dist11_h.bmp" ;
- };
String 3
{
Text [ en-US ] = "~Line spacing";
@@ -579,10 +573,6 @@ ModalDialog RID_DISTANCEDIALOG
{
File = "dist12.bmp" ;
};
- Bitmap 31
- {
- File = "dist12_h.bmp" ;
- };
String 4
{
Text [ en-US ] = "~Root spacing";
@@ -591,10 +581,6 @@ ModalDialog RID_DISTANCEDIALOG
{
File = "dist13.bmp" ;
};
- Bitmap 41
- {
- File = "dist13_h.bmp" ;
- };
};
Resource 2
{
@@ -610,10 +596,6 @@ ModalDialog RID_DISTANCEDIALOG
{
File = "dist21.bmp" ;
};
- Bitmap 21
- {
- File = "dist21_h.bmp" ;
- };
String 3
{
Text [ en-US ] = "S~ubscript";
@@ -622,10 +604,6 @@ ModalDialog RID_DISTANCEDIALOG
{
File = "dist22.bmp" ;
};
- Bitmap 31
- {
- File = "dist22_h.bmp" ;
- };
};
Resource 3
{
@@ -641,10 +619,6 @@ ModalDialog RID_DISTANCEDIALOG
{
File = "dist31.bmp" ;
};
- Bitmap 21
- {
- File = "dist31_h.bmp" ;
- };
String 3
{
Text [ en-US ] = "~Denominator";
@@ -653,10 +627,6 @@ ModalDialog RID_DISTANCEDIALOG
{
File = "dist32.bmp" ;
};
- Bitmap 31
- {
- File = "dist32_h.bmp" ;
- };
};
Resource 4
{
@@ -672,10 +642,6 @@ ModalDialog RID_DISTANCEDIALOG
{
File = "dist41.bmp" ;
};
- Bitmap 21
- {
- File = "dist41_h.bmp" ;
- };
String 3
{
Text [ en-US ] = "~Weight";
@@ -684,10 +650,6 @@ ModalDialog RID_DISTANCEDIALOG
{
File = "dist42.bmp" ;
};
- Bitmap 31
- {
- File = "dist42_h.bmp" ;
- };
};
Resource 5
{
@@ -703,10 +665,6 @@ ModalDialog RID_DISTANCEDIALOG
{
File = "dist51.bmp" ;
};
- Bitmap 21
- {
- File = "dist51_h.bmp" ;
- };
String 3
{
Text [ en-US ] = "~Lower limit";
@@ -715,10 +673,6 @@ ModalDialog RID_DISTANCEDIALOG
{
File = "dist52.bmp" ;
};
- Bitmap 31
- {
- File = "dist52_h.bmp" ;
- };
};
Resource 6
{
@@ -734,10 +688,6 @@ ModalDialog RID_DISTANCEDIALOG
{
File = "dist61.bmp" ;
};
- Bitmap 21
- {
- File = "dist61_h.bmp" ;
- };
String 3
{
Text [ en-US ] = "~Spacing";
@@ -746,10 +696,6 @@ ModalDialog RID_DISTANCEDIALOG
{
File = "dist62.bmp" ;
};
- Bitmap 31
- {
- File = "dist62_h.bmp" ;
- };
String 5
{
Text [ en-US ] = "~Excess size";
@@ -758,10 +704,6 @@ ModalDialog RID_DISTANCEDIALOG
{
File = "dist61.bmp" ;
};
- Bitmap 51
- {
- File = "dist61_h.bmp" ;
- };
};
Resource 7
{
@@ -777,10 +719,6 @@ ModalDialog RID_DISTANCEDIALOG
{
File = "dist71.bmp" ;
};
- Bitmap 21
- {
- File = "dist71_h.bmp" ;
- };
String 3
{
Text [ en-US ] = "~Column spacing";
@@ -789,10 +727,6 @@ ModalDialog RID_DISTANCEDIALOG
{
File = "dist72.bmp" ;
};
- Bitmap 31
- {
- File = "dist72_h.bmp" ;
- };
};
Resource 8
{
@@ -808,10 +742,6 @@ ModalDialog RID_DISTANCEDIALOG
{
File = "dist81.bmp" ;
};
- Bitmap 21
- {
- File = "dist81_h.bmp" ;
- };
String 3
{
Text [ en-US ] = "~Minimum spacing";
@@ -820,10 +750,6 @@ ModalDialog RID_DISTANCEDIALOG
{
File = "dist82.bmp" ;
};
- Bitmap 31
- {
- File = "dist82_h.bmp" ;
- };
};
Resource 9
{
@@ -839,10 +765,6 @@ ModalDialog RID_DISTANCEDIALOG
{
File = "dist91.bmp" ;
};
- Bitmap 21
- {
- File = "dist91_h.bmp" ;
- };
String 3
{
Text [ en-US ] = "~Spacing";
@@ -851,10 +773,6 @@ ModalDialog RID_DISTANCEDIALOG
{
File = "dist92.bmp" ;
};
- Bitmap 31
- {
- File = "dist92_h.bmp" ;
- };
};
Resource 10
{
@@ -870,10 +788,6 @@ ModalDialog RID_DISTANCEDIALOG
{
File = "dist101.bmp" ;
};
- Bitmap 21
- {
- File = "dist101_h.bmp" ;
- };
String 3
{
Text [ en-US ] = "~Right";
@@ -882,10 +796,6 @@ ModalDialog RID_DISTANCEDIALOG
{
File = "dist102.bmp" ;
};
- Bitmap 31
- {
- File = "dist102_h.bmp" ;
- };
String 4
{
Text [ en-US ] = "~Top";
@@ -894,10 +804,6 @@ ModalDialog RID_DISTANCEDIALOG
{
File = "dist103.bmp" ;
};
- Bitmap 41
- {
- File = "dist103_h.bmp" ;
- };
String 5
{
Text [ en-US ] = "~Bottom";
@@ -906,10 +812,6 @@ ModalDialog RID_DISTANCEDIALOG
{
File = "dist104.bmp" ;
};
- Bitmap 51
- {
- File = "dist104_h.bmp" ;
- };
};
};
@@ -1277,11 +1179,6 @@ ModalDialog RID_SYMDEFINEDIALOG
ImageBitmap = Bitmap { File = "ar_right.bmp" ; };
MaskColor = IMAGE_STDBTN_COLOR ;
};
- Image 2
- {
- ImageBitmap = Bitmap { File = "ar_right_h.bmp" ; };
- MaskColor = IMAGE_STDBTN_COLOR ;
- };
FixedImage BMP_ARROW_RIGHT
{
Pos = MAP_APPFONT ( 252 , 142 ) ;
diff --git a/starmath/source/toolbox.cxx b/starmath/source/toolbox.cxx
index 35d9716..204f77a 100644
--- a/starmath/source/toolbox.cxx
+++ b/starmath/source/toolbox.cxx
@@ -46,7 +46,7 @@
////////////////////////////////////////////////////////////
-static USHORT GetImageListRID( USHORT nCategoryRID, bool bHighContrast )
+static USHORT GetImageListRID( USHORT nCategoryRID )
{
USHORT nRes = 0xFFFF;
switch (nCategoryRID)
@@ -63,8 +63,6 @@ static USHORT GetImageListRID( USHORT nCategoryRID, bool bHighContrast )
default :
DBG_ERROR( "unkown category" );
}
- if (nRes != 0xFFFF && bHighContrast)
- ++nRes; //! the resource ID for the high contrast image list is just +1 compared to the regular ones
return nRes;
}
@@ -145,10 +143,7 @@ SmToolBoxWindow::SmToolBoxWindow(SfxBindings *pTmpBindings,
pToolBoxCmd = vToolBoxCategories[0];
for (i = 0; i <= NUM_TBX_CATEGORIES; ++i)
- {
aImageLists [i] = 0;
- aImageListsH[i] = 0;
- }
FreeResource();
@@ -165,10 +160,7 @@ SmToolBoxWindow::~SmToolBoxWindow()
delete pBox;
}
for (i = 0; i < NUM_TBX_CATEGORIES + 1; ++i)
- {
delete aImageLists[i];
- delete aImageListsH[i];
- }
}
@@ -179,7 +171,7 @@ SmViewShell * SmToolBoxWindow::GetView()
}
-const ImageList * SmToolBoxWindow::GetImageList( USHORT nResId, bool bHighContrast )
+const ImageList * SmToolBoxWindow::GetImageList( USHORT nResId )
{
// creates the image list via its resource id and stores that
// list for later use in the respective array.
@@ -194,7 +186,7 @@ const ImageList * SmToolBoxWindow::GetImageList( USHORT nResId, bool bHighContra
if (nIndex >= 0)
{
- ImageList **pImgList = bHighContrast ? aImageListsH : aImageLists;
+ ImageList **pImgList = aImageLists;
if (!pImgList[ nIndex ])
pImgList[ nIndex ] = new ImageList( SmResId(nResId) );
pIL = pImgList[ nIndex ];
@@ -207,18 +199,16 @@ const ImageList * SmToolBoxWindow::GetImageList( USHORT nResId, bool bHighContra
void SmToolBoxWindow::ApplyImageLists( USHORT nCategoryRID )
{
- bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-
// set image list for toolbox 'catalog'
- const ImageList *pImageList = GetImageList( RID_IL_CATALOG, bHighContrast );
+ const ImageList *pImageList = GetImageList( RID_IL_CATALOG );
OSL_ENSURE( pImageList, "image list missing" );
if (pImageList)
aToolBoxCat.SetImageList( *pImageList );
// set image list for active (visible) category of 'catalog'
sal_Int16 nIdx = GetToolBoxCategoriesIndex( nCategoryRID );
- USHORT nResId = GetImageListRID( nCategoryRID, bHighContrast );
- pImageList = GetImageList( nResId, bHighContrast );
+ USHORT nResId = GetImageListRID( nCategoryRID );
+ pImageList = GetImageList( nResId );
OSL_ENSURE( pImageList && nIdx >= 0, "image list or index missing" );
if (pImageList && nIdx >= 0)
vToolBoxCategories[ nIdx ]->SetImageList( *pImageList );
commit 4c5ddd73eccf0ebaff19c87168ede81d96d501bc
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Nov 16 14:49:01 2010 +0000
some more fixups
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 199590d..2a3f672 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -2213,7 +2213,7 @@ SwGrfExtPage::SwGrfExtPage(Window *pParent, const SfxItemSet &rSet) :
aAllPagesRB (this, SW_RES( RB_MIRROR_ALL_PAGES )),
aLeftPagesRB (this, SW_RES( RB_MIRROR_LEFT_PAGES )),
aRightPagesRB (this, SW_RES( RB_MIRROR_RIGHT_PAGES )),
- aBmpWin (this, WN_BMP, Graphic(), BitmapEx(SW_RES(BMP_EXAMPLE)), BitmapEx(SW_RES(BMP_EXAMPLE_HC)) ),
+ aBmpWin (this, WN_BMP, Graphic(), BitmapEx(SW_RES(BMP_EXAMPLE))),
aConnectFL (this, SW_RES( FL_CONNECT )),
aConnectFT (this, SW_RES( FT_CONNECT )),
aConnectED (this, SW_RES( ED_CONNECT )),
@@ -2455,11 +2455,10 @@ IMPL_LINK( SwGrfExtPage, MirrorHdl, CheckBox *, EMPTYARG )
Beschreibung: BeispielWindow
--------------------------------------------------------------------*/
BmpWindow::BmpWindow( Window* pPar, USHORT nId,
- const Graphic& rGraphic, const BitmapEx& rBmp, const BitmapEx& rBmpHC ) :
+ const Graphic& rGraphic, const BitmapEx& rBmp ) :
Window(pPar, SW_RES(nId)),
aGraphic(rGraphic),
aBmp(rBmp),
- aBmpHC(rBmpHC),
bHorz(FALSE),
bVert(FALSE),
bGraphic(FALSE),
@@ -2506,8 +2505,7 @@ void BmpWindow::Paint( const Rectangle& )
aGraphic.Draw( this, aPntPos, aPntSz );
else
{
- bool bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
- DrawBitmapEx( aPntPos, aPntSz, bHC ? aBmpHC : aBmp );
+ DrawBitmapEx( aPntPos, aPntSz, aBmp );
}
}
diff --git a/sw/source/ui/frmdlg/frmpage.hrc b/sw/source/ui/frmdlg/frmpage.hrc
index a1f213e..faa0e63 100644
--- a/sw/source/ui/frmdlg/frmpage.hrc
+++ b/sw/source/ui/frmdlg/frmpage.hrc
@@ -105,7 +105,6 @@
#define ED_URL 59
#define BMP_EXAMPLE 62
-#define BMP_EXAMPLE_HC 63
#define RB_MIRROR_ALL_PAGES 64
#define RB_MIRROR_LEFT_PAGES 65
#define RB_MIRROR_RIGHT_PAGES 66
diff --git a/sw/source/ui/inc/bmpwin.hxx b/sw/source/ui/inc/bmpwin.hxx
index 051dcd9..8c76b2d 100644
--- a/sw/source/ui/inc/bmpwin.hxx
+++ b/sw/source/ui/inc/bmpwin.hxx
@@ -41,7 +41,6 @@ class BmpWindow : public Window
private:
Graphic aGraphic;
BitmapEx aBmp;
- BitmapEx aBmpHC;
BOOL bHorz : 1;
BOOL bVert : 1;
@@ -52,7 +51,7 @@ private:
public:
BmpWindow(Window* pPar, USHORT nId,
- const Graphic& rGraphic, const BitmapEx& rBmp, const BitmapEx& rBmpHC);
+ const Graphic& rGraphic, const BitmapEx& rBmp);
BmpWindow(Window* pParent, const ResId rResId) :
Window(pParent, rResId),
bHorz(FALSE), bVert(FALSE),bGraphic(FALSE), bLeftAlign(TRUE) {}
commit 8e125760a587a0dbff3ea06d5c737101bd1d8d5b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Nov 16 14:45:55 2010 +0000
fix this up
diff --git a/sw/inc/envelp.hrc b/sw/inc/envelp.hrc
index 29a4248..4617a6c 100644
--- a/sw/inc/envelp.hrc
+++ b/sw/inc/envelp.hrc
@@ -79,14 +79,11 @@
#define STR_BTN_NEWDOC (RC_ENVLOP_BEGIN + 65)
#define STR_SENDER_TOKENS (RC_ENVLOP_BEGIN + 66)
-#define RC_ENVPRT_HC_BEGIN (RC_ENVLOP_BEGIN + 70)
-#define RC_ENVPRT_HC_END (RC_ENVLOP_BEGIN + 82)
-
// Ueberlaufpruefung ----------------------------------------------------------
#define ENVELP_ACT_END STR_SENDER_TOKENS
-#if ENVELP_ACT_END > RC_ENVPRT_HC_END
+#if ENVELP_ACT_END > STR_SENDER_TOKENS
#error Resource-Ueberlauf in #file, #line
#endif
diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx
index 42de2e6..19de971 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -268,7 +268,7 @@ SwTestAccountSettingsDialog::SwTestAccountSettingsDialog(SwMailConfigPage* pPare
#ifdef MSC
#pragma warning (default : 4355)
#endif
- m_aImageList( SW_RES( GetSettings().GetStyleSettings().GetHighContrastMode() ? ILIST_HC : ILIST) ),
+ m_aImageList( SW_RES(ILIST) ),
m_sTask( SW_RES( ST_TASK )),
m_sStatus( SW_RES( ST_STATUS )),
m_sEstablish( SW_RES( ST_ESTABLISH )),
diff --git a/sw/source/ui/config/mailconfigpage.hrc b/sw/source/ui/config/mailconfigpage.hrc
index 0a52c94..7b4aa97 100644
--- a/sw/source/ui/config/mailconfigpage.hrc
+++ b/sw/source/ui/config/mailconfigpage.hrc
@@ -61,7 +61,6 @@
#define ST_FAILED 44
#define ST_ERROR_SERVER 46
#define ILIST 47
-#define ILIST_HC 48
#define CB_AUTHENTICATION 50
#define RB_SEP_AUTHENTICATION 51
diff --git a/sw/source/ui/dbui/mailmergechildwindow.cxx b/sw/source/ui/dbui/mailmergechildwindow.cxx
index c384c51..4650fdf 100644
--- a/sw/source/ui/dbui/mailmergechildwindow.cxx
+++ b/sw/source/ui/dbui/mailmergechildwindow.cxx
@@ -92,8 +92,7 @@ SwMailMergeChildWin::SwMailMergeChildWin( SfxBindings* _pBindings,
m_aBackTB(this, SW_RES( TB_BACK ))
{
m_aBackTB.SetSelectHdl(LINK(this, SwMailMergeChildWin, BackHdl));
- sal_uInt16 nIResId = GetSettings().GetStyleSettings().GetHighContrastMode() ?
- ILIST_TBX_HC : ILIST_TBX;
+ sal_uInt16 nIResId = ILIST_TBX;
ResId aResId( nIResId, *pSwResMgr );
ImageList aIList(aResId);
FreeResource();
@@ -325,7 +324,6 @@ SwSendMailDialog::SwSendMailDialog(Window *pParent, SwMailMergeConfigItem& rConf
m_bCancel(false),
m_bDesctructionEnabled(false),
m_aImageList( SW_RES( ILIST ) ),
- m_aImageListHC( SW_RES( ILIST_HC ) ),
m_pImpl(new SwSendMailDialog_Impl),
m_pConfigItem(&rConfigItem),
m_nSendCount(0),
@@ -562,9 +560,7 @@ void SwSendMailDialog::IterateMails()
{
if(!SwMailMergeHelper::CheckMailAddress( pCurrentMailDescriptor->sEMail ))
{
- ImageList& rImgLst = GetSettings().GetStyleSettings().GetHighContrastMode() ?
- m_aImageListHC : m_aImageList;
- Image aInsertImg = rImgLst.GetImage( FN_FORMULA_CANCEL );
+ Image aInsertImg = m_aImageList.GetImage( FN_FORMULA_CANCEL );
String sMessage = m_sSendingTo;
String sTmp(pCurrentMailDescriptor->sEMail);
@@ -663,9 +659,7 @@ void SwSendMailDialog::DocumentSent( uno::Reference< mail::XMailMessage> xMessag
Application::PostUserEvent( STATIC_LINK( this, SwSendMailDialog,
StopSendMails ), this );
}
- ImageList& rImgLst = GetSettings().GetStyleSettings().GetHighContrastMode() ?
- m_aImageListHC : m_aImageList;
- Image aInsertImg = rImgLst.GetImage( bResult ? FN_FORMULA_APPLY : FN_FORMULA_CANCEL );
+ Image aInsertImg = m_aImageList.GetImage( bResult ? FN_FORMULA_APPLY : FN_FORMULA_CANCEL );
String sMessage = m_sSendingTo;
String sTmp(xMessage->getRecipients()[0]);
diff --git a/sw/source/ui/dbui/mailmergechildwindow.hrc b/sw/source/ui/dbui/mailmergechildwindow.hrc
index edba002..63adcc6 100644
--- a/sw/source/ui/dbui/mailmergechildwindow.hrc
+++ b/sw/source/ui/dbui/mailmergechildwindow.hrc
@@ -27,7 +27,6 @@
#define TB_BACK 1
#define ILIST_TBX 90
-#define ILIST_TBX_HC 91
#define FL_SEPARATOR 7
@@ -47,7 +46,6 @@
#define ST_TASK 73
#define ST_STATUS 74
#define ILIST 75
-#define ILIST_HC 76
#define ST_SEND 77
#define ST_SENDINGTO 78
#define ST_COMPLETED 79
diff --git a/sw/source/ui/dbui/mmoutputpage.hxx b/sw/source/ui/dbui/mmoutputpage.hxx
index 11f5daf..3ac11c0 100644
--- a/sw/source/ui/dbui/mmoutputpage.hxx
+++ b/sw/source/ui/dbui/mmoutputpage.hxx
@@ -196,7 +196,6 @@ class SW_DLLPUBLIC SwSendMailDialog : public ModelessDialog //SfxModalDialog
bool m_bDesctructionEnabled;
ImageList m_aImageList;
- ImageList m_aImageListHC;
SwSendMailDialog_Impl* m_pImpl;
SwMailMergeConfigItem* m_pConfigItem;
diff --git a/sw/source/ui/dialog/regionsw.hrc b/sw/source/ui/dialog/regionsw.hrc
index 72c85eb..c5a76ca 100644
--- a/sw/source/ui/dialog/regionsw.hrc
+++ b/sw/source/ui/dialog/regionsw.hrc
@@ -83,7 +83,6 @@
#define FL_END 52
#define FL_FTN 53
#define IL_BITMAPS 54
-#define ILH_BITMAPS 55
// #114856# edit in readonly sections
#define FL_PROPERTIES 56
#define CB_EDIT_IN_READONLY 57
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 806b23b..690a6dd 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -387,7 +387,6 @@ SwEditRegionDlg::SwEditRegionDlg( Window* pParent, SwWrtShell& rWrtSh )
aHelp ( this, SW_RES( PB_HELP ) ),
aImageIL ( SW_RES(IL_BITMAPS)),
- aImageILH ( SW_RES(ILH_BITMAPS)),
rSh( rWrtSh ),
pAktEntry( 0 ),
@@ -515,7 +514,7 @@ void SwEditRegionDlg::RecurseList( const SwSectionFmt* pFmt, SvLBoxEntry* pEntry
{
SectRepr* pSectRepr = new SectRepr( n,
*(pSect=pFmt->GetSection()) );
- Image aImg = BuildBitmap( pSect->IsProtect(),pSect->IsHidden(), FALSE);
+ Image aImg = BuildBitmap( pSect->IsProtect(),pSect->IsHidden());
pEntry = aTree.InsertEntry(pSect->GetSectionName(), aImg, aImg);
pEntry->SetUserData(pSectRepr);
RecurseList( pFmt, pEntry );
@@ -545,7 +544,7 @@ void SwEditRegionDlg::RecurseList( const SwSectionFmt* pFmt, SvLBoxEntry* pEntry
SectRepr* pSectRepr=new SectRepr(
FindArrPos( pSect->GetFmt() ), *pSect );
Image aImage = BuildBitmap( pSect->IsProtect(),
- pSect->IsHidden(), FALSE);
+ pSect->IsHidden());
pNEntry = aTree.InsertEntry(
pSect->GetSectionName(), aImage, aImage, pEntry);
pNEntry->SetUserData(pSectRepr);
@@ -912,7 +911,7 @@ IMPL_LINK( SwEditRegionDlg, ChangeProtectHdl, TriStateBox *, pBox )
SectReprPtr pRepr = (SectReprPtr) pEntry->GetUserData();
pRepr->GetSectionData().SetProtectFlag(bCheck);
Image aImage = BuildBitmap( bCheck,
- STATE_CHECK == aHideCB.GetState(), FALSE);
+ STATE_CHECK == aHideCB.GetState());
aTree.SetExpandedEntryBmp( pEntry, aImage );
aTree.SetCollapsedEntryBmp( pEntry, aImage );
pEntry = aTree.NextSelected(pEntry);
@@ -938,7 +937,7 @@ IMPL_LINK( SwEditRegionDlg, ChangeHideHdl, TriStateBox *, pBox )
pRepr->GetSectionData().SetHidden(STATE_CHECK == pBox->GetState());
Image aImage = BuildBitmap(STATE_CHECK == aProtectCB.GetState(),
- STATE_CHECK == pBox->GetState(), FALSE);
+ STATE_CHECK == pBox->GetState());
aTree.SetExpandedEntryBmp( pEntry, aImage );
aTree.SetCollapsedEntryBmp( pEntry, aImage );
@@ -1482,9 +1481,9 @@ IMPL_LINK( SwEditRegionDlg, SubRegionEventHdl, VclWindowEvent *, pEvent )
return 0;
}
-Image SwEditRegionDlg::BuildBitmap(BOOL bProtect,BOOL bHidden, BOOL bHighContrast)
+Image SwEditRegionDlg::BuildBitmap(BOOL bProtect,BOOL bHidden)
{
- ImageList& rImgLst = bHighContrast ? aImageILH : aImageIL;
+ ImageList& rImgLst = aImageIL;
return rImgLst.GetImage((!bHidden+(bProtect<<1)) + 1);
}
diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx
index 58544cc..2b7e67d 100644
--- a/sw/source/ui/envelp/envprt.cxx
+++ b/sw/source/ui/envelp/envprt.cxx
@@ -91,26 +91,25 @@ SwEnvPrtPage::~SwEnvPrtPage()
IMPL_LINK( SwEnvPrtPage, ClickHdl, Button *, EMPTYARG )
{
- sal_Bool bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
if (aBottomButton.IsChecked())
{
// Envelope from botton
- aAlignBox.SetItemImage(ITM_HOR_LEFT, Bitmap(SW_RES(bHC ? BMP_HOR_LEFT_LOWER_H : BMP_HOR_LEFT_LOWER)));
- aAlignBox.SetItemImage(ITM_HOR_CNTR, Bitmap(SW_RES(bHC ? BMP_HOR_CNTR_LOWER_H : BMP_HOR_CNTR_LOWER)));
- aAlignBox.SetItemImage(ITM_HOR_RGHT, Bitmap(SW_RES(bHC ? BMP_HOR_RGHT_LOWER_H : BMP_HOR_RGHT_LOWER)));
- aAlignBox.SetItemImage(ITM_VER_LEFT, Bitmap(SW_RES(bHC ? BMP_VER_LEFT_LOWER_H : BMP_VER_LEFT_LOWER)));
- aAlignBox.SetItemImage(ITM_VER_CNTR, Bitmap(SW_RES(bHC ? BMP_VER_CNTR_LOWER_H : BMP_VER_CNTR_LOWER)));
- aAlignBox.SetItemImage(ITM_VER_RGHT, Bitmap(SW_RES(bHC ? BMP_VER_RGHT_LOWER_H : BMP_VER_RGHT_LOWER)));
+ aAlignBox.SetItemImage(ITM_HOR_LEFT, Bitmap(SW_RES(BMP_HOR_LEFT_LOWER)));
+ aAlignBox.SetItemImage(ITM_HOR_CNTR, Bitmap(SW_RES(BMP_HOR_CNTR_LOWER)));
+ aAlignBox.SetItemImage(ITM_HOR_RGHT, Bitmap(SW_RES(BMP_HOR_RGHT_LOWER)));
+ aAlignBox.SetItemImage(ITM_VER_LEFT, Bitmap(SW_RES(BMP_VER_LEFT_LOWER)));
+ aAlignBox.SetItemImage(ITM_VER_CNTR, Bitmap(SW_RES(BMP_VER_CNTR_LOWER)));
+ aAlignBox.SetItemImage(ITM_VER_RGHT, Bitmap(SW_RES(BMP_VER_RGHT_LOWER)));
}
else
{
// Envelope from top
- aAlignBox.SetItemImage(ITM_HOR_LEFT, Bitmap(SW_RES(bHC ? BMP_HOR_LEFT_UPPER_H : BMP_HOR_LEFT_UPPER)));
- aAlignBox.SetItemImage(ITM_HOR_CNTR, Bitmap(SW_RES(bHC ? BMP_HOR_CNTR_UPPER_H : BMP_HOR_CNTR_UPPER)));
- aAlignBox.SetItemImage(ITM_HOR_RGHT, Bitmap(SW_RES(bHC ? BMP_HOR_RGHT_UPPER_H : BMP_HOR_RGHT_UPPER)));
- aAlignBox.SetItemImage(ITM_VER_LEFT, Bitmap(SW_RES(bHC ? BMP_VER_LEFT_UPPER_H : BMP_VER_LEFT_UPPER)));
- aAlignBox.SetItemImage(ITM_VER_CNTR, Bitmap(SW_RES(bHC ? BMP_VER_CNTR_UPPER_H : BMP_VER_CNTR_UPPER)));
- aAlignBox.SetItemImage(ITM_VER_RGHT, Bitmap(SW_RES(bHC ? BMP_VER_RGHT_UPPER_H : BMP_VER_RGHT_UPPER)));
+ aAlignBox.SetItemImage(ITM_HOR_LEFT, Bitmap(SW_RES(BMP_HOR_LEFT_UPPER)));
+ aAlignBox.SetItemImage(ITM_HOR_CNTR, Bitmap(SW_RES(BMP_HOR_CNTR_UPPER)));
+ aAlignBox.SetItemImage(ITM_HOR_RGHT, Bitmap(SW_RES(BMP_HOR_RGHT_UPPER)));
+ aAlignBox.SetItemImage(ITM_VER_LEFT, Bitmap(SW_RES(BMP_VER_LEFT_UPPER)));
+ aAlignBox.SetItemImage(ITM_VER_CNTR, Bitmap(SW_RES(BMP_VER_CNTR_UPPER)));
+ aAlignBox.SetItemImage(ITM_VER_RGHT, Bitmap(SW_RES(BMP_VER_RGHT_UPPER)));
}
return 0;
}
diff --git a/sw/source/ui/envelp/envprt.hrc b/sw/source/ui/envelp/envprt.hrc
index 32e5e62..044b0cb 100644
--- a/sw/source/ui/envelp/envprt.hrc
+++ b/sw/source/ui/envelp/envprt.hrc
@@ -67,26 +67,11 @@
#define ITM_VER_CNTR (RC_ENVPRT_BEGIN + 16)
#define ITM_VER_RGHT (RC_ENVPRT_BEGIN + 17)
-#define BMP_HOR_LEFT_LOWER_H (RC_ENVPRT_HC_BEGIN )
-#define BMP_HOR_LEFT_UPPER_H (RC_ENVPRT_HC_BEGIN + 1)
-#define BMP_HOR_CNTR_LOWER_H (RC_ENVPRT_HC_BEGIN + 2)
-#define BMP_HOR_CNTR_UPPER_H (RC_ENVPRT_HC_BEGIN + 3)
-#define BMP_HOR_RGHT_LOWER_H (RC_ENVPRT_HC_BEGIN + 4)
-#define BMP_HOR_RGHT_UPPER_H (RC_ENVPRT_HC_BEGIN + 5)
-
-#define BMP_VER_LEFT_LOWER_H (RC_ENVPRT_HC_BEGIN + 6)
-#define BMP_VER_LEFT_UPPER_H (RC_ENVPRT_HC_BEGIN + 7)
-#define BMP_VER_CNTR_LOWER_H (RC_ENVPRT_HC_BEGIN + 8)
-#define BMP_VER_CNTR_UPPER_H (RC_ENVPRT_HC_BEGIN + 9)
-#define BMP_VER_RGHT_LOWER_H (RC_ENVPRT_HC_BEGIN + 10)
-#define BMP_VER_RGHT_UPPER_H (RC_ENVPRT_HC_BEGIN + 11)
-
-
// Ueberlaufpruefung ********************************************************
-#define ENVPRT_ACT_END BMP_VER_RGHT_UPPER_H
+#define ENVPRT_ACT_END ITM_VER_RGHT
-#if ENVPRT_ACT_END > RC_ENVPRT_HC_END
+#if ENVPRT_ACT_END > ITM_VER_RGHT
#error Resource-Ueberlauf in #file, #line
#endif
diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index 5ecb5b0..0f97b98 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@ -86,8 +86,6 @@ SwChangeDBDlg::SwChangeDBDlg(SwView& rVw) :
aCancelBT (this, SW_RES(BT_CANCEL )),
aHelpBT (this, SW_RES(BT_HELP )),
aImageList (SW_RES(ILIST_DB_DLG )),
- aImageListHC (SW_RES(ILIST_DB_DLG_HC )),
-
pSh(rVw.GetWrtShellPtr()),
pMgr( new SwFldMgr() )
{
diff --git a/sw/source/ui/inc/changedb.hxx b/sw/source/ui/inc/changedb.hxx
index 85f5fa0..1a6aea6 100644
--- a/sw/source/ui/inc/changedb.hxx
+++ b/sw/source/ui/inc/changedb.hxx
@@ -60,10 +60,8 @@ class SwChangeDBDlg: public SvxStandardDialog
OKButton aOKBT;
CancelButton aCancelBT;
HelpButton aHelpBT;
-// PushButton aChangeBT;
ImageList aImageList;
- ImageList aImageListHC;
SwWrtShell *pSh;
SwFldMgr *pMgr;
diff --git a/sw/source/ui/inc/regionsw.hxx b/sw/source/ui/inc/regionsw.hxx
index d175d09..68ec42f 100644
--- a/sw/source/ui/inc/regionsw.hxx
+++ b/sw/source/ui/inc/regionsw.hxx
@@ -106,7 +106,6 @@ class SwEditRegionDlg : public SfxModalDialog
PushButton aDismiss;
HelpButton aHelp;
ImageList aImageIL;
- ImageList aImageILH;
SwWrtShell& rSh;
SectReprArr aSectReprArr;
@@ -119,7 +118,7 @@ class SwEditRegionDlg : public SfxModalDialog
BOOL bWeb :1;
- Image BuildBitmap(BOOL bProtect,BOOL bHidden,BOOL bHighContrast);
+ Image BuildBitmap(BOOL bProtect,BOOL bHidden);
void RecurseList( const SwSectionFmt* pFmt, SvLBoxEntry* pEntry);
USHORT FindArrPos(const SwSectionFmt* pFmt);
diff --git a/sw/source/ui/inc/utlui.hrc b/sw/source/ui/inc/utlui.hrc
index 812dc4b..80970bb 100644
--- a/sw/source/ui/inc/utlui.hrc
+++ b/sw/source/ui/inc/utlui.hrc
@@ -154,9 +154,7 @@
#define DLG_GLOSSARY_DECIDE_DLG (RC_UTLUI_BEGIN + 3)
#define IMG_NAVI_ENTRYBMP (RC_UTLUI_BEGIN + 4)
-#define IMG_NAVI_ENTRYBMPH (RC_UTLUI_BEGIN + 5)
#define ILIST_DB_DLG (RC_UTLUI_BEGIN + 6)
-#define ILIST_DB_DLG_HC (RC_UTLUI_BEGIN + 7)
#define IMG_VIEWLAYOUT_AUTOMATIC (RC_UTLUI_BEGIN + 12)
#define IMG_VIEWLAYOUT_AUTOMATIC_ACTIVE (RC_UTLUI_BEGIN + 13)
@@ -164,12 +162,6 @@
#define IMG_VIEWLAYOUT_BOOKMODE_ACTIVE (RC_UTLUI_BEGIN + 15)
#define IMG_VIEWLAYOUT_SINGLECOLUMN (RC_UTLUI_BEGIN + 16)
#define IMG_VIEWLAYOUT_SINGLECOLUMN_ACTIVE (RC_UTLUI_BEGIN + 17)
-#define IMG_VIEWLAYOUT_AUTOMATIC_HC (RC_UTLUI_BEGIN + 18)
-#define IMG_VIEWLAYOUT_AUTOMATIC_ACTIVE_HC (RC_UTLUI_BEGIN + 19)
-#define IMG_VIEWLAYOUT_BOOKMODE_HC (RC_UTLUI_BEGIN + 20)
-#define IMG_VIEWLAYOUT_BOOKMODE_ACTIVE_HC (RC_UTLUI_BEGIN + 21)
-#define IMG_VIEWLAYOUT_SINGLECOLUMN_HC (RC_UTLUI_BEGIN + 22)
-#define IMG_VIEWLAYOUT_SINGLECOLUMN_ACTIVE_HC (RC_UTLUI_BEGIN + 23)
//local ids of the Database ImageLists
diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx
index c26acad..ab23e89 100644
--- a/sw/source/ui/lingu/olmenu.cxx
+++ b/sw/source/ui/lingu/olmenu.cxx
@@ -570,8 +570,8 @@ bGrammarResults(false)
*/
uno::Reference< frame::XFrame > xFrame = pWrtSh->GetView().GetViewFrame()->GetFrame().GetFrameInterface();
Image rImg = ::GetImage( xFrame,
- OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:SpellingAndGrammarDialog")), sal_False,
- Application::GetSettings().GetStyleSettings().GetHighContrastMode() );
+ OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:SpellingAndGrammarDialog")), sal_False );
+
SetItemImage( MN_SPELLING_DLG, rImg );
//////////////////////////////////////////////////////////////////////////////////
@@ -703,8 +703,8 @@ aInfo16( SW_RES(IMG_INFO_16) )
*/
uno::Reference< frame::XFrame > xFrame = pWrtSh->GetView().GetViewFrame()->GetFrame().GetFrameInterface();
Image rImg = ::GetImage( xFrame,
- OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:SpellingAndGrammarDialog")), sal_False,
- Application::GetSettings().GetStyleSettings().GetHighContrastMode() );
+ OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:SpellingAndGrammarDialog")), sal_False );
+
SetItemImage( MN_SPELLING_DLG, rImg );
//////////////////////////////////////////////////////////////////////////////////
diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx
index a4d6212..e975f0b 100644
--- a/sw/source/ui/ribbar/workctrl.cxx
+++ b/sw/source/ui/ribbar/workctrl.cxx
@@ -94,8 +94,7 @@ void SAL_CALL SwTbxInsertCtrl::update() throw (uno::RuntimeException)
aSlotURL += rtl::OUString::valueOf( sal_Int32( nLastSlotId ));
Image aImage = GetImage( m_xFrame,
aSlotURL,
- hasBigImages(),
- rTbx.GetSettings().GetStyleSettings().GetHighContrastMode() );
+ hasBigImages() );
rTbx.SetItemImage(GetId(), aImage);
rTbx.Invalidate();
@@ -124,8 +123,7 @@ void SwTbxInsertCtrl::StateChanged( USHORT /*nSID*/,
ToolBox& rBox = GetToolBox();
Image aImage = GetImage( m_xFrame,
aSlotURL,
- hasBigImages(),
- rBox.GetSettings().GetStyleSettings().GetHighContrastMode() );
+ hasBigImages() );
rBox.SetItemImage(GetId(), aImage);
rBox.SetItemImageMirrorMode( GetId(), FALSE );
rBox.SetItemImageAngle( GetId(), pItem->GetRotation() );
diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx
index 3a95748..4954e49 100644
--- a/sw/source/ui/uno/unotxdoc.cxx
+++ b/sw/source/ui/uno/unotxdoc.cxx
@@ -3590,8 +3590,7 @@ Any lcl_GetDisplayBitmap(String sLinkSuffix)
if(USHRT_MAX != nImgId)
{
nImgId += 20000;
- BOOL bHighContrast = Application::GetSettings().GetStyleSettings().GetHighContrastMode();
- ImageList aEntryImages( SW_RES(bHighContrast ? IMG_NAVI_ENTRYBMPH : IMG_NAVI_ENTRYBMP) );
+ ImageList aEntryImages( SW_RES(IMG_NAVI_ENTRYBMP) );
const Image& rImage = aEntryImages.GetImage( nImgId );
Bitmap aBitmap( rImage.GetBitmapEx().GetBitmap() );
Reference<awt::XBitmap> xBmp = VCLUnoHelper::CreateBitmap( aBitmap );
diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx
index 1c274c0..939725d 100644
--- a/sw/source/ui/utlui/content.cxx
+++ b/sw/source/ui/utlui/content.cxx
@@ -1384,8 +1384,7 @@ void SwContentTree::Display( sal_Bool bActive )
{
if(!bIsImageListInitialized)
{
- USHORT nResId = GetSettings().GetStyleSettings().GetHighContrastMode() ? IMG_NAVI_ENTRYBMPH : IMG_NAVI_ENTRYBMP;
- aEntryImages = ImageList(SW_RES(nResId));
+ aEntryImages = ImageList(SW_RES(IMG_NAVI_ENTRYBMP));
bIsImageListInitialized = sal_True;
}
// erst den selektierten Eintrag auslesen, um ihn spaeter evtl. wieder
@@ -3190,8 +3189,7 @@ void SwContentTree::DataChanged( const DataChangedEvent& rDCEvt )
if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
(rDCEvt.GetFlags() & SETTINGS_STYLE) )
{
- USHORT nResId = GetSettings().GetStyleSettings().GetHighContrastMode() ? IMG_NAVI_ENTRYBMPH : IMG_NAVI_ENTRYBMP;
- aEntryImages = ImageList(SW_RES(nResId));
+ aEntryImages = ImageList(SW_RES(IMG_NAVI_ENTRYBMP));
FindActiveTypeAndRemoveUserData();
Display(sal_True);
}
diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx
index ee43c7c..53248cf 100644
--- a/sw/source/ui/utlui/glbltree.cxx
+++ b/sw/source/ui/utlui/glbltree.cxx
@@ -643,8 +643,7 @@ void SwGlobalTree::Display(BOOL bOnlyUpdateUserData)
{
if(!bIsImageListInitialized)
{
- USHORT nResId = GetSettings().GetStyleSettings().GetHighContrastMode() ? IMG_NAVI_ENTRYBMPH : IMG_NAVI_ENTRYBMP;
- aEntryImages = ImageList(SW_RES(nResId));
+ aEntryImages = ImageList(SW_RES(IMG_NAVI_ENTRYBMP));
bIsImageListInitialized = TRUE;
}
USHORT nCount = pSwGlblDocContents->Count();
@@ -1274,8 +1273,7 @@ void SwGlobalTree::DataChanged( const DataChangedEvent& rDCEvt )
if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
(rDCEvt.GetFlags() & SETTINGS_STYLE) )
{
- USHORT nResId = GetSettings().GetStyleSettings().GetHighContrastMode() ? IMG_NAVI_ENTRYBMPH : IMG_NAVI_ENTRYBMP;
- aEntryImages = ImageList(SW_RES(nResId));
+ aEntryImages = ImageList(SW_RES(IMG_NAVI_ENTRYBMP));
Update(sal_True);
}
SvTreeListBox::DataChanged( rDCEvt );
diff --git a/sw/source/ui/utlui/viewlayoutctrl.cxx b/sw/source/ui/utlui/viewlayoutctrl.cxx
index 16ada1f..e06868b 100644
--- a/sw/source/ui/utlui/viewlayoutctrl.cxx
+++ b/sw/source/ui/utlui/viewlayoutctrl.cxx
@@ -68,13 +68,12 @@ SwViewLayoutControl::SwViewLayoutControl( USHORT _nSlotId, USHORT _nId, StatusBa
{
mpImpl->mnState = 0;
- const sal_Bool bHC = GetStatusBar().GetSettings().GetStyleSettings().GetHighContrastMode();
- mpImpl->maImageSingleColumn = Image( bHC ? SW_RES(IMG_VIEWLAYOUT_SINGLECOLUMN_HC) : SW_RES(IMG_VIEWLAYOUT_SINGLECOLUMN) );
- mpImpl->maImageSingleColumn_Active = Image( bHC ? SW_RES(IMG_VIEWLAYOUT_SINGLECOLUMN_ACTIVE_HC) : SW_RES(IMG_VIEWLAYOUT_SINGLECOLUMN_ACTIVE) );
- mpImpl->maImageAutomatic = Image( bHC ? SW_RES(IMG_VIEWLAYOUT_AUTOMATIC_HC) : SW_RES(IMG_VIEWLAYOUT_AUTOMATIC) );
- mpImpl->maImageAutomatic_Active = Image( bHC ? SW_RES(IMG_VIEWLAYOUT_AUTOMATIC_ACTIVE_HC) : SW_RES(IMG_VIEWLAYOUT_AUTOMATIC_ACTIVE) );
- mpImpl->maImageBookMode = Image( bHC ? SW_RES(IMG_VIEWLAYOUT_BOOKMODE_HC) : SW_RES(IMG_VIEWLAYOUT_BOOKMODE) );
- mpImpl->maImageBookMode_Active = Image( bHC ? SW_RES(IMG_VIEWLAYOUT_BOOKMODE_ACTIVE_HC) : SW_RES(IMG_VIEWLAYOUT_BOOKMODE_ACTIVE) );
+ mpImpl->maImageSingleColumn = Image( SW_RES(IMG_VIEWLAYOUT_SINGLECOLUMN) );
+ mpImpl->maImageSingleColumn_Active = Image( SW_RES(IMG_VIEWLAYOUT_SINGLECOLUMN_ACTIVE) );
+ mpImpl->maImageAutomatic = Image( SW_RES(IMG_VIEWLAYOUT_AUTOMATIC) );
+ mpImpl->maImageAutomatic_Active = Image( SW_RES(IMG_VIEWLAYOUT_AUTOMATIC_ACTIVE) );
+ mpImpl->maImageBookMode = Image( SW_RES(IMG_VIEWLAYOUT_BOOKMODE) );
+ mpImpl->maImageBookMode_Active = Image( SW_RES(IMG_VIEWLAYOUT_BOOKMODE_ACTIVE) );
}
SwViewLayoutControl::~SwViewLayoutControl()
More information about the Libreoffice-commits
mailing list