diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-22 14:35:31 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-22 14:42:17 +0200 |
| commit | dd28837249088bf6e6ec11ed01a01be6f1774985 (patch) | |
| tree | 452a88ea26e395f846df690472147898dd999036 /sfx2 | |
| parent | 61027a637760087ee716f64ae0f216ef2a640108 (diff) | |
vcl: mark more Image constructors as "explicit"
Change-Id: If59d7c75c89a102a573738d15d8593cb8ac5c486
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/dinfdlg.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/dialog/taskpane.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/doc/templatedlg.cxx | 8 |
3 files changed, 8 insertions, 4 deletions
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 1cc97a90d4c2..fc92e367f375 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -1374,7 +1374,7 @@ CustomPropertyLine::CustomPropertyLine( Window* pParent ) : m_aTimeField.SetExtFormat( EXTTIMEF_24H_LONG ); m_aDateField.SetExtDateFormat( XTDATEF_SYSTEM_SHORT_YYYY ); - m_aRemoveButton.SetModeImage( SfxResId( SFX_IMG_PROPERTY_REMOVE ) ); + m_aRemoveButton.SetModeImage(Image(SfxResId(SFX_IMG_PROPERTY_REMOVE))); } void CustomPropertyLine::SetRemoved() diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx index 42d9c3a1ed94..54ea70e91ec2 100644 --- a/sfx2/source/dialog/taskpane.cxx +++ b/sfx2/source/dialog/taskpane.cxx @@ -178,7 +178,7 @@ namespace sfx2 const OUString sCommandName( aCommandName.makeStringAndClear() ); const Image aPanelImage( GetImage( i_rDocFrame, sCommandName, sal_False ) ); - return aPanelImage.GetXGraphic(); + return aPanelImage; } // otherwise, delegate to the GraphicProvider diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index 22271bada09c..d61d6b5c7155 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -177,8 +177,12 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window *parent) // Create popup menus mpActionMenu = new PopupMenu; - mpActionMenu->InsertItem(MNI_ACTION_SORT_NAME,SfxResId(STR_ACTION_SORT_NAME).toString(),SfxResId(IMG_ACTION_SORT)); - mpActionMenu->InsertItem(MNI_ACTION_REFRESH,SfxResId(STR_ACTION_REFRESH).toString(),SfxResId(IMG_ACTION_REFRESH)); + mpActionMenu->InsertItem(MNI_ACTION_SORT_NAME, + SfxResId(STR_ACTION_SORT_NAME).toString(), + Image(SfxResId(IMG_ACTION_SORT))); + mpActionMenu->InsertItem(MNI_ACTION_REFRESH, + SfxResId(STR_ACTION_REFRESH).toString(), + Image(SfxResId(IMG_ACTION_REFRESH))); mpActionMenu->InsertItem(MNI_ACTION_DEFAULT,SfxResId(STR_ACTION_DEFAULT).toString()); mpActionMenu->SetSelectHdl(LINK(this,SfxTemplateManagerDlg,MenuSelectHdl)); |