Change-Id: Ib316bf40bb9b9afeb5fbdf9281f2d3b9539e346f

Change-Id: Ib9b3a63ad48ab9a8c109a97f4053c0fc4aca8a28
Reviewed-on: https://gerrit.libreoffice.org/3591Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>

This is a cherry-pick of 6374df20.

Credit goes to Isamu Mogi for pin-pointing exactly what caused the crash
and which commit fixed it on master.

Change-Id: Ic5653c76c8c7d8eb8798a9c4ae0cbc43f0e946e4
Reviewed-on: https://gerrit.libreoffice.org/3581Reviewed-by: Eike Rathke <erack@redhat.com>
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>

Includes following master commits:

commit 6536d0eb
Author: Lionel Elie Mamane <lionel@mamane.lu>
Date:   Tue Apr 23 06:44:57 2013 +0200

    reword comment

commit 5143e162
Author: Lionel Elie Mamane <lionel@mamane.lu>
Date:   Tue Apr 23 06:44:42 2013 +0200

    isEmpty() instead of getLength()==0

commit f0c38b63
Author: Olivier Ploton <olivier.ploton@univ-tours.fr>
Date:   Wed Dec 12 22:04:38 2012 +0100

    Base: fix incorrect field removal in criterion inside query design view

Change-Id: I2fedae672c24a269fca3dfc1bacc66fd53fc61af
Signed-off-by: Miklos Vajna <vmiklos@suse.cz>

Apply the table-cell-style to paragraphs inside the table cell
for cells with value-type="string" and office:string-value attribute.
This should complete commit 1b5839f4.

Change-Id: Ief34de1e7c5087906ea597ce3ca96e020f6eebe6
(cherry picked from commit 84217e29)
Reviewed-on: https://gerrit.libreoffice.org/3575Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>

(cherry picked from commit 4757ffcc)

Conflicts:
	libcdr/ExternalProject_libcdr.mk

Change-Id: Icdf57cb8a40256b4a474ededd3ba030bd79497f4

Trying to fix a boost::property_tree::json_parser error on windows

(cherry picked from commit 41d2b58b)

Conflicts:
	boost/UnpackedTarball_boost.mk

Change-Id: Iea3ec9a56eb008c6a0729a151b392f1e62925720

Trying to avoid linking with boost on Windows

Change-Id: Ic0c538dfad88f850d95f417f2741ef7dba7fc5e4
(cherry picked from commit 1e392ea7)
Reviewed-on: https://gerrit.libreoffice.org/3559Reviewed-by: Michael Meeks <michael.meeks@suse.com>
Tested-by: Michael Meeks <michael.meeks@suse.com>

(cherry picked from commit aa1aedb2)
Conflicts:
	vcl/inc/unx/salinst.h
	vcl/unx/generic/dtrans/X11_service.cxx

Change-Id: Ifc8275276811ba24b62f93096e7cb98a5dbf658c
Reviewed-on: https://gerrit.libreoffice.org/3556Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>

Change-Id: I4e3cf644d8a6e6989f79a6758ad3d55972fc82b1

Previouslly there were some internal methods to allow event handlers
to be triggered. To test some functionality from the unit tests we
now expose some of that functionality via uno.

Change-Id: I11022226260d3dacd82f42ce89413102ce34cc13

Change-Id: Id9aa26cac2f59829e8b00057c82dc52bbbbc20cb

