b*, c*: load BitmapEx resources instead of Image ones

Change-Id: Idbf99de17e5349712ef7c3da3ce8bb8b5f879ef7

7 files changed, 176 insertions, 154 deletions

diff --git a/chart2/source/controller/dialogs/Bitmaps.hrc b/chart2/source/controller/dialogs/Bitmaps.hrc
index 0c3f323d7032..78550d54807b 100644
--- a/chart2/source/controller/dialogs/Bitmaps.hrc
+++ b/chart2/source/controller/dialogs/Bitmaps.hrc
@@ -21,25 +21,6 @@
 
 #include <svl/solar.hrc>
 
-// chart types
-// Images:
-
-#define IMG_TYPE_COLUMN (RID_APP_START + 1)
-#define IMG_TYPE_BAR    (RID_APP_START + 2)
-#define IMG_TYPE_PIE    (RID_APP_START + 3)
-#define IMG_TYPE_AREA   (RID_APP_START + 4)
-#define IMG_TYPE_LINE   (RID_APP_START + 5)
-#define IMG_TYPE_XY     (RID_APP_START + 6)
-#define IMG_TYPE_BUBBLE (RID_APP_START + 7)
-#define IMG_TYPE_NET    (RID_APP_START + 8)
-#define IMG_TYPE_STOCK  (RID_APP_START + 9)
-#define IMG_TYPE_COLUMN_LINE  (RID_APP_START + 10)
-#define IMG_TYPE_GL3D_BAR (RID_APP_START + 11)
-#define IMG_STEP_START  (RID_APP_START + 12)
-#define IMG_STEP_END    (RID_APP_START + 13)
-#define IMG_STEP_CENTER_X (RID_APP_START + 14)
-#define IMG_STEP_CENTER_Y (RID_APP_START + 15)
-
 //Chart Subtypes
 // Bitmaps:
 
@@ -188,14 +169,6 @@
 
 //further Images:
 
-//SchStatisticTabPage and SchDataStatisticsDlg part 1
-#define BMP_INDICATE_BOTH_VERTI (RID_APP_START + 89)
-#define BMP_INDICATE_UP (RID_APP_START + 90)
-#define BMP_INDICATE_DOWN (RID_APP_START + 91)
-#define BMP_INDICATE_BOTH_HORI (RID_APP_START + 97)
-#define BMP_INDICATE_RIGHT (RID_APP_START + 98)
-#define BMP_INDICATE_LEFT (RID_APP_START + 99)
-
 //SchStatisticTabPage and SchDataStatisticsDlg part 2
 #define BMP_REGRESSION_NONE             (RID_APP_START + 92)
 #define BMP_REGRESSION_LINEAR           (RID_APP_START + 93)
@@ -205,6 +178,34 @@
 #define BMP_REGRESSION_POLYNOMIAL       (RID_APP_START + 110)
 #define BMP_REGRESSION_MOVING_AVERAGE   (RID_APP_START + 111)
 
+// chart types
+// Images:
+
+#define BMP_TYPE_COLUMN (RID_APP_START + 112)
+#define BMP_TYPE_BAR    (RID_APP_START + 113)
+#define BMP_TYPE_PIE    (RID_APP_START + 114)
+#define BMP_TYPE_AREA   (RID_APP_START + 115)
+#define BMP_TYPE_LINE   (RID_APP_START + 116)
+#define BMP_TYPE_XY     (RID_APP_START + 117)
+#define BMP_TYPE_BUBBLE (RID_APP_START + 118)
+#define BMP_TYPE_NET    (RID_APP_START + 119)
+#define BMP_TYPE_STOCK  (RID_APP_START + 120)
+#define BMP_TYPE_COLUMN_LINE  (RID_APP_START + 131)
+#define BMP_TYPE_GL3D_BAR (RID_APP_START + 132)
+#define BMP_STEP_START  (RID_APP_START + 133)
+#define BMP_STEP_END    (RID_APP_START + 134)
+#define BMP_STEP_CENTER_X (RID_APP_START + 135)
+#define BMP_STEP_CENTER_Y (RID_APP_START + 136)
+
+//SchStatisticTabPage and SchDataStatisticsDlg part 1
+#define BMP_INDICATE_BOTH_VERTI (RID_APP_START + 137)
+#define BMP_INDICATE_UP (RID_APP_START + 138)
+#define BMP_INDICATE_DOWN (RID_APP_START + 139)
+#define BMP_INDICATE_BOTH_HORI (RID_APP_START + 140)
+#define BMP_INDICATE_RIGHT (RID_APP_START + 141)
+#define BMP_INDICATE_LEFT (RID_APP_START + 142)
+
+
 // CHART_BITMAPS_HRC
 #endif
 
