(cherry picked from commit 0b31fa19)

Change-Id: I1f96c6239d7278c4eb0c17b69f9d35e08eb8260b

(cherry picked from commit 78b2bf15)

Change-Id: I876b24bc5324c3aede992c4cadb7014b570de5dc

(cherry picked from commit 613c8044)

Change-Id: I8412a600ea4a828639b3334b3d913705b6e4f782

in Fields dialog

Patch by: Tsutomu Uchino

(cherry picked from commit 5e59a33a)

Change-Id: I8e7264caa875fe49cf66a24e201fbf8966aa19fa

(cherry picked from commit 687d6ed3)

Conflicts:
	sw/source/filter/ww8/WW8TableInfo.hxx

Change-Id: If21c5d7c6db2803f7da59e28c00d47790abffe86

Change-Id: Ibcf70dd5626474bb2a023ce43d7ac661401fd1cb

There was a mistage when merging the clean up.

Note that $(UNIXFILENAME.$*) is not correctly substituted if the variables are define
by another VAR.bla variables. This is why we need to hardcode the lowercase names here.

Change-Id: I9110083122175cdbd09baa0533d890a7ef6d8213

Change-Id: Ifc518e65ccdce4e853fc419b87547b00d0e437a4

Change-Id: I91203e74d54adba17a20ef7b7d835d9ac49855be

not working correctly.

Patch by:	lihuiibm
Reviewed by:	Chen Peng

Change-Id: I86080d7849b58f39623c22494992b2d84d9ed6de

if the pCallStack variable is optimized out then any assumptions of the
method's inlined assembler about stack layout collapse. Adding a pseudo
dependency to the pCallStack variable solves that problem

(cherry picked from commit 254359b9)

Conflicts:
	bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx
	bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx

Change-Id: I5ba7713c2630bb3ecc4343632e796c38541bcd0e

in some build environments the use of std::transform() with plain pointers as
input iterators results in many warnings about how unsafe such a construct is.
The warnings could be suppressed e.g. on MSVC with the SCL_SECURE_NO_WARNINGS
define. Open coding the construct makes it cleaner and more debugable though.
(cherry picked from commit a599e524)

Conflicts:
	comphelper/inc/comphelper/namedvaluecollection.hxx

Change-Id: I3233116bfb862f6cda038541ffecac492623611c

Change-Id: I949a5cf0cb2f4595db7d25103f7caf51b861e8ec

Change-Id: I0057b9174af6a83f3fde0e27c3a91a4aeca95873
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>

That destination contains a whole shape, but the only interesing detail
of it is the fill color, which is the page background color.

Change-Id: I9527db8954c48c980f8734c9bbeaa6ccd3c48fbc

Change-Id: I1214498e57fcbb2b7208c213a2b98dc7dc3bf3ae

Reported by: Yan Ji
Review by: sunying
Patch by: Jianyuan Li
(cherry picked from commit 43ff744c)

Conflicts:
	filter/source/msfilter/msdffimp.cxx

Change-Id: I88ab49daa7b82b573eaf6a22eb4a2ce97b871027
Signed-off-by: Xisco Fauli <anistenis@gmail.com>

Change-Id: I4606b4b1e26303ebba501276a176b2fb66bf9e37

(cherry picked from commit c6f4bbfa)

Conflicts:
	sc/source/core/data/bcaslot.cxx

Change-Id: I774235d445192833031f99211639f23116e37bb4

- remove superfluous slot invalidation
(cherry picked from commit 2ff25b11)

(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>