[Libreoffice-commits] .: Branch 'libreoffice-3-5' - framework/source

David Tardon dtardon at kemper.freedesktop.org
Tue Jan 10 22:07:59 PST 2012


 framework/source/uielement/toolbarmanager.cxx |    3 ++-
 framework/source/uielement/toolbarmerger.cxx  |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit de4dddcd2bf799dae7c10e9c9ac8a81fdcfbe19e
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Jan 10 13:31:33 2012 +0100

    workaround internal compiler error with gcc 4.7
    
    Signed-off-by: David Tardon <dtardon at redhat.com>

diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 3c2896e..df50488 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1379,7 +1379,8 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
                     {
                         aCmdInfo.nId = nId;
                         aCmdInfo.nWidth = nWidth;
-                        m_aCommandMap.insert( CommandToInfoMap::value_type( aCommandURL, aCmdInfo ));
+                        const CommandToInfoMap::value_type aValue( aCommandURL, aCmdInfo );
+                        m_aCommandMap.insert( aValue );
                     }
                     else
                     {
diff --git a/framework/source/uielement/toolbarmerger.cxx b/framework/source/uielement/toolbarmerger.cxx
index 7e0b39f..a085a6a 100644
--- a/framework/source/uielement/toolbarmerger.cxx
+++ b/framework/source/uielement/toolbarmerger.cxx
@@ -516,7 +516,8 @@ bool ToolBarMerger::MergeItems(
                 {
                     CommandInfo aCmdInfo;
                     aCmdInfo.nId = rItemId;
-                    rCommandMap.insert( CommandToInfoMap::value_type( rItem.aCommandURL, aCmdInfo ));
+                    const CommandToInfoMap::value_type aValue( rItem.aCommandURL, aCmdInfo );
+                    rCommandMap.insert( aValue );
                 }
                 else
                 {


More information about the Libreoffice-commits mailing list