[Libreoffice-commits] core.git: avmedia/source basctl/source chart2/source cui/source dbaccess/source desktop/source extensions/source formula/source fpicker/source framework/source reportdesign/source sc/source sd/source sfx2/source svtools/source svx/source sw/source vcl/inc vcl/source xmlsecurity/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Dec 8 18:15:34 UTC 2018
avmedia/source/framework/MediaControlBase.cxx | 2
basctl/source/basicide/baside2b.cxx | 4
basctl/source/basicide/bastype2.cxx | 18
basctl/source/basicide/bastype3.cxx | 2
basctl/source/basicide/moduldl2.cxx | 6
basctl/source/basicide/moduldlg.cxx | 4
chart2/source/controller/dialogs/ChartTypeDialogController.cxx | 206 +++++-----
chart2/source/controller/dialogs/DataBrowser.cxx | 18
chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx | 10
cui/source/customize/cfgutil.cxx | 12
cui/source/dialogs/cuihyperdlg.cxx | 8
cui/source/dialogs/scriptdlg.cxx | 8
cui/source/options/dbregister.cxx | 2
cui/source/tabpages/labdlg.cxx | 6
dbaccess/source/ui/app/AppDetailPageHelper.cxx | 4
dbaccess/source/ui/app/AppIconControl.cxx | 2
dbaccess/source/ui/dlg/CollectionView.cxx | 4
dbaccess/source/ui/dlg/indexdialog.cxx | 2
dbaccess/source/ui/misc/WNameMatch.cxx | 4
dbaccess/source/ui/misc/WTypeSelect.cxx | 2
dbaccess/source/ui/misc/imageprovider.cxx | 8
dbaccess/source/ui/querydesign/TableWindow.cxx | 2
desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 8
desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 2
extensions/source/bibliography/toolbar.cxx | 6
extensions/source/dbpilots/commonpagesdbp.cxx | 4
extensions/source/propctrlr/selectlabeldialog.cxx | 10
extensions/source/propctrlr/taborder.cxx | 2
extensions/source/update/ui/updatecheckui.cxx | 4
formula/source/ui/dlg/parawin.cxx | 8
formula/source/ui/dlg/structpg.cxx | 4
fpicker/source/office/RemoteFilesDialog.cxx | 2
fpicker/source/office/iodlg.cxx | 2
framework/source/uielement/controlmenucontroller.cxx | 2
framework/source/uielement/popuptoolbarcontroller.cxx | 6
reportdesign/source/ui/dlg/Navigator.cxx | 7
reportdesign/source/ui/report/StartMarker.cxx | 4
sc/source/ui/app/inputwin.cxx | 20
sc/source/ui/app/scmod.cxx | 4
sc/source/ui/cctrl/tbzoomsliderctrl.cxx | 6
sc/source/ui/miscdlgs/dataproviderdlg.cxx | 2
sc/source/ui/navipi/content.cxx | 3
sc/source/ui/navipi/navipi.cxx | 2
sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx | 20
sc/source/ui/view/olinewin.cxx | 2
sc/source/ui/xmlsource/xmlsourcedlg.cxx | 6
sd/source/ui/animations/CustomAnimationList.cxx | 7
sd/source/ui/animations/SlideTransitionPane.cxx | 2
sd/source/ui/app/sdmod2.cxx | 4
sd/source/ui/dlg/navigatr.cxx | 2
sd/source/ui/dlg/sdtreelb.cxx | 28 -
sd/source/ui/tools/IconCache.cxx | 2
sfx2/source/appl/newhelp.cxx | 44 +-
sfx2/source/control/recentdocsview.cxx | 2
sfx2/source/dialog/dinfdlg.cxx | 2
sfx2/source/dialog/infobar.cxx | 4
sfx2/source/dialog/templdlg.cxx | 6
sfx2/source/dialog/titledockwin.cxx | 3
sfx2/source/doc/templatedlg.cxx | 4
svtools/source/contnr/fileview.cxx | 2
svtools/source/contnr/foldertree.cxx | 4
svtools/source/misc/imagemgr.cxx | 2
svx/source/dialog/docrecovery.cxx | 6
svx/source/dialog/fontwork.cxx | 8
svx/source/dialog/langbox.cxx | 4
svx/source/engine3d/float3d.cxx | 4
svx/source/fmcomp/fmgridcl.cxx | 3
svx/source/form/datanavi.cxx | 26 -
svx/source/form/filtnav.cxx | 10
svx/source/form/fmexpl.cxx | 46 +-
svx/source/form/fmshimp.cxx | 2
svx/source/form/navigatortree.cxx | 10
svx/source/sidebar/area/AreaPropertyPanelBase.cxx | 12
svx/source/sidebar/line/LinePropertyPanelBase.cxx | 18
svx/source/sidebar/line/LineWidthPopup.cxx | 4
svx/source/stbctrls/modctrl.cxx | 6
svx/source/stbctrls/pszctrl.cxx | 4
svx/source/stbctrls/selctrl.cxx | 2
svx/source/stbctrls/xmlsecctrl.cxx | 6
svx/source/stbctrls/zoomctrl.cxx | 2
svx/source/stbctrls/zoomsliderctrl.cxx | 6
svx/source/tbxctrls/extrusioncontrols.cxx | 38 -
svx/source/tbxctrls/fontworkgallery.cxx | 10
sw/source/ui/dbui/mmoutputtypepage.cxx | 4
sw/source/ui/dialog/uiregionsw.cxx | 4
sw/source/ui/fldui/changedb.cxx | 10
sw/source/uibase/app/swmodule.cxx | 12
sw/source/uibase/dbui/dbtree.cxx | 12
sw/source/uibase/lingu/olmenu.cxx | 2
sw/source/uibase/misc/redlndlg.cxx | 10
sw/source/uibase/ribbar/inputwin.cxx | 6
sw/source/uibase/ribbar/workctrl.cxx | 4
sw/source/uibase/utlui/glbltree.cxx | 4
sw/source/uibase/utlui/navipi.cxx | 2
sw/source/uibase/utlui/viewlayoutctrl.cxx | 12
vcl/inc/printdlg.hxx | 3
vcl/source/app/salvtables.cxx | 14
vcl/source/control/button.cxx | 4
vcl/source/control/tabctrl.cxx | 4
vcl/source/treelist/svimpbox.cxx | 4
vcl/source/window/menubarwindow.cxx | 6
vcl/source/window/printdlg.cxx | 4
vcl/source/window/scrwnd.cxx | 12
xmlsecurity/source/dialogs/certificateviewer.cxx | 2
104 files changed, 468 insertions(+), 482 deletions(-)
New commits:
commit 15f0d61206dddee12159b68aeab5c860e3d5aff4
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Dec 7 10:29:02 2018 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sat Dec 8 19:15:09 2018 +0100
use Image(OUString) instead of Image(Bitmap(OUString))
which benefits LOOL since we can delay creating the image until
we know the dpi setting of the display we are going to write to.
Achieved by
perl -pi -w -e "s/\bImage\s*\(\s*BitmapEx\s*\((\w+)\s*\)\s*\)/Image\(\1\)/g" $( git grep -lw "BitmapEx" )
followed by
git grep -nP '\bImage\s*\(\s*BitmapEx\s*\('
followed by commenting out the BitmapEx(OUString) constructor and seeing
what needed adjusting.
Change-Id: I3224e11937d720fa484b0d659d25673a9e809267
Reviewed-on: https://gerrit.libreoffice.org/64760
Tested-by: Jenkins
Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
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:
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list