diff --git a/chart2/source/controller/dialogs/Bitmaps.src b/chart2/source/controller/dialogs/Bitmaps.src
index 05ae95e9e33f..0f1373547299 100644
--- a/chart2/source/controller/dialogs/Bitmaps.src
+++ b/chart2/source/controller/dialogs/Bitmaps.src
@@ -18,66 +18,81 @@
  */
 #include "Bitmaps.hrc"
 
-Image IMG_TYPE_COLUMN
+Bitmap BMP_TYPE_COLUMN
 {
-    ImageBitmap = Bitmap { File = "typecolumn_16.png" ; };
+    File = "typecolumn_16.png";
 };
-Image IMG_TYPE_BAR
+
+Bitmap BMP_TYPE_BAR
 {
-    ImageBitmap = Bitmap { File = "typebar_16.png" ; };
+    File = "typebar_16.png";
 };
-Image IMG_TYPE_PIE
+
+Bitmap BMP_TYPE_PIE
 {
-    ImageBitmap = Bitmap { File = "typepie_16.png" ; };
+    File = "typepie_16.png";
 };
-Image IMG_TYPE_LINE
+
+Bitmap BMP_TYPE_LINE
 {
-    ImageBitmap = Bitmap { File = "typepointline_16.png" ; };
+    File = "typepointline_16.png";
 };
-Image IMG_TYPE_XY
+
+Bitmap BMP_TYPE_XY
 {
-    ImageBitmap = Bitmap { File = "typexy_16.png" ; };
+    File = "typexy_16.png";
 };
-Image IMG_TYPE_AREA
+
+Bitmap BMP_TYPE_AREA
 {
-    ImageBitmap = Bitmap { File = "typearea_16.png" ; };
+    File = "typearea_16.png";
 };
-Image IMG_TYPE_NET
+
+Bitmap BMP_TYPE_NET
 {
-    ImageBitmap = Bitmap { File = "typenet_16.png" ; };
+    File = "typenet_16.png";
 };
-Image IMG_TYPE_STOCK
+
+Bitmap BMP_TYPE_STOCK
 {
-    ImageBitmap = Bitmap { File = "typestock_16.png" ; };
+    File = "typestock_16.png";
 };
-Image IMG_TYPE_COLUMN_LINE
+
+Bitmap BMP_TYPE_COLUMN_LINE
 {
-    ImageBitmap = Bitmap { File = "typecolumnline_16.png" ; };
+    File = "typecolumnline_16.png";
 };
-Image IMG_TYPE_BUBBLE
+
+Bitmap BMP_TYPE_BUBBLE
 {
-    ImageBitmap = Bitmap { File = "typebubble_16.png" ; };
+    File = "typebubble_16.png";
 };
-Image IMG_TYPE_GL3D_BAR
+
+Bitmap BMP_TYPE_GL3D_BAR
 {
-    ImageBitmap = Bitmap { File = "typegl3dbar_16.png" ; };
+    File = "typegl3dbar_16.png";
 };
-Image IMG_STEP_START
+
+Bitmap BMP_STEP_START
 {
-    ImageBitmap = Bitmap { File = "step_start_30.png" ; };
+    File = "step_start_30.png";
 };
