df-libreoffice:libreoffice-3-5-7

Last commit made on 2012-10-03
Get this branch:
git clone -b libreoffice-3-5-7 https://git.launchpad.net/df-libreoffice
Members of The Document Foundation can upload to this branch. Log in for directions.

Branch merges

Branch information

Name:
libreoffice-3-5-7
Repository:
lp:df-libreoffice

Recent commits

789a2df... by Fridrich

bump product version to 3.5.7.2+, release number to 2

Change-Id: Id5e81fd989168b8bfe319947d7b17c8070a1327a

414599a... by Miklos Vajna <email address hidden>

rhbz#861680 fix crash on tables in substreams

Background: the old RTF filter in 3.4 supported tables in substreams
(headers, footers, etc), while 3.5.5 did not, so even if this is
technically a new feature, it got backported to -3-5. As the bugreport
states, this caused problems in the docx import. Instead of trying to
find out where was the problem (it's already fixed in -3-6 and master,
and I forgot how it happened), just disable this feature for DOCX, where
this never worked, so doing so does not cause any regression.

Change-Id: I39d486e3c69546519e232943f50675402b7bb595
Reviewed-by: Fridrich Strba <email address hidden>
Reviewed-on: https://gerrit.libreoffice.org/756
Reviewed-by: Michael Meeks <email address hidden>
Tested-by: Michael Meeks <email address hidden>
Reviewed-by: Norbert Thiebaud <email address hidden>

6ee9fc5... by Fridrich

bump product version to 3.5.7.1+, release number to 1

Change-Id: Ie8a6d4be2edced084e9ba7f1f3a0c7857378aca1

f266374... by Fridrich

Branch libreoffice-3-5-7

This is 'libreoffice-3-5-7' - the stable branch for the 3.5.7 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 3.5.x release,
please use the 'libreoffice-3-5' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I1a6089f9a57ca07530aaa14d8d9d2170bcc0107f

324ddd2... by Andras Timar <email address hidden>

fdo#54232 set encoding of Romanian MSI tables to UTF-8

Change-Id: I0604998e5019757c47050e4f94b1feb1b847cfca

Signed-off-by: Fridrich Štrba <email address hidden>

4c700df... by Lionel Elie Mamane

fdo#37529 clear DataColumns read-only information when we clear DataColumns

Change-Id: I6f3b4f1646df1244d97ae98f56ba054bc26e3314
(cherry picked from commit 522b4c65dcc90719288b4f7aa7eb565c15b64e86)

Signed-off-by: Miklos Vajna <email address hidden>

3d2a4ea... by Fridrich

Bin SAL_UNUSED_PARAMETER

Change-Id: Ieee86e5d024c650065e855a9213e2f7421493d17
Signed-off-by: Andras Timar <email address hidden>

8803f99... by Michael Stahl <email address hidden>

fdo#45700: sw ODF export: workaround corrupted table model:

do not export invalid table:number-columns-spanned="0"

(cherry picked from commit c45c64e3de51d9f56c9d9789729b6f7952547a61)

Conflicts:
 sw/source/filter/xml/xmltble.cxx

Change-Id: I7e286a9fcb6ed3df7222c83fe73e870e69561649
Reviewed-on: https://gerrit.libreoffice.org/613
Reviewed-by: Fridrich Strba <email address hidden>
Tested-by: Fridrich Strba <email address hidden>

bacceec... by Lionel Elie Mamane

fdo#44721 protect against negative calculated height value

Change-Id: I4faedd535421eaf1e3e425f4731b3bb8831e7360
Reviewed-on: https://gerrit.libreoffice.org/623
Reviewed-by: Fridrich Strba <email address hidden>
Tested-by: Fridrich Strba <email address hidden>

4fcdc54... by Michael Stahl <email address hidden>

fdo#49677: ODF export: always add xlink:type attribute

The xlink:type was optional on text:a and draw:a elements in ODF 1.1 but
is mandatory in ODF 1.2

Change-Id: Ifc7301ed1b0120d31a156751888dea1a55e952fe
(cherry picked from commit a27a6b68b7e4d2a4674b4de59fc487b17c7c9907)
Reviewed-on: https://gerrit.libreoffice.org/615
Reviewed-by: Fridrich Strba <email address hidden>
Tested-by: Fridrich Strba <email address hidden>