diff options
104 files changed, 468 insertions, 482 deletions
diff --git a/avmedia/source/framework/MediaControlBase.cxx b/avmedia/source/framework/MediaControlBase.cxx index 22d2b8896d3b..7b9b7a1e5392 100644 --- a/avmedia/source/framework/MediaControlBase.cxx +++ b/avmedia/source/framework/MediaControlBase.cxx @@ -332,7 +332,7 @@ Image MediaControlBase::GetImage(sal_Int32 nImageId) } } - return Image(BitmapEx(sImageId)); + return Image(StockImage::Yes, sImageId); } } diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 7ddaa8a81875..726109076587 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -79,7 +79,7 @@ SbxVariable* IsSbxVariable (SbxBase* pBase) Image GetImage(const OUString& rId) { - return Image(BitmapEx(rId)); + return Image(StockImage::Yes, rId); } int const nScrollLine = 12; @@ -1567,7 +1567,7 @@ WatchWindow::WatchWindow (Layout* pParent) aRemoveWatchButton->SetClickHdl( LINK( this, WatchWindow, ButtonHdl ) ); aRemoveWatchButton->SetPosPixel( Point( nTextLen + aXEdit->GetSizePixel().Width() + 4, 2 ) ); aRemoveWatchButton->SetHelpId(HID_BASICIDE_REMOVEWATCH); - aRemoveWatchButton->SetModeImage(Image(BitmapEx(RID_BMP_REMOVEWATCH))); + aRemoveWatchButton->SetModeImage(Image(StockImage::Yes, RID_BMP_REMOVEWATCH)); aRemoveWatchButton->SetQuickHelpText(IDEResId(RID_STR_REMOVEWATCHTIP)); Size aSz( aRemoveWatchButton->GetModeImage().GetSizePixel() ); aSz.AdjustWidth(6 ); diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx index 36c856d468c8..2b237dd0e3ea 100644 --- a/basctl/source/basicide/bastype2.cxx +++ b/basctl/source/basicide/bastype2.cxx @@ -263,7 +263,7 @@ void TreeListBox::ImpCreateLibEntries( SvTreeListEntry* pDocumentRootEntry, cons SvTreeListEntry* pLibRootEntry = FindEntry( pDocumentRootEntry, aLibName, OBJ_TYPE_LIBRARY ); if ( pLibRootEntry ) { - SetEntryBitmaps(pLibRootEntry, Image(BitmapEx(sId))); + SetEntryBitmaps(pLibRootEntry, Image(StockImage::Yes, sId)); if ( IsExpanded(pLibRootEntry)) ImpCreateLibSubEntries( pLibRootEntry, rDocument, aLibName ); } @@ -271,7 +271,7 @@ void TreeListBox::ImpCreateLibEntries( SvTreeListEntry* pDocumentRootEntry, cons { AddEntry( aLibName, - Image(BitmapEx(sId)), + Image(StockImage::Yes, sId), pDocumentRootEntry, true, o3tl::make_unique<Entry>(OBJ_TYPE_LIBRARY)); } @@ -307,7 +307,7 @@ void TreeListBox::ImpCreateLibSubEntries( SvTreeListEntry* pLibRootEntry, const { pModuleEntry = AddEntry( aModName, - Image(BitmapEx(RID_BMP_MODULE)), + Image(StockImage::Yes, RID_BMP_MODULE), pLibRootEntry, false, o3tl::make_unique<Entry>(OBJ_TYPE_MODULE)); } @@ -363,7 +363,7 @@ void TreeListBox::ImpCreateLibSubEntriesInVBAMode( SvTreeListEntry* pLibRootEntr SvTreeListEntry* pLibSubRootEntry = FindEntry( pLibRootEntry, aEntryName, eType ); if( pLibSubRootEntry ) { - SetEntryBitmaps(pLibSubRootEntry, Image(BitmapEx(RID_BMP_MODLIB))); + SetEntryBitmaps(pLibSubRootEntry, Image(StockImage::Yes, RID_BMP_MODLIB)); if ( IsExpanded( pLibSubRootEntry ) ) ImpCreateLibSubSubEntriesInVBAMode( pLibSubRootEntry, rDocument, rLibName ); } @@ -371,7 +371,7 @@ void TreeListBox::ImpCreateLibSubEntriesInVBAMode( SvTreeListEntry* pLibRootEntr { AddEntry( aEntryName, - Image(BitmapEx(RID_BMP_MODLIB)), + Image(StockImage::Yes, RID_BMP_MODLIB), pLibRootEntry, true, o3tl::make_unique<Entry>(eType)); } } @@ -432,7 +432,7 @@ void TreeListBox::ImpCreateLibSubSubEntriesInVBAMode( SvTreeListEntry* pLibSubRo { pModuleEntry = AddEntry( aEntryName, - Image(BitmapEx(RID_BMP_MODULE)), + Image(StockImage::Yes, RID_BMP_MODULE), pLibSubRootEntry, false, o3tl::make_unique<Entry>(OBJ_TYPE_MODULE)); } @@ -636,7 +636,7 @@ void TreeListBox::FillTreeListBox( SvTreeListEntry* pRootEntry, const Sequence< { AddEntry( aName, - Image(BitmapEx( aBmpMacro )), + Image(StockImage::Yes, aBmpMacro), pRootEntry, false, o3tl::make_unique<Entry>( eType )); } @@ -723,12 +723,12 @@ void TreeListBox::GetRootEntryBitmaps( const ScriptDocument& rDocument, Image& r else { // default icon - rImage = Image(BitmapEx(RID_BMP_DOCUMENT)); + rImage = Image(StockImage::Yes, RID_BMP_DOCUMENT); } } else { - rImage = Image(BitmapEx(RID_BMP_INSTALLATION)); + rImage = Image(StockImage::Yes, RID_BMP_INSTALLATION); } } diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx index 359f6b3a7f5c..69cb6dea88cd 100644 --- a/basctl/source/basicide/bastype3.cxx +++ b/basctl/source/basicide/bastype3.cxx @@ -107,7 +107,7 @@ void TreeListBox::RequestingChildren( SvTreeListEntry* pEntry ) // exchange image const bool bDlgMode = (nMode & BrowseMode::Dialogs) && !(nMode & BrowseMode::Modules); - Image aImage(BitmapEx(bDlgMode ? OUStringLiteral(RID_BMP_DLGLIB) : OUStringLiteral(RID_BMP_MODLIB))); + Image aImage(StockImage::Yes, bDlgMode ? OUStringLiteral(RID_BMP_DLGLIB) : OUStringLiteral(RID_BMP_MODLIB)); SetEntryBitmaps( pEntry, aImage ); } else diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index 7c16245fd392..32f6d8adf1bc 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -1425,7 +1425,7 @@ SvTreeListEntry* LibPage::ImpInsertLibEntry( const OUString& rLibName, sal_uLong if (bProtected) { - Image aImage(BitmapEx(RID_BMP_LOCKED)); + Image aImage(StockImage::Yes, RID_BMP_LOCKED); m_pLibBox->SetExpandedEntryBmp(pNewEntry, aImage); m_pLibBox->SetCollapsedEntryBmp(pNewEntry, aImage); } @@ -1527,7 +1527,7 @@ void createLibImpl(weld::Window* pWin, const ScriptDocument& rDocument, const OUString sId = bDlgMode ? OUStringLiteral(RID_BMP_DLGLIB) : OUStringLiteral(RID_BMP_MODLIB); SvTreeListEntry* pNewLibEntry = pBasicBox->AddEntry( aLibName, - Image(BitmapEx(sId)), + Image(StockImage::Yes, sId), pRootEntry, false, o3tl::make_unique<Entry>(OBJ_TYPE_LIBRARY)); DBG_ASSERT( pNewLibEntry, "Insert entry failed!" ); @@ -1536,7 +1536,7 @@ void createLibImpl(weld::Window* pWin, const ScriptDocument& rDocument, { SvTreeListEntry* pEntry_ = pBasicBox->AddEntry( aModName, - Image(BitmapEx(RID_BMP_MODULE)), + Image(StockImage::Yes, RID_BMP_MODULE), pNewLibEntry, false, o3tl::make_unique<Entry>(OBJ_TYPE_MODULE)); DBG_ASSERT( pEntry_, "Insert entry failed!" ); diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx index 1f525beb7c26..ce81a182c82a 100644 --- a/basctl/source/basicide/moduldlg.cxx +++ b/basctl/source/basicide/moduldlg.cxx @@ -860,7 +860,7 @@ void ObjectPage::NewDialog() { pEntry = m_pBasicBox->AddEntry( aDlgName, - Image(BitmapEx(RID_BMP_DIALOG)), + Image(StockImage::Yes, RID_BMP_DIALOG), pLibEntry, false, o3tl::make_unique<Entry>(OBJ_TYPE_DIALOG)); DBG_ASSERT( pEntry, "Insert entry failed!" ); @@ -1031,7 +1031,7 @@ SbModule* createModImpl(weld::Window* pWin, const ScriptDocument& rDocument, { pEntry = rBasicBox.AddEntry( aModName, - Image(BitmapEx(RID_BMP_MODULE)), + Image(StockImage::Yes, RID_BMP_MODULE), pSubRootEntry, false, o3tl::make_unique<Entry>(OBJ_TYPE_MODULE)); DBG_ASSERT( pEntry, "Insert entry failed!" ); diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx index 459dc29e27ad..56a7a2173c88 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx @@ -438,36 +438,36 @@ void ColumnChartDialogController::fillSubTypeList( SvtValueSet& rSubTypeList, co switch(rParameter.nGeometry3D) { case DataPointGeometry3D::CYLINDER: - rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_SAEULE_3D_1))); - rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_SAEULE_3D_2))); - rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_SAEULE_3D_3))); - rSubTypeList.InsertItem(4, Image(BitmapEx(BMP_SAEULE_3D_4))); + rSubTypeList.InsertItem(1, Image(StockImage::Yes, BMP_SAEULE_3D_1)); + rSubTypeList.InsertItem(2, Image(StockImage::Yes, BMP_SAEULE_3D_2)); + rSubTypeList.InsertItem(3, Image(StockImage::Yes, BMP_SAEULE_3D_3)); + rSubTypeList.InsertItem(4, Image(StockImage::Yes, BMP_SAEULE_3D_4)); break; case DataPointGeometry3D::CONE: - rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_KEGEL_3D_1))); - rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_KEGEL_3D_2))); - rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_KEGEL_3D_3))); - rSubTypeList.InsertItem(4, Image(BitmapEx(BMP_KEGEL_3D_4))); + rSubTypeList.InsertItem(1, Image(StockImage::Yes, BMP_KEGEL_3D_1)); + rSubTypeList.InsertItem(2, Image(StockImage::Yes, BMP_KEGEL_3D_2)); + rSubTypeList.InsertItem(3, Image(StockImage::Yes, BMP_KEGEL_3D_3)); + rSubTypeList.InsertItem(4, Image(StockImage::Yes, BMP_KEGEL_3D_4)); break; case DataPointGeometry3D::PYRAMID: - rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_PYRAMID_3D_1))); - rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_PYRAMID_3D_2))); - rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_PYRAMID_3D_3))); - rSubTypeList.InsertItem(4, Image(BitmapEx(BMP_PYRAMID_3D_4))); + rSubTypeList.InsertItem(1, Image(StockImage::Yes, BMP_PYRAMID_3D_1)); + rSubTypeList.InsertItem(2, Image(StockImage::Yes, BMP_PYRAMID_3D_2)); + rSubTypeList.InsertItem(3, Image(StockImage::Yes, BMP_PYRAMID_3D_3)); + rSubTypeList.InsertItem(4, Image(StockImage::Yes, BMP_PYRAMID_3D_4)); break; default: //DataPointGeometry3D::CUBOID: - rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_COLUMNS_3D_1))); - rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_COLUMNS_3D_2))); - rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_COLUMNS_3D_3))); - rSubTypeList.InsertItem(4, Image(BitmapEx(BMP_COLUMNS_3D))); + rSubTypeList.InsertItem(1, Image(StockImage::Yes, BMP_COLUMNS_3D_1)); + rSubTypeList.InsertItem(2, Image(StockImage::Yes, BMP_COLUMNS_3D_2)); + rSubTypeList.InsertItem(3, Image(StockImage::Yes, BMP_COLUMNS_3D_3)); + rSubTypeList.InsertItem(4, Image(StockImage::Yes, BMP_COLUMNS_3D)); break; } } else { - rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_COLUMNS_2D_1))); - rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_COLUMNS_2D_2))); - rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_COLUMNS_2D_3))); + rSubTypeList.InsertItem(1, Image(StockImage::Yes, BMP_COLUMNS_2D_1)); + rSubTypeList.InsertItem(2, Image(StockImage::Yes, BMP_COLUMNS_2D_2)); + rSubTypeList.InsertItem(3, Image(StockImage::Yes, BMP_COLUMNS_2D_3)); } rSubTypeList.SetItemText( 1, SchResId( STR_NORMAL ) ); @@ -515,36 +515,36 @@ void BarChartDialogController::fillSubTypeList( SvtValueSet& rSubTypeList, const switch(rParameter.nGeometry3D) { case DataPointGeometry3D::CYLINDER: - rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_ROEHRE_3D_1))); - rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_ROEHRE_3D_2))); - rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_ROEHRE_3D_3))); - rSubTypeList.InsertItem(4, Image(BitmapEx(BMP_ROEHRE_3D_4))); + rSubTypeList.InsertItem(1, Image(StockImage::Yes, BMP_ROEHRE_3D_1)); + rSubTypeList.InsertItem(2, Image(StockImage::Yes, BMP_ROEHRE_3D_2)); + rSubTypeList.InsertItem(3, Image(StockImage::Yes, BMP_ROEHRE_3D_3)); + rSubTypeList.InsertItem(4, Image(StockImage::Yes, BMP_ROEHRE_3D_4)); break; case DataPointGeometry3D::CONE: - rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_KEGELQ_3D_1))); - rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_KEGELQ_3D_2))); - rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_KEGELQ_3D_3))); - rSubTypeList.InsertItem(4, Image(BitmapEx(BMP_KEGELQ_3D_4))); + rSubTypeList.InsertItem(1, Image(StockImage::Yes, BMP_KEGELQ_3D_1)); + rSubTypeList.InsertItem(2, Image(StockImage::Yes, BMP_KEGELQ_3D_2)); + rSubTypeList.InsertItem(3, Image(StockImage::Yes, BMP_KEGELQ_3D_3)); + rSubTypeList.InsertItem(4, Image(StockImage::Yes, BMP_KEGELQ_3D_4)); break; case DataPointGeometry3D::PYRAMID: - rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_PYRAMIDQ_3D_1))); - rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_PYRAMIDQ_3D_2))); - rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_PYRAMIDQ_3D_3))); - rSubTypeList.InsertItem(4, Image(BitmapEx(BMP_PYRAMIDQ_3D_4))); + rSubTypeList.InsertItem(1, Image(StockImage::Yes, BMP_PYRAMIDQ_3D_1)); + rSubTypeList.InsertItem(2, Image(StockImage::Yes, BMP_PYRAMIDQ_3D_2)); + rSubTypeList.InsertItem(3, Image(StockImage::Yes, BMP_PYRAMIDQ_3D_3)); + rSubTypeList.InsertItem(4, Image(StockImage::Yes, BMP_PYRAMIDQ_3D_4)); break; default: //DataPointGeometry3D::CUBOID: - rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_BARS_3D_1))); - rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_BARS_3D_2))); - rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_BARS_3D_3))); - rSubTypeList.InsertItem(4, Image(BitmapEx(BMP_BARS_3D))); + rSubTypeList.InsertItem(1, Image(StockImage::Yes, BMP_BARS_3D_1)); + rSubTypeList.InsertItem(2, Image(StockImage::Yes, BMP_BARS_3D_2)); + rSubTypeList.InsertItem(3, Image(StockImage::Yes, BMP_BARS_3D_3)); + rSubTypeList.InsertItem(4, Image(StockImage::Yes, BMP_BARS_3D)); break; } } else { - rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_BARS_2D_1))); - rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_BARS_2D_2))); - rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_BARS_2D_3))); + rSubTypeList.InsertItem(1, Image(StockImage::Yes, BMP_BARS_2D_1)); + rSubTypeList.InsertItem(2, Image(StockImage::Yes, BMP_BARS_2D_2)); + rSubTypeList.InsertItem(3, Image(StockImage::Yes, BMP_BARS_2D_3)); } rSubTypeList.SetItemText( 1, SchResId( STR_NORMAL ) ); rSubTypeList.SetItemText( 2, SchResId( STR_STACKED ) ); @@ -589,17 +589,17 @@ void PieChartDialogController::fillSubTypeList( SvtValueSet& rSubTypeList, const if( rParameter.b3DLook ) { - rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_CIRCLES_3D))); - rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_CIRCLES_3D_EXPLODED))); - rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_DONUT_3D))); - rSubTypeList.InsertItem(4, Image(BitmapEx(BMP_DONUT_3D_EXPLODED))); + rSubTypeList.InsertItem(1, Image(StockImage::Yes, BMP_CIRCLES_3D)); + rSubTypeList.InsertItem(2, Image(StockImage::Yes, BMP_CIRCLES_3D_EXPLODED)); + rSubTypeList.InsertItem(3, Image(StockImage::Yes, BMP_DONUT_3D)); + rSubTypeList.InsertItem(4, Image(StockImage::Yes, BMP_DONUT_3D_EXPLODED)); } else { - rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_CIRCLES_2D))); - rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_CIRCLES_2D_EXPLODED))); - rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_DONUT_2D))); - rSubTypeList.InsertItem(4, Image(BitmapEx(BMP_DONUT_2D_EXPLODED))); + rSubTypeList.InsertItem(1, Image(StockImage::Yes, BMP_CIRCLES_2D)); + rSubTypeList.InsertItem(2, Image(StockImage::Yes, BMP_CIRCLES_2D_EXPLODED)); + rSubTypeList.InsertItem(3, Image(StockImage::Yes, BMP_DONUT_2D)); + rSubTypeList.InsertItem(4, Image(StockImage::Yes, BMP_DONUT_2D_EXPLODED)); } rSubTypeList.SetItemText( 1, SchResId( STR_NORMAL ) ); rSubTypeList.SetItemText( 2, SchResId( STR_PIE_EXPLODED ) ); @@ -663,17 +663,17 @@ void LineChartDialogController::fillSubTypeList( SvtValueSet& rSubTypeList, cons case CurveStyle_B_SPLINES: if( rParameter.eStackMode == GlobalStackMode_NONE || rParameter.eStackMode == GlobalStackMode_STACK_Z ) { - rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_POINTS_XCATEGORY))); - rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_LINE_P_XCATEGORY_SMOOTH))); - rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_LINE_O_XCATEGORY_SMOOTH))); - rSubTypeList.InsertItem(4, Image(BitmapEx(BMP_LINE3D_XCATEGORY_SMOOTH))); + rSubTypeList.InsertItem(1, Image(StockImage::Yes, BMP_POINTS_XCATEGORY)); + rSubTypeList.InsertItem(2, Image(StockImage::Yes, BMP_LINE_P_XCATEGORY_SMOOTH)); + rSubTypeList.InsertItem(3, Image(StockImage::Yes, BMP_LINE_O_XCATEGORY_SMOOTH)); + rSubTypeList.InsertItem(4, Image(StockImage::Yes, BMP_LINE3D_XCATEGORY_SMOOTH)); } else { - rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_POINTS_STACKED))); - rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_LINE_P_STACKED_SMOOTH))); - rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_LINE_O_STACKED_SMOOTH))); - rSubTypeList.InsertItem(4, Image(BitmapEx(BMP_LINE3D_STACKED_SMOOTH))); + rSubTypeList.InsertItem(1, Image(StockImage::Yes, BMP_POINTS_STACKED)); + rSubTypeList.InsertItem(2, Image(StockImage::Yes, BMP_LINE_P_STACKED_SMOOTH)); + rSubTypeList.InsertItem(3, Image(StockImage::Yes, BMP_LINE_O_STACKED_SMOOTH)); + rSubTypeList.InsertItem(4, Image(StockImage::Yes, BMP_LINE3D_STACKED_SMOOTH)); } break; case CurveStyle_STEP_START: @@ -682,34 +682,34 @@ void LineChartDialogController::fillSubTypeList( SvtValueSet& rSubTypeList, cons case CurveStyle_STEP_CENTER_Y: if( rParameter.eStackMode == GlobalStackMode_NONE || rParameter.eStackMode == GlobalStackMode_STACK_Z ) { - rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_POINTS_XCATEGORY))); - rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_LINE_P_XCATEGORY_STEPPED))); - rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_LINE_O_XCATEGORY_STEPPED))); - rSubTypeList.InsertItem(4, Image(BitmapEx(BMP_LINE3D_XCATEGORY_STEPPED))); + rSubTypeList.InsertItem(1, Image(StockImage::Yes, BMP_POINTS_XCATEGORY)); + rSubTypeList.InsertItem(2, Image(StockImage::Yes, BMP_LINE_P_XCATEGORY_STEPPED)); + rSubTypeList.InsertItem(3, Image(StockImage::Yes, BMP_LINE_O_XCATEGORY_STEPPED)); + rSubTypeList.InsertItem(4, Image(StockImage::Yes, BMP_LINE3D_XCATEGORY_STEPPED)); } else { - rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_POINTS_STACKED))); - rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_LINE_P_STACKED_STEPPED))); - rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_LINE_O_STACKED_STEPPED))); - rSubTypeList.InsertItem(4, Image(BitmapEx(BMP_LINE3D_STACKED_STEPPED))); + rSubTypeList.InsertItem(1, Image(StockImage::Yes, BMP_POINTS_STACKED)); + rSubTypeList.InsertItem(2, Image(StockImage::Yes, BMP_LINE_P_STACKED_STEPPED)); + rSubTypeList.InsertItem(3, Image(StockImage::Yes, BMP_LINE_O_STACKED_STEPPED)); + rSubTypeList.InsertItem(4, Image(StockImage::Yes, BMP_LINE3D_STACKED_STEPPED)); } break; default: // includes CurveStyle_LINES //direct lines if( rParameter.eStackMode == GlobalStackMode_NONE || rParameter.eStackMode == GlobalStackMode_STACK_Z ) { - rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_POINTS_XCATEGORY))); - rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_LINE_P_XCATEGORY))); - rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_LINE_O_XCATEGORY))); - rSubTypeList.InsertItem(4, Image(BitmapEx(BMP_LINE3D_XCATEGORY))); + rSubTypeList.InsertItem(1, Image(StockImage::Yes, BMP_POINTS_XCATEGORY)); + rSubTypeList.InsertItem(2, Image(StockImage::Yes, BMP_LINE_P_XCATEGORY)); + rSubTypeList.InsertItem(3, Image(StockImage::Yes, BMP_LINE_O_XCATEGORY)); + rSubTypeList.InsertItem(4, Image(StockImage::Yes, BMP_LINE3D_XCATEGORY)); } else { - rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_POINTS_STACKED))); - rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_LINE_P_STACKED))); - rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_LINE_O_STACKED))); - rSubTypeList.InsertItem(4, Image(BitmapEx(BMP_LINE3D_STACKED))); + rSubTypeList.InsertItem(1, Image(StockImage::Yes, BMP_POINTS_STACKED)); + rSubTypeList.InsertItem(2, Image(StockImage::Yes, BMP_LINE_P_STACKED)); + rSubTypeList.InsertItem(3, Image(StockImage::Yes, BMP_LINE_O_STACKED)); + rSubTypeList.InsertItem(4, Image(StockImage::Yes, BMP_LINE3D_STACKED)); } } @@ -806,10 +806,10 @@ void XYChartDialogController::fillSubTypeList( SvtValueSet& rSubTypeList, const case CurveStyle_CUBIC_SPLINES: case CurveStyle_B_SPLINES: { - rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_POINTS_XVALUES))); - rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_LINE_P_XVALUES_SMOOTH))); - rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_LINE_O_XVALUES_SMOOTH))); - rSubTypeList.InsertItem(4, Image(BitmapEx(BMP_LINE3D_XVALUES_SMOOTH))); + rSubTypeList.InsertItem(1, Image(StockImage::Yes, BMP_POINTS_XVALUES)); + rSubTypeList.InsertItem(2, Image(StockImage::Yes, BMP_LINE_P_XVALUES_SMOOTH)); + rSubTypeList.InsertItem(3, Image(StockImage::Yes, BMP_LINE_O_XVALUES_SMOOTH)); + rSubTypeList.InsertItem(4, Image(StockImage::Yes, BMP_LINE3D_XVALUES_SMOOTH)); break; } case CurveStyle_STEP_START: @@ -817,17 +817,17 @@ void XYChartDialogController::fillSubTypeList( SvtValueSet& rSubTypeList, const case CurveStyle_STEP_CENTER_X: case CurveStyle_STEP_CENTER_Y: { - rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_POINTS_XVALUES))); - rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_LINE_P_XVALUES_STEPPED))); - rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_LINE_O_XVALUES_STEPPED))); - rSubTypeList.InsertItem(4, Image(BitmapEx(BMP_LINE3D_XVALUES_STEPPED))); + rSubTypeList.InsertItem(1, Image(StockImage::Yes, BMP_POINTS_XVALUES)); + rSubTypeList.InsertItem(2, Image(StockImage::Yes, BMP_LINE_P_XVALUES_STEPPED)); + rSubTypeList.InsertItem(3, Image(StockImage::Yes, BMP_LINE_O_XVALUES_STEPPED)); + rSubTypeList.InsertItem(4, Image(StockImage::Yes, BMP_LINE3D_XVALUES_STEPPED)); break; } default: // includes CurveStyle_LINES - rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_POINTS_XVALUES))); - rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_LINE_P_XVALUES))); - rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_LINE_O_XVALUES))); - rSubTypeList.InsertItem(4, Image(BitmapEx(BMP_LINE3D_XVALUES))); + rSubTypeList.InsertItem(1, Image(StockImage::Yes, BMP_POINTS_XVALUES)); + rSubTypeList.InsertItem(2, Image(StockImage::Yes, BMP_LINE_P_XVALUES)); + rSubTypeList.InsertItem(3, Image(StockImage::Yes, BMP_LINE_O_XVALUES)); + rSubTypeList.InsertItem(4, Image(StockImage::Yes, BMP_LINE3D_XVALUES)); } rSubTypeList.SetItemText( 1, SchResId( STR_POINTS_ONLY ) ); @@ -913,15 +913,15 @@ void AreaChartDialogController::fillSubTypeList( SvtValueSet& rSubTypeList, cons if( rParameter.b3DLook ) { - rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_AREAS_3D))); - rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_AREAS_3D_1))); - rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_AREAS_3D_2))); + rSubTypeList.InsertItem(1, Image(StockImage::Yes, BMP_AREAS_3D)); + rSubTypeList.InsertItem(2, Image(StockImage::Yes, BMP_AREAS_3D_1)); + rSubTypeList.InsertItem(3, Image(StockImage::Yes, BMP_AREAS_3D_2)); } else { - rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_AREAS_2D_1))); - rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_AREAS_2D))); - rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_AREAS_2D_3))); + rSubTypeList.InsertItem(1, Image(StockImage::Yes, BMP_AREAS_2D_1)); + rSubTypeList.InsertItem(2, Image(StockImage::Yes, BMP_AREAS_2D)); + rSubTypeList.InsertItem(3, Image(StockImage::Yes, BMP_AREAS_2D_3)); } rSubTypeList.SetItemText( 1, SchResId( rParameter.b3DLook ? STR_DEEP : STR_NORMAL ) ); @@ -1009,17 +1009,17 @@ void NetChartDialogController::fillSubTypeList( SvtValueSet& rSubTypeList, const if( rParameter.eStackMode == GlobalStackMode_NONE ) { - rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_NET_SYMB))); - rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_NET_LINESYMB))); - rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_NET))); - rSubTypeList.InsertItem(4, Image(BitmapEx(BMP_NET_FILL))); + rSubTypeList.InsertItem(1, Image(StockImage::Yes, BMP_NET_SYMB)); + rSubTypeList.InsertItem(2, Image(StockImage::Yes, BMP_NET_LINESYMB)); + rSubTypeList.InsertItem(3, Image(StockImage::Yes, BMP_NET)); + rSubTypeList.InsertItem(4, Image(StockImage::Yes, BMP_NET_FILL)); } else { - rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_NET_SYMB_STACK))); - rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_NET_LINESYMB_STACK))); - rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_NET_STACK))); - rSubTypeList.InsertItem(4, Image(BitmapEx(BMP_NET_FILL_STACK))); + rSubTypeList.InsertItem(1, Image(StockImage::Yes, BMP_NET_SYMB_STACK)); + rSubTypeList.InsertItem(2, Image(StockImage::Yes, BMP_NET_LINESYMB_STACK)); + rSubTypeList.InsertItem(3, Image(StockImage::Yes, BMP_NET_STACK)); + rSubTypeList.InsertItem(4, Image(StockImage::Yes, BMP_NET_FILL_STACK)); } rSubTypeList.SetItemText( 1, SchResId( STR_POINTS_ONLY ) ); @@ -1085,10 +1085,10 @@ const tTemplateServiceChartTypeParameterMap& StockChartDialogController::getTemp void StockChartDialogController::fillSubTypeList( SvtValueSet& rSubTypeList, const ChartTypeParameter& /*rParameter*/ ) { rSubTypeList.Clear(); - rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_STOCK_1))); - rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_STOCK_2))); - rSubTypeList.InsertItem(3, Image(BitmapEx(BMP_STOCK_3))); - rSubTypeList.InsertItem(4, Image(BitmapEx(BMP_STOCK_4))); + rSubTypeList.InsertItem(1, Image(StockImage::Yes, BMP_STOCK_1)); + rSubTypeList.InsertItem(2, Image(StockImage::Yes, BMP_STOCK_2)); + rSubTypeList.InsertItem(3, Image(StockImage::Yes, BMP_STOCK_3)); + rSubTypeList.InsertItem(4, Image(StockImage::Yes, BMP_STOCK_4)); rSubTypeList.SetItemText( 1, SchResId(STR_STOCK_1) ); rSubTypeList.SetItemText( 2, SchResId(STR_STOCK_2) ); @@ -1128,8 +1128,8 @@ const tTemplateServiceChartTypeParameterMap& CombiColumnLineChartDialogControlle void CombiColumnLineChartDialogController::fillSubTypeList( SvtValueSet& rSubTypeList, const ChartTypeParameter& /*rParameter*/ ) { rSubTypeList.Clear(); - rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_COLUMN_LINE))); - rSubTypeList.InsertItem(2, Image(BitmapEx(BMP_COLUMN_LINE_STACKED))); + rSubTypeList.InsertItem(1, Image(StockImage::Yes, BMP_COLUMN_LINE)); + rSubTypeList.InsertItem(2, Image(StockImage::Yes, BMP_COLUMN_LINE_STACKED)); rSubTypeList.SetItemText(1, SchResId(STR_LINE_COLUMN)); rSubTypeList.SetItemText(2, SchResId(STR_LINE_STACKEDCOLUMN)); @@ -1256,7 +1256,7 @@ const tTemplateServiceChartTypeParameterMap& BubbleChartDialogController::getTem void BubbleChartDialogController::fillSubTypeList( SvtValueSet& rSubTypeList, const ChartTypeParameter& /*rParameter*/ ) { rSubTypeList.Clear(); - rSubTypeList.InsertItem(1, Image(BitmapEx(BMP_BUBBLE_1))); + rSubTypeList.InsertItem(1, Image(StockImage::Yes, BMP_BUBBLE_1)); rSubTypeList.SetItemText( 1, SchResId(STR_BUBBLE_1) ); } diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index 006ffbe97888..740735d45829 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -358,40 +358,40 @@ Image SeriesHeader::GetChartTypeImage( if( aChartTypeName == CHART2_SERVICE_NAME_CHARTTYPE_AREA ) { - aResult = Image(BitmapEx(BMP_TYPE_AREA)); + aResult = Image(StockImage::Yes, BMP_TYPE_AREA); } else if( aChartTypeName == CHART2_SERVICE_NAME_CHARTTYPE_COLUMN ) { if( bSwapXAndYAxis ) - aResult = Image(BitmapEx(BMP_TYPE_BAR)); + aResult = Image(StockImage::Yes, BMP_TYPE_BAR); else - aResult = Image(BitmapEx(BMP_TYPE_COLUMN)); + aResult = Image(StockImage::Yes, BMP_TYPE_COLUMN); } else if( aChartTypeName == CHART2_SERVICE_NAME_CHARTTYPE_LINE ) { - aResult = Image(BitmapEx(BMP_TYPE_LINE)); + aResult = Image(StockImage::Yes, BMP_TYPE_LINE); } else if( aChartTypeName == CHART2_SERVICE_NAME_CHARTTYPE_SCATTER ) { - aResult = Image(BitmapEx(BMP_TYPE_XY)); + aResult = Image(StockImage::Yes, BMP_TYPE_XY); } else if( aChartTypeName == CHART2_SERVICE_NAME_CHARTTYPE_PIE ) { - aResult = Image(BitmapEx(BMP_TYPE_PIE)); + aResult = Image(StockImage::Yes, BMP_TYPE_PIE); } else if( aChartTypeName == CHART2_SERVICE_NAME_CHARTTYPE_NET || aChartTypeName == CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET ) { - aResult = Image(BitmapEx(BMP_TYPE_NET)); + aResult = Image(StockImage::Yes, BMP_TYPE_NET); } else if( aChartTypeName == CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK ) { // @todo: correct image for candle-stick type - aResult = Image(BitmapEx(BMP_TYPE_STOCK)); + aResult = Image(StockImage::Yes, BMP_TYPE_STOCK); } else if( aChartTypeName == CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE ) { - aResult = Image(BitmapEx(BMP_TYPE_BUBBLE)); + aResult = Image(StockImage::Yes, BMP_TYPE_BUBBLE); } return aResult; diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx index fb27b035eb22..a6e70f363af6 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx @@ -43,7 +43,7 @@ LightButton::LightButton( vcl::Window* pParent) : ImageButton( pParent) , m_bLightOn(false) { - SetModeImage(Image(BitmapEx(RID_SVXBMP_LAMP_OFF))); + SetModeImage(Image(StockImage::Yes, RID_SVXBMP_LAMP_OFF)); } VCL_BUILDER_FACTORY(LightButton) @@ -55,11 +55,11 @@ void LightButton::switchLightOn(bool bOn) m_bLightOn = bOn; if(m_bLightOn) { - SetModeImage(Image(BitmapEx(RID_SVXBMP_LAMP_ON))); + SetModeImage(Image(StockImage::Yes, RID_SVXBMP_LAMP_ON)); } else { - SetModeImage(Image(BitmapEx(RID_SVXBMP_LAMP_OFF))); + SetModeImage(Image(StockImage::Yes, RID_SVXBMP_LAMP_OFF)); } } @@ -98,9 +98,9 @@ void LightSourceInfo::initButtonFromSource() { if(!pButton) return; - pButton->SetModeImage(Image(BitmapEx( + pButton->SetModeImage(Image(StockImage::Yes, aLightSource.bIsEnabled ? OUString(RID_SVXBMP_LAMP_ON) : OUString(RID_SVXBMP_LAMP_OFF) - ) ) ); + ) ); } namespace diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index 17efb2d86497..267f8217784d 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -426,17 +426,17 @@ struct SvxConfigGroupBoxResource_Impl }; SvxConfigGroupBoxResource_Impl::SvxConfigGroupBoxResource_Impl() : - m_hdImage(BitmapEx(RID_CUIBMP_HARDDISK)), - m_libImage(BitmapEx(RID_CUIBMP_LIB)), - m_macImage(BitmapEx(RID_CUIBMP_MACRO)), - m_docImage(BitmapEx(RID_CUIBMP_DOC)), + m_hdImage(StockImage::Yes, RID_CUIBMP_HARDDISK), + m_libImage(StockImage::Yes, RID_CUIBMP_LIB), + m_macImage(StockImage::Yes, RID_CUIBMP_MACRO), + m_docImage(StockImage::Yes, RID_CUIBMP_DOC), m_sMyMacros(CuiResId(RID_SVXSTR_MYMACROS)), m_sProdMacros(CuiResId(RID_SVXSTR_PRODMACROS)), m_sMacros(CuiResId(RID_SVXSTR_BASICMACROS)), m_sDlgMacros(CuiResId(RID_SVXSTR_PRODMACROS)), m_aStrGroupStyles(CuiResId(RID_SVXSTR_GROUP_STYLES)), - m_collapsedImage(BitmapEx(RID_CUIBMP_COLLAPSED)), - m_expandedImage(BitmapEx(RID_CUIBMP_EXPANDED)) + m_collapsedImage(StockImage::Yes, RID_CUIBMP_COLLAPSED), + m_expandedImage(StockImage::Yes, RID_CUIBMP_EXPANDED) { } diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx index e106826bdeba..a3e31a91dbd4 100644 --- a/cui/source/dialogs/cuihyperdlg.cxx +++ b/cui/source/dialogs/cuihyperdlg.cxx @@ -93,10 +93,10 @@ SvxHpLinkDlg::SvxHpLinkDlg (vcl::Window* pParent, SfxBindings* pBindings) std::vector<Image> imgVector; OUString aStrTitle; SvxIconChoiceCtrlEntry *pEntry; - imgVector.emplace_back(BitmapEx(RID_SVXBMP_HLINETTP)); - imgVector.emplace_back(BitmapEx(RID_SVXBMP_HLMAILTP)); - imgVector.emplace_back(BitmapEx(RID_SVXBMP_HLDOCTP)); - imgVector.emplace_back(BitmapEx(RID_SVXBMP_HLDOCNTP)); + imgVector.emplace_back(StockImage::Yes, RID_SVXBMP_HLINETTP); + imgVector.emplace_back(StockImage::Yes, RID_SVXBMP_HLMAILTP); + imgVector.emplace_back(StockImage::Yes, RID_SVXBMP_HLDOCTP); + imgVector.emplace_back(StockImage::Yes, RID_SVXBMP_HLDOCNTP); for(Image &aImage : imgVector ) { diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index d0eeb7b8c2ea..379ceeb47240 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -73,10 +73,10 @@ static void ShowErrorDialog( const Any& aException ) SFTreeListBox::SFTreeListBox(vcl::Window* pParent) : SvTreeListBox(pParent) - , m_hdImage(BitmapEx(RID_CUIBMP_HARDDISK)) - , m_libImage(BitmapEx(RID_CUIBMP_LIB)) - , m_macImage(BitmapEx(RID_CUIBMP_MACRO)) - , m_docImage(BitmapEx(RID_CUIBMP_DOC)) + , m_hdImage(StockImage::Yes, RID_CUIBMP_HARDDISK) + , m_libImage(StockImage::Yes, RID_CUIBMP_LIB) + , m_macImage(StockImage::Yes, RID_CUIBMP_MACRO) + , m_docImage(StockImage::Yes, RID_CUIBMP_DOC) , m_sMyMacros(CuiResId(RID_SVXSTR_MYMACROS)) , m_sProdMacros(CuiResId(RID_SVXSTR_PRODMACROS)) { diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index ebd641bb628d..d31876dadd98 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -389,7 +389,7 @@ void DbRegistrationOptionsPage::insertNewEntry( const OUString& _sName,const OUS SvTreeListEntry* pEntry = nullptr; if ( _bReadOnly ) { - Image aLocked(BitmapEx(RID_SVXBMP_LOCK)); + Image aLocked(StockImage::Yes, RID_SVXBMP_LOCK); pEntry = m_pPathBox->InsertEntry( aStr, aLocked, aLocked ); } else diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index 4d8331e05c0e..cda14818ee05 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -112,9 +112,9 @@ SvxCaptionTabPage::SvxCaptionTabPage(TabPageParent pParent, const SfxItemSet& rI aLineTypes.push_back(m_xLineTypes->get_text(i)); static_assert(CAPTYPE_BITMAPS_COUNT == 3, "unexpected"); - m_aBmpCapTypes[0] = Image(BitmapEx(RID_SVXBMP_LEGTYP1)); - m_aBmpCapTypes[1] = Image(BitmapEx(RID_SVXBMP_LEGTYP2)); - m_aBmpCapTypes[2] = Image(BitmapEx(RID_SVXBMP_LEGTYP3)); + m_aBmpCapTypes[0] = Image(StockImage::Yes, RID_SVXBMP_LEGTYP1); + m_aBmpCapTypes[1] = Image(StockImage::Yes, RID_SVXBMP_LEGTYP2); + m_aBmpCapTypes[2] = Image(StockImage::Yes, RID_SVXBMP_LEGTYP3); //------------install ValueSet-------------------------- m_xCT_CAPTTYPE->SetStyle( m_xCT_CAPTTYPE->GetStyle() | WB_ITEMBORDER | WB_DOUBLEBORDER | WB_NAMEFIELD ); diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index 5c5868f886e7..fe7eb6b9de7b 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -706,7 +706,7 @@ void OAppDetailPageHelper::fillNames( const Reference< XNameAccess >& _xContaine { pEntry = pList->InsertEntry( *pIter, _pParent ); - Image aImage{BitmapEx(rImageId)}; + Image aImage(StockImage::Yes, rImageId); pList->SetExpandedEntryBmp(pEntry, aImage); pList->SetCollapsedEntryBmp(pEntry, aImage); } @@ -834,7 +834,7 @@ SvTreeListEntry* OAppDetailPageHelper::elementAdded(ElementType _eType,const OUS { pRet = pTreeView->InsertEntry( _rName, pEntry ); - Image aImage{BitmapEx(sImageId)}; + Image aImage(StockImage::Yes, sImageId); pTreeView->SetExpandedEntryBmp( pRet, aImage ); pTreeView->SetCollapsedEntryBmp( pRet, aImage ); } diff --git a/dbaccess/source/ui/app/AppIconControl.cxx b/dbaccess/source/ui/app/AppIconControl.cxx index 489b9fe19388..1097094d822e 100644 --- a/dbaccess/source/ui/app/AppIconControl.cxx +++ b/dbaccess/source/ui/app/AppIconControl.cxx @@ -50,7 +50,7 @@ OApplicationIconControl::OApplicationIconControl(vcl::Window* _pParent) { SvxIconChoiceCtrlEntry* pEntry = InsertEntry( DBA_RES(aCategorie.pLabelResId) , - Image(BitmapEx(OUString::createFromAscii(aCategorie.aImageResId)))); + Image(StockImage::Yes, OUString::createFromAscii(aCategorie.aImageResId))); if ( pEntry ) pEntry->SetUserData( new ElementType( aCategorie.eType ) ); } diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx index 81fda93c625e..fc978b310450 100644 --- a/dbaccess/source/ui/dlg/CollectionView.cxx +++ b/dbaccess/source/ui/dlg/CollectionView.cxx @@ -82,8 +82,8 @@ OCollectionView::OCollectionView( vcl::Window * pParent m_pName->SetText(_sDefaultName); m_pName->GrabFocus(); - m_pUp->SetModeImage(Image(BitmapEx(BMP_NAVIGATION_BTN_UP_SC))); - m_pNewFolder->SetModeImage(Image(BitmapEx(BMP_NAVIGATION_CREATEFOLDER_SC))); + m_pUp->SetModeImage(Image(StockImage::Yes, BMP_NAVIGATION_BTN_UP_SC)); + m_pNewFolder->SetModeImage(Image(StockImage::Yes, BMP_NAVIGATION_CREATEFOLDER_SC)); m_pView->SetDoubleClickHdl( LINK( this, OCollectionView, Dbl_Click_FileView ) ); m_pView->EnableAutoResize(); diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index 6d480eba43ad..6c4cdcc05da9 100644 --- a/dbaccess/source/ui/dlg/indexdialog.cxx +++ b/dbaccess/source/ui/dlg/indexdialog.cxx @@ -279,7 +279,7 @@ namespace dbaui void DbaIndexDialog::fillIndexList() { - Image aPKeyIcon(BitmapEx(BMP_PKEYICON)); + Image aPKeyIcon(StockImage::Yes, BMP_PKEYICON); // fill the list with the index names m_pIndexList->Clear(); sal_Int32 nPos = 0; diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx index 8e6a57e909a5..782e62d1b4e0 100644 --- a/dbaccess/source/ui/misc/WNameMatch.cxx +++ b/dbaccess/source/ui/misc/WNameMatch.cxx @@ -37,8 +37,8 @@ using namespace ::dbaui; OWizNameMatching::OWizNameMatching(vcl::Window* pParent) : OWizardPage(pParent, "NameMatching", "dbaccess/ui/namematchingpage.ui") { - Image aImgUp(BitmapEx(BMP_UP)); - Image aImgDown(BitmapEx(BMP_DOWN)); + Image aImgUp(StockImage::Yes, BMP_UP); + Image aImgDown(StockImage::Yes, BMP_DOWN); get(m_pTABLE_LEFT, "leftlabel"); get(m_pTABLE_RIGHT, "rightlabel"); get(m_pCTRL_LEFT, "left"); diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx index 42f25cb2cf12..29144469ad6f 100644 --- a/dbaccess/source/ui/misc/WTypeSelect.cxx +++ b/dbaccess/source/ui/misc/WTypeSelect.cxx @@ -232,7 +232,7 @@ OWizTypeSelect::OWizTypeSelect( vcl::Window* pParent, SvStream* _pStream ) m_pColumnNames->SetSelectHdl(LINK(this,OWizTypeSelect,ColumnSelectHdl)); - m_imgPKey = Image(BitmapEx(BMP_PRIMARY_KEY)); + m_imgPKey = Image(StockImage::Yes, BMP_PRIMARY_KEY); m_pTypeControl->Show(); m_pTypeControl->Init(); diff --git a/dbaccess/source/ui/misc/imageprovider.cxx b/dbaccess/source/ui/misc/imageprovider.cxx index 4410caf7e4db..a17795afc449 100644 --- a/dbaccess/source/ui/misc/imageprovider.cxx +++ b/dbaccess/source/ui/misc/imageprovider.cxx @@ -139,7 +139,7 @@ namespace dbaui lcl_getTableImageResourceID_nothrow( *m_pData, _rName, sImageResourceID ); if (!sImageResourceID.isEmpty() && !_out_rImage) - _out_rImage = Image(BitmapEx(sImageResourceID)); + _out_rImage = Image(StockImage::Yes, sImageResourceID); } } } @@ -149,7 +149,7 @@ namespace dbaui Image aObjectImage; OUString sImageResourceID( getDefaultImageResourceID( _nDatabaseObjectType) ); if (!sImageResourceID.isEmpty()) - aObjectImage = Image(BitmapEx(sImageResourceID)); + aObjectImage = Image(StockImage::Yes, sImageResourceID); return aObjectImage; } @@ -201,13 +201,13 @@ namespace dbaui Image aFolderImage; if (!sImageResourceID.isEmpty()) - aFolderImage = Image(BitmapEx(sImageResourceID)); + aFolderImage = Image(StockImage::Yes, sImageResourceID); return aFolderImage; } Image ImageProvider::getDatabaseImage() { - return Image(BitmapEx(DATABASE_TREE_ICON)); + return Image(StockImage::Yes, DATABASE_TREE_ICON); } } // namespace dbaui diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx index c7d84e2ad904..c7be7a9d94f8 100644 --- a/dbaccess/source/ui/querydesign/TableWindow.cxx +++ b/dbaccess/source/ui/querydesign/TableWindow.cxx @@ -191,7 +191,7 @@ void OTableWindow::FillListBox() } // mark all primary keys with special image - Image aPrimKeyImage = Image(BitmapEx(BMP_PRIMARY_KEY)); + Image aPrimKeyImage = Image(StockImage::Yes, BMP_PRIMARY_KEY); if (GetData()->IsShowAll()) { diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index 3e3808c3bbfa..677c8598c799 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -184,10 +184,10 @@ ExtensionBox_Impl::ExtensionBox_Impl(vcl::Window* pParent) : m_nActive( 0 ), m_nTopIndex( 0 ), m_nActiveHeight( 0 ), - m_aSharedImage(BitmapEx(RID_BMP_SHARED)), - m_aLockedImage(BitmapEx(RID_BMP_LOCKED)), - m_aWarningImage(BitmapEx(RID_BMP_WARNING)), - m_aDefaultImage(BitmapEx(RID_BMP_EXTENSION)), + m_aSharedImage(StockImage::Yes, RID_BMP_SHARED), + m_aLockedImage(StockImage::Yes, RID_BMP_LOCKED), + m_aWarningImage(StockImage::Yes, RID_BMP_WARNING), + m_aDefaultImage(StockImage::Yes, RID_BMP_EXTENSION), m_pScrollBar( nullptr ), m_pManager( nullptr ) { diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index 347c6e6445fa..243ed17fb4f3 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx @@ -588,7 +588,7 @@ UpdateDialog::CheckListBox::CheckListBox( vcl::Window* pParent, UpdateDialog & d m_enableUpdate( DpResId( RID_DLG_UPDATE_ENABLE ) ), m_dialog(dialog) { - SetNormalStaticImage(Image(BitmapEx(RID_DLG_UPDATE_NORMALALERT))); + SetNormalStaticImage(Image(StockImage::Yes, RID_DLG_UPDATE_NORMALALERT)); } sal_uInt16 UpdateDialog::CheckListBox::getItemCount() const { diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx index e0e57846e16c..c63d7792200b 100644 --- a/extensions/source/bibliography/toolbar.cxx +++ b/extensions/source/bibliography/toolbar.cxx @@ -572,9 +572,9 @@ void BibToolBar::RebuildToolbar() void BibToolBar::ApplyImageList() { - SetItemImage(nTBC_BT_AUTOFILTER, Image(BitmapEx(nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ? OUStringLiteral(RID_EXTBMP_AUTOFILTER_SC) : OUStringLiteral(RID_EXTBMP_AUTOFILTER_LC)))); - SetItemImage(nTBC_BT_FILTERCRIT, Image(BitmapEx(nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ? OUStringLiteral(RID_EXTBMP_FILTERCRIT_SC) : OUStringLiteral(RID_EXTBMP_FILTERCRIT_LC)))); - SetItemImage(nTBC_BT_REMOVEFILTER, Image(BitmapEx(nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ? OUStringLiteral(RID_EXTBMP_REMOVE_FILTER_SORT_SC) : OUStringLiteral(RID_EXTBMP_REMOVE_FILTER_SORT_LC)))); + SetItemImage(nTBC_BT_AUTOFILTER, Image(StockImage::Yes, nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ? OUStringLiteral(RID_EXTBMP_AUTOFILTER_SC) : OUStringLiteral(RID_EXTBMP_AUTOFILTER_LC))); + SetItemImage(nTBC_BT_FILTERCRIT, Image(StockImage::Yes, nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ? OUStringLiteral(RID_EXTBMP_FILTERCRIT_SC) : OUStringLiteral(RID_EXTBMP_FILTERCRIT_LC))); + SetItemImage(nTBC_BT_REMOVEFILTER, Image(StockImage::Yes, nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ? OUStringLiteral(RID_EXTBMP_REMOVE_FILTER_SORT_SC) : OUStringLiteral(RID_EXTBMP_REMOVE_FILTER_SORT_LC))); AdjustToolBox(); } diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx index c811a0f90d8d..89800e43ea66 100644 --- a/extensions/source/dbpilots/commonpagesdbp.cxx +++ b/extensions/source/dbpilots/commonpagesdbp.cxx @@ -361,8 +361,8 @@ namespace dbp return; } - Image aTableImage(BitmapEx(BMP_TABLE)); - Image aQueryImage(BitmapEx(BMP_QUERY)); + Image aTableImage(StockImage::Yes, BMP_TABLE); + Image aQueryImage(StockImage::Yes, BMP_QUERY); lcl_fillEntries( *m_pTable, aTableNames, aTableImage, CommandType::TABLE ); lcl_fillEntries( *m_pTable, aQueryNames, aQueryImage, CommandType::QUERY ); diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx index cad96ca645cd..77a126f877f0 100644 --- a/extensions/source/propctrlr/selectlabeldialog.cxx +++ b/extensions/source/propctrlr/selectlabeldialog.cxx @@ -66,8 +66,8 @@ namespace pcr m_pControlTree->EnableInplaceEditing( false ); m_pControlTree->SetStyle(m_pControlTree->GetStyle() | WB_BORDER | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HSCROLL); - m_pControlTree->SetNodeBitmaps(Image(BitmapEx(RID_EXTBMP_COLLAPSEDNODE)), - Image(BitmapEx(RID_EXTBMP_EXPANDEDNODE))); + m_pControlTree->SetNodeBitmaps(Image(StockImage::Yes, RID_EXTBMP_COLLAPSEDNODE), + Image(StockImage::Yes, RID_EXTBMP_EXPANDEDNODE)); m_pControlTree->SetSelectHdl(LINK(this, OSelectLabelDialog, OnEntrySelected)); m_pControlTree->SetDeselectHdl(LINK(this, OSelectLabelDialog, OnEntrySelected)); @@ -101,7 +101,7 @@ namespace pcr sal_Int16 nClassId = 0; try { nClassId = ::comphelper::getINT16(m_xControlModel->getPropertyValue(PROPERTY_CLASSID)); } catch(...) { } m_sRequiredService = (FormComponentType::RADIOBUTTON == nClassId) ? OUString(SERVICE_COMPONENT_GROUPBOX) : OUString(SERVICE_COMPONENT_FIXEDTEXT); - m_aRequiredControlImage = Image(BitmapEx(FormComponentType::RADIOBUTTON == nClassId ? OUStringLiteral(RID_EXTBMP_GROUPBOX) : OUStringLiteral(RID_EXTBMP_FIXEDTEXT))); + m_aRequiredControlImage = Image(StockImage::Yes, FormComponentType::RADIOBUTTON == nClassId ? OUStringLiteral(RID_EXTBMP_GROUPBOX) : OUStringLiteral(RID_EXTBMP_FIXEDTEXT)); // calc the currently set label control (so InsertEntries can calc m_pInitialSelection) Any aCurrentLabelControl( m_xControlModel->getPropertyValue(PROPERTY_CONTROLLABEL) ); @@ -112,7 +112,7 @@ namespace pcr aCurrentLabelControl >>= m_xInitialLabelControl; // insert the root - Image aRootImage(BitmapEx(RID_EXTBMP_FORMS)); + Image aRootImage(StockImage::Yes, RID_EXTBMP_FORMS); SvTreeListEntry* pRoot = m_pControlTree->InsertEntry(PcrRes(RID_STR_FORMS), aRootImage, aRootImage); // build the tree @@ -200,7 +200,7 @@ namespace pcr Reference< XIndexAccess > xCont(xAsSet, UNO_QUERY); if (xCont.is() && xCont->getCount()) { // yes -> step down - Image aFormImage(BitmapEx(RID_EXTBMP_FORM)); + Image aFormImage(StockImage::Yes, RID_EXTBMP_FORM); SvTreeListEntry* pCont = m_pControlTree->InsertEntry(sName, aFormImage, aFormImage, pContainerEntry); sal_Int32 nContChildren = InsertEntries(xCont, pCont); if (nContChildren) diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx index 5e6705c2d203..a4d0cfb5f1d0 100644 --- a/extensions/source/propctrlr/taborder.cxx +++ b/extensions/source/propctrlr/taborder.cxx @@ -78,7 +78,7 @@ namespace pcr } } - return Image(BitmapEx(sImageId)); + return Image(StockImage::Yes, sImageId); } } diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index 5625ab1a102e..a3e1a492ef3f 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -90,7 +90,7 @@ Image GetMenuBarIcon( MenuBar const * pMBar ) else sResID = RID_UPDATE_AVAILABLE_16; - return Image(BitmapEx(sResID)); + return Image(StockImage::Yes, sResID); } class BubbleWindow : public FloatingWindow @@ -268,7 +268,7 @@ Image UpdateCheckUI::GetBubbleImage( OUString const &rURL ) } if ( aImage.GetSizePixel().Width() == 0 ) - aImage = Image(BitmapEx(SV_RESID_BITMAP_INFOBOX)); + aImage = Image(StockImage::Yes, SV_RESID_BITMAP_INFOBOX); return aImage; } diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx index d96a2a84e7fc..d901bc1a7cfa 100644 --- a/formula/source/ui/dlg/parawin.cxx +++ b/formula/source/ui/dlg/parawin.cxx @@ -58,13 +58,13 @@ ParaWin::ParaWin(vcl::Window* pParent,IControlReferenceHandler* _pDlg): m_pFtArgDesc->SetText(""); get(m_pBtnFx1, "FX1"); - m_pBtnFx1->SetModeImage(Image(BitmapEx(BMP_FX))); + m_pBtnFx1->SetModeImage(Image(StockImage::Yes, BMP_FX)); get(m_pBtnFx2, "FX2"); - m_pBtnFx2->SetModeImage(Image(BitmapEx(BMP_FX))); + m_pBtnFx2->SetModeImage(Image(StockImage::Yes, BMP_FX)); get(m_pBtnFx3, "FX3"); - m_pBtnFx3->SetModeImage(Image(BitmapEx(BMP_FX))); + m_pBtnFx3->SetModeImage(Image(StockImage::Yes, BMP_FX)); get(m_pBtnFx4, "FX4"); - m_pBtnFx4->SetModeImage(Image(BitmapEx(BMP_FX))); + m_pBtnFx4->SetModeImage(Image(StockImage::Yes, BMP_FX)); get(m_pFtArg1, "FT_ARG1"); get(m_pFtArg2, "FT_ARG2"); diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx index 0dc29dd8fb19..6f2a51b3228e 100644 --- a/formula/source/ui/dlg/structpg.cxx +++ b/formula/source/ui/dlg/structpg.cxx @@ -93,8 +93,8 @@ StructPage::StructPage(vcl::Window* pParent): WB_HASBUTTONS|WB_HSCROLL|WB_NOINITIALSELECTION); m_pTlbStruct->SetNodeDefaultImages(); - m_pTlbStruct->SetDefaultExpandedEntryBmp(Image(BitmapEx(BMP_STR_OPEN))); - m_pTlbStruct->SetDefaultCollapsedEntryBmp(Image(BitmapEx(BMP_STR_CLOSE))); + m_pTlbStruct->SetDefaultExpandedEntryBmp(Image(StockImage::Yes, BMP_STR_OPEN)); + m_pTlbStruct->SetDefaultCollapsedEntryBmp(Image(StockImage::Yes, BMP_STR_CLOSE)); m_pTlbStruct->SetSelectHdl(LINK( this, StructPage, SelectHdl ) ); diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx index 34729dfb2005..be7666761946 100644 --- a/fpicker/source/office/RemoteFilesDialog.cxx +++ b/fpicker/source/office/RemoteFilesDialog.cxx @@ -217,7 +217,7 @@ RemoteFilesDialog::RemoteFilesDialog( vcl::Window* pParent, PickerFlags nBits ) { get( m_pOk_btn, "save" ); - m_pNewFolder->SetModeImage(Image(BitmapEx(BMP_FILEDLG_CREATEFOLDER))); + m_pNewFolder->SetModeImage(Image(StockImage::Yes, BMP_FILEDLG_CREATEFOLDER)); m_pNewFolder->SetClickHdl( LINK( this, RemoteFilesDialog, NewFolderHdl ) ); } diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 3977368924f3..8048c46df294 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -2751,7 +2751,7 @@ IMPL_LINK_NOARG( SvtFileDialog, Split_Hdl, Splitter*, void ) Image SvtFileDialog::GetButtonImage(const OUString& rButtonId) { - return Image(BitmapEx(rButtonId)); + return Image(StockImage::Yes, rButtonId); } QueryFolderNameDialog::QueryFolderNameDialog(weld::Window* _pParent, diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index bcb88030a8e3..49742cd16957 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -182,7 +182,7 @@ void ControlMenuController::updateImagesPopupMenu( PopupMenu* pPopupMenu ) OString sIdent = OString(aCommands[i]).copy(5); sal_uInt16 nId = pPopupMenu->GetItemId(sIdent); if (m_bShowMenuImages) - pPopupMenu->SetItemImage(nId, Image(BitmapEx(aImgIds[i]))); + pPopupMenu->SetItemImage(nId, Image(StockImage::Yes, aImgIds[i])); else pPopupMenu->SetItemImage(nId, Image()); } diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx index 0da3d9b97b74..6ce0354f891c 100644 --- a/framework/source/uielement/popuptoolbarcontroller.cxx +++ b/framework/source/uielement/popuptoolbarcontroller.cxx @@ -492,11 +492,11 @@ void SaveToolbarController::updateImage() else if ( m_bModified ) { if (eImageType == vcl::ImageType::Size26) - aImage = Image(BitmapEx(BMP_SAVEMODIFIED_LARGE)); + aImage = Image(StockImage::Yes, BMP_SAVEMODIFIED_LARGE); else if (eImageType == vcl::ImageType::Size32) - aImage = Image(BitmapEx(BMP_SAVEMODIFIED_EXTRALARGE)); + aImage = Image(StockImage::Yes, BMP_SAVEMODIFIED_EXTRALARGE); else - aImage = Image(BitmapEx(BMP_SAVEMODIFIED_SMALL)); + aImage = Image(StockImage::Yes, BMP_SAVEMODIFIED_SMALL); } if ( !aImage ) diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index 2b9503642a84..b28fb5ed7fcb 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -230,8 +230,8 @@ NavigatorTree::NavigatorTree( vcl::Window* pParent,OReportController& _rControll SetHelpId( HID_REPORT_NAVIGATOR_TREE ); SetNodeBitmaps( - Image(BitmapEx(RID_SVXBMP_COLLAPSEDNODE)), - Image(BitmapEx(RID_SVXBMP_EXPANDEDNODE)) + Image(StockImage::Yes, RID_SVXBMP_COLLAPSEDNODE), + Image(StockImage::Yes, RID_SVXBMP_EXPANDEDNODE) ); SetDragDropMode(DragDropMode::ALL); @@ -522,8 +522,7 @@ SvTreeListEntry* NavigatorTree::insertEntry(const OUString& _sName,SvTreeListEnt SvTreeListEntry* pEntry = nullptr; if (!rImageId.isEmpty()) { - BitmapEx aBitmap(rImageId); - const Image aImage(aBitmap); + const Image aImage(StockImage::Yes, rImageId); pEntry = InsertEntry(_sName,aImage,aImage,_pParent,false,_nPosition,_pData); } else diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx index 0b2b8b843f04..0a6476cfd34e 100644 --- a/reportdesign/source/ui/report/StartMarker.cxx +++ b/reportdesign/source/ui/report/StartMarker.cxx @@ -192,8 +192,8 @@ void OStartMarker::initDefaultNodeImages() { if ( !s_pDefCollapsed ) { - s_pDefCollapsed = new Image(BitmapEx(RID_BMP_TREENODE_COLLAPSED)); - s_pDefExpanded = new Image(BitmapEx(RID_BMP_TREENODE_EXPANDED)); + s_pDefCollapsed = new Image(StockImage::Yes, RID_BMP_TREENODE_COLLAPSED); + s_pDefExpanded = new Image(StockImage::Yes, RID_BMP_TREENODE_EXPANDED); } Image* pImage = m_bCollapsed ? s_pDefCollapsed : s_pDefExpanded; diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 02a881304152..2162eb6b9f74 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -189,11 +189,11 @@ ScInputWindow::ScInputWindow( vcl::Window* pParent, const SfxBindings* pBind ) : // Position window, 3 buttons, input window InsertWindow (1, aWndPos.get(), ToolBoxItemBits::NONE, 0); InsertSeparator (1); - InsertItem (SID_INPUT_FUNCTION, Image(BitmapEx(RID_BMP_INPUT_FUNCTION)), ToolBoxItemBits::NONE, 2); - InsertItem (SID_INPUT_SUM, Image(BitmapEx(RID_BMP_INPUT_SUM)), ToolBoxItemBits::NONE, 3); - InsertItem (SID_INPUT_EQUAL, Image(BitmapEx(RID_BMP_INPUT_EQUAL)), ToolBoxItemBits::NONE, 4); - InsertItem (SID_INPUT_CANCEL, Image(BitmapEx(RID_BMP_INPUT_CANCEL)), ToolBoxItemBits::NONE, 5); - InsertItem (SID_INPUT_OK, Image(BitmapEx(RID_BMP_INPUT_OK)), ToolBoxItemBits::NONE, 6); + InsertItem (SID_INPUT_FUNCTION, Image(StockImage::Yes, RID_BMP_INPUT_FUNCTION), ToolBoxItemBits::NONE, 2); + InsertItem (SID_INPUT_SUM, Image(StockImage::Yes, RID_BMP_INPUT_SUM), ToolBoxItemBits::NONE, 3); + InsertItem (SID_INPUT_EQUAL, Image(StockImage::Yes, RID_BMP_INPUT_EQUAL), ToolBoxItemBits::NONE, 4); + InsertItem (SID_INPUT_CANCEL, Image(StockImage::Yes, RID_BMP_INPUT_CANCEL), ToolBoxItemBits::NONE, 5); + InsertItem (SID_INPUT_OK, Image(StockImage::Yes, RID_BMP_INPUT_OK), ToolBoxItemBits::NONE, 6); InsertSeparator (7); InsertWindow (7, &aTextWindow, ToolBoxItemBits::NONE, 8); @@ -642,16 +642,16 @@ void ScInputWindow::DataChanged( const DataChangedEvent& rDCEvt ) if ( rDCEvt.GetType() == DataChangedEventType::SETTINGS && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { // update item images - SetItemImage(SID_INPUT_FUNCTION, Image(BitmapEx(RID_BMP_INPUT_FUNCTION))); + SetItemImage(SID_INPUT_FUNCTION, Image(StockImage::Yes, RID_BMP_INPUT_FUNCTION)); if ( bIsOkCancelMode ) { - SetItemImage(SID_INPUT_CANCEL, Image(BitmapEx(RID_BMP_INPUT_CANCEL))); - SetItemImage(SID_INPUT_OK, Image(BitmapEx(RID_BMP_INPUT_OK))); + SetItemImage(SID_INPUT_CANCEL, Image(StockImage::Yes, RID_BMP_INPUT_CANCEL)); + SetItemImage(SID_INPUT_OK, Image(StockImage::Yes, RID_BMP_INPUT_OK)); } else { - SetItemImage(SID_INPUT_SUM, Image(BitmapEx(RID_BMP_INPUT_SUM))); - SetItemImage(SID_INPUT_EQUAL, Image(BitmapEx(RID_BMP_INPUT_EQUAL))); + SetItemImage(SID_INPUT_SUM, Image(StockImage::Yes, RID_BMP_INPUT_SUM)); + SetItemImage(SID_INPUT_EQUAL, Image(StockImage::Yes, RID_BMP_INPUT_EQUAL)); } } diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index 6b4df19ea669..632f61e4dda9 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -2231,12 +2231,12 @@ std::unique_ptr<SfxStyleFamilies> ScModule::CreateStyleFamilies() pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Para, ScResId(STR_STYLE_FAMILY_CELL), - Image(BitmapEx(BMP_STYLES_FAMILY_CELL)), + Image(StockImage::Yes, BMP_STYLES_FAMILY_CELL), RID_CELLSTYLEFAMILY, SC_MOD()->GetResLocale())); pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Page, ScResId(STR_STYLE_FAMILY_PAGE), - Image(BitmapEx(BMP_STYLES_FAMILY_PAGE)), + Image(StockImage::Yes, BMP_STYLES_FAMILY_PAGE), RID_PAGESTYLEFAMILY, SC_MOD()->GetResLocale())); return pStyleFamilies; diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx index 6c9938bcfc85..9eb38a66ddd7 100644 --- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx +++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx @@ -220,9 +220,9 @@ ScZoomSliderWnd::ScZoomSliderWnd( vcl::Window* pParent, aLogicalSize( 115, 40 ), m_xDispatchProvider( rDispatchProvider ) { - mpImpl->maSliderButton = Image(BitmapEx(RID_SVXBMP_SLIDERBUTTON)); - mpImpl->maIncreaseButton = Image(BitmapEx(RID_SVXBMP_SLIDERINCREASE)); - mpImpl->maDecreaseButton = Image(BitmapEx(RID_SVXBMP_SLIDERDECREASE)); + mpImpl->maSliderButton = Image(StockImage::Yes, RID_SVXBMP_SLIDERBUTTON); + mpImpl->maIncreaseButton = Image(StockImage::Yes, RID_SVXBMP_SLIDERINCREASE); + mpImpl->maDecreaseButton = Image(StockImage::Yes, RID_SVXBMP_SLIDERDECREASE); Size aSliderSize = LogicToPixel( aLogicalSize, MapMode( MapUnit::Map10thMM ) ); SetSizePixel( Size( aSliderSize.Width() * nSliderWidth-1, aSliderSize.Height() + nSliderHeight ) ); } diff --git a/sc/source/ui/miscdlgs/dataproviderdlg.cxx b/sc/source/ui/miscdlgs/dataproviderdlg.cxx index b8bff7916874..d4cd62bcf5aa 100644 --- a/sc/source/ui/miscdlgs/dataproviderdlg.cxx +++ b/sc/source/ui/miscdlgs/dataproviderdlg.cxx @@ -91,7 +91,7 @@ ScDataProviderBaseControl::ScDataProviderBaseControl(vcl::Window* pParent, mpApplyBtn->SetControlForeground(COL_GREEN); mpApplyBtn->SetControlBackground(COL_GREEN); mpApplyBtn->SetBackground(Wallpaper(COL_LIGHTGREEN)); - mpApplyBtn->SetModeImage(Image(BitmapEx("sc/res/xml_element.png"))); + mpApplyBtn->SetModeImage(Image(StockImage::Yes, "sc/res/xml_element.png")); mpApplyBtn->Show(); mpApplyBtn->SetClickHdl(LINK(this, ScDataProviderBaseControl, ApplyBtnHdl)); SetSizePixel(GetOptimalSize()); diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index cca7461fea0b..c11936752551 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -250,8 +250,7 @@ void ScContentTree::InitRoot( ScContentId nType ) return; } - BitmapEx aBitmap(aContentBmps[static_cast<int>(nType) - 1]); - Image aImage(aBitmap); + Image aImage(StockImage::Yes, aContentBmps[static_cast<int>(nType) - 1]); OUString aName(ScResId(SCSTR_CONTENT_ARY[static_cast<int>(nType)])); // back to the correct position: sal_uInt16 nPos = nRootType != ScContentId::ROOT ? 0 : pPosList[nType]-1; diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index 2701cddda19d..b74176410920 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -428,7 +428,7 @@ void ScNavigatorDlg::UpdateButtons() sImageId = RID_BMP_DROP_COPY; break; } - aTbxCmd->SetItemImage(nDragModeId, Image(BitmapEx(sImageId))); + aTbxCmd->SetItemImage(nDragModeId, Image(StockImage::Yes, sImageId)); } ScNavigatorSettings::ScNavigatorSettings() diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx index 819929a6f8b2..e1aadc00307b 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx @@ -57,16 +57,16 @@ CellAppearancePropertyPanel::CellAppearancePropertyPanel( maBorderTLBRControl(SID_ATTR_BORDER_DIAG_TLBR, *pBindings, *this), maBorderBLTRControl(SID_ATTR_BORDER_DIAG_BLTR, *pBindings, *this), - maIMGCellBorder(BitmapEx(RID_BMP_CELL_BORDER)), - maIMGLineStyle1(BitmapEx(RID_BMP_LINE_STYLE1)), - maIMGLineStyle2(BitmapEx(RID_BMP_LINE_STYLE2)), - maIMGLineStyle3(BitmapEx(RID_BMP_LINE_STYLE3)), - maIMGLineStyle4(BitmapEx(RID_BMP_LINE_STYLE4)), - maIMGLineStyle5(BitmapEx(RID_BMP_LINE_STYLE5)), - maIMGLineStyle6(BitmapEx(RID_BMP_LINE_STYLE6)), - maIMGLineStyle7(BitmapEx(RID_BMP_LINE_STYLE7)), - maIMGLineStyle8(BitmapEx(RID_BMP_LINE_STYLE8)), - maIMGLineStyle9(BitmapEx(RID_BMP_LINE_STYLE9)), + maIMGCellBorder(StockImage::Yes, RID_BMP_CELL_BORDER), + maIMGLineStyle1(StockImage::Yes, RID_BMP_LINE_STYLE1), + maIMGLineStyle2(StockImage::Yes, RID_BMP_LINE_STYLE2), + maIMGLineStyle3(StockImage::Yes, RID_BMP_LINE_STYLE3), + maIMGLineStyle4(StockImage::Yes, RID_BMP_LINE_STYLE4), + maIMGLineStyle5(StockImage::Yes, RID_BMP_LINE_STYLE5), + maIMGLineStyle6(StockImage::Yes, RID_BMP_LINE_STYLE6), + maIMGLineStyle7(StockImage::Yes, RID_BMP_LINE_STYLE7), + maIMGLineStyle8(StockImage::Yes, RID_BMP_LINE_STYLE8), + maIMGLineStyle9(StockImage::Yes, RID_BMP_LINE_STYLE9), mnInWidth(0), mnOutWidth(0), diff --git a/sc/source/ui/view/olinewin.cxx b/sc/source/ui/view/olinewin.cxx index d60461963624..431c6259aef5 100644 --- a/sc/source/ui/view/olinewin.cxx +++ b/sc/source/ui/view/olinewin.cxx @@ -530,7 +530,7 @@ namespace { Image GetImage(const OUString& rId) { - return Image(BitmapEx(rId)); + return Image(StockImage::Yes, rId); } } diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx index 995498a4d6ee..fd8b652bd209 100644 --- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx +++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx @@ -90,9 +90,9 @@ ScXMLSourceDlg::ScXMLSourceDlg( mpActiveEdit = mpRefEdit; - maXMLParam.maImgElementDefault = Image(BitmapEx(RID_BMP_ELEMENT_DEFAULT)); - maXMLParam.maImgElementRepeat = Image(BitmapEx(RID_BMP_ELEMENT_REPEAT)); - maXMLParam.maImgAttribute = Image(BitmapEx(RID_BMP_ELEMENT_ATTRIBUTE)); + maXMLParam.maImgElementDefault = Image(StockImage::Yes, RID_BMP_ELEMENT_DEFAULT); + maXMLParam.maImgElementRepeat = Image(StockImage::Yes, RID_BMP_ELEMENT_REPEAT); + maXMLParam.maImgAttribute = Image(StockImage::Yes, RID_BMP_ELEMENT_ATTRIBUTE); Link<Button*,void> aBtnHdl = LINK(this, ScXMLSourceDlg, BtnPressedHdl); mpBtnSelectSource->SetClickHdl(aBtnHdl); diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index a4aa0644abe7..9019a412482b 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -274,11 +274,11 @@ void CustomAnimationListEntryItem::Paint(const Point& rPos, SvTreeListBox& rDev, sal_Int16 nNodeType = mpEffect->getNodeType(); if (nNodeType == EffectNodeType::ON_CLICK ) { - rRenderContext.DrawImage(aPos, Image(BitmapEx(BMP_CUSTOMANIMATION_ON_CLICK))); + rRenderContext.DrawImage(aPos, Image(StockImage::Yes, BMP_CUSTOMANIMATION_ON_CLICK)); } else if (nNodeType == EffectNodeType::AFTER_PREVIOUS) { - rRenderContext.DrawImage(aPos, Image(BitmapEx(BMP_CUSTOMANIMATION_AFTER_PREVIOUS))); + rRenderContext.DrawImage(aPos, Image(StockImage::Yes, BMP_CUSTOMANIMATION_AFTER_PREVIOUS)); } else if (nNodeType == EffectNodeType::WITH_PREVIOUS) { @@ -323,8 +323,7 @@ void CustomAnimationListEntryItem::Paint(const Point& rPos, SvTreeListBox& rDev, if (!sImage.isEmpty()) { - BitmapEx aBitmap(sImage); - Image aImage(aBitmap); + Image aImage(StockImage::Yes, sImage); Point aImagePos(aPos); aImagePos.AdjustY((aSize.Height()/2 - aImage.GetSizePixel().Height()) >> 1 ); rRenderContext.DrawImage(aImagePos, aImage); diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index b7025bacfb30..826c307b25fd 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -472,7 +472,7 @@ void SlideTransitionPane::Initialize(SdDrawDocument* pDoc) // dummy list box of slide transitions for startup. mpVS_TRANSITION_ICONS->InsertItem( - 0, Image( BitmapEx( "sd/cmd/transition-none.png" ) ), + 0, Image( StockImage::Yes, "sd/cmd/transition-none.png" ), SdResId( STR_SLIDETRANSITION_NONE ), VALUESET_APPEND, /* show legend */ true ); mpVS_TRANSITION_ICONS->RecalculateItemSizes(); diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index 04aa3657adf7..2730b1e7adc9 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -811,12 +811,12 @@ std::unique_ptr<SfxStyleFamilies> SdModule::CreateStyleFamilies() pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Para, SdResId(STR_GRAPHICS_STYLE_FAMILY), - Image(BitmapEx(BMP_STYLES_FAMILY_GRAPHICS)), + Image(StockImage::Yes, BMP_STYLES_FAMILY_GRAPHICS), RID_GRAPHICSTYLEFAMILY, SD_MOD()->GetResLocale())); pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Pseudo, SdResId(STR_PRESENTATIONS_STYLE_FAMILY), - Image(BitmapEx(BMP_STYLES_FAMILY_PRESENTATIONS)), + Image(StockImage::Yes, BMP_STYLES_FAMILY_PRESENTATIONS), RID_PRESENTATIONSTYLEFAMILY, SD_MOD()->GetResLocale())); return pStyleFamilies; diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index 6e573c8f259f..7ef07aaa7ea9 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -768,7 +768,7 @@ void SdNavigatorWin::KeyInput( const KeyEvent& rKEvt ) void SdNavigatorWin::SetDragImage() { const sal_uInt16 nDragTypeId = maToolbox->GetItemId("dragmode"); - maToolbox->SetItemImage(nDragTypeId, Image(BitmapEx(GetDragTypeSdBmpId(meDragType)))); + maToolbox->SetItemImage(nDragTypeId, Image(StockImage::Yes, GetDragTypeSdBmpId(meDragType))); } /** diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index f3ff7edbec0c..70ecaebf96f0 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -198,8 +198,8 @@ SdPageObjsTLB::SdPageObjsTLB( vcl::Window* pParentWin, WinBits nStyle ) , mpBookmarkDoc ( nullptr ) , mpMedium ( nullptr ) , mpOwnMedium ( nullptr ) -, maImgOle ( BitmapEx(BMP_OLE) ) -, maImgGraphic ( BitmapEx(BMP_GRAPHIC) ) +, maImgOle ( StockImage::Yes, BMP_OLE ) +, maImgGraphic ( StockImage::Yes, BMP_GRAPHIC ) , mbLinkableSelected ( false ) , mbSaveTreeItemState ( false ) , mbShowAllShapes ( false ) @@ -213,7 +213,7 @@ SdPageObjsTLB::SdPageObjsTLB( vcl::Window* pParentWin, WinBits nStyle ) WB_HSCROLL | WB_HASBUTTONSATROOT ); SetQuickSearch(true); /* i31275 */; - SetNodeBitmaps(Image(BitmapEx(BMP_EXPAND)), Image(BitmapEx(BMP_COLLAPSE))); + SetNodeBitmaps(Image(StockImage::Yes, BMP_EXPAND), Image(StockImage::Yes, BMP_COLLAPSE)); SetDragDropMode( DragDropMode::CTRL_MOVE | DragDropMode::CTRL_COPY | @@ -488,8 +488,8 @@ void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc, SfxMedium* pInMedium, mpMedium = pInMedium; maDocName = rDocName; - Image aImgDocOpen=Image(BitmapEx(BMP_DOC_OPEN)); - Image aImgDocClosed=Image(BitmapEx(BMP_DOC_CLOSED)); + Image aImgDocOpen(StockImage::Yes, BMP_DOC_OPEN); + Image aImgDocClosed(StockImage::Yes, BMP_DOC_CLOSED); // insert document name InsertEntry( maDocName, aImgDocOpen, aImgDocClosed, nullptr, true, TREELIST_APPEND, @@ -750,9 +750,9 @@ void SdPageObjsTLB::RequestingChildren( SvTreeListEntry* pFileEntry ) SdrObject* pObj = nullptr; SvTreeListEntry* pPageEntry = nullptr; - Image aImgPage = Image(BitmapEx(BMP_PAGE)); - Image aImgPageObjs = Image(BitmapEx(BMP_PAGEOBJS)); - Image aImgObjects = Image(BitmapEx(BMP_OBJECTS)); + Image aImgPage(StockImage::Yes, BMP_PAGE); + Image aImgPageObjs(StockImage::Yes, BMP_PAGEOBJS); + Image aImgObjects(StockImage::Yes, BMP_OBJECTS); // document name already inserted @@ -1422,12 +1422,12 @@ void SdPageObjsTLB::AddShapeToTransferable ( //===== IconProvider ========================================================== SdPageObjsTLB::IconProvider::IconProvider() - : maImgPage(BitmapEx(BMP_PAGE)), - maImgPageExcl(BitmapEx(BMP_PAGE_EXCLUDED)), - maImgPageObjsExcl(BitmapEx(BMP_PAGEOBJS_EXCLUDED)), - maImgPageObjs(BitmapEx(BMP_PAGEOBJS)), - maImgObjects(BitmapEx(BMP_OBJECTS)), - maImgGroup(BitmapEx(BMP_GROUP)) + : maImgPage(StockImage::Yes, BMP_PAGE), + maImgPageExcl(StockImage::Yes, BMP_PAGE_EXCLUDED), + maImgPageObjsExcl(StockImage::Yes, BMP_PAGEOBJS_EXCLUDED), + maImgPageObjs(StockImage::Yes, BMP_PAGEOBJS), + maImgObjects(StockImage::Yes, BMP_OBJECTS), + maImgGroup(StockImage::Yes, BMP_GROUP) { } diff --git a/sd/source/ui/tools/IconCache.cxx b/sd/source/ui/tools/IconCache.cxx index 25b3e0225f8d..3d38142dd225 100644 --- a/sd/source/ui/tools/IconCache.cxx +++ b/sd/source/ui/tools/IconCache.cxx @@ -54,7 +54,7 @@ Image IconCache::Implementation::GetIcon(const OUString& rResourceId) iImage = maContainer.find(rResourceId); if (iImage == maContainer.end()) { - aResult = Image(BitmapEx(rResourceId)); + aResult = Image(StockImage::Yes, rResourceId); maContainer[rResourceId] = aResult; } else diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 92a558285efc..7a269a09d8a4 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -266,9 +266,9 @@ struct ContentEntry_Impl ContentListBox_Impl::ContentListBox_Impl(vcl::Window* pParent, WinBits nStyle) : SvTreeListBox(pParent, nStyle) - , aOpenBookImage(BitmapEx(BMP_HELP_CONTENT_BOOK_OPEN)) - , aClosedBookImage(BitmapEx(BMP_HELP_CONTENT_BOOK_CLOSED)) - , aDocumentImage(BitmapEx(BMP_HELP_CONTENT_DOC)) + , aOpenBookImage(StockImage::Yes, BMP_HELP_CONTENT_BOOK_OPEN) + , aClosedBookImage(StockImage::Yes, BMP_HELP_CONTENT_BOOK_CLOSED) + , aDocumentImage(StockImage::Yes, BMP_HELP_CONTENT_DOC) { SetStyle( GetStyle() | WB_HIDESELECTION | WB_HSCROLL ); @@ -1851,8 +1851,8 @@ SfxHelpTextWindow_Impl::SfxHelpTextWindow_Impl( SfxHelpWindow_Impl* pParent ) : aToolBox ( VclPtr<ToolBox>::Create(this, 0) ), aOnStartupCB ( VclPtr<CheckBox>::Create(this, WB_HIDE | WB_TABSTOP) ), aSelectIdle ( "sfx2 appl SfxHelpTextWindow_Impl Select" ), - aIndexOnImage (BitmapEx(BMP_HELP_TOOLBOX_INDEX_ON)), - aIndexOffImage (BitmapEx(BMP_HELP_TOOLBOX_INDEX_OFF)), + aIndexOnImage (StockImage::Yes, BMP_HELP_TOOLBOX_INDEX_ON), + aIndexOffImage (StockImage::Yes, BMP_HELP_TOOLBOX_INDEX_OFF), aIndexOnText ( SfxResId( STR_HELP_BUTTON_INDEX_ON ) ), aIndexOffText ( SfxResId( STR_HELP_BUTTON_INDEX_OFF ) ), aOnStartupText ( SfxResId( RID_HELP_ONSTARTUP_TEXT ) ), @@ -1947,33 +1947,33 @@ void SfxHelpTextWindow_Impl::InitToolBoxImages() { bool bLarge = SvtMiscOptions().AreCurrentSymbolsLarge(); - aIndexOnImage = Image(BitmapEx(bLarge ? OUString(BMP_HELP_TOOLBOX_L_INDEX_ON) : OUString(BMP_HELP_TOOLBOX_INDEX_ON))); - aIndexOffImage = Image(BitmapEx(bLarge ? OUString(BMP_HELP_TOOLBOX_L_INDEX_OFF) : OUString(BMP_HELP_TOOLBOX_INDEX_OFF))); + aIndexOnImage = Image(StockImage::Yes, bLarge ? OUString(BMP_HELP_TOOLBOX_L_INDEX_ON) : OUString(BMP_HELP_TOOLBOX_INDEX_ON)); + aIndexOffImage = Image(StockImage::Yes, bLarge ? OUString(BMP_HELP_TOOLBOX_L_INDEX_OFF) : OUString(BMP_HELP_TOOLBOX_INDEX_OFF)); aToolBox->SetItemImage( TBI_INDEX, bIsIndexOn ? aIndexOffImage : aIndexOnImage ); aToolBox->SetItemImage( TBI_BACKWARD, - Image(BitmapEx(bLarge ? OUString(BMP_HELP_TOOLBOX_L_PREV) : OUString(BMP_HELP_TOOLBOX_PREV))) + Image(StockImage::Yes, bLarge ? OUString(BMP_HELP_TOOLBOX_L_PREV) : OUString(BMP_HELP_TOOLBOX_PREV)) ); aToolBox->SetItemImage( TBI_FORWARD, - Image(BitmapEx(bLarge ? OUString(BMP_HELP_TOOLBOX_L_NEXT) : OUString(BMP_HELP_TOOLBOX_NEXT))) + Image(StockImage::Yes, bLarge ? OUString(BMP_HELP_TOOLBOX_L_NEXT) : OUString(BMP_HELP_TOOLBOX_NEXT)) ); aToolBox->SetItemImage( TBI_START, - Image(BitmapEx(bLarge ? OUString(BMP_HELP_TOOLBOX_L_START) : OUString(BMP_HELP_TOOLBOX_START))) + Image(StockImage::Yes, bLarge ? OUString(BMP_HELP_TOOLBOX_L_START) : OUString(BMP_HELP_TOOLBOX_START)) ); aToolBox->SetItemImage( TBI_PRINT, - Image(BitmapEx(bLarge ? OUString(BMP_HELP_TOOLBOX_L_PRINT) : OUString(BMP_HELP_TOOLBOX_PRINT))) + Image(StockImage::Yes, bLarge ? OUString(BMP_HELP_TOOLBOX_L_PRINT) : OUString(BMP_HELP_TOOLBOX_PRINT)) ); aToolBox->SetItemImage( TBI_BOOKMARKS, - Image(BitmapEx(bLarge ? OUString(BMP_HELP_TOOLBOX_L_BOOKMARKS) : OUString(BMP_HELP_TOOLBOX_BOOKMARKS))) + Image(StockImage::Yes, bLarge ? OUString(BMP_HELP_TOOLBOX_L_BOOKMARKS) : OUString(BMP_HELP_TOOLBOX_BOOKMARKS)) ); aToolBox->SetItemImage( TBI_SEARCHDIALOG, - Image(BitmapEx(bLarge ? OUString(BMP_HELP_TOOLBOX_L_SEARCHDIALOG) : OUString(BMP_HELP_TOOLBOX_SEARCHDIALOG))) + Image(StockImage::Yes, bLarge ? OUString(BMP_HELP_TOOLBOX_L_SEARCHDIALOG) : OUString(BMP_HELP_TOOLBOX_SEARCHDIALOG)) ); Size aSize = aToolBox->CalcWindowSizePixel(); @@ -2319,43 +2319,43 @@ bool SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt ) aPos.AdjustY(pTextWin->GetPosPixel().Y() ); ScopedVclPtrInstance<PopupMenu> aMenu; if ( bIsIndexOn ) - aMenu->InsertItem(TBI_INDEX, aIndexOffText, Image(BitmapEx(BMP_HELP_TOOLBOX_INDEX_OFF))); + aMenu->InsertItem(TBI_INDEX, aIndexOffText, Image(StockImage::Yes, BMP_HELP_TOOLBOX_INDEX_OFF)); else - aMenu->InsertItem(TBI_INDEX, aIndexOnText, Image(BitmapEx(BMP_HELP_TOOLBOX_INDEX_ON))); + aMenu->InsertItem(TBI_INDEX, aIndexOnText, Image(StockImage::Yes, BMP_HELP_TOOLBOX_INDEX_ON)); aMenu->SetHelpId( TBI_INDEX, HID_HELP_TOOLBOXITEM_INDEX ); aMenu->InsertSeparator(); aMenu->InsertItem( TBI_BACKWARD, SfxResId( STR_HELP_BUTTON_PREV ), - Image(BitmapEx(BMP_HELP_TOOLBOX_PREV)) + Image(StockImage::Yes, BMP_HELP_TOOLBOX_PREV) ); aMenu->SetHelpId( TBI_BACKWARD, HID_HELP_TOOLBOXITEM_BACKWARD ); aMenu->EnableItem( TBI_BACKWARD, pHelpWin->HasHistoryPredecessor() ); aMenu->InsertItem( TBI_FORWARD, SfxResId( STR_HELP_BUTTON_NEXT ), - Image(BitmapEx(BMP_HELP_TOOLBOX_NEXT)) + Image(StockImage::Yes, BMP_HELP_TOOLBOX_NEXT) ); aMenu->SetHelpId( TBI_FORWARD, HID_HELP_TOOLBOXITEM_FORWARD ); aMenu->EnableItem( TBI_FORWARD, pHelpWin->HasHistorySuccessor() ); aMenu->InsertItem( TBI_START, SfxResId( STR_HELP_BUTTON_START ), - Image(BitmapEx(BMP_HELP_TOOLBOX_START)) + Image(StockImage::Yes, BMP_HELP_TOOLBOX_START) ); aMenu->SetHelpId( TBI_START, HID_HELP_TOOLBOXITEM_START ); aMenu->InsertSeparator(); aMenu->InsertItem( TBI_PRINT, SfxResId( STR_HELP_BUTTON_PRINT ), - Image(BitmapEx(BMP_HELP_TOOLBOX_PRINT)) + Image(StockImage::Yes, BMP_HELP_TOOLBOX_PRINT) ); aMenu->SetHelpId( TBI_PRINT, HID_HELP_TOOLBOXITEM_PRINT ); aMenu->InsertItem( TBI_BOOKMARKS, SfxResId( STR_HELP_BUTTON_ADDBOOKMARK ), - Image(BitmapEx(BMP_HELP_TOOLBOX_BOOKMARKS)) + Image(StockImage::Yes, BMP_HELP_TOOLBOX_BOOKMARKS) ); aMenu->SetHelpId( TBI_BOOKMARKS, HID_HELP_TOOLBOXITEM_BOOKMARKS ); aMenu->InsertItem( TBI_SEARCHDIALOG, SfxResId( STR_HELP_BUTTON_SEARCHDIALOG ), - Image(BitmapEx(BMP_HELP_TOOLBOX_SEARCHDIALOG)) + Image(StockImage::Yes, BMP_HELP_TOOLBOX_SEARCHDIALOG) ); aMenu->SetHelpId( TBI_SEARCHDIALOG, HID_HELP_TOOLBOXITEM_SEARCHDIALOG ); aMenu->InsertSeparator(); @@ -2378,7 +2378,7 @@ bool SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt ) aMenu->InsertSeparator(); aMenu->InsertItem( TBI_COPY, SfxResId(STR_HELP_MENU_TEXT_COPY), - Image(BitmapEx(BMP_HELP_TOOLBOX_COPY)) + Image(StockImage::Yes, BMP_HELP_TOOLBOX_COPY) ); aMenu->SetHelpId( TBI_COPY, ".uno:Copy" ); aMenu->EnableItem( TBI_COPY, HasSelection() ); diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx index b35397cf9296..3970c7f08a39 100644 --- a/sfx2/source/control/recentdocsview.cxx +++ b/sfx2/source/control/recentdocsview.cxx @@ -123,7 +123,7 @@ RecentDocsView::RecentDocsView( vcl::Window* pParent ) : ThumbnailView(pParent) , mnFileTypes(ApplicationType::TYPE_NONE) , mnLastMouseDownItem(THUMBNAILVIEW_ITEM_NOTFOUND) - , maWelcomeImage(BitmapEx(BMP_WELCOME)) + , maWelcomeImage(StockImage::Yes, BMP_WELCOME) , maWelcomeLine1(SfxResId(STR_WELCOME_LINE1)) , maWelcomeLine2(SfxResId(STR_WELCOME_LINE2)) { diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 316372ec6f2b..c866edd2ed45 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -1421,7 +1421,7 @@ CustomPropertyLine::CustomPropertyLine( vcl::Window* pParent ) : m_aTimeField->SetExtFormat( ExtTimeFieldFormat::Long24H ); m_aDateField->SetExtDateFormat( ExtDateFieldFormat::SystemShortYYYY ); - m_aRemoveButton->SetModeImage(Image(BitmapEx(SFX_BMP_PROPERTY_REMOVE))); + m_aRemoveButton->SetModeImage(Image(StockImage::Yes, SFX_BMP_PROPERTY_REMOVE)); m_aRemoveButton->SetQuickHelpText(SfxResId(STR_SFX_REMOVE_PROPERTY)); m_aEditButton->SetText(SFX_ST_EDIT); diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx index d1f753c8da71..4e66a9db55f4 100644 --- a/sfx2/source/dialog/infobar.cxx +++ b/sfx2/source/dialog/infobar.cxx @@ -183,7 +183,7 @@ SfxInfoBarWindow::SfxInfoBarWindow(vcl::Window* pParent, const OUString& sId, long nWidth = pParent->GetSizePixel().getWidth(); SetPosSizePixel(Point(0, 0), Size(nWidth, INFO_BAR_BASE_HEIGHT * fScaleFactor)); - m_pImage->SetImage(Image(BitmapEx(GetInfoBarIconName(ibType)))); + m_pImage->SetImage(Image(StockImage::Yes, GetInfoBarIconName(ibType))); m_pImage->SetPaintTransparent(true); m_pImage->Show(); @@ -305,7 +305,7 @@ void SfxInfoBarWindow::Update( const OUString &sNewMessage, InfoBarType eType ) { m_eType = eType; SetForeAndBackgroundColors(m_eType); - m_pImage->SetImage(Image(BitmapEx(GetInfoBarIconName(eType)))); + m_pImage->SetImage(Image(StockImage::Yes, GetInfoBarIconName(eType))); } m_pMessage->SetText( sNewMessage ); diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index d7a3ad778d89..6a29e77056b8 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -2140,13 +2140,13 @@ SfxTemplateDialog_Impl::SfxTemplateDialog_Impl(SfxBindings* pB, SfxTemplatePanel , m_aActionTbL(VclPtrInstance<DropToolBox_Impl>(pDlgWindow, this)) , m_aActionTbR(VclPtrInstance<ToolBox>(pDlgWindow)) { - m_aActionTbR->InsertItem(SID_STYLE_WATERCAN, Image(BitmapEx(RID_SFXBMP_WATERCAN)), SfxResId(STR_STYLE_FILL_FORMAT_MODE)); + m_aActionTbR->InsertItem(SID_STYLE_WATERCAN, Image(StockImage::Yes, RID_SFXBMP_WATERCAN), SfxResId(STR_STYLE_FILL_FORMAT_MODE)); m_aActionTbR->SetHelpId(SID_STYLE_WATERCAN, HID_TEMPLDLG_WATERCAN); - m_aActionTbR->InsertItem(SID_STYLE_NEW_BY_EXAMPLE, Image(BitmapEx(RID_SFXBMP_NEW_BY_EXAMPLE)), SfxResId(STR_STYLE_NEW_STYLE_FROM_SELECTION)); + m_aActionTbR->InsertItem(SID_STYLE_NEW_BY_EXAMPLE, Image(StockImage::Yes, RID_SFXBMP_NEW_BY_EXAMPLE), SfxResId(STR_STYLE_NEW_STYLE_FROM_SELECTION)); m_aActionTbR->SetHelpId(SID_STYLE_NEW_BY_EXAMPLE, HID_TEMPLDLG_NEWBYEXAMPLE); - m_aActionTbR->InsertItem(SID_STYLE_UPDATE_BY_EXAMPLE, Image(BitmapEx(RID_SFXBMP_UPDATE_BY_EXAMPLE)), SfxResId(STR_STYLE_UPDATE_STYLE)); + m_aActionTbR->InsertItem(SID_STYLE_UPDATE_BY_EXAMPLE, Image(StockImage::Yes, RID_SFXBMP_UPDATE_BY_EXAMPLE), SfxResId(STR_STYLE_UPDATE_STYLE)); m_aActionTbR->SetHelpId(SID_STYLE_UPDATE_BY_EXAMPLE, HID_TEMPLDLG_UPDATEBYEXAMPLE); Initialize(); diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx index 575b4253a56c..c82d1ec84033 100644 --- a/sfx2/source/dialog/titledockwin.cxx +++ b/sfx2/source/dialog/titledockwin.cxx @@ -215,8 +215,7 @@ namespace sfx2 m_aToolbox->Clear(); // Get the closer bitmap and set it as right most button. - BitmapEx aBitmapEx(SFX_BMP_CLOSE_DOC); - m_aToolbox->InsertItem(1, Image(aBitmapEx)); + m_aToolbox->InsertItem(1, Image(StockImage::Yes, SFX_BMP_CLOSE_DOC)); m_aToolbox->SetQuickHelpText(1, SfxResId(STR_CLOSE_PANE)); m_aToolbox->ShowItem( 1 ); } diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index 717eabb934c2..940679960b93 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -171,7 +171,7 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg(vcl::Window *parent) mpActionMenu = VclPtr<PopupMenu>::Create(); mpActionMenu->InsertItem(MNI_ACTION_NEW_FOLDER, SfxResId(STR_CATEGORY_NEW), - Image(BitmapEx(BMP_ACTION_REFRESH))); + Image(StockImage::Yes, BMP_ACTION_REFRESH)); mpActionMenu->InsertItem(MNI_ACTION_RENAME_FOLDER, SfxResId(STR_CATEGORY_RENAME)); mpActionMenu->InsertItem(MNI_ACTION_DELETE_FOLDER, @@ -179,7 +179,7 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg(vcl::Window *parent) mpActionMenu->InsertSeparator(); mpActionMenu->InsertItem(MNI_ACTION_REFRESH, SfxResId(STR_ACTION_REFRESH), - Image(BitmapEx(BMP_ACTION_REFRESH))); + Image(StockImage::Yes, BMP_ACTION_REFRESH)); mpActionMenu->InsertItem(MNI_ACTION_DEFAULT,SfxResId(STR_ACTION_DEFAULT)); mpActionMenu->SetSelectHdl(LINK(this,SfxTemplateManagerDlg,MenuSelectHdl)); diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index ad4816518f06..891fd40e7128 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -1294,7 +1294,7 @@ SvtFileView_Impl::SvtFileView_Impl( SvtFileView* pAntiImpl, Reference < XCommand ,mnSuspendSelectCallback ( 0 ) ,mbIsFirstResort ( true ) ,aIntlWrapper ( Application::GetSettings().GetLanguageTag() ) - ,maFolderImage (BitmapEx(RID_BMP_FOLDER)) + ,maFolderImage (StockImage::Yes, RID_BMP_FOLDER) ,mxCmdEnv ( xEnv ) { diff --git a/svtools/source/contnr/foldertree.cxx b/svtools/source/contnr/foldertree.cxx index b5bf64dcd859..83bf6c6110f9 100644 --- a/svtools/source/contnr/foldertree.cxx +++ b/svtools/source/contnr/foldertree.cxx @@ -21,8 +21,8 @@ FolderTree::FolderTree( vcl::Window* pParent, WinBits nBits ) InteractionHandler::createWithParent(xContext, VCLUnoHelper::GetInterface(GetParentDialog())), UNO_QUERY_THROW ); m_xEnv = new ::ucbhelper::CommandEnvironment( xInteractionHandler, Reference< XProgressHandler >() ); - Image aFolderImage(BitmapEx(RID_BMP_FOLDER)); - Image aFolderExpandedImage(BitmapEx(RID_BMP_FOLDER_OPEN)); + Image aFolderImage(StockImage::Yes, RID_BMP_FOLDER); + Image aFolderExpandedImage(StockImage::Yes, RID_BMP_FOLDER_OPEN); SetDefaultCollapsedEntryBmp( aFolderImage ); SetDefaultExpandedEntryBmp( aFolderExpandedImage ); } diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx index 4978dfda4d49..8ca9d542cc7c 100644 --- a/svtools/source/misc/imagemgr.cxx +++ b/svtools/source/misc/imagemgr.cxx @@ -690,7 +690,7 @@ static Image GetImageFromList_Impl( SvImageId nImageId, bool bBig ) { OUString sImageName(GetImageNameFromList_Impl(nImageId, bBig)); if (!sImageName.isEmpty()) - return Image(BitmapEx(sImageName)); + return Image(StockImage::Yes, sImageName); return Image(); } diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index c1434bf5df6b..3403558c16bf 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -776,9 +776,9 @@ void RecovDocListEntry::Paint(const Point& aPos, SvTreeListBox& aDevice, vcl::Re RecovDocList::RecovDocList(SvSimpleTableContainer& rParent) : SvSimpleTable ( rParent ) - , m_aGreenCheckImg (BitmapEx(RID_SVXBMP_GREENCHECK)) - , m_aYellowCheckImg (BitmapEx(RID_SVXBMP_YELLOWCHECK)) - , m_aRedCrossImg (BitmapEx(RID_SVXBMP_REDCROSS)) + , m_aGreenCheckImg (StockImage::Yes, RID_SVXBMP_GREENCHECK) + , m_aYellowCheckImg (StockImage::Yes, RID_SVXBMP_YELLOWCHECK) + , m_aRedCrossImg (StockImage::Yes, RID_SVXBMP_REDCROSS) , m_aSuccessRecovStr (SvxResId(RID_SVXSTR_SUCCESSRECOV)) , m_aOrigDocRecovStr (SvxResId(RID_SVXSTR_ORIGDOCRECOV)) , m_aRecovFailedStr (SvxResId(RID_SVXSTR_RECOVFAILED)) diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx index 197a0180d388..ac8e68e353ad 100644 --- a/svx/source/dialog/fontwork.cxx +++ b/svx/source/dialog/fontwork.cxx @@ -801,13 +801,13 @@ void SvxFontWorkDialog::ApplyImageList() { if (nLastShadowTbxId == nShadowSlantId) { - m_pFbShadowX->SetImage(Image(BitmapEx(RID_SVXBMP_SHADOW_ANGLE))); - m_pFbShadowY->SetImage(Image(BitmapEx(RID_SVXBMP_SHADOW_SIZE))); + m_pFbShadowX->SetImage(Image(StockImage::Yes, RID_SVXBMP_SHADOW_ANGLE)); + m_pFbShadowY->SetImage(Image(StockImage::Yes, RID_SVXBMP_SHADOW_SIZE)); } else { - m_pFbShadowX->SetImage(Image(BitmapEx(RID_SVXBMP_SHADOW_XDIST))); - m_pFbShadowY->SetImage(Image(BitmapEx(RID_SVXBMP_SHADOW_YDIST))); + m_pFbShadowX->SetImage(Image(StockImage::Yes, RID_SVXBMP_SHADOW_XDIST)); + m_pFbShadowY->SetImage(Image(StockImage::Yes, RID_SVXBMP_SHADOW_YDIST)); } } diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index 9dc829ed6ce1..242753913641 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -140,8 +140,8 @@ SvxLanguageBoxBase::SvxLanguageBoxBase() void SvxLanguageBoxBase::ImplLanguageBoxBaseInit() { - m_aNotCheckedImage = Image(BitmapEx(RID_SVXBMP_NOTCHECKED)); - m_aCheckedImage = Image(BitmapEx(RID_SVXBMP_CHECKED)); + m_aNotCheckedImage = Image(StockImage::Yes, RID_SVXBMP_NOTCHECKED); + m_aCheckedImage = Image(StockImage::Yes, RID_SVXBMP_CHECKED); m_aAllString = SvxResId( RID_SVXSTR_LANGUAGE_ALL ); m_bHasLangNone = false; m_bLangNoneIsLangAll = false; diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index 8d0a72d11923..6451b1778893 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -88,8 +88,8 @@ namespace { Svx3DWin::Svx3DWin(SfxBindings* pInBindings, SfxChildWindow *pCW, vcl::Window* pParent) : SfxDockingWindow (pInBindings, pCW, pParent, "Docking3DEffects", "svx/ui/docking3deffects.ui") - , aImgLightOn(BitmapEx(RID_SVXBMP_LAMP_ON)) - , aImgLightOff(BitmapEx(RID_SVXBMP_LAMP_OFF)) + , aImgLightOn(StockImage::Yes, RID_SVXBMP_LAMP_ON) + , aImgLightOff(StockImage::Yes, RID_SVXBMP_LAMP_OFF) , bUpdate(false) , eViewType(ViewType3D::Geo) , pBindings(pInBindings) diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index 8ab6df731009..acd329d5ceca 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -100,8 +100,7 @@ struct FmGridHeaderData static void SetMenuItem(const OUString& rImgID, const OString &rID, Menu& rMenu, bool bDesignMode) { - BitmapEx aBitmap(rImgID); - Image aImage(aBitmap); + Image aImage(StockImage::Yes, rImgID); sal_uInt16 nID = rMenu.GetItemId(rID); rMenu.SetItemImage(nID, aImage); rMenu.EnableItem(nID, bDesignMode); diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 4fe587b23109..3e7eaeb30ec0 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -339,11 +339,11 @@ namespace svxform m_pItemList->SetToolBoxItemIds(m_nAddId, m_nAddElementId, m_nAddAttributeId, m_nEditId, m_nRemoveId); m_pToolBox->InsertSeparator(4,5); - m_pToolBox->SetItemImage(m_nAddId, Image(BitmapEx(RID_SVXBMP_ADD))); - m_pToolBox->SetItemImage(m_nAddElementId, Image(BitmapEx(RID_SVXBMP_ADD_ELEMENT))); - m_pToolBox->SetItemImage(m_nAddAttributeId, Image(BitmapEx(RID_SVXBMP_ADD_ATTRIBUTE))); - m_pToolBox->SetItemImage(m_nEditId, Image(BitmapEx(RID_SVXBMP_EDIT))); - m_pToolBox->SetItemImage(m_nRemoveId, Image(BitmapEx(RID_SVXBMP_REMOVE))); + m_pToolBox->SetItemImage(m_nAddId, Image(StockImage::Yes, RID_SVXBMP_ADD)); + m_pToolBox->SetItemImage(m_nAddElementId, Image(StockImage::Yes, RID_SVXBMP_ADD_ELEMENT)); + m_pToolBox->SetItemImage(m_nAddAttributeId, Image(StockImage::Yes, RID_SVXBMP_ADD_ATTRIBUTE)); + m_pToolBox->SetItemImage(m_nEditId, Image(StockImage::Yes, RID_SVXBMP_EDIT)); + m_pToolBox->SetItemImage(m_nRemoveId, Image(StockImage::Yes, RID_SVXBMP_REMOVE)); if ( DGTInstance == m_eGroup ) m_pToolBox->RemoveItem( m_pToolBox->GetItemPos( m_nAddId ) ); @@ -427,16 +427,16 @@ namespace svxform switch ( eChildType ) { case css::xml::dom::NodeType_ATTRIBUTE_NODE: - aExpImg = aCollImg = Image(BitmapEx(RID_SVXBMP_ATTRIBUTE)); + aExpImg = aCollImg = Image(StockImage::Yes, RID_SVXBMP_ATTRIBUTE); break; case css::xml::dom::NodeType_ELEMENT_NODE: - aExpImg = aCollImg = Image(BitmapEx(RID_SVXBMP_ELEMENT)); + aExpImg = aCollImg = Image(StockImage::Yes, RID_SVXBMP_ELEMENT); break; case css::xml::dom::NodeType_TEXT_NODE: - aExpImg = aCollImg = Image(BitmapEx(RID_SVXBMP_TEXT)); + aExpImg = aCollImg = Image(StockImage::Yes, RID_SVXBMP_TEXT); break; default: - aExpImg = aCollImg = Image(BitmapEx(RID_SVXBMP_OTHER)); + aExpImg = aCollImg = Image(StockImage::Yes, RID_SVXBMP_OTHER); } OUString sName = m_xUIHelper->getNodeDisplayName( xChild, bShowDetails ); @@ -450,7 +450,7 @@ namespace svxform Reference< css::xml::dom::XNamedNodeMap > xMap = xChild->getAttributes(); if ( xMap.is() ) { - aExpImg = aCollImg = Image(BitmapEx(RID_SVXBMP_ATTRIBUTE)); + aExpImg = aCollImg = Image(StockImage::Yes, RID_SVXBMP_ATTRIBUTE); sal_Int32 j, nMapLen = xMap->getLength(); for ( j = 0; j < nMapLen; ++j ) { @@ -790,7 +790,7 @@ namespace svxform SvTreeListEntry* XFormsPage::AddEntry( ItemNode* _pNewNode, bool _bIsElement ) { SvTreeListEntry* pParent = m_pItemList->FirstSelected(); - Image aImage(BitmapEx(_bIsElement ? OUString(RID_SVXBMP_ELEMENT) : OUString(RID_SVXBMP_ATTRIBUTE))); + Image aImage(StockImage::Yes, _bIsElement ? OUString(RID_SVXBMP_ELEMENT) : OUString(RID_SVXBMP_ATTRIBUTE)); OUString sName; try { @@ -808,7 +808,7 @@ namespace svxform SvTreeListEntry* XFormsPage::AddEntry( const Reference< XPropertySet >& _rEntry ) { SvTreeListEntry* pEntry = nullptr; - Image aImage(BitmapEx(RID_SVXBMP_ELEMENT)); + Image aImage(StockImage::Yes, RID_SVXBMP_ELEMENT); ItemNode* pNode = new ItemNode( _rEntry ); OUString sTemp; @@ -1159,7 +1159,7 @@ namespace svxform Reference < XEnumeration > xNum = xNumAccess->createEnumeration(); if ( xNum.is() && xNum->hasMoreElements() ) { - Image aImage(BitmapEx(RID_SVXBMP_ELEMENT)); + Image aImage(StockImage::Yes, RID_SVXBMP_ELEMENT); while ( xNum->hasMoreElements() ) { Reference< XPropertySet > xPropSet; diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 461f0fea6564..8a30a1cab344 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -137,7 +137,7 @@ FmParentData::~FmParentData() Image FmFormItem::GetImage() const { - return Image(BitmapEx(RID_SVXBMP_FORM)); + return Image(StockImage::Yes, RID_SVXBMP_FORM); } FmFilterItem* FmFilterItems::Find( const ::sal_Int32 _nFilterComponentIndex ) const @@ -153,7 +153,7 @@ FmFilterItem* FmFilterItems::Find( const ::sal_Int32 _nFilterComponentIndex ) co Image FmFilterItems::GetImage() const { - return Image(BitmapEx(RID_SVXBMP_FILTER)); + return Image(StockImage::Yes, RID_SVXBMP_FILTER); } FmFilterItem::FmFilterItem( FmFilterItems* pParent, @@ -168,7 +168,7 @@ FmFilterItem::FmFilterItem( FmFilterItems* pParent, Image FmFilterItem::GetImage() const { - return Image(BitmapEx(RID_SVXBMP_FIELD)); + return Image(StockImage::Yes, RID_SVXBMP_FIELD); } // Hints for communication between model and view @@ -1053,8 +1053,8 @@ FmFilterNavigator::FmFilterNavigator( vcl::Window* pParent ) SetHelpId( HID_FILTER_NAVIGATOR ); SetNodeBitmaps( - Image(BitmapEx(RID_SVXBMP_COLLAPSEDNODE)), - Image(BitmapEx(RID_SVXBMP_EXPANDEDNODE)) + Image(StockImage::Yes, RID_SVXBMP_COLLAPSEDNODE), + Image(StockImage::Yes, RID_SVXBMP_EXPANDEDNODE) ); m_pModel.reset( new FmFilterModel() ); diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx index 76e4b853ef6c..6eb21dbe0e95 100644 --- a/svx/source/form/fmexpl.cxx +++ b/svx/source/form/fmexpl.cxx @@ -326,7 +326,7 @@ std::unique_ptr<FmEntryData> FmControlData::Clone() Image FmControlData::GetImage() const { // Default-Image - Image aImage(BitmapEx(RID_SVXBMP_CONTROL)); + Image aImage(StockImage::Yes, RID_SVXBMP_CONTROL); Reference< XServiceInfo > xInfo( m_xFormComponent, UNO_QUERY ); if (!m_xFormComponent.is()) @@ -338,91 +338,91 @@ Image FmControlData::GetImage() const switch (nObjectType) { case OBJ_FM_BUTTON: - aImage = Image(BitmapEx(RID_SVXBMP_BUTTON)); + aImage = Image(StockImage::Yes, RID_SVXBMP_BUTTON); break; case OBJ_FM_FIXEDTEXT: - aImage = Image(BitmapEx(RID_SVXBMP_FIXEDTEXT)); + aImage = Image(StockImage::Yes, RID_SVXBMP_FIXEDTEXT); break; case OBJ_FM_EDIT: - aImage = Image(BitmapEx(RID_SVXBMP_EDITBOX)); + aImage = Image(StockImage::Yes, RID_SVXBMP_EDITBOX); break; case OBJ_FM_RADIOBUTTON: - aImage = Image(BitmapEx(RID_SVXBMP_RADIOBUTTON)); + aImage = Image(StockImage::Yes, RID_SVXBMP_RADIOBUTTON); break; case OBJ_FM_CHECKBOX: - aImage = Image(BitmapEx(RID_SVXBMP_CHECKBOX)); + aImage = Image(StockImage::Yes, RID_SVXBMP_CHECKBOX); break; case OBJ_FM_LISTBOX: - aImage = Image(BitmapEx(RID_SVXBMP_LISTBOX)); + aImage = Image(StockImage::Yes, RID_SVXBMP_LISTBOX); break; case OBJ_FM_COMBOBOX: - aImage = Image(BitmapEx(RID_SVXBMP_COMBOBOX)); + aImage = Image(StockImage::Yes, RID_SVXBMP_COMBOBOX); break; case OBJ_FM_NAVIGATIONBAR: - aImage = Image(BitmapEx(RID_SVXBMP_NAVIGATIONBAR)); + aImage = Image(StockImage::Yes, RID_SVXBMP_NAVIGATIONBAR); break; case OBJ_FM_GROUPBOX: - aImage = Image(BitmapEx(RID_SVXBMP_GROUPBOX)); + aImage = Image(StockImage::Yes, RID_SVXBMP_GROUPBOX); break; case OBJ_FM_IMAGEBUTTON: - aImage = Image(BitmapEx(RID_SVXBMP_IMAGEBUTTON)); + aImage = Image(StockImage::Yes, RID_SVXBMP_IMAGEBUTTON); break; case OBJ_FM_FILECONTROL: - aImage = Image(BitmapEx(RID_SVXBMP_FILECONTROL)); + aImage = Image(StockImage::Yes, RID_SVXBMP_FILECONTROL); break; case OBJ_FM_HIDDEN: - aImage = Image(BitmapEx(RID_SVXBMP_HIDDEN)); + aImage = Image(StockImage::Yes, RID_SVXBMP_HIDDEN); break; case OBJ_FM_DATEFIELD: - aImage = Image(BitmapEx(RID_SVXBMP_DATEFIELD)); + aImage = Image(StockImage::Yes, RID_SVXBMP_DATEFIELD); break; case OBJ_FM_TIMEFIELD: - aImage = Image(BitmapEx(RID_SVXBMP_TIMEFIELD)); + aImage = Image(StockImage::Yes, RID_SVXBMP_TIMEFIELD); break; case OBJ_FM_NUMERICFIELD: - aImage = Image(BitmapEx(RID_SVXBMP_NUMERICFIELD)); + aImage = Image(StockImage::Yes, RID_SVXBMP_NUMERICFIELD); break; case OBJ_FM_CURRENCYFIELD: - aImage = Image(BitmapEx(RID_SVXBMP_CURRENCYFIELD)); + aImage = Image(StockImage::Yes, RID_SVXBMP_CURRENCYFIELD); break; case OBJ_FM_PATTERNFIELD: - aImage = Image(BitmapEx(RID_SVXBMP_PATTERNFIELD)); + aImage = Image(StockImage::Yes, RID_SVXBMP_PATTERNFIELD); break; case OBJ_FM_IMAGECONTROL: - aImage = Image(BitmapEx(RID_SVXBMP_IMAGECONTROL)); + aImage = Image(StockImage::Yes, RID_SVXBMP_IMAGECONTROL); break; case OBJ_FM_FORMATTEDFIELD: - aImage = Image(BitmapEx(RID_SVXBMP_FORMATTEDFIELD)); + aImage = Image(StockImage::Yes, RID_SVXBMP_FORMATTEDFIELD); break; case OBJ_FM_GRID: - aImage = Image(BitmapEx(RID_SVXBMP_GRID)); + aImage = Image(StockImage::Yes, RID_SVXBMP_GRID); break; case OBJ_FM_SCROLLBAR: - aImage = Image(BitmapEx(RID_SVXBMP_SCROLLBAR)); + aImage = Image(StockImage::Yes, RID_SVXBMP_SCROLLBAR); break; case OBJ_FM_SPINBUTTON: - aImage = Image(BitmapEx(RID_SVXBMP_SPINBUTTON)); + aImage = Image(StockImage::Yes, RID_SVXBMP_SPINBUTTON); break; } diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index e788853b28f3..202358922b5d 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -1038,7 +1038,7 @@ VclBuilder* FmXFormShell::GetConversionMenu_Lock() for (size_t i = 0; i < SAL_N_ELEMENTS(aConvertSlots); ++i) { // the corresponding image at it - pNewMenu->SetItemImage(pNewMenu->GetItemId(aConvertSlots[i]), Image(BitmapEx(aImgIds[i]))); + pNewMenu->SetItemImage(pNewMenu->GetItemId(aConvertSlots[i]), Image(StockImage::Yes, aImgIds[i])); } return pBuilder; } diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index f6aee2a8adc9..555bd5c94367 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -134,8 +134,8 @@ namespace svxform SetHelpId( HID_FORM_NAVIGATOR ); SetNodeBitmaps( - Image(BitmapEx(RID_SVXBMP_COLLAPSEDNODE)), - Image(BitmapEx(RID_SVXBMP_EXPANDEDNODE)) + Image(StockImage::Yes, RID_SVXBMP_COLLAPSEDNODE), + Image(StockImage::Yes, RID_SVXBMP_EXPANDEDNODE) ); SetDragDropMode(DragDropMode::ALL); @@ -363,12 +363,12 @@ namespace svxform // 'New'\'Form' under the same terms const sal_uInt16 nFormId = pSubMenuNew->GetItemId("form"); pSubMenuNew->EnableItem(nFormId, bSingleSelection && (m_nFormsSelected || m_bRootSelected)); - pSubMenuNew->SetItemImage(nFormId, Image(BitmapEx(RID_SVXBMP_FORM))); + pSubMenuNew->SetItemImage(nFormId, Image(StockImage::Yes, RID_SVXBMP_FORM)); // 'New'\'hidden...', if exactly one form is selected const sal_uInt16 nHiddenId = pSubMenuNew->GetItemId("hidden"); pSubMenuNew->EnableItem(nHiddenId, bSingleSelection && m_nFormsSelected); - pSubMenuNew->SetItemImage(nHiddenId, Image(BitmapEx(RID_SVXBMP_HIDDEN))); + pSubMenuNew->SetItemImage(nHiddenId, Image(StockImage::Yes, RID_SVXBMP_HIDDEN)); // 'Delete': everything which is not root can be removed aContextMenu->EnableItem(aContextMenu->GetItemId("delete"), !m_bRootSelected); @@ -576,7 +576,7 @@ namespace svxform SvTreeListBox::Clear(); // default-entry "Forms" - Image aRootImage(BitmapEx(RID_SVXBMP_FORMS)); + Image aRootImage(StockImage::Yes, RID_SVXBMP_FORMS); m_pRootEntry = InsertEntry( SvxResId(RID_STR_FORMS), aRootImage, aRootImage, nullptr, false, 0 ); } diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx index 1235ecb98b2d..969cd2c18a01 100644 --- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx @@ -82,12 +82,12 @@ AreaPropertyPanelBase::AreaPropertyPanelBase( mpFillGradientItem(), mpHatchItem(), mpBitmapItem(), - maImgAxial(BitmapEx(BMP_AXIAL)), - maImgElli(BitmapEx(BMP_ELLI)), - maImgQuad(BitmapEx(BMP_QUAD)), - maImgRadial(BitmapEx(BMP_RADIAL)), - maImgSquare(BitmapEx(BMP_SQUARE)), - maImgLinear(BitmapEx(BMP_LINEAR)), + maImgAxial(StockImage::Yes, BMP_AXIAL), + maImgElli(StockImage::Yes, BMP_ELLI), + maImgQuad(StockImage::Yes, BMP_QUAD), + maImgRadial(StockImage::Yes, BMP_RADIAL), + maImgSquare(StockImage::Yes, BMP_SQUARE), + maImgLinear(StockImage::Yes, BMP_LINEAR), mpFloatTransparenceItem(), mpTransparanceItem() { diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx b/svx/source/sidebar/line/LinePropertyPanelBase.cxx index 618aece61eec..e8de20e68a1f 100644 --- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx +++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx @@ -171,7 +171,7 @@ LinePropertyPanelBase::LinePropertyPanelBase( mpStartItem(), mpEndItem(), mxLineWidthPopup(VclPtr<LineWidthPopup>::Create(*this)), - maIMGNone(BitmapEx(BMP_NONE_ICON)), + maIMGNone(StockImage::Yes, BMP_NONE_ICON), mpIMGWidthIcon(), mbWidthValuable(true), mbArrowSupported(true) @@ -223,14 +223,14 @@ void LinePropertyPanelBase::dispose() void LinePropertyPanelBase::Initialize() { mpIMGWidthIcon.reset(new Image[8]); - mpIMGWidthIcon[0] = Image(BitmapEx(BMP_WIDTH1_ICON)); - mpIMGWidthIcon[1] = Image(BitmapEx(BMP_WIDTH2_ICON)); - mpIMGWidthIcon[2] = Image(BitmapEx(BMP_WIDTH3_ICON)); - mpIMGWidthIcon[3] = Image(BitmapEx(BMP_WIDTH4_ICON)); - mpIMGWidthIcon[4] = Image(BitmapEx(BMP_WIDTH5_ICON)); - mpIMGWidthIcon[5] = Image(BitmapEx(BMP_WIDTH6_ICON)); - mpIMGWidthIcon[6] = Image(BitmapEx(BMP_WIDTH7_ICON)); - mpIMGWidthIcon[7] = Image(BitmapEx(BMP_WIDTH8_ICON)); + mpIMGWidthIcon[0] = Image(StockImage::Yes, BMP_WIDTH1_ICON); + mpIMGWidthIcon[1] = Image(StockImage::Yes, BMP_WIDTH2_ICON); + mpIMGWidthIcon[2] = Image(StockImage::Yes, BMP_WIDTH3_ICON); + mpIMGWidthIcon[3] = Image(StockImage::Yes, BMP_WIDTH4_ICON); + mpIMGWidthIcon[4] = Image(StockImage::Yes, BMP_WIDTH5_ICON); + mpIMGWidthIcon[5] = Image(StockImage::Yes, BMP_WIDTH6_ICON); + mpIMGWidthIcon[6] = Image(StockImage::Yes, BMP_WIDTH7_ICON); + mpIMGWidthIcon[7] = Image(StockImage::Yes, BMP_WIDTH8_ICON); FillLineStyleList(); SelectLineStyle(); diff --git a/svx/source/sidebar/line/LineWidthPopup.cxx b/svx/source/sidebar/line/LineWidthPopup.cxx index 97841ad1edb4..6ed094b82551 100644 --- a/svx/source/sidebar/line/LineWidthPopup.cxx +++ b/svx/source/sidebar/line/LineWidthPopup.cxx @@ -37,8 +37,8 @@ LineWidthPopup::LineWidthPopup(LinePropertyPanelBase& rParent) , m_bVSFocus(true) , m_bCustom(false) , m_nCustomWidth(0) - , m_aIMGCus(BitmapEx(RID_SVXBMP_WIDTH_CUSTOM)) - , m_aIMGCusGray(BitmapEx(RID_SVXBMP_WIDTH_CUSTOM_GRAY)) + , m_aIMGCus(StockImage::Yes, RID_SVXBMP_WIDTH_CUSTOM) + , m_aIMGCusGray(StockImage::Yes, RID_SVXBMP_WIDTH_CUSTOM_GRAY) { get(m_xMFWidth, "spin"); diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx index 81711ff62232..d057314eda35 100644 --- a/svx/source/stbctrls/modctrl.cxx +++ b/svx/source/stbctrls/modctrl.cxx @@ -55,9 +55,9 @@ struct SvxModifyControl::ImplData ImplData(): mnModState(MODIFICATION_STATE_NO) { - maImages[MODIFICATION_STATE_NO] = Image(BitmapEx(RID_SVXBMP_DOC_MODIFIED_NO)); - maImages[MODIFICATION_STATE_YES] = Image(BitmapEx(RID_SVXBMP_DOC_MODIFIED_YES)); - maImages[MODIFICATION_STATE_FEEDBACK] = Image(BitmapEx(RID_SVXBMP_DOC_MODIFIED_FEEDBACK)); + maImages[MODIFICATION_STATE_NO] = Image(StockImage::Yes, RID_SVXBMP_DOC_MODIFIED_NO); + maImages[MODIFICATION_STATE_YES] = Image(StockImage::Yes, RID_SVXBMP_DOC_MODIFIED_YES); + maImages[MODIFICATION_STATE_FEEDBACK] = Image(StockImage::Yes, RID_SVXBMP_DOC_MODIFIED_FEEDBACK); maIdle.SetPriority(TaskPriority::LOWEST); maIdle.SetDebugName("svx::SvxModifyControl maIdle"); diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index 143cae23d057..1f91da7bdfa8 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -220,8 +220,8 @@ SvxPosSizeStatusBarControl::SvxPosSizeStatusBarControl( sal_uInt16 _nSlotId, pImpl->bTable = false; pImpl->bHasMenu = false; pImpl->nFunctionSet = 0; - pImpl->aPosImage = Image(BitmapEx(RID_SVXBMP_POSITION)); - pImpl->aSizeImage = Image(BitmapEx(RID_SVXBMP_SIZE)); + pImpl->aPosImage = Image(StockImage::Yes, RID_SVXBMP_POSITION); + pImpl->aSizeImage = Image(StockImage::Yes, RID_SVXBMP_SIZE); addStatusListener( STR_POSITION); // SID_ATTR_POSITION addStatusListener( STR_TABLECELL); // SID_TABLE_CELL diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx index dfcc0ee9b2fb..12320c61fcc6 100644 --- a/svx/source/stbctrls/selctrl.cxx +++ b/svx/source/stbctrls/selctrl.cxx @@ -81,7 +81,7 @@ SvxSelectionModeControl::SvxSelectionModeControl( sal_uInt16 _nSlotId, StatusBar& rStb ) : SfxStatusBarControl( _nSlotId, _nId, rStb ), mnState( 0 ), - maImage(BitmapEx(RID_SVXBMP_SELECTION)) + maImage(StockImage::Yes, RID_SVXBMP_SELECTION) { GetStatusBar().SetItemText( GetId(), "" ); } diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx index 4784739c7079..1f9ea639444d 100644 --- a/svx/source/stbctrls/xmlsecctrl.cxx +++ b/svx/source/stbctrls/xmlsecctrl.cxx @@ -57,9 +57,9 @@ XmlSecStatusBarControl::XmlSecStatusBarControl( sal_uInt16 _nSlotId, sal_uInt16 { mpImpl->mnState = SignatureState::UNKNOWN; - mpImpl->maImage = Image(BitmapEx(RID_SVXBMP_SIGNET)); - mpImpl->maImageBroken = Image(BitmapEx(RID_SVXBMP_SIGNET_BROKEN)); - mpImpl->maImageNotValidated = Image(BitmapEx(RID_SVXBMP_SIGNET_NOTVALIDATED)); + mpImpl->maImage = Image(StockImage::Yes, RID_SVXBMP_SIGNET); + mpImpl->maImageBroken = Image(StockImage::Yes, RID_SVXBMP_SIGNET_BROKEN); + mpImpl->maImageNotValidated = Image(StockImage::Yes, RID_SVXBMP_SIGNET_NOTVALIDATED); } XmlSecStatusBarControl::~XmlSecStatusBarControl() diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx index ce763fdc9f2e..dfd8ed6871ea 100644 --- a/svx/source/stbctrls/zoomctrl.cxx +++ b/svx/source/stbctrls/zoomctrl.cxx @@ -182,7 +182,7 @@ SFX_IMPL_STATUSBAR_CONTROL(SvxZoomPageStatusBarControl,SfxVoidItem); SvxZoomPageStatusBarControl::SvxZoomPageStatusBarControl(sal_uInt16 _nSlotId, sal_uInt16 _nId, StatusBar& rStb) : SfxStatusBarControl(_nSlotId, _nId, rStb) - , maImage(BitmapEx(RID_SVXBMP_ZOOM_PAGE)) + , maImage(StockImage::Yes, RID_SVXBMP_ZOOM_PAGE) { GetStatusBar().SetQuickHelpText(GetId(), SvxResId(RID_SVXSTR_FIT_SLIDE)); } diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx index ec51b6eb2cf2..b54490cc4ce1 100644 --- a/svx/source/stbctrls/zoomsliderctrl.cxx +++ b/svx/source/stbctrls/zoomsliderctrl.cxx @@ -153,9 +153,9 @@ SvxZoomSliderControl::SvxZoomSliderControl( sal_uInt16 _nSlotId, sal_uInt16 _nI SfxStatusBarControl( _nSlotId, _nId, rStatusBar ), mxImpl( new SvxZoomSliderControl_Impl ) { - mxImpl->maSliderButton = Image(BitmapEx(RID_SVXBMP_SLIDERBUTTON)); - mxImpl->maIncreaseButton = Image(BitmapEx(RID_SVXBMP_SLIDERINCREASE)); - mxImpl->maDecreaseButton = Image(BitmapEx(RID_SVXBMP_SLIDERDECREASE)); + mxImpl->maSliderButton = Image(StockImage::Yes, RID_SVXBMP_SLIDERBUTTON); + mxImpl->maIncreaseButton = Image(StockImage::Yes, RID_SVXBMP_SLIDERINCREASE); + mxImpl->maDecreaseButton = Image(StockImage::Yes, RID_SVXBMP_SLIDERDECREASE); } SvxZoomSliderControl::~SvxZoomSliderControl() diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index 8ee22d3bec00..369c54133fc8 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -126,12 +126,12 @@ ExtrusionDirectionWindow::ExtrusionDirectionWindow( ) : ToolbarMenu(rController.getFrameInterface(), pParentWindow, WB_STDPOPUP) , mrController(rController) - , maImgPerspective(BitmapEx(RID_SVXBMP_PERSPECTIVE)) - , maImgParallel(BitmapEx(RID_SVXBMP_PARALLEL)) + , maImgPerspective(StockImage::Yes, RID_SVXBMP_PERSPECTIVE) + , maImgParallel(StockImage::Yes, RID_SVXBMP_PARALLEL) { for (sal_uInt16 i = DIRECTION_NW; i <= DIRECTION_SE; ++i) { - maImgDirection[i] = Image(BitmapEx(aDirectionBmps[i])); + maImgDirection[i] = Image(StockImage::Yes, aDirectionBmps[i]); } SetSelectHdl( LINK( this, ExtrusionDirectionWindow, SelectToolbarMenuHdl ) ); @@ -373,12 +373,12 @@ ExtrusionDepthWindow::ExtrusionDepthWindow( { SetSelectHdl( LINK( this, ExtrusionDepthWindow, SelectHdl ) ); - Image aImgDepth0(BitmapEx(RID_SVXBMP_DEPTH_0)); - Image aImgDepth1(BitmapEx(RID_SVXBMP_DEPTH_1)); - Image aImgDepth2(BitmapEx(RID_SVXBMP_DEPTH_2)); - Image aImgDepth3(BitmapEx(RID_SVXBMP_DEPTH_3)); - Image aImgDepth4(BitmapEx(RID_SVXBMP_DEPTH_4)); - Image aImgDepthInfinity(BitmapEx(RID_SVXBMP_DEPTH_INFINITY)); + Image aImgDepth0(StockImage::Yes, RID_SVXBMP_DEPTH_0); + Image aImgDepth1(StockImage::Yes, RID_SVXBMP_DEPTH_1); + Image aImgDepth2(StockImage::Yes, RID_SVXBMP_DEPTH_2); + Image aImgDepth3(StockImage::Yes, RID_SVXBMP_DEPTH_3); + Image aImgDepth4(StockImage::Yes, RID_SVXBMP_DEPTH_4); + Image aImgDepthInfinity(StockImage::Yes, RID_SVXBMP_DEPTH_INFINITY); appendEntry(0, "", aImgDepth0); appendEntry(1, "", aImgDepth1); @@ -585,9 +585,9 @@ ExtrusionLightingWindow::ExtrusionLightingWindow(svt::ToolboxController& rContro vcl::Window* pParentWindow) : ToolbarMenu(rController.getFrameInterface(), pParentWindow, WB_STDPOPUP) , mrController(rController) - , maImgBright(BitmapEx(RID_SVXBMP_LIGHTING_BRIGHT)) - , maImgNormal(BitmapEx(RID_SVXBMP_LIGHTING_NORMAL)) - , maImgDim(BitmapEx(RID_SVXBMP_LIGHTING_DIM)) + , maImgBright(StockImage::Yes, RID_SVXBMP_LIGHTING_BRIGHT) + , maImgNormal(StockImage::Yes, RID_SVXBMP_LIGHTING_NORMAL) + , maImgDim(StockImage::Yes, RID_SVXBMP_LIGHTING_DIM) , mnDirection(FROM_FRONT) , mbDirectionEnabled(false) { @@ -595,10 +595,10 @@ ExtrusionLightingWindow::ExtrusionLightingWindow(svt::ToolboxController& rContro { if( i != FROM_FRONT ) { - maImgLightingOff[i] = Image(BitmapEx(aLightOffBmps[i])); - maImgLightingOn[i] = Image(BitmapEx(aLightOnBmps[i])); + maImgLightingOff[i] = Image(StockImage::Yes, aLightOffBmps[i]); + maImgLightingOn[i] = Image(StockImage::Yes, aLightOnBmps[i]); } - maImgLightingPreview[i] = Image(BitmapEx(aLightPreviewBmps[i])); + maImgLightingPreview[i] = Image(StockImage::Yes, aLightPreviewBmps[i]); } SetSelectHdl( LINK( this, ExtrusionLightingWindow, SelectToolbarMenuHdl ) ); @@ -839,10 +839,10 @@ ExtrusionSurfaceWindow::ExtrusionSurfaceWindow( { SetSelectHdl( LINK( this, ExtrusionSurfaceWindow, SelectHdl ) ); - Image aImgSurface1(BitmapEx(RID_SVXBMP_WIRE_FRAME)); - Image aImgSurface2(BitmapEx(RID_SVXBMP_MATTE)); - Image aImgSurface3(BitmapEx(RID_SVXBMP_PLASTIC)); - Image aImgSurface4(BitmapEx(RID_SVXBMP_METAL)); + Image aImgSurface1(StockImage::Yes, RID_SVXBMP_WIRE_FRAME); + Image aImgSurface2(StockImage::Yes, RID_SVXBMP_MATTE); + Image aImgSurface3(StockImage::Yes, RID_SVXBMP_PLASTIC); + Image aImgSurface4(StockImage::Yes, RID_SVXBMP_METAL); appendEntry(0, SvxResId(RID_SVXSTR_WIREFRAME), aImgSurface1); appendEntry(1, SvxResId(RID_SVXSTR_MATTE), aImgSurface2); diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index 9a910fa3d875..3b88ab1d78c7 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -285,11 +285,11 @@ FontworkAlignmentWindow::FontworkAlignmentWindow(svt::ToolboxController& rContro { SetSelectHdl( LINK( this, FontworkAlignmentWindow, SelectHdl ) ); - Image aImgAlgin1(BitmapEx(RID_SVXBMP_FONTWORK_ALIGN_LEFT)); - Image aImgAlgin2(BitmapEx(RID_SVXBMP_FONTWORK_ALIGN_CENTER)); - Image aImgAlgin3(BitmapEx(RID_SVXBMP_FONTWORK_ALIGN_RIGHT)); - Image aImgAlgin4(BitmapEx(RID_SVXBMP_FONTWORK_ALIGN_WORD)); - Image aImgAlgin5(BitmapEx(RID_SVXBMP_FONTWORK_ALIGN_STRETCH)); + Image aImgAlgin1(StockImage::Yes, RID_SVXBMP_FONTWORK_ALIGN_LEFT); + Image aImgAlgin2(StockImage::Yes, RID_SVXBMP_FONTWORK_ALIGN_CENTER); + Image aImgAlgin3(StockImage::Yes, RID_SVXBMP_FONTWORK_ALIGN_RIGHT); + Image aImgAlgin4(StockImage::Yes, RID_SVXBMP_FONTWORK_ALIGN_WORD); + Image aImgAlgin5(StockImage::Yes, RID_SVXBMP_FONTWORK_ALIGN_STRETCH); appendEntry(0, SvxResId(RID_SVXSTR_ALIGN_LEFT), aImgAlgin1); appendEntry(1, SvxResId(RID_SVXSTR_ALIGN_CENTER), aImgAlgin2); diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx index d0b3f5c875a8..3e2910cb1b73 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.cxx +++ b/sw/source/ui/dbui/mmoutputtypepage.cxx @@ -437,7 +437,7 @@ void SwSendMailDialog::IterateMails() { if(!SwMailMergeHelper::CheckMailAddress( pCurrentMailDescriptor->sEMail )) { - Image aInsertImg(BitmapEx(RID_BMP_FORMULA_CANCEL)); + Image aInsertImg(StockImage::Yes, RID_BMP_FORMULA_CANCEL); OUString sMessage = m_sSendingTo; OUString sTmp(pCurrentMailDescriptor->sEMail); @@ -523,7 +523,7 @@ void SwSendMailDialog::DocumentSent( uno::Reference< mail::XMailMessage> const & Application::PostUserEvent( LINK( this, SwSendMailDialog, StopSendMails ), this, true ); } - Image aInsertImg(BitmapEx(bResult ? OUString(RID_BMP_FORMULA_APPLY) : OUString(RID_BMP_FORMULA_CANCEL))); + Image aInsertImg(StockImage::Yes, bResult ? OUString(RID_BMP_FORMULA_APPLY) : OUString(RID_BMP_FORMULA_CANCEL)); OUString sMessage = m_sSendingTo; OUString sTmp(xMessage->getRecipients()[0]); diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 9bd79a7db39d..9ae53737945c 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -70,8 +70,8 @@ namespace { Image BuildBitmap(bool bProtect, bool bHidden) { if (bProtect) - return Image(BitmapEx(bHidden ? OUString(RID_BMP_PROT_HIDE) : OUString(RID_BMP_PROT_NO_HIDE))); - return Image(BitmapEx(bHidden ? OUString(RID_BMP_HIDE) : OUString(RID_BMP_NO_HIDE))); + return Image(StockImage::Yes, bHidden ? OUString(RID_BMP_PROT_HIDE) : OUString(RID_BMP_PROT_NO_HIDE)); + return Image(StockImage::Yes, bHidden ? OUString(RID_BMP_HIDE) : OUString(RID_BMP_NO_HIDE)); } } diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx index 715b99016593..fa054f251539 100644 --- a/sw/source/ui/fldui/changedb.cxx +++ b/sw/source/ui/fldui/changedb.cxx @@ -69,8 +69,8 @@ SwChangeDBDlg::SwChangeDBDlg(SwView const & rVw) m_pUsedDBTLB->SetSelectionMode(SelectionMode::Multiple); m_pUsedDBTLB->SetStyle(m_pUsedDBTLB->GetStyle()|WB_HASLINES|WB_CLIPCHILDREN|WB_SORT|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL); m_pUsedDBTLB->SetSpaceBetweenEntries(0); - m_pUsedDBTLB->SetNodeBitmaps(Image(BitmapEx(RID_BMP_COLLAPSE)), - Image(BitmapEx(RID_BMP_EXPAND))); + m_pUsedDBTLB->SetNodeBitmaps(Image(StockImage::Yes, RID_BMP_COLLAPSE), + Image(StockImage::Yes, RID_BMP_EXPAND)); Link<SvTreeListBox*,void> aLink = LINK(this, SwChangeDBDlg, TreeSelectHdl); @@ -134,9 +134,9 @@ SvTreeListEntry* SwChangeDBDlg::Insert(const OUString& rDBName) sal_uLong nParent = 0; sal_uLong nChild = 0; - Image aTableImg(BitmapEx(RID_BMP_DBTABLE)); - Image aDBImg(BitmapEx(RID_BMP_DB)); - Image aQueryImg(BitmapEx(RID_BMP_DBQUERY)); + Image aTableImg(StockImage::Yes, RID_BMP_DBTABLE); + Image aDBImg(StockImage::Yes, RID_BMP_DB); + Image aQueryImg(StockImage::Yes, RID_BMP_DBQUERY); Image& rToInsert = nCommandType ? aQueryImg : aTableImg; while ((pParent = m_pUsedDBTLB->GetEntry(nParent++)) != nullptr) { diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx index 963d35cadd3f..c921a2431857 100644 --- a/sw/source/uibase/app/swmodule.cxx +++ b/sw/source/uibase/app/swmodule.cxx @@ -396,32 +396,32 @@ std::unique_ptr<SfxStyleFamilies> SwModule::CreateStyleFamilies() pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Para, SwResId(STR_PARAGRAPHSTYLEFAMILY), - Image(BitmapEx(BMP_STYLES_FAMILY_PARA)), + Image(StockImage::Yes, BMP_STYLES_FAMILY_PARA), RID_PARAGRAPHSTYLEFAMILY, GetResLocale())); pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Char, SwResId(STR_CHARACTERSTYLEFAMILY), - Image(BitmapEx(BMP_STYLES_FAMILY_CHAR)), + Image(StockImage::Yes, BMP_STYLES_FAMILY_CHAR), RID_CHARACTERSTYLEFAMILY, GetResLocale())); pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Frame, SwResId(STR_FRAMESTYLEFAMILY), - Image(BitmapEx(BMP_STYLES_FAMILY_FRAME)), + Image(StockImage::Yes, BMP_STYLES_FAMILY_FRAME), RID_FRAMESTYLEFAMILY, GetResLocale())); pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Page, SwResId(STR_PAGESTYLEFAMILY), - Image(BitmapEx(BMP_STYLES_FAMILY_PAGE)), + Image(StockImage::Yes, BMP_STYLES_FAMILY_PAGE), RID_PAGESTYLEFAMILY, GetResLocale())); pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Pseudo, SwResId(STR_LISTSTYLEFAMILY), - Image(BitmapEx(BMP_STYLES_FAMILY_LIST)), + Image(StockImage::Yes, BMP_STYLES_FAMILY_LIST), RID_LISTSTYLEFAMILY, GetResLocale())); pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Table, SwResId(STR_TABLESTYLEFAMILY), - Image(BitmapEx(BMP_STYLES_FAMILY_TABLE)), + Image(StockImage::Yes, BMP_STYLES_FAMILY_TABLE), RID_TABLESTYLEFAMILY, GetResLocale())); return pStyleFamilies; diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx index e0674f90e44b..b4d9d4494ef6 100644 --- a/sw/source/uibase/dbui/dbtree.cxx +++ b/sw/source/uibase/dbui/dbtree.cxx @@ -172,8 +172,8 @@ void SwDBTreeList::InitTreeList() SetStyle(GetStyle()|WB_HASLINES|WB_CLIPCHILDREN|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL); // don't set font, so that the Control's font is being applied! SetSpaceBetweenEntries(0); - SetNodeBitmaps(Image(BitmapEx(RID_BMP_COLLAPSE)), - Image(BitmapEx(RID_BMP_EXPAND))); + SetNodeBitmaps(Image(StockImage::Yes, RID_BMP_COLLAPSE), + Image(StockImage::Yes, RID_BMP_EXPAND)); SetDragDropMode(DragDropMode::APP_COPY); @@ -190,7 +190,7 @@ void SwDBTreeList::InitTreeList() const OUString* pDBNames = aDBNames.getConstArray(); long nCount = aDBNames.getLength(); - Image aImg(BitmapEx(RID_BMP_DB)); + Image aImg(StockImage::Yes, RID_BMP_DB); for(long i = 0; i < nCount; i++) { OUString sDBName(pDBNames[i]); @@ -207,7 +207,7 @@ void SwDBTreeList::InitTreeList() void SwDBTreeList::AddDataSource(const OUString& rSource) { - Image aImg(BitmapEx(RID_BMP_DB)); + Image aImg(StockImage::Yes, RID_BMP_DB); SvTreeListEntry* pEntry = InsertEntry(rSource, aImg, aImg, nullptr, true); SvTreeListBox::Select(pEntry); } @@ -336,7 +336,7 @@ void SwDBTreeList::RequestingChildren(SvTreeListEntry* pParent) OUString sTableName; long nCount = aTableNames.getLength(); const OUString* pTableNames = aTableNames.getConstArray(); - Image aImg(BitmapEx(RID_BMP_DBTABLE)); + Image aImg(StockImage::Yes, RID_BMP_DBTABLE); for (long i = 0; i < nCount; i++) { sTableName = pTableNames[i]; @@ -354,7 +354,7 @@ void SwDBTreeList::RequestingChildren(SvTreeListEntry* pParent) OUString sQueryName; long nCount = aQueryNames.getLength(); const OUString* pQueryNames = aQueryNames.getConstArray(); - Image aImg(BitmapEx(RID_BMP_DBQUERY)); + Image aImg(StockImage::Yes, RID_BMP_DBQUERY); for (long i = 0; i < nCount; i++) { sQueryName = pQueryNames[i]; diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx index 56f56cbe5a03..118a1bb85ca2 100644 --- a/sw/source/uibase/lingu/olmenu.cxx +++ b/sw/source/uibase/lingu/olmenu.cxx @@ -451,7 +451,7 @@ SwSpellPopup::SwSpellPopup( m_xPopupMenu->InsertSeparator(OString(), nPos++); m_xPopupMenu->InsertItem(MN_SHORT_COMMENT, aMessageText, MenuItemBits::NOSELECT, OString(), nPos++); if (bUseImagesInMenus) - m_xPopupMenu->SetItemImage(MN_SHORT_COMMENT, Image(BitmapEx(BMP_INFO_16))); + m_xPopupMenu->SetItemImage(MN_SHORT_COMMENT, Image(StockImage::Yes, BMP_INFO_16)); // Add an item to show detailed infos if the FullCommentURL property is defined beans::PropertyValues aProperties = rResult.aErrors[ nErrorInResult ].aProperties; diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx index 169be0e7297c..530e21e090a8 100644 --- a/sw/source/uibase/misc/redlndlg.cxx +++ b/sw/source/uibase/misc/redlndlg.cxx @@ -160,11 +160,11 @@ SwRedlineAcceptDlg::SwRedlineAcceptDlg(vcl::Window *pParent, VclBuilderContainer , m_bOnlyFormatedRedlines(false) , m_bRedlnAutoFormat(bAutoFormat) , m_bInhibitActivate(false) - , m_aInserted(BitmapEx(BMP_REDLINE_INSERTED)) - , m_aDeleted(BitmapEx(BMP_REDLINE_DELETED)) - , m_aFormated(BitmapEx(BMP_REDLINE_FORMATTED)) - , m_aTableChgd(BitmapEx(BMP_REDLINE_TABLECHG)) - , m_aFormatCollSet(BitmapEx(BMP_REDLINE_FMTCOLLSET)) + , m_aInserted(StockImage::Yes, BMP_REDLINE_INSERTED) + , m_aDeleted(StockImage::Yes, BMP_REDLINE_DELETED) + , m_aFormated(StockImage::Yes, BMP_REDLINE_FORMATTED) + , m_aTableChgd(StockImage::Yes, BMP_REDLINE_TABLECHG) + , m_aFormatCollSet(StockImage::Yes, BMP_REDLINE_FMTCOLLSET) { m_aTabPagesCTRL->SetHelpId(HID_REDLINE_CTRL); m_pTPView = m_aTabPagesCTRL->GetViewPage(); diff --git a/sw/source/uibase/ribbar/inputwin.cxx b/sw/source/uibase/ribbar/inputwin.cxx index 7e4c4f3a3439..324c0fbd8877 100644 --- a/sw/source/uibase/ribbar/inputwin.cxx +++ b/sw/source/uibase/ribbar/inputwin.cxx @@ -77,11 +77,11 @@ SwInputWindow::SwInputWindow(vcl::Window* pParent, SfxDispatcher const * pDispat aEdit->SetSizePixel(aEdit->CalcMinimumSize()); aPos->SetSizePixel(aPos->LogicToPixel(Size(45, 11), MapMode(MapUnit::MapAppFont))); - InsertItem(FN_FORMULA_CALC, Image(BitmapEx(RID_BMP_FORMULA_CALC)), + InsertItem(FN_FORMULA_CALC, Image(StockImage::Yes, RID_BMP_FORMULA_CALC), SwResId(STR_FORMULA_CALC)); - InsertItem(FN_FORMULA_CANCEL, Image(BitmapEx(RID_BMP_FORMULA_CANCEL)), + InsertItem(FN_FORMULA_CANCEL, Image(StockImage::Yes, RID_BMP_FORMULA_CANCEL), SwResId(STR_FORMULA_CANCEL)); - InsertItem(FN_FORMULA_APPLY, Image(BitmapEx(RID_BMP_FORMULA_APPLY)), + InsertItem(FN_FORMULA_APPLY, Image(StockImage::Yes, RID_BMP_FORMULA_APPLY), SwResId(STR_FORMULA_APPLY)); SetHelpId(FN_FORMULA_CALC, HID_TBX_FORMULA_CALC); diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx index 4dd4d8d03c5a..5cd71f1e2746 100644 --- a/sw/source/uibase/ribbar/workctrl.cxx +++ b/sw/source/uibase/ribbar/workctrl.cxx @@ -323,7 +323,7 @@ SwScrollNaviPopup::SwScrollNaviPopup(sal_uInt16 nId, const Reference< XFrame >& ToolBoxItemBits nTbxBits = ToolBoxItemBits::NONE; if ((NID_PREV != nNaviId) && (NID_NEXT != nNaviId)) nTbxBits = ToolBoxItemBits::CHECKABLE; - m_pToolBox->InsertItem(nNaviId, Image(BitmapEx(aNavigationImgIds[i])), + m_pToolBox->InsertItem(nNaviId, Image(StockImage::Yes, aNavigationImgIds[i]), SwResId(aNavigationStrIds[i]), nTbxBits); m_pToolBox->SetHelpId(nNaviId, aNavigationHelpIds[i]); } @@ -727,7 +727,7 @@ NavElementBox_Impl::NavElementBox_Impl( { sal_uInt16 nNaviId = aNavigationInsertIds[i]; if ( ( NID_PREV != nNaviId ) && ( NID_NEXT != nNaviId ) ) - InsertEntry( SwResId( aNavigationStrIds[i] ), Image( BitmapEx( aNavigationImgIds[i] ) ) ); + InsertEntry( SwResId( aNavigationStrIds[i] ), Image( StockImage::Yes, aNavigationImgIds[i] ) ); } } diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx index 275f71578aae..28709b329ae2 100644 --- a/sw/source/uibase/utlui/glbltree.cxx +++ b/sw/source/uibase/utlui/glbltree.cxx @@ -696,14 +696,14 @@ void SwGlobalTree::Display(bool bOnlyUpdateUserData) { const SwTOXBase* pBase = pCont->GetTOX(); sEntry = pBase->GetTitle(); - aImage = Image(BitmapEx(RID_BMP_NAVI_INDEX)); + aImage = Image(StockImage::Yes, RID_BMP_NAVI_INDEX); } break; case GLBLDOC_SECTION: { const SwSection* pSect = pCont->GetSection(); sEntry = pSect->GetSectionName(); - aImage = Image(BitmapEx(RID_BMP_DROP_REGION)); + aImage = Image(StockImage::Yes, RID_BMP_DROP_REGION); } break; } diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index cc6d60dcc06e..c3253ac29e60 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -1139,7 +1139,7 @@ void SwNavigationPI::SetRegionDropMode(RegionMode nNewMode) sImageId = RID_BMP_DROP_COPY; break; } - m_aContentToolBox->SetItemImage(m_aContentToolBox->GetItemId("dragmode"), Image(BitmapEx(sImageId))); + m_aContentToolBox->SetItemImage(m_aContentToolBox->GetItemId("dragmode"), Image(StockImage::Yes, sImageId)); } void SwNavigationPI::ToggleTree() diff --git a/sw/source/uibase/utlui/viewlayoutctrl.cxx b/sw/source/uibase/utlui/viewlayoutctrl.cxx index eadb17f748f1..c813ffaa5baf 100644 --- a/sw/source/uibase/utlui/viewlayoutctrl.cxx +++ b/sw/source/uibase/utlui/viewlayoutctrl.cxx @@ -46,12 +46,12 @@ SwViewLayoutControl::SwViewLayoutControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, { mpImpl->mnState = 1; - mpImpl->maImageSingleColumn = Image(BitmapEx(RID_BMP_VIEWLAYOUT_SINGLECOLUMN)); - mpImpl->maImageSingleColumn_Active = Image(BitmapEx(RID_BMP_VIEWLAYOUT_SINGLECOLUMN_ACTIVE)); - mpImpl->maImageAutomatic = Image(BitmapEx(RID_BMP_VIEWLAYOUT_AUTOMATIC)); - mpImpl->maImageAutomatic_Active = Image(BitmapEx(RID_BMP_VIEWLAYOUT_AUTOMATIC_ACTIVE)); - mpImpl->maImageBookMode = Image(BitmapEx(RID_BMP_VIEWLAYOUT_BOOKMODE)); - mpImpl->maImageBookMode_Active = Image(BitmapEx(RID_BMP_VIEWLAYOUT_BOOKMODE_ACTIVE)); + mpImpl->maImageSingleColumn = Image(StockImage::Yes, RID_BMP_VIEWLAYOUT_SINGLECOLUMN); + mpImpl->maImageSingleColumn_Active = Image(StockImage::Yes, RID_BMP_VIEWLAYOUT_SINGLECOLUMN_ACTIVE); + mpImpl->maImageAutomatic = Image(StockImage::Yes, RID_BMP_VIEWLAYOUT_AUTOMATIC); + mpImpl->maImageAutomatic_Active = Image(StockImage::Yes, RID_BMP_VIEWLAYOUT_AUTOMATIC_ACTIVE); + mpImpl->maImageBookMode = Image(StockImage::Yes, RID_BMP_VIEWLAYOUT_BOOKMODE); + mpImpl->maImageBookMode_Active = Image(StockImage::Yes, RID_BMP_VIEWLAYOUT_BOOKMODE_ACTIVE); } SwViewLayoutControl::~SwViewLayoutControl() diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx index 5cf84e0e475b..5c79a3765dcb 100644 --- a/vcl/inc/printdlg.hxx +++ b/vcl/inc/printdlg.hxx @@ -169,9 +169,6 @@ namespace vcl sal_Int32 mnCurPage; sal_Int32 mnCachedPages; - BitmapEx const maCollateBmp; - BitmapEx const maNoCollateBmp; - bool mbCollateAlwaysOff; VclPtr<RadioButton> mpPagesBtn; diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 6adc7d802775..df40054c98b8 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -561,13 +561,13 @@ namespace { assert((rImage == "dialog-warning" || rImage == "dialog-error" || rImage == "dialog-information") && "unknown stock image"); if (rImage == "dialog-warning") - return Image(BitmapEx(IMG_WARN)); + return Image(StockImage::Yes, IMG_WARN); else if (rImage == "dialog-error") - return Image(BitmapEx(IMG_ERROR)); + return Image(StockImage::Yes, IMG_ERROR); else if (rImage == "dialog-information") - return Image(BitmapEx(IMG_INFO)); + return Image(StockImage::Yes, IMG_INFO); } - return Image(BitmapEx(rImage)); + return Image(StockImage::Yes, rImage); } Image createImage(VirtualDevice& rDevice) @@ -1236,7 +1236,7 @@ public: virtual void set_from_icon_name(const OUString& rIconName) override { - m_xButton->SetModeImage(::Image(BitmapEx(rIconName))); + m_xButton->SetModeImage(::Image(StockImage::Yes, rIconName)); } virtual void set_label_line_wrap(bool wrap) override @@ -1407,7 +1407,7 @@ public: virtual void set_from_icon_name(const OUString& rIconName) override { - m_xRadioButton->SetModeRadioImage(::Image(BitmapEx(rIconName))); + m_xRadioButton->SetModeRadioImage(::Image(StockImage::Yes, rIconName)); } virtual void set_inconsistent(bool /*inconsistent*/) override @@ -1620,7 +1620,7 @@ public: virtual void set_from_icon_name(const OUString& rIconName) override { - m_xImage->SetImage(::Image(BitmapEx(rIconName))); + m_xImage->SetImage(::Image(StockImage::Yes, rIconName)); } }; diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 5e294019c36c..86f709ddb879 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -3785,9 +3785,9 @@ void DisclosureButton::ImplDrawCheckBoxState(vcl::RenderContext& rRenderContext) ImplSVCtrlData& rCtrlData(ImplGetSVData()->maCtrlData); if (!rCtrlData.mpDisclosurePlus) - rCtrlData.mpDisclosurePlus.reset(new Image(BitmapEx(SV_DISCLOSURE_PLUS))); + rCtrlData.mpDisclosurePlus.reset(new Image(StockImage::Yes, SV_DISCLOSURE_PLUS)); if (!rCtrlData.mpDisclosureMinus) - rCtrlData.mpDisclosureMinus.reset(new Image(BitmapEx(SV_DISCLOSURE_MINUS))); + rCtrlData.mpDisclosureMinus.reset(new Image(StockImage::Yes, SV_DISCLOSURE_MINUS)); Image* pImg = IsChecked() ? rCtrlData.mpDisclosureMinus.get() : rCtrlData.mpDisclosurePlus.get(); diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index 82401c5c06a4..ea9cfcee05f1 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -2174,12 +2174,10 @@ NotebookbarTabControlBase::NotebookbarTabControlBase(vcl::Window* pParent) , bLastContextWasSupported(true) , eLastContext(vcl::EnumContext::Context::Any) { - BitmapEx aBitmap(SV_RESID_BITMAP_NOTEBOOKBAR); - m_pOpenMenu = VclPtr<PushButton>::Create( this , WB_CENTER | WB_VCENTER ); m_pOpenMenu->SetSizePixel(Size(HAMBURGER_DIM, HAMBURGER_DIM)); m_pOpenMenu->SetClickHdl(LINK(this, NotebookbarTabControlBase, OpenMenu)); - m_pOpenMenu->SetModeImage(Image(aBitmap)); + m_pOpenMenu->SetModeImage(Image(StockImage::Yes, SV_RESID_BITMAP_NOTEBOOKBAR)); m_pOpenMenu->Show(); } diff --git a/vcl/source/treelist/svimpbox.cxx b/vcl/source/treelist/svimpbox.cxx index 1c6a222a2b3f..78be5057c96e 100644 --- a/vcl/source/treelist/svimpbox.cxx +++ b/vcl/source/treelist/svimpbox.cxx @@ -3322,8 +3322,8 @@ void SvImpLBox::implInitDefaultNodeImages() // assume that all or nothing is initialized return; - s_pDefCollapsed = new Image(BitmapEx(RID_BMP_TREENODE_COLLAPSED)); - s_pDefExpanded = new Image(BitmapEx(RID_BMP_TREENODE_EXPANDED)); + s_pDefCollapsed = new Image(StockImage::Yes, RID_BMP_TREENODE_COLLAPSED); + s_pDefExpanded = new Image(StockImage::Yes, RID_BMP_TREENODE_EXPANDED); } diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx index 290c6ab65ffa..f45cb3e64681 100644 --- a/vcl/source/window/menubarwindow.cxx +++ b/vcl/source/window/menubarwindow.cxx @@ -60,8 +60,7 @@ void DecoToolBox::calcMinSize() ScopedVclPtrInstance<ToolBox> aTbx( GetParent() ); if( GetItemCount() == 0 ) { - BitmapEx aBitmap(SV_RESID_BITMAP_CLOSEDOC); - aTbx->InsertItem(IID_DOCUMENTCLOSE, Image(aBitmap)); + aTbx->InsertItem(IID_DOCUMENTCLOSE, Image(StockImage::Yes, SV_RESID_BITMAP_CLOSEDOC)); } else { @@ -127,8 +126,7 @@ MenuBarWindow::MenuBarWindow( vcl::Window* pParent ) : SetMBWHideAccel(true); SetMBWMenuKey(false); - BitmapEx aBitmap(SV_RESID_BITMAP_CLOSEDOC); - aCloseBtn->maImage = Image(aBitmap); + aCloseBtn->maImage = Image(StockImage::Yes, SV_RESID_BITMAP_CLOSEDOC); aCloseBtn->SetOutStyle(TOOLBOX_STYLE_FLAT); aCloseBtn->SetBackground(); diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index 05db90085456..9dd5fa29fc3d 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -535,8 +535,6 @@ PrintDialog::PrintDialog(vcl::Window* i_pWindow, const std::shared_ptr<PrinterCo , maNoPreviewStr( VclResId( SV_PRINT_NOPREVIEW ) ) , mnCurPage( 0 ) , mnCachedPages( 0 ) -, maCollateBmp(SV_PRINT_COLLATE_BMP) -, maNoCollateBmp(SV_PRINT_NOCOLLATE_BMP) , mbCollateAlwaysOff(false) , mbShowLayoutFrame( true ) , mbSingleJobs( false ) @@ -1079,7 +1077,7 @@ void PrintDialog::checkControlDependencies() else mpCollateBox->Enable( false ); - Image aImg(mpCollateBox->IsChecked() ? maCollateBmp : maNoCollateBmp); + Image aImg(StockImage::Yes, mpCollateBox->IsChecked() ? OUString(SV_PRINT_COLLATE_BMP) : OUString(SV_PRINT_NOCOLLATE_BMP)); Size aImgSize( aImg.GetSizePixel() ); diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx index 079f87ee580f..b5aec1cfb009 100644 --- a/vcl/source/window/scrwnd.cxx +++ b/vcl/source/window/scrwnd.cxx @@ -116,12 +116,12 @@ void ImplWheelWindow::ImplSetRegion( const Bitmap& rRegionBmp ) void ImplWheelWindow::ImplCreateImageList() { - maImgList.emplace_back(BitmapEx(SV_RESID_BITMAP_SCROLLVH)); - maImgList.emplace_back(BitmapEx(SV_RESID_BITMAP_SCROLLV)); - maImgList.emplace_back(BitmapEx(SV_RESID_BITMAP_SCROLLH)); - maImgList.emplace_back(BitmapEx(SV_RESID_BITMAP_WHEELVH)); - maImgList.emplace_back(BitmapEx(SV_RESID_BITMAP_WHEELV)); - maImgList.emplace_back(BitmapEx(SV_RESID_BITMAP_WHEELH)); + maImgList.emplace_back(Image(StockImage::Yes, SV_RESID_BITMAP_SCROLLVH)); + maImgList.emplace_back(Image(StockImage::Yes, SV_RESID_BITMAP_SCROLLV)); + maImgList.emplace_back(Image(StockImage::Yes, SV_RESID_BITMAP_SCROLLH)); + maImgList.emplace_back(Image(StockImage::Yes, SV_RESID_BITMAP_WHEELVH)); + maImgList.emplace_back(Image(StockImage::Yes, SV_RESID_BITMAP_WHEELV)); + maImgList.emplace_back(Image(StockImage::Yes, SV_RESID_BITMAP_WHEELH)); } void ImplWheelWindow::ImplSetWheelMode( WheelMode nWheelMode ) diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx index ceefb55c03bc..df5d6b0f68c1 100644 --- a/xmlsecurity/source/dialogs/certificateviewer.cxx +++ b/xmlsecurity/source/dialogs/certificateviewer.cxx @@ -124,7 +124,7 @@ CertificateViewerGeneralTP::CertificateViewerGeneralTP( vcl::Window* _pParent, C if ( !bCertValid ) { - m_pCertImg->SetImage(Image(BitmapEx(BMP_STATE_NOT_VALIDATED))); + m_pCertImg->SetImage(Image(StockImage::Yes, BMP_STATE_NOT_VALIDATED)); m_pHintNotTrustedFT->SetText( XsResId( STR_CERTIFICATE_NOT_VALIDATED ) ); } |