summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-10-22 14:35:31 +0200
committerMichael Stahl <mstahl@redhat.com>2013-10-22 14:42:17 +0200
commitdd28837249088bf6e6ec11ed01a01be6f1774985 (patch)
tree452a88ea26e395f846df690472147898dd999036 /vcl
parent61027a637760087ee716f64ae0f216ef2a640108 (diff)
vcl: mark more Image constructors as "explicit"
Change-Id: If59d7c75c89a102a573738d15d8593cb8ac5c486
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/control/throbber.cxx9
-rw-r--r--vcl/source/window/builder.cxx5
-rw-r--r--vcl/source/window/menu.cxx5
3 files changed, 10 insertions, 9 deletions
diff --git a/vcl/source/control/throbber.cxx b/vcl/source/control/throbber.cxx
index bc4063f6475e..b1be3c353eee 100644
--- a/vcl/source/control/throbber.cxx
+++ b/vcl/source/control/throbber.cxx
@@ -204,11 +204,10 @@ void Throbber::setImageList( ::std::vector< Image > const& i_images )
void Throbber::setImageList( const Sequence< Reference< XGraphic > >& rImageList )
{
::std::vector< Image > aImages( rImageList.getLength() );
- ::std::copy(
- rImageList.getConstArray(),
- rImageList.getConstArray() + rImageList.getLength(),
- aImages.begin()
- );
+ for (sal_Int32 i = 0; i < rImageList.getLength(); ++i)
+ {
+ aImages[i] = Image(rImageList[i]);
+ }
setImageList( aImages );
}
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 56b808ee6448..04795df9cae8 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -365,10 +365,11 @@ VclBuilder::VclBuilder(Window *pParent, OUString sUIDir, OUString sUIFile, OStri
if (eType == SYMBOL_IMAGE)
{
Bitmap aBitmap(VclResId(mapStockToImageResource(rImageInfo.m_sStock)));
+ Image const aImage(aBitmap);
if (!aI->m_bRadio)
- pTargetButton->SetModeImage(aBitmap);
+ pTargetButton->SetModeImage(aImage);
else
- pTargetRadio->SetModeRadioImage(aBitmap);
+ pTargetRadio->SetModeRadioImage(aImage);
}
switch (rImageInfo.m_nSize)
{
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 214b6565b5f2..23545a909f7c 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -1303,10 +1303,11 @@ void Menu::InsertItem( const ResId& rResId, sal_uInt16 nPos )
if ( !bSep )
{
Bitmap aBmp( ResId( (RSHEADER_TYPE*)GetClassRes(), *pMgr ) );
+ Image const aImg(aBmp);
if ( !aText.isEmpty() )
- InsertItem( nItemId, aText, aBmp, nStatus, OString(), nPos );
+ InsertItem( nItemId, aText, aImg, nStatus, OString(), nPos );
else
- InsertItem( nItemId, aBmp, nStatus, OString(), nPos );
+ InsertItem( nItemId, aImg, nStatus, OString(), nPos );
}
IncrementRes( GetObjSizeRes( (RSHEADER_TYPE*)GetClassRes() ) );
}