[Libreoffice-commits] core.git: framework/source

[Susobhan Ghosh]

 framework/source/uielement/newmenucontroller.cxx |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 51b71a7be13611acc02a702cf025425fc746f4a2
Author: Susobhan Ghosh <susobhang70 at gmail.com>
Date:   Fri Jan 15 11:59:19 2016 +0530

    Related tdf#96059 Fix icons in File->New menu
    
    Change-Id: Iecfa69ab9db76ce0390a06d9d9574f30469c131a
    Reviewed-on: https://gerrit.libreoffice.org/21483
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index 352a531..5ef569b 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -41,6 +41,8 @@
 #include <osl/file.hxx>
 #include <svtools/menuoptions.hxx>
 #include <svtools/acceleratorexecute.hxx>
+#include <svtools/imagemgr.hxx>
+#include <tools/urlobj.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <osl/mutex.hxx>
 #include <memory>
@@ -101,7 +103,10 @@ void NewMenuController::setMenuImages( PopupMenu* pPopupMenu, bool bSetImages )
                 {
                     OUString aCmd( pPopupMenu->GetItemCommand( nItemId ) );
                     if ( !aCmd.isEmpty() )
-                        aImage = vcl::CommandInfoProvider::Instance().GetImageForCommand( aCmd, false, xFrame );
+                    {
+                        INetURLObject aURLObj( aCmd );
+                        aImage = SvFileInformationManager::GetImageNoDefault( aURLObj, false );
+                    }
 
                     if ( !!aImage )
                         pPopupMenu->SetItemImage( nItemId, aImage );