(cherry picked from commit 2610028a)

Conflicts:
	svgio/source/svgreader/svgnode.cxx

Change-Id: If1f4184da76b275e44737d5f16a3cb57357db67d

Change-Id: I631f0c872b7ec7e6dada1488e03eae3f75987fc6

Change-Id: I4f7911cb283d67e7c7b883d629b39588e96f32c2

Change-Id: Icdb19eb9f8e3925f2da2d2ffe514f0da2bd14471

(cherry picked from commit 194c7ff9)

Change-Id: I28a31c5abb14ceb72dc290e6ed2161c0ef6592df

on Mac

(cherry picked from commit 947f7594)

Conflicts:
	vcl/aqua/source/gdi/salgdi.cxx

Change-Id: I7e38ed34caf4f0e841f95ef5c4de52e241d561db

(cherry picked from commit eeba25ef)

Change-Id: Ic482dd1230793d505abd2d0551cb527ca5c816f6

Change-Id: I457a4cae7907df6fc05535873ed51766c56220ee

(cherry picked from commit a34f3fdf)

Change-Id: Icdb83829917315173be5e824083ed502f6a6a8cb

Change-Id: Ie4d85ca344163807b9455f6305c35327df9fd877

(cherry picked from commit b2cc0de3)

Conflicts:
	canvas/source/vcl/spritecanvashelper.cxx
	drawinglayer/Library_drawinglayer.mk
	drawinglayer/source/processor2d/vclhelperbitmaprender.cxx
	drawinglayer/source/processor2d/vclhelperbitmaprender.hxx
	drawinglayer/source/processor2d/vclhelperbitmaptransform.cxx
	drawinglayer/source/processor2d/vclhelperbitmaptransform.hxx
	drawinglayer/source/processor2d/vclprocessor2d.cxx
	officecfg/registry/schema/org/openoffice/Office/Draw.xcs
	svx/source/svdraw/svdograf.cxx
	vcl/aqua/source/gdi/salgdi.cxx
	vcl/inc/aqua/salgdi.h
	vcl/inc/os2/salgdi.h
	vcl/inc/salgdi.hxx
	vcl/inc/unx/pspgraphics.h
	vcl/inc/vcl/bitmapex.hxx
	vcl/inc/vcl/outdev.hxx
	vcl/inc/vcl/salbtype.hxx
	vcl/os2/source/gdi/salgdi2.cxx
	vcl/source/gdi/bitmapex.cxx
	vcl/source/gdi/outdev2.cxx
	vcl/source/gdi/salgdilayout.cxx
	vcl/source/gdi/salmisc.cxx
	vcl/unx/generic/gdi/pspgraphics.cxx
	vcl/unx/generic/gdi/salgdi2.cxx
	vcl/unx/headless/svpgdi.cxx
	vcl/unx/headless/svpgdi.hxx
	vcl/unx/headless/svppspgraphics.cxx
	vcl/unx/headless/svppspgraphics.hxx
	vcl/win/source/gdi/salbmp.cxx
	vcl/win/source/gdi/salgdi.cxx
	vcl/win/source/gdi/salgdi3.cxx
	vcl/win/source/gdi/salgdi_gdiplus.cxx
	vcl/win/source/gdi/winlayout.cxx

Change-Id: I871d1d107b019758f3913e5eb63bc9bc0ba403fd

Do not name unused arguments to prevent compiler warnings.

(cherry picked from commit f3118889)

Change-Id: I482d1f96d695c7bf9912ec464bb39e7fdd14adef

Related: #i121534# fix graphite-enabled windows build

(cherry picked from commit c90a6ca9)

Conflicts:
	vcl/win/source/gdi/winlayout.cxx

Change-Id: I95fd41ad6f7187f34ba9474674a471fb4fc65314

Change-Id: I277b396b50c4e820431ec360d653e5e8b8357721

Change-Id: I0b2253d3e23f6f2ec77c8aca88897144c59507a3

(cherry picked from commit d84324ff)

Conflicts:
	odk/pack/copying/makefile.mk

Change-Id: I04c004b1ea2c6c05a18f48db553141e2cf32f06d

Change-Id: Ie29aa2e970f06a4a5bef672afe17b085600e7b88

Change-Id: Ib158bc873fc41bb5668a1da3d7c928f2757d80ab

...post d7ae9f77 "rename HAVE_CXX0X->HAVE_CXX11
and clean up to #define in a config header."

Change-Id: Ie8f62c78c9aabe06736a25e60a3035880470e7b5

... see 08bb8fca "#i122208# replace the
binaryurp cache for improved C++ compatibility" and
059f041d "cppcheck: fix duplicateExpression,"
when the only improvement is to not needlessly acquire/release raw rtl_uString
instances.

Change-Id: I734304b231d69f8089cbf1d35a3deda75f771c78

Change-Id: I185a9854ca2ce43f1f880f5ea2bb3b68a1757ca9

...and use it so that private: URLs are not needlessly passed to the gio or
gnome-vfs "catch-all" UCPs.

Change-Id: I85d100567d1641130449fe21ccd072bcc0ec0979

Change-Id: Iead9b7ee98a11ad5a9916d6e176c8938378b817a

Change-Id: Ic30cbc95b4baa4dabaa0f8f8e129aa5cf4ca5f2f

