[libreoffice] workaround internal compiler error with gcc 4.7

[David Tardon]

commit 8888a4047d4dd3b29c84429baab9e1c550ca4c6d
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Jan 10 14:19:40 2012 +0100

    workaround internal compiler error with gcc 4.7

 ...ound-internal-compiler-error-with-gcc-4.7.patch |   41 ++++++++++++++++++++
 libreoffice.spec                                   |    2 +
 2 files changed, 43 insertions(+), 0 deletions(-)
---
diff --git a/0001-workaround-internal-compiler-error-with-gcc-4.7.patch b/0001-workaround-internal-compiler-error-with-gcc-4.7.patch
new file mode 100644
index 0000000..93c654f
--- /dev/null
+++ b/0001-workaround-internal-compiler-error-with-gcc-4.7.patch
@@ -0,0 +1,41 @@
+From 4a71d128bba69f7b91fe46fad5731caac6ca6ba2 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Tue, 10 Jan 2012 13:31:33 +0100
+Subject: [PATCH] workaround internal compiler error with gcc 4.7
+
+---
+ framework/source/uielement/toolbarmanager.cxx |    3 ++-
+ framework/source/uielement/toolbarmerger.cxx  |    3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
+index 8d4f984..0104b65 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 4b5da50..7e2a5f7 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
+                 {
+-- 
+1.7.7.5
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 9774938..c7775fa 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -115,6 +115,7 @@ Patch14: 0001-gcc-trunk-fix-error-unable-to-find-string-literal-op.patch
 Patch15: 0001-gcc-trunk-avoid-confusion.patch
 Patch16: 0001-workaround-for-LO-namespace-pollution-breaking-KDE4-.patch
 Patch17: 0001-smath-does-not-handle-accents-in-MathML.patch
+Patch18: 0001-workaround-internal-compiler-error-with-gcc-4.7.patch
 # TODO: this in S390 only, so it can wait .-)
 #Patch13: solenv.fix.mk.inheritance.patch
 
@@ -766,6 +767,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch15 -p1 -b .gcc-trunk-avoid-confusion.patch
 %patch16 -p1 -b .workaround-for-LO-namespace-pollution-breaking-KDE4-.patch
 %patch17 -p1 -b .smath-does-not-handle-accents-in-MathML.patch
+%patch18 -p1 -b .workaround-internal-compiler-error-with-gcc-4.7.patch
 #%patch13 -p1 -b .solenv.fix.mk.inheritance.patch
 
 # TODO: check this