Change-Id: Ieb48dfe85ed16a8123917b30873f301d523ea381

Change-Id: I6ef1ce6cbfb121b18f4d79709d141cdf2f01a16f

Change-Id: I35d6b0652eee9ea99bbe48e067802c119ed4c56d

Change-Id: I6bb6bcb96993d05cc225da63c56cbb7fbad83ec2

Conflicts:
	sw/source/core/text/inftxt.hxx

Change-Id: I32a430c35d69308f87b7b6f1b4ef232315deed2f

Change-Id: I40be8e54199baf6f24a7b69b268fbff713a9a0a6

Change-Id: I8af4c25abd288ed4d5ac754d2b685c3dcf9d081b

Change-Id: I4573f77418b3631a2f324aac29e225698da53ba6

Change-Id: Ia367c2c3ba834d423ac20416e7ab4f67e8271852

Change-Id: I69f12fb097dbc977e63463b6b764a3553bcf9271

Not my idea.

Change-Id: If4874d97a2035588cd65ded9f281de0c3598b7d7

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.

Conflicts:

	extensions/Library_npsoplugin.mk
	extensions/WinResTarget_npsoplugin.mk

Change-Id: Ib91fa2a3b72b15912587f22becccb0aebc2aa390

Change-Id: I515a316bea0bef6608d993823f906390b39e9fa9

Change-Id: I0cf95c5ef222d085ccda73b54165d7238190becc

Change-Id: I71236b9ca6300372ba00c85401cf19f6c0e7ac99

Change-Id: I2cddfc6b36dfef22dc5f17b94b8732e0646eff02

rather than a ScPopupMenu*, we don't use anything added by
ScPopupMenu to PopupMenu.

While I'm at it, expose the wrapped selected identity of
the popup through the drop-down menu button

Change-Id: Id92f4a03fca19140e624d577f888135c5b227192

Change-Id: I639120393fec6fc0c5aa58cbefffe511742383f9

Change-Id: Id0c07507810ec1db41359f39dee804364fd37ecd

Patch was also submitted with https://ssl.icu-project.org/trac/ticket/10129
of which the outcome should be monitored.

Change-Id: I3ebd4aaef281214062a5b2a858eff8e57a34c9b1
Reviewed-on: https://gerrit.libreoffice.org/3637Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>

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: I7225b4b024c6b7c549d0c9fbf5204df653577bec

Change-Id: I77a4f6d338751c00942f091f4267e5f7d1d1742f

Add doxygen documentation for classes and methods
Delete useless comments.
Add include guards where missing.
Delete some useless typedef.

Change-Id: I9bba16560790239d7775fcd40981465e70e5d437

Broken with 53153889

Change-Id: I0302baee0532ab8f10853c648bf695a58cfe273c

Adapt hatch processing to keep a view-dependent minimal distance for a more
pleasant visualisation

(cherry picked from commit 6a036e7a)

Conflicts:
	drawinglayer/inc/drawinglayer/attribute/fillhatchattribute.hxx
	drawinglayer/inc/drawinglayer/primitive2d/fillhatchprimitive2d.hxx
	drawinglayer/inc/drawinglayer/primitive2d/primitivetools2d.hxx
	drawinglayer/source/attribute/fillhatchattribute.cxx

Change-Id: I15cd784ef7d3e47a20308f16d370c24ef46d2f22

Change-Id: Ib2e56280a5a6bfdfee18a5b213dd67b9fbfc8949

Change-Id: I3e9027ac1d4a19b953bd3404c82f069334f5f4ff

Patch by: Lei Debin
Reviewed by: Andre

(cherry picked from commit 9667c78f)

Change-Id: I993ee9497e5da5d0af499fcab1d203766a18a4a9

(cherry picked from commit cb38ee0d)

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

Change-Id: Iffd413ba1d74ae3b7da58df7b092c43c4f64a7c9

Not sure why I used to store it as images.zip. Probably just a mistake. The
code uses the images_tango.name.zip when trying to open it.

Sure, no toolbar with images is displayed currently anyway, so having this
file in the .apk is pointless, but there has been talk of reverting the
disabling of toolbars, sigh.

Change-Id: I12dfd3abe8f329d660b518f6b37904aa00423bc2

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>

(cherry picked from commit e755623a)

Conflicts:
	configure.in

Change-Id: I2a7a9ab83ac29c0306366303374e93ab08cd10ce

Patch By: Tsutomu Uchino
Review By: jsc

(cherry picked from commit d56225de)

Change-Id: I91ea7add253a5c40272ee112d207fcf510cd3935

Change-Id: Ia888670ad7a5b51c9b6a3d05676b192456311704

* sw/source/core/unocore/unoframe.cxx
odf compatibility

Patch by: Jane Kang,<kangjane2012@gmail.com>
Found by: Yan Ji,<yanji.yj@gmail.com>
Review by: Jian Hong Cheng,<chengjh@apache.org>

(cherry picked from commit f8ecf85d)

Conflicts:
	sw/source/core/unocore/unoframe.cxx

Change-Id: Iffbe79efd43119e78f6983e27b99ba278118555d