vcl: mark more Image constructors as "explicit"

Change-Id: If59d7c75c89a102a573738d15d8593cb8ac5c486

3 files changed, 19 insertions, 17 deletions

diff --git a/sw/source/ui/sidebar/PageColumnControl.cxx b/sw/source/ui/sidebar/PageColumnControl.cxx
index 771f0a2287f4..d4585b7a0937 100644
--- a/sw/source/ui/sidebar/PageColumnControl.cxx
+++ b/sw/source/ui/sidebar/PageColumnControl.cxx
@@ -46,19 +46,19 @@ PageColumnControl::PageColumnControl(
 
     if ( bLandscape )
     {
-        mpColumnValueSet->AddItem( SW_RES(IMG_ONE_L), 0, SW_RES(STR_ONE), 0 );
-        mpColumnValueSet->AddItem( SW_RES(IMG_TWO_L), 0, SW_RES(STR_TWO), 0 );
-        mpColumnValueSet->AddItem( SW_RES(IMG_THREE_L), 0, SW_RES(STR_THREE), 0 );
-        mpColumnValueSet->AddItem( SW_RES(IMG_LEFT_L), 0, SW_RES(STR_LEFT), 0 );
-        mpColumnValueSet->AddItem( SW_RES(IMG_RIGHT_L), 0, SW_RES(STR_RIGHT), 0 );
+        mpColumnValueSet->AddItem(Image(SW_RES(IMG_ONE_L)), 0, SW_RES(STR_ONE), 0 );
+        mpColumnValueSet->AddItem(Image(SW_RES(IMG_TWO_L)), 0, SW_RES(STR_TWO), 0 );
+        mpColumnValueSet->AddItem(Image(SW_RES(IMG_THREE_L)), 0, SW_RES(STR_THREE), 0 );
+        mpColumnValueSet->AddItem(Image(SW_RES(IMG_LEFT_L)), 0, SW_RES(STR_LEFT), 0 );
+        mpColumnValueSet->AddItem(Image(SW_RES(IMG_RIGHT_L)), 0, SW_RES(STR_RIGHT), 0 );
     }
     else
     {
-        mpColumnValueSet->AddItem( SW_RES(IMG_ONE), 0, SW_RES(STR_ONE), 0 );
-        mpColumnValueSet->AddItem( SW_RES(IMG_TWO), 0, SW_RES(STR_TWO), 0 );
-        mpColumnValueSet->AddItem( SW_RES(IMG_THREE), 0, SW_RES(STR_THREE), 0 );
-        mpColumnValueSet->AddItem( SW_RES(IMG_LEFT), 0, SW_RES(STR_LEFT), 0 );
-        mpColumnValueSet->AddItem( SW_RES(IMG_RIGHT), 0, SW_RES(STR_RIGHT), 0 );
+        mpColumnValueSet->AddItem(Image(SW_RES(IMG_ONE)), 0, SW_RES(STR_ONE), 0 );
+        mpColumnValueSet->AddItem(Image(SW_RES(IMG_TWO)), 0, SW_RES(STR_TWO), 0 );
+        mpColumnValueSet->AddItem(Image(SW_RES(IMG_THREE)), 0, SW_RES(STR_THREE), 0 );
+        mpColumnValueSet->AddItem(Image(SW_RES(IMG_LEFT)), 0, SW_RES(STR_LEFT), 0 );
+        mpColumnValueSet->AddItem(Image(SW_RES(IMG_RIGHT)), 0, SW_RES(STR_RIGHT), 0 );
     }
 
     mpColumnValueSet->SetNoSelection();
diff --git a/sw/source/ui/sidebar/PageMarginControl.cxx b/sw/source/ui/sidebar/PageMarginControl.cxx
index 4155edbf6402..2a59a77135cb 100644
--- a/sw/source/ui/sidebar/PageMarginControl.cxx
+++ b/sw/source/ui/sidebar/PageMarginControl.cxx
@@ -184,7 +184,7 @@ void PageMarginControl::FillValueSet(
     aHelpText += aBottom;
     aHelpText += aNarrowValText;
     mpMarginValueSet->AddItem(
-        (bLandscape ? SW_RES(IMG_NARROW_L) : SW_RES(IMG_NARROW) ), 0,
+        Image((bLandscape) ? SW_RES(IMG_NARROW_L) : SW_RES(IMG_NARROW)), 0,
         SW_RESSTR(STR_NARROW), &aHelpText );
 
     SetMetricValue( maWidthHeightField, SWPAGE_NORMAL_VALUE, meUnit );
@@ -198,7 +198,7 @@ void PageMarginControl::FillValueSet(
     aHelpText += aBottom;
     aHelpText += aNormalValText;
     mpMarginValueSet->AddItem(
-        (bLandscape ? SW_RES(IMG_NORMAL_L) : SW_RES(IMG_NORMAL) ), 0,
+        Image((bLandscape) ? SW_RES(IMG_NORMAL_L) : SW_RES(IMG_NORMAL)), 0,
         SW_RESSTR(STR_NORMAL), &aHelpText );
 
     SetMetricValue( maWidthHeightField, SWPAGE_WIDE_VALUE1, meUnit );
@@ -214,7 +214,7 @@ void PageMarginControl::FillValueSet(
     aHelpText += aBottom;
     aHelpText += aWide1ValText;
     mpMarginValueSet->AddItem(
-        (bLandscape ? SW_RES(IMG_WIDE_L) : SW_RES(IMG_WIDE) ), 0,
+        Image((bLandscape) ? SW_RES(IMG_WIDE_L) : SW_RES(IMG_WIDE)), 0,
         SW_RESSTR(STR_WIDE), &aHelpText );
 
     const OUString aInner = SW_RESSTR(STR_MARGIN_TOOLTIP_INNER);
@@ -231,7 +231,7 @@ void PageMarginControl::FillValueSet(
     aHelpText += aBottom;
     aHelpText += aWide1ValText;
     mpMarginValueSet->AddItem(
-        (bLandscape ? SW_RES(IMG_MIRRORED_L) : SW_RES(IMG_MIRRORED) ), 0,
+        Image((bLandscape) ? SW_RES(IMG_MIRRORED_L) : SW_RES(IMG_MIRRORED)), 0,
         SW_RESSTR(STR_MIRRORED), &aHelpText );
 
     if ( bUserCustomValuesAvailable )
@@ -254,7 +254,7 @@ void PageMarginControl::FillValueSet(
         aHelpText = OUString();
     }
     mpMarginValueSet->AddItem(
-        (bUserCustomValuesAvailable ? SW_RES(IMG_CUSTOM) : SW_RES(IMG_CUSTOM_DIS) ), 0,
+        Image((bUserCustomValuesAvailable) ? SW_RES(IMG_CUSTOM) : SW_RES(IMG_CUSTOM_DIS)), 0,
         SW_RESSTR(STR_LCVALUE), &aHelpText );
 }
 
diff --git a/sw/source/ui/sidebar/PageOrientationControl.cxx b/sw/source/ui/sidebar/PageOrientationControl.cxx
index 397adf83ba68..302b1697c591 100644
--- a/sw/source/ui/sidebar/PageOrientationControl.cxx
+++ b/sw/source/ui/sidebar/PageOrientationControl.cxx
@@ -41,8 +41,10 @@ PageOrientationControl::PageOrientationControl(
 
     // initialize <ValueSetWithText> control
     {
-        mpOrientationValueSet->AddItem( SW_RES(IMG_PORTRAIT), 0, SW_RES(STR_PORTRAIT), 0 );
-        mpOrientationValueSet->AddItem( SW_RES(IMG_LANDSCAPE), 0, SW_RES(STR_LANDSCAPE), 0 );
+        mpOrientationValueSet->AddItem(Image(SW_RES(IMG_PORTRAIT)), 0,
+                SW_RES(STR_PORTRAIT), 0);
+        mpOrientationValueSet->AddItem(Image(SW_RES(IMG_LANDSCAPE)), 0,
+                    SW_RES(STR_LANDSCAPE), 0 );
     }
 
     Link aLink = LINK(this, PageOrientationControl,ImplOrientationHdl );