since that is what the conversion in the other direction recognises.
It also recognises the "true"/"false" written by LibreOffice versions affected by fdo#68657

Change-Id: I213c23a19e4857905da93eeb2be1b9714215594a

Change-Id: I1b9dacea79b978384b61240bdecf83b9bd924a66
Reviewed-on: https://gerrit.libreoffice.org/6267Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>

- the whole module wont be loaded with --with-system-libpng because of the
  gb_Helper_optional thingie one level up

Change-Id: I885fedf82bdbb383a3caee343422dc79528838e0
Reviewed-on: https://gerrit.libreoffice.org/6266Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>

see http://nabble.documentfoundation.org/move-external-builds-into-subfolder-fdo-70393-td4078160.html for details

Change-Id: I5ebf3a6162a8f977d1ddf0d445f076afd53332e4
Reviewed-on: https://gerrit.libreoffice.org/6265Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>

Project: help  5158a5975dcc23ec1bb3dcd92fbfb5da03155596

Will be .uno:PrintPagePreview going forward.

Change-Id: Ie5a35467917a54a60dab9eaacf0690c9df27e6f6

Change-Id: I93cd8e27d5f16fe62a1434e3667fc7cc06c62e08

(cherry picked from commit 04b38114
 and adapted to the rewritten scanBuildPageChainCache)

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

Change-Id: Iebbb7e5200977e9c89cbd213cb78613d3d0f3ba4

Added icu.10318.CVE-2013-2924_changeset_34076.patch from
https://ssl.icu-project.org/trac/changeset/34076 assigned to
https://ssl.icu-project.org/trac/ticket/10318

Change-Id: I93a33e59aec9b79fb8d4b1517cd0990c79ee65fb

Change-Id: I81205ae7010ab776cd1880f779af2f623e290da9

Change-Id: I59317a0d591eac188fa01636031e907357038c29

