strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

HC Cleanup - libs-gui

Browse source
This commit is contained in:
Joseph Powers 2010-11-16 19:03:56 -08:00
parent 89490d99c3
commit 1702d31ddf
21 changed files with 72 additions and 161 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
padmin/source/padialog.cxx
View file

@ -110,8 +110,8 @@ PADialog::PADialog( Window* pParent, BOOL /*bAdmin*/ ) :
void PADialog::updateSettings() void PADialog::updateSettings()
{ {
m_aPrinterImg = Image( BitmapEx( PaResId( RID_BMP_SMALL_PRINTER ) ) ); m_aPrinterImg = Image( BitmapEx( PaResId( RID_BMP_SMALL_PRINTER ) ) );
m_aFaxImg = Image( BitmapEx( PaResId( RID_BMP_SMALL_FAX ) ) ); m_aFaxImg = Image( BitmapEx( PaResId( RID_BMP_SMALL_FAX ) ) );
m_aPdfImg = Image( BitmapEx( PaResId( RID_BMP_SMALL_PDF ) ) ); m_aPdfImg = Image( BitmapEx( PaResId( RID_BMP_SMALL_PDF ) ) );
} }
void PADialog::Init() void PADialog::Init()

4
padmin/source/padialog.hrc
View file

@ -190,13 +190,9 @@
#define RID_TXT_FONT_REGULAR 1095 #define RID_TXT_FONT_REGULAR 1095
#define RID_BMP_SMALL_PRINTER 1096 #define RID_BMP_SMALL_PRINTER 1096
// free
#define RID_BMP_SMALL_FAX 1098 #define RID_BMP_SMALL_FAX 1098
// free
#define RID_BMP_SMALL_PDF 1100 #define RID_BMP_SMALL_PDF 1100
// free
#define RID_BMP_PRINTER 1102 #define RID_BMP_PRINTER 1102
// free
#define RID_AFMERROR_OK 1300 #define RID_AFMERROR_OK 1300
#define RID_AFMERROR_NO_FONT_NAME 1301 #define RID_AFMERROR_NO_FONT_NAME 1301

10
padmin/source/padialog.src
View file

