(cherry picked from commit 17f7ee84)

Change-Id: Ic761c6c7dd17b42098adc44f7f4435b83ed3d009
Reviewed-on: https://gerrit.libreoffice.org/2129Reviewed-by: Michael Meeks <michael.meeks@suse.com>
Tested-by: Michael Meeks <michael.meeks@suse.com>

(cherry picked from commit 5e10c8d2)

Conflicts:
	shell/CustomTarget_shlxthdl_res.mk

Change-Id: I5b4b839b930c294bee6727402dbc47efee7fbcd7
Reviewed-on: https://gerrit.libreoffice.org/2135Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>

Change-Id: I4e912cab7ab252ef4c118fe63b02931eecd986aa
Signed-off-by: Michael Meeks <michael.meeks@suse.com>

This fixes connecting to one computer after connecting to another failed.

Change-Id: I5b13d186d32690a91e4290c81c8d2e12a0a1f2be
Signed-off-by: Michael Meeks <michael.meeks@suse.com>

The latestInstance lifecycle and mName initialisation was borked.

Change-Id: If7ef8a15fdc297e0fe6e401399a3b94dcd8d08c5
Signed-off-by: Michael Meeks <michael.meeks@suse.com>

Change-Id: Ife81ec74b36f71782997219e36ac926ea429c297
Signed-off-by: Michael Meeks <michael.meeks@suse.com>

The existing code in refreshLists() was somewhat hard to understand, and it
actually crashed (if uncommented-out). Now it simply empties the maps and view
lists and then rebuilds them.

The visible end result, at least for me, is that I no longer get duplicate
servers in the list...

Change-Id: I1543292e219e666e7dcbc68473f40a11e2eb3381
Signed-off-by: Michael Meeks <michael.meeks@suse.com>

These files are Java, not C++. Add empty line before the vim mode line.

Change-Id: Ia94d18e9995ecfbbbfd1c9e6a4d2ce4e8ffb95f3
Signed-off-by: Michael Meeks <michael.meeks@suse.com>

Change-Id: I314066086827d283938c6f402733da3f801ad55b
Signed-off-by: Michael Meeks <michael.meeks@suse.com>

Change-Id: I45ecc4a745722cc6bf1f5017429a3e532200bf03
Signed-off-by: Michael Meeks <michael.meeks@suse.com>

No point in using a generic "Serial Port" name, or describe it as a "COM Port"
(eek). The remote control app doesn't check what the service name is
anyway. (It probably should?)

Change-Id: I6098110e8c4f62e20c38cf7e6b2071f00dd00515
Signed-off-by: Michael Meeks <michael.meeks@suse.com>

Change-Id: I3ddfb3e3f93782556ec7fd7a16afbb294d17c013
Signed-off-by: Michael Meeks <michael.meeks@suse.com>

Fun that we have to reverse engineer and document magic numbers in our own
code. Code written less than a year ago.

Change-Id: I02b7697e7e02b85c8df78acda8f943c9b0628359
Signed-off-by: Michael Meeks <michael.meeks@suse.com>

Conflicts:

	sd/source/ui/remotecontrol/BluetoothServer.cxx

Change-Id: Ie6c3d12387cececce4e169482659cbcbbcfd0975
Signed-off-by: Tor Lillqvist <tml@iki.fi>

and squash remove no longer needed hack

Conflicts:

	sd/source/ui/remotecontrol/BluetoothServer.cxx

Change-Id: I06ab10df77e2b3598f7268173206429596a50217
Signed-off-by: Michael Meeks <michael.meeks@suse.com>

This allows the OLE object to at least be passed to the OS for
opening...

(cherry picked from commit 5a65ca67)
Change-Id: I97f93eb3a015d7771f3fc909517ffb96d61fde52
Reviewed-on: https://gerrit.libreoffice.org/2096Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Miklos Vajna <vmiklos@suse.cz>

(regression from f7d681dc)

Change-Id: Ida92854efe6ddffffb8fe10e5ef1f42c53747f40
(cherry picked from commit cbc72273)
Reviewed-on: https://gerrit.libreoffice.org/2119Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Miklos Vajna <vmiklos@suse.cz>

Change-Id: Id16431fb3517c831a5e81ff72fafaa8569f99ef1
Reviewed-on: https://gerrit.libreoffice.org/2109Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Miklos Vajna <vmiklos@suse.cz>

After thinking this was a feature regression, I finally discovered that
the old template manager couldn't rename templates. This commit is
bringing back some previously unused code dropped in an ealier commit.

Even though this is a UI change, no new string is added by this commit.

Conflicts:
	sfx2/inc/sfx2/templateview.hxx
	sfx2/source/control/templatelocalview.cxx
	sfx2/source/control/templateview.cxx

Change-Id: I2e4a89c2e68f7e04b0fca3fc161920505ac715b4
Reviewed-on: https://gerrit.libreoffice.org/2108Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>

SwTxtNode::GetExpandTxt must filter out all dummy characters used to
represent fields, footnotes, field marks, etc.

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

Change-Id: I120acd40b83cad074869b404d4e74b5ec69d493d
Signed-off-by: Michael Meeks <michael.meeks@suse.com>

Don't output the port number if that one is not valid.
(cherry picked from commit 12ea7036)

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

I was not sure how this can be triggered util the comment 46 in fdo#57061.
I was not brave enough to enable this without testing.

It seems to work, people complain about it, let's enable this migration
as well.