Some libraries exist both in solver/*/lib and in their
UnpackedTarball/foo location.

Change-Id: Ie312479069738b27900bd4d7021ede986d94f22a

Change-Id: I014202fa48a211499b0290e6236bbdc96ad247a8

It seems that using libc++ when building with Xcode 4 (and iOS SDK 6)
you get linking errors. Stick to libstdc++ for now then with that.

Propagate the choice to the iOS Xcode projects through the lo.xcconfig
file.

Change-Id: Ic61dd2336066a77c4219c532106e3e50e85d0689

Change-Id: Ia7ce38ef07e6225ce785fab580343dfcd7ecb948

Change-Id: I196feb392f9ebebfdcd6f6e0ecd2c9cc89707cbb

Change-Id: Ia52da28fc6a979c4712fc191ab5e71c1926b0c93
Reviewed-on: https://gerrit.libreoffice.org/6231Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>

Change-Id: If0983696bf9a44bda6edeb746c121446106a95c5

Change-Id: I934158f892daf3ae36f265e6bc95fd9987a05ca5

Conflicts:
	sw/qa/extras/ooxmlimport/ooxmlimport.cxx

Change-Id: I7efd68fe21dddd7d9262d3e0b7400db67504e6bc

Change-Id: I828ab50e11546ba5f183e27dbff8ba87827bb426

Change-Id: I05ce7f66ca76345eabb660a12d9cd85a34ef55dd

Change-Id: I9a644a52146eb33248762c65c71fbd9a187490b7

Change-Id: I134944d8c4a1312f65ff7c3df98d8828bfc96b15

Change-Id: I58b6a1738c2039e863f1446cbfa17d1138523694

Change-Id: Ia08a0c8d4366bde572a7438ceff687f6028b066e

Change-Id: I89bbd213b7eddd5c55d4c8768929add326a63722

(cherry picked from commit 6f969437)

Conflicts:
	readlicense_oo/docs/readme/readme.xrm

Change-Id: Idfa47f97ad84ad5b3bb9414ee9e3b89e693501f6

Despite it's name, rProperties, the Sequence is not a reference in the
function signature.

Besides, some small improvements:

- instead of compareToAscii, use operator==, which is  optimized for
performance
(cherry picked from commit a17e2212)

Conflicts:
	cui/source/options/optsave.cxx

Change-Id: Ifffd2b9014210c885f03ff8116ea97625b903cba

(cherry picked from commit 2fc5d294)

Conflicts:
	svx/inc/svx/fillctrl.hxx
	svx/source/tbxctrls/fillctrl.cxx

Change-Id: I3be23f7ec199c49beb7c5cecfb835977e2bedcea

Change-Id: I158c171d39756d1949427b3a45d685a194d9fb63

...what apparently happened is:

(1) First, 2c6363eb "Be less pathetic" replaced
    MediaDescriptor::impl_normalizeURL with removeFragment.

(2) Then, b378e754 "CMIS: fix file saving issue"
    (plus follow-up b50d3727 "WaE: unused
    function 'removeFragment'") removed calling removeFragment at all (but re-
    introduced a now bogus "Parse URL! ..." comment that (1) had removed), which

(3) 34f4d257 "CMIS file picker: it really does
    not like ID Mark" tried to revert again (but kept the bogus comment in), and

(4) odd commit 319b1603 "CMIS file picker: it
    really does not like ID Mark" (that looks like a merge conflict resolution
    gone wrong) erroneously re-introduced MediaDescriptor::impl_normalizeURL
    that (1) had removed, which caused a -Wunused-variable warning that

(5) 706c5a54 "-Werror,-Wunused-variable" tried
    to fix, but working under wrong assumptions.

The solution is to go effectively back to the code as it was after (1).

Change-Id: I62dfa9fa3adbea6b2cb10a509416fe3797c577b9

"logical not is only applied to the left hand side of this comparison"

Change-Id: I015befe47ea9f40f83217b259e07eb01edb7d820

Change-Id: Ida2d2bab3a30beaa8e686a23355e4d6f41182f3f
Reviewed-on: https://gerrit.libreoffice.org/6257Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>

Added the possibility of rendering the basic shapes generated for a
Smart-Art into a bitmap and replacing them with it in order to not
letting to edit the Smart-Art. This possibility is controlled using a
configuration parameter located at Options -> Load/Save -> MS Office
-> SmartArt to LibreOffice shapes or reverse.

Made the "oox" library to depend on the "drawinglayer" and "svx"
libraries.

Made the "ooxmlexport" C++ unit tests in the "sw" module to depend on
the "drawinglayer" and "svx" components.

Fixed to set to diagram type a new "oox::drawingml::Shape"
representing a Smart-Art in the "getShape" method of the
"oox::shape::ShapeContextHandler" class.

Added the "keepDiagramCompatibilityInfo" and "renderDiagramToGraphic"
protected methods to the "oox::drawingml::Shape"
class. "keepDiagramCompatibilityInfo" is now called after an instance
of type "FRAMETYPE_DIAGRAM" has added all its children in the
"addShape" method and the proper setting is in place.

"keepDiagramCompatibilityInfo" substitutes previous similar code in
the "createAndInsert" method and also calls "renderDiagramToGraphic".

The "renderDiagramToGraphic" renders the basic shapes in a Smart-Art
into a PNG image and replaces these basic shapes with a new
"GraphicObjectShape" filled with the new PNG image. It also sets the
"MoveProtect" and "SizeProtect" properties of the
"GraphicObjectShape".

Change-Id: Ie4002238ff5fae758a5881b03735bf1f0721ed5b
Reviewed-on: https://gerrit.libreoffice.org/6059Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>

The point of this menu option is that locked Smart-Art shapes would
preserve the original XML files attached so they could be exported
back to docx with no loss.

The new menu option is located at Options -> Load/Save -> MS Office ->
SmartArt to LibreOffice shapes or reverse.

Change-Id: I6aafc2eb83404ee2c0b8538b2f6fbbbd4363e7d3
Reviewed-on: https://gerrit.libreoffice.org/6138Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>

The "ooxmlexport" unit test for Smart-Art has been updated to just
check for the new rendered bitmap that substitutes the generated basic
shapes.

The "ooxmlimport" has been updated with a new "testSmartart" unit
tests which checks that the importing has been done to just basic
shapes.

For this, the "run" method has been customized so we can set the
proper filter option.

Slightly modified the expected results in the "testChartProp" unit
test since linking it to additional libraries has modified the
dimmensions of the imported chart in few units.

Made the "ooxmlimport" C++ unit tests in the "sw" module to depend on
the "drawinglayer" and "svx" components and the "utl" library.

Conflicts:
	sw/qa/extras/ooxmlimport/ooxmlimport.cxx

Change-Id: I0900a50cfee07999511d071bc9932477ad9430c5

An extra InsertEntry method is added with parameters to enable or disable the
load and save checkboxes independently.

Change-Id: I49233ce31e2eaf361310f89887dcede86dec0edc
Reviewed-on: https://gerrit.libreoffice.org/6137Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>

Problem Description: In case of multicolumn sections, separator line was getting added during export to docx.
Unit test cases added to verify the code changes.

Change-Id: Id65ac4d3878eed298882c85082cec9575f914d83
Reviewed-on: https://gerrit.libreoffice.org/6211Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>