summaryrefslogtreecommitdiff
path: root/svx/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2010-11-16 14:33:19 +0000
committerCaolán McNamara <caolanm@redhat.com>2010-11-16 14:38:03 +0000
commitc04f8c48e69f01622a2104d7f91dfd7de25d560f (patch)
tree5064c222099f0f7745f3fb03a8ee5621018ad106 /svx/source
parente040c1a075fd3dfbe5d496a4eec349a0dd0795ee (diff)
get this building again
Diffstat (limited to 'svx/source')
-rw-r--r--svx/source/customshapes/tbxcustomshapes.cxx4
-rw-r--r--svx/source/dialog/docrecovery.cxx3
-rw-r--r--svx/source/form/tbxform.cxx3
-rw-r--r--svx/source/inc/docrecovery.hxx3
-rw-r--r--svx/source/inc/fmexpl.hxx2
-rw-r--r--svx/source/tbxctrls/tbxalign.cxx4
6 files changed, 6 insertions, 13 deletions
diff --git a/svx/source/customshapes/tbxcustomshapes.cxx b/svx/source/customshapes/tbxcustomshapes.cxx
index 334b3ffd0841..bcaf8a6f80ac 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 5921ff2b8846..dc19ea73af5e 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 f86842aaa99b..895a09d54f55 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 8214911cb699..fd3b1adc024d 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 2fe48a2c9615..6b65aaf49836 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 428a57fc0817..a4d528a70eca 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 );
}