Change-Id: Ie8f8b4fe48a94cd760fa85cc83121c4ab0f3b507

...and not only if the caller happens to pass in non-null ppError.  Otherwise,
calling soffice with a document URL handled by the gio UCP that is not yet
gio-mounted would silently do nothing and exit with EXIT_SUCCESS, as the first
thing the type detection code does on the URL is execute "getPropertyValues" for
"IsDocument", which calls getGFileInfo with null ppError, so a void instead of a
boolean value is returned, which then derails the type detection code to
silently fail (which is another problem that needs fixing).

Change-Id: I48a84428cdee5caead02909abc2efd3ae3722052

Change-Id: I5aed0a4d9b3e912b1cad0be2092b2dc394e10b04

Change-Id: I884c3c57dfd1d2e7bfa0675fd0c0184113cdda9c

Reported by: luo qing le
Patch by: Lei De Bin
Review by: Chen Zuo Jun

(cherry picked from commit 9b161d18)

Change-Id: I7e51d2fd6b72d08b793b857cf2a3de5989145695

Reported by: luo qing le
Patch by: Lei De Bin
Review by: Chen Zuo Jun

(cherry picked from commit 3654740a)

Conflicts:
	sw/source/filter/ww8/wrtw8esh.cxx
	sw/source/filter/ww8/wrtww8.hxx

Change-Id: I1c25d17b1780adeddee46d500f2f0753944e9ffc

Change-Id: I0fb3d99326ec3cb930b85626c749613f65ee8b6e
Reviewed-on: https://gerrit.libreoffice.org/4281Reviewed-by: Noel Power <noel.power@suse.com>
Tested-by: Noel Power <noel.power@suse.com>

LimitBox set its value to -1 if the current
text is "All" but just when it loses its focus
so dispatching its value to the controller
 must be after this setting.
(see limitboxcontroller.cxx)

Plus some clean up in LimitBox.cxx

Change-Id: Ic1d314a5a67c2b261b2e9c50973f51de2bfb8db8

If limit clause follow from clause directly than the statement
parser of hsqldb parses "LIMIT" token like a table alias and
that's why the next number is unexpected.
The problem was that the limit token was not added to a "keyword"
vector in which parser search while working with form clause.
If the algorithm find a keyword after table names than it
knows it is the end of the form clause. That's why it
worked with any other keywords like "ORDER_BY",
"WHERE", "GROUP BY" and so on.

Change-Id: Iacd3ea3493c85eb0f2579aaad6903537ac65d25a

Change-Id: If3b7b1faab858afa82d4c665ee1a5036190e69aa
Reviewed-on: https://gerrit.libreoffice.org/4278Reviewed-by: Tomáš Chvátal <tchvatal@suse.cz>
Tested-by: Tomáš Chvátal <tchvatal@suse.cz>

Change-Id: I4161cacc95576a5f34205c92482a38bb60ecc9f2

Change-Id: I7956510a5faf1d659f88268941f8afce44e83560

to make sure the week object is released correctly.

Found by: zhangjf
Patch by: zhangjf

(cherry picked from commit 1e51e5da)

Conflicts:
	ucb/source/ucp/tdoc/tdoc_stgelems.cxx

Change-Id: I33d0b3b7cda2aa9a220056bf7d641b09036f89e9

Change-Id: Ie8ce0ebb9ec979575657a89ebbfe4d01142b04e5

* subversion/main/oox/source/drawingml/textparagraphpropertiescontext.cxx
[]WritingMode2 is used to numerous explicit writing directions, so use WritingMode2 to instead WritingMode.

Patch by: Ma Bingbing <jiazema@gmail.com>
Suggested by: Wang Zhe <kingwisemmx@gmai.com>
Found by: Wang Lifeng <phoenix.wanglf@gmail.com>
Review by: Wang Zhe <kingwisemmx@gmai.com>(cherry picked from commit 4545d293)

Change-Id: Ic621ce6107bdc0b83c511f055175ae7b629f1503

SVGs in Writer GraphicObjects

(cherry picked from commit 436b901a)

Conflicts:
	sw/source/core/doc/notxtfrm.cxx

Change-Id: I0e1d4087c94f7d73f1b124ea7918f051c9eacd12

(cherry picked from commit dd4bed5d)

Conflicts:
	svtools/inc/svtools/optionsdrawinglayer.hxx
	svtools/source/config/optionsdrawinglayer.cxx
	sw/source/core/crsr/viscrs.cxx

Change-Id: I21167b58a9b81f5fa15c7def5fb4b6023f91f32b

also const as const can
(cherry picked from commit bb9ad24b)

Conflicts:
	svgio/inc/svgio/svgreader/svgstyleattributes.hxx
	svgio/source/svgreader/svgstyleattributes.cxx
	svgio/source/svgreader/svgtoken.cxx

Change-Id: If236eb8b1e0193c43229ea6dc496eb3a8fd20c42

Related: #i121656# removed const for return-by-value

(cherry picked from commit aa85e31b)

Conflicts:
	svgio/inc/svgio/svgreader/svgstyleattributes.hxx
	svgio/source/svgreader/svgstyleattributes.cxx

Change-Id: Ief43c478ea3000d114487918875e9a201dd827bc