3 files changed, 6 insertions, 6 deletions
diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx
index 680f3b84e312..c2fc4485a446 100644
--- a/forms/source/solar/component/navbarcontrol.cxx
+++ b/forms/source/solar/component/navbarcontrol.cxx
@@ -211,7 +211,7 @@ namespace frm
         VclPtrInstance<NavigationToolBar> pNavBar(
             _pParentWindow,
             lcl_getWinBits_nothrow( _rxModel ),
-            createDocumentCommandImageProvider( _rxORB, xContextDocument ),
+            std::make_shared<DocumentCommandImageProvider>( _rxORB, xContextDocument ),
             sModuleID
         );
 
diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx
index 5acd1139e217..bbb717139e19 100644
--- a/forms/source/solar/control/navtoolbar.cxx
+++ b/forms/source/solar/control/navtoolbar.cxx
@@ -366,10 +366,10 @@ namespace frm
         }
 
         // retrieve the images for the command URLs
-        CommandImages aCommandImages = m_pImageProvider->getCommandImages( aCommandURLs, m_eImageSize == eLarge );
+        std::vector<Image> aCommandImages = m_pImageProvider->getCommandImages( aCommandURLs, m_eImageSize == eLarge );
 
         // and set them at the toolbar
-        CommandImages::const_iterator commandImage = aCommandImages.begin();
+        auto commandImage = aCommandImages.begin();
         for (auto const& formFeature : aFormFeatures)
         {
             m_pToolbar->SetItemImage( formFeature, *commandImage );
diff --git a/forms/source/solar/inc/navtoolbar.hxx b/forms/source/solar/inc/navtoolbar.hxx
index e5db22177383..1018ff6e16b3 100644
--- a/forms/source/solar/inc/navtoolbar.hxx
+++ b/forms/source/solar/inc/navtoolbar.hxx
@@ -31,10 +31,10 @@ namespace frm
 
 
     class IFeatureDispatcher;
-    class ICommandImageProvider;
+    class DocumentCommandImageProvider;
     class ICommandDescriptionProvider;
     class ImplNavToolBar;
-    typedef std::shared_ptr< const ICommandImageProvider >  PCommandImageProvider;
+    typedef std::shared_ptr< const DocumentCommandImageProvider >  PCommandImageProvider;
 
     class NavigationToolBar final : public vcl::Window
     {
@@ -55,7 +55,7 @@ namespace frm
 
     private:
         const IFeatureDispatcher*       m_pDispatcher;
-        const std::shared_ptr< const ICommandImageProvider >
+        const std::shared_ptr< const DocumentCommandImageProvider >
                                         m_pImageProvider;
         ImageSize                       m_eImageSize;
         VclPtr<ImplNavToolBar>          m_pToolbar;