Revert
0d9ddccd
and
66f3b170

Solve border merge on portions level.
- Add new members to text portion called m_bJoinBorderWithPrev
and m_bJoinBorderWithNext which indicate when to skip left or
right border.
- Use these members during formating, painting and cursor calculation.

Change-Id: I24f1a848e266207b252a6cd157663edc47c51de6

Change-Id: I52735c222e14e725fc01caa156cb8ea9671a36cc

Export works and import has just a little typo.

Change-Id: I570d70423b5a626f21117971fb7eff030eae20af

Use just those API tests which still alive.
Export filter test use import so no need for distinct
import tests.

Change-Id: Idddc2ece10e20027551538f4e8c224edffa9bfe8

Change-Id: Ib1a79678ffce7764638378b4002f5e87ae749d00

Change-Id: I06064b1145578579c8748b6e5326090303aa670e

Change-Id: Ia3ca6da7155842693446888a53c899b3766870fe

Change-Id: I636cc3e9204db2247c74256e00abee8fdfdaee97

Change-Id: Ib37fa00b58a1c4193b4181699e385dcb6502edac

Change-Id: Ib82a63aa77e47203ff4bd94f3c76759bfa6fa47d

Change-Id: Ia29a5956813c5d71f042f774d00de3bc82b7f1aa

Change-Id: Id68fa488731d3b34213db23bf4d50f73b04c6fe4

Change-Id: I0aa881bae4c1ee0857bafef78094a3d92bcc0702

Change-Id: Ib2bd2da3852fdd8110d6d799b5a4091f2a89f0a8

Change-Id: Ia5fe8e386fd363f0b5bb81b3d0e8fd1e15efe430

Change-Id: I9798408dc92a983fecc98c42516482afcb12ae25

Change-Id: I532401e4853319668f49c75e4653907272384d12

Change-Id: I54deff88232d54f268a03dd61646b0ad59b3d8d1

Change-Id: Id5ab789b3518a23ccef6f3a13f852c478a129089

Change-Id: I5dbb39e429ee35c47b492dc29bf172879bc32b1e

Change-Id: I22624e2f15b95257f950f48704909aeb6ae54ef4

Change-Id: I1de0d79ed3e9b3fd6b6ae9c303d5e502780bb568

Change-Id: I41b73e0af6841247a0403974b1c66e5a66123420
Reviewed-on: https://gerrit.libreoffice.org/5483Reviewed-by: Matteo Casalin <matteo.casalin@yahoo.com>
Tested-by: Matteo Casalin <matteo.casalin@yahoo.com>

Change-Id: Ib8309e687c375a05739e8b6f4db95d004a3b97cb
Reviewed-on: https://gerrit.libreoffice.org/5482Reviewed-by: Matteo Casalin <matteo.casalin@yahoo.com>
Tested-by: Matteo Casalin <matteo.casalin@yahoo.com>

Change-Id: I1653140533a0f848dcf577ad7e81991a4591d916

Change-Id: I92f2203988c5a4843ce512029ec60750fe4d25ff

before commit 7a504c87 there was:
aUnknownToken.CompareTo(sSaveToken) != COMPARE_EQUAL

Change-Id: I4c6411777f342e160c78b0ec591456e284e4e385

This reverts commit 4f20c9f6

Change-Id: I4d8cef801d570b0c20e580144e79a5940b100271
Reviewed-on: https://gerrit.libreoffice.org/5476Reviewed-by: Andrzej J.R. Hunt <andrzej@ahunt.org>
Tested-by: Andrzej J.R. Hunt <andrzej@ahunt.org>

Change-Id: I8e23eb484177ccd47b7780ccafbdf8b377ea57e1

Change-Id: Ia317f09260853602f4dd313a0577de192834b1c5

Change-Id: I677596779606621f201d9ba3c45bc6dca8c92bef

Change-Id: Ib67e86b2ffde51ce1907eb03a88990da6a52cf2a

Change-Id: I2def55821347622252c22ae61c75239af5d27e6a

Change-Id: Ie307b3acb3e87bd87ec578e042b1cea29ab4839d

Change-Id: I34b03a7decb459c6014f25e2e38b5c32c58da68f

Project: help  f9847b72a14adb5ce6518c7815e69ed8fea807f2

Conflicts:
	cui/UIConfig_cui.mk

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

Project: help  a1382cf50529aba8391a426d74996819a7c49483

Change-Id: I2be99d22d30b5a09ee0b0920a63852ca6783cc0a

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