[Libreoffice-commits] .: chart2/source
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Nov 16 03:57:33 PST 2010
chart2/source/controller/dialogs/ChartTypeDialogController.cxx | 77 +++-------
chart2/source/controller/dialogs/ChartTypeDialogController.hxx | 44 ++---
chart2/source/controller/dialogs/DataBrowser.cxx | 24 ---
chart2/source/controller/dialogs/dlg_DataEditor.cxx | 2
chart2/source/controller/dialogs/dlg_DataEditor.src | 2
chart2/source/controller/dialogs/res_Trendline.cxx | 10 -
chart2/source/controller/dialogs/tp_ChartType.cxx | 9 -
7 files changed, 62 insertions(+), 106 deletions(-)
New commits:
commit 5e1fee852fed17b34cc52c8ea22290b97b7da50f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Nov 16 11:57:23 2010 +0000
get this to build and remove warnings etc
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index 2acbab0..dced722 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -135,7 +135,7 @@ ChartTypeDialogController::ChartTypeDialogController()
ChartTypeDialogController::~ChartTypeDialogController()
{
}
-Image ChartTypeDialogController::getImage( bool /*bIsHighContrast*/ )
+Image ChartTypeDialogController::getImage()
{
return Image();
}
@@ -361,7 +361,7 @@ bool ChartTypeDialogController::commitToModel( const ChartTypeParameter& rParame
}
return false;
}
-void ChartTypeDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool /*bIsHighContrast*/, const ChartTypeParameter& /*rParameter*/ )
+void ChartTypeDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& /*rParameter*/ )
{
rSubTypeList.Clear();
}
@@ -443,10 +443,7 @@ String ColumnChartDialogController::getName()
{
return String( SchResId( STR_TYPE_COLUMN ));
}
-/*
- * @param bIsHighContrast, this is now an unused noop. FIXME, remove carefully.
- */
-Image ColumnChartDialogController::getImage( bool bIsHighContrast )
+Image ColumnChartDialogController::getImage()
{
return Image( SchResId( IMG_TYPE_COLUMN ));
}
@@ -464,7 +461,7 @@ const tTemplateServiceChartTypeParameterMap& ColumnChartDialogController::getTem
;
return m_aTemplateMap;
}
-void ColumnChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter )
+void ColumnChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter )
{
rSubTypeList.Clear();
@@ -523,10 +520,7 @@ String BarChartDialogController::getName()
{
return String( SchResId( STR_TYPE_BAR ));
}
-/**
- * @param bIsHighContrast This is now an unused Noop. FIXME: remove carefully
- */
-Image BarChartDialogController::getImage( bool bIsHighContrast )
+Image BarChartDialogController::getImage()
{
return Image( SchResId( IMG_TYPE_BAR ));
}
@@ -544,7 +538,7 @@ const tTemplateServiceChartTypeParameterMap& BarChartDialogController::getTempla
;
return m_aTemplateMap;
}
-void BarChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter )
+void BarChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter )
{
rSubTypeList.Clear();
@@ -602,10 +596,7 @@ String PieChartDialogController::getName()
{
return String( SchResId( STR_TYPE_PIE ));
}
-/**
- * @param bIsHighContrast: This is now an unused Noop. FIXME, remove carefully.
- */
-Image PieChartDialogController::getImage( bool bIsHighContrast )
+Image PieChartDialogController::getImage()
{
return Image( SchResId( IMG_TYPE_PIE ));
}
@@ -624,7 +615,7 @@ const tTemplateServiceChartTypeParameterMap& PieChartDialogController::getTempla
;
return m_aTemplateMap;
}
-void PieChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter )
+void PieChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter )
{
rSubTypeList.Clear();
@@ -667,10 +658,7 @@ String LineChartDialogController::getName()
{
return String( SchResId( STR_TYPE_LINE ));
}
-/**
- * @param bIsHighContrast: This is now an noop. FIXME: please remove carefully.
- */
-Image LineChartDialogController::getImage( bool bIsHighContrast )
+Image LineChartDialogController::getImage()
{
return Image( SchResId( IMG_TYPE_LINE ));
}
@@ -697,7 +685,7 @@ const tTemplateServiceChartTypeParameterMap& LineChartDialogController::getTempl
;
return m_aTemplateMap;
}
-void LineChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter )
+void LineChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter )
{
rSubTypeList.Clear();
@@ -803,7 +791,7 @@ String XYChartDialogController::getName()
{
return String( SchResId( STR_TYPE_XY ));
}
-Image XYChartDialogController::getImage( bool bIsHighContrast )
+Image XYChartDialogController::getImage()
{
return Image( SchResId( IMG_TYPE_XY ));
}
@@ -819,7 +807,7 @@ const tTemplateServiceChartTypeParameterMap& XYChartDialogController::getTemplat
;
return m_aTemplateMap;
}
-void XYChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter )
+void XYChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter )
{
rSubTypeList.Clear();
@@ -890,10 +878,7 @@ String AreaChartDialogController::getName()
{
return String( SchResId( STR_TYPE_AREA ));
}
-/**
- * @param: bIsHighContrast: This is now an unused noop. FIXME, please remove carefully.
- */
-Image AreaChartDialogController::getImage( bool bIsHighContrast )
+Image AreaChartDialogController::getImage()
{
return Image( SchResId( IMG_TYPE_AREA ));
}
@@ -914,15 +899,15 @@ const tTemplateServiceChartTypeParameterMap& AreaChartDialogController::getTempl
;
return m_aTemplateMap;
}
-void AreaChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter )
+void AreaChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter )
{
rSubTypeList.Clear();
if( rParameter.b3DLook )
{
- rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_AREAS_3D ) );
- rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_AREAS_3D_1 ) );
- rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_AREAS_3D_2 ) );
+ rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_AREAS_3D )));
+ rSubTypeList.InsertItem( 2, Bitmap( SchResId( BMP_AREAS_3D_1 )));
+ rSubTypeList.InsertItem( 3, Bitmap( SchResId( BMP_AREAS_3D_2 )));
}
else
{
@@ -976,10 +961,7 @@ String NetChartDialogController::getName()
{
return String( SchResId( STR_TYPE_NET ));
}
-/**
- * @param bIsHighContrast this is now an unused noop. Please remove carefully.
- */
-Image NetChartDialogController::getImage( bool bIsHighContrast )
+Image NetChartDialogController::getImage()
{
return Image( SchResId( IMG_TYPE_NET ));
}
@@ -1010,7 +992,7 @@ const tTemplateServiceChartTypeParameterMap& NetChartDialogController::getTempla
;
return m_aTemplateMap;
}
-void NetChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter )
+void NetChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter )
{
rSubTypeList.Clear();
@@ -1072,10 +1054,7 @@ String StockChartDialogController::getName()
{
return String( SchResId( STR_TYPE_STOCK ));
}
-/**
- * @param bIsHighContrast this is now an unused noop. FIXME, please remove carefully.
- */
-Image StockChartDialogController::getImage( bool bIsHighContrast )
+Image StockChartDialogController::getImage()
{
return Image( SchResId( IMG_TYPE_STOCK ));
}
@@ -1090,7 +1069,7 @@ const tTemplateServiceChartTypeParameterMap& StockChartDialogController::getTemp
;
return m_aTemplateMap;
}
-void StockChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& /*rParameter*/ )
+void StockChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& /*rParameter*/ )
{
rSubTypeList.Clear();
rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_STOCK_1 )));
@@ -1126,10 +1105,7 @@ String CombiColumnLineChartDialogController::getName()
{
return String( SchResId( STR_TYPE_COMBI_COLUMN_LINE ));
}
-/**
- * @param bIsHighContrast this is now an unused noop. FIXME, please remove carefully
- */
-Image CombiColumnLineChartDialogController::getImage( bool bIsHighContrast )
+Image CombiColumnLineChartDialogController::getImage()
{
return Image( SchResId( IMG_TYPE_COLUMN_LINE ));
}
@@ -1142,7 +1118,7 @@ const tTemplateServiceChartTypeParameterMap& CombiColumnLineChartDialogControlle
;
return m_aTemplateMap;
}
-void CombiColumnLineChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& /*rParameter*/ )
+void CombiColumnLineChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& /*rParameter*/ )
{
rSubTypeList.Clear();
rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_COLUMN_LINE )));
@@ -1269,10 +1245,7 @@ String BubbleChartDialogController::getName()
{
return String( SchResId( STR_TYPE_BUBBLE ));
}
-/**
- * @param bIsHighContrast this is now a noop. FIXME, please remove carefully
- */
-Image BubbleChartDialogController::getImage( bool bIsHighContrast )
+Image BubbleChartDialogController::getImage()
{
return Image( SchResId( IMG_TYPE_BUBBLE ));
}
@@ -1283,7 +1256,7 @@ const tTemplateServiceChartTypeParameterMap& BubbleChartDialogController::getTem
( C2U( "com.sun.star.chart2.template.Bubble" ), ChartTypeParameter(1,true) ) ;
return m_aTemplateMap;
}
-void BubbleChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& /*rParameter*/ )
+void BubbleChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& /*rParameter*/ )
{
rSubTypeList.Clear();
rSubTypeList.InsertItem( 1, Bitmap( SchResId( BMP_BUBBLE_1 )));
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
index 64b684a..d8aec2a 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
@@ -103,9 +103,9 @@ public:
virtual ~ChartTypeDialogController();
virtual String getName()=0;
- virtual Image getImage( bool bIsHighContrast );
+ virtual Image getImage();
virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const = 0;
- virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter );
+ virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
virtual bool shouldShow_XAxisTypeControl() const;
virtual bool shouldShow_3DLookControl() const;
@@ -159,9 +159,9 @@ public:
virtual ~ColumnChartDialogController();
virtual String getName();
- virtual Image getImage( bool bIsHighContrast );
+ virtual Image getImage();
virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
- virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter );
+ virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
};
class BarChartDialogController : public ColumnOrBarChartDialogController_Base
@@ -171,9 +171,9 @@ public:
virtual ~BarChartDialogController();
virtual String getName();
- virtual Image getImage( bool bIsHighContrast );
+ virtual Image getImage();
virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
- virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter );
+ virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
};
class PieChartDialogController : public ChartTypeDialogController
@@ -183,9 +183,9 @@ public:
virtual ~PieChartDialogController();
virtual String getName();
- virtual Image getImage( bool bIsHighContrast );
+ virtual Image getImage();
virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
- virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter );
+ virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
virtual void adjustParameterToSubType( ChartTypeParameter& rParameter );
virtual bool shouldShow_3DLookControl() const;
@@ -198,9 +198,9 @@ public:
virtual ~LineChartDialogController();
virtual String getName();
- virtual Image getImage( bool bIsHighContrast );
+ virtual Image getImage();
virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
- virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter );
+ virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
virtual void adjustParameterToSubType( ChartTypeParameter& rParameter );
virtual void adjustParameterToMainType( ChartTypeParameter& rParameter );
@@ -216,9 +216,9 @@ public:
virtual ~XYChartDialogController();
virtual String getName();
- virtual Image getImage( bool bIsHighContrast );
+ virtual Image getImage();
virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
- virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter );
+ virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
virtual void adjustParameterToSubType( ChartTypeParameter& rParameter );
virtual bool shouldShow_SplineControl() const;
@@ -232,9 +232,9 @@ public:
virtual ~AreaChartDialogController();
virtual String getName();
- virtual Image getImage( bool bIsHighContrast );
+ virtual Image getImage();
virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
- virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter );
+ virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
virtual void adjustParameterToSubType( ChartTypeParameter& rParameter );
virtual void adjustParameterToMainType( ChartTypeParameter& rParameter );
@@ -248,9 +248,9 @@ public:
virtual ~NetChartDialogController();
virtual String getName();
- virtual Image getImage( bool bIsHighContrast );
+ virtual Image getImage();
virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
- virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter );
+ virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
virtual void adjustParameterToSubType( ChartTypeParameter& rParameter );
virtual bool shouldShow_StackingControl() const;
@@ -263,9 +263,9 @@ public:
virtual ~StockChartDialogController();
virtual String getName();
- virtual Image getImage( bool bIsHighContrast );
+ virtual Image getImage();
virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
- virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter );
+ virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
virtual void adjustParameterToSubType( ChartTypeParameter& rParameter );
};
@@ -276,9 +276,9 @@ public:
virtual ~CombiColumnLineChartDialogController();
virtual String getName();
- virtual Image getImage( bool bIsHighContrast );
+ virtual Image getImage();
virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
- virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter );
+ virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
virtual void adjustParameterToSubType( ChartTypeParameter& rParameter );
virtual void showExtraControls( Window* pParent, const Point& rPosition, const Size& rSize );
@@ -304,9 +304,9 @@ public:
virtual ~BubbleChartDialogController();
virtual String getName();
- virtual Image getImage( bool bIsHighContrast );
+ virtual Image getImage();
virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
- virtual void fillSubTypeList( ValueSet& rSubTypeList, bool bIsHighContrast, const ChartTypeParameter& rParameter );
+ virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter );
virtual void adjustParameterToSubType( ChartTypeParameter& rParameter );
};
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 8f05899..d10a1ea 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -176,8 +176,7 @@ public:
void SetPos( const Point & rPos );
void SetWidth( sal_Int32 nWidth );
void SetChartType( const Reference< chart2::XChartType > & xChartType,
- bool bSwapXAndYAxis,
- bool bIsHighContrast );
+ bool bSwapXAndYAxis );
void SetSeriesName( const String & rName );
void SetRange( sal_Int32 nStartCol, sal_Int32 nEndCol );
@@ -213,11 +212,9 @@ private:
DECL_LINK( SeriesNameChanged, void * );
DECL_LINK( SeriesNameEdited, void * );
- /// @param bHC </TRUE> for hight-contrast image
static Image GetChartTypeImage(
const Reference< chart2::XChartType > & xChartType,
- bool bSwapXAndYAxis,
- bool bHC );
+ bool bSwapXAndYAxis);
sal_Int32 m_nStartCol, m_nEndCol;
sal_Int32 m_nWidth;
@@ -323,10 +320,9 @@ void SeriesHeader::SetPixelWidth( sal_Int32 nWidth )
void SeriesHeader::SetChartType(
const Reference< chart2::XChartType > & xChartType,
- bool bSwapXAndYAxis,
- bool bIsHighContrast )
+ bool bSwapXAndYAxis )
{
- m_spSymbol->SetImage( GetChartTypeImage( xChartType, bSwapXAndYAxis, bIsHighContrast ));
+ m_spSymbol->SetImage(GetChartTypeImage(xChartType, bSwapXAndYAxis));
}
void SeriesHeader::SetSeriesName( const String & rName )
@@ -385,13 +381,9 @@ bool SeriesHeader::HasFocus() const
return m_spSeriesName->HasFocus();
}
-/**
- * @param bHC is a noop. FIXME, remove carefully
- */
Image SeriesHeader::GetChartTypeImage(
const Reference< chart2::XChartType > & xChartType,
- bool bSwapXAndYAxis,
- bool bHC )
+ bool bSwapXAndYAxis)
{
Image aResult;
if( !xChartType.is())
@@ -626,7 +618,6 @@ void DataBrowser::RenewTable()
const DataBrowserModel::tDataHeaderVector& aHeaders( m_apDataBrowserModel->getDataHeaders());
Link aFocusLink( LINK( this, DataBrowser, SeriesHeaderGotFocus ));
Link aSeriesHeaderChangedLink( LINK( this, DataBrowser, SeriesHeaderChanged ));
- bool bIsHighContrast = pWin ? (pWin->GetSettings().GetStyleSettings().GetHighContrastMode()) : false;
for( DataBrowserModel::tDataHeaderVector::const_iterator aIt( aHeaders.begin());
aIt != aHeaders.end(); ++aIt )
@@ -638,7 +629,7 @@ void DataBrowser::RenewTable()
if( xSeriesProp.is() &&
( xSeriesProp->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("Color"))) >>= nColor ))
spHeader->SetColor( Color( nColor ));
- spHeader->SetChartType( aIt->m_xChartType, aIt->m_bSwapXAndYAxis, bIsHighContrast );
+ spHeader->SetChartType( aIt->m_xChartType, aIt->m_bSwapXAndYAxis );
spHeader->SetSeriesName(
String( DataSeriesHelper::getDataSeriesLabel(
aIt->m_xDataSeries,
@@ -1244,7 +1235,6 @@ void DataBrowser::RenewSeriesHeaders()
DataBrowserModel::tDataHeaderVector aHeaders( m_apDataBrowserModel->getDataHeaders());
Link aFocusLink( LINK( this, DataBrowser, SeriesHeaderGotFocus ));
Link aSeriesHeaderChangedLink( LINK( this, DataBrowser, SeriesHeaderChanged ));
- bool bIsHighContrast = pWin ? (pWin->GetSettings().GetStyleSettings().GetHighContrastMode()) : false;
for( DataBrowserModel::tDataHeaderVector::const_iterator aIt( aHeaders.begin());
aIt != aHeaders.end(); ++aIt )
@@ -1255,7 +1245,7 @@ void DataBrowser::RenewSeriesHeaders()
if( xSeriesProp.is() &&
( xSeriesProp->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("Color"))) >>= nColor ))
spHeader->SetColor( Color( nColor ));
- spHeader->SetChartType( aIt->m_xChartType, aIt->m_bSwapXAndYAxis, bIsHighContrast );
+ spHeader->SetChartType( aIt->m_xChartType, aIt->m_bSwapXAndYAxis );
spHeader->SetSeriesName(
String( DataSeriesHelper::getDataSeriesLabel(
aIt->m_xDataSeries,
diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
index 9744b45..f9c2b26 100644
--- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
@@ -69,7 +69,7 @@ DataEditor::DataEditor(
m_aTbxData( this, SchResId( TBX_DATA )),
m_xChartDoc( xChartDoc ),
m_xContext( xContext ),
- m_aToolboxImageList( SchResId( IL_DIAGRAM_DATA )),
+ m_aToolboxImageList( SchResId( IL_DIAGRAM_DATA ))
{
FreeResource();
diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.src b/chart2/source/controller/dialogs/dlg_DataEditor.src
index 552fbb4..3950092 100644
--- a/chart2/source/controller/dialogs/dlg_DataEditor.src
+++ b/chart2/source/controller/dialogs/dlg_DataEditor.src
@@ -31,8 +31,6 @@
// Mask Color for standard images
#define IMAGE_BUTTON_STD_MASK_COLOR Color { Red = 0xff00; Green = 0x0000; Blue = 0xff00; }
-// Mask Color for high-contrast images
-#define IMAGE_BUTTON_HC_MASK_COLOR IMAGE_BUTTON_STD_MASK_COLOR
#define ADDITIONAL_SPACE_ABOVE_TABLE 17
diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx b/chart2/source/controller/dialogs/res_Trendline.cxx
index c4c3674..6d3b4fa 100644
--- a/chart2/source/controller/dialogs/res_Trendline.cxx
+++ b/chart2/source/controller/dialogs/res_Trendline.cxx
@@ -256,11 +256,11 @@ BOOL TrendlineResources::FillItemSet(SfxItemSet& rOutAttrs) const
void TrendlineResources::FillValueSets()
{
if( m_bNoneAvailable )
- m_aFINone.SetImage( Image( SchResId( BMP_REGRESSION_NONE ));
- m_aFILinear.SetImage( Image( SchResId( BMP_REGRESSION_LINEAR ));
- m_aFILogarithmic.SetImage( Image( SchResId( BMP_REGRESSION_LOG ));
- m_aFIExponential.SetImage( Image( SchResId( BMP_REGRESSION_EXP ));
- m_aFIPower.SetImage( Image( SchResId( BMP_REGRESSION_POWER ));
+ m_aFINone.SetImage( Image( SchResId( BMP_REGRESSION_NONE )) );
+ m_aFILinear.SetImage( Image( SchResId( BMP_REGRESSION_LINEAR )) );
+ m_aFILogarithmic.SetImage( Image( SchResId( BMP_REGRESSION_LOG )) );
+ m_aFIExponential.SetImage( Image( SchResId( BMP_REGRESSION_EXP )) );
+ m_aFIPower.SetImage( Image( SchResId( BMP_REGRESSION_POWER )) );
}
void TrendlineResources::UpdateControlStates()
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 1b0811c..9d23c00 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -841,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() )
@@ -878,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 );
}
@@ -1076,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 );
More information about the Libreoffice-commits
mailing list