[libreoffice] fix fdo#80650

[David Tardon]

commit 2d841fcdfbd4db600d95adb37f6da4a817e93c50
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Sep 14 14:45:35 2014 +0200

    fix fdo#80650

 ...-src-transl.-merge-must-be-case-sensitive.patch |   65 ++++++++++++++++++++
 libreoffice.spec                                   |    1 +
 2 files changed, 66 insertions(+), 0 deletions(-)
---
diff --git a/0001-fdo-80650-src-transl.-merge-must-be-case-sensitive.patch b/0001-fdo-80650-src-transl.-merge-must-be-case-sensitive.patch
new file mode 100644
index 0000000..d50f07f
--- /dev/null
+++ b/0001-fdo-80650-src-transl.-merge-must-be-case-sensitive.patch
@@ -0,0 +1,65 @@
+From 03626d7940d5e2fc2abf65ef1b49a7a89623f08f Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Sun, 14 Sep 2014 13:20:29 +0200
+Subject: [PATCH] fdo#80650 src transl. merge must be case sensitive
+
+This makes the desired changes in
+workdir/SrsPartMergeTarget/starmath/source/symbol.src. The only other
+merged file that is changed is
+workdir/SrsPartMergeTarget/sw/source/ui/misc/numberingtypelistbox.src,
+with changes like
+
+                < "1, 2, 3, ..." ; 4/*SVX_NUM_ARABIC
+-               < "a, b, c, ..." ; 0/*SVX_NUM_CHARS_UPPER_LETTER   */; > ;
++               < "A, B, C, ..." ; 0/*SVX_NUM_CHARS_UPPER_LETTER   */; > ;
+                < "a, b, c, ..." ; 1/*SVX_NUM_CHARS_LOWER_LETTER   */; > ;
+
+This looks okay to me too :-)
+
+Change-Id: I729075209027ed1f3fec311c05b631c0f681708b
+---
+ l10ntools/source/export.cxx | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
+index 49805cc..6052e24 100644
+--- a/l10ntools/source/export.cxx
++++ b/l10ntools/source/export.cxx
+@@ -275,7 +275,7 @@ Export::~Export()
+ 
+     if ( bMergeMode ) {
+         if ( !pMergeDataFile )
+-            pMergeDataFile = new MergeDataFile(sMergeSrc, global::inputPathname, false);
++            pMergeDataFile = new MergeDataFile(sMergeSrc, global::inputPathname, true);
+ 
+         delete pMergeDataFile;
+     }
+@@ -1062,14 +1062,14 @@ void Export::ResData2Output( MergeEntrys *pEntry, sal_uInt16 nType, const OStrin
+ void Export::MergeRest( ResData *pResData )
+ {
+     if ( !pMergeDataFile ){
+-        pMergeDataFile = new MergeDataFile( sMergeSrc, global::inputPathname, false );
++        pMergeDataFile = new MergeDataFile( sMergeSrc, global::inputPathname, true );
+         aLanguages = pMergeDataFile->GetLanguages();
+ 
+     }
+ 
+     MergeEntrys *pEntry = 0;
+     if( pResData->bText || pResData->bQuickHelpText || pResData->bTitle )
+-        pEntry = pMergeDataFile->GetMergeEntrys( pResData );
++        pEntry = pMergeDataFile->GetMergeEntrysCaseSensitive( pResData );
+ 
+     if ( pEntry )
+     {
+@@ -1154,7 +1154,7 @@ void Export::MergeRest( ResData *pResData )
+                     ConvertExportContent( pResData->sId );
+                 }
+ 
+-                MergeEntrys* pEntrys = pMergeDataFile->GetMergeEntrys( pResData );
++                MergeEntrys* pEntrys = pMergeDataFile->GetMergeEntrysCaseSensitive( pResData );
+                 OString sText;
+                 bool bText = pEntrys && pEntrys->GetText( sText, STRING_TYP_TEXT, sCur, true );
+ 
+-- 
+1.9.3
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 8d0b7ea..3013133 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -317,6 +317,7 @@ Patch25: 0001-drop-useless-test-for-ant-apache-regexp.patch
 Patch26: 0001-No-fstack-protect-strong-for-gcc3_linux_aarch64-cpp2.patch
 Patch27: 0001-fdo-82496-Change-picture-option-by-rightclicking.patch
 Patch28: 0001-create-a-master-document-template-type.patch
+Patch29: 0001-fdo-80650-src-transl.-merge-must-be-case-sensitive.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice