Change-Id: Ia40d037d7af6cd3a283aa12948e4c5565dcb2ae6
(cherry picked from commit cbea6a70)
Reviewed-on: https://gerrit.libreoffice.org/17292Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>

Change-Id: Id9cd7fbe9e433005cc27b2e8e3417a5e289b94e3
(cherry picked from commit b1760dc3)
Reviewed-on: https://gerrit.libreoffice.org/17302Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>

Change-Id: I6621d528e297ea91d7546a17918285a4f0793baa

This is an odd-one; lots of details in the bug.

Change-Id: I287945eba965cc637642e9226c7fe7f2a0754130
Reviewed-on: https://gerrit.libreoffice.org/17274Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>

regression from

commit bf586deb
Author: Matteo Casalin <matteo.casalin@yahoo.com>
Date:   Sat Feb 21 12:38:54 2015 +0100

    Simplify

Change-Id: I09f83b2bab053fcd48fe1a1a4184cc11a4f9d663
(cherry picked from commit 8a01693c)
Reviewed-on: https://gerrit.libreoffice.org/17233Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>

Change-Id: Ia475ce737c430fab8d019e1b8a762f81897e0847
Reviewed-on: https://gerrit.libreoffice.org/17260Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>

Change-Id: I64e77f12cb016a7f4a9d21c732aaeaae7959da76
(cherry picked from commit 34d06214)
Reviewed-on: https://gerrit.libreoffice.org/17257Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>

As a po file, Slovenian translation was in git in time, but not
in the requested AutoCorrect XML.

Change-Id: I6387ff6388963c1f020c7a82e721fd103153bbea
Reviewed-on: https://gerrit.libreoffice.org/17246Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>

Change-Id: I427da08eed3fc5daed2bac4d588b66a3f03fd28c
(cherry picked from commit 2fd3560e)
Reviewed-on: https://gerrit.libreoffice.org/17244Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>

It was checked if the flag says it's not dirty.
Thanks to Varun Dhall for pointing to this problem.

(cherry picked from commit 0a91e08a)

Change-Id: I4aa1fef8b2251f0f3e579930b39d6d5a256c1895
Reviewed-on: https://gerrit.libreoffice.org/17243Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>

When exporting ooo67907-1.doc we get ~SwIndexReg assert because there's
a frame anchored in a redline, and the SwPosition in the sw::Frame for
it is invalidated during SetRedlineMode because the node it points to is
deleted.  Add another horrible workaround to the redline trainwreck.

Change-Id: Ia9b2393c77f42502862daaa30fd54eb3b040a214
(cherry picked from commit ab706f85)
Reviewed-on: https://gerrit.libreoffice.org/17231Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

Turns out that 84ea33ef did not actually
fix the problem; it was merely good enough to fool the asserts in
FastSaxSerializer that were not yet adapted to the funky maMarkStack.

The problem is that the StartRuby()/EndRuby() call StartRun()/EndRun()
and that really messes up the mark stack.  Prevent that by first ending
the run before starting new one in StartRuby(), and then starting a new
run after ending the ruby-base one in EndRuby().

The hints handled in SwWW8AttrIter::OutAttrWithRange() are sorted in the
right way for this to work (i.e. the EndRuby() will be the last call for
any given position).

This apparently causes an additional <w:r/> empty element to be written,
not sure if that causes any issues but at least the output is
well-formed for fdo82849-1.odt.

Change-Id: I28ffd029246310ff0e405b0674aef8e724700d4d
(cherry picked from commit c2c51fa5)
Reviewed-on: https://gerrit.libreoffice.org/17230Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

Change-Id: I4a8e78231befff498894ec92a1f38af206e13129
(cherry picked from commit 97a0e755)
Reviewed-on: https://gerrit.libreoffice.org/17232Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

Change-Id: I7215cf8d8b1e4a4156c87507018de3c2b7ed08d8
(cherry picked from commit 8eaef6b5)
Reviewed-on: https://gerrit.libreoffice.org/17219Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

Apparently there may have been situations when the caption or its shape
could not be obtained for whatever reason.

Change-Id: Ie9b97d4b3999cb4645bb6b8b688b3666cfd71ccc
(cherry picked from commit 47d90af5)
Reviewed-on: https://gerrit.libreoffice.org/17220Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

Change-Id: I999012d428fa84e21fe9e9f851a016eacc96a686
(cherry picked from commit 6964f67d)
Reviewed-on: https://gerrit.libreoffice.org/17217Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

Change-Id: I318385286fcc27ffb2d938237d83e793564d2525
(cherry picked from commit c02e7987)
Reviewed-on: https://gerrit.libreoffice.org/17214Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

Change-Id: If119628d7f510a7db30ed2180111063781cde887
(cherry picked from commit 33d43205)
Reviewed-on: https://gerrit.libreoffice.org/17210Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

(cherry picked from commit 5fa73031)

Conflicts:
	filter/source/graphicfilter/ipict/ipict.cxx

add a test image

(cherry picked from commit 3f0677b8)

Change-Id: I6809ef52c462958eed2329fe2d32b5cbc691194c
Reviewed-on: https://gerrit.libreoffice.org/17203Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

