[libreoffice] 08/09: new upstream 4.4.6 rc

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to tag libreoffice_4.4.6_rc3-0ubuntu1
in repository libreoffice.

commit 60ed8c13922e0d936bb6bfcba7241631dd12cd7b
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Fri Oct 16 12:09:06 2015 +0100

    new upstream 4.4.6 rc
---
 changelog                   |  7 ++++
 patches/pstatus-vector.diff | 86 ---------------------------------------------
 patches/series              |  1 -
 rules                       |  4 +--
 4 files changed, 9 insertions(+), 89 deletions(-)

diff --git a/changelog b/changelog
index 2b60c5a..705a147 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:4.4.6~rc2-0ubuntu1) vivid; urgency=medium
+
+  * new upstream rc
+  * remove obsolete patches
+
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Fri, 16 Oct 2015 12:06:28 +0100
+
 libreoffice (1:4.4.5~rc2-0ubuntu2) vivid; urgency=medium
 
   * add ww8 pstatus import fix
diff --git a/patches/pstatus-vector.diff b/patches/pstatus-vector.diff
deleted file mode 100644
index 8ea12e6..0000000
--- a/patches/pstatus-vector.diff
+++ /dev/null
@@ -1,86 +0,0 @@
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
-Date: Thu, 13 Aug 2015 10:58:06 +0100
-Subject: [PATCH] convert pStatus to vector and use at to check offsets
-
-(cherry picked from commit ea70088895ed45dc60abf18319acc1b4fa3018dd)
-
-Change-Id: I5186f6a65bb9d5ed8a0d1ab1d71f7e2c13865411
-Reviewed-on: https://gerrit.libreoffice.org/17695
-Reviewed-by: David Tardon <dtardon at redhat.com>
-Tested-by: David Tardon <dtardon at redhat.com>
----
- sw/source/filter/ww8/ww8scan.cxx | 18 +++++++++---------
- sw/source/filter/ww8/ww8scan.hxx |  4 ++--
- 2 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
---- a/sw/source/filter/ww8/ww8scan.cxx
-+++ b/sw/source/filter/ww8/ww8scan.cxx
-@@ -3972,7 +3972,7 @@ void WW8ReadSTTBF(bool bVer8, SvStream& rStrm, sal_uInt32 nStart, sal_Int32 nLen
- }
- 
- WW8PLCFx_Book::WW8PLCFx_Book(SvStream* pTblSt, const WW8Fib& rFib)
--    : WW8PLCFx(rFib.GetFIBVersion(), false), pStatus(0), nIsEnd(0), nBookmarkId(1)
-+    : WW8PLCFx(rFib.GetFIBVersion(), false), nIsEnd(0), nBookmarkId(1)
- {
-     if( !rFib.fcPlcfbkf || !rFib.lcbPlcfbkf || !rFib.fcPlcfbkl ||
-         !rFib.lcbPlcfbkl || !rFib.fcSttbfbkmk || !rFib.lcbSttbfbkmk )
-@@ -3997,14 +3997,12 @@ WW8PLCFx_Book::WW8PLCFx_Book(SvStream* pTblSt, const WW8Fib& rFib)
-             nIMax = pBook[0]->GetIMax();
-         if( pBook[1]->GetIMax() < nIMax )
-             nIMax = pBook[1]->GetIMax();
--        pStatus = new eBookStatus[ nIMax ];
--        memset( pStatus, 0, nIMax * sizeof( eBookStatus ) );
-+        aStatus.resize(nIMax);
-     }
- }
- 
- WW8PLCFx_Book::~WW8PLCFx_Book()
- {
--    delete[] pStatus;
-     delete pBook[1];
-     delete pBook[0];
- }
-@@ -4122,18 +4120,20 @@ long WW8PLCFx_Book::GetLen() const
-     return nNum;
- }
- 
--void WW8PLCFx_Book::SetStatus(sal_uInt16 nIndex, eBookStatus eStat )
-+void WW8PLCFx_Book::SetStatus(sal_uInt16 nIndex, eBookStatus eStat)
- {
--    OSL_ENSURE(nIndex < nIMax, "set status of non existing bookmark!");
--    pStatus[nIndex] = (eBookStatus)( pStatus[nIndex] | eStat );
-+    SAL_WARN_IF(nIndex >= nIMax, "sw.ww8",
-+                "bookmark index " << nIndex << " invalid");
-+    eBookStatus eStatus = aStatus.at(nIndex);
-+    aStatus[nIndex] = static_cast<eBookStatus>(eStatus | eStat);
- }
- 
- eBookStatus WW8PLCFx_Book::GetStatus() const
- {
--    if( !pStatus )
-+    if (aStatus.empty())
-         return BOOK_NORMAL;
-     long nEndIdx = GetHandle();
--    return ( nEndIdx < nIMax ) ? pStatus[nEndIdx] : BOOK_NORMAL;
-+    return ( nEndIdx < nIMax ) ? aStatus[nEndIdx] : BOOK_NORMAL;
- }
- 
- long WW8PLCFx_Book::GetHandle() const
-diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
---- a/sw/source/filter/ww8/ww8scan.hxx
-+++ b/sw/source/filter/ww8/ww8scan.hxx
-@@ -734,8 +734,8 @@ class WW8PLCFx_Book : public WW8PLCFx
- {
- private:
-     WW8PLCFspecial* pBook[2];           // Start and End Position
--    ::std::vector<OUString> aBookNames;   // Name
--    eBookStatus* pStatus;
-+    std::vector<OUString> aBookNames;   // Name
-+    std::vector<eBookStatus> aStatus;
-     long nIMax;                         // Number of Booknotes
-     sal_uInt16 nIsEnd;
-     sal_Int32 nBookmarkId; // counter incremented by GetUniqueBookmarkName.
--- 
-1.9.1
-
diff --git a/patches/series b/patches/series
index b3c3940..0968867 100644
--- a/patches/series
+++ b/patches/series
@@ -29,4 +29,3 @@ gcj-no-bitness-check.diff
 lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
 kubuntu_breeze-icons.diff
 mailmerge-base.diff
-pstatus-vector.diff
diff --git a/rules b/rules
index 3cf221b..c9df9c2 100755
--- a/rules
+++ b/rules
@@ -69,11 +69,11 @@ ifeq "$(USE_GIT_TARBALLS)" "y"
 GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
 # bootstraping this from the source tree is breaking get-orig-source
 #lo_sources_ver=$(shell grep AC_INIT $(SOURCE_TREE)/configure.ac | grep documentfoundation | cut -d, -f2 | sed -e 's,\[,,' -e 's,\],,')
-lo_sources_ver=4.4.5.2
+lo_sources_ver=4.4.6.2
 # NOT in proper libreoffice-3-6 branch
 # use ./g checkout -b tag-libreoffice-3.6.2.1 libreoffice-3.6.2.1
 GIT_TAG=libreoffice-$(lo_sources_ver)
-GIT_BRANCH=libreoffice-4-4-4
+GIT_BRANCH=libreoffice-4-4-6
 endif
 ifeq "$(USE_SOURCE_TARBALLS)" "y"
 lo_sources_ver=$(shell cat $(CURDIR)/sources.ver | cut -d= -f2)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git