add mapKeysToSequence/mapValuesToSequence methods to comphelper

and use them

Change-Id: If4dc9df63db37185228aeaaab2979498d61304ec
Reviewed-on: https://gerrit.libreoffice.org/20055
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

1 files changed, 4 insertions, 12 deletions

diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index ce608f7bbec2..49588d78f782 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1320,19 +1320,10 @@ void ToolBarManager::RequestImages()
 {
 
     // Request images from image manager
-    Sequence< OUString > aCmdURLSeq( m_aCommandMap.size() );
+    Sequence< OUString > aCmdURLSeq( comphelper::mapKeysToSequence(m_aCommandMap) );
     Sequence< Reference< XGraphic > > aDocGraphicSeq;
     Sequence< Reference< XGraphic > > aModGraphicSeq;
 
-    sal_uInt32 i = 0;
-    CommandToInfoMap::iterator pIter = m_aCommandMap.begin();
-    CommandToInfoMap::iterator pEnd = m_aCommandMap.end();
-    while ( pIter != pEnd )
-    {
-        aCmdURLSeq[i++] = pIter->first;
-        ++pIter;
-    }
-
     bool  bBigImages( SvtMiscOptions().AreCurrentSymbolsLarge() );
     sal_Int16 p = getImageTypeFromBools( SvtMiscOptions().AreCurrentSymbolsLarge() );
 
@@ -1340,8 +1331,9 @@ void ToolBarManager::RequestImages()
         aDocGraphicSeq = m_xDocImageManager->getImages( p, aCmdURLSeq );
     aModGraphicSeq = m_xModuleImageManager->getImages( p, aCmdURLSeq );
 
-    i = 0;
-    pIter = m_aCommandMap.begin();
+    sal_uInt32 i = 0;
+    CommandToInfoMap::iterator pIter = m_aCommandMap.begin();
+    CommandToInfoMap::iterator pEnd = m_aCommandMap.end();
     while ( pIter != pEnd )
     {
         Image aImage;