diff options
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/customshapes/tbxcustomshapes.cxx | 4 | ||||
| -rw-r--r-- | svx/source/dialog/docrecovery.cxx | 3 | ||||
| -rw-r--r-- | svx/source/form/tbxform.cxx | 3 | ||||
| -rw-r--r-- | svx/source/inc/docrecovery.hxx | 3 | ||||
| -rw-r--r-- | svx/source/inc/fmexpl.hxx | 2 | ||||
| -rw-r--r-- | svx/source/tbxctrls/tbxalign.cxx | 4 |
6 files changed, 6 insertions, 13 deletions
diff --git a/svx/source/customshapes/tbxcustomshapes.cxx b/svx/source/customshapes/tbxcustomshapes.cxx index 36854b1501..0f9d3c4a14 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 b242c2e048..63a60d8de0 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 8080486709..beb9ec0bb9 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 c6e41176a5..66c70cbb4e 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 160f3e09eb..30c4fe366c 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 f35550d21b..182c2fcd98 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 ); } |