diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-22 14:35:31 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-22 14:42:17 +0200 |
| commit | dd28837249088bf6e6ec11ed01a01be6f1774985 (patch) | |
| tree | 452a88ea26e395f846df690472147898dd999036 /svx/source/tbxctrls | |
| parent | 61027a637760087ee716f64ae0f216ef2a640108 (diff) | |
vcl: mark more Image constructors as "explicit"
Change-Id: If59d7c75c89a102a573738d15d8593cb8ac5c486
Diffstat (limited to 'svx/source/tbxctrls')
| -rw-r--r-- | svx/source/tbxctrls/fillctrl.cxx | 4 | ||||
| -rw-r--r-- | svx/source/tbxctrls/linectrl.cxx | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index 99b2d9cbac18..e8b45dc07bc5 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -309,7 +309,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState ) if( !aBmp.IsEmpty() ) { - ( (ListBox*)pFillAttrLB )->InsertEntry( pEntry->GetName(), aBmp ); + pFillAttrLB->InsertEntry(pEntry->GetName(), Image(aBmp)); pFillAttrLB->SelectEntryPos( pFillAttrLB->GetEntryCount() - 1 ); //delete pBmp; } @@ -354,7 +354,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState ) if( !aBmp.IsEmpty() ) { - ( (ListBox*)pFillAttrLB )->InsertEntry( pEntry->GetName(), aBmp ); + pFillAttrLB->InsertEntry(pEntry->GetName(), Image(aBmp)); pFillAttrLB->SelectEntryPos( pFillAttrLB->GetEntryCount() - 1 ); //delete pBmp; } diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index cc29e1f9f862..4db2dbce6a52 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -516,8 +516,8 @@ void SvxLineEndWindow::FillValueSet() Point aPt1( aBmpSize.Width(), 0 ); aVD.DrawBitmap( Point(), aBmp ); - aLineEndSet.InsertItem( 1, aVD.GetBitmap( aPt0, aBmpSize ), pEntry->GetName() ); - aLineEndSet.InsertItem( 2, aVD.GetBitmap( aPt1, aBmpSize ), pEntry->GetName() ); + aLineEndSet.InsertItem(1, Image(aVD.GetBitmap(aPt0, aBmpSize)), pEntry->GetName()); + aLineEndSet.InsertItem(2, Image(aVD.GetBitmap(aPt1, aBmpSize)), pEntry->GetName()); delete pLineEndList->Remove( nCount ); @@ -529,8 +529,10 @@ void SvxLineEndWindow::FillValueSet() OSL_ENSURE( !aBmp.IsEmpty(), "UI bitmap was not created" ); aVD.DrawBitmap( aPt0, aBmp ); - aLineEndSet.InsertItem( (sal_uInt16)((i+1L)*2L+1L), aVD.GetBitmap( aPt0, aBmpSize ), pEntry->GetName() ); - aLineEndSet.InsertItem( (sal_uInt16)((i+2L)*2L), aVD.GetBitmap( aPt1, aBmpSize ), pEntry->GetName() ); + aLineEndSet.InsertItem((sal_uInt16)((i+1L)*2L+1L), + Image(aVD.GetBitmap(aPt0, aBmpSize)), pEntry->GetName()); + aLineEndSet.InsertItem((sal_uInt16)((i+2L)*2L), + Image(aVD.GetBitmap(aPt1, aBmpSize)), pEntry->GetName()); } nLines = std::min( (sal_uInt16)(nCount + 1), (sal_uInt16) MAX_LINES ); aLineEndSet.SetLineCount( nLines ); |