Change-Id: I79fa4b95828a55619ce098dc8fd357af317a1d47
Reviewed-on: https://gerrit.libreoffice.org/2104Reviewed-by: Michael Meeks <michael.meeks@suse.com>
Tested-by: Michael Meeks <michael.meeks@suse.com>

- paths setting
- recently opened files
- recovery setting (enable/disable; time)
- ODF import/export setting
- font anti aliasing setting
- windows and toolbars setting (visibility, position, docking)

Change-Id: I01ee912a782f14ba0751659ad87863b749950793
Reviewed-on: https://gerrit.libreoffice.org/2103Reviewed-by: Michael Meeks <michael.meeks@suse.com>
Tested-by: Michael Meeks <michael.meeks@suse.com>

Also revert "SwTxtPaintInfo::_DrawBackBrush: draw dark border around
comment highlight" (commit 57c8c34f), as
it draws confusing vertical lines inside the comment when it has
multiple runs.

(cherry picked from commit bd505fdb)

Conflicts:
	sw/qa/core/swdoc-test.cxx

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

Change-Id: Ia43e1c63aa3a1f72deaa20351f9fe59fcc021b62
(cherry picked from commit ed7012e9)
Reviewed-on: https://gerrit.libreoffice.org/2106Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>

After commit 117fdb98, the setTitleForURL only wrote the meta.xml file
to the odf container, dropping all the other streams. Use storeToStorage
as in the old implementation to fix the problem.

Even though marginal, this problem is important for templates renaming.

Change-Id: Ia9b6abfc112f102e2bd2ae9d3080c4ed827200df
Reviewed-on: https://gerrit.libreoffice.org/2107Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>

DffPropSet::IsHardAttribute needs to handle flag properties specially
(regression from 44cfc7cb)

Change-Id: If5c6b9cfac58a787527cd132f7fc80d392b8e677
(cherry picked from commit 658c3587)
Reviewed-on: https://gerrit.libreoffice.org/2114Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>

Change-Id: I01d30f2cc714e0b2e283e738abd7955919c070d2
Reviewed-on: https://gerrit.libreoffice.org/2116Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>

Reversed the location of the RTL and LTR buttons as well as the align right
and align left buttons on the RTL interface. It now matches the LTR interface.
Done from toolboxdocumenthandler instead of modifying 20+ xml files.

Change-Id: I6b3715e134bb45a7500b87a9e926d7940690a9af
Reviewed-on: https://gerrit.libreoffice.org/2077Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>

Also escape single quotes for ulf, escape both double and single
quotes for stringex.

Change-Id: I4c9b8ea88c0172e0d2fdbc79c68bce34668a64f7
(cherry picked from commit 049cf7c7)
Signed-off-by: Miklos Vajna <vmiklos@suse.cz>

See
http://stackoverflow.com/questions/10330893/android-resources-for-languages-with-only-3-letter-codes
for some more background.

Change-Id: Ib8c62d008239de3f0ba35ebe17f8f6974f28beb1
(cherry picked from commit 63fdfd1e)
Signed-off-by: Miklos Vajna <vmiklos@suse.cz>

Change-Id: Icb6fb1ffab19f02d0af807d8f92201f1914ac08c
(cherry picked from commit 5b614cb2)
Signed-off-by: Miklos Vajna <vmiklos@suse.cz>

Having multiple <family> in <alias> isn't supported and may not work as
expected

Change-Id: Ifffa81db6829e7e21ff061276e1558dda6b99c71
Reviewed-on: https://gerrit.libreoffice.org/2100Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>

(regression from 09cd5c46, which defined
 DISABLE_ATL on all platforms in configure)

(cherry picked from commit ca8ac449)

Conflicts:
	postprocess/Rdb_services.mk

Change-Id: If2373386102373cb49e8cd0c6bf807da2f805dda
Reviewed-on: https://gerrit.libreoffice.org/2095Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>

There were two issues here:

1) c3b0f135 added a mechanism to work
around broken documents, but that didn't deal with nested tables.
Additionally, the check compared the max row width with the width of the
last cell, not the last row.

2) d276d3f3 cleaned up implicit
horizontal merge detection, but didn't deal with valid documents, where
each row definition is available twice.

(cherry picked from commit e15f9cea)

Conflicts:
	sw/qa/extras/rtfimport/rtfimport.cxx

Change-Id: I1a32ec2fcb0d1a8fca7a7bd26501d3daf17880c9
Reviewed-on: https://gerrit.libreoffice.org/2044Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

Change-Id: If0d7b17b97a78eddcdd02b3951afb7b2a1ae43ad
(cherry picked from commit 2b5dd635)
Reviewed-on: https://gerrit.libreoffice.org/2090Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

e.g. tools->options->paths, click the sort icon, reclick it few
times and the list doesn't reverse but instead shows the
same two entries over and over again.

Regression since fb01d8e1

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

Use prefix consistently in all component files for the library.
(regression from 393588ce)

Change-Id: I58dce631f474e022be320c748f62238953a28e17
(cherry picked from commit 63ca871b)
Reviewed-on: https://gerrit.libreoffice.org/2055Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>

Reviewed-on: https://gerrit.libreoffice.org/2043Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit f10ba079)

Conflicts:
	vcl/source/window/builder.cxx

allow a custom border property for drawing areas

(cherry picked from commit e258b760)

Change-Id: I2e28b9f9d52bcb01b04f98d39d12b6d8a627bec5
1e5777e5dcc04d0aa53d1ac4b9091f310ae59035
Reviewed-on: https://gerrit.libreoffice.org/2052Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>