diff options
Diffstat (limited to 'chart2/source/controller/dialogs/tp_ChartType.cxx')
-rw-r--r-- | chart2/source/controller/dialogs/tp_ChartType.cxx | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index d82879a93080..728e7e6cf443 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.cxx +++ b/chart2/source/controller/dialogs/tp_ChartType.cxx @@ -56,15 +56,6 @@ namespace chart using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; -// macro for selecting a normal or high contrast bitmap the stack variable -// bIsHighContrast must exist and reflect the correct state -#define SELECT_BITMAP(name) Bitmap( SchResId( bIsHighContrast ? name ## _HC : name )) -#define SELECT_IMAGE(name) Image( SchResId( bIsHighContrast ? name ## _HC : name )) - -//-------------------------------------------------------------------------- -//-------------------------------------------------------------------------- -//-------------------------------------------------------------------------- - namespace { long lcl_getDistance() @@ -850,8 +841,6 @@ ChartTypeTabPage::ChartTypeTabPage( Window* pParent m_aSubTypeList.SetColCount(4); m_aSubTypeList.SetLineCount(1); - bool bIsHighContrast = ( true && GetSettings().GetStyleSettings().GetHighContrastMode() ); - bool bDisableComplexChartTypes = false; uno::Reference< beans::XPropertySet > xProps( m_xChartModel, uno::UNO_QUERY ); if ( xProps.is() ) @@ -887,7 +876,7 @@ ChartTypeTabPage::ChartTypeTabPage( Window* pParent const ::std::vector< ChartTypeDialogController* >::const_iterator aEnd = m_aChartTypeDialogControllerList.end(); for( ; aIter != aEnd; aIter++ ) { - m_aMainTypeList.InsertEntry( (*aIter)->getName(), (*aIter)->getImage( bIsHighContrast ) ); + m_aMainTypeList.InsertEntry( (*aIter)->getName(), (*aIter)->getImage() ); (*aIter)->setChangeListener( this ); } @@ -1085,10 +1074,7 @@ void ChartTypeTabPage::fillAllControls( const ChartTypeParameter& rParameter, bo { m_nChangingCalls++; if( m_pCurrentMainType && bAlsoResetSubTypeList ) - { - bool bIsHighContrast = ( true && GetSettings().GetStyleSettings().GetHighContrastMode() ); - m_pCurrentMainType->fillSubTypeList( m_aSubTypeList, bIsHighContrast, rParameter ); - } + m_pCurrentMainType->fillSubTypeList( m_aSubTypeList, rParameter ); m_aSubTypeList.SelectItem( static_cast<USHORT>( rParameter.nSubTypeIndex) ); m_pAxisTypeResourceGroup->fillControls( rParameter ); m_pDim3DLookResourceGroup->fillControls( rParameter ); |