Change-Id: I9213bb2cc059e05e286598edac03bd72c84db876
(cherry picked from commit dcbbe774)
Reviewed-on: https://gerrit.libreoffice.org/17212Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>

Change-Id: Id3f6fdc0ebed9711acec5d71f404e7a6072b765c
(cherry picked from commit bca4d6f8)
Reviewed-on: https://gerrit.libreoffice.org/17207Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>

Change-Id: I86e4e94392527b5faf5d9cdb4251853f35813f4e
(cherry picked from commit 5d32a4ac)
Reviewed-on: https://gerrit.libreoffice.org/17204Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>

(cherry picked from commit d9b2105e)

Change-Id: Icd081c38de1374c6bfd6fb04d7765e07ff5d1aff
Reviewed-on: https://gerrit.libreoffice.org/17196Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>

Change-Id: Ic707f4407bb3aef5f2a7b9d13a0340c6d9afb3fe
(cherry picked from commit 9f75bad2)
Reviewed-on: https://gerrit.libreoffice.org/17178Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>

Newly added property Office::Common::StylesAndFormatting::Preview
can now be used to turn off "Style And Formatting" style preview.

Change-Id: I2e01de2a74e2d295557c87022a7b745ce23b4800
(cherry picked from commit 210f42a3)
Reviewed-on: https://gerrit.libreoffice.org/17177Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>

Change-Id: I481bf3295feb64827de2122234a9300d0b8ced40
(cherry picked from commit 3e17ed1f)
Reviewed-on: https://gerrit.libreoffice.org/17172Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>

so accept that and test if the values were accepted or limited

Change-Id: I599cf8065a6f8786d380fdba03135857766770f3
(cherry picked from commit 80c591ea)
Reviewed-on: https://gerrit.libreoffice.org/17197Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

Change-Id: Id16ae9325f3c67792941b9c88d83435aa98282ca
(cherry picked from commit be4e1141)
Reviewed-on: https://gerrit.libreoffice.org/17199Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

Change-Id: I0fb61954b2eaf0c015d7bdefe9f03bd459b31501
(cherry picked from commit fcdddbd3)
Reviewed-on: https://gerrit.libreoffice.org/17201Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

Change-Id: I4a126f40589fd401f3a63f74be5e86e3df947ef6
(cherry picked from commit 33255f97)
Reviewed-on: https://gerrit.libreoffice.org/17136Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>

Change-Id: I5d57f715edbadc7fef5c508cae7e98bcde0e4e5c
(cherry picked from commit edaacb62)
Reviewed-on: https://gerrit.libreoffice.org/17169Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>

The new mime types were added the followings:
   - eps -> image/x-eps
   - wmf -> image/x-wmf
   - bmp -> image/bmp
   - pct -> image/x-pct
These new mime types are written in the attribute "media-type"
of each image in the file "manifest.xml"

Change-Id: I16edb625e331d3f917c6e8929df004191e317acc
Reviewed-on: https://gerrit.libreoffice.org/17123Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 4d84153e)

svx: this was supposed to be "image/x-eps"

Change-Id: Ieb9d7f23a0ef1e4546c488a678dbfde085156216
(cherry picked from commit 5351f621)
Signed-off-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>

(cherry picked from commit 094f894b)

Change-Id: I7cdcdcbbbbdc4ba44b3fb8014f93cc522b61f5fc

regression from dcad3ac4

    coverity#1242624 Untrusted loop bound

    Change-Id: Idf52c09828c2bab767e9ff0d07b61befd6bfc64b

The original code read 8 bytes on the nElemSizeVert == 8
branch and always 4 otherwise. I assumed that nElemSizeVert had
to be read as 4 on that branch, but apparently not. So if its
not 4, set it to 4 and we get the same behaviour as originally
and continue to ensure we bounds check the loop

Change-Id: Ica8ab7cc3bbebee93216766a2e1279a579494840
(cherry picked from commit b3cd47bd)
Reviewed-on: https://gerrit.libreoffice.org/17134Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>

Change-Id: I1652244d5515629f1cd8f15f4c5b15f139dba0aa
(cherry picked from commit 6a1f3189)
Reviewed-on: https://gerrit.libreoffice.org/17158Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

Change-Id: I1483ea3671420be53496888892374641e10b344d
(cherry picked from commit feedb957)
Reviewed-on: https://gerrit.libreoffice.org/17151Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

Change-Id: I638792417924bcb8e48995f4e789f84a2cbf4757
(cherry picked from commit c9ba7a2a)
Reviewed-on: https://gerrit.libreoffice.org/17157Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

Change-Id: I950f751277d9080b4fc00c38f63453cce81bcc32
(cherry picked from commit 49bf2c67)
Reviewed-on: https://gerrit.libreoffice.org/17154Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

Change-Id: I27645566cd9fc0ac8cf753f0217ae6cf0fa9929e
(cherry picked from commit 290465b0)
Reviewed-on: https://gerrit.libreoffice.org/17149Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

Change-Id: Icb82d9dd0a3918f2bdc4cb768c566774cd0d8ac4
(cherry picked from commit bf02304a)
Reviewed-on: https://gerrit.libreoffice.org/17132Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>