@ -437,10 +437,12 @@ ModalDialog RID_FONTNAMEDIALOG
}; };
Text [ en-US ] = "Fonts"; Text [ en-US ] = "Fonts";
}; };
String RID_BXT_TESTPAGE String RID_BXT_TESTPAGE
{ {
Text [ en-US ] = "Test page"; Text [ en-US ] = "Test page";
}; };
String RID_BXT_ENVIRONMENT String RID_BXT_ENVIRONMENT
{ {
Text [ en-US ] = "Wrong environment"; Text [ en-US ] = "Wrong environment";
@ -480,34 +482,42 @@ String RID_AFMERROR_OK
{ {
Text [ en-US ] = "No error"; Text [ en-US ] = "No error";
}; };
String RID_AFMERROR_NO_FONT_NAME String RID_AFMERROR_NO_FONT_NAME
{ {
Text [ en-US ] = "The metric does not contain a 'FontName' entry."; Text [ en-US ] = "The metric does not contain a 'FontName' entry.";
}; };
String RID_AFMERROR_NO_FULL_NAME String RID_AFMERROR_NO_FULL_NAME
{ {
Text [ en-US ] = "The metric does not contain a 'FullName' entry."; Text [ en-US ] = "The metric does not contain a 'FullName' entry.";
}; };
String RID_AFMERROR_NO_FAMILY_NAME String RID_AFMERROR_NO_FAMILY_NAME
{ {
Text [ en-US ] = "The metric does not contain a 'FamilyName' entry."; Text [ en-US ] = "The metric does not contain a 'FamilyName' entry.";
}; };
String RID_AFMERROR_MOVETO_FAILED String RID_AFMERROR_MOVETO_FAILED
{ {
Text [ en-US ] = "The converted metric could not be written."; Text [ en-US ] = "The converted metric could not be written.";
}; };
String RID_AFMERROR_STREAM_READ_FAILED String RID_AFMERROR_STREAM_READ_FAILED
{ {
Text [ en-US ] = "The metric could not be read."; Text [ en-US ] = "The metric could not be read.";
}; };
String RID_AFMERROR_STREAM_WRITE_FAILED String RID_AFMERROR_STREAM_WRITE_FAILED
{ {
Text [ en-US ] = "A temporary file could not be created."; Text [ en-US ] = "A temporary file could not be created.";
}; };
STRING RID_AFMERROR_NOT_A_METRIC STRING RID_AFMERROR_NOT_A_METRIC
{ {
Text [ en-US ] = "The file does not contain a metric."; Text [ en-US ] = "The file does not contain a metric.";
}; };
String RID_AFMERROR_BOX_TXT String RID_AFMERROR_BOX_TXT
{ {
Text [ en-US ] = "The metric\n\n%s\n\ncould not be converted for the following reason:\n\n"; Text [ en-US ] = "The metric\n\n%s\n\ncould not be converted for the following reason:\n\n";

2
sot/source/base/exchange.cxx
View file

@ -210,7 +210,7 @@ namespace
/*136 SOT_FORMATSTR_ID_STARCALC_8_TEMPLATE*/ { MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_TEMPLATE_ASCII, "Calc 8 Template", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, /*136 SOT_FORMATSTR_ID_STARCALC_8_TEMPLATE*/ { MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_TEMPLATE_ASCII, "Calc 8 Template", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
/*137 SOT_FORMATSTR_ID_STARCHART_8_TEMPLATE*/ { MIMETYPE_OASIS_OPENDOCUMENT_CHART_TEMPLATE_ASCII, "Chart 8 Template", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, /*137 SOT_FORMATSTR_ID_STARCHART_8_TEMPLATE*/ { MIMETYPE_OASIS_OPENDOCUMENT_CHART_TEMPLATE_ASCII, "Chart 8 Template", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
/*138 SOT_FORMATSTR_ID_STARMATH_8_TEMPLATE*/ { MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_TEMPLATE_ASCII, "Math 8 Template", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, /*138 SOT_FORMATSTR_ID_STARMATH_8_TEMPLATE*/ { MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_TEMPLATE_ASCII, "Math 8 Template", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
/*139 SOT_FORMATSTR_ID_STARBASE_8*/ { MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII, "StarBase 8", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, /*139 SOT_FORMATSTR_ID_STARBASE_8*/ { MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII, "StarBase 8", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
/*140 SOT_FORMAT_GDIMETAFILE*/ { "application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"", "High Contrast GDIMetaFile", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, /*140 SOT_FORMAT_GDIMETAFILE*/ { "application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"", "High Contrast GDIMetaFile", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
}; };
return &aInstance[0]; return &aInstance[0];

28
svl/inc/cntwids.hrc
View file

@ -77,7 +77,6 @@
#define WID_TO (WID_CHAOS_START + 24) #define WID_TO (WID_CHAOS_START + 24)
#define WID_FROM (WID_CHAOS_START + 25) #define WID_FROM (WID_CHAOS_START + 25)
#define WID_TITLE (WID_CHAOS_START + 26) #define WID_TITLE (WID_CHAOS_START + 26)
#define WID_SUBJECT WID_TITLE // only here to prevent panic, should be removed
#define WID_MESSAGEBODY (WID_CHAOS_START + 27) #define WID_MESSAGEBODY (WID_CHAOS_START + 27)
#define WID_REFERENCES (WID_CHAOS_START + 28) #define WID_REFERENCES (WID_CHAOS_START + 28)
@ -137,8 +136,6 @@
//PROP FOLDER VIEW //PROP FOLDER VIEW
#define WID_DUMMY_PROPFOLDERVIEW1 (WID_CHAOS_START + 65) #define WID_DUMMY_PROPFOLDERVIEW1 (WID_CHAOS_START + 65)
#define WID_THREADING (WID_CHAOS_START + 66) #define WID_THREADING (WID_CHAOS_START + 66)
#define WID_MSG_COLUMN_INFO /* obsolete */ (WID_CHAOS_START + 67)
#define WID_FLD_COLUMN_INFO /* obsolete */ (WID_CHAOS_START + 68)
#define WID_FOLDERVIEW_MODE (WID_CHAOS_START + 69) #define WID_FOLDERVIEW_MODE (WID_CHAOS_START + 69)
#define WID_MESSAGEVIEW_MODE (WID_CHAOS_START + 70) #define WID_MESSAGEVIEW_MODE (WID_CHAOS_START + 70)
#define WID_SENTMESSAGEVIEW_MODE (WID_CHAOS_START + 71) #define WID_SENTMESSAGEVIEW_MODE (WID_CHAOS_START + 71)
@ -153,8 +150,6 @@
//PROP FOLDER DIR //PROP FOLDER DIR
#define WID_DUMMY_FOLDERDIR1 (WID_CHAOS_START + 79) #define WID_DUMMY_FOLDERDIR1 (WID_CHAOS_START + 79)
#define WID_TOTALCONTENTCOUNT (WID_CHAOS_START + 80) #define WID_TOTALCONTENTCOUNT (WID_CHAOS_START + 80)
#define WID_NEWSGROUPCOUNT /* ??? */ (WID_CHAOS_START + 81)
#define WID_ARTICLECOUNT /* ??? */ (WID_CHAOS_START + 82)
#define WID_KNOWN_RANGES (WID_CHAOS_START + 83) #define WID_KNOWN_RANGES (WID_CHAOS_START + 83)
#define WID_IMAPFOLDERINFO (WID_CHAOS_START + 84) #define WID_IMAPFOLDERINFO (WID_CHAOS_START + 84)
@ -176,23 +171,9 @@
#define WID_PASSWORD (WID_CHAOS_START + 92) #define WID_PASSWORD (WID_CHAOS_START + 92)
#define WID_SERVERNAME (WID_CHAOS_START + 93) #define WID_SERVERNAME (WID_CHAOS_START + 93)
#define WID_SERVERPORT (WID_CHAOS_START + 94) #define WID_SERVERPORT (WID_CHAOS_START + 94)
// obsolete
#define WID_MAILSEND_USERNAME (WID_CHAOS_START + 95)
#define WID_MAILSEND_PASSWORD (WID_CHAOS_START + 96)
#define WID_MAILSEND_SERVERNAME (WID_CHAOS_START + 97)
#define WID_NEWSSEND_USERNAME (WID_CHAOS_START + 98)
#define WID_NEWSSEND_PASSWORD (WID_CHAOS_START + 99)
#define WID_NEWSSEND_SERVERNAME (WID_CHAOS_START + 100)
// end obsolete
#define WID_SERVERBASE (WID_CHAOS_START + 101) #define WID_SERVERBASE (WID_CHAOS_START + 101)
// not used
#define WID_SMTP_GATEWAY (WID_CHAOS_START + 102)
// -> ..._DEFAULT // -> ..._DEFAULT
// obsolete
#define WID_FROM_DEFAULT (WID_CHAOS_START + 103)
// obsolete
#define WID_REPLY_TO_DEFAULT (WID_CHAOS_START + 104)
#define WID_AUTOUPDATE_INTERVAL (WID_CHAOS_START + 105) #define WID_AUTOUPDATE_INTERVAL (WID_CHAOS_START + 105)
#define WID_UPDATE_ENABLED (WID_CHAOS_START + 106) #define WID_UPDATE_ENABLED (WID_CHAOS_START + 106)
@ -243,13 +224,6 @@
#define WID_STORE_MSGS_TIMELIMIT (WID_CHAOS_START + 124) #define WID_STORE_MSGS_TIMELIMIT (WID_CHAOS_START + 124)
// PROP BOX // PROP BOX
#define WID_MSG_COLUMN_WIDTHS /* obsolete */(WID_CHAOS_START + 125)
#ifdef OLD_CHAOS
#define WID_CHAOS_END (WID_CHAOS_START + 125)
#else
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
// WID's added after SO 4.0 release ( SUPD > 364 ) // WID's added after SO 4.0 release ( SUPD > 364 )
@ -501,6 +475,4 @@
// END // END
#define WID_CHAOS_END (WID_CHAOS_START + 253) #define WID_CHAOS_END (WID_CHAOS_START + 253)
#endif /* OLD_CHAOS */
#endif /* !_CNTWIDS_HRC */ #endif /* !_CNTWIDS_HRC */

2
svtools/inc/contextmenuhelper.hxx
View file

@ -97,7 +97,7 @@ class SVT_DLLPUBLIC ContextMenuHelper
// methods to retrieve a single command URL dependent value from a // methods to retrieve a single command URL dependent value from a
// ui configuratin manager // ui configuratin manager
Image getImageFromCommandURL( const ::rtl::OUString& aCmdURL, bool bHiContrast ) const; Image getImageFromCommandURL( const ::rtl::OUString& aCmdURL ) const;
rtl::OUString getLabelFromCommandURL( const ::rtl::OUString& aCmdURL ) const; rtl::OUString getLabelFromCommandURL( const ::rtl::OUString& aCmdURL ) const;
// creates an association between current module/controller bound to the // creates an association between current module/controller bound to the

8
svtools/inc/imagemgr.hxx
View file

@ -75,10 +75,10 @@ private:
SVT_DLLPRIVATE static String GetDescription_Impl( const INetURLObject& rObject, sal_Bool bDetectFolder ); SVT_DLLPRIVATE static String GetDescription_Impl( const INetURLObject& rObject, sal_Bool bDetectFolder );
public: public:
SVT_DLLPUBLIC static Image GetImage( const INetURLObject& rURL, sal_Bool bBig ); SVT_DLLPUBLIC static Image GetImage( const INetURLObject& rURL, sal_Bool bBig = sal_False );
SVT_DLLPUBLIC static Image GetFileImage( const INetURLObject& rURL, sal_Bool bBig ); SVT_DLLPUBLIC static Image GetFileImage( const INetURLObject& rURL, sal_Bool bBig = sal_False );
SVT_DLLPUBLIC static Image GetImageNoDefault( const INetURLObject& rURL, sal_Bool bBig ); SVT_DLLPUBLIC static Image GetImageNoDefault( const INetURLObject& rURL, sal_Bool bBig = sal_False );
SVT_DLLPUBLIC static Image GetFolderImage( const svtools::VolumeInfo& rInfo, sal_Bool bBig ); SVT_DLLPUBLIC static Image GetFolderImage( const svtools::VolumeInfo& rInfo, sal_Bool bBig = sal_False );
SVT_DLLPUBLIC static String GetDescription( const INetURLObject& rObject ); SVT_DLLPUBLIC static String GetDescription( const INetURLObject& rObject );
SVT_DLLPUBLIC static String GetFileDescription( const INetURLObject& rObject ); SVT_DLLPUBLIC static String GetFileDescription( const INetURLObject& rObject );

20
svtools/inc/ivctrl.hxx
View file

@ -73,7 +73,6 @@ enum SvxIconChoiceCtrlPositionMode
class SvxIconChoiceCtrlEntry class SvxIconChoiceCtrlEntry
{ {
Image aImage; Image aImage;
Image aImageHC;
String aText; String aText;
String aQuickHelpText; String aQuickHelpText;
@ -123,16 +122,13 @@ class SvxIconChoiceCtrlEntry
public: public:
SvxIconChoiceCtrlEntry( USHORT nFlags = 0 ); SvxIconChoiceCtrlEntry( USHORT nFlags = 0 );
SvxIconChoiceCtrlEntry( const String& rText, const Image& rImage, USHORT nFlags = 0 ); SvxIconChoiceCtrlEntry( const String& rText, const Image& rImage, USHORT nFlags = 0 );
SvxIconChoiceCtrlEntry( const String& rText, const Image& rImage, const Image& rImageHC, USHORT nFlags = 0 );
~SvxIconChoiceCtrlEntry () {} ~SvxIconChoiceCtrlEntry () {}
void SetImage ( const Image& rImage ) { aImage = rImage; } void SetImage ( const Image& rImage ) { aImage = rImage; }
void SetImageHC ( const Image& rImage ) { aImageHC = rImage; }
Image GetImage () const { return aImage; } Image GetImage () const { return aImage; }
Image GetImageHC () const { return aImageHC; }
void SetText ( const String& rText ) { aText = rText; } void SetText ( const String& rText ) { aText = rText; }
String GetText () const { return aText; } String GetText () const { return aText; }
String SVT_DLLPUBLIC GetDisplayText() const; String SVT_DLLPUBLIC GetDisplayText() const;
void SetQuickHelpText( const String& rText ) { aQuickHelpText = rText; } void SetQuickHelpText( const String& rText ) { aQuickHelpText = rText; }
String GetQuickHelpText() const { return aQuickHelpText; } String GetQuickHelpText() const { return aQuickHelpText; }
void SetUserData ( void* _pUserData ) { pUserData = _pUserData; } void SetUserData ( void* _pUserData ) { pUserData = _pUserData; }
@ -303,14 +299,12 @@ public:
SvxIconChoiceCtrlEntry* InsertEntry( ULONG nPos = LIST_APPEND, SvxIconChoiceCtrlEntry* InsertEntry( ULONG nPos = LIST_APPEND,
const Point* pPos = 0, const Point* pPos = 0,
USHORT nFlags = 0 ); USHORT nFlags = 0 );
SvxIconChoiceCtrlEntry* InsertEntry( const String& rText, const Image& rImage, SvxIconChoiceCtrlEntry* InsertEntry( const String& rText,
ULONG nPos = LIST_APPEND, const Image& rImage,
const Point* pPos = 0, ULONG nPos = LIST_APPEND,
USHORT nFlags = 0 ); const Point* pPos = 0,
SvxIconChoiceCtrlEntry* InsertEntry( const String& rText, const Image& rImage, const Image& rImageHC, USHORT nFlags = 0
ULONG nPos = LIST_APPEND, );
const Point* pPos = 0,
USHORT nFlags = 0 );
/** creates automatic mnemonics for all icon texts in the control /** creates automatic mnemonics for all icon texts in the control
*/ */

3
svtools/inc/svtools/svtools.hrc
View file

@ -317,9 +317,6 @@
#define RID_SVTOOLS_IMAGELIST_BIG (RID_SVTOOLS_IMAGELIST_START + 1) #define RID_SVTOOLS_IMAGELIST_BIG (RID_SVTOOLS_IMAGELIST_START + 1)
#define RID_SVTOOLS_IMAGELIST_SMALL (RID_SVTOOLS_IMAGELIST_START + 2) #define RID_SVTOOLS_IMAGELIST_SMALL (RID_SVTOOLS_IMAGELIST_START + 2)
#define RID_SVTOOLS_IMAGELIST_EDITBROWSEBOX (RID_SVTOOLS_IMAGELIST_START + 3) #define RID_SVTOOLS_IMAGELIST_EDITBROWSEBOX (RID_SVTOOLS_IMAGELIST_START + 3)
/// free
/// free
/// free
#define RID_FILEPICKER_IMAGES (RID_SVTOOLS_IMAGELIST_START + 7) #define RID_FILEPICKER_IMAGES (RID_SVTOOLS_IMAGELIST_START + 7)
//............................................................................. //.............................................................................

1
svtools/inc/svtools/toolboxcontroller.hxx
View file

@ -157,7 +157,6 @@ class SVT_DLLPUBLIC ToolboxController : public ::com::sun::star::frame::XStatusL
void unbindListener(); void unbindListener();
sal_Bool isBound() const; sal_Bool isBound() const;
sal_Bool hasBigImages() const; sal_Bool hasBigImages() const;
sal_Bool isHighContrast() const;
::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > getURLTransformer() const; ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > getURLTransformer() const;
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > getParent() const; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > getParent() const;

2
svtools/source/brwbox/editbrowsebox.cxx
View file

@ -296,7 +296,7 @@ namespace svt
{ {
if ( !m_aStatusImages.GetImageCount() ) if ( !m_aStatusImages.GetImageCount() )
{ {
const_cast<EditBrowseBox*>(this)->m_aStatusImages = ImageList(SvtResId(RID_SVTOOLS_IMAGELIST_EDITBROWSEBOX)); const_cast<EditBrowseBox*>(this)->m_aStatusImages = ImageList( SvtResId( RID_SVTOOLS_IMAGELIST_EDITBROWSEBOX ) );
} }
Image aImage; Image aImage;

12
svtools/source/brwbox/editbrowsebox.src
View file

@ -42,9 +42,15 @@ ImageList RID_SVTOOLS_IMAGELIST_EDITBROWSEBOX
Blue = 0xFFFF; Blue = 0xFFFF;
}; };
IdList = { IdList = {
IMG_EBB_CURRENT; IMG_EBB_MODIFIED; IMG_EBB_CURRENT;
IMG_EBB_NEW;IMG_EBB_DELETED;IMG_EBB_CURRENTNEW; IMG_EBB_MODIFIED;
IMG_EBB_PRIMARYKEY; IMG_EBB_CURRENT_PRIMARYKEY; IMG_EBB_FILTER;IMG_EBB_HEADERFOOTER; IMG_EBB_NEW;
IMG_EBB_DELETED;
IMG_EBB_CURRENTNEW;
IMG_EBB_PRIMARYKEY;
IMG_EBB_CURRENT_PRIMARYKEY;
IMG_EBB_FILTER;
IMG_EBB_HEADERFOOTER;
}; };
IdCount = { 9; }; IdCount = { 9; };
}; };

13
svtools/source/config/colorcfg.cxx
View file

@ -478,17 +478,12 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry eEntry)
case SPELL : case SPELL :
case DRAWDRAWING : case DRAWDRAWING :
case SMARTTAGS : case SMARTTAGS :
{ aRet = aAutoColors[eEntry];
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); break;
aRet = rStyleSettings.GetHighContrastMode() ?
rStyleSettings.GetDialogTextColor().GetColor() : aAutoColors[eEntry];
}
break;
case DRAWFILL : case DRAWFILL :
aRet = /*rStyleSettings.GetHighContrastMode() ? aRet = aAutoColors[eEntry];
rStyleSettings.OutlineMode??? : */ aAutoColors[eEntry]; break;
break;
case FONTCOLOR : case FONTCOLOR :
aRet = Application::GetSettings().GetStyleSettings().GetWindowTextColor(); aRet = Application::GetSettings().GetStyleSettings().GetWindowTextColor();

41
svtools/source/contnr/ivctrl.cxx
View file

@ -46,20 +46,6 @@ SvxIconChoiceCtrlEntry::SvxIconChoiceCtrlEntry( const String& rText, const Image
{ {
aText = rText; aText = rText;
aImage = rImage; aImage = rImage;
aImageHC = rImage;
pUserData = NULL;
nFlags = _nFlags;
eTextMode = IcnShowTextShort;
pblink = 0;
pflink = 0;
}
SvxIconChoiceCtrlEntry::SvxIconChoiceCtrlEntry( const String& rText, const Image& rImage, const Image& rImageHC, USHORT _nFlags )
{
aText = rText;
aImage = rImage;
aImageHC = rImageHC;
pUserData = NULL; pUserData = NULL;
nFlags = _nFlags; nFlags = _nFlags;
@ -94,15 +80,6 @@ void SvxIconChoiceCtrlEntry::LockPos( BOOL bLock )
nFlags &= ~ICNVIEW_FLAG_POS_LOCKED; nFlags &= ~ICNVIEW_FLAG_POS_LOCKED;
} }
/*sal_Unicode SvxIconChoiceCtrlEntry::GetMnemonicChar() const
{
sal_Unicode cChar = 0;
xub_StrLen nPos = aText.Search( '~' );
if ( nPos != STRING_NOTFOUND && nPos < ( aText.Len() ) - 1 )
cChar = aText.GetChar( nPos + 1 );
return cChar;
}*/
String SvxIconChoiceCtrlEntry::GetDisplayText() const String SvxIconChoiceCtrlEntry::GetDisplayText() const
{ {
return MnemonicGenerator::EraseAllMnemonicChars( aText ); return MnemonicGenerator::EraseAllMnemonicChars( aText );
@ -177,43 +154,41 @@ SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::InsertEntry( const String& rText, con
return pEntry; return pEntry;
} }
SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::InsertEntry( const String& rText, const Image& rImage, const Image& rImageHC, ULONG nPos, const Point* pPos, USHORT nFlags )
{
SvxIconChoiceCtrlEntry* pEntry = new SvxIconChoiceCtrlEntry( rText, rImage, rImageHC, nFlags);
_pImp->InsertEntry( pEntry, nPos, pPos );
return pEntry;
}
BOOL SvtIconChoiceCtrl::EditedEntry( SvxIconChoiceCtrlEntry*, const XubString&, BOOL ) BOOL SvtIconChoiceCtrl::EditedEntry( SvxIconChoiceCtrlEntry*, const XubString&, BOOL )
{ {
return TRUE; return TRUE;
} }
BOOL SvtIconChoiceCtrl::EditingEntry( SvxIconChoiceCtrlEntry* ) BOOL SvtIconChoiceCtrl::EditingEntry( SvxIconChoiceCtrlEntry* )
{ {
return TRUE; return TRUE;
} }
void SvtIconChoiceCtrl::DrawEntryImage( SvxIconChoiceCtrlEntry* pEntry, const Point& rPos, OutputDevice& rDev ) void SvtIconChoiceCtrl::DrawEntryImage( SvxIconChoiceCtrlEntry* pEntry, const Point& rPos, OutputDevice& rDev )
{ {
rDev.DrawImage( rPos, GetSettings().GetStyleSettings().GetHighContrastMode() ? pEntry->GetImageHC() : pEntry->GetImage() ); rDev.DrawImage( rPos, pEntry->GetImage() );
} }
String SvtIconChoiceCtrl::GetEntryText( SvxIconChoiceCtrlEntry* pEntry, BOOL ) String SvtIconChoiceCtrl::GetEntryText( SvxIconChoiceCtrlEntry* pEntry, BOOL )
{ {
return pEntry->GetText(); return pEntry->GetText();
} }
BOOL SvtIconChoiceCtrl::HasBackground() const BOOL SvtIconChoiceCtrl::HasBackground() const
{ {
return FALSE; return FALSE;
} }
BOOL SvtIconChoiceCtrl::HasFont() const BOOL SvtIconChoiceCtrl::HasFont() const
{ {
return FALSE; return FALSE;
} }
BOOL SvtIconChoiceCtrl::HasFontTextColor() const BOOL SvtIconChoiceCtrl::HasFontTextColor() const
{ {
return TRUE; return TRUE;
} }
BOOL SvtIconChoiceCtrl::HasFontFillColor() const BOOL SvtIconChoiceCtrl::HasFontFillColor() const
{ {
return TRUE; return TRUE;

11
svtools/source/uno/contextmenuhelper.cxx
View file

@ -504,15 +504,11 @@ ContextMenuHelper::associateUIConfigurationManagers()
} }
Image Image
ContextMenuHelper::getImageFromCommandURL( ContextMenuHelper::getImageFromCommandURL( const ::rtl::OUString& aCmdURL ) const
const ::rtl::OUString& aCmdURL,
bool bHiContrast ) const
{ {
Image aImage; Image aImage;
sal_Int16 nImageType( ui::ImageType::COLOR_NORMAL| sal_Int16 nImageType( ui::ImageType::COLOR_NORMAL|
ui::ImageType::SIZE_DEFAULT ); ui::ImageType::SIZE_DEFAULT );
if ( bHiContrast )
nImageType |= ui::ImageType::COLOR_HIGHCONTRAST;
uno::Sequence< uno::Reference< graphic::XGraphic > > aGraphicSeq; uno::Sequence< uno::Reference< graphic::XGraphic > > aGraphicSeq;
uno::Sequence< ::rtl::OUString > aImageCmdSeq( 1 ); uno::Sequence< ::rtl::OUString > aImageCmdSeq( 1 );
@ -544,7 +540,7 @@ ContextMenuHelper::getImageFromCommandURL(
{ {
aGraphicSeq = m_xModuleImageMgr->getImages( nImageType, aImageCmdSeq ); aGraphicSeq = m_xModuleImageMgr->getImages( nImageType, aImageCmdSeq );
uno::Reference< ::com::sun::star::graphic::XGraphic > xGraphic = aGraphicSeq[0]; uno::Reference< ::com::sun::star::graphic::XGraphic > xGraphic = aGraphicSeq[0];
aImage = Image( xGraphic ); aImage = Image( xGraphic );
if ( !!aImage ) if ( !!aImage )
return aImage; return aImage;
@ -609,7 +605,6 @@ ContextMenuHelper::completeMenuProperties(
// menu correctly. // menu correctly.
const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
bool bShowMenuImages( rSettings.GetUseImagesInMenus() ); bool bShowMenuImages( rSettings.GetUseImagesInMenus() );
bool bIsHiContrast( rSettings.GetHighContrastMode() );
if ( pMenu ) if ( pMenu )
{ {
@ -639,7 +634,7 @@ ContextMenuHelper::completeMenuProperties(
{ {
Image aImage; Image aImage;
if ( aCmdURL.getLength() > 0 ) if ( aCmdURL.getLength() > 0 )
aImage = getImageFromCommandURL( aCmdURL, bIsHiContrast ); aImage = getImageFromCommandURL( aCmdURL );
pMenu->SetItemImage( nId, aImage ); pMenu->SetItemImage( nId, aImage );
} }
else else

16
svtools/source/uno/toolboxcontroller.cxx
View file

@ -673,22 +673,6 @@ sal_Bool ToolboxController::hasBigImages() const
return SvtMiscOptions().AreCurrentSymbolsLarge(); return SvtMiscOptions().AreCurrentSymbolsLarge();
} }
sal_Bool ToolboxController::isHighContrast() const
{
sal_Bool bHighContrast( sal_False );
Reference< XWindow > xWindow = m_pImpl->m_xParentWindow;
if ( xWindow.is() )
{
SolarMutexGuard aSolarMutexGuard;
Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
if ( pWindow )
bHighContrast = ( ((ToolBox *)pWindow)->GetSettings().GetStyleSettings().GetHighContrastMode() );
}
return bHighContrast;
}
void ToolboxController::updateStatus() void ToolboxController::updateStatus()
{ {
bindListener(); bindListener();

10
unotools/inc/unotools/lingucfg.hxx
View file

@ -228,11 +228,11 @@ public:
std::vector< SvtLinguConfigDictionaryEntry > GetActiveDictionariesByFormat( const rtl::OUString &rFormatName ); std::vector< SvtLinguConfigDictionaryEntry > GetActiveDictionariesByFormat( const rtl::OUString &rFormatName );
// functions returning file URLs to the respective images (if found) and empty string otherwise // functions returning file URLs to the respective images (if found) and empty string otherwise
::rtl::OUString GetSpellAndGrammarDialogImage( const ::rtl::OUString &rServiceImplName, bool bHighContrast = false ) const; ::rtl::OUString GetSpellAndGrammarDialogImage( const ::rtl::OUString &rServiceImplName ) const;
::rtl::OUString GetSpellAndGrammarContextSuggestionImage( const ::rtl::OUString &rServiceImplName, bool bHighContrast = false ) const; ::rtl::OUString GetSpellAndGrammarContextSuggestionImage( const ::rtl::OUString &rServiceImplName ) const;
::rtl::OUString GetSpellAndGrammarContextDictionaryImage( const ::rtl::OUString &rServiceImplName, bool bHighContrast = false ) const; ::rtl::OUString GetSpellAndGrammarContextDictionaryImage( const ::rtl::OUString &rServiceImplName ) const;
::rtl::OUString GetThesaurusDialogImage( const ::rtl::OUString &rServiceImplName, bool bHighContrast = false ) const; ::rtl::OUString GetThesaurusDialogImage( const ::rtl::OUString &rServiceImplName ) const;
::rtl::OUString GetSynonymsContextImage( const ::rtl::OUString &rServiceImplName, bool bHighContrast = false ) const; ::rtl::OUString GetSynonymsContextImage( const ::rtl::OUString &rServiceImplName ) const;
bool HasVendorImages( const char *pImageName ) const; bool HasVendorImages( const char *pImageName ) const;
bool HasGrammarChecker() const; bool HasGrammarChecker() const;

30
unotools/source/config/lingucfg.cxx
View file

@ -1364,13 +1364,13 @@ rtl::OUString SvtLinguConfig::GetVendorImageUrl_Impl(
rtl::OUString SvtLinguConfig::GetSpellAndGrammarDialogImage( rtl::OUString SvtLinguConfig::GetSpellAndGrammarDialogImage(
const rtl::OUString &rServiceImplName, const rtl::OUString &rServiceImplName
bool bHighContrast ) const ) const
{ {
rtl::OUString aRes; rtl::OUString aRes;
if (rServiceImplName.getLength() > 0) if (rServiceImplName.getLength() > 0)
{ {
rtl::OUString aImageName( A2OU( bHighContrast ? "SpellAndGrammarDialogImage_HC" : "SpellAndGrammarDialogImage" )); rtl::OUString aImageName( A2OU( "SpellAndGrammarDialogImage" ));
rtl::OUString aPath( GetVendorImageUrl_Impl( rServiceImplName, aImageName ) ); rtl::OUString aPath( GetVendorImageUrl_Impl( rServiceImplName, aImageName ) );
aRes = aPath; aRes = aPath;
} }
@ -1379,13 +1379,13 @@ rtl::OUString SvtLinguConfig::GetSpellAndGrammarDialogImage(
rtl::OUString SvtLinguConfig::GetSpellAndGrammarContextSuggestionImage( rtl::OUString SvtLinguConfig::GetSpellAndGrammarContextSuggestionImage(
const rtl::OUString &rServiceImplName, const rtl::OUString &rServiceImplName
bool bHighContrast ) const ) const
{ {
rtl::OUString aRes; rtl::OUString aRes;
if (rServiceImplName.getLength() > 0) if (rServiceImplName.getLength() > 0)
{ {
rtl::OUString aImageName( A2OU( bHighContrast ? "SpellAndGrammarContextMenuSuggestionImage_HC" : "SpellAndGrammarContextMenuSuggestionImage" )); rtl::OUString aImageName( A2OU( "SpellAndGrammarContextMenuSuggestionImage" ));
rtl::OUString aPath( GetVendorImageUrl_Impl( rServiceImplName, aImageName ) ); rtl::OUString aPath( GetVendorImageUrl_Impl( rServiceImplName, aImageName ) );
aRes = aPath; aRes = aPath;
} }
@ -1394,13 +1394,13 @@ rtl::OUString SvtLinguConfig::GetSpellAndGrammarContextSuggestionImage(
rtl::OUString SvtLinguConfig::GetSpellAndGrammarContextDictionaryImage( rtl::OUString SvtLinguConfig::GetSpellAndGrammarContextDictionaryImage(
const rtl::OUString &rServiceImplName, const rtl::OUString &rServiceImplName
bool bHighContrast ) const ) const
{ {
rtl::OUString aRes; rtl::OUString aRes;
if (rServiceImplName.getLength() > 0) if (rServiceImplName.getLength() > 0)
{ {
rtl::OUString aImageName( A2OU( bHighContrast ? "SpellAndGrammarContextMenuDictionaryImage_HC" : "SpellAndGrammarContextMenuDictionaryImage" )); rtl::OUString aImageName( A2OU( "SpellAndGrammarContextMenuDictionaryImage" ));
rtl::OUString aPath( GetVendorImageUrl_Impl( rServiceImplName, aImageName ) ); rtl::OUString aPath( GetVendorImageUrl_Impl( rServiceImplName, aImageName ) );
aRes = aPath; aRes = aPath;
} }
@ -1409,13 +1409,13 @@ rtl::OUString SvtLinguConfig::GetSpellAndGrammarContextDictionaryImage(
::rtl::OUString SvtLinguConfig::GetThesaurusDialogImage( ::rtl::OUString SvtLinguConfig::GetThesaurusDialogImage(
const ::rtl::OUString &rServiceImplName, const ::rtl::OUString &rServiceImplName
bool bHighContrast ) const ) const
{ {
rtl::OUString aRes; rtl::OUString aRes;
if (rServiceImplName.getLength() > 0) if (rServiceImplName.getLength() > 0)
{ {
rtl::OUString aImageName( A2OU( bHighContrast ? "ThesaurusDialogImage_HC" : "ThesaurusDialogImage" )); rtl::OUString aImageName( A2OU( "ThesaurusDialogImage" ));
rtl::OUString aPath( GetVendorImageUrl_Impl( rServiceImplName, aImageName ) ); rtl::OUString aPath( GetVendorImageUrl_Impl( rServiceImplName, aImageName ) );
aRes = aPath; aRes = aPath;
} }
@ -1424,13 +1424,13 @@ rtl::OUString SvtLinguConfig::GetSpellAndGrammarContextDictionaryImage(
::rtl::OUString SvtLinguConfig::GetSynonymsContextImage( ::rtl::OUString SvtLinguConfig::GetSynonymsContextImage(
const ::rtl::OUString &rServiceImplName, const ::rtl::OUString &rServiceImplName
bool bHighContrast ) const ) const
{ {
rtl::OUString aRes; rtl::OUString aRes;
if (rServiceImplName.getLength() > 0) if (rServiceImplName.getLength() > 0)
{ {
rtl::OUString aImageName( A2OU( bHighContrast ? "SynonymsContextMenuImage_HC" : "SynonymsContextMenuImage" )); rtl::OUString aImageName( A2OU( "SynonymsContextMenuImage" ));
rtl::OUString aPath( GetVendorImageUrl_Impl( rServiceImplName, aImageName ) ); rtl::OUString aPath( GetVendorImageUrl_Impl( rServiceImplName, aImageName ) );
aRes = aPath; aRes = aPath;
} }

1
vcl/inc/vcl/svids.hrc
View file

@ -54,7 +54,6 @@
#define SV_RESID_BITMAP_SCROLLMSK 1050 #define SV_RESID_BITMAP_SCROLLMSK 1050
#define SV_RESID_BITMAP_SCROLLBMP 1051 #define SV_RESID_BITMAP_SCROLLBMP 1051
#define SV_RESID_BITMAP_CLOSEDOC 1052 #define SV_RESID_BITMAP_CLOSEDOC 1052
#define SV_RESID_BITMAP_CLOSEDOCHC 1053
#define SV_DISCLOSURE_PLUS 1060 #define SV_DISCLOSURE_PLUS 1060
#define SV_DISCLOSURE_MINUS 1061 #define SV_DISCLOSURE_MINUS 1061

5
vcl/source/src/images.src
View file

@ -120,11 +120,6 @@ Bitmap SV_RESID_BITMAP_CLOSEDOC
File = "closedoc.bmp"; File = "closedoc.bmp";
}; };
Bitmap SV_RESID_BITMAP_CLOSEDOCHC
{
File = "closedochc.bmp";
};
Bitmap SV_RESID_BITMAP_SPLITHPIN Bitmap SV_RESID_BITMAP_SPLITHPIN
{ {
File = "splhpin.bmp"; File = "splhpin.bmp";

10
vcl/source/window/menu.cxx
View file

@ -562,7 +562,6 @@ public:
Size getMinSize(); Size getMinSize();
Image maImage; Image maImage;
Image maImageHC;
}; };
DecoToolBox::DecoToolBox( Window* pParent, WinBits nStyle ) : DecoToolBox::DecoToolBox( Window* pParent, WinBits nStyle ) :
@ -640,8 +639,7 @@ void DecoToolBox::SetImages( long nMaxHeight, bool bForce )
Color aEraseColor( 255, 255, 255, 255 ); Color aEraseColor( 255, 255, 255, 255 );
BitmapEx aBmpExDst( maImage.GetBitmapEx() ); BitmapEx aBmpExDst( maImage.GetBitmapEx() );
BitmapEx aBmpExSrc( GetSettings().GetStyleSettings().GetHighContrastMode() ? BitmapEx aBmpExSrc( aBmpExDst );
maImageHC.GetBitmapEx() : aBmpExDst );
aEraseColor.SetTransparency( 255 ); aEraseColor.SetTransparency( 255 );
aBmpExDst.Erase( aEraseColor ); aBmpExDst.Erase( aEraseColor );
@ -5165,18 +5163,14 @@ MenuBarWindow::MenuBarWindow( Window* pParent ) :
if( pResMgr ) if( pResMgr )
{ {
BitmapEx aBitmap( ResId( SV_RESID_BITMAP_CLOSEDOC, *pResMgr ) ); BitmapEx aBitmap( ResId( SV_RESID_BITMAP_CLOSEDOC, *pResMgr ) );
BitmapEx aBitmapHC( ResId( SV_RESID_BITMAP_CLOSEDOCHC, *pResMgr ) );
aCloser.maImage = Image( aBitmap ); aCloser.maImage = Image( aBitmap );
aCloser.maImageHC = Image( aBitmapHC );
aCloser.SetOutStyle( TOOLBOX_STYLE_FLAT ); aCloser.SetOutStyle( TOOLBOX_STYLE_FLAT );
aCloser.SetBackground(); aCloser.SetBackground();
aCloser.SetPaintTransparent( TRUE ); aCloser.SetPaintTransparent( TRUE );
aCloser.SetParentClipMode( PARENTCLIPMODE_NOCLIP ); aCloser.SetParentClipMode( PARENTCLIPMODE_NOCLIP );
aCloser.InsertItem( IID_DOCUMENTCLOSE, aCloser.InsertItem( IID_DOCUMENTCLOSE, aCloser.maImage, 0 );
GetSettings().GetStyleSettings().GetHighContrastMode() ? aCloser.maImageHC : aCloser.maImage, 0 );
aCloser.SetSelectHdl( LINK( this, MenuBarWindow, CloserHdl ) ); aCloser.SetSelectHdl( LINK( this, MenuBarWindow, CloserHdl ) );
aCloser.AddEventListener( LINK( this, MenuBarWindow, ToolboxEventHdl ) ); aCloser.AddEventListener( LINK( this, MenuBarWindow, ToolboxEventHdl ) );
aCloser.SetQuickHelpText( IID_DOCUMENTCLOSE, XubString( ResId( SV_HELPTEXT_CLOSEDOCUMENT, *pResMgr ) ) ); aCloser.SetQuickHelpText( IID_DOCUMENTCLOSE, XubString( ResId( SV_HELPTEXT_CLOSEDOCUMENT, *pResMgr ) ) );