summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--basctl/inc/basidesh.hrc1
-rw-r--r--basctl/source/basicide/basidesh.src5
-rw-r--r--basctl/source/basicide/bastype2.cxx8
-rw-r--r--basctl/source/basicide/moduldl2.cxx9
-rw-r--r--cui/source/customize/acccfg.hrc2
-rw-r--r--cui/source/customize/acccfg.src16
-rw-r--r--cui/source/customize/cfgutil.cxx30
-rw-r--r--cui/source/customize/selector.cxx24
-rw-r--r--cui/source/dialogs/hlmarkwn.cxx2
-rw-r--r--cui/source/dialogs/scriptdlg.cxx19
-rw-r--r--cui/source/dialogs/scriptdlg.hrc4
-rw-r--r--cui/source/dialogs/scriptdlg.src20
-rw-r--r--cui/source/inc/scriptdlg.hxx4
-rw-r--r--cui/source/options/optpath.cxx3
14 files changed, 21 insertions, 126 deletions
diff --git a/basctl/inc/basidesh.hrc b/basctl/inc/basidesh.hrc
index 8bf7d3316cd0..c35b785c607b 100644
--- a/basctl/inc/basidesh.hrc
+++ b/basctl/inc/basidesh.hrc
@@ -57,7 +57,6 @@
#define RID_POPUP_DLGED ( RID_BASICIDE_START + 62 )
#define RID_PRINTDLG_STRLIST ( RID_BASICIDE_START + 78 )
-#define RID_IMG_LOCKED_HC ( RID_BASICIDE_START + 6 )
#define RID_IMGBTN_REMOVEWATCH ( RID_BASICIDE_START + 8 )
#define RID_IMGBTN_GOTOCALL ( RID_BASICIDE_START + 9 )
#define RID_IMGLST_LAYOUT_HC ( RID_BASICIDE_START + 14 )
diff --git a/basctl/source/basicide/basidesh.src b/basctl/source/basicide/basidesh.src
index 556211f690af..9b0c38d16081 100644
--- a/basctl/source/basicide/basidesh.src
+++ b/basctl/source/basicide/basidesh.src
@@ -529,11 +529,6 @@ Image RID_IMG_LOCKED
ImageBitmap = Bitmap { File = "locked.bmp" ; };
MASKCOLOR
};
-Image RID_IMG_LOCKED_HC
-{
- ImageBitmap = Bitmap { File = "locked_h.bmp" ; };
- MASKCOLOR
-};
Image RID_IMG_INSTALLATION
{
ImageBitmap = Bitmap { File = "harddisk_16.png"; };
diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index 05c965f6e035..2299e1a720ad 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -718,17 +718,13 @@ SvLBoxEntry* BasicTreeListBox::AddEntry(
SvLBoxEntry* p = InsertEntry(
rText, rImage, rImage, pParent, bChildrenOnDemand, LIST_APPEND,
aUserData.release() ); // XXX possible leak
- SetExpandedEntryBmp( p, rImageHC, BMP_COLOR_HIGHCONTRAST );
- SetCollapsedEntryBmp( p, rImageHC, BMP_COLOR_HIGHCONTRAST );
return p;
}
void BasicTreeListBox::SetEntryBitmaps( SvLBoxEntry * pEntry, const Image& rImage, const Image& rImageHC )
{
- SetExpandedEntryBmp( pEntry, rImage, BMP_COLOR_NORMAL );
- SetCollapsedEntryBmp( pEntry, rImage, BMP_COLOR_NORMAL );
- SetExpandedEntryBmp( pEntry, rImageHC, BMP_COLOR_HIGHCONTRAST );
- SetCollapsedEntryBmp( pEntry, rImageHC, BMP_COLOR_HIGHCONTRAST );
+ SetExpandedEntryBmp( pEntry, rImage );
+ SetCollapsedEntryBmp( pEntry, rImage );
}
LibraryType BasicTreeListBox::GetLibraryType() const
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index b66d6b3510d9..b9445dc1f675 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -1582,13 +1582,8 @@ SvLBoxEntry* LibPage::ImpInsertLibEntry( const String& rLibName, ULONG nPos )
if (bProtected)
{
Image aImage(IDEResId(RID_IMG_LOCKED));
- aLibBox.SetExpandedEntryBmp(pNewEntry, aImage, BMP_COLOR_NORMAL);
- aLibBox.SetCollapsedEntryBmp(pNewEntry, aImage, BMP_COLOR_NORMAL);
- aImage = Image(IDEResId(RID_IMG_LOCKED_HC));
- aLibBox.SetExpandedEntryBmp(pNewEntry, aImage,
- BMP_COLOR_HIGHCONTRAST);
- aLibBox.SetCollapsedEntryBmp(pNewEntry, aImage,
- BMP_COLOR_HIGHCONTRAST);
+ aLibBox.SetExpandedEntryBmp(pNewEntry, aImage);
+ aLibBox.SetCollapsedEntryBmp(pNewEntry, aImage);
}
// check, if library is link
diff --git a/cui/source/customize/acccfg.hrc b/cui/source/customize/acccfg.hrc
index be0771b83fc8..99dc56bfb683 100644
--- a/cui/source/customize/acccfg.hrc
+++ b/cui/source/customize/acccfg.hrc
@@ -66,8 +66,6 @@
#define STR_BASICNAME 62
#define BMP_COLLAPSED 63
#define BMP_EXPANDED 64
-#define BMP_COLLAPSED_HC 65
-#define BMP_EXPANDED_HC 66
#define STR_BASICMACROS 67
#define STR_DLG_MACROS 68
#define STR_HUMAN_APPNAME 69
diff --git a/cui/source/customize/acccfg.src b/cui/source/customize/acccfg.src
index bf2c2ae7485a..659f3f928d98 100644
--- a/cui/source/customize/acccfg.src
+++ b/cui/source/customize/acccfg.src
@@ -278,7 +278,6 @@ Resource RID_SVXPAGE_CONFIGGROUPBOX
{
File = "plus.bmp" ;
};
- // MaskColor = Color { Predefine = COL_GREEN ; };
};
Image BMP_EXPANDED
{
@@ -286,21 +285,6 @@ Resource RID_SVXPAGE_CONFIGGROUPBOX
{
File = "minus.bmp" ;
};
- // MaskColor = Color { Predefine = COL_GREEN ; };
- };
- Image BMP_EXPANDED_HC
- {
- ImageBitmap = Bitmap
- {
- File = "minus_h.bmp" ;
- };
- };
- Image BMP_COLLAPSED_HC
- {
- ImageBitmap = Bitmap
- {
- File = "plus_h.bmp" ;
- };
};
};
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 392f419c6387..f56dc424f3b9 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -463,9 +463,7 @@ struct SvxConfigGroupBoxResource_Impl : public Resource
String m_aStrGroupStyles;
String m_aScriptType;
Image m_collapsedImage;
- Image m_collapsedImage_hc;
Image m_expandedImage;
- Image m_expandedImage_hc;
SvxConfigGroupBoxResource_Impl();
};
@@ -488,9 +486,7 @@ SvxConfigGroupBoxResource_Impl::SvxConfigGroupBoxResource_Impl() :
m_aStrGroupStyles(String(CUI_RES(STR_GROUP_STYLES))),
m_aScriptType(String(CUI_RES(STR_BASICNAME))),
m_collapsedImage(CUI_RES(BMP_COLLAPSED)),
- m_collapsedImage_hc(CUI_RES(BMP_COLLAPSED_HC)),
- m_expandedImage(CUI_RES(BMP_EXPANDED)),
- m_expandedImage_hc(CUI_RES(BMP_EXPANDED_HC))
+ m_expandedImage(CUI_RES(BMP_EXPANDED))
{
FreeResource();
}
@@ -501,8 +497,7 @@ SfxConfigGroupListBox_Impl::SfxConfigGroupListBox_Impl(
, pImp(new SvxConfigGroupBoxResource_Impl()), pFunctionListBox(0), nMode( nConfigMode ), bShowSF( FALSE ), bShowBasic( TRUE ), pStylesInfo(0)
{
SetWindowBits( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_HASBUTTONS | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONSATROOT );
- SetNodeBitmaps( pImp->m_collapsedImage, pImp->m_expandedImage, BMP_COLOR_NORMAL );
- SetNodeBitmaps( pImp->m_collapsedImage_hc, pImp->m_expandedImage_hc, BMP_COLOR_HIGHCONTRAST );
+ SetNodeBitmaps( pImp->m_collapsedImage, pImp->m_expandedImage );
// Check configuration to see whether only Basic macros,
// only Scripting Framework scripts, or both should be listed
@@ -929,11 +924,8 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
Image aImage = GetImage( theChild, xCtx, bIsRootNode,BMP_COLOR_NORMAL );
SvLBoxEntry* pNewEntry =
InsertEntry( uiName, NULL);
- SetExpandedEntryBmp(pNewEntry, aImage, BMP_COLOR_NORMAL);
- SetCollapsedEntryBmp(pNewEntry, aImage, BMP_COLOR_NORMAL);
- aImage = GetImage( theChild, xCtx, bIsRootNode,BMP_COLOR_HIGHCONTRAST );
- SetExpandedEntryBmp(pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST);
- SetCollapsedEntryBmp(pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST);
+ SetExpandedEntryBmp( pNewEntry, aImage );
+ SetCollapsedEntryBmp( pNewEntry, aImage );
pNewEntry->SetUserData( pInfo );
aArr.Insert( pInfo, aArr.Count() );
@@ -1275,11 +1267,8 @@ void SfxConfigGroupListBox_Impl::GroupSelected()
Image aImage = GetImage( children[n], Reference< XComponentContext >(), sal_False, BMP_COLOR_NORMAL );
SvLBoxEntry* pNewEntry =
pFunctionListBox->InsertEntry( children[n]->getName(), NULL );
- pFunctionListBox->SetExpandedEntryBmp(pNewEntry, aImage, BMP_COLOR_NORMAL);
- pFunctionListBox->SetCollapsedEntryBmp(pNewEntry, aImage, BMP_COLOR_NORMAL);
- aImage = GetImage( children[n], Reference< XComponentContext >(), sal_False, BMP_COLOR_HIGHCONTRAST );
- pFunctionListBox->SetExpandedEntryBmp(pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST);
- pFunctionListBox->SetCollapsedEntryBmp(pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST);
+ pFunctionListBox->SetExpandedEntryBmp( pNewEntry, aImage );
+ pFunctionListBox->SetCollapsedEntryBmp(pNewEntry, aImage );
pGrpInfo->sCommand = uri;
pGrpInfo->sLabel = children[n]->getName();
@@ -1499,11 +1488,8 @@ void SfxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry )
Image aImage = GetImage( theChild, Reference< XComponentContext >(), sal_False, BMP_COLOR_NORMAL );
SvLBoxEntry* pNewEntry =
InsertEntry( theChild->getName(), pEntry );
- SetExpandedEntryBmp(pNewEntry, aImage, BMP_COLOR_NORMAL);
- SetCollapsedEntryBmp(pNewEntry, aImage, BMP_COLOR_NORMAL);
- aImage = GetImage( theChild, Reference< XComponentContext >(), sal_False, BMP_COLOR_HIGHCONTRAST );
- SetExpandedEntryBmp(pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST);
- SetCollapsedEntryBmp(pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST);
+ SetExpandedEntryBmp( pNewEntry, aImage );
+ SetCollapsedEntryBmp(pNewEntry, aImage );
pNewEntry->SetUserData( pGrpInfo );
aArr.Insert( pGrpInfo, aArr.Count() );
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index cd44651dd8e1..7fd97e88168f 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -269,13 +269,8 @@ SvxConfigGroupListBox_Impl::SvxConfigGroupListBox_Impl(
SetNodeBitmaps(
aNavigatorImages.GetImage( RID_SVXIMG_COLLAPSEDNODE ),
- aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE ),
- BMP_COLOR_NORMAL );
-
- SetNodeBitmaps(
- aNavigatorImages.GetImage( RID_SVXIMG_COLLAPSEDNODE ),
- aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE ),
- BMP_COLOR_HIGHCONTRAST );
+ aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE )
+ );
}
@@ -420,12 +415,8 @@ void SvxConfigGroupListBox_Impl::fillScriptList( const Reference< browse::XBrows
::comphelper::ComponentContext aContext( ::comphelper::getProcessServiceFactory() );
Image aImage = GetImage( theChild, aContext.getUNOContext(), bIsRootNode, BMP_COLOR_NORMAL );
- SetExpandedEntryBmp( pNewEntry, aImage, BMP_COLOR_NORMAL );
- SetCollapsedEntryBmp( pNewEntry, aImage, BMP_COLOR_NORMAL );
-
- aImage = GetImage( theChild, aContext.getUNOContext(), bIsRootNode, BMP_COLOR_HIGHCONTRAST );
- SetExpandedEntryBmp( pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST );
- SetCollapsedEntryBmp( pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST );
+ SetExpandedEntryBmp( pNewEntry, aImage );
+ SetCollapsedEntryBmp( pNewEntry, aImage );
SvxGroupInfo_Impl* pInfo =
new SvxGroupInfo_Impl( SVX_CFGGROUP_SCRIPTCONTAINER, 0, theChild );
@@ -902,11 +893,8 @@ void SvxConfigGroupListBox_Impl::GroupSelected()
Image aImage = GetImage( children[n], Reference< XComponentContext >(), sal_False, BMP_COLOR_NORMAL );
SvLBoxEntry* pNewEntry =
pFunctionListBox->InsertEntry( children[n]->getName(), NULL );
- pFunctionListBox->SetExpandedEntryBmp(pNewEntry, aImage, BMP_COLOR_NORMAL);
- pFunctionListBox->SetCollapsedEntryBmp(pNewEntry, aImage, BMP_COLOR_NORMAL);
- aImage = GetImage( children[n], Reference< XComponentContext >(), sal_False, BMP_COLOR_HIGHCONTRAST );
- pFunctionListBox->SetExpandedEntryBmp(pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST);
- pFunctionListBox->SetCollapsedEntryBmp(pNewEntry, aImage, BMP_COLOR_HIGHCONTRAST);
+ pFunctionListBox->SetExpandedEntryBmp( pNewEntry, aImage );
+ pFunctionListBox->SetCollapsedEntryBmp(pNewEntry, aImage );
pNewEntry->SetUserData( _pGroupInfo );
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index 9755364c0531..f994095ab49c 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -386,8 +386,6 @@ int SvxHlinkDlgMarkWnd::FillTree( uno::Reference< container::XNameAccess > xLink
pParentEntry,
FALSE, LIST_APPEND,
(void*)pData );
- maLbTree.SetExpandedEntryBmp( pEntry, aBmp, BMP_COLOR_HIGHCONTRAST );
- maLbTree.SetCollapsedEntryBmp( pEntry, aBmp, BMP_COLOR_HIGHCONTRAST );
nEntries++;
}
else
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 2b05f258a6f0..bf62b0916860 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -87,13 +87,9 @@ void ShowErrorDialog( const Any& aException )
SFTreeListBox::SFTreeListBox( Window* pParent, const ResId& rResId ) :
SvTreeListBox( pParent, ResId( rResId.GetId(),*rResId.GetResMgr() ) ),
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_DOCUMENT,*rResId.GetResMgr())),
- m_docImage_hc(ResId(IMG_DOCUMENT_HC,*rResId.GetResMgr())),
m_sMyMacros(String(ResId(STR_MYMACROS,*rResId.GetResMgr()))),
m_sProdMacros(String(ResId(STR_PRODMACROS,*rResId.GetResMgr())))
{
@@ -395,14 +391,9 @@ SvLBoxEntry * SFTreeListBox::insertEntry(
Image aImage = SvFileInformationManager::GetFileImage(
INetURLObject(factoryURL), false,
BMP_COLOR_NORMAL );
- Image aHCImage = SvFileInformationManager::GetFileImage(
- INetURLObject(factoryURL), false,
- BMP_COLOR_HIGHCONTRAST );
p = InsertEntry(
rText, aImage, aImage, pParent, bChildrenOnDemand, LIST_APPEND,
aUserData.release()); // XXX possible leak
- SetExpandedEntryBmp(p, aHCImage, BMP_COLOR_HIGHCONTRAST);
- SetCollapsedEntryBmp(p, aHCImage, BMP_COLOR_HIGHCONTRAST);
}
else
{
@@ -415,33 +406,27 @@ SvLBoxEntry * SFTreeListBox::insertEntry(
String const & rText, USHORT nBitmap, SvLBoxEntry * pParent,
bool bChildrenOnDemand, std::auto_ptr< SFEntry > aUserData )
{
- Image aHCImage, aImage;
+ Image aImage;
if( nBitmap == IMG_HARDDISK )
{
aImage = m_hdImage;
- aHCImage = m_hdImage_hc;
}
else if( nBitmap == IMG_LIB )
{
aImage = m_libImage;
- aHCImage = m_libImage_hc;
}
else if( nBitmap == IMG_MACRO )
{
aImage = m_macImage;
- aHCImage = m_macImage_hc;
}
else if( nBitmap == IMG_DOCUMENT )
{
aImage = m_docImage;
- aHCImage = m_docImage_hc;
}
SvLBoxEntry * p = InsertEntry(
rText, aImage, aImage, pParent, bChildrenOnDemand, LIST_APPEND,
aUserData.release()); // XXX possible leak
- SetExpandedEntryBmp(p, aHCImage, BMP_COLOR_HIGHCONTRAST);
- SetCollapsedEntryBmp(p, aHCImage, BMP_COLOR_HIGHCONTRAST);
- return p;
+ return p;
}
void __EXPORT SFTreeListBox::RequestingChilds( SvLBoxEntry* pEntry )
diff --git a/cui/source/dialogs/scriptdlg.hrc b/cui/source/dialogs/scriptdlg.hrc
index 95ba3ddf38c2..5568b447ab96 100644
--- a/cui/source/dialogs/scriptdlg.hrc
+++ b/cui/source/dialogs/scriptdlg.hrc
@@ -43,13 +43,9 @@
#define SF_PB_HELP 9
#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_DOCUMENT 7
-#define IMG_DOCUMENT_HC 8
#define RID_IMGLST_OBJECTS ( RID_BASICIDE_START + 7 )
#define RID_IMGLST_OBJECTS_HC (RID_BASICIDE_START + 13)
diff --git a/cui/source/dialogs/scriptdlg.src b/cui/source/dialogs/scriptdlg.src
index 67a81376d662..5a551cede7ef 100644
--- a/cui/source/dialogs/scriptdlg.src
+++ b/cui/source/dialogs/scriptdlg.src
@@ -59,41 +59,21 @@ ModalDialog RID_DLG_SCRIPTORGANIZER
ImageBitmap = Bitmap { File = "harddisk_16.bmp" ; };
MASKCOLOR
};
- Image IMG_HARDDISK_HC
- {
- ImageBitmap = Bitmap { File = "harddisk_16_h.bmp" ; };
- MASKCOLOR
- };
Image IMG_LIB
{
ImageBitmap = Bitmap { File = "im30820.png"; };
MASKCOLOR
};
- Image IMG_LIB_HC
- {
- ImageBitmap = Bitmap { File = "imh30820.png"; };
- MASKCOLOR
- };
Image IMG_MACRO
{
ImageBitmap = Bitmap { File = "im30821.png"; };
MASKCOLOR
};
- Image IMG_MACRO_HC
- {
- ImageBitmap = Bitmap { File = "imh30821.png"; };
- MASKCOLOR
- };
Image IMG_DOCUMENT
{
ImageBitmap = Bitmap { File = "im30826.png"; };
MASKCOLOR
};
- Image IMG_DOCUMENT_HC
- {
- ImageBitmap = Bitmap { File = "imh30826.png"; };
- MASKCOLOR
- };
String STR_MYMACROS
{
Text [ en-US ] = "My Macros";
diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx
index 5489be6e5164..4182e4c729b0 100644
--- a/cui/source/inc/scriptdlg.hxx
+++ b/cui/source/inc/scriptdlg.hxx
@@ -72,13 +72,9 @@ class SFTreeListBox : public SvTreeListBox
private:
USHORT nMode;
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;
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 5a4f22495629..8cc0f2c20000 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -355,8 +355,7 @@ void SvxPathTabPage::Reset( const SfxItemSet& )
SvLBoxEntry* pEntry = pPathBox->InsertEntry( aStr );
if ( bReadOnly )
{
- pPathBox->SetCollapsedEntryBmp( pEntry, pImpl->m_aLockImage, BMP_COLOR_NORMAL );
- pPathBox->SetCollapsedEntryBmp( pEntry, pImpl->m_aLockImageHC, BMP_COLOR_HIGHCONTRAST );
+ pPathBox->SetCollapsedEntryBmp( pEntry, pImpl->m_aLockImage );
}
PathUserData_Impl* pPathImpl = new PathUserData_Impl(i);
pPathImpl->sUserPath = sUser;