[libreoffice/f17] add libreoffice-gcc-4.7.patch to build with gcc 4.7

[Caolán McNamara]

commit 652bc8a1d2883b2559dc50f369396545f1bd49fb
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Aug 1 11:12:10 2012 +0100

    add libreoffice-gcc-4.7.patch to build with gcc 4.7

 libreoffice-gcc-4.7.patch |   99 +++++++++++++++++++++++++++++++++++++++++++++
 libreoffice.spec          |    3 +
 2 files changed, 102 insertions(+), 0 deletions(-)
---
diff --git a/libreoffice-gcc-4.7.patch b/libreoffice-gcc-4.7.patch
new file mode 100644
index 0000000..6119f71
--- /dev/null
+++ b/libreoffice-gcc-4.7.patch
@@ -0,0 +1,99 @@
+diff --git a/l10ntools.orig/source/tagtest.cxx b/l10ntools/source/tagtest.cxx
+index 58a1299..62c59ad 100644
+--- a/l10ntools.orig/source/tagtest.cxx
++++ b/l10ntools/source/tagtest.cxx
+@@ -668,7 +668,8 @@ void SimpleParser::Parse( String PaSource )
+     aSource = PaSource;
+     nPos = 0;
+     aLastToken.Erase();
+-    aNextTag = TokenInfo( TAG_NOMORETAGS, TOK_INVALIDPOS );
++    TokenInfo aFoo( TAG_NOMORETAGS, TOK_INVALIDPOS );
++    aNextTag = aFoo;
+     aTokenList.clear();
+ };
+ 
+@@ -679,7 +680,8 @@ TokenInfo SimpleParser::GetNextToken( ParserMessageList &rErrorList )
+     if ( aNextTag.nId != TAG_NOMORETAGS )
+     {
+         aResult = aNextTag;
+-        aNextTag = TokenInfo( TAG_NOMORETAGS, TOK_INVALIDPOS );
++        TokenInfo aFoo( TAG_NOMORETAGS, TOK_INVALIDPOS );
++        aNextTag = aFoo;
+     }
+     else
+     {
+@@ -718,15 +720,22 @@ TokenInfo SimpleParser::GetNextToken( ParserMessageList &rErrorList )
+             while ( aLastToken.GetChar(nNonBlankStartPos) == ' ' )
+                 nNonBlankStartPos++;
+             if ( aLastToken.GetChar(nNonBlankStartPos) == '/' )
+-                aResult = TokenInfo( TAG_COMMONEND, nTokenStartPos, aLastToken, rErrorList );
++            {
++                TokenInfo aFoo( TAG_COMMONEND, nTokenStartPos, aLastToken, rErrorList );
++                aResult = aFoo;
++            }
+             else
+             {
+-                aResult = TokenInfo( TAG_COMMONSTART, nTokenStartPos, aLastToken, rErrorList );
++                TokenInfo aBar( TAG_COMMONSTART, nTokenStartPos, aLastToken, rErrorList );
++                aResult = aBar;
+                 nNonBlankEndPos = aLastToken.Len() -3;
+                 while ( aLastToken.GetChar(nNonBlankEndPos) == ' ' )
+                     nNonBlankEndPos--;
+                 if ( aLastToken.GetChar( nNonBlankEndPos ) == '/' )
+-                    aNextTag = TokenInfo( TAG_COMMONEND, nTokenStartPos, String::CreateFromAscii("\\</").Append(aResult.GetTagName()).AppendAscii("\\>"), rErrorList );
++                {
++                    TokenInfo aFoo( TAG_COMMONEND, nTokenStartPos, String::CreateFromAscii("\\</").Append(aResult.GetTagName()).AppendAscii("\\>"), rErrorList );
++                    aNextTag = aFoo;
++                }
+             }
+         }
+         else
+@@ -735,12 +744,16 @@ TokenInfo SimpleParser::GetNextToken( ParserMessageList &rErrorList )
+             while ( aKnownTags[i].nTag != TAG_UNKNOWN_TAG &&
+                 aLastToken != aKnownTags[i].GetName() )
+                 i++;
+-            aResult = TokenInfo( aKnownTags[i].nTag, nTokenStartPos );
++            TokenInfo aFoo( aKnownTags[i].nTag, nTokenStartPos );
++            aResult = aFoo;
+         }
+     }
+ 
+     if ( aResult.nId == TAG_UNKNOWN_TAG )
+-        aResult = TokenInfo( TAG_UNKNOWN_TAG, nTokenStartPos, aLastToken );
++    {
++        TokenInfo aFoo( TAG_UNKNOWN_TAG, nTokenStartPos, aLastToken );
++        aResult = aFoo;
++    }
+     aTokenList.insert( aResult );
+     return aResult;
+ }
+@@ -825,7 +838,8 @@ void TokenParser::Parse( const String &aCode, ParserMessageList* pList )
+     aParser.Parse( aCode );
+ 
+     //erstes Symbol holen
+-    aTag = aParser.GetNextToken( *pErrorList );
++    TokenInfo aFoo(aParser.GetNextToken( *pErrorList ));
++    aTag = aFoo;
+ 
+     nPfCaseOptions = 0;
+     nAppCaseOptions = 0;
+@@ -1305,7 +1319,8 @@ sal_Bool TokenParser::match( const TokenInfo &aCurrentToken, const TokenInfo &rE
+                && aCurrentToken.GetTagName().Equals( aExpectedToken.GetTagName() ) )
+              || aCurrentToken.nId != TAG_COMMONEND )
+         {
+-            aTag = aParser.GetNextToken( *pErrorList );
++            TokenInfo aFoo(aParser.GetNextToken( *pErrorList ));
++            aTag = aFoo;
+             return sal_True;
+         }
+     }
+@@ -1335,7 +1350,8 @@ void TokenParser::ParseError( sal_uInt16 nErrNr, ByteString aErrMsg, const Token
+     pErrorList->AddError( nErrNr, aErrMsg, rTag);
+ 
+     // Das Fehlerhafte Tag ueberspringen
+-    aTag = aParser.GetNextToken( *pErrorList );
++    TokenInfo aFoo(aParser.GetNextToken( *pErrorList ));
++    aTag = aFoo;
+ }
+ 
+ 
diff --git a/libreoffice.spec b/libreoffice.spec
index 9b0b97b..b15284f 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -148,6 +148,7 @@ Patch33: 0001-Resolves-rhbz-838368-view-ignored-while-view-accepte.patch
 Patch34: 0001-resolved-rhbz-838248-init-filter-criteria-string.patch
 Patch35: 0001-Resolves-rhbz-836937-insanely-slow-with-Zemberek-ins.patch
 Patch36: 0001-rhbz-842552-always-create-text-content.patch
+Patch37: libreoffice-gcc-4.7.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1014,6 +1015,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch34 -p1 -b .rhbz-838248-init-filter-criteria-string.patch
 %patch35 -p1 -b .rhbz-836937-insanely-slow-with-Zemberek-ins.patch
 %patch36 -p1 -b .rhbz-842552-always-create-text-content.patch
+%patch37 -p1 -b .libreoffice-gcc-4.7.patch
 
 # TODO: check this
 # these are horribly incomplete--empty translations and copied english
@@ -2302,6 +2304,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 * Thu Jul 26 2012 David Tardon <dtardon at redhat.com> - 1:3.5.5.3-5
 - Resolves: rhbz#842552 crash in pptx import
 - Resolves: rhbz#832603 abi problems with c++11
+- add libreoffice-gcc-4.7.patch to build with gcc 4.7
 
 * Mon Jul 16 2012 Caolán McNamara <caolanm at redhat.com> - 3.5.5.3-4
 - Resolves: rhbz#836937 insanely slow with Zemberek