4 files changed, 9 insertions, 16 deletions
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index b2680c08bf11..b5802d726994 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -32,6 +32,7 @@
 #include <comphelper/string.hxx>
 #include <svx/svxids.hrc>
 
+#include <vcl/commandinfoprovider.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/msgbox.hxx>
@@ -46,7 +47,6 @@
 
 #include <tools/datetime.hxx>
 
-#include <sfx2/imagemgr.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/app.hxx>
@@ -1206,12 +1206,8 @@ void AnnotationManagerImpl::ExecuteAnnotationContextMenu( const Reference< XAnno
             sal_uInt16 nId = pMenu->GetItemId( nPos );
             if (!pMenu->IsItemEnabled(nId))
                 continue;
-            OString sIdent = pMenu->GetItemIdent(nId);
-            sal_uInt16 nSID = IdentToSID(sIdent);
-            OUString sSlotURL( "slot:" );
-            sSlotURL += OUString::number(nSID);
 
-            Image aImage( GetImage( xFrame, sSlotURL, false ) );
+            Image aImage( vcl::CommandInfoProvider::GetImageForCommand( pMenu->GetItemCommand( nId ), xFrame ) );
             if( !!aImage )
                 pMenu->SetItemImage( nId, aImage );
         }
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 521e18f86ce3..888e49fdd367 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -40,7 +40,6 @@
 #include <toolkit/helper/vclunohelper.hxx>
 
 #include <sfx2/infobar.hxx>
-#include <sfx2/imagemgr.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/app.hxx>
@@ -65,6 +64,7 @@
 #include "res_bmp.hrc"
 #include "sdresid.hxx"
 #include <vcl/canvastools.hxx>
+#include <vcl/commandinfoprovider.hxx>
 #include <vcl/settings.hxx>
 
 #include "comphelper/anytostring.hxx"
@@ -2004,13 +2004,13 @@ IMPL_LINK_NOARG(SlideshowImpl, ContextMenuHdl, void*, void)
         Reference< css::frame::XFrame > xFrame( pViewFrame->GetFrame().GetFrameInterface() );
         if( xFrame.is() )
         {
-            pMenu->SetItemImage(pMenu->GetItemId("next"), GetImage(xFrame, "slot:10617" , false));
-            pMenu->SetItemImage(pMenu->GetItemId("prev"), GetImage(xFrame, "slot:10618" , false));
+            pMenu->SetItemImage(pMenu->GetItemId("next"), vcl::CommandInfoProvider::GetImageForCommand(".uno:NextRecord", xFrame));
+            pMenu->SetItemImage(pMenu->GetItemId("prev"), vcl::CommandInfoProvider::GetImageForCommand(".uno:PrevRecord", xFrame));
 
             if( pPageMenu )
             {
-                pPageMenu->SetItemImage(pPageMenu->GetItemId("first"), GetImage(xFrame, "slot:10616" , false));
-                pPageMenu->SetItemImage(pPageMenu->GetItemId("last"), GetImage(xFrame, "slot:10619" , false));
+                pPageMenu->SetItemImage(pPageMenu->GetItemId("first"), vcl::CommandInfoProvider::GetImageForCommand(".uno:FirstRecord", xFrame));
+                pPageMenu->SetItemImage(pPageMenu->GetItemId("last"), vcl::CommandInfoProvider::GetImageForCommand(".uno:LastRecord", xFrame));
             }
         }
     }
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index f0cbddc14394..5821dde1d610 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -20,6 +20,7 @@
 #include "OutlineView.hxx"
 #include <editeng/forbiddencharacterstable.hxx>
 #include <sfx2/progress.hxx>
+#include <vcl/commandinfoprovider.hxx>
 #include <vcl/wrkwin.hxx>
 #include <svx/svxids.hrc>
 #include <editeng/outliner.hxx>
@@ -28,7 +29,6 @@
 #include <editeng/lrspitem.hxx>
 #include <svx/svdotext.hxx>
 #include <sfx2/printer.hxx>
-#include <sfx2/imagemgr.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/bindings.hxx>
 #include <svl/itempool.hxx>
@@ -146,9 +146,7 @@ OutlineView::OutlineView( DrawDocShell& rDocSh, vcl::Window* pWindow, OutlineVie
     maBulletFont.SetShadow(false);
 
     Reference<XFrame> xFrame (mrOutlineViewShell.GetViewShellBase().GetFrame()->GetFrame().GetFrameInterface(), UNO_QUERY);
-
-    const OUString aSlotURL( ".uno:ShowSlide" );
-    maSlideImage = GetImage( xFrame, aSlotURL, true );
+    maSlideImage = vcl::CommandInfoProvider::GetImageForCommand(".uno:ShowSlide", xFrame, vcl::ImageType::Size26);
 
     // Tell undo manager of the document about the undo manager of the
     // outliner, so that the former can synchronize with the later.
diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx
index 44aa1f59e3d0..19254e201c9c 100644
--- a/sd/source/ui/view/viewoverlaymanager.cxx
+++ b/sd/source/ui/view/viewoverlaymanager.cxx
@@ -20,7 +20,6 @@
 #include "sddll.hxx"
 
 #include <com/sun/star/frame/XFrame.hpp>
-#include <sfx2/imagemgr.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/app.hxx>