rpms
/
libreoffice
21
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 4.3.2 rc2

Browse Source
f41
David Tardon 10 years ago
parent 2168af3ce1
commit 6fc647cde3
4 changed files with 13 additions and 73 deletions
Show Stats Download Patch File Download Diff File

3
.gitignore vendored
Unescape View File

@ -94,3 +94,6 @@
/libreoffice-4.3.2.1.tar.xz
/libreoffice-help-4.3.2.1.tar.xz
/libreoffice-translations-4.3.2.1.tar.xz
/libreoffice-4.3.2.2.tar.xz
/libreoffice-help-4.3.2.2.tar.xz
/libreoffice-translations-4.3.2.2.tar.xz

65
0001-fdo-80650-src-transl.-merge-must-be-case-sensitive.patch
Unescape View File

@ -1,65 +0,0 @@
From 03626d7940d5e2fc2abf65ef1b49a7a89623f08f Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@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

12
libreoffice.spec
Unescape View File

@ -45,8 +45,8 @@
Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.1
Release: 3%{?libo_prerelease}%{?dist}
Version: %{libo_version}.2
Release: 1%{?libo_prerelease}%{?dist}
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0
Group: Applications/Productivity
URL: http://www.libreoffice.org/
@ -317,9 +317,8 @@ 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
Patch30: 0001-Resolves-fdo-80911-don-t-swap-notes-page-width-heigh.patch
Patch31: 0001-default-n-up-printing-of-notes-to-sensible-2-x-1-not.patch
Patch29: 0001-Resolves-fdo-80911-don-t-swap-notes-page-width-heigh.patch
Patch30: 0001-default-n-up-printing-of-notes-to-sensible-2-x-1-not.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/libreoffice
@ -2296,6 +2295,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%endif
%changelog
* Mon Sep 22 2014 David Tardon <dtardon@redhat.com> - 1:4.3.2.2-1
- update to 4.3.2 rc2
* Wed Sep 17 2014 Caolán McNamara <caolanm@redhat.com> - 1:4.3.2.1-3
- make n-up printing of impress notes work out of the box

6
sources
Unescape View File

@ -6,6 +6,6 @@ a7983f859eafb2677d7ff386a023bc40 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.
1f24ab1d39f4a51faf22244c94a6203f 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
0168229624cfac409e766913506961a8 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
12fb8b5b0d5132726e57b9b9fc7e22c4 libreoffice-multiliblauncher.sh
7008d77820525a33187877588488e0e8 libreoffice-4.3.2.1.tar.xz
cbf370f6738cbab71204cb929f73ab5e libreoffice-help-4.3.2.1.tar.xz
be26af4326e74c6a78137111815a0ed3 libreoffice-translations-4.3.2.1.tar.xz
86aa9cad125fec16c5cd1d9d964e1d20 libreoffice-4.3.2.2.tar.xz
63a59a4c77a72856b47caf1871cfc48f libreoffice-help-4.3.2.2.tar.xz
0236e56349006fc8fec8e7df749c13b1 libreoffice-translations-4.3.2.2.tar.xz

Write Preview
Loading…
Cancel
Save