[Libreoffice-commits] .: 2 commits - basctl/source cui/source extensions/source xmlsecurity/inc xmlsecurity/source
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Nov 16 09:11:07 PST 2010
basctl/source/basicide/bastype2.cxx | 3 -
basctl/source/basicide/tbxctl.cxx | 3 -
cui/source/customize/acccfg.hrc | 4 -
cui/source/customize/cfgutil.cxx | 50 +++--------------
cui/source/customize/eventdlg.cxx | 2
cui/source/customize/macropg.cxx | 28 +--------
cui/source/customize/macropg.hrc | 2
cui/source/customize/macropg_impl.hxx | 2
cui/source/customize/selector.cxx | 44 +++-----------
cui/source/customize/selector.hrc | 4 -
cui/source/dialogs/cuihyperdlg.cxx | 13 +---
cui/source/dialogs/scriptdlg.cxx | 3 -
cui/source/inc/cfgutil.hxx | 2
cui/source/inc/cuires.hrc | 6 --
cui/source/inc/labdlg.hxx | 1
cui/source/inc/selector.hxx | 6 --
cui/source/inc/treeopt.hxx | 1
cui/source/options/optjava.cxx | 6 +-
cui/source/options/readonlyimage.src | 1
cui/source/options/treeopt.cxx | 10 ---
cui/source/tabpages/labdlg.cxx | 9 ---
extensions/source/dbpilots/commonpagesdbp.cxx | 5 -
extensions/source/dbpilots/commonpagesdbp.src | 13 ----
extensions/source/dbpilots/dbpresid.hrc | 2
extensions/source/propctrlr/formlocalid.hrc | 2
extensions/source/propctrlr/formresid.hrc | 1
extensions/source/propctrlr/pcrmiscres.src | 15 -----
extensions/source/propctrlr/taborder.cxx | 4 -
extensions/source/update/ui/updatecheckui.cxx | 15 +----
extensions/source/update/ui/updatecheckui.hrc | 2
extensions/source/update/ui/updatecheckui.src | 10 ---
xmlsecurity/inc/xmlsecurity/global.hrc | 1
xmlsecurity/source/dialogs/certificateviewer.cxx | 14 ----
xmlsecurity/source/dialogs/certificateviewer.src | 25 --------
xmlsecurity/source/dialogs/dialogs.hrc | 8 --
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 8 --
xmlsecurity/source/dialogs/digitalsignaturesdialog.src | 15 -----
xmlsecurity/source/dialogs/macrosecurity.cxx | 3 -
xmlsecurity/source/dialogs/macrosecurity.src | 9 ---
39 files changed, 48 insertions(+), 304 deletions(-)
New commits:
commit 9ccb10ffefe7bd52bc269a133929a1c75b9dd6c9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Nov 16 16:57:17 2010 +0000
get this to build again
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx
index 4ec5568..9c3c370 100644
--- a/extensions/source/dbpilots/commonpagesdbp.cxx
+++ b/extensions/source/dbpilots/commonpagesdbp.cxx
@@ -370,9 +370,8 @@ namespace dbp
{
::svt::OLocalResourceAccess aLocalResAccess( ModuleRes( RID_PAGE_TABLESELECTION ), RSC_TABPAGE );
- bool bIsHiContrast = m_aTable.GetSettings().GetStyleSettings().GetHighContrastMode();
- aTableImage = Image( ModuleRes( bIsHiContrast ? IMG_TABLE_HC : IMG_TABLE ) );
- aQueryImage = Image( ModuleRes( bIsHiContrast ? IMG_QUERY_HC : IMG_QUERY ) );
+ aTableImage = Image( ModuleRes( IMG_TABLE ) );
+ aQueryImage = Image( ModuleRes( IMG_QUERY ) );
}
lcl_fillEntries( m_aTable, aTableNames, aTableImage, CommandType::TABLE );
lcl_fillEntries( m_aTable, aQueryNames, aQueryImage, CommandType::QUERY );
diff --git a/extensions/source/dbpilots/commonpagesdbp.src b/extensions/source/dbpilots/commonpagesdbp.src
index 783bdb4..28bdf47 100644
--- a/extensions/source/dbpilots/commonpagesdbp.src
+++ b/extensions/source/dbpilots/commonpagesdbp.src
@@ -96,24 +96,11 @@ TabPage RID_PAGE_TABLESELECTION
MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
};
- Image IMG_TABLE_HC
- {
- ImageBitmap = Bitmap { File = "sxh03188.bmp"; };
- MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
- };
-
Image IMG_QUERY
{
ImageBitmap = Bitmap { File = "sx03202.bmp"; };
MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
};
-
- Image IMG_QUERY_HC
- {
- ImageBitmap = Bitmap { File = "sxh03202.bmp"; };
- MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
- };
-
};
TabPage RID_PAGE_OPTION_DBFIELD
diff --git a/extensions/source/dbpilots/dbpresid.hrc b/extensions/source/dbpilots/dbpresid.hrc
index 81f61d4..eea87bc 100644
--- a/extensions/source/dbpilots/dbpresid.hrc
+++ b/extensions/source/dbpilots/dbpresid.hrc
@@ -210,9 +210,7 @@
// Image
#define IMG_TABLE 1
-#define IMG_TABLE_HC 2
#define IMG_QUERY 3
-#define IMG_QUERY_HC 4
//========================================================================
// defines
diff --git a/extensions/source/propctrlr/formlocalid.hrc b/extensions/source/propctrlr/formlocalid.hrc
index 387a141..61c9f82 100644
--- a/extensions/source/propctrlr/formlocalid.hrc
+++ b/extensions/source/propctrlr/formlocalid.hrc
@@ -33,7 +33,5 @@
#define IMG_PLUS 1
#define IMG_MINUS 2
-#define IMG_PLUS_HC 3
-#define IMG_MINUS_HC 4
#endif // _EXTENSIONS_PROPCTRLR_FORMLOCALID_HRC_
diff --git a/extensions/source/propctrlr/formresid.hrc b/extensions/source/propctrlr/formresid.hrc
index e05a6bb..4024e2b 100644
--- a/extensions/source/propctrlr/formresid.hrc
+++ b/extensions/source/propctrlr/formresid.hrc
@@ -308,7 +308,6 @@
// - ImageLists
#define RID_IL_FORMEXPLORER ( RID_PROPCONTROLLER_START + 0 )
-#define RID_IL_FORMEXPLORER_HC ( RID_PROPCONTROLLER_START + 1 )
// -----------------------------------------------------------------------
// - untyped resources
diff --git a/extensions/source/propctrlr/pcrmiscres.src b/extensions/source/propctrlr/pcrmiscres.src
index f898cf4..25320c8 100644
--- a/extensions/source/propctrlr/pcrmiscres.src
+++ b/extensions/source/propctrlr/pcrmiscres.src
@@ -48,14 +48,6 @@ Resource RID_RSC_BUTTON_IMAGES
{
ImageBitmap = Bitmap{ file = "buttonminus.png"; };
};
- Image IMG_PLUS_HC
- {
- ImageBitmap = Bitmap{ file = "buttonplus_hc.png"; };
- };
- Image IMG_MINUS_HC
- {
- ImageBitmap = Bitmap{ file = "buttonminus_hc.png"; };
- };
};
#define IMAGE_IDS \
@@ -100,13 +92,6 @@ ImageList RID_IL_FORMEXPLORER
IMAGE_IDS;
};
-ImageList RID_IL_FORMEXPLORER_HC
-{
- Prefix = "sxh";
- MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; };
- IMAGE_IDS;
-};
-
String RID_STR_PROPTITLE_PUSHBUTTON
{
Text [ en-US ] = "Button" ;
diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx
index ae24730..62b2bfd 100644
--- a/extensions/source/propctrlr/taborder.cxx
+++ b/extensions/source/propctrlr/taborder.cxx
@@ -106,9 +106,7 @@ namespace pcr
aPB_OK.SetClickHdl( LINK( this, TabOrderDialog, OKClickHdl ) );
aPB_OK.Disable();
- sal_Bool bIsHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
- pImageList = new ImageList( PcrRes( bIsHighContrast ? RID_IL_FORMEXPLORER_HC : RID_IL_FORMEXPLORER ) );
-
+ pImageList = new ImageList( PcrRes( RID_IL_FORMEXPLORER ) );
if ( m_xModel.is() )
m_xTempModel = new OSimpleTabModel( m_xModel->getControlModels() );
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx
index fe784a7..d4a4640 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -311,17 +311,10 @@ Image UpdateCheckUI::GetMenuBarIcon( MenuBar* pMBar )
if ( pMBarWin )
nMBarHeight = pMBarWin->GetOutputSizePixel().getHeight();
- if ( Application::GetSettings().GetStyleSettings().GetHighContrastMode() ) {
- if ( nMBarHeight >= 35 )
- nResID = RID_UPDATE_AVAILABLE_26_HC;
- else
- nResID = RID_UPDATE_AVAILABLE_16_HC;
- } else {
- if ( nMBarHeight >= 35 )
- nResID = RID_UPDATE_AVAILABLE_26;
- else
- nResID = RID_UPDATE_AVAILABLE_16;
- }
+ if ( nMBarHeight >= 35 )
+ nResID = RID_UPDATE_AVAILABLE_26;
+ else
+ nResID = RID_UPDATE_AVAILABLE_16;
return Image( ResId( nResID, *mpUpdResMgr ) );
}
diff --git a/extensions/source/update/ui/updatecheckui.hrc b/extensions/source/update/ui/updatecheckui.hrc
index 3b451fa..47034b3 100644
--- a/extensions/source/update/ui/updatecheckui.hrc
+++ b/extensions/source/update/ui/updatecheckui.hrc
@@ -31,6 +31,4 @@
#define RID_UPDATE_AVAILABLE_16 RID_UPDATECHECKUI_START + 1
#define RID_UPDATE_AVAILABLE_26 RID_UPDATECHECKUI_START + 2
- #define RID_UPDATE_AVAILABLE_16_HC RID_UPDATECHECKUI_START + 3
- #define RID_UPDATE_AVAILABLE_26_HC RID_UPDATECHECKUI_START + 4
diff --git a/extensions/source/update/ui/updatecheckui.src b/extensions/source/update/ui/updatecheckui.src
index 813e3e1..1e3e113 100644
--- a/extensions/source/update/ui/updatecheckui.src
+++ b/extensions/source/update/ui/updatecheckui.src
@@ -39,13 +39,3 @@
ImageBitmap = Bitmap{ file = "onlineupdate_26.png"; };
STD_MASK_COLOR
};
- Image RID_UPDATE_AVAILABLE_16_HC
- {
- ImageBitmap = Bitmap{ file = "onlineupdate_16_h.png"; };
- STD_MASK_COLOR
- };
- Image RID_UPDATE_AVAILABLE_26_HC
- {
- ImageBitmap = Bitmap{ file = "onlineupdate_26_h.png"; };
- STD_MASK_COLOR
- };
diff --git a/xmlsecurity/inc/xmlsecurity/global.hrc b/xmlsecurity/inc/xmlsecurity/global.hrc
index 8761f71..addbbd1 100644
--- a/xmlsecurity/inc/xmlsecurity/global.hrc
+++ b/xmlsecurity/inc/xmlsecurity/global.hrc
@@ -42,7 +42,6 @@
#define RID_XMLSECTP_MACROWARN 1009
#define RID_XMLSECTP_READONLY_CONFIG_TIP 1010
#define RID_XMLSECTP_LOCK 1011
-#define RID_XMLSECTP_LOCK_HC 1012
#define RID_XMLSECWB_NO_MOZILLA_PROFILE 1013
#endif
diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx
index 2bbbf2d..c76ab4c 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.cxx
+++ b/xmlsecurity/source/dialogs/certificateviewer.cxx
@@ -120,24 +120,18 @@ CertificateViewerGeneralTP::CertificateViewerGeneralTP( Window* _pParent, Certif
,maKeyImg ( this, XMLSEC_RES( IMG_KEY ) )
,maHintCorrespPrivKeyFI ( this, XMLSEC_RES( FI_CORRPRIVKEY ) )
{
- if ( GetSettings().GetStyleSettings().GetHighContrastMode() )
- maKeyImg.SetImage( Image( XMLSEC_RES( IMG_KEY_HC ) ) );
-
//Verify the certificate
sal_Int32 certStatus = mpDlg->mxSecurityEnvironment->verifyCertificate(mpDlg->mxCert,
Sequence<Reference<css::security::XCertificate> >());
bool bCertValid = certStatus == css::security::CertificateValidity::VALID ? true : false;
- bool bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
if ( !bCertValid )
{
maCertImg.SetImage(
- Image( XMLSEC_RES( bHC ? IMG_STATE_NOT_VALIDATED_HC : IMG_STATE_NOT_VALIDATED ) ) );
+ Image( XMLSEC_RES( IMG_STATE_NOT_VALIDATED ) ) );
maHintNotTrustedFI.SetText( String( XMLSEC_RES( STR_CERTIFICATE_NOT_VALIDATED ) ) );
}
- else if ( bHC )
- maCertImg.SetImage( Image( XMLSEC_RES( IMG_STATE_CERIFICATED_HC ) ) );
FreeResource();
@@ -419,12 +413,6 @@ CertificateViewerCertPathTP::CertificateViewerCertPathTP( Window* _pParent, Cert
,msCertNotValidated ( XMLSEC_RES( STR_PATH_CERT_NOT_VALIDATED ) )
{
- if ( GetSettings().GetStyleSettings().GetHighContrastMode() )
- {
- maCertImage = Image( XMLSEC_RES( IMG_CERT_SMALL_HC ) );
- maCertNotValidatedImage = Image( XMLSEC_RES( IMG_CERT_NOTVALIDATED_SMALL_HC ) );
- }
-
FreeResource();
maCertPathLB.SetNodeDefaultImages();
diff --git a/xmlsecurity/source/dialogs/certificateviewer.src b/xmlsecurity/source/dialogs/certificateviewer.src
index 19f90de..d56c0a8 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.src
+++ b/xmlsecurity/source/dialogs/certificateviewer.src
@@ -174,21 +174,6 @@ TabPage RID_XMLSECTP_GENERAL
ImageBitmap = Bitmap { File = "notcertificate_40x56.png"; };
MaskColor = STD_MASKCOLOR;
};
- Image IMG_STATE_CERIFICATED_HC
- {
- ImageBitmap = Bitmap { File = "certificate_40x56_h.png"; };
- MaskColor = STD_MASKCOLOR;
- };
- Image IMG_STATE_NOT_VALIDATED_HC
- {
- ImageBitmap = Bitmap { File = "notcertificate_40x56_h.png"; };
- MaskColor = STD_MASKCOLOR;
- };
- Image IMG_KEY_HC
- {
- ImageBitmap = Bitmap { File = "key_12_h.png"; };
- MaskColor = STD_MASKCOLOR;
- };
};
TabPage RID_XMLSECTP_DETAILS
@@ -321,21 +306,11 @@ TabPage RID_XMLSECTP_CERTPATH
ImageBitmap = Bitmap { File = "certificate_16.png"; };
MaskColor = STD_MASKCOLOR;
};
- Image IMG_CERT_SMALL_HC
- {
- ImageBitmap = Bitmap { File = "certificate_16_h.png"; };
- MaskColor = STD_MASKCOLOR;
- };
Image IMG_CERT_NOTVALIDATED_SMALL
{
ImageBitmap = Bitmap { File = "notcertificate_16.png"; };
MaskColor = STD_MASKCOLOR;
};
- Image IMG_CERT_NOTVALIDATED_SMALL_HC
- {
- ImageBitmap = Bitmap { File = "notcertificate_16_h.png"; };
- MaskColor = STD_MASKCOLOR;
- };
String STR_PATH_CERT_OK
{
Text [ en-US ] = "The certificate is OK.";
diff --git a/xmlsecurity/source/dialogs/dialogs.hrc b/xmlsecurity/source/dialogs/dialogs.hrc
index eb6fd03..9ea22bf 100644
--- a/xmlsecurity/source/dialogs/dialogs.hrc
+++ b/xmlsecurity/source/dialogs/dialogs.hrc
@@ -82,9 +82,6 @@
#define FI_STATE_BROKEN 10
#define IMG_STATE_NOTVALIDATED 11
#define FI_STATE_NOTVALIDATED 12
-#define IMG_STATE_VALID_HC 13
-#define IMG_STATE_BROKEN_HC 14
-#define IMG_STATE_NOTVALIDATED_HC 15
#define FI_STATE_OLDSIGNATURE 16
//#define DS_WIDTH DLGS_WIDTH
@@ -175,9 +172,6 @@
#define FI_CORRPRIVKEY 14
#define STR_CERTIFICATE_NOT_VALIDATED 15
#define IMG_STATE_NOT_VALIDATED 16
-#define IMG_STATE_CERIFICATED_HC 17
-#define IMG_STATE_NOT_VALIDATED_HC 18
-#define IMG_KEY_HC 19
#define IMG1_WIDTH 33
#define IMG1_HEIGHT 22
@@ -237,9 +231,7 @@
#define FT_CERTSTATUS 2
#define ML_CERTSTATUS 3
#define IMG_CERT_SMALL 4
-#define IMG_CERT_SMALL_HC 5
#define IMG_CERT_NOTVALIDATED_SMALL 6
-#define IMG_CERT_NOTVALIDATED_SMALL_HC 7
#define STR_PATH_CERT_OK 8
#define STR_PATH_CERT_NOT_VALIDATED 9
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index f3d927f..dca6489 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -221,14 +221,6 @@ DigitalSignaturesDialog::DigitalSignaturesDialog(
maSigsNotvalidatedFI.SetText( String( XMLSEC_RES( STR_NO_INFO_TO_VERIFY ) ) );
- if ( GetSettings().GetStyleSettings().GetHighContrastMode() )
- {
- // high contrast mode needs other images
- maSigsValidImg.SetImage( Image( XMLSEC_RES( IMG_STATE_VALID_HC ) ) );
- maSigsInvalidImg.SetImage( Image( XMLSEC_RES( IMG_STATE_BROKEN_HC ) ) );
- maSigsNotvalidatedImg.SetImage( Image( XMLSEC_RES( IMG_STATE_NOTVALIDATED_HC ) ) );
- }
-
FreeResource();
mbVerifySignatures = true;
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.src b/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
index fcdc60b..c59ad5f 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
@@ -178,21 +178,6 @@ ModalDialog RID_XMLSECDLG_DIGSIG
Pos = MAP_APPFONT( 6, 171 );
Size = MAP_APPFONT( 50, 14 );
};
- Image IMG_STATE_VALID_HC
- {
- ImageBitmap = Bitmap { File = "signet_11x16_h.png"; };
- MaskColor = STD_MASKCOLOR;
- };
- Image IMG_STATE_BROKEN_HC
- {
- ImageBitmap = Bitmap { File = "caution_11x16_h.png"; };
- MaskColor = STD_MASKCOLOR;
- };
- Image IMG_STATE_NOTVALIDATED_HC
- {
- ImageBitmap = Bitmap { File = "notcertificate_16_h.png"; };
- MaskColor = STD_MASKCOLOR;
- };
};
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx
index 86cdc57..043e972 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.cxx
+++ b/xmlsecurity/source/dialogs/macrosecurity.cxx
@@ -423,8 +423,7 @@ void MacroSecurityTrustedSourcesTP::ClosePage( void )
ReadOnlyImage::ReadOnlyImage(Window* pParent, const ResId rResId) :
FixedImage(pParent, rResId)
{
- sal_Bool bHighContrast = pParent->GetSettings().GetStyleSettings().GetHighContrastMode();
- SetImage( Image(XMLSEC_RES( bHighContrast ? RID_XMLSECTP_LOCK_HC : RID_XMLSECTP_LOCK )));
+ SetImage( Image(XMLSEC_RES( RID_XMLSECTP_LOCK )));
}
ReadOnlyImage::~ReadOnlyImage()
diff --git a/xmlsecurity/source/dialogs/macrosecurity.src b/xmlsecurity/source/dialogs/macrosecurity.src
index 9e7411e..0833348 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.src
+++ b/xmlsecurity/source/dialogs/macrosecurity.src
@@ -229,12 +229,3 @@ Image RID_XMLSECTP_LOCK
};
MaskColor = Color { Red=0xffff; Green=0x0000; Blue=0xffff; };
};
-Image RID_XMLSECTP_LOCK_HC
-{
- ImageBitmap = Bitmap
- {
- File = "lock_hc.bmp";
- };
- MaskColor = Color { Red=0xffff; Green=0x0000; Blue=0xffff; };
-};
-
commit 4dc069c92fc7620aa172da099490eafeadf8673a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Nov 16 14:32:13 2010 +0000
get this building again
diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index 6b0a140..81ff61f 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -770,8 +770,7 @@ void BasicTreeListBox::GetRootEntryBitmaps( const ScriptDocument& rDocument, Ima
if ( sFactoryURL.getLength() )
{
rImage = SvFileInformationManager::GetFileImage( INetURLObject( sFactoryURL ),
- FALSE /* small */,
- FALSE /* normal */ );
+ FALSE /* small */ );
}
else
{
diff --git a/basctl/source/basicide/tbxctl.cxx b/basctl/source/basicide/tbxctl.cxx
index 97ae12f..bdea6b4 100644
--- a/basctl/source/basicide/tbxctl.cxx
+++ b/basctl/source/basicide/tbxctl.cxx
@@ -183,8 +183,7 @@ void TbxControls::StateChanged( USHORT nSID, SfxItemState eState,
aSlotURL += rtl::OUString::valueOf( sal_Int32( nTemp ));
Image aImage = GetImage( m_xFrame,
aSlotURL,
- hasBigImages(),
- GetToolBox().GetSettings().GetStyleSettings().GetHighContrastMode() );
+ hasBigImages() );
ToolBox& rBox = GetToolBox();
rBox.SetItemImage(GetId(), aImage);
nLastSlot = nLastEnum;
diff --git a/cui/source/customize/acccfg.hrc b/cui/source/customize/acccfg.hrc
index f1357b6..dc16a69 100644
--- a/cui/source/customize/acccfg.hrc
+++ b/cui/source/customize/acccfg.hrc
@@ -50,15 +50,11 @@
#define STR_SAVEACCELCONFIG 47
#define IMG_HARDDISK 48
-#define IMG_HARDDISK_HC 49
#define STR_PRODMACROS 50
#define STR_MYMACROS 51
#define IMG_LIB 52
-#define IMG_LIB_HC 53
#define IMG_MACRO 54
-#define IMG_MACRO_HC 55
#define IMG_DOC 56
-#define IMG_DOC_HC 57
#define STR_GROUP_STYLES 58
#define STR_PDF_EXPORT_SEND 59
#define STR_RECHECK_DOCUMENT 60
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 537c22b..fe5e821 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -448,13 +448,9 @@ void SfxConfigFunctionListBox_Impl::SetStylesInfo(SfxStylesInfo_Impl* pStyles)
struct SvxConfigGroupBoxResource_Impl : public Resource
{
Image m_hdImage;
- Image m_hdImage_hc;
Image m_libImage;
- Image m_libImage_hc;
Image m_macImage;
- Image m_macImage_hc;
Image m_docImage;
- Image m_docImage_hc;
::rtl::OUString m_sMyMacros;
::rtl::OUString m_sProdMacros;
String m_sMacros;
@@ -471,13 +467,9 @@ struct SvxConfigGroupBoxResource_Impl : public Resource
SvxConfigGroupBoxResource_Impl::SvxConfigGroupBoxResource_Impl() :
Resource(CUI_RES(RID_SVXPAGE_CONFIGGROUPBOX)),
m_hdImage(CUI_RES(IMG_HARDDISK)),
- m_hdImage_hc(CUI_RES(IMG_HARDDISK_HC)),
m_libImage(CUI_RES(IMG_LIB)),
- m_libImage_hc(CUI_RES(IMG_LIB_HC)),
m_macImage(CUI_RES(IMG_MACRO)),
- m_macImage_hc(CUI_RES(IMG_MACRO_HC)),
m_docImage(CUI_RES(IMG_DOC)),
- m_docImage_hc(CUI_RES(IMG_DOC_HC)),
m_sMyMacros(String(CUI_RES(STR_MYMACROS))),
m_sProdMacros(String(CUI_RES(STR_PRODMACROS))),
m_sMacros(String(CUI_RES(STR_BASICMACROS))),
@@ -919,7 +911,7 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
new SfxGroupInfo_Impl(SFX_CFGGROUP_SCRIPTCONTAINER,
0, static_cast<void *>( theChild.get()));
- Image aImage = GetImage( theChild, xCtx, bIsRootNode,BMP_COLOR_NORMAL );
+ Image aImage = GetImage( theChild, xCtx, bIsRootNode );
SvLBoxEntry* pNewEntry =
InsertEntry( uiName, NULL);
SetExpandedEntryBmp( pNewEntry, aImage );
@@ -967,7 +959,7 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
MakeVisible( GetEntry( 0,0 ) );
SetUpdateMode( TRUE );
}
-Image SfxConfigGroupListBox_Impl::GetImage( Reference< browse::XBrowseNode > node, Reference< XComponentContext > xCtx, bool bIsRootNode, bool bHighContrast )
+Image SfxConfigGroupListBox_Impl::GetImage( Reference< browse::XBrowseNode > node, Reference< XComponentContext > xCtx, bool bIsRootNode )
{
Image aImage;
if ( bIsRootNode )
@@ -976,10 +968,7 @@ Image SfxConfigGroupListBox_Impl::GetImage( Reference< browse::XBrowseNode > nod
::rtl::OUString share( RTL_CONSTASCII_USTRINGPARAM("share") );
if (node->getName().equals( user ) || node->getName().equals(share ) )
{
- if( bHighContrast == BMP_COLOR_NORMAL )
- aImage = pImp->m_hdImage;
- else
- aImage = pImp->m_hdImage_hc;
+ aImage = pImp->m_hdImage;
}
else
{
@@ -1024,40 +1013,21 @@ Image SfxConfigGroupListBox_Impl::GetImage( Reference< browse::XBrowseNode > nod
}
if( factoryURL.getLength() > 0 )
{
- if( bHighContrast == BMP_COLOR_NORMAL )
- aImage = SvFileInformationManager::GetFileImage(
- INetURLObject(factoryURL), false,
- BMP_COLOR_NORMAL );
- else
- aImage = SvFileInformationManager::GetFileImage(
- INetURLObject(factoryURL), false,
- BMP_COLOR_HIGHCONTRAST );
+ aImage = SvFileInformationManager::GetFileImage(
+ INetURLObject(factoryURL), false );
}
else
{
- if( bHighContrast == BMP_COLOR_NORMAL )
- aImage = pImp->m_docImage;
- else
- aImage = pImp->m_docImage_hc;
+ aImage = pImp->m_docImage;
}
}
}
else
{
if( node->getType() == browse::BrowseNodeTypes::SCRIPT )
- {
- if( bHighContrast == BMP_COLOR_NORMAL )
- aImage = pImp->m_macImage;
- else
- aImage = pImp->m_macImage_hc;
- }
+ aImage = pImp->m_macImage;
else
- {
- if( bHighContrast == BMP_COLOR_NORMAL )
- aImage = pImp->m_libImage;
- else
- aImage = pImp->m_libImage_hc;
- }
+ aImage = pImp->m_libImage;
}
return aImage;
}
@@ -1262,7 +1232,7 @@ void SfxConfigGroupListBox_Impl::GroupSelected()
new SfxGroupInfo_Impl(SFX_CFGFUNCTION_SCRIPT,
aInfo->GetSlotId(), aInfo);
- Image aImage = GetImage( children[n], Reference< XComponentContext >(), sal_False, BMP_COLOR_NORMAL );
+ Image aImage = GetImage( children[n], Reference< XComponentContext >(), sal_False );
SvLBoxEntry* pNewEntry =
pFunctionListBox->InsertEntry( children[n]->getName(), NULL );
pFunctionListBox->SetExpandedEntryBmp( pNewEntry, aImage );
@@ -1483,7 +1453,7 @@ void SfxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry )
new SfxGroupInfo_Impl(SFX_CFGGROUP_SCRIPTCONTAINER,
0, static_cast<void *>( theChild.get()));
- Image aImage = GetImage( theChild, Reference< XComponentContext >(), sal_False, BMP_COLOR_NORMAL );
+ Image aImage = GetImage( theChild, Reference< XComponentContext >(), sal_False );
SvLBoxEntry* pNewEntry =
InsertEntry( theChild->getName(), pEntry );
SetExpandedEntryBmp( pNewEntry, aImage );
diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx
index 12e2e18..dffb651 100644
--- a/cui/source/customize/eventdlg.cxx
+++ b/cui/source/customize/eventdlg.cxx
@@ -82,8 +82,6 @@ SvxEventConfigPage::SvxEventConfigPage( Window *pParent, const SfxItemSet& rSet,
mpImpl->pDeletePB = new PushButton( this, CUI_RES( PB_DELETE ));
mpImpl->pMacroImg = new Image( CUI_RES( IMG_MACRO) );
mpImpl->pComponentImg = new Image( CUI_RES( IMG_COMPONENT) );
- mpImpl->pMacroImg_h = new Image( CUI_RES( IMG_MACRO_H) );
- mpImpl->pComponentImg_h = new Image( CUI_RES( IMG_COMPONENT_H) );
FreeResource();
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 2a43f41..8e099a8 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -70,8 +70,6 @@ _SvxMacroTabPage_Impl::_SvxMacroTabPage_Impl( const SfxItemSet& rAttrSet ) :
pDeletePB( NULL ),
pMacroImg( NULL ),
pComponentImg( NULL ),
- pMacroImg_h( NULL ),
- pComponentImg_h( NULL ),
pStrEvent( NULL ),
pAssignedMacro( NULL ),
pEventLB( NULL ),
@@ -91,8 +89,6 @@ _SvxMacroTabPage_Impl::~_SvxMacroTabPage_Impl()
delete pDeletePB;
delete pMacroImg;
delete pComponentImg;
- delete pMacroImg_h;
- delete pComponentImg_h;
delete pStrEvent;
delete pAssignedMacro;
delete pEventLB;
@@ -449,25 +445,20 @@ class IconLBoxString : public SvLBoxString
{
Image* m_pMacroImg;
Image* m_pComponentImg;
- Image* m_pMacroImg_h;
- Image* m_pComponentImg_h;
int m_nxImageOffset;
public:
IconLBoxString( SvLBoxEntry* pEntry, USHORT nFlags, const String& sText,
- Image* pMacroImg, Image* pComponentImg,
- Image* pMacroImg_h, Image* pComponentImg_h );
+ Image* pMacroImg, Image* pComponentImg );
virtual void Paint(const Point& aPos, SvLBox& aDevice, USHORT nFlags, SvLBoxEntry* pEntry );
};
IconLBoxString::IconLBoxString( SvLBoxEntry* pEntry, USHORT nFlags, const String& sText,
- Image* pMacroImg, Image* pComponentImg, Image* pMacroImg_h, Image* pComponentImg_h )
+ Image* pMacroImg, Image* pComponentImg )
: SvLBoxString( pEntry, nFlags, sText )
, m_pMacroImg( pMacroImg )
, m_pComponentImg( pComponentImg )
- , m_pMacroImg_h( pMacroImg_h )
- , m_pComponentImg_h( pComponentImg_h )
{
m_nxImageOffset = 20;
}
@@ -483,12 +474,7 @@ void IconLBoxString::Paint( const Point& aPos, SvLBox& aDevice,
sal_Int32 nIndex = aURL.indexOf( aVndSunStarUNO );
bool bUNO = nIndex == 0;
- BOOL bHC = aDevice.GetSettings().GetStyleSettings().GetHighContrastMode();
- const Image* pImg;
- if( bHC )
- pImg = bUNO ? m_pComponentImg_h : m_pMacroImg_h;
- else
- pImg = bUNO ? m_pComponentImg : m_pMacroImg;
+ const Image* pImg = bUNO ? m_pComponentImg : m_pMacroImg;
aDevice.DrawImage( aPos, *pImg );
::rtl::OUString aPureMethod;
@@ -572,8 +558,7 @@ void _SvxMacroTabPage::DisplayAppEvents( bool appEvents)
_pE->SetUserData( (void*)pEventName );
String sNew( eventURL );
_pE->ReplaceItem( new IconLBoxString( _pE, 0, sNew,
- mpImpl->pMacroImg, mpImpl->pComponentImg,
- mpImpl->pMacroImg_h, mpImpl->pComponentImg_h ), LB_MACROS_ITEMPOS );
+ mpImpl->pMacroImg, mpImpl->pComponentImg ), LB_MACROS_ITEMPOS );
rListBox.GetModel()->InvalidateEntry( _pE );
rListBox.Select( _pE );
rListBox.MakeVisible( _pE );
@@ -722,8 +707,7 @@ long _SvxMacroTabPage::GenericHandler_Impl( _SvxMacroTabPage* pThis, PushButton*
// update the listbox entry
pImpl->pEventLB->SetUpdateMode( FALSE );
pE->ReplaceItem( new IconLBoxString( pE, 0, sEventURL,
- pImpl->pMacroImg, pImpl->pComponentImg,
- pImpl->pMacroImg_h, pImpl->pComponentImg_h ), LB_MACROS_ITEMPOS );
+ pImpl->pMacroImg, pImpl->pComponentImg ), LB_MACROS_ITEMPOS );
rListBox.GetModel()->InvalidateEntry( pE );
rListBox.Select( pE );
@@ -846,8 +830,6 @@ SvxMacroTabPage::SvxMacroTabPage( Window* pParent, const Reference< frame::XFram
mpImpl->pAssignComponentPB = new PushButton( this, CUI_RES( PB_ASSIGN_COMPONENT ) );
mpImpl->pMacroImg = new Image( CUI_RES(IMG_MACRO) );
mpImpl->pComponentImg = new Image( CUI_RES(IMG_COMPONENT) );
- mpImpl->pMacroImg_h = new Image( CUI_RES(IMG_MACRO_H) );
- mpImpl->pComponentImg_h = new Image( CUI_RES(IMG_COMPONENT_H) );
FreeResource();
diff --git a/cui/source/customize/macropg.hrc b/cui/source/customize/macropg.hrc
index dedb2db..f1245c0 100644
--- a/cui/source/customize/macropg.hrc
+++ b/cui/source/customize/macropg.hrc
@@ -43,8 +43,6 @@
// Starting new IDs with 30 as eventdlg.hrc also includes this file
#define IMG_MACRO 30
#define IMG_COMPONENT 31
-#define IMG_MACRO_H 32
-#define IMG_COMPONENT_H 33
#define RID_PB_OK 41
#define RID_PB_CANCEL 42
diff --git a/cui/source/customize/macropg_impl.hxx b/cui/source/customize/macropg_impl.hxx
index 3701d5f..b1ea61d 100644
--- a/cui/source/customize/macropg_impl.hxx
+++ b/cui/source/customize/macropg_impl.hxx
@@ -41,8 +41,6 @@ public:
PushButton* pDeletePB;
Image* pMacroImg;
Image* pComponentImg;
- Image* pMacroImg_h;
- Image* pComponentImg_h;
String* pStrEvent;
String* pAssignedMacro;
_HeaderTabListBox* pEventLB;
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index 6543ab2..338a49f 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -246,13 +246,9 @@ SvxConfigGroupListBox_Impl::SvxConfigGroupListBox_Impl(
: SvTreeListBox( pParent, rResId )
, m_bShowSlots( _bShowSlots ),
m_hdImage(ResId(IMG_HARDDISK,*rResId.GetResMgr())),
- m_hdImage_hc(ResId(IMG_HARDDISK_HC,*rResId.GetResMgr())),
m_libImage(ResId(IMG_LIB,*rResId.GetResMgr())),
- m_libImage_hc(ResId(IMG_LIB_HC,*rResId.GetResMgr())),
m_macImage(ResId(IMG_MACRO,*rResId.GetResMgr())),
- m_macImage_hc(ResId(IMG_MACRO_HC,*rResId.GetResMgr())),
m_docImage(ResId(IMG_DOC,*rResId.GetResMgr())),
- m_docImage_hc(ResId(IMG_DOC_HC,*rResId.GetResMgr())),
m_sMyMacros(String(ResId(STR_MYMACROS,*rResId.GetResMgr()))),
m_sProdMacros(String(ResId(STR_PRODMACROS,*rResId.GetResMgr())))
{
@@ -414,7 +410,7 @@ void SvxConfigGroupListBox_Impl::fillScriptList( const Reference< browse::XBrows
SvLBoxEntry* pNewEntry = InsertEntry( sUIName, _pParentEntry );
::comphelper::ComponentContext aContext( ::comphelper::getProcessServiceFactory() );
- Image aImage = GetImage( theChild, aContext.getUNOContext(), bIsRootNode, BMP_COLOR_NORMAL );
+ Image aImage = GetImage( theChild, aContext.getUNOContext(), bIsRootNode );
SetExpandedEntryBmp( pNewEntry, aImage );
SetCollapsedEntryBmp( pNewEntry, aImage );
@@ -621,17 +617,14 @@ void SvxConfigGroupListBox_Impl::Init()
SetUpdateMode( TRUE );
}
-Image SvxConfigGroupListBox_Impl::GetImage( Reference< browse::XBrowseNode > node, Reference< XComponentContext > xCtx, bool bIsRootNode, bool bHighContrast )
+Image SvxConfigGroupListBox_Impl::GetImage( Reference< browse::XBrowseNode > node, Reference< XComponentContext > xCtx, bool bIsRootNode )
{
Image aImage;
if ( bIsRootNode )
{
if ( node->getName().equalsAscii( "user" ) || node->getName().equalsAscii( "share" ) )
{
- if( bHighContrast == BMP_COLOR_NORMAL )
- aImage = m_hdImage;
- else
- aImage = m_hdImage_hc;
+ aImage = m_hdImage;
}
else
{
@@ -673,40 +666,21 @@ Image SvxConfigGroupListBox_Impl::GetImage( Reference< browse::XBrowseNode > nod
}
if( factoryURL.getLength() > 0 )
{
- if( bHighContrast == BMP_COLOR_NORMAL )
- aImage = SvFileInformationManager::GetFileImage(
- INetURLObject(factoryURL), false,
- BMP_COLOR_NORMAL );
- else
- aImage = SvFileInformationManager::GetFileImage(
- INetURLObject(factoryURL), false,
- BMP_COLOR_HIGHCONTRAST );
+ aImage = SvFileInformationManager::GetFileImage(
+ INetURLObject(factoryURL), false);
}
else
{
- if( bHighContrast == BMP_COLOR_NORMAL )
- aImage = m_docImage;
- else
- aImage = m_docImage_hc;
+ aImage = m_docImage;
}
}
}
else
{
if( node->getType() == browse::BrowseNodeTypes::SCRIPT )
- {
- if( bHighContrast == BMP_COLOR_NORMAL )
- aImage = m_macImage;
- else
- aImage = m_macImage_hc;
- }
+ aImage = m_macImage;
else
- {
- if( bHighContrast == BMP_COLOR_NORMAL )
- aImage = m_libImage;
- else
- aImage = m_libImage_hc;
- }
+ aImage = m_libImage;
}
return aImage;
}
@@ -890,7 +864,7 @@ void SvxConfigGroupListBox_Impl::GroupSelected()
new SvxGroupInfo_Impl(
SVX_CFGFUNCTION_SCRIPT, 123, uri, description );
- Image aImage = GetImage( children[n], Reference< XComponentContext >(), sal_False, BMP_COLOR_NORMAL );
+ Image aImage = GetImage( children[n], Reference< XComponentContext >(), sal_False );
SvLBoxEntry* pNewEntry =
pFunctionListBox->InsertEntry( children[n]->getName(), NULL );
pFunctionListBox->SetExpandedEntryBmp( pNewEntry, aImage );
diff --git a/cui/source/customize/selector.hrc b/cui/source/customize/selector.hrc
index cfa1ff2..cdb1225 100644
--- a/cui/source/customize/selector.hrc
+++ b/cui/source/customize/selector.hrc
@@ -36,13 +36,9 @@
#define GRP_SELECTOR_DESCRIPTION 9
#define TXT_SELECTOR_DESCRIPTION 10
#define IMG_HARDDISK 1
-#define IMG_HARDDISK_HC 2
#define IMG_LIB 3
-#define IMG_LIB_HC 4
#define IMG_MACRO 5
-#define IMG_MACRO_HC 6
#define IMG_DOC 7
-#define IMG_DOC_HC 8
#define STR_SELECTOR_ADD 310
#define STR_SELECTOR_CLOSE 311
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index e3c58e1..d308d60 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -112,29 +112,24 @@ SvxHpLinkDlg::SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings)
mbGrabFocus = sal_True;
// insert pages
Image aImage;
- Image aImageHC;
String aStrTitle;
SvxIconChoiceCtrlEntry* pEntry = NULL;
aStrTitle = CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLINETTP );
aImage = Image( CUI_RES ( RID_SVXBMP_HLINETTP ) );
- aImageHC = Image( CUI_RES ( RID_SVXBMP_HLINETTP_H ) );
- pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_INTERNET, aStrTitle, aImage, aImageHC, SvxHyperlinkInternetTp::Create );
+ pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_INTERNET, aStrTitle, aImage, SvxHyperlinkInternetTp::Create );
pEntry->SetQuickHelpText( CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLINETTP_HELP ) );
aStrTitle = CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLMAILTP );
aImage = Image( CUI_RES ( RID_SVXBMP_HLMAILTP ) );
- aImageHC = Image( CUI_RES ( RID_SVXBMP_HLMAILTP_H ) );
- pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_MAIL, aStrTitle, aImage, aImageHC, SvxHyperlinkMailTp::Create );
+ pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_MAIL, aStrTitle, aImage, SvxHyperlinkMailTp::Create );
pEntry->SetQuickHelpText( CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLMAILTP_HELP ) );
aStrTitle = CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCTP );
aImage = Image( CUI_RES ( RID_SVXBMP_HLDOCTP ) );
- aImageHC = Image( CUI_RES ( RID_SVXBMP_HLDOCTP_H ) );
- pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_DOCUMENT, aStrTitle, aImage, aImageHC, SvxHyperlinkDocTp::Create );
+ pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_DOCUMENT, aStrTitle, aImage, SvxHyperlinkDocTp::Create );
pEntry->SetQuickHelpText( CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCTP_HELP ) );
aStrTitle = CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCNTP );
aImage = Image( CUI_RES ( RID_SVXBMP_HLDOCNTP ) );
- aImageHC = Image( CUI_RES ( RID_SVXBMP_HLDOCNTP_H ) );
- pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_NEWDOCUMENT, aStrTitle, aImage, aImageHC, SvxHyperlinkNewDocTp::Create );
+ pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_NEWDOCUMENT, aStrTitle, aImage, SvxHyperlinkNewDocTp::Create );
pEntry->SetQuickHelpText( CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP ) );
// all tab pages set -> create mnemonics
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index bda5dfc..047d27a 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -388,8 +388,7 @@ SvLBoxEntry * SFTreeListBox::insertEntry(
if( nBitmap == IMG_DOCUMENT && factoryURL.getLength() > 0 )
{
Image aImage = SvFileInformationManager::GetFileImage(
- INetURLObject(factoryURL), false,
- BMP_COLOR_NORMAL );
+ INetURLObject(factoryURL), false );
p = InsertEntry(
rText, aImage, aImage, pParent, bChildrenOnDemand, LIST_APPEND,
aUserData.release()); // XXX possible leak
diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index 61f5415..150ad35 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -170,7 +170,7 @@ class SfxConfigGroupListBox_Impl : public SvTreeListBox
css::uno::Reference< css::container::XNameAccess > m_xModuleCategoryInfo;
css::uno::Reference< css::container::XNameAccess > m_xUICmdDescription;
- Image GetImage( ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > node, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xCtx, bool bIsRootNode, bool bHighContrast );
+ Image GetImage( ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > node, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xCtx, bool bIsRootNode );
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getDocumentModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, ::rtl::OUString& docName );
::rtl::OUString parseLocationName( const ::rtl::OUString& location );
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index bc62048..eb4a43f 100755
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -131,7 +131,6 @@
#define RID_OFADLG_OPTIONS_TREE_PAGES (RID_OFA_START + 116)
#define RID_OFADLG_OPTIONS_TREE (RID_OFA_START + 115)
#define RID_IMGLIST_TREEOPT (RID_OFA_START + 174)
-#define RID_IMGLIST_TREEOPT_HC (RID_OFA_START + 175)
#define RID_RIDER_SLL_SITE (RID_OFA_START + 100)//?
#define RID_RIDER_SLL_PERSONAL (RID_OFA_START + 101)//?
#define RID_OFADLG_OPTIONS_TREE_HINT (RID_OFA_START + 118)//?
@@ -178,7 +177,6 @@
#define RID_SVXSTR_PATH_NAME_START (RID_SVX_START + 1003)
#define RID_SVXDLG_FILTER_WARNING (RID_SVX_START + 248)
#define RID_SVXBMP_LOCK (RID_SVX_START + 118)
-#define RID_SVXBMP_LOCK_HC (RID_SVX_START + 119)
#define RID_SVXSTR_READONLY_CONFIG_TIP (RID_SVX_START + 1026)
#define RID_SVXQB_CHANGEDATA (RID_SVX_START + 214) //?
#define RID_SVXERR_OPT_DOUBLEPATHS (RID_SVX_START + 208) //?
@@ -217,10 +215,6 @@
// hyperlink dialog
#define RID_SVXDLG_NEWHYPERLINK (RID_SVX_START + 227)
-#define RID_SVXBMP_HLINETTP_H (RID_SVX_START + 272)
-#define RID_SVXBMP_HLMAILTP_H (RID_SVX_START + 273)
-#define RID_SVXBMP_HLDOCTP_H (RID_SVX_START + 274)
-#define RID_SVXBMP_HLDOCNTP_H (RID_SVX_START + 275)
#define RID_SVXBMP_HLINETTP (RID_SVX_START + 556)
#define RID_SVXBMP_HLMAILTP (RID_SVX_START + 557)
#define RID_SVXBMP_HLDOCTP (RID_SVX_START + 558)
diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx
index 22cdd4b..bf695ba 100644
--- a/cui/source/inc/labdlg.hxx
+++ b/cui/source/inc/labdlg.hxx
@@ -61,7 +61,6 @@ private:
CheckBox aCB_LAENGE;
Image* mpBmpCapTypes[CAPTYPE_BITMAPS_COUNT];
- Image* mpBmpCapTypesH[CAPTYPE_BITMAPS_COUNT];
String aStrHorzList;
String aStrVertList;
diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx
index fa1e6b8..df108d1 100644
--- a/cui/source/inc/selector.hxx
+++ b/cui/source/inc/selector.hxx
@@ -150,16 +150,12 @@ class SvxConfigGroupListBox_Impl : public SvTreeListBox
< ::com::sun::star::container::XNameAccess > m_xModuleCommands;
Image m_hdImage;
- Image m_hdImage_hc;
Image m_libImage;
- Image m_libImage_hc;
Image m_macImage;
- Image m_macImage_hc;
Image m_docImage;
- Image m_docImage_hc;
::rtl::OUString m_sMyMacros;
::rtl::OUString m_sProdMacros;
- Image GetImage( ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > node, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xCtx, bool bIsRootNode, bool bHighContrast );
+ Image GetImage( ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > node, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xCtx, bool bIsRootNode );
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getDocumentModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, ::rtl::OUString& docName );
private:
diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index c209457..3b0d834 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -188,7 +188,6 @@ private:
FixedImage aHelpImg;
ImageList aPageImages;
- ImageList aPageImagesHC;
ResStringArray aHelpTextsArr;
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index a59f888..293e6fe 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -993,7 +993,7 @@ IMPL_LINK( SvxJavaClassPathDlg, AddArchiveHdl_Impl, PushButton *, EMPTYARG )
String sFile = aURL.getFSysPath( INetURLObject::FSYS_DETECT );
if ( !IsPathDuplicate( sURL ) )
{
- USHORT nPos = m_aPathList.InsertEntry( sFile, SvFileInformationManager::GetImage( aURL ) );
+ USHORT nPos = m_aPathList.InsertEntry( sFile, SvFileInformationManager::GetImage( aURL, false ) );
m_aPathList.SelectEntryPos( nPos );
}
else
@@ -1031,7 +1031,7 @@ IMPL_LINK( SvxJavaClassPathDlg, AddPathHdl_Impl, PushButton *, EMPTYARG )
String sNewFolder = aURL.getFSysPath( INetURLObject::FSYS_DETECT );
if ( !IsPathDuplicate( sFolderURL ) )
{
- USHORT nPos = m_aPathList.InsertEntry( sNewFolder, SvFileInformationManager::GetImage( aURL ) );
+ USHORT nPos = m_aPathList.InsertEntry( sNewFolder, SvFileInformationManager::GetImage( aURL, false ) );
m_aPathList.SelectEntryPos( nPos );
}
else
@@ -1127,7 +1127,7 @@ void SvxJavaClassPathDlg::SetClassPath( const String& _rPath )
String sToken = _rPath.GetToken( 0, CLASSPATH_DELIMITER, nIdx );
INetURLObject aURL( sToken, INetURLObject::FSYS_DETECT );
String sPath = aURL.getFSysPath( INetURLObject::FSYS_DETECT );
- m_aPathList.InsertEntry( sPath, SvFileInformationManager::GetImage( aURL ) );
+ m_aPathList.InsertEntry( sPath, SvFileInformationManager::GetImage( aURL, false ) );
}
// select first entry
m_aPathList.SelectEntryPos(0);
diff --git a/cui/source/options/readonlyimage.src b/cui/source/options/readonlyimage.src
index a2cc82b..4a42c4d 100644
--- a/cui/source/options/readonlyimage.src
+++ b/cui/source/options/readonlyimage.src
@@ -39,4 +39,3 @@ Image RID_SVXBMP_LOCK
};
MaskColor = Color { Red=0xffff; Green=0x0000; Blue=0xffff; };
};
-
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 876bbdd..fa595c7 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -853,10 +853,6 @@ void OfaTreeOptionsDialog::InitTreeAndHandler()
aImgLstRes.SetRT( RSC_IMAGELIST );
if ( pIsoRes->IsAvailable( aImgLstRes ) )
aPageImages = ImageList( ResId( RID_IMGLIST_TREEOPT, *pIsoRes ) );
- ResId aImgLstHCRes( RID_IMGLIST_TREEOPT_HC, *pIsoRes );
- aImgLstHCRes.SetRT( RSC_IMAGELIST );
- if ( pIsoRes->IsAvailable( aImgLstHCRes ) )
- aPageImagesHC = ImageList( ResId( RID_IMGLIST_TREEOPT_HC, *pIsoRes ) );
delete pIsoRes;
aTreeLB.SetHelpId( HID_OFADLG_TREELISTBOX );
@@ -1032,8 +1028,7 @@ void OfaTreeOptionsDialog::DataChanged( const DataChangedEvent& rDCEvt )
!aTreeLB.GetParent(pEntry))
{
OptionsGroupInfo* pInfo = static_cast<OptionsGroupInfo*>(pEntry->GetUserData());
- bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
- ImageList* pImgLst = bHighContrast ? &aPageImagesHC : &aPageImages;
+ ImageList* pImgLst = &aPageImages;
for ( sal_uInt16 i = 0; i < aHelpTextsArr.Count(); ++i )
{
if ( aHelpTextsArr.GetValue(i) == pInfo->m_nDialogId )
@@ -1290,8 +1285,7 @@ IMPL_LINK( OfaTreeOptionsDialog, SelectHdl_Impl, Timer*, EMPTYARG )
OptionsGroupInfo* pTGInfo = (OptionsGroupInfo *)pEntry->GetUserData();
if ( pTGInfo->m_sPageURL.getLength() == 0 )
{
- bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
- ImageList* pImgLst = bHighContrast ? &aPageImagesHC : &aPageImages;
+ ImageList* pImgLst = &aPageImages;
//hier den Hilfetext anzeigen
for ( sal_uInt16 i = 0; i < aHelpTextsArr.Count(); ++i )
{
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index b9fcc8c..fa5a36d 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]) );
More information about the Libreoffice-commits
mailing list