-Image IMG_STEP_END
+
+Bitmap BMP_STEP_END
 {
-    ImageBitmap = Bitmap { File = "step_end_30.png" ; };
+    File = "step_end_30.png";
 };
-Image IMG_STEP_CENTER_X
+
+Bitmap BMP_STEP_CENTER_X
 {
-    ImageBitmap = Bitmap { File = "step_center_x_30.png" ; };
+    File = "step_center_x_30.png";
 };
-Image IMG_STEP_CENTER_Y
+
+Bitmap BMP_STEP_CENTER_Y
 {
-    ImageBitmap = Bitmap { File = "step_center_y_30.png" ; };
+    File = "step_center_y_30.png";
 };
+
 Bitmap BMP_BUBBLE_1
 {
     File = "bubble_52x60.png" ;
@@ -180,6 +195,7 @@ Bitmap BMP_COLUMNS_2D_1
 {
     File = "columns_52x60.png" ;
 };
+
 Bitmap BMP_COLUMNS_2D_2
 {
     File = "columnstack_52x60.png" ;
@@ -491,98 +507,70 @@ Bitmap BMP_STOCK_4
 };
 
 //error indicator
-Image BMP_INDICATE_BOTH_VERTI
+Bitmap BMP_INDICATE_BOTH_VERTI
 {
-    ImageBitmap = Bitmap
-    {
-        File = "errorbothverti_30.png" ;
-    };
+    File = "errorbothverti_30.png" ;
 };
-Image BMP_INDICATE_DOWN
+
+Bitmap BMP_INDICATE_DOWN
 {
-    ImageBitmap = Bitmap
-    {
-        File = "errordown_30.png" ;
-    };
+    File = "errordown_30.png" ;
 };
-Image BMP_INDICATE_UP
+
+Bitmap BMP_INDICATE_UP
 {
-    ImageBitmap = Bitmap
-    {
-        File = "errorup_30.png" ;
-    };
+    File = "errorup_30.png" ;
 };
-Image BMP_INDICATE_BOTH_HORI
+
+Bitmap BMP_INDICATE_BOTH_HORI
 {
-    ImageBitmap = Bitmap
-    {
-        File = "errorbothhori_30.png" ;
-    };
+    File = "errorbothhori_30.png" ;
 };
-Image BMP_INDICATE_RIGHT
+
+Bitmap BMP_INDICATE_RIGHT
 {
-    ImageBitmap = Bitmap
-    {
-        File = "errorright_30.png" ;
-    };
+    File = "errorright_30.png" ;
 };
-Image BMP_INDICATE_LEFT
+
+Bitmap BMP_INDICATE_LEFT
 {
-    ImageBitmap = Bitmap
-    {
-        File = "errorleft_30.png" ;
-    };
+    File = "errorleft_30.png" ;
 };
 
 //regression curves
-Image BMP_REGRESSION_NONE
+Bitmap BMP_REGRESSION_NONE
 {
-    ImageBitmap = Bitmap
-    {
-        File = "regno.png" ;
-    };
+    File = "regno.png" ;
 };
-Image BMP_REGRESSION_LINEAR
+
+Bitmap BMP_REGRESSION_LINEAR
 {
-    ImageBitmap = Bitmap
-    {
-        File = "reglin.png" ;
-    };
+    File = "reglin.png" ;
 };
-Image BMP_REGRESSION_LOG
+
+Bitmap BMP_REGRESSION_LOG
 {
-    ImageBitmap = Bitmap
-    {
-        File = "reglog.png" ;
-    };
+    File = "reglog.png" ;
 };
-Image BMP_REGRESSION_EXP
+
+Bitmap BMP_REGRESSION_EXP
 {
-    ImageBitmap = Bitmap
-    {
-        File = "regexp.png" ;
-    };
+    File = "regexp.png" ;
 };
-Image BMP_REGRESSION_POWER
+
+Bitmap BMP_REGRESSION_POWER
 {
-    ImageBitmap = Bitmap
-    {
-        File = "regpow.png" ;
-    };
+    File = "regpow.png" ;
 };
-Image BMP_REGRESSION_POLYNOMIAL
+
+Bitmap BMP_REGRESSION_POLYNOMIAL
 {
-    ImageBitmap = Bitmap
-    {
-        File = "regpoly.png" ;
-    };
+    File = "regpoly.png" ;
 };
-Image BMP_REGRESSION_MOVING_AVERAGE
+
+Bitmap BMP_REGRESSION_MOVING_AVERAGE
 {
-    ImageBitmap = Bitmap
-    {
-        File = "regavg.png" ;
-    };
+    File = "regavg.png";
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index 0956589ee991..b9b82fc0705d 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -439,10 +439,12 @@ OUString ColumnChartDialogController::getName()
 {
     return SCH_RESSTR( STR_TYPE_COLUMN );
 }
+
 Image ColumnChartDialogController::getImage()
 {
-    return Image( SchResId( IMG_TYPE_COLUMN ));
+    return Image(BitmapEx(SchResId(BMP_TYPE_COLUMN)));
 }
+
 const tTemplateServiceChartTypeParameterMap& ColumnChartDialogController::getTemplateMap() const
 {
     static tTemplateServiceChartTypeParameterMap s_aTemplateMap{
@@ -505,17 +507,21 @@ void ColumnChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const
 BarChartDialogController::BarChartDialogController()
 {
 }
+
 BarChartDialogController::~BarChartDialogController()
 {
 }
+
 OUString BarChartDialogController::getName()
 {
     return SCH_RESSTR( STR_TYPE_BAR );
 }
+
 Image BarChartDialogController::getImage()
 {
-    return Image( SchResId( IMG_TYPE_BAR ));
+    return Image(BitmapEx(SchResId(BMP_TYPE_BAR)));
 }
+
 const tTemplateServiceChartTypeParameterMap& BarChartDialogController::getTemplateMap() const
 {
     static tTemplateServiceChartTypeParameterMap s_aTemplateMap{
@@ -586,7 +592,7 @@ OUString PieChartDialogController::getName()
 }
 Image PieChartDialogController::getImage()
 {
-    return Image( SchResId( IMG_TYPE_PIE ));
+    return Image(BitmapEx(SchResId(BMP_TYPE_PIE)));
 }
 const tTemplateServiceChartTypeParameterMap& PieChartDialogController::getTemplateMap() const
 {
@@ -644,10 +650,12 @@ OUString LineChartDialogController::getName()
 {
     return SCH_RESSTR( STR_TYPE_LINE );
 }
+
 Image LineChartDialogController::getImage()
 {
-    return Image( SchResId( IMG_TYPE_LINE ));
+    return Image(BitmapEx(SchResId(BMP_TYPE_LINE)));
 }
+
 const tTemplateServiceChartTypeParameterMap& LineChartDialogController::getTemplateMap() const
 {
     static tTemplateServiceChartTypeParameterMap s_aTemplateMap{
@@ -779,21 +787,26 @@ void LineChartDialogController::adjustParameterToMainType( ChartTypeParameter& r
 
     ChartTypeDialogController::adjustParameterToMainType( rParameter );
 }
+
 XYChartDialogController::XYChartDialogController()
 {
     bSupportsXAxisWithValues = true;
 }
+
 XYChartDialogController::~XYChartDialogController()
 {
 }
+
 OUString XYChartDialogController::getName()
 {
     return SCH_RESSTR( STR_TYPE_XY );
 }
+
 Image XYChartDialogController::getImage()
 {
-    return Image( SchResId( IMG_TYPE_XY ));
+    return Image(BitmapEx(SchResId(BMP_TYPE_XY)));
 }
+
 const tTemplateServiceChartTypeParameterMap& XYChartDialogController::getTemplateMap() const
 {
     static tTemplateServiceChartTypeParameterMap s_aTemplateMap{
@@ -803,6 +816,7 @@ const tTemplateServiceChartTypeParameterMap& XYChartDialogController::getTemplat
     {"com.sun.star.chart2.template.ThreeDScatter" ,              ChartTypeParameter(4,true,true,GlobalStackMode_NONE,false,true)}};
     return s_aTemplateMap;
 }
+
 void XYChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter )
 {
     rSubTypeList.Clear();
@@ -877,24 +891,30 @@ void XYChartDialogController::adjustParameterToSubType( ChartTypeParameter& rPar
             break;
     }
 }
+
 AreaChartDialogController::AreaChartDialogController()
 {
 }
+
 AreaChartDialogController::~AreaChartDialogController()
 {
 }
+
 OUString AreaChartDialogController::getName()
 {
     return SCH_RESSTR(STR_TYPE_AREA);
 }
+
 Image AreaChartDialogController::getImage()
 {
-    return Image( SchResId( IMG_TYPE_AREA ));
+    return Image(BitmapEx(SchResId(BMP_TYPE_AREA)));
 }
+
 bool AreaChartDialogController::shouldShow_3DLookControl() const
 {
     return true;
 }
+
 const tTemplateServiceChartTypeParameterMap& AreaChartDialogController::getTemplateMap() const
 {
     static tTemplateServiceChartTypeParameterMap s_aTemplateMap{
@@ -906,6 +926,7 @@ const tTemplateServiceChartTypeParameterMap& AreaChartDialogController::getTempl
     {"com.sun.star.chart2.template.PercentStackedThreeDArea" , ChartTypeParameter(3,false,true,GlobalStackMode_STACK_Y_PERCENT)}};
     return s_aTemplateMap;
 }
+
 void AreaChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter )
 {
     rSubTypeList.Clear();
@@ -956,25 +977,31 @@ void AreaChartDialogController::adjustParameterToMainType( ChartTypeParameter& r
 
     ChartTypeDialogController::adjustParameterToMainType( rParameter );
 }
+
 NetChartDialogController::NetChartDialogController()
 {
     bSupports3D = false;
 }
+
 NetChartDialogController::~NetChartDialogController()
 {
 }
+
 OUString NetChartDialogController::getName()
 {
     return SCH_RESSTR(STR_TYPE_NET);
 }
+
 Image NetChartDialogController::getImage()
 {
-    return Image( SchResId( IMG_TYPE_NET ));
+    return Image(BitmapEx(SchResId(BMP_TYPE_NET)));
 }
+
 bool NetChartDialogController::shouldShow_StackingControl() const
 {
     return true;
 }
+
 const tTemplateServiceChartTypeParameterMap& NetChartDialogController::getTemplateMap() const
 {
     static tTemplateServiceChartTypeParameterMap s_aTemplateMap{
@@ -1059,9 +1086,10 @@ OUString StockChartDialogController::getName()
 {
     return SCH_RESSTR(STR_TYPE_STOCK);
 }
+
 Image StockChartDialogController::getImage()
 {
-    return Image( SchResId( IMG_TYPE_STOCK ));
+    return Image(BitmapEx(SchResId(BMP_TYPE_STOCK)));
 }
 
 const tTemplateServiceChartTypeParameterMap& StockChartDialogController::getTemplateMap() const
@@ -1108,7 +1136,7 @@ OUString CombiColumnLineChartDialogController::getName()
 
 Image CombiColumnLineChartDialogController::getImage( )
 {
-    return Image( SchResId( IMG_TYPE_COLUMN_LINE ) );
+    return Image(BitmapEx(SchResId(BMP_TYPE_COLUMN_LINE)));
 }
 
 const tTemplateServiceChartTypeParameterMap& CombiColumnLineChartDialogController::getTemplateMap() const
@@ -1226,20 +1254,25 @@ void CombiColumnLineChartDialogController::adjustParameterToSubType( ChartTypePa
             break;
     }
 }
+
 BubbleChartDialogController::BubbleChartDialogController()
 {
 }
+
 BubbleChartDialogController::~BubbleChartDialogController()
 {
 }
+
 OUString BubbleChartDialogController::getName()
 {
     return SCH_RESSTR(STR_TYPE_BUBBLE);
 }
+
 Image BubbleChartDialogController::getImage()
 {
-    return Image( SchResId( IMG_TYPE_BUBBLE ));
+    return Image(BitmapEx(SchResId(BMP_TYPE_BUBBLE)));
 }
+
 const tTemplateServiceChartTypeParameterMap& BubbleChartDialogController::getTemplateMap() const
 {
     static tTemplateServiceChartTypeParameterMap s_aTemplateMap{
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 8c7af15f1936..345ae0670b8f 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -353,40 +353,40 @@ Image SeriesHeader::GetChartTypeImage(
 
     if( aChartTypeName == CHART2_SERVICE_NAME_CHARTTYPE_AREA )
     {
-        aResult = Image( SchResId( IMG_TYPE_AREA ) );
+        aResult = Image(BitmapEx(SchResId(BMP_TYPE_AREA)));
     }
     else if( aChartTypeName == CHART2_SERVICE_NAME_CHARTTYPE_COLUMN )
     {
         if( bSwapXAndYAxis )
-            aResult = Image( SchResId( IMG_TYPE_BAR ) );
+            aResult = Image(BitmapEx(SchResId(BMP_TYPE_BAR)));
         else
-            aResult = Image( SchResId( IMG_TYPE_COLUMN ) );
+            aResult = Image(BitmapEx(SchResId(BMP_TYPE_COLUMN)));
     }
     else if( aChartTypeName == CHART2_SERVICE_NAME_CHARTTYPE_LINE )
     {
-        aResult = Image( SchResId( IMG_TYPE_LINE ) );
+        aResult = Image(BitmapEx(SchResId(BMP_TYPE_LINE)) );
     }
     else if( aChartTypeName == CHART2_SERVICE_NAME_CHARTTYPE_SCATTER )
     {
-        aResult = Image( SchResId( IMG_TYPE_XY ) );
+        aResult = Image(BitmapEx(SchResId(BMP_TYPE_XY)));
     }
     else if( aChartTypeName == CHART2_SERVICE_NAME_CHARTTYPE_PIE )
     {
-        aResult = Image( SchResId( IMG_TYPE_PIE ) );
+        aResult = Image(BitmapEx(SchResId(BMP_TYPE_PIE)));
     }
     else if( aChartTypeName == CHART2_SERVICE_NAME_CHARTTYPE_NET
           || aChartTypeName == CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET )
     {
-        aResult = Image( SchResId( IMG_TYPE_NET ) );
+        aResult = Image(BitmapEx(SchResId(BMP_TYPE_NET)));
     }
     else if( aChartTypeName == CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK )
     {
         // @todo: correct image for candle-stick type
-        aResult = Image( SchResId( IMG_TYPE_STOCK ) );
+        aResult = Image(BitmapEx(SchResId(BMP_TYPE_STOCK)));
     }
     else if( aChartTypeName == CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE )
     {
-        aResult = Image( SchResId( IMG_TYPE_BUBBLE ) );
+        aResult = Image(BitmapEx(SchResId(BMP_TYPE_BUBBLE)));
     }
 
     return aResult;
diff --git a/chart2/source/controller/dialogs/GL3DBarChartDialogController.cxx b/chart2/source/controller/dialogs/GL3DBarChartDialogController.cxx
index 88dd865813fa..57c9a081e547 100644
--- a/chart2/source/controller/dialogs/GL3DBarChartDialogController.cxx
+++ b/chart2/source/controller/dialogs/GL3DBarChartDialogController.cxx
@@ -32,7 +32,7 @@ OUString GL3DBarChartDialogController::getName()
 
 Image GL3DBarChartDialogController::getImage()
 {
-    return Image(SchResId(IMG_TYPE_GL3D_BAR));
+    return Image(BitmapEx(SchResId(BMP_TYPE_GL3D_BAR)));
 }
 
 const tTemplateServiceChartTypeParameterMap&
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index 4296b9502b86..6eb0b10bc772 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -665,15 +665,15 @@ void ErrorBarResources::FillValueSets()
 {
     if( m_eErrorBarType == ERROR_BAR_Y )
     {
-        m_pFiNegative->SetImage( Image( SchResId( BMP_INDICATE_DOWN       ) ) );
-        m_pFiPositive->SetImage( Image( SchResId( BMP_INDICATE_UP         ) ) );
-        m_pFiBoth->SetImage(     Image( SchResId( BMP_INDICATE_BOTH_VERTI ) ) );
+        m_pFiNegative->SetImage(Image(BitmapEx(SchResId(BMP_INDICATE_DOWN))));
+        m_pFiPositive->SetImage(Image(BitmapEx(SchResId(BMP_INDICATE_UP))));
+        m_pFiBoth->SetImage(Image(BitmapEx(SchResId(BMP_INDICATE_BOTH_VERTI))));
     }
     else if( m_eErrorBarType == ERROR_BAR_X )
     {
-        m_pFiNegative->SetImage( Image( SchResId( BMP_INDICATE_LEFT      ) ) );
-        m_pFiPositive->SetImage( Image( SchResId( BMP_INDICATE_RIGHT     ) ) );
-        m_pFiBoth->SetImage(     Image( SchResId( BMP_INDICATE_BOTH_HORI ) ) );
+        m_pFiNegative->SetImage(Image(BitmapEx(SchResId(BMP_INDICATE_LEFT))));
+        m_pFiPositive->SetImage(Image(BitmapEx(SchResId(BMP_INDICATE_RIGHT))));
+        m_pFiBoth->SetImage(Image(BitmapEx(SchResId(BMP_INDICATE_BOTH_HORI))));
     }
 }
 
diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx b/chart2/source/controller/dialogs/res_Trendline.cxx
index bec6a44257eb..13fb61398a39 100644
--- a/chart2/source/controller/dialogs/res_Trendline.cxx
+++ b/chart2/source/controller/dialogs/res_Trendline.cxx
@@ -312,12 +312,12 @@ bool TrendlineResources::FillItemSet(SfxItemSet* rOutAttrs) const
 
 void TrendlineResources::FillValueSets()
 {
-    m_pFI_Linear->SetImage(       Image( SchResId( BMP_REGRESSION_LINEAR          ) ) );
-    m_pFI_Logarithmic->SetImage(  Image( SchResId( BMP_REGRESSION_LOG             ) ) );
-    m_pFI_Exponential->SetImage(  Image( SchResId( BMP_REGRESSION_EXP             ) ) );
-    m_pFI_Power->SetImage(        Image( SchResId( BMP_REGRESSION_POWER           ) ) );
-    m_pFI_Polynomial->SetImage(   Image( SchResId( BMP_REGRESSION_POLYNOMIAL      ) ) );
-    m_pFI_MovingAverage->SetImage(Image( SchResId( BMP_REGRESSION_MOVING_AVERAGE  ) ) );
+    m_pFI_Linear->SetImage(Image(BitmapEx(SchResId(BMP_REGRESSION_LINEAR))));
+    m_pFI_Logarithmic->SetImage(Image(BitmapEx(SchResId(BMP_REGRESSION_LOG))));
+    m_pFI_Exponential->SetImage(Image(BitmapEx(SchResId(BMP_REGRESSION_EXP))));
+    m_pFI_Power->SetImage(Image(BitmapEx(SchResId(BMP_REGRESSION_POWER))));
+    m_pFI_Polynomial->SetImage(Image(BitmapEx(SchResId(BMP_REGRESSION_POLYNOMIAL))));
+    m_pFI_MovingAverage->SetImage(Image(BitmapEx(SchResId(BMP_REGRESSION_MOVING_AVERAGE))));
 }
 
 void TrendlineResources::UpdateControlStates()