diff --git a/.gitignore b/.gitignore index 8e02adc..fc14745 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,6 @@ /libreoffice-4.4.1.2.tar.xz /libreoffice-help-4.4.1.2.tar.xz /libreoffice-translations-4.4.1.2.tar.xz +/libreoffice-4.4.2.1.tar.xz +/libreoffice-help-4.4.2.1.tar.xz +/libreoffice-translations-4.4.2.1.tar.xz diff --git a/0001-Resolves-rhbz-1193971-clear-hard-coded-char-props-in.patch b/0001-Resolves-rhbz-1193971-clear-hard-coded-char-props-in.patch deleted file mode 100644 index ca064c2..0000000 --- a/0001-Resolves-rhbz-1193971-clear-hard-coded-char-props-in.patch +++ /dev/null @@ -1,128 +0,0 @@ -From af05bc34c64d20e4936735b3506e9533623dac7d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Wed, 18 Feb 2015 15:04:45 +0000 -Subject: [PATCH] Resolves: rhbz#1193971 clear hard-coded char props in table - cells... -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -like we do already for shapes. So now when attempting to set replacement char -properties on the entire cell, clear any hard-coded sub ranges within the -existing paragraphs. - -This extends the effort of -commit a217f3cb2dce71a4322f78ceb45edb6f171b2b65 -Author: Matúš Kukan -Date: Tue Aug 26 10:16:34 2014 +0200 - - bnc#770711: Make changing table text color in impress always work - -to encompass all character properties, not just color - -Change-Id: If8b426c3531b4678868d8351426db32c3c558650 -(cherry picked from commit b14259b946686c753c0df42c519fc2537e871601) ---- - svx/source/svdraw/svdedtv1.cxx | 38 ++++++++++++++++++++++---------------- - svx/source/table/cell.cxx | 15 +++++++++++++-- - 2 files changed, 35 insertions(+), 18 deletions(-) - -diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx -index 1ba5f40..62c4cff 100644 ---- a/svx/source/svdraw/svdedtv1.cxx -+++ b/svx/source/svdraw/svdedtv1.cxx -@@ -953,6 +953,26 @@ void SdrEditView::MergeAttrFromMarked(SfxItemSet& rAttr, bool bOnlyHardAttr) con - } - } - -+std::vector GetAllCharPropIds(const SfxItemSet& rSet) -+{ -+ std::vector aCharWhichIds; -+ { -+ SfxItemIter aIter(rSet); -+ const SfxPoolItem* pItem=aIter.FirstItem(); -+ while (pItem!=NULL) -+ { -+ if (!IsInvalidItem(pItem)) -+ { -+ sal_uInt16 nWhich = pItem->Which(); -+ if (nWhich>=EE_CHAR_START && nWhich<=EE_CHAR_END) -+ aCharWhichIds.push_back( nWhich ); -+ } -+ pItem=aIter.NextItem(); -+ } -+ } -+ return aCharWhichIds; -+} -+ - void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, bool bReplaceAll) - { - if (AreObjectsMarked()) -@@ -977,25 +997,11 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, bool bReplaceAll) - } - #endif - -- // #103836# if the user thets character attributes to the complete shape, -+ // #103836# if the user sets character attributes to the complete shape, - // we want to remove all hard set character attributes with same - // which ids from the text. We do that later but here we remember - // all character attribute which id's that are set. -- std::vector aCharWhichIds; -- { -- SfxItemIter aIter(rAttr); -- const SfxPoolItem* pItem=aIter.FirstItem(); -- while( pItem!=NULL ) -- { -- if (!IsInvalidItem(pItem)) -- { -- sal_uInt16 nWhich = pItem->Which(); -- if (nWhich>=EE_CHAR_START && nWhich<=EE_CHAR_END) -- aCharWhichIds.push_back( nWhich ); -- } -- pItem=aIter.NextItem(); -- } -- } -+ std::vector aCharWhichIds(GetAllCharPropIds(rAttr)); - - // To make Undo reconstruct text attributes correctly after Format.Standard - bool bHasEEItems=SearchOutlinerItems(rAttr,bReplaceAll); -diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx -index e81370c..3468283 100644 ---- a/svx/source/table/cell.cxx -+++ b/svx/source/table/cell.cxx -@@ -139,6 +139,8 @@ SdrText* CellTextProvider::getText(sal_Int32 nIndex) const - - } - -+extern std::vector GetAllCharPropIds(const SfxItemSet& rSet); -+ - namespace sdr - { - namespace properties -@@ -261,12 +263,21 @@ namespace sdr - - sal_Int32 nParaCount(pOutliner->GetParagraphCount()); - -+ // if the user sets character attributes to the complete -+ // cell we want to remove all hard set character attributes -+ // with same which ids from the text -+ std::vector aCharWhichIds(GetAllCharPropIds(rSet)); -+ - for(sal_Int32 nPara = 0; nPara < nParaCount; nPara++) - { - SfxItemSet aSet(pOutliner->GetParaAttribs(nPara)); - aSet.Put(rSet); -- if (aSet.GetItemState(EE_CHAR_COLOR, false) == SfxItemState::SET) -- pOutliner->RemoveCharAttribs( nPara, EE_CHAR_COLOR ); -+ -+ for (std::vector::const_iterator aI = aCharWhichIds.begin(); aI != aCharWhichIds.end(); ++aI) -+ { -+ pOutliner->RemoveCharAttribs(nPara, *aI); -+ } -+ - pOutliner->SetParaAttribs(nPara, aSet); - } - --- -1.9.3 - diff --git a/0001-fix-linker-error.patch b/0001-fix-linker-error.patch deleted file mode 100644 index 9e22918..0000000 --- a/0001-fix-linker-error.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 63a5f3804578dc185a88b7f88cdbdfc53dde02b4 Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Wed, 11 Feb 2015 22:56:53 +0100 -Subject: [PATCH] fix linker error - -/builddir/build/BUILD/libreoffice-4.4.1.1/workdir/CxxObject/svtools/source/misc/imageresourceaccess.o: In function `com::sun::star::uno::Reference::Reference(com::sun::star::io::XOutputStream*)': -/builddir/build/BUILD/libreoffice-4.4.1.1/include/com/sun/star/uno/Reference.hxx:137: undefined reference to `non-virtual thunk to utl::OSeekableOutputStreamWrapper::acquire()' - -Change-Id: Ic644a8299cf2f79f02c1e3ca0de9687520f402a9 ---- - include/unotools/streamwrap.hxx | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/include/unotools/streamwrap.hxx b/include/unotools/streamwrap.hxx -index e8027ce..8efc227 100644 ---- a/include/unotools/streamwrap.hxx -+++ b/include/unotools/streamwrap.hxx -@@ -123,12 +123,12 @@ typedef ::cppu::ImplHelper1 < css::io::XSeekable - /** helper class for wrapping an SvStream into an com.sun.star.io::XOutputStream - which is seekable (i.e. supports the com.sun.star.io::XSeekable interface). - */ --class OSeekableOutputStreamWrapper -+class UNOTOOLS_DLLPUBLIC OSeekableOutputStreamWrapper - :public OOutputStreamWrapper - ,public OSeekableOutputStreamWrapper_Base - { - public: -- UNOTOOLS_DLLPUBLIC OSeekableOutputStreamWrapper(SvStream& _rStream); -+ OSeekableOutputStreamWrapper(SvStream& _rStream); - - private: - virtual ~OSeekableOutputStreamWrapper(); --- -2.1.0 - diff --git a/libreoffice.spec b/libreoffice.spec index 3157694..b2d49e3 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1,5 +1,5 @@ # download path contains version without the last (fourth) digit -%define libo_version 4.4.1 +%define libo_version 4.4.2 # Should contain .alphaX / .betaX, if this is pre-release (actually # pre-RC) version. The pre-release string is part of tarball file names, # so we need a way to define it easily at one place. @@ -45,7 +45,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 -Version: %{libo_version}.2 +Version: %{libo_version}.1 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 and CC0 Group: Applications/Productivity @@ -324,8 +324,6 @@ Patch17: 0001-Resolves-fdo-37559-revert-adding-extra-dummy-polygon.patch Patch18: 0001-radio-check-top-center-bottom-alignment-for-table-ce.patch Patch19: 0001-allow-comparing-documents-which-only-differ-by-frame.patch Patch20: 0001-Use-the-same-advanced-Ellipse-and-Rectangle-shapes-i.patch -Patch21: 0001-fix-linker-error.patch -Patch22: 0001-Resolves-rhbz-1193971-clear-hard-coded-char-props-in.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/libreoffice @@ -2353,6 +2351,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog +* Thu Mar 12 2015 David Tardon - 1:4.4.2.1-1 +- update to 4.2.2 rc1 + * Mon Feb 23 2015 David Tardon - 1:4.4.1.2-1 - update to 4.4.1 rc2 diff --git a/sources b/sources index e06442b..0bca8e3 100644 --- a/sources +++ b/sources @@ -7,6 +7,6 @@ a7983f859eafb2677d7ff386a023bc40 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2. 0168229624cfac409e766913506961a8 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz 12fb8b5b0d5132726e57b9b9fc7e22c4 libreoffice-multiliblauncher.sh 4b87018f7fff1d054939d19920b751a0 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 -4c7b5a8a37cb883382778a95604180cf libreoffice-4.4.1.2.tar.xz -c59c5680716e147ade109e3544f892f4 libreoffice-help-4.4.1.2.tar.xz -85c9224cc524b8882e98568e4e7acf3a libreoffice-translations-4.4.1.2.tar.xz +95a3c794f4c6e17d6ced1bd2be414568 libreoffice-4.4.2.1.tar.xz +291b5bef617ac3af1d46f8c1c13f67c8 libreoffice-help-4.4.2.1.tar.xz +d528a5b5d10162f38775ee408f35a587 libreoffice-translations-4.4.2.1.tar.xz