[Libreoffice-commits] .: 4 commits - desktop/source framework/inc framework/source sfx2/inc sfx2/source svx/inc svx/source
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Nov 16 09:11:37 PST 2010
desktop/source/deployment/gui/dp_gui.hrc | 1
desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 7 -
desktop/source/deployment/gui/dp_gui_updatedialog.hxx | 3
desktop/source/deployment/gui/dp_gui_updatedialog.src | 5
framework/inc/classes/addonsoptions.hxx | 4
framework/inc/classes/menumanager.hxx | 3
framework/inc/helper/imageproducer.hxx | 6 -
framework/inc/uielement/controlmenucontroller.hxx | 3
framework/inc/uielement/menubarmanager.hxx | 1
framework/inc/uielement/newmenucontroller.hxx | 3
framework/inc/uielement/toolbarmanager.hxx | 3
framework/source/classes/addonsoptions.cxx | 65 ++----------
framework/source/classes/bmkmenu.cxx | 6 -
framework/source/classes/menumanager.cxx | 32 ++---
framework/source/helper/actiontriggerhelper.cxx | 5
framework/source/helper/imageproducer.cxx | 5
framework/source/uielement/addonstoolbarmanager.cxx | 16 +-
framework/source/uielement/controlmenucontroller.cxx | 6 -
framework/source/uielement/imagebuttontoolbarcontroller.cxx | 3
framework/source/uielement/menubarmanager.cxx | 24 +---
framework/source/uielement/newmenucontroller.cxx | 17 +--
framework/source/uielement/toolbarmanager.cxx | 39 +------
framework/source/uielement/toolbarsmenucontroller.cxx | 2
sfx2/inc/imagemgr.hxx | 2
sfx2/inc/sfx2/mnuitem.hxx | 1
sfx2/inc/sfx2/tbxctrl.hxx | 2
sfx2/source/appl/imagemgr.cxx | 6 -
sfx2/source/appl/newhelp.cxx | 4
sfx2/source/dialog/taskpane.cxx | 3
sfx2/source/doc/docvor.cxx | 2
sfx2/source/inc/virtmenu.hxx | 1
sfx2/source/menu/mnuitem.cxx | 8 -
sfx2/source/menu/virtmenu.cxx | 45 ++------
sfx2/source/toolbox/tbxitem.cxx | 13 --
svx/inc/svx/checklbx.hxx | 3
svx/source/customshapes/tbxcustomshapes.cxx | 4
svx/source/dialog/checklbx.cxx | 6 -
svx/source/dialog/docrecovery.cxx | 3
svx/source/form/tbxform.cxx | 3
svx/source/inc/docrecovery.hxx | 3
svx/source/inc/fmexpl.hxx | 2
svx/source/tbxctrls/tbxalign.cxx | 4
42 files changed, 111 insertions(+), 263 deletions(-)
New commits:
commit e80018f8fce130bc7ba6c9bef6b9f927c857afe2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Nov 16 17:00:33 2010 +0000
fix this to build again
diff --git a/desktop/source/deployment/gui/dp_gui.hrc b/desktop/source/deployment/gui/dp_gui.hrc
index 77b3fa0..6ec1100 100755
--- a/desktop/source/deployment/gui/dp_gui.hrc
+++ b/desktop/source/deployment/gui/dp_gui.hrc
@@ -107,7 +107,6 @@
#define RID_DLG_UPDATE_OK 10
#define RID_DLG_UPDATE_CANCEL 11
#define RID_DLG_UPDATE_NORMALALERT 12
-#define RID_DLG_UPDATE_HIGHCONTRASTALERT 13
#define RID_DLG_UPDATE_ERROR 14
#define RID_DLG_UPDATE_NONE 15
#define RID_DLG_UPDATE_NOINSTALLABLE 16
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index 91f1aff..c3ac936 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -565,8 +565,7 @@ UpdateDialog::UpdateDialog(
m_update(this, DpGuiResId(RID_DLG_UPDATE_UPDATE)),
m_updates(
*this, DpGuiResId(RID_DLG_UPDATE_UPDATES),
- Image(DpGuiResId(RID_DLG_UPDATE_NORMALALERT)),
- Image(DpGuiResId(RID_DLG_UPDATE_HIGHCONTRASTALERT))),
+ Image(DpGuiResId(RID_DLG_UPDATE_NORMALALERT))),
m_all(this, DpGuiResId(RID_DLG_UPDATE_ALL)),
m_description(this, DpGuiResId(RID_DLG_UPDATE_DESCRIPTION)),
m_PublisherLabel(this, DpGuiResId(RID_DLG_UPDATE_PUBLISHER_LABEL)),
@@ -667,9 +666,9 @@ short UpdateDialog::Execute() {
UpdateDialog::CheckListBox::CheckListBox(
UpdateDialog & dialog, ResId const & resource,
- Image const & normalStaticImage, Image const & highContrastStaticImage):
+ Image const & normalStaticImage):
SvxCheckListBox(
- &dialog, resource, normalStaticImage, highContrastStaticImage),
+ &dialog, resource, normalStaticImage),
m_dialog(dialog)
{}
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
index a9a8bcf..7fde4f7 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
@@ -122,8 +122,7 @@ private:
public:
CheckListBox(
UpdateDialog & dialog, ResId const & resource,
- Image const & normalStaticImage,
- Image const & highContrastStaticImage);
+ Image const & normalStaticImage);
virtual ~CheckListBox();
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.src b/desktop/source/deployment/gui/dp_gui_updatedialog.src
index 59539d5..500d28e 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.src
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.src
@@ -212,11 +212,6 @@ ModalDialog RID_DLG_UPDATE {
File = "caution_12.png";
};
};
- Image RID_DLG_UPDATE_HIGHCONTRASTALERT {
- ImageBitmap = Bitmap {
- File = "caution_12_h.png";
- };
- };
String RID_DLG_UPDATE_ERROR {
Text[en-US] = "Error";
};
diff --git a/svx/inc/svx/checklbx.hxx b/svx/inc/svx/checklbx.hxx
index 0a15f82..c69f9bd 100644
--- a/svx/inc/svx/checklbx.hxx
+++ b/svx/inc/svx/checklbx.hxx
@@ -61,8 +61,7 @@ public:
SvxCheckListBox( Window* pParent, WinBits nWinStyle = 0 );
SvxCheckListBox( Window* pParent, const ResId& rResId );
SvxCheckListBox( Window* pParent, const ResId& rResId,
- const Image& rNormalStaticImage,
- const Image& rHighContrastStaticImage );
+ const Image& rNormalStaticImage );
~SvxCheckListBox();
void InsertEntry ( const String& rStr,
diff --git a/svx/source/dialog/checklbx.cxx b/svx/source/dialog/checklbx.cxx
index 296434a..7d7f975 100644
--- a/svx/source/dialog/checklbx.cxx
+++ b/svx/source/dialog/checklbx.cxx
@@ -62,10 +62,8 @@ SvxCheckListBox::SvxCheckListBox( Window* pParent, const ResId& rResId ) :
// -----------------------------------------------------------------------
SvxCheckListBox::SvxCheckListBox( Window* pParent, const ResId& rResId,
- const Image& rNormalStaticImage,
- const Image& /*TODO#i72485# rHighContrastStaticImage*/ ) :
-
- SvTreeListBox( pParent, rResId )
+ const Image& rNormalStaticImage )
+ : SvTreeListBox( pParent, rResId )
{
Init_Impl();
commit 349ebefec794488b7ca299c7dc1227d2e92433d6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Nov 16 14:33:19 2010 +0000
get this building again
diff --git a/svx/source/customshapes/tbxcustomshapes.cxx b/svx/source/customshapes/tbxcustomshapes.cxx
index 36854b1..0f9d3c4 100644
--- a/svx/source/customshapes/tbxcustomshapes.cxx
+++ b/svx/source/customshapes/tbxcustomshapes.cxx
@@ -180,7 +180,7 @@ void SAL_CALL SvxTbxCtlCustomShapes::functionSelected( const ::rtl::OUString& rC
if ( m_aCommand.getLength() > 0 )
{
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame( getFrameInterface());
- Image aImage = GetImage( xFrame, m_aCommand, hasBigImages(), isHighContrast() );
+ Image aImage = GetImage( xFrame, m_aCommand, hasBigImages() );
if ( !!aImage )
GetToolBox().SetItemImage( GetId(), aImage );
}
@@ -195,7 +195,7 @@ void SAL_CALL SvxTbxCtlCustomShapes::updateImage( ) throw (::com::sun::star::un
if ( m_aCommand.getLength() > 0 )
{
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame( getFrameInterface());
- Image aImage = GetImage( xFrame, m_aCommand, hasBigImages(), isHighContrast() );
+ Image aImage = GetImage( xFrame, m_aCommand, hasBigImages() );
if ( !!aImage )
GetToolBox().SetItemImage( GetId(), aImage );
}
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index b242c2e..63a60d8 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -548,8 +548,7 @@ void SAL_CALL RecoveryCore::statusChanged(const css::frame::FeatureStateEvent& a
if (!sURL.Len())
sURL = aNew.TemplateURL;
INetURLObject aURL(sURL);
- aNew.StandardImage = SvFileInformationManager::GetFileImage(aURL, false, false);
- aNew.HCImage = SvFileInformationManager::GetFileImage(aURL, false, true );
+ aNew.StandardImage = SvFileInformationManager::GetFileImage(aURL, false);
/* set the right UI state for this item to NOT_RECOVERED_YET ... because nDocState shows the state of
the last emergency save operation before and is interessting for the used recovery core service only ...
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index 8080486..beb9ec0 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -210,8 +210,7 @@ void SvxFmTbxCtlConfig::StateChanged(USHORT nSID, SfxItemState eState, const Sfx
aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlot ));
Image aImage = GetImage( m_xFrame,
aSlotURL,
- hasBigImages(),
- GetToolBox().GetSettings().GetStyleSettings().GetHighContrastMode() );
+ hasBigImages() );
GetToolBox().SetItemImage( GetId(), aImage );
nLastSlot = nSlot;
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index c6e4117..66c70cb 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -181,9 +181,6 @@ struct TURLInfo
/// standard icon
Image StandardImage;
- /// high contrast icon
- Image HCImage;
-
public:
TURLInfo()
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index 160f3e0..30c4fe3 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -157,7 +157,6 @@ private:
protected:
Image m_aNormalImage;
- Image m_aHCImage;
::rtl::OUString aText;
FmEntryDataList* pChildList;
@@ -178,7 +177,6 @@ public:
void SetParent( FmEntryData* pParentData ){ pParent = pParentData; }
const Image& GetNormalImage() const { return m_aNormalImage; }
- const Image& GetHCImage() const { return m_aHCImage; }
::rtl::OUString GetText() const { return aText; }
FmEntryData* GetParent() const { return pParent; }
diff --git a/svx/source/tbxctrls/tbxalign.cxx b/svx/source/tbxctrls/tbxalign.cxx
index f35550d..182c2fc 100644
--- a/svx/source/tbxctrls/tbxalign.cxx
+++ b/svx/source/tbxctrls/tbxalign.cxx
@@ -118,7 +118,7 @@ void SAL_CALL SvxTbxCtlAlign::functionSelected( const ::rtl::OUString& aCommand
if ( aCommand.getLength() > 0 )
{
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame( getFrameInterface());
- Image aImage = GetImage( xFrame, aCommand, hasBigImages(), isHighContrast() );
+ Image aImage = GetImage( xFrame, aCommand, hasBigImages() );
if ( !!aImage )
GetToolBox().SetItemImage( GetId(), aImage );
}
@@ -133,7 +133,7 @@ void SAL_CALL SvxTbxCtlAlign::updateImage() throw (::com::sun::star::uno::Runtim
if ( m_aCommand.getLength() > 0 )
{
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame( getFrameInterface());
- Image aImage = GetImage( xFrame, m_aCommand, hasBigImages(), isHighContrast() );
+ Image aImage = GetImage( xFrame, m_aCommand, hasBigImages() );
if ( !!aImage )
GetToolBox().SetItemImage( GetId(), aImage );
}
commit 27e5fd193311daa343f174dfbcf24f6df7a3d59b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Nov 16 12:59:37 2010 +0000
get this to build again
diff --git a/framework/inc/classes/addonsoptions.hxx b/framework/inc/classes/addonsoptions.hxx
index 0d44d6a..8dd1120 100644
--- a/framework/inc/classes/addonsoptions.hxx
+++ b/framework/inc/classes/addonsoptions.hxx
@@ -313,9 +313,9 @@ class AddonsOptions
@onerror An empty image
*//*-*****************************************************************************************************/
- Image GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast, sal_Bool bNoScale ) const;
+ Image GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bNoScale ) const;
- Image GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast ) const;
+ Image GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig ) const;
//-------------------------------------------------------------------------------------------------------------
// private methods
//-------------------------------------------------------------------------------------------------------------
diff --git a/framework/inc/classes/menumanager.hxx b/framework/inc/classes/menumanager.hxx
index c256e1e..51dc9c0 100644
--- a/framework/inc/classes/menumanager.hxx
+++ b/framework/inc/classes/menumanager.hxx
@@ -102,7 +102,7 @@ class MenuManager : public ThreadHelpBase ,
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& getServiceFactory();
static void UpdateSpecialWindowMenu( Menu* pMenu ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,IMutex& _rMutex);
- static void FillMenuImages(::com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& xFrame,Menu* _pMenu,sal_Bool bIsHiContrast,sal_Bool bShowMenuImages);
+ static void FillMenuImages(::com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& xFrame,Menu* _pMenu,sal_Bool bShowMenuImages);
protected:
DECL_LINK( Highlight, Menu * );
@@ -144,7 +144,6 @@ class MenuManager : public ThreadHelpBase ,
sal_Bool m_bDeleteChildren;
sal_Bool m_bActive;
sal_Bool m_bIsBookmarkMenu;
- sal_Bool m_bWasHiContrast;
sal_Bool m_bShowMenuImages;
::rtl::OUString m_aMenuItemCommand;
Menu* m_pVCLMenu;
diff --git a/framework/inc/helper/imageproducer.hxx b/framework/inc/helper/imageproducer.hxx
index 573448c..6da7c58 100644
--- a/framework/inc/helper/imageproducer.hxx
+++ b/framework/inc/helper/imageproducer.hxx
@@ -43,8 +43,7 @@ namespace framework
typedef Image ( *pfunc_getImage)(
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
const ::rtl::OUString& aURL,
- BOOL bBig,
- BOOL bHiContrast
+ BOOL bBig
);
pfunc_getImage SAL_CALL SetImageProducer( pfunc_getImage pGetImageFunc );
@@ -52,8 +51,7 @@ pfunc_getImage SAL_CALL SetImageProducer( pfunc_getImage pGetImageFunc );
Image SAL_CALL GetImageFromURL(
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
const ::rtl::OUString& aURL,
- BOOL bBig,
- BOOL bHiContrast
+ BOOL bBig
);
}
diff --git a/framework/inc/uielement/controlmenucontroller.hxx b/framework/inc/uielement/controlmenucontroller.hxx
index 09e733f..55fe00a 100644
--- a/framework/inc/uielement/controlmenucontroller.hxx
+++ b/framework/inc/uielement/controlmenucontroller.hxx
@@ -106,8 +106,7 @@ namespace framework
void updateImagesPopupMenu( PopupMenu* pPopupMenu );
void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu );
- sal_Bool m_bWasHiContrast : 1,
- m_bShowMenuImages : 1;
+ sal_Bool m_bShowMenuImages : 1;
PopupMenu* m_pResPopupMenu;
UrlToDispatchMap m_aURLToDispatchMap;
};
diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx
index 69e8b95..26291bf 100644
--- a/framework/inc/uielement/menubarmanager.hxx
+++ b/framework/inc/uielement/menubarmanager.hxx
@@ -248,7 +248,6 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener
m_bDeleteChildren : 1,
m_bActive : 1,
m_bIsBookmarkMenu : 1,
- m_bWasHiContrast : 1,
m_bShowMenuImages : 1;
sal_Bool m_bRetrieveImages : 1,
m_bAcceleratorCfg : 1;
diff --git a/framework/inc/uielement/newmenucontroller.hxx b/framework/inc/uielement/newmenucontroller.hxx
index afaf633..8859f73 100644
--- a/framework/inc/uielement/newmenucontroller.hxx
+++ b/framework/inc/uielement/newmenucontroller.hxx
@@ -113,12 +113,11 @@ namespace framework
std::vector< KeyCode >& aMenuShortCuts );
void setAccelerators( PopupMenu* pPopupMenu );
void determineAndSetNewDocAccel( PopupMenu* pPopupMenu, const KeyCode& rKeyCode );
- void setMenuImages( PopupMenu* pPopupMenu, sal_Bool bSetImages, sal_Bool bHiContrast );
+ void setMenuImages( PopupMenu* pPopupMenu, sal_Bool bSetImages );
private:
// members
sal_Bool m_bShowImages : 1,
- m_bHiContrast : 1,
m_bNewMenu : 1,
m_bModuleIdentified : 1,
m_bAcceleratorCfg : 1;
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index baede2e..26becf3 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -200,7 +200,7 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener
sal_uInt16 ConvertStyleToToolboxItemBits( sal_Int32 nStyle );
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetModelFromFrame() const;
sal_Bool IsPluginMode() const;
- Image QueryAddonsImage( const ::rtl::OUString& aCommandURL, bool bBigImages, bool bHiContrast );
+ Image QueryAddonsImage( const ::rtl::OUString& aCommandURL, bool bBigImages );
long HandleClick(void ( SAL_CALL ::com::sun::star::frame::XToolbarController::*_pClick )( ));
void setToolBarImage(const Image& _aImage,const CommandToInfoMap::const_iterator& _pIter);
void impl_elementChanged(bool _bRemove,const ::com::sun::star::ui::ConfigurationEvent& Event );
@@ -215,7 +215,6 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener
typedef ::std::hash_map< sal_uInt16, ::com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > > MenuDescriptionMap;
sal_Bool m_bDisposed : 1,
- m_bIsHiContrast : 1,
m_bSmallSymbols : 1,
m_bModuleIdentified : 1,
m_bAddedToTaskPaneList : 1,
diff --git a/framework/source/classes/addonsoptions.cxx b/framework/source/classes/addonsoptions.cxx
index 8513f60..de84391 100644
--- a/framework/source/classes/addonsoptions.cxx
+++ b/framework/source/classes/addonsoptions.cxx
@@ -269,7 +269,7 @@ class AddonsOptions_Impl : public ConfigItem
const Sequence< Sequence< PropertyValue > >& GetAddonsToolBarPart ( sal_uInt32 nIndex ) const ;
const ::rtl::OUString GetAddonsToolbarResourceName( sal_uInt32 nIndex ) const;
const Sequence< Sequence< PropertyValue > >& GetAddonsHelpMenu () const ;
- Image GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast, sal_Bool bNoScale ) const;
+ Image GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bNoScale ) const;
const MergeMenuInstructionContainer& GetMergeMenuInstructions() const;
bool GetMergeToolbarInstructions( const ::rtl::OUString& rToolbarName, MergeToolbarInstructionContainer& rToolbarInstructions ) const;
@@ -292,13 +292,9 @@ class AddonsOptions_Impl : public ConfigItem
{
Image aImageSmall;
Image aImageBig;
- Image aImageSmallHC;
- Image aImageBigHC;
Image aImageSmallNoScale;
Image aImageBigNoScale;
- Image aImageSmallHCNoScale;
- Image aImageBigHCNoScale;
};
typedef std::hash_map< ::rtl::OUString, ImageEntry, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > ImageManager;
@@ -607,27 +603,17 @@ bool AddonsOptions_Impl::GetMergeToolbarInstructions(
//*****************************************************************************************************************
// public method
//*****************************************************************************************************************
-Image AddonsOptions_Impl::GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast, sal_Bool bNoScale ) const
+Image AddonsOptions_Impl::GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bNoScale ) const
{
Image aImage;
ImageManager::const_iterator pIter = m_aImageManager.find( aURL );
if ( pIter != m_aImageManager.end() )
{
- if ( !bHiContrast )
- {
- if ( bNoScale )
- aImage = ( bBig ? pIter->second.aImageBigNoScale : pIter->second.aImageSmallNoScale );
- if ( !aImage )
- aImage = ( bBig ? pIter->second.aImageBig : pIter->second.aImageSmall );
- }
- else
- {
- if ( bNoScale )
- aImage = ( bBig ? pIter->second.aImageBigHCNoScale : pIter->second.aImageSmallHCNoScale );
- if ( !aImage )
- aImage = ( bBig ? pIter->second.aImageBigHC : pIter->second.aImageSmallHC );
- }
+ if ( bNoScale )
+ aImage = ( bBig ? pIter->second.aImageBigNoScale : pIter->second.aImageSmallNoScale );
+ if ( !aImage )
+ aImage = ( bBig ? pIter->second.aImageBig : pIter->second.aImageSmall );
}
return aImage;
@@ -1406,8 +1392,8 @@ void AddonsOptions_Impl::ReadImageFromURL( ImageSize nImageSize, const ::rtl::OU
//*****************************************************************************************************************
void AddonsOptions_Impl::ReadAndAssociateImages( const ::rtl::OUString& aURL, const ::rtl::OUString& aImageId )
{
- const int MAX_NUM_IMAGES = 4;
- const char* aExtArray[MAX_NUM_IMAGES] = { "_16", "_26", "_16h", "_26h" };
+ const int MAX_NUM_IMAGES = 2;
+ const char* aExtArray[MAX_NUM_IMAGES] = { "_16", "_26" };
const char* pBmpExt = ".bmp";
if ( aImageId.getLength() == 0 )
@@ -1442,14 +1428,6 @@ void AddonsOptions_Impl::ReadAndAssociateImages( const ::rtl::OUString& aURL, co
aImageEntry.aImageBig = aImage;
aImageEntry.aImageBigNoScale = aImageNoScale;
break;
- case 2:
- aImageEntry.aImageSmallHC = aImage;
- aImageEntry.aImageSmallHCNoScale = aImageNoScale;
- break;
- case 3:
- aImageEntry.aImageBigHC = aImage;
- aImageEntry.aImageBigHCNoScale = aImageNoScale;
- break;
}
}
}
@@ -1482,8 +1460,7 @@ AddonsOptions_Impl::ImageEntry* AddonsOptions_Impl::ReadImageData( const ::rtl::
if (( aPropertyData[i] >>= aImageDataSeq ) &&
aImageDataSeq.getLength() > 0 &&
( CreateImageFromSequence( aImage,
- (( i == OFFSET_IMAGES_BIG ) ||
- ( i == OFFSET_IMAGES_BIGHC )),
+ ( i == OFFSET_IMAGES_BIG ),
aImageDataSeq )) )
{
if ( !pEntry )
@@ -1493,10 +1470,6 @@ AddonsOptions_Impl::ImageEntry* AddonsOptions_Impl::ReadImageData( const ::rtl::
pEntry->aImageSmall = aImage;
else if ( i == OFFSET_IMAGES_BIG )
pEntry->aImageBig = aImage;
- else if ( i == OFFSET_IMAGES_SMALLHC )
- pEntry->aImageSmallHC = aImage;
- else
- pEntry->aImageBigHC = aImage;
}
}
else
@@ -1523,21 +1496,11 @@ AddonsOptions_Impl::ImageEntry* AddonsOptions_Impl::ReadImageData( const ::rtl::
pEntry->aImageSmall = aImage;
pEntry->aImageSmallNoScale = aImageNoScale;
}
- else if ( i == OFFSET_IMAGES_BIG_URL && !pEntry->aImageBig )
+ else if ( !pEntry->aImageBig )
{
pEntry->aImageBig = aImage;
pEntry->aImageBigNoScale = aImageNoScale;
}
- else if ( i == OFFSET_IMAGES_SMALLHC_URL && !pEntry->aImageSmallHC )
- {
- pEntry->aImageSmallHC = aImage;
- pEntry->aImageSmallHCNoScale = aImageNoScale;
- }
- else if ( !pEntry->aImageBigHC )
- {
- pEntry->aImageBigHC = aImage;
- pEntry->aImageBigHCNoScale = aImageNoScale;
- }
}
}
}
@@ -1806,18 +1769,18 @@ bool AddonsOptions::GetMergeToolbarInstructions(
//*****************************************************************************************************************
// public method
//*****************************************************************************************************************
-Image AddonsOptions::GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast, sal_Bool bNoScale ) const
+Image AddonsOptions::GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bNoScale ) const
{
MutexGuard aGuard( GetOwnStaticMutex() );
- return m_pDataContainer->GetImageFromURL( aURL, bBig, bHiContrast, bNoScale );
+ return m_pDataContainer->GetImageFromURL( aURL, bBig, bNoScale );
}
//*****************************************************************************************************************
// public method
//*****************************************************************************************************************
-Image AddonsOptions::GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast ) const
+Image AddonsOptions::GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig ) const
{
- return GetImageFromURL( aURL, bBig, bHiContrast, sal_False );
+ return GetImageFromURL( aURL, bBig, sal_False );
}
//*****************************************************************************************************************
diff --git a/framework/source/classes/bmkmenu.cxx b/framework/source/classes/bmkmenu.cxx
index d8740eb..fecd1d6 100644
--- a/framework/source/classes/bmkmenu.cxx
+++ b/framework/source/classes/bmkmenu.cxx
@@ -171,8 +171,6 @@ void BmkMenu::Initialize()
::rtl::OUString aTargetFrame;
::rtl::OUString aImageId;
- BOOL bIsHiContrastMode = rSettings.GetHighContrastMode();
-
UINT32 i, nCount = aDynamicMenuEntries.getLength();
for ( i = 0; i < nCount; ++i )
{
@@ -192,7 +190,7 @@ void BmkMenu::Initialize()
{
if ( aImageId.getLength() > 0 )
{
- Image aImage = GetImageFromURL( m_xFrame, aImageId, FALSE, bIsHiContrastMode );
+ Image aImage = GetImageFromURL( m_xFrame, aImageId, FALSE );
if ( !!aImage )
{
bImageSet = sal_True;
@@ -202,7 +200,7 @@ void BmkMenu::Initialize()
if ( !bImageSet )
{
- Image aImage = GetImageFromURL( m_xFrame, aURL, FALSE, bIsHiContrastMode );
+ Image aImage = GetImageFromURL( m_xFrame, aURL, FALSE );
if ( !aImage )
InsertItem( nId, aTitle );
else
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index 1041bf7..9817fbf 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -152,7 +152,6 @@ MenuManager::MenuManager(
SAL_STATIC_CAST( ::com::sun::star::uno::XInterface*, (OWeakObject*)this )->acquire();
const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
- m_bWasHiContrast = rSettings.GetHighContrastMode();
m_bShowMenuImages = rSettings.GetUseImagesInMenus();
sal_Int32 nAddonsURLPrefixLength = ADDONSPOPUPMENU_URL_PREFIX.getLength();
@@ -212,7 +211,7 @@ MenuManager::MenuManager(
// Set image for the addon popup menu item
if ( bShowMenuImages && !pPopupMenu->GetItemImage( ITEMID_ADDONLIST ))
{
- Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE, m_bWasHiContrast );
+ Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE );
if ( !!aImage )
pPopupMenu->SetItemImage( ITEMID_ADDONLIST, aImage );
}
@@ -239,7 +238,7 @@ MenuManager::MenuManager(
AddMenu(pSubMenu,::rtl::OUString(),nItemId,sal_True,sal_False);
if ( bShowMenuImages && !pMenu->GetItemImage( nItemId ))
{
- Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE, m_bWasHiContrast );
+ Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE );
if ( !!aImage )
pMenu->SetItemImage( nItemId, aImage );
}
@@ -261,7 +260,7 @@ MenuManager::MenuManager(
if ( bShowMenuImages && !pMenu->GetItemImage( nItemId ))
{
- Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE, m_bWasHiContrast );
+ Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE );
if ( !!aImage )
pMenu->SetItemImage( nItemId, aImage );
}
@@ -282,14 +281,14 @@ MenuManager::MenuManager(
if ( pMenuAttributes && pMenuAttributes->aImageId.getLength() > 0 )
{
// Retrieve image id from menu attributes
- aImage = GetImageFromURL( rFrame, aImageId, FALSE, m_bWasHiContrast );
+ aImage = GetImageFromURL( rFrame, aImageId, FALSE );
}
if ( !aImage )
{
- aImage = GetImageFromURL( rFrame, aItemCommand, FALSE, m_bWasHiContrast );
+ aImage = GetImageFromURL( rFrame, aItemCommand, FALSE );
if ( !aImage )
- aImage = AddonsOptions().GetImageFromURL( aItemCommand, FALSE, m_bWasHiContrast );
+ aImage = AddonsOptions().GetImageFromURL( aItemCommand, FALSE );
}
if ( !!aImage )
@@ -297,7 +296,7 @@ MenuManager::MenuManager(
}
else if ( !pMenu->GetItemImage( nItemId ))
{
- Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE, m_bWasHiContrast );
+ Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE );
if ( !!aImage )
pMenu->SetItemImage( nItemId, aImage );
}
@@ -824,15 +823,10 @@ IMPL_LINK( MenuManager, Activate, Menu *, pMenu )
aCommand == aSpecialWindowCommand )
UpdateSpecialWindowMenu( pMenu,getServiceFactory(),m_aLock );
- // Check if some modes have changed so we have to update our menu images
- sal_Bool bIsHiContrast = rSettings.GetHighContrastMode();
-
- if ( m_bWasHiContrast != bIsHiContrast || bShowMenuImages != m_bShowMenuImages )
+ if ( bShowMenuImages != m_bShowMenuImages )
{
- // The mode changed so we have to replace all images
- m_bWasHiContrast = bIsHiContrast;
m_bShowMenuImages = bShowMenuImages;
- FillMenuImages(m_xFrame,pMenu,bIsHiContrast,bShowMenuImages);
+ FillMenuImages(m_xFrame,pMenu,bShowMenuImages);
}
if ( m_bInitialized )
@@ -1028,7 +1022,7 @@ USHORT MenuManager::FillItemCommand(::rtl::OUString& _rItemCommand,Menu* _pMenu,
}
return nItemId;
}
-void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame,Menu* _pMenu,sal_Bool bIsHiContrast,sal_Bool bShowMenuImages)
+void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame,Menu* _pMenu,sal_Bool bShowMenuImages)
{
AddonsOptions aAddonOptions;
@@ -1058,7 +1052,7 @@ void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame,Menu* _pMenu,sal_B
if ( aImageId.getLength() > 0 )
{
- Image aImage = GetImageFromURL( _xFrame, aImageId, FALSE, bIsHiContrast );
+ Image aImage = GetImageFromURL( _xFrame, aImageId, FALSE );
if ( !!aImage )
{
bImageSet = sal_True;
@@ -1069,9 +1063,9 @@ void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame,Menu* _pMenu,sal_B
if ( !bImageSet )
{
rtl::OUString aMenuItemCommand = _pMenu->GetItemCommand( nId );
- Image aImage = GetImageFromURL( _xFrame, aMenuItemCommand, FALSE, bIsHiContrast );
+ Image aImage = GetImageFromURL( _xFrame, aMenuItemCommand, FALSE );
if ( !aImage )
- aImage = aAddonOptions.GetImageFromURL( aMenuItemCommand, FALSE, bIsHiContrast );
+ aImage = aAddonOptions.GetImageFromURL( aMenuItemCommand, FALSE );
_pMenu->SetItemImage( nId, aImage );
}
diff --git a/framework/source/helper/actiontriggerhelper.cxx b/framework/source/helper/actiontriggerhelper.cxx
index 2c0b64c..56ee06e 100644
--- a/framework/source/helper/actiontriggerhelper.cxx
+++ b/framework/source/helper/actiontriggerhelper.cxx
@@ -115,9 +115,6 @@ void InsertSubMenuItems( Menu* pSubMenu, USHORT& nItemId, Reference< XIndexConta
if ( xIndexAccess.is() )
{
AddonsOptions aAddonOptions;
- const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
- sal_Bool bHiContrast = rSettings.GetHighContrastMode();
-
OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
for ( sal_Int32 i = 0; i < xIndexAccess->getCount(); i++ )
@@ -221,7 +218,7 @@ void InsertSubMenuItems( Menu* pSubMenu, USHORT& nItemId, Reference< XIndexConta
else
{
// Support add-on images for context menu interceptors
- Image aImage = aAddonOptions.GetImageFromURL( aCommandURL, sal_False, bHiContrast, sal_True );
+ Image aImage = aAddonOptions.GetImageFromURL( aCommandURL, sal_False, sal_True );
if ( !!aImage )
pSubMenu->SetItemImage( nNewItemId, aImage );
}
diff --git a/framework/source/helper/imageproducer.cxx b/framework/source/helper/imageproducer.cxx
index 5a2750b..e7e6bbc 100644
--- a/framework/source/helper/imageproducer.cxx
+++ b/framework/source/helper/imageproducer.cxx
@@ -48,12 +48,11 @@ pfunc_getImage SAL_CALL SetImageProducer( pfunc_getImage pNewGetImageFunc )
Image SAL_CALL GetImageFromURL(
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
const ::rtl::OUString& aURL,
- BOOL bBig,
- BOOL bHiContrast
+ BOOL bBig
)
{
if ( _pGetImageFunc )
- return _pGetImageFunc( rFrame, aURL, bBig, bHiContrast );
+ return _pGetImageFunc( rFrame, aURL, bBig );
else
return Image();
}
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx
index 1b78b7a..ab03e3e 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -142,25 +142,24 @@ static sal_Bool IsCorrectContext( const ::rtl::OUString& rModuleIdentifier, cons
static Image RetrieveImage( Reference< com::sun::star::frame::XFrame >& rFrame,
const rtl::OUString& aImageId,
const rtl::OUString& aURL,
- BOOL bBigImage,
- BOOL bHiContrast )
+ BOOL bBigImage )
{
Image aImage;
if ( aImageId.getLength() > 0 )
{
- aImage = framework::AddonsOptions().GetImageFromURL( aImageId, bBigImage, bHiContrast );
+ aImage = framework::AddonsOptions().GetImageFromURL( aImageId, bBigImage );
if ( !!aImage )
return aImage;
else
- aImage = GetImageFromURL( rFrame, aImageId, bBigImage, bHiContrast );
+ aImage = GetImageFromURL( rFrame, aImageId, bBigImage );
if ( !!aImage )
return aImage;
}
- aImage = framework::AddonsOptions().GetImageFromURL( aURL, bBigImage, bHiContrast );
+ aImage = framework::AddonsOptions().GetImageFromURL( aURL, bBigImage );
if ( !aImage )
- aImage = GetImageFromURL( rFrame, aImageId, bBigImage, bHiContrast );
+ aImage = GetImageFromURL( rFrame, aImageId, bBigImage );
return aImage;
}
@@ -218,8 +217,7 @@ void AddonsToolBarManager::RefreshImages()
m_pToolBar->SetItemImage( nId, RetrieveImage( m_xFrame,
aImageId,
aCommandURL,
- bBigImages,
- m_bIsHiContrast ));
+ bBigImages ));
}
}
}
@@ -298,7 +296,7 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue
m_pToolBar->InsertItem( nId, aTitle );
- Image aImage = RetrieveImage( m_xFrame, aImageId, aURL, !m_bSmallSymbols, m_bIsHiContrast );
+ Image aImage = RetrieveImage( m_xFrame, aImageId, aURL, !m_bSmallSymbols );
if ( !!aImage )
m_pToolBar->SetItemImage( nId, aImage );
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx
index f6d2157..ed2ce7d 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -219,7 +219,6 @@ ControlMenuController::ControlMenuController( const ::com::sun::star::uno::Refer
m_pResPopupMenu( 0 )
{
const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
- m_bWasHiContrast = rSettings.GetHighContrastMode();
m_bShowMenuImages = rSettings.GetUseImagesInMenus();
}
@@ -361,14 +360,11 @@ void SAL_CALL ControlMenuController::activate( const css::awt::MenuEvent& ) thro
// Check if some modes have changed so we have to update our menu images
const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
- sal_Bool bIsHiContrast = rSettings.GetHighContrastMode();
sal_Bool bShowMenuImages = rSettings.GetUseImagesInMenus();
- sal_Bool bUpdateImages = (( m_bWasHiContrast != bIsHiContrast ) || ( bShowMenuImages != m_bShowMenuImages ));
+ sal_Bool bUpdateImages = (bShowMenuImages != m_bShowMenuImages);
if ( bUpdateImages )
{
- // The mode has changed or the complete menu so we have to retrieve all images again
- m_bWasHiContrast = bIsHiContrast;
m_bShowMenuImages = bShowMenuImages;
VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXPopupMenu::GetImplementation( m_xPopupMenu );
diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
index 62de977..257948a 100644
--- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
@@ -136,9 +136,8 @@ ImageButtonToolbarController::ImageButtonToolbarController(
ComplexToolbarController( rServiceManager, rFrame, pToolbar, nID, aCommand )
{
sal_Bool bBigImages( SvtMiscOptions().AreCurrentSymbolsLarge() );
- sal_Bool bHiContrast( pToolbar->GetSettings().GetStyleSettings().GetHighContrastMode() );
- Image aImage = AddonsOptions().GetImageFromURL( aCommand, bBigImages, bHiContrast, sal_True );
+ Image aImage = AddonsOptions().GetImageFromURL( aCommand, bBigImages, sal_True );
// Height will be controlled by scaling according to button height
m_pToolbar->SetItemImage( m_nID, aImage );
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 6f0e5c4..521118c 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -188,13 +188,11 @@ const ::rtl::OUString aSpecialWindowCommand( RTL_CONSTASCII_USTRINGPARAM( ".uno:
const ::rtl::OUString UNO_COMMAND( RTL_CONSTASCII_USTRINGPARAM( ".uno:" ));
-static sal_Int16 getImageTypeFromBools( sal_Bool bBig, sal_Bool bHighContrast )
+static sal_Int16 getImageTypeFromBools( sal_Bool bBig )
{
sal_Int16 n( 0 );
if ( bBig )
n |= ::com::sun::star::ui::ImageType::SIZE_LARGE;
- if ( bHighContrast )
- n |= ::com::sun::star::ui::ImageType::COLOR_HIGHCONTRAST;
return n;
}
@@ -458,7 +456,7 @@ throw (RuntimeException)
return;
sal_Int16 nImageType = sal_Int16();
- sal_Int16 nCurrentImageType = getImageTypeFromBools( sal_False, m_bWasHiContrast );
+ sal_Int16 nCurrentImageType = getImageTypeFromBools( sal_False );
if (( Event.aInfo >>= nImageType ) &&
( nImageType == nCurrentImageType ))
RequestImages();
@@ -869,20 +867,16 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
MenuManager::UpdateSpecialWindowMenu( pMenu,getServiceFactory(),m_aLock );
// Check if some modes have changed so we have to update our menu images
- sal_Bool bIsHiContrast = rSettings.GetHighContrastMode();
sal_Int16 nSymbolsStyle = SvtMiscOptions().GetCurrentSymbolsStyle();
if ( m_bRetrieveImages ||
- m_bWasHiContrast != bIsHiContrast ||
bShowMenuImages != m_bShowMenuImages ||
nSymbolsStyle != m_nSymbolsStyle )
{
- // The mode changed so we have to replace all images
- m_bWasHiContrast = bIsHiContrast;
m_bShowMenuImages = bShowMenuImages;
m_bRetrieveImages = sal_False;
m_nSymbolsStyle = nSymbolsStyle;
- MenuManager::FillMenuImages(m_xFrame,pMenu,bIsHiContrast,bShowMenuImages);
+ MenuManager::FillMenuImages(m_xFrame,pMenu,bShowMenuImages);
}
// Try to map commands to labels
@@ -1266,7 +1260,6 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
m_xDispatchProvider = rDispatchProvider;
const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
- m_bWasHiContrast = rSettings.GetHighContrastMode();
m_bShowMenuImages = rSettings.GetUseImagesInMenus();
m_bRetrieveImages = sal_False;
@@ -1431,7 +1424,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
if ( bItemShowMenuImages && !pPopup->GetItemImage( ITEMID_ADDONLIST ))
{
Reference< XFrame > xTemp( rFrame );
- Image aImage = GetImageFromURL( xTemp, aItemCommand, FALSE, m_bWasHiContrast );
+ Image aImage = GetImageFromURL( xTemp, aItemCommand, FALSE );
if ( !!aImage )
pPopup->SetItemImage( ITEMID_ADDONLIST, aImage );
}
@@ -1461,14 +1454,14 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
if ( pMenuAttributes && pMenuAttributes->aImageId.getLength() > 0 )
{
// Retrieve image id from menu attributes
- aImage = GetImageFromURL( m_xFrame, aImageId, FALSE, m_bWasHiContrast );
+ aImage = GetImageFromURL( m_xFrame, aImageId, FALSE );
}
if ( !aImage )
{
- aImage = GetImageFromURL( m_xFrame, aItemCommand, FALSE, m_bWasHiContrast );
+ aImage = GetImageFromURL( m_xFrame, aItemCommand, FALSE );
if ( !aImage )
- aImage = AddonsOptions().GetImageFromURL( aItemCommand, FALSE, m_bWasHiContrast );
+ aImage = AddonsOptions().GetImageFromURL( aItemCommand, FALSE );
}
if ( !!aImage )
@@ -2066,9 +2059,6 @@ void MenuBarManager::Init(const Reference< XFrame >& rFrame,AddonMenu* pAddonMen
getServiceFactory()->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.PopupMenuControllerFactory" ))),
UNO_QUERY );
- const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
- m_bWasHiContrast = rSettings.GetHighContrastMode();
-
Reference< XStatusListener > xStatusListener;
Reference< XDispatch > xDispatch;
USHORT nItemCount = pAddonMenu->GetItemCount();
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index 13219be..3fdfe93 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -94,7 +94,7 @@ DEFINE_XSERVICEINFO_MULTISERVICE ( NewMenuController
DEFINE_INIT_SERVICE ( NewMenuController, {} )
-void NewMenuController::setMenuImages( PopupMenu* pPopupMenu, sal_Bool bSetImages, sal_Bool bHiContrast )
+void NewMenuController::setMenuImages( PopupMenu* pPopupMenu, sal_Bool bSetImages )
{
USHORT nItemCount = pPopupMenu->GetItemCount();
Image aImage;
@@ -116,7 +116,7 @@ void NewMenuController::setMenuImages( PopupMenu* pPopupMenu, sal_Bool bSetImage
if ( aImageId.getLength() > 0 )
{
- aImage = GetImageFromURL( xFrame, aImageId, FALSE, bHiContrast );
+ aImage = GetImageFromURL( xFrame, aImageId, FALSE );
if ( !!aImage )
{
bImageSet = sal_True;
@@ -128,7 +128,7 @@ void NewMenuController::setMenuImages( PopupMenu* pPopupMenu, sal_Bool bSetImage
{
String aCmd( pPopupMenu->GetItemCommand( nItemId ) );
if ( aCmd.Len() )
- aImage = GetImageFromURL( xFrame, aCmd, FALSE, bHiContrast );
+ aImage = GetImageFromURL( xFrame, aCmd, FALSE );
if ( !!aImage )
pPopupMenu->SetItemImage( nItemId, aImage );
@@ -328,7 +328,6 @@ void NewMenuController::retrieveShortcutsFromConfiguration(
NewMenuController::NewMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) :
svt::PopupMenuControllerBase( xServiceManager ),
m_bShowImages( sal_True ),
- m_bHiContrast( sal_False ),
m_bNewMenu( sal_False ),
m_bModuleIdentified( sal_False ),
m_bAcceleratorCfg( sal_False ),
@@ -388,7 +387,7 @@ void NewMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopup
}
if ( m_bShowImages )
- setMenuImages( pVCLPopupMenu, m_bShowImages, m_bHiContrast );
+ setMenuImages( pVCLPopupMenu, m_bShowImages );
delete pSubMenu;
}
@@ -483,17 +482,14 @@ void SAL_CALL NewMenuController::activate( const css::awt::MenuEvent& ) throw (R
{
const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
sal_Bool bShowImages( rSettings.GetUseImagesInMenus() );
- sal_Bool bHiContrast( rSettings.GetHighContrastMode() );
PopupMenu* pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu();
- if (( m_bShowImages != bShowImages ) ||
- ( m_bHiContrast != bHiContrast ))
+ if ( m_bShowImages != bShowImages )
{
m_bShowImages = bShowImages;
- m_bHiContrast = bHiContrast;
- setMenuImages( pVCLPopupMenu, m_bShowImages, m_bHiContrast );
+ setMenuImages( pVCLPopupMenu, m_bShowImages );
}
setAccelerators( pVCLPopupMenu );
@@ -560,7 +556,6 @@ void SAL_CALL NewMenuController::initialize( const Sequence< Any >& aArguments )
const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
m_bShowImages = rSettings.GetUseImagesInMenus();
- m_bHiContrast = rSettings.GetHighContrastMode();
m_bNewMenu = m_aCommandURL.equalsAscii( ".uno:AddDirect" );
}
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 9e1c730..6abe6fe 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -176,13 +176,11 @@ throw ( RuntimeException )
//*****************************************************************************************************************
-static sal_Int16 getImageTypeFromBools( sal_Bool bBig, sal_Bool bHighContrast )
+static sal_Int16 getImageTypeFromBools( sal_Bool bBig )
{
sal_Int16 n( 0 );
if ( bBig )
n |= ::com::sun::star::ui::ImageType::SIZE_LARGE;
- if ( bHighContrast )
- n |= ::com::sun::star::ui::ImageType::COLOR_HIGHCONTRAST;
return n;
}
@@ -239,7 +237,6 @@ ToolBarManager::ToolBarManager( const Reference< XMultiServiceFactory >& rServic
ThreadHelpBase( &Application::GetSolarMutex() ),
OWeakObject(),
m_bDisposed( sal_False ),
- m_bIsHiContrast( pToolBar->GetSettings().GetStyleSettings().GetHighContrastMode() ),
m_bSmallSymbols( !SvtMiscOptions().AreCurrentSymbolsLarge() ),
m_bModuleIdentified( sal_False ),
m_bAddedToTaskPaneList( sal_True ),
@@ -369,21 +366,6 @@ void ToolBarManager::CheckAndUpdateImages()
ResetableGuard aGuard( m_aLock );
sal_Bool bRefreshImages = sal_False;
- // Check if high contrast/normal mode have changed
- if ( m_pToolBar->GetSettings().GetStyleSettings().GetHighContrastMode() )
- {
- if ( !m_bIsHiContrast )
- {
- bRefreshImages = TRUE;
- m_bIsHiContrast = sal_True;
- }
- }
- else if ( m_bIsHiContrast )
- {
- bRefreshImages = sal_True;
- m_bIsHiContrast = sal_False;
- }
-
SvtMiscOptions aMiscOptions;
bool bCurrentSymbolsSmall = !aMiscOptions.AreCurrentSymbolsLarge();
if ( m_bSmallSymbols != bCurrentSymbolsSmall )
@@ -416,11 +398,11 @@ void ToolBarManager::RefreshImages()
if ( nId > 0 )
{
::rtl::OUString aCommandURL = m_pToolBar->GetItemCommand( nId );
- Image aImage = GetImageFromURL( m_xFrame, aCommandURL, bBigImages, m_bIsHiContrast );
+ Image aImage = GetImageFromURL( m_xFrame, aCommandURL, bBigImages );
// Try also to query for add-on images before giving up and use an
// empty image.
if ( !aImage )
- aImage = QueryAddonsImage( aCommandURL, bBigImages, m_bIsHiContrast );
+ aImage = QueryAddonsImage( aCommandURL, bBigImages );
m_pToolBar->SetItemImage( nId, aImage );
}
}
@@ -764,8 +746,7 @@ void ToolBarManager::impl_elementChanged(bool _bRemove,const ::com::sun::star::u
Reference< XNameAccess > xNameAccess;
sal_Int16 nImageType = sal_Int16();
sal_Int16 nCurrentImageType = getImageTypeFromBools(
- SvtMiscOptions().AreCurrentSymbolsLarge(),
- m_bIsHiContrast );
+ SvtMiscOptions().AreCurrentSymbolsLarge());
if (( Event.aInfo >>= nImageType ) &&
( nImageType == nCurrentImageType ) &&
@@ -1559,8 +1540,7 @@ void ToolBarManager::RequestImages()
}
sal_Bool bBigImages( SvtMiscOptions().AreCurrentSymbolsLarge() );
- m_bIsHiContrast = m_pToolBar->GetSettings().GetStyleSettings().GetHighContrastMode();
- sal_Int16 p = getImageTypeFromBools( SvtMiscOptions().AreCurrentSymbolsLarge(), m_bIsHiContrast );
+ sal_Int16 p = getImageTypeFromBools( SvtMiscOptions().AreCurrentSymbolsLarge() );
if ( m_xDocImageManager.is() )
aDocGraphicSeq = m_xDocImageManager->getImages( p, aCmdURLSeq );
@@ -1581,7 +1561,7 @@ void ToolBarManager::RequestImages()
// Try also to query for add-on images before giving up and use an
// empty image.
if ( !aImage )
- aImage = QueryAddonsImage( aCmdURLSeq[i], bBigImages, m_bIsHiContrast );
+ aImage = QueryAddonsImage( aCmdURLSeq[i], bBigImages );
pIter->second.nImageInfo = 1; // mark image as module based
}
@@ -1838,8 +1818,7 @@ PopupMenu * ToolBarManager::GetToolBarCustomMeun(ToolBox* pToolBar)
pItemMenu->SetItemImage( STARTID_CUSTOMIZE_POPUPMENU+nPos,
GetImageFromURL( m_xFrame,
aCommandURL,
- sal_False,
- m_bIsHiContrast ));
+ sal_False ));
}
else
{
@@ -2241,9 +2220,9 @@ IMPL_STATIC_LINK_NOINSTANCE( ToolBarManager, ExecuteHdl_Impl, ExecuteInfo*, pExe
return 0;
}
-Image ToolBarManager::QueryAddonsImage( const ::rtl::OUString& aCommandURL, bool bBigImages, bool bHiContrast )
+Image ToolBarManager::QueryAddonsImage( const ::rtl::OUString& aCommandURL, bool bBigImages )
{
- Image aImage = framework::AddonsOptions().GetImageFromURL( aCommandURL, bBigImages, bHiContrast );
+ Image aImage = framework::AddonsOptions().GetImageFromURL( aCommandURL, bBigImages );
return aImage;
}
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index a6d7cff..26656b0 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -203,7 +203,7 @@ void ToolbarsMenuController::addCommand(
const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
if ( rSettings.GetUseImagesInMenus() )
- aImage = GetImageFromURL( m_xFrame, rCommandURL, FALSE, rSettings.GetHighContrastMode() );
+ aImage = GetImageFromURL( m_xFrame, rCommandURL, FALSE );
VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXPopupMenu::GetImplementation( rPopupMenu );
if ( pPopupMenu )
commit a2ee92186638524488cc2f979f9b74f3856035e8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Nov 16 12:59:23 2010 +0000
get this to build again
diff --git a/sfx2/inc/imagemgr.hxx b/sfx2/inc/imagemgr.hxx
index 5e27120..8bdb07d 100644
--- a/sfx2/inc/imagemgr.hxx
+++ b/sfx2/inc/imagemgr.hxx
@@ -37,7 +37,7 @@
SFX2_DLLPUBLIC Image SAL_CALL GetImage(
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
const ::rtl::OUString& aURL,
- BOOL bBig, BOOL bHiContrast
+ BOOL bBig
);
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/mnuitem.hxx b/sfx2/inc/sfx2/mnuitem.hxx
index 9ca0217..5b567c2 100644
--- a/sfx2/inc/sfx2/mnuitem.hxx
+++ b/sfx2/inc/sfx2/mnuitem.hxx
@@ -159,7 +159,6 @@ class SfxAppMenuControl_Impl : public SfxMenuControl
{
PopupMenu* pMenu;
ULONG m_nSymbolsStyle;
- BOOL m_bWasHiContrastMode;
BOOL m_bShowMenuImages;
protected:
diff --git a/sfx2/inc/sfx2/tbxctrl.hxx b/sfx2/inc/sfx2/tbxctrl.hxx
index 67182b7..c87e279 100644
--- a/sfx2/inc/sfx2/tbxctrl.hxx
+++ b/sfx2/inc/sfx2/tbxctrl.hxx
@@ -373,7 +373,6 @@ private:
BOOL bBigImages;
PopupMenu* pMenu;
ULONG m_nSymbolsStyle;
- BOOL m_bWasHiContrastMode;
BOOL m_bShowMenuImages;
};
@@ -417,7 +416,6 @@ class SfxAddonsToolBoxControl_Impl : public SfxToolBoxControl
{
BOOL bBigImages;
PopupMenu* pMenu;
- BOOL m_bWasHiContrastMode;
BOOL m_bShowMenuImages;
protected:
diff --git a/sfx2/source/appl/imagemgr.cxx b/sfx2/source/appl/imagemgr.cxx
index 2e364cb..94b4753 100644
--- a/sfx2/source/appl/imagemgr.cxx
+++ b/sfx2/source/appl/imagemgr.cxx
@@ -68,7 +68,7 @@ typedef std::hash_map< ::rtl::OUString,
::std::equal_to< ::rtl::OUString > > ModuleIdToImagegMgr;
-Image SAL_CALL GetImage( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast )
+Image SAL_CALL GetImage( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig )
{
// TODO/LATeR: shouldn't this become a method at SfxViewFrame?! That would save the UnoTunnel
if ( !rFrame.is() )
@@ -128,8 +128,6 @@ Image SAL_CALL GetImage( const ::com::sun::star::uno::Reference< ::com::sun::sta
::com::sun::star::ui::ImageType::SIZE_DEFAULT );
if ( bBig )
nImageType |= ::com::sun::star::ui::ImageType::SIZE_LARGE;
- if ( bHiContrast )
- nImageType |= ::com::sun::star::ui::ImageType::COLOR_HIGHCONTRAST;
if ( xDocImgMgr.is() )
{
@@ -211,7 +209,7 @@ Image SAL_CALL GetImage( const ::com::sun::star::uno::Reference< ::com::sun::sta
if ( !!aImage )
return aImage;
else if ( nProtocol != INET_PROT_UNO && nProtocol != INET_PROT_SLOT )
- return SvFileInformationManager::GetImageNoDefault( aObj, bBig, bHiContrast );
+ return SvFileInformationManager::GetImageNoDefault( aObj, bBig );
}
}
catch ( Exception& )
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index b2706a5..5c957e3 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -1307,7 +1307,7 @@ void BookmarksBox_Impl::DoAction( USHORT nAction )
RemoveEntry( nPos );
rtl::OUString aImageURL = IMAGE_URL;
aImageURL += INetURLObject( *pURL ).GetHost();
- nPos = InsertEntry( aDlg.GetTitle(), SvFileInformationManager::GetImage( aImageURL ) );
+ nPos = InsertEntry( aDlg.GetTitle(), SvFileInformationManager::GetImage( aImageURL, false ) );
SetEntryData( nPos, (void*)(ULONG)( new String( *pURL ) ) );
SelectEntryPos( nPos );
delete pURL;
@@ -1480,7 +1480,7 @@ void BookmarksTabPage_Impl::AddBookmarks( const String& rTitle, const String& rU
{
rtl::OUString aImageURL = IMAGE_URL;
aImageURL += INetURLObject( rURL ).GetHost();
- USHORT nPos = aBookmarksBox.InsertEntry( rTitle, SvFileInformationManager::GetImage( aImageURL ) );
+ USHORT nPos = aBookmarksBox.InsertEntry( rTitle, SvFileInformationManager::GetImage( aImageURL, false ) );
aBookmarksBox.SetEntryData( nPos, (void*)(ULONG)( new String( rURL ) ) );
}
diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx
index 1c9152c..fb78c23 100644
--- a/sfx2/source/dialog/taskpane.cxx
+++ b/sfx2/source/dialog/taskpane.cxx
@@ -185,8 +185,7 @@ namespace sfx2
aCommandName.append( sImageURL.copy( nCommandImagePrefixLen ) );
const ::rtl::OUString sCommandName( aCommandName.makeStringAndClear() );
- const BOOL bHiContrast( Application::GetSettings().GetStyleSettings().GetHighContrastMode() );
- const Image aPanelImage( GetImage( i_rDocFrame, sCommandName, FALSE, bHiContrast ) );
+ const Image aPanelImage( GetImage( i_rDocFrame, sCommandName, FALSE ) );
return aPanelImage.GetXGraphic();
}
diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx
index f9071e6..bc021a9 100644
--- a/sfx2/source/doc/docvor.cxx
+++ b/sfx2/source/doc/docvor.cxx
@@ -2111,7 +2111,7 @@ IMPL_LINK( SfxOrganizeDlg_Impl, MenuActivate_Impl, Menu *, pMenu )
String aTitle = SvFileInformationManager::GetDescription(
INetURLObject(aObjFacURL) );
pSubMenu->InsertItem( nItemId, aTitle,
- SvFileInformationManager::GetImage(INetURLObject(aObjFacURL)) );
+ SvFileInformationManager::GetImage(INetURLObject(aObjFacURL), false) );
pSubMenu->SetItemCommand( nItemId++, aObjFacURL );
DBG_ASSERT( nItemId <= ID_RESET_DEFAULT_TEMPLATE_END, "menu item id overflow" );
}
diff --git a/sfx2/source/inc/virtmenu.hxx b/sfx2/source/inc/virtmenu.hxx
index 7e5624e..acf3aec 100644
--- a/sfx2/source/inc/virtmenu.hxx
+++ b/sfx2/source/inc/virtmenu.hxx
@@ -64,7 +64,6 @@ private:
BOOL bHelpInitialized : 1;
BOOL bIsActive : 1;
BOOL bControllersUnBound : 1;
- BOOL bWasHighContrast : 1;
BOOL bIsAddonPopupMenu : 1;
private:
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index f3d30c7..5fc1966 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -443,7 +443,6 @@ SfxAppMenuControl_Impl::SfxAppMenuControl_Impl(
// Determine the current background color setting for menus
const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
m_nSymbolsStyle = rSettings.GetSymbolsStyle();
- m_bWasHiContrastMode = rSettings.GetHighContrastMode();
m_bShowMenuImages = rSettings.GetUseImagesInMenus();
Reference<com::sun::star::lang::XMultiServiceFactory> aXMultiServiceFactory(::comphelper::getProcessServiceFactory());
@@ -469,15 +468,12 @@ IMPL_LINK( SfxAppMenuControl_Impl, Activate, Menu *, pActMenu )
{
const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
ULONG nSymbolsStyle = rSettings.GetSymbolsStyle();
- BOOL bIsHiContrastMode = rSettings.GetHighContrastMode();
BOOL bShowMenuImages = rSettings.GetUseImagesInMenus();
if (( nSymbolsStyle != m_nSymbolsStyle ) ||
- ( bIsHiContrastMode != m_bWasHiContrastMode ) ||
( bShowMenuImages != m_bShowMenuImages ))
{
m_nSymbolsStyle = nSymbolsStyle;
- m_bWasHiContrastMode = bIsHiContrastMode;
m_bShowMenuImages = bShowMenuImages;
USHORT nCount = pActMenu->GetItemCount();
@@ -499,7 +495,7 @@ IMPL_LINK( SfxAppMenuControl_Impl, Activate, Menu *, pActMenu )
if ( aImageId.getLength() > 0 )
{
Reference< ::com::sun::star::frame::XFrame > xFrame;
- Image aImage = GetImage( xFrame, aImageId, FALSE, bIsHiContrastMode );
+ Image aImage = GetImage( xFrame, aImageId, FALSE );
if ( !!aImage )
{
bImageSet = sal_True;
@@ -511,7 +507,7 @@ IMPL_LINK( SfxAppMenuControl_Impl, Activate, Menu *, pActMenu )
if ( !bImageSet && aCmd.Len() )
{
Image aImage = SvFileInformationManager::GetImage(
- INetURLObject(aCmd), FALSE, bIsHiContrastMode );
+ INetURLObject(aCmd), FALSE );
if ( !!aImage )
pActMenu->SetItemImage( nItemId, aImage );
}
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx
index 2aee922..2ced6fe 100644
--- a/sfx2/source/menu/virtmenu.cxx
+++ b/sfx2/source/menu/virtmenu.cxx
@@ -134,21 +134,20 @@ void SfxMenuImageControl_Impl::Update()
static Image RetrieveAddOnImage( Reference< com::sun::star::frame::XFrame >& rFrame,
const rtl::OUString& aImageId,
const rtl::OUString& aURL,
- BOOL bBigImage,
- BOOL bHiContrast )
+ BOOL bBigImage )
{
Image aImage;
if ( aImageId.getLength() > 0 )
{
- aImage = GetImage( rFrame, aImageId, bBigImage, bHiContrast );
+ aImage = GetImage( rFrame, aImageId, bBigImage );
if ( !!aImage )
return aImage;
}
- aImage = GetImage( rFrame, aURL, bBigImage, bHiContrast );
+ aImage = GetImage( rFrame, aURL, bBigImage );
if ( !aImage )
- aImage = framework::AddonsOptions().GetImageFromURL( aURL, bBigImage, bHiContrast );
+ aImage = framework::AddonsOptions().GetImageFromURL( aURL, bBigImage );
return aImage;
}
@@ -201,7 +200,6 @@ SfxVirtualMenu::SfxVirtualMenu( USHORT nOwnId,
pAutoDeactivate(0),
nLocks(0),
bHelpInitialized( bWithHelp ),
- bWasHighContrast( FALSE ),
bIsAddonPopupMenu( bIsAddonMenu )
{
DBG_MEMTEST();
@@ -237,7 +235,6 @@ SfxVirtualMenu::SfxVirtualMenu( Menu *pStarViewMenu, BOOL bWithHelp,
pAutoDeactivate(0),
nLocks(0),
bHelpInitialized( bWithHelp ),
- bWasHighContrast( FALSE ),
bIsAddonPopupMenu( bIsAddonMenu )
{
DBG_MEMTEST();
@@ -393,9 +390,6 @@ void SfxVirtualMenu::CreateFromSVMenu()
pBindings->ENTERREGISTRATIONS(); ++nLocks;
pImageControl = new SfxMenuImageControl_Impl( SID_IMAGE_ORIENTATION, *pBindings, this );
- // Update high contrast state
- bWasHighContrast = IsHiContrastMode();
-
USHORT nSVPos = 0;
for ( USHORT nPos=0; nPos<nCount; ++nPos, ++nSVPos )
{
@@ -436,7 +430,7 @@ void SfxVirtualMenu::CreateFromSVMenu()
{
rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlotId ));
- Image aImage = GetImage( xFrame, aSlotURL, FALSE, bWasHighContrast );
+ Image aImage = GetImage( xFrame, aSlotURL, FALSE );
pSVMenu->SetItemImage( nSlotId, aImage );
}
}
@@ -542,13 +536,13 @@ void SfxVirtualMenu::CreateFromSVMenu()
if ( pMenuAttributes )
aImageId = pMenuAttributes->aImageId; // Retrieve image id from menu attributes
- aImage = RetrieveAddOnImage( xFrame, aImageId, aCmd, FALSE, bWasHighContrast );
+ aImage = RetrieveAddOnImage( xFrame, aImageId, aCmd, FALSE );
}
else
{
rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlotId ));
- aImage = GetImage( xFrame, aSlotURL, FALSE, bWasHighContrast );
+ aImage = GetImage( xFrame, aSlotURL, FALSE );
}
if ( !!aImage )
@@ -603,7 +597,6 @@ IMPL_LINK( SfxVirtualMenu, SettingsChanged, void*, EMPTYARG )
USHORT nItemCount = pSVMenu->GetItemCount();
SfxViewFrame *pViewFrame = pBindings->GetDispatcher()->GetFrame();
BOOL bIcons = Application::GetSettings().GetStyleSettings().GetUseImagesInMenus();
- BOOL bIsHiContrastMode = IsHiContrastMode();
Reference<com::sun::star::frame::XFrame> xFrame( pViewFrame->GetFrame().GetFrameInterface() );
if ( !bIsAddonPopupMenu )
@@ -626,13 +619,13 @@ IMPL_LINK( SfxVirtualMenu, SettingsChanged, void*, EMPTYARG )
if ( pMenuAttributes )
aImageId = pMenuAttributes->aImageId; // Retrieve image id from menu attributes
- pSVMenu->SetItemImage( nSlotId, RetrieveAddOnImage( xFrame, aImageId, aCmd, FALSE, bIsHiContrastMode ));
+ pSVMenu->SetItemImage( nSlotId, RetrieveAddOnImage( xFrame, aImageId, aCmd, FALSE ));
}
else
{
rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlotId ));
- pSVMenu->SetItemImage( nSlotId, GetImage( xFrame, aSlotURL, FALSE, bWasHighContrast ));
+ pSVMenu->SetItemImage( nSlotId, GetImage( xFrame, aSlotURL, FALSE ));
}
}
else if( nType == MENUITEM_STRINGIMAGE && !bIcons )
@@ -673,7 +666,6 @@ void SfxVirtualMenu::UpdateImages()
if ( bIcons )
{
- BOOL bIsHiContrastMode = IsHiContrastMode();
USHORT nItemCount = pSVMenu->GetItemCount();
SfxViewFrame * pViewFrame = pBindings->GetDispatcher()->GetFrame();
Reference<com::sun::star::frame::XFrame> xFrame( pViewFrame->GetFrame().GetFrameInterface() );
@@ -695,13 +687,13 @@ void SfxVirtualMenu::UpdateImages()
if ( pMenuAttributes )
aImageId = pMenuAttributes->aImageId; // Retrieve image id from menu attributes
- pSVMenu->SetItemImage( nSlotId, RetrieveAddOnImage( xFrame, aImageId, aCmd, FALSE, bIsHiContrastMode ));
+ pSVMenu->SetItemImage( nSlotId, RetrieveAddOnImage( xFrame, aImageId, aCmd, FALSE ));
}
else
{
rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlotId ));
- pSVMenu->SetItemImage( nSlotId, GetImage( xFrame, aSlotURL, FALSE, bWasHighContrast ));
+ pSVMenu->SetItemImage( nSlotId, GetImage( xFrame, aSlotURL, FALSE ));
}
}
}
@@ -723,7 +715,6 @@ void SfxVirtualMenu::UpdateImages( Menu* pMenu )
BOOL bIcons = Application::GetSettings().GetStyleSettings().GetUseImagesInMenus();
if ( bIcons )
{
- BOOL bIsHiContrastMode = IsHiContrastMode();
USHORT nItemCount = pMenu->GetItemCount();
Reference<com::sun::star::frame::XFrame> aXFrame( pBindings->GetDispatcher_Impl()->GetFrame()->GetFrame().GetFrameInterface() );
@@ -741,7 +732,7 @@ void SfxVirtualMenu::UpdateImages( Menu* pMenu )
if ( pMenuAttributes )
aImageId = pMenuAttributes->aImageId; // Retrieve image id from menu attributes
- pMenu->SetItemImage( nSlotId, RetrieveAddOnImage( aXFrame, aImageId, pMenu->GetItemCommand( nSlotId ), FALSE, bIsHiContrastMode ));
+ pMenu->SetItemImage( nSlotId, RetrieveAddOnImage( aXFrame, aImageId, pMenu->GetItemCommand( nSlotId ), FALSE ));
}
if ( pPopup )
@@ -919,7 +910,7 @@ void SfxVirtualMenu::InsertAddOnsMenuItem( Menu* pMenu )
{
rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
aSlotURL += rtl::OUString::valueOf( sal_Int32( SID_ADDONS ));
- pMenu->SetItemImage( SID_ADDONS, GetImage( xFrame, aSlotURL, FALSE, bWasHighContrast ));
+ pMenu->SetItemImage( SID_ADDONS, GetImage( xFrame, aSlotURL, FALSE ));
}
}
else
@@ -1066,16 +1057,6 @@ IMPL_LINK( SfxVirtualMenu, Activate, Menu *, pMenu )
if ( pAutoDeactivate ) // QAP-Hack
pAutoDeactivate->Start();
- if ( IsHiContrastMode() != bWasHighContrast )
- {
- // Refresh images as our background color changed and remember it!!
- bWasHighContrast = IsHiContrastMode();
- if ( bIsAddonPopupMenu )
- UpdateImages( pSVMenu );
- else
- UpdateImages();
- }
-
// erledigt
return TRUE;
}
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 6209a3d..2af713c 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -1522,7 +1522,6 @@ SfxAppToolBoxControl_Impl::SfxAppToolBoxControl_Impl( USHORT nSlotId, USHORT nId
// Determine the current background color of the menus
const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
m_nSymbolsStyle = rSettings.GetSymbolsStyle();
- m_bWasHiContrastMode = rSettings.GetHighContrastMode();
m_bShowMenuImages = rSettings.GetUseImagesInMenus();
SetImage( String() );
@@ -1647,11 +1646,10 @@ void SfxAppToolBoxControl_Impl::SetImage( const String &rURL )
aURL = sFallback;
BOOL bBig = SvtMiscOptions().AreCurrentSymbolsLarge();
- BOOL bHC = GetToolBox().GetSettings().GetStyleSettings().GetHighContrastMode();
- Image aImage = SvFileInformationManager::GetImageNoDefault( INetURLObject( aURL ), bBig, bHC );
+ Image aImage = SvFileInformationManager::GetImageNoDefault( INetURLObject( aURL ), bBig );
if ( !aImage )
aImage = !!aMenuImage ? aMenuImage :
- SvFileInformationManager::GetImage( INetURLObject( aURL ), bBig, bHC );
+ SvFileInformationManager::GetImage( INetURLObject( aURL ), bBig );
Size aBigSize( GetToolBox().GetDefaultImageSize() );
if ( bBig && aImage.GetSizePixel() != aBigSize )
{
@@ -1798,15 +1796,12 @@ IMPL_LINK( SfxAppToolBoxControl_Impl, Activate, Menu *, pActMenu )
{
const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
ULONG nSymbolsStyle = rSettings.GetSymbolsStyle();
- BOOL bIsHiContrastMode = rSettings.GetHighContrastMode();
BOOL bShowMenuImages = rSettings.GetUseImagesInMenus();
if (( nSymbolsStyle != m_nSymbolsStyle ) ||
- ( bIsHiContrastMode != m_bWasHiContrastMode ) ||
( bShowMenuImages != m_bShowMenuImages ))
{
m_nSymbolsStyle = nSymbolsStyle;
- m_bWasHiContrastMode = bIsHiContrastMode;
m_bShowMenuImages = bShowMenuImages;
USHORT nCount = pActMenu->GetItemCount();
@@ -1828,7 +1823,7 @@ IMPL_LINK( SfxAppToolBoxControl_Impl, Activate, Menu *, pActMenu )
if ( aImageId.getLength() > 0 )
{
Reference< ::com::sun::star::frame::XFrame > xFrame;
- Image aImage = GetImage( xFrame, aImageId, FALSE, bIsHiContrastMode );
+ Image aImage = GetImage( xFrame, aImageId, FALSE );
if ( !!aImage )
{
bImageSet = sal_True;
@@ -1840,7 +1835,7 @@ IMPL_LINK( SfxAppToolBoxControl_Impl, Activate, Menu *, pActMenu )
if ( !bImageSet && aCmd.Len() )
{
Image aImage = SvFileInformationManager::GetImage(
- INetURLObject(aCmd), FALSE, bIsHiContrastMode );
+ INetURLObject(aCmd), FALSE );
if ( !!aImage )
pActMenu->SetItemImage( nId, aImage );
}
More information about the Libreoffice-commits
mailing list