summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--basctl/source/basicide/bastype2.cxx3
-rw-r--r--basctl/source/basicide/tbxctl.cxx3
-rw-r--r--cui/source/customize/acccfg.hrc4
-rw-r--r--cui/source/customize/cfgutil.cxx50
-rw-r--r--cui/source/customize/eventdlg.cxx2
-rw-r--r--cui/source/customize/macropg.cxx28
-rw-r--r--cui/source/customize/macropg.hrc2
-rw-r--r--cui/source/customize/macropg_impl.hxx2
-rw-r--r--cui/source/customize/selector.cxx44
-rw-r--r--cui/source/customize/selector.hrc4
-rw-r--r--cui/source/dialogs/cuihyperdlg.cxx13
-rw-r--r--cui/source/dialogs/scriptdlg.cxx3
-rw-r--r--cui/source/inc/cfgutil.hxx2
-rwxr-xr-xcui/source/inc/cuires.hrc6
-rw-r--r--cui/source/inc/labdlg.hxx1
-rw-r--r--cui/source/inc/selector.hxx6
-rw-r--r--cui/source/inc/treeopt.hxx1
-rw-r--r--cui/source/options/optjava.cxx6
-rw-r--r--cui/source/options/readonlyimage.src1
-rw-r--r--cui/source/options/treeopt.cxx10
-rw-r--r--cui/source/tabpages/labdlg.cxx9
21 files changed, 39 insertions, 161 deletions
diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index 55e17fec4b63..149e8244777e 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 3f3968524245..986bea442d50 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 99dc56bfb683..2460ec23d4c7 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 228a0ba9e9e6..7ffa643907af 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 37fc62cd8539..dc8a8a00b648 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 d106abfbde29..e02db7ee3e41 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 a7387e410432..b8ffa3694be2 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 0e527e5a7623..c6501e4b30a1 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 7fd97e88168f..28e21b7700b8 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 78929c8c9de5..388871f332e7 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 53b2d8f703c5..eb80960da935 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 bda5dfc8d95b..047d27a2ca90 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 b9bba8c16641..6fb87b38d1d3 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 7c27243c2d0f..27756e8c4db0 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 8dd89e64297a..e35a83144c82 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 5ea0be27a980..541b3f0db5e4 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 3e895ffca069..bcd2904449ad 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 3d905fc2c779..cb935722483e 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 3810f022fac9..6adcd4986ecd 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 8426b9074adb..25de5b817ce6 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 568a215a7499..e63ea5855ce4 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -126,9 +126,7 @@ SvxCaptionTabPage::SvxCaptionTabPage(Window* pParent, const SfxItemSet& rInAttrs
sal_uInt16 nBitmap;
for( nBitmap = 0; nBitmap < CAPTYPE_BITMAPS_COUNT; nBitmap++ )
- {
mpBmpCapTypes[nBitmap] = new Image(Bitmap(CUI_RES(BMP_CAPTTYPE_1 + nBitmap)), COL_LIGHTMAGENTA );
- }
//------------ValueSet installieren--------------------------
aCT_CAPTTYPE.SetStyle( aCT_CAPTTYPE.GetStyle() | WB_ITEMBORDER | WB_DOUBLEBORDER | WB_NAMEFIELD );
@@ -156,10 +154,7 @@ SvxCaptionTabPage::~SvxCaptionTabPage()
{
sal_uInt16 nBitmap;
for( nBitmap = 0; nBitmap < CAPTYPE_BITMAPS_COUNT; nBitmap++ )
- {
delete mpBmpCapTypes[nBitmap];
- delete mpBmpCapTypesH[nBitmap];
- }
}
// -----------------------------------------------------------------------
@@ -567,9 +562,7 @@ void SvxCaptionTabPage::DataChanged( const DataChangedEvent& rDCEvt )
void SvxCaptionTabPage::FillValueSet()
{
- bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-
- Image** ppBitmaps = bHighContrast ? mpBmpCapTypesH : mpBmpCapTypes;
+ Image** ppBitmaps = mpBmpCapTypes;
aCT_CAPTTYPE.SetItemImage(BMP_CAPTTYPE_1, *(ppBitmaps[0]) );
aCT_CAPTTYPE.SetItemImage(BMP_CAPTTYPE_2, *(ppBitmaps[1]) );
aCT_CAPTTYPE.SetItemImage(BMP_CAPTTYPE_3, *(ppBitmaps[2]) );
generated by cgit (git 2.34.1) at 2025-01-29 12:21:39 +0000