summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2012-01-10 13:31:33 +0100
committerDavid Tardon <dtardon@redhat.com>2012-01-11 07:06:35 +0100
commitde4dddcd2bf799dae7c10e9c9ac8a81fdcfbe19e (patch)
tree9969a3b7e2f858adff55a27bb9e756728a0321b3 /framework
parenta78260fb65c2542566215bb5bdd6060c164584ab (diff)
workaround internal compiler error with gcc 4.7
Signed-off-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'framework')
-rw-r--r--framework/source/uielement/toolbarmanager.cxx3
-rw-r--r--framework/source/uielement/toolbarmerger.cxx3
2 files changed, 4 insertions, 2 deletions
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 3c2896eac8bc..df5048837489 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 7e0b39ffbfb9..a085a6ad4432 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
{