<sigh> pagebreak implementation is still flawed here, the used
range is used to determine whether the page break should be
considered ( or not ) Problem is that it is not the used
range but rather the rightmost column position that contains content
( but not necessarily the column that contains content but rather
the righmost column that has content ( or even that is covered either
by spillover from an adjacent column or drawing )

Change-Id: I68c8ccc5911049bc4b2076992f839bc684d966a9

At some point in the past default tab was introduced, the VBA Range code calling
ScRangeList::Parse was not adjusted to take care of this extra defaulted param and
and the delimiter param was passed in place of default tab.

Change-Id: I45a971f7ad9cb4f3299fae8cb1882cb0e7744c3b

This reverts commit 7c63d525.

Change-Id: I02ab972cfad577423585d25587b925b5b1153506
(cherry picked from commit ad576643)
Reviewed-on: https://gerrit.libreoffice.org/3551Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>

Regression from 3d7e168a.

(cherry picked from commit a88ac708)

Change-Id: I9ab3f9f41316a01d5a74f3e500bad7a83c8d2dca
Reviewed-on: https://gerrit.libreoffice.org/3485Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
Tested-by: Luboš Luňák <l.lunak@suse.cz>

The test to determine JAVA_OPTIONS was already cheesy (e.g., it does not catch
java-1.7.0-openjdk-1.7.0.9-2.3.8.0.fc18.x86_64, as there "java -version" outputs
"OpenJDK 64-Bit Server VM (build 23.7-b01, mixed mode)" with "64-Bit" in the
second instead of the third field), so make it a bit more cheesy still (i.e.,
just cover the case to not set -d32 for x86_64).

Change-Id: Ib10a16fb3f8104875bfda7de0e8bce59b9c3b06a
(cherry picked from commit 391477d4)
Reviewed-on: https://gerrit.libreoffice.org/3480Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>

Change-Id: I01eff3bb8b194e1437a263e527cb8e6d2defa4de
Reviewed-on: https://gerrit.libreoffice.org/3458Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>

These were apparently accidentally disabled on all non-WNT platforms.
Set the OPT variable from the outside on the platform that needs it.
(regression from ab41efc81ec26fcbd4cdeb9c36fbe8cc274523f)

Change-Id: Ifbf7ec8e0f863cb6368758571496c8b615e3e814
(cherry picked from commit 38232ea1)
Reviewed-on: https://gerrit.libreoffice.org/3472Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>

(cherry picked from commits 3d4fef85 and
08dc5de9)

Change-Id: I33f5c8a856206860ac9cdb23dd6b5222cb785bf7
Reviewed-on: https://gerrit.libreoffice.org/3461Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>

...otherwise preload.cxx in juh.dll will not be able to find them
via osl_getFunctionSymbol.  What apparently happens is that JNICALL expanding
to __stdcall decorates symbol names with _...@NN.  This likely was hidden in
pre-gbuild times thanks to the use of def files.  (On a side note, the JVM
appears to contain special code to find syms for native methods in both
decorated and undecorated form; that explains why it picks up the decorated
symbols from juh.dll just fine.)

There is no need for the functions in juhx.dll (called from the juh.dll wrapper)
to adhere to JNICALL (in fact, things would likely be easier to maintain if the
juhx.dll functions also used different names than their juh.dll wrappers).
However, what complicates this patch is that for DISABLE_DYNLOADING, the juh
wrapper and its preload.cxx is elided, and the code that would normally go into
the juhx library goes into the juh library (and thus needs to stick to JNICALL,
and also needs to use the right function names).

(cherry picked from commit 96488510)
Conflicts:
	javaunohelper/source/bootstrap.cxx
	javaunohelper/source/javaunohelper.cxx
	javaunohelper/source/preload.cxx

Change-Id: I66611648f1f79f57f0c1b23fb7a801da2d7b86c5
Reviewed-on: https://gerrit.libreoffice.org/3455Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>

(cherry picked from commit e46564a0, plus
63b4633c "Related: rhbz#867808 if one person
threw by pointer..." and 336353a8 "Related
rhbz#867808: More apparently bogus 'throw new ...' in C++ code")
Signed-off-by: Petr Mladek <pmladek@suse.cz>

Conflicts:
	bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
	bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
	sdext/source/presenter/PresenterController.cxx
	stoc/source/registry_tdprovider/functiondescription.cxx
	stoc/source/registry_tdprovider/methoddescription.cxx
	toolkit/source/awt/vclxwindow1.cxx

Change-Id: I22b7d3d642e7ee0488d6b726a331d328065bbee7
Reviewed-on: https://gerrit.libreoffice.org/3418Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Signed-off-by: Petr Mladek <pmladek@suse.cz>

when trying to parse empty lines looking for the matching
bracket

Change-Id: I3961a3d0e804d136de286e21934c6ba5ab0496cf
(cherry picked from commit 02917cb5)
Reviewed-on: https://gerrit.libreoffice.org/3414Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>

It is not needed at runtime. I tried to reuse the cli_basetypes config file
but it caused a race condition and random build failures.

Change-Id: I83c963a70701006b48510d26f0301607f128fafa

Change-Id: If931617e648310aef4ecb41030ec5d17ebcbf3ce

Change-Id: Ie76a802bc890b00f0fa9358aeff65f86e35fd7a0

Former code did not find the Firefox plugin, if it was
registered under HKEY_CURRENT_USER. Therefore the checkbox state was not
preserved in Tools - Options - Internet - Browser Plug-in.

Change-Id: I9ae2a7dae1501500d7ea7cb42517605219450af3

The actual reason for this change is a .docx document, which has a textframe
and a modified 'text' style. The textframe in MSO has 'normal' style
(which is like our 'standard') and so the style is not written to the docx.
LO however uses 'frame contents' for the textframe, and since it was
based on 'text', it used the modified style, unlike in MSO.

But even on its own, this change seems to make sense. It's similar
to 4014d40c, and I see no particular
reason why contents of textframes should be the same style like the main
text of the document, while footnotes, footers, headers, tables, etc.
are different.

Change-Id: Ibe7bfd6a2820cff5cf29c669fd60b575c63500b0
Reviewed-on: https://gerrit.libreoffice.org/3697Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>

style="position:absolute;left:0" is relative to paragraph area,
not paragraph text area (which is different if it's indented).

Change-Id: I12a1d2b8a68aa3fa9c65b3d469118b5334f83d7f

Change-Id: Ifd12d4d1f4dab0a6bea4701d0a1b9ab4f3763ce7

Change-Id: I745944202a25a348f36e79d28f03740a28b70eee

Change-Id: Ifb23e61b265697272e54df225719e006319e79af

I had to add a new function to gbuild system: set_nativeres,
because the trick in extensions/Library_npsoplugin.mk did not work.
It linked the default.res, and that made the plugin unusable under
Windows. Also, one export was missing compared to LibreOffice 3.5.

Change-Id: Ib91fa2a3b72b15912587f22becccb0aebc2aa390

Also factor out the w:sdt-related methods to a helper class to avoid
DomainMapper_Impl become a God object.

Change-Id: Ic1a388940bce89688e8558818f92ce9ac997609c
(cherry picked from commit 3ec2d26d)

Conflicts:
	sw/CppunitTest_sw_ooxmlimport.mk
	writerfilter/source/dmapper/DomainMapper_Impl.cxx
	writerfilter/source/dmapper/DomainMapper_Impl.hxx

Change-Id: I57d4768a26476d1a0535087c60535393b7004b24
(cherry picked from commit 9cc1e7b1)

Conflicts:
	writerfilter/source/dmapper/DomainMapper_Impl.hxx

Change-Id: I714c2fd747eae2e706355b4fae892af9f569b3ae
(cherry picked from commit 84be52b5)

This was previously sticking long types into Any - which yields
different sal types on different archs.

Change-Id: Ifc7a60a052b57f8a83739ec11a97ab32aaa2ee7c
Reviewed-on: https://gerrit.libreoffice.org/3703Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

somehow got duplicated when merging the tag libreoffice-4.0.3.2

Change-Id: I78ed09327076263f1797adc6b94b948918e5227c

sigh, how this survived the conflict resolution?

Change-Id: I65117ba28cac28419d6873af5620a3df17654318

Change-Id: I453cf8cad1a651d1e1ec0c69da0d75a862359128

Tag libreoffice-4.0.3.2

Conflicts:
	basic/qa/cppunit/test_vba.cxx
	basic/source/runtime/step2.cxx
	dictionaries
	helpcontent2
	instsetoo_native/util/openoffice.lst
	libvisio/UnpackedTarball_visio.mk
	sc/source/ui/vba/vbaapplication.cxx
	sc/source/ui/vba/vbavalidation.cxx
	solenv/inc/minor.mk
	sw/qa/extras/ooxmlimport/ooxmlimport.cxx
	translations

Change-Id: Ic1f06489175f3db92d6bbcebb9732fadc1c61fed