Hello community, here is the log from the commit of package libreoffice for openSUSE:Factory checked in at 2015-12-20 10:51:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libreoffice (Old) and /work/SRC/openSUSE:Factory/.libreoffice.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice" Changes: -------- --- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2015-12-13 11:58:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice.changes 2015-12-20 10:51:56.000000000 +0100 @@ -1,0 +2,18 @@ +Tue Dec 15 11:47:08 UTC 2015 - [email protected] + +- Version update to 5.0.4.2: + * Final of the 5.0.4 series + +------------------------------------------------------------------- +Mon Dec 14 22:23:15 UTC 2015 - [email protected] + +- bnc#945047 - LO-L3: LO is duplicating master pages + * bnc-945047.diff + +------------------------------------------------------------------- +Fri Dec 11 12:13:27 UTC 2015 - [email protected] + +- Version update to 5.0.4.1: + * rc1 of 5.0.4 with various regression fixes + +------------------------------------------------------------------- Old: ---- language-subtag-registry-2015-06-08.tar.bz2 libreoffice-5.0.3.2.tar.xz libreoffice-help-5.0.3.2.tar.xz libreoffice-translations-5.0.3.2.tar.xz New: ---- bnc-945047.diff language-subtag-registry-2015-08-04.tar.bz2 libreoffice-5.0.4.2.tar.xz libreoffice-help-5.0.4.2.tar.xz libreoffice-translations-5.0.4.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice.spec ++++++ --- /var/tmp/diff_new_pack.yJctr7/_old 2015-12-20 10:52:19.000000000 +0100 +++ /var/tmp/diff_new_pack.yJctr7/_new 2015-12-20 10:52:19.000000000 +0100 @@ -22,7 +22,7 @@ %define numbertext_version 0.9.5 # Urls %define external_url http://dev-www.libreoffice.org/src/ -%define tarball_url http://download.documentfoundation.org/libreoffice/src/5.0.3 +%define tarball_url http://download.documentfoundation.org/libreoffice/src/5.0.4 # Old Make and bundle or not %if 0%{?suse_version} > 1230 %bcond_with oldmake @@ -64,7 +64,7 @@ %endif # This is used due to the need for beta releases Name: libreoffice -Version: 5.0.3.2 +Version: 5.0.4.2 Release: 0 Summary: A Free Office Suite (Framework) License: Apache-2.0 and Artistic-1.0 and BSD-3-Clause and BSD-4-Clause and GPL-2.0+ and LPPL-1.3c and LGPL-2.1+ and LGPL-3.0 and MPL-1.1 and MIT and SUSE-Public-Domain and W3C @@ -152,7 +152,7 @@ Source2059: %{external_url}/c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2 Source2060: %{external_url}/2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz Source2061: %{external_url}/b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz -Source2062: %{external_url}/language-subtag-registry-2015-06-08.tar.bz2 +Source2062: %{external_url}/language-subtag-registry-2015-08-04.tar.bz2 # Make for old distros where too old gnumake resides Source3000: http://ftp.gnu.org/gnu/make/make-4.1.tar.bz2 # PATCH-FIX-SUSE: disable really fragile test run on hsqldb @@ -177,6 +177,8 @@ Patch12: use-long-for-test-comparsion.patch # bnc#954345 - LO-L3: Insert-->Image-->Insert as Link hangs writer Patch13: bnc-954345.diff +# bnc#945047 - LO-L3: LO is duplicating master pages +Patch14: bnc-945047.diff # try to save space by using hardlinks Patch990: install-with-hardlinks.diff BuildRequires: %{name}-share-linker @@ -1008,6 +1010,7 @@ %patch11 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 %patch990 -p1 # 256x256 icons tar -xjf %{SOURCE20} ++++++ bnc-945047.diff ++++++ >From 0b6c9ddce0478bbedc36e8531f31b154bbce661c Mon Sep 17 00:00:00 2001 From: Mike Kaganski <[email protected]> Date: Thu, 3 Dec 2015 19:05:03 +1000 Subject: [PATCH] tdf#96206: Avoid scaling objects while copying to clipboard ... to prevent duplicating masters on slide copy-paste. Also fixed a 10-year copy-paste error (pRefPage wasn't replaced with pNPage). Fixed argument evaluation order issue (aStream.GetEndOfData() depends on Flush() but doesn't call it, so will return incorrect result if called before aStream.GetBuffer()). Replaced compare of hashes with results of stringify(), because it removes useless overhead (hashes are calculated from stringify() anyway, and are not cached anywhere). Removed Flush() called from SvMemoryStream::GetBuffer(), because it calls GetData(), which calls Flush() itself. Change-Id: Ia46d4e9a017fc628d424949a9d229045a249a4ca --- sd/source/core/drawdoc3.cxx | 22 ++++++++++++++++------ svx/source/svdraw/svdobj.cxx | 1 + tools/source/stream/stream.cxx | 1 - 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index 3f966e8..cb15650 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -51,6 +51,7 @@ #include "strmname.h" #include "anminfo.hxx" #include "customshowlist.hxx" +#include "sdxfer.hxx" #include "../ui/inc/unmovss.hxx" #include "../ui/inc/unchss.hxx" @@ -110,7 +111,7 @@ void InsertBookmarkAsPage_FindDuplicateLayouts::operator()( SdDrawDocument& rDoc { // Ignore Layouts with "Default" these seem to be special - in the sense that there are lot of assumption all over Impress // about this - if( bRenameDuplicates && aTest != OUString( SdResId( STR_LAYOUT_DEFAULT_NAME ) ) && pTestPage->getHash() != pBMMPage->getHash() ) + if( bRenameDuplicates && aTest != OUString( SdResId( STR_LAYOUT_DEFAULT_NAME ) ) && pTestPage->stringify() != pBMMPage->stringify() ) { pBookmarkDoc->RenameLayoutTemplate( pBMMPage->GetLayoutName(), OUString(pBMMPage->GetName())+=OUString("_") ); aLayout = pBMMPage->GetName(); @@ -438,17 +439,26 @@ bool SdDrawDocument::InsertBookmarkAsPage( sal_Int32 nNRight = pNPage->GetRgtBorder(); sal_Int32 nNUpper = pNPage->GetUppBorder(); sal_Int32 nNLower = pNPage->GetLwrBorder(); - Orientation eNOrient = pRefPage->GetOrientation(); + Orientation eNOrient = pNPage->GetOrientation(); // Adapt page size and margins to those of the later pages? pRefPage = GetSdPage(nSdPageCount - 1, PK_STANDARD); if( bNoDialogs ) { - if( rBookmarkList.empty() ) - bScaleObjects = pRefPage->IsScaleObjects(); - else - bScaleObjects = true; + // If this is clipboard, then no need to scale objects: + // this will make copied masters to differ from the originals, + // and thus InsertBookmarkAsPage_FindDuplicateLayouts will + // duplicate masters on insert to same document + bool bIsClipBoard = (SD_MOD()->pTransferClip && + SD_MOD()->pTransferClip->GetWorkDocument() == this); + if (!bIsClipBoard) + { + if (rBookmarkList.empty()) + bScaleObjects = pRefPage->IsScaleObjects(); + else + bScaleObjects = true; + } } else { diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index b6d3827..b712850 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -1776,6 +1776,7 @@ OString SdrObject::stringify() const SfxItemSet aSet(GetMergedItemSet()); aSet.InvalidateDefaultItems(); aSet.Store(aStream, true); + aStream.Flush(); // for correct results from aStream.GetEndOfData() aString.append(static_cast<const char *>(aStream.GetBuffer()), aStream.GetEndOfData()); return aString.makeStringAndClear(); diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx index bb6d21e..17bdcd1 100644 --- a/tools/source/stream/stream.cxx +++ b/tools/source/stream/stream.cxx @@ -1723,7 +1723,6 @@ SvMemoryStream::~SvMemoryStream() const void* SvMemoryStream::GetBuffer() { - Flush(); return GetData(); } -- 2.1.4 ++++++ language-subtag-registry-2015-06-08.tar.bz2 -> language-subtag-registry-2015-08-04.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/data/language-subtag-registry new/data/language-subtag-registry --- old/data/language-subtag-registry 2015-06-08 21:00:00.000000000 +0200 +++ new/data/language-subtag-registry 2015-08-04 22:13:32.000000000 +0200 @@ -1,4 +1,4 @@ -File-Date: 2015-06-08 +File-Date: 2015-08-04 %% Type: language Subtag: aa @@ -43525,6 +43525,11 @@ Added: 2005-10-16 %% Type: script +Subtag: Bhks +Description: Bhaiksuki +Added: 2015-07-24 +%% +Type: script Subtag: Blis Description: Blissymbols Added: 2005-10-16 @@ -43866,6 +43871,11 @@ Added: 2005-10-16 %% Type: script +Subtag: Leke +Description: Leke +Added: 2015-07-24 +%% +Type: script Subtag: Lepc Description: Lepcha Description: Róng ++++++ libreoffice-5.0.3.2.tar.xz -> libreoffice-5.0.4.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-5.0.3.2.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-5.0.4.2.tar.xz differ: char 26, line 1 ++++++ libreoffice-help-5.0.3.2.tar.xz -> libreoffice-help-5.0.4.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-5.0.3.2/ChangeLog-helpcontent2 new/libreoffice-5.0.4.2/ChangeLog-helpcontent2 --- old/libreoffice-5.0.3.2/ChangeLog-helpcontent2 2015-10-24 17:40:43.000000000 +0200 +++ new/libreoffice-5.0.4.2/ChangeLog-helpcontent2 2015-12-11 03:42:56.000000000 +0100 @@ -1,14 +1,14 @@ -2015-10-24 Christian Lohmaier <[email protected]> [c4cc6da5820bd254499cee0bf490af5a91aa5724] +2015-12-11 Christian Lohmaier <[email protected]> [e8c482d0367808076a524676cb531e567f690caa] -Version 5.0.3.2, tag libreoffice-5.0.3.2 +Version 5.0.4.2, tag libreoffice-5.0.4.2 -Change-Id: Icdd3c7b9bd4df2c79990ddee9ecf5b00f6ca33f3 +Change-Id: I76ef3ddf6c8ce71a18bc303b7731536001a89879 -2015-10-07 Christian Lohmaier <[email protected]> [f3cc5cfcbabc36d95522204ab2db1d9a834c20a4] +2015-11-27 Christian Lohmaier <[email protected]> [3314abf3386bc83bb10253058cc1255d79524ad6] -Branch libreoffice-5-0-3 +Branch libreoffice-5-0-4 -This is 'libreoffice-5-0-3' - the stable branch for the 5.0.3 release. +This is 'libreoffice-5-0-4' - the stable branch for the 5.0.4 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 5.0.x release, @@ -16,7 +16,40 @@ If you want to build something cool, unstable, and risky, use master. -Change-Id: If61d763a22550a0915f468708275f259c83feef3 +Change-Id: Id8b1edef3b8cc717bafac596fed63d99e6dd5d7b + +2015-11-23 Adolfo Jayme Barrientos <[email protected]> [ab4c21fa199cdaa11862f49e201af73d67c7850b] + +Revert "tdf#87313 Update instructions to Firefox 42" + +This reverts commit 1f6ca79f4270e03fe256129147752fd7e6c8ab54. + +2015-11-23 Adolfo Jayme Barrientos <[email protected]> [1f6ca79f4270e03fe256129147752fd7e6c8ab54] + +tdf#87313 Update instructions to Firefox 42 + +And remove references to the dead Mozilla Suite. + +2015-11-22 Stanislav Horacek <[email protected]> [5e1a32e2b6ddf58636216e505d7ec30801364ba6] + +Insert - Section - Footnotes/Endnotes tab is available in both views + +Change-Id: If21268f37c254753eac5ae4c52c931ebde73b6e8 +Reviewed-on: https://gerrit.libreoffice.org/20120 +Reviewed-by: Adolfo Jayme Barrientos <[email protected]> +Tested-by: Adolfo Jayme Barrientos <[email protected]> +(cherry picked from commit 229eff368cdbfd556ed83f051eb2000d2700ff7b) +Signed-off-by: Adolfo Jayme Barrientos <[email protected]> + +2015-11-08 Andras Timar <[email protected]> [5f1e836c7d1356ad5c66e6bed1a5e2eeaeebe67d] + +tdf#94473 add missing hid + +Change-Id: Ib0709570cdbfdf2ea4dc7e025319ae4acdb1ff36 +(cherry picked from commit 2f91170b8637554100e427525541ade2fd38c574) +Reviewed-on: https://gerrit.libreoffice.org/19841 +Reviewed-by: Adolfo Jayme Barrientos <[email protected]> +Tested-by: Adolfo Jayme Barrientos <[email protected]> 2015-08-05 Christian Lohmaier <[email protected]> [68c46e7dbaf5cf34a5b5ccb80122801dad778bbe] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-5.0.3.2/helpcontent2/source/text/shared/01/01100200.xhp new/libreoffice-5.0.4.2/helpcontent2/source/text/shared/01/01100200.xhp --- old/libreoffice-5.0.3.2/helpcontent2/source/text/shared/01/01100200.xhp 2015-10-24 17:21:47.000000000 +0200 +++ new/libreoffice-5.0.4.2/helpcontent2/source/text/shared/01/01100200.xhp 2015-12-11 03:29:31.000000000 +0100 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <helpdocument version="1.0"> - + <!-- * This file is part of the LibreOffice project. * @@ -18,8 +18,8 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - - + + <meta> <topic id="textshared0101100200xml" indexer="include" status="PUBLISH"> <title xml-lang="en-US" id="tit">General</title> @@ -57,6 +57,7 @@ <paragraph xml-lang="en-US" id="par_id3153748" role="paragraph" l10n="U" oldref="8">Displays the date and time and author when the file was first saved.</paragraph> <paragraph xml-lang="en-US" id="hd_id3149182" role="heading" level="2" l10n="U" oldref="9">Modified:</paragraph> <paragraph xml-lang="en-US" id="par_id3150355" role="paragraph" l10n="U" oldref="10">Displays the date and time and author when the file was last saved in a $[officename] file format.</paragraph> +<bookmark xml-lang="en-US" branch="hid/sfx/ui/documentinfopage/signature" id="bm_id3149284" localize="false"/> <paragraph xml-lang="en-US" id="par_idN106C5" role="heading" level="2" l10n="NEW">Digitally signed:</paragraph> <paragraph xml-lang="en-US" id="par_idN106C9" role="paragraph" l10n="NEW">Displays the date and the time when the file was last signed as well as the name of the author who signed the document.</paragraph> <paragraph xml-lang="en-US" id="par_idN106CC" role="heading" level="2" l10n="NEW">Digital Signature</paragraph> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-5.0.3.2/helpcontent2/source/text/swriter/01/05040700.xhp new/libreoffice-5.0.4.2/helpcontent2/source/text/swriter/01/05040700.xhp --- old/libreoffice-5.0.3.2/helpcontent2/source/text/swriter/01/05040700.xhp 2015-10-24 17:21:47.000000000 +0200 +++ new/libreoffice-5.0.4.2/helpcontent2/source/text/swriter/01/05040700.xhp 2015-12-11 03:29:31.000000000 +0100 @@ -40,7 +40,6 @@ <section id="howtoget"> <embed href="text/swriter/00/00000405.xhp#fussendnoten"/> </section> - <paragraph xml-lang="en-US" role="note" id="par_id3149800" l10n="U" oldref="3">This tab is not available in <link href="text/swriter/01/03130000.xhp" name="Print Layout">Print Layout</link> view.</paragraph> <paragraph role="heading" level="2" id="hd_id3153538" l10n="U" xml-lang="en-US" oldref="4">Footnotes</paragraph> <bookmark branch="hid/modules/swriter/ui/footnotesendnotestabpage/ftnntattextend" xml-lang="en-US" id="bm_id3154572" localize="false"/><paragraph role="heading" level="3" id="hd_id3154480" l10n="U" xml-lang="en-US" oldref="5">Collect at end of text</paragraph> <paragraph l10n="U" role="paragraph" id="par_id3151309" xml-lang="en-US" oldref="11"><ahelp hid="modules/swriter/ui/footnotesendnotestabpage/ftnntattextend" visibility="visible">Adds footnotes at the end of the section. If the section spans more than one page, the footnotes are added to the bottom of the page on which the footnote anchors appear.</ahelp></paragraph> ++++++ libreoffice-translations-5.0.3.2.tar.xz -> libreoffice-translations-5.0.4.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-translations-5.0.3.2.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-translations-5.0.4.2.tar.xz differ: char 26, line 1
