Conflicts:
	sc/inc/scabstdlg.hxx
	sc/source/ui/attrdlg/scdlgfact.cxx
	sc/source/ui/attrdlg/scdlgfact.hxx
	sc/source/ui/inc/hfedtdlg.hxx
	sc/source/ui/pagedlg/hfedtdlg.cxx

Change-Id: I6aa0f055f89c05c3d799b5ed1b21188f7f3a8268
Reviewed-on: https://gerrit.libreoffice.org/3911Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>

under certain conditions.

Reported by: Li Feng Wang
Patch and review by: Ma Bingbing and Armin Le Grand
(cherry picked from commit f425d556)

Conflicts:
	sd/source/filter/eppt/epptso.cxx

Change-Id: I7e610b754ff7215201bc1ac47d618869e4e8fe2b

Change-Id: Ic390ceeb9f52953d5dea6999b194956e90eb4629

Change-Id: Ibae79a962ef9d2ea6cf72b70df62c6fa170e05e9

Signed-off-by: Luboš Luňák <l.lunak@suse.cz>
https://gerrit.libreoffice.org/#/c/3892/

Change-Id: I12175a81f0a74546b5e00633176f204b9a3fb35c

Change-Id: I1091b4ff6b700513c7ef5ac41d94972dbb33dcb2

The definition of Auto_File_Libs_ALL was not known in
module_hidden_ooo.scp, so it was left unexpanded and the unattached
files were assigned to the gid_Module_Root.

Change-Id: Ie7064da6e02394261a47e88526c073941625dc8c

Change-Id: I4dcb563dc2368b7979df3da5e0691cd3633cb5a9

Change-Id: Id401feed7d629cbc0c24428b0c1273afdb31be89

Change-Id: I9037aa31cbb93d38a656ce463e0a73f8b39245ff

support for recursive STL containers is not required by the standard.
Boost TR1 containers allow them explicitly though but for some compiler/stl
combinations there are constness issues that prevent the default
assignment operator to work. Adding a small helper function solves
this problem in a clean way.
(cherry picked from commit 58d20429)

Conflicts:
	configmgr/source/partial.hxx

Change-Id: I301765e47db12f3b158d4525e896e090f4b81bbb

This reverts commit a94dc220.
This reverts commit 3baa1c8c.
This reverts commit 4e312f0c.
This reverts commit 050a51b6.
This reverts commit 9c2a1cb4.

It used to be mis-spelled PATH_SEPERATOR. Now, after correcting the spelling,
it breaks the build of 3rd-party libraries using autoconfigury on Windows. The
value of PATH_SEPARATOR is ";" on Windows, and the configure scripts of those
libs run in Cygwin and assume that a PATH_SEPARATOR environment variable
should be correct for Cygwin. Which ";" isn't.

Rename the variable to LIBO_PATH_SEPARATOR.

Change-Id: Iff0eb93bf11d9f844a28be7ea4456e4c0ae10844

Change-Id: Id5798c97d3dcfd997ce56f7a7ea72660c9b86c63

implementation for method <RtfAttributeOutput::WriteExpand(..)>

Found by: ej197us at gmail dot com
Patch by: yuanlin <yuanlin.ibm at gmail dot com>
Review by: Oliver <orw at apache dot org>
(cherry picked from commit 4536f0b9)

Conflicts:
	sw/source/filter/ww8/rtfattributeoutput.cxx

Change-Id: I1cde654dadd26e214a1c097fe2e0aeaa376195c2

Change-Id: I9a4fc068e522dd7129b66652c193626075b460bf

Change-Id: Ib4a18dafe4a0b5679e0a015f8208207ae482e720

Change-Id: I5d179ab3d8591bb01799dcb2b8eb6b5c2bd90110

Actually no testcase, as the export bug does not affect our import
filter. The problem was that we wrote SPRM's, which are properties of
floating tables, so once the user edited the resulting document in Word
and imported it back to Writer, frames around tables got created.  Fix
this by only writing floating table SPRM's for tables which are already
in a fly frame.

Regression from cbba191c.

Change-Id: Ifeae93100ca80dcde34fc79f69a91064d44ea8f4

Change-Id: Ie644af5866eadbee2a3d2840db37676d5c0bdc30

Change-Id: I5b2de61407924cdde5d74a7ea639365a876de74e

+ update the expected dumps together with that.

This allows testing of the other part (wrong text color and size, commit
55c63ccf) of n#758621 too.

Change-Id: Ie93feb9d9d05eb4e11106bf9aa1f237947351b4e

Fixes a regression from the pick-best-image from draw:frame in ODF,
where before sometimes the XShape got deleted that the
UnoInterfaceToUniqueIdentifierMapper::registerReference stored.

For that, added a
UnoInterfaceToUniqueIdentifierMapper::registerReferenceAlways
function, which overwrites potentially existing earlier entries
with the same identifier string.

This fix was originally much more messy, but then dtardon committed
30b248df which also fixes this here
bug. Now only sneaking in slightly less involved interface map
handling and a safeguard in ximpshap.cxx.

Change-Id: I87501e43518a5fc2fee166c45a4e2f01718f5228

This is already (identically) documented in the header file.

Change-Id: I4a10cb0c1d1b1eee80fd828ab95829fb8128433f

Align multiimagehelper with module standard.

Change-Id: I70a4dbc66a0d127b9bf04d1e8db694d3526b21d7

Change-Id: Ifc47c1422f035cb23a9a148510230c8dd2cf42cd

Change-Id: I260304559eec7b92add33a758623bc039c2e2d3a

by keeping it's storage and graphic stream.

Patch by: Clarence Guo, zhaoshzh
Review by: alg
Found by: Shan Zhu

(cherry picked from commit 0b71c735)

Conflicts:
	comphelper/inc/comphelper/embeddedobjectcontainer.hxx
	comphelper/source/container/embeddedobjectcontainer.cxx

Change-Id: I6ec172644806309d0f06f8522eb8a2adb45899ed

Change-Id: Ib7dffdb36d09d458e3c6089d1d0a16cd5ee63afd

See
http://lists.freedesktop.org/archives/libreoffice/2013-May/051706.html
for explanation.

Change-Id: Ieb7480f9f7a64a026abc985edde3ed932c1e8f56
Reviewed-on: https://gerrit.libreoffice.org/3908Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>

Change-Id: I1d0fd352cb0b500c64f86197b2510450b0f7d4ce

Have to pass AR=lib.exe and SED=sed.exe on the configure command line,
otherwise for some reason it doesn't know what archiver to use, and
thinks it can't find a sed that does not truncate output.

Change-Id: I1ce211119e62b6ecf6a2fc8fc89cdde2c7bb985a

Change-Id: I86caf96be62120e4bcebadb0083cd4dae1f5d8d1

Change-Id: Ibd12835cc5368080a302b3b8d7c6f52ccc434e3c

Change-Id: Ie0dae388769f9119f0d836abd87205eff17a03f1

Change-Id: Ia9f0e7196ce858e664e9a735ab55c34c5937bd1a

Change-Id: If5fe5af925bb2f8b7a5a11eb9d310668a3fd7085

Change-Id: I95402d81aef426de14ca928ea811aac6f1cd289d

Change-Id: I9f1c340562030bccbe0627ba9e91a56e1611b64e

Change-Id: I783b0fe54c6273ce3d78996a02da02dc51944606