(cherry picked from commit a3eded97)

Conflicts:
	jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
	jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx

Change-Id: I5ec6aa62147f9b3fb3e5142fbc2658c0b54f21b8

Change-Id: Ic1a85b48363b2596ebfe225dc76332068229cb96

(It causes linker errors, type_info destructor not found and a few
others. Possibly this is a bug in Apple's libc++abi?)

Change-Id: I50bc97c8e061ff47d4ff16f31d37cfe3b4f5a010

(cherry picked from commit 76f5fa8e)

Conflicts:
	officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
	officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu

Change-Id: I72d3f6ae382793943084235a8e8112bba509e694

Change-Id: Ie53c9acd51a53fbb11f0735739edbf18551a620b

(cherry picked from commit 08159967)

Conflicts:
	sfx2/inc/sfx2/sidebar/EnumContext.hxx

Change-Id: If40d3dee7c11e4ea6b01d40d713280e1dc19484d

Unname unused argument to prevent compiler warnings.

(cherry picked from commit f68dfc2c)

Change-Id: I6450c6e46d5971abc871ed378d2ad6307e8f7a3e

to other application window

(cherry picked from commit 604502e2)

Conflicts:
	sd/source/ui/view/drviewsa.cxx
	sfx2/inc/sfx2/shell.hxx
	sfx2/source/control/shell.cxx
	svx/inc/svx/sidebar/SelectionAnalyzer.hxx
	svx/inc/svx/sidebar/SelectionChangeHandler.hxx

Change-Id: Id3c427e02714ef0d6686a78094e2f7f3b390a693

(cherry picked from commit 39ca5338)

Conflicts:
	configure.in

Change-Id: I2f5d18c98693daa29a19345f56faaf7d1ae3c34a

Unlike in case of msvcr90.dll, which went to WinSxS, msvcr100.dll is installed
to the "system32" folder. Windows installer automatically replaces it to
SysWOW64. The problem is that this way 64-bit dlls end up in the wrong directory.
They conflict with the 32-bit dlls, and will not be installed. Therefore
64-bit shell extensions will not work, unless the 64-bit VC runtime is
installed from other source. It is not possible to install both 32-bit and
64-bit VC Runtime with merge modules in case of VS 2010 and VS 2012.
For the 64-bit shell extensions, we can install the runtime dlls next to the files.

Change-Id: I157048a521662bbac568d1660e46576935f0ea9f

(cherry picked from commit 68e51570)

Change-Id: I2cbdc2a228884dff8000206ced4a5d8930dd6339

(cherry picked from commit 1c02bb1b)

Change-Id: I57cbc1a19f18d71a27fb87086375b22755443675

(see #i120498#) for sw

(cherry picked from commit fb2580f1)

Conflicts:
	sw/source/core/draw/dview.cxx
	sw/source/core/inc/UndoManager.hxx
	sw/source/core/undo/docundo.cxx

Change-Id: I9970377d66f1104448a2ee7e4fb1cf82bf559cd8

(see #i120498#) for sc

(cherry picked from commit 472c175d)

Conflicts:
	sc/source/core/data/document.cxx
	sc/source/ui/view/drawview.cxx

Change-Id: I4ae171807b80e3f6c9f44028bd04dfac9338e627

extended as preparation for #i120515#

(cherry picked from commit ddd94929)

Conflicts:
	svx/inc/svx/sdrundomanager.hxx
	svx/inc/svx/svdedxv.hxx

Change-Id: I50272a5719ee6e6a1a7fd1bafe9d94f480b1dbf5

when editing texts in graphic objects and/or tables

(cherry picked from commit a0967257)

Conflicts:
	editeng/inc/editeng/editeng.hxx
	editeng/inc/editeng/editund2.hxx
	editeng/inc/editeng/outliner.hxx
	editeng/source/editeng/editundo.cxx
	editeng/source/editeng/impedit.hxx
	editeng/source/outliner/outliner.cxx
	sd/source/core/undo/undomanager.cxx
	sd/source/ui/view/drviewse.cxx
	svx/Library_svxcore.mk
	svx/Package_inc.mk
	svx/inc/svx/svdedxv.hxx
	svx/source/svdraw/svdedxv.cxx

Change-Id: I40e3ef2dff681f9b6f2f6b5d35507071f8110533

Comment unused variable pNewEditUndoManager to silence the compiler

(cherry picked from commit 56865508)

Change-Id: Ib7179ee6c34ce03a75942978831c3a55968f161f

Removed unused variable

(cherry picked from commit 0bbde441)

Change-Id: I39e7f25426e8e7d1367102d603b0f6c84d96622f

Block them together and announce after undoing that all is done.  This stops
a11y trampling in before we're actually finished, querying for the new text,
which unsets the invalid flags as the new layout is now up-to-date, but
unfortunately results in the view not redrawing as the layout is apparently
valid and doesn't need to be redrawn.

To reproduce, enter a drawing rectangle in draw, enter some text, and (without
leaving edit more) press ctrl-z. The text appears to not change. But the model
has changed except the view didn't get to hear about it because a11y swooped in
between that model change and the view checking to see if the model changed.
And the format update there unsets the model-changed flag.

Change-Id: If2552ef3680b9bd64a2e28a3e9cdbb9e2d45f329

Change-Id: Ie13a80afd0df6972488b8e7f8629a1c4bc840afb

Change-Id: I7a5f2881d2aa77f2d5c6c302c8eac1162b194bcf
Reviewed-on: https://gerrit.libreoffice.org/4016Reviewed-by: Jan Holesovsky <kendy@suse.cz>
Tested-by: Jan Holesovsky <kendy@suse.cz>

fix the X position when the sheet are RTL.

Change-Id: I9b38a840fb17a70e1ba60d46b8c83b7e498501e1
Reviewed-on: https://gerrit.libreoffice.org/4069Reviewed-by: Jan Holesovsky <kendy@suse.cz>
Tested-by: Jan Holesovsky <kendy@suse.cz>

The type_info crack is even harder in the libc++ (with Clang, on OS X)
case, sigh. Punt for now and let's see what happens...

Change-Id: I17c3a4d9d933acfbf554649c9ec8b6fb5213f2f0

Experimental work in progress.

Change-Id: I92663e07c7322037182141603f72c6d442da6ee9

...this e.g. changes the error message when trying to register an extension that
contains an (actively registered) Python component but no pyuno is installed
from "Binary URP bridge disposed during call" to a less frightening "The service
com.sun.star.loader.Python cannot be instantiated."

Change-Id: I10f2b36b11395559ee95ce659878222b5ea99c11

The X11 headers are present in the OS X SDK (because OS X does have an X11
server, even though I think it might be a separate download and install on
demand nowadays), but we don't want to include them even if it would be
harmless.

Change-Id: I48011d7e1d2cd6398fc7b4cba8ec8100addc053b

We really need some feature test macro that would be equivalent to
using X11.

Change-Id: I0c1f9b487b4feab3b7d4641e898f9fdf0144065b

Change-Id: I0fa2cb8d24cd6862ab1d88ad8ccc033c70bbfa44

Change-Id: Ie8a092b7d91e0f379c7102c3aa12da8eb7666840

Change-Id: I8212bc5981418f6cbd514bf5002e6a5dbdf53152

...see dictionaries comits df423c53829faa96f46acd71887fd0f8697c49e9
"fix Lithuanian thesaurus" and 9b6407dadc64e10e7117d8551917b46105ecc6c8
"Fix more thesauri."

Change-Id: I6ddc41fce4e3f68d80d05af3320c835b98908fcb

Project: dictionaries  9b6407dadc64e10e7117d8551917b46105ecc6c8

Regression since 6e29f568 and
28d2a0c1 pText1 can legally be NULL

Change-Id: I0d54f4aeaa18834c32daeabad43776bc4f68088b

46e53913 fixed some transparency emf problems
on X11, it however did it by implementing alpha support in X11SalBitmap only
and made generic code rely on it. Now it doesn't work at least on Windows,
after reverting it works on Windows but not on X11. As I have no idea what
the real problem is, at least keep both code paths.

Change-Id: I2f2cf247becfcd777b4f3d129efe4d6a5d641f7b

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

to break cycle reference to SwXMLTableContext object

Found by: zhangjf
Patch by: zhangjf

(cherry picked from commit ba47a717)

Change-Id: Iba0b581920417b3866b07542621d56ccdc272261

Change-Id: Iaad121a3333ab7cffcc2cbd6cb1b3e447f0989f7

Project: dictionaries  df423c53829faa96f46acd71887fd0f8697c49e9

(cherry picked from commit a9606aa4)

Conflicts:
	officecfg/registry/schema/org/openoffice/Office/Logging.xcs

Change-Id: I25719f2898df2f91ef9c71234e9eab83f8140b96

opened with LTR UI.

Change-Id: Iff6899539fe0b1788df7b09f91f850b91bcdb811
Reviewed-on: https://gerrit.libreoffice.org/4024Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>

Change-Id: I4c009618598714769f8b561640f69a4d1038339d

Failing to instantiatie incomplete types like the Map::iterator in
binaryurp Cache's Entry members is allowed by the C++ standard.
The rewrite makes it more compliant with other C++ compilers/STLs.
And interesting alternative would be to use boost's multi_index_container.

git-svn-id: http://svn.apache.org/repos/asf/openoffice/branches/rejuvenate01@1480367 13f79535-47bb-0310-9956-ffa450edef68

Change-Id: I5bfb2e2c44e11a03278a4a127396dcb2861c63b8