LibreOffice.git
8 years agoBump for 4.0-18suse-4.0-18-fix
Andras Timar [Wed, 9 Oct 2013 19:57:33 +0000 (9 12:57 -0700)]
Bump for 4.0-18

Change-Id: If2af95548d57a95995988228752503f770ada4d5

8 years agoBump for 4.0-18suse-4.0-18
Andras Timar [Tue, 8 Oct 2013 12:40:18 +0000 (8 05:40 -0700)]
Bump for 4.0-18

Change-Id: I9d76a7031a28b8dd82f26877dfef2c30e07941ca

8 years agon#819614: Fix for lines running off screens.
Muthu Subramanian [Mon, 7 Oct 2013 13:49:10 +0000 (7 19:19 +0530)]
n#819614: Fix for lines running off screens.

8 years agoBump for 4.0-17suse-4.0-17
Andras Timar [Fri, 4 Oct 2013 06:28:51 +0000 (3 23:28 -0700)]
Bump for 4.0-17

Change-Id: I725c090eee8094e85a64c18816af2ace8aaa010b

8 years agobnc#779620 DOCX import: try harder to convert floating tables to text frames
Miklos Vajna [Tue, 1 Oct 2013 14:57:56 +0000 (1 16:57 +0200)]
bnc#779620 DOCX import: try harder to convert floating tables to text frames

Since 78d1f1c2835b9fae0f91ed771fc1d594c7817502, we convert floating
tables to text frames only in case it's possible that there will be
wrapping, to give better results for multi-page tables, which are
multi-page, and technically floating ones, but that has no effect on the
layout.

The problem was that we try to do this decision too early, effectively
the page width and margins were counted from the default letter size,
instead of the actual values, which did not arrive at the time of the
decision. Fix this by moving this logic at the section end.

Change-Id: Ic1fbceb54c8ec223ed01836fafe6220bb3b2410a
(cherry picked from commit bbef85c157169efa958ea1014d91d467cb243e6f)

Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
writerfilter/source/dmapper/DomainMapper_Impl.hxx

8 years agon#834720: Labels wrongly interpreted as dates.
Muthu Subramanian [Wed, 11 Sep 2013 16:11:43 +0000 (11 21:41 +0530)]
n#834720: Labels wrongly interpreted as dates.

If the numFormat is available we should probably use that.

8 years agoBump for 4.0-16
Andras Timar [Sun, 22 Sep 2013 14:32:08 +0000 (22 07:32 -0700)]
Bump for 4.0-16

Change-Id: Ia7d8e427295b813268b74a8cfb4b8a1e686aa3d8

8 years agobnc#825891 fdo#37606 SwWrtShell::SelAll(): fix for doc starting with table
Miklos Vajna [Mon, 16 Sep 2013 10:12:42 +0000 (16 12:12 +0200)]
bnc#825891 fdo#37606 SwWrtShell::SelAll(): fix for doc starting with table

SwWrtShell::SelAll() can now detect if the body text starts with a
table, and if so, it explicitly selects the whole document, not just the
first cell of the starting table.

Also, SwCrsrShell::EndAction() now checks for this "select all and doc
starts with table" situation, and if that's the case, it activates a
special select all mode, so layout can act accordingly.

(cherry picked from commit 3b11e66ab89c201591d8be8f1ab1af1aba11a821)

Conflicts:
sw/source/core/crsr/crsrsh.cxx
sw/source/core/layout/trvlfrm.cxx

fdo#37606 SwWrtShell: fix select all when doc starts with table and cursor ...

... is outside that table

(cherry picked from commit 4b6445dba6bb5b2aed3edb4878ecb327446286e9)

fdo#37606 SwEditShell::DeleteSel(): handle document starting with a table

If the whole document is selected and the document starts with a table,
then we used to delete the contents of the document, except the starting
table, which was just cleared. Change this and do what is expected:
remove the table as well, so the document will have a single empty
paragraph only.

(cherry picked from commit 0fb4adcff534e3841cf6df0e2363fb0797af7022)

Conflicts:
sw/source/core/edit/eddel.cxx

fdo#37606 SwEditShell: fix copying when doc starts with a table ...

... and the whole document was selected

The problem is that the cursor starts at the first cell of the starting
table, but when copying, we want to copy the preceding startnode and
tablenode as well.

(cherry picked from commit 49505336a629a75f4fb48bbe0c532b402e857ed4)

fdo#37606 testcase

(cherry picked from commit f5fa78d75abac3dbe0f9edf9e9106f63ca5dca53)

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

Change-Id: I60d34906a90a5143163e516f618648cf7178430e

Conflicts:
sw/CppunitTest_sw_odfimport.mk
sw/inc/viewsh.hxx
sw/qa/extras/odfimport/odfimport.cxx
sw/source/core/crsr/crsrsh.cxx
sw/source/core/view/vnew.cxx

8 years agoBump for 4.0-15suse-4.0-15
Andras Timar [Wed, 11 Sep 2013 12:06:11 +0000 (11 05:06 -0700)]
Bump for 4.0-15

Change-Id: Ibfb122a2034ab5362f0439c51280576912f48c2e

8 years agon#834722: Chart shown flipped.
Muthu Subramanian [Mon, 9 Sep 2013 15:35:42 +0000 (9 21:05 +0530)]
n#834722: Chart shown flipped.

Auto and manual axis positioning seems to cause a problem.
Needs to be tested with more charts.

8 years agoBump for 4.0-14suse-4.0-14
Andras Timar [Mon, 9 Sep 2013 09:01:08 +0000 (9 02:01 -0700)]
Bump for 4.0-14

Change-Id: I358cb24d01ce33bc95f5b49611b34148195ca52e

8 years agobnc#779642 VML import: handle drawinglayer rectangle char spacing
Miklos Vajna [Fri, 6 Sep 2013 13:57:03 +0000 (6 15:57 +0200)]
bnc#779642 VML import: handle drawinglayer rectangle char spacing

Change-Id: I79fa72c9235682030d23a03fdb0c7c40370c4a8a
(cherry picked from commit 4cbc41bc4eaa822829e68c1ee11eafe834bb7da7)

8 years agobnc#779642 VML import: handle drawinglayer rectangle inset
Miklos Vajna [Fri, 6 Sep 2013 10:29:46 +0000 (6 12:29 +0200)]
bnc#779642 VML import: handle drawinglayer rectangle inset

Change-Id: If8b064ca9a52bb02ff41f07e00142702a29df818
(cherry picked from commit 870a2394a87c77740daf41e1aa81b130113f8e00)

8 years agobnc#779642 VML import: import result of sdt fields
Miklos Vajna [Fri, 6 Sep 2013 10:09:45 +0000 (6 12:09 +0200)]
bnc#779642 VML import: import result of sdt fields

We can't have e.g. placeholder fields on drawinglayer rectangles, but at
least the result of the field is now imported.

Change-Id: I135f205c4231645f11f824495993c4dbea4135ed
(cherry picked from commit 3847de4b724f4f435bb68bceef9a5e187c3f363c)

8 years agobnc#779642 fdo#46361 oox: handle w:color for groupshape textboxes
Miklos Vajna [Mon, 1 Jul 2013 11:59:47 +0000 (1 13:59 +0200)]
bnc#779642 fdo#46361 oox: handle w:color for groupshape textboxes

Change-Id: Ifcbf622a04a4b3f06d95c079d5e13ec3f505268f
(cherry picked from commit ef53d4aec2a3d690de2c7cdaf73ca95bbe29a433)

8 years agobnc#779642 fdo#46361 oox: handle w:jc for groupshape textboxes
Miklos Vajna [Mon, 1 Jul 2013 14:47:56 +0000 (1 16:47 +0200)]
bnc#779642 fdo#46361 oox: handle w:jc for groupshape textboxes

Change-Id: I21391d9a9f5b5173b599006287b33fdaab3c0c75
(cherry picked from commit 5a737fca37cd5a5f90aa03a30688d447677d3b8a)

Conflicts:
oox/inc/oox/vml/vmltextbox.hxx

8 years agobnc#779642 fdo#46361 oox: handle w:br for groupshape textboxes
Miklos Vajna [Mon, 1 Jul 2013 10:05:23 +0000 (1 12:05 +0200)]
bnc#779642 fdo#46361 oox: handle w:br for groupshape textboxes

Change-Id: Ib78891614256b197cefbe766a4a4a9c76219f1cf
(cherry picked from commit b1f78c44c1acc246f06a963383232c9bf649a06b)

8 years agobnc#779642 fdo#46361 oox: handle multiple w:p for groupshape textboxes
Miklos Vajna [Mon, 1 Jul 2013 10:20:09 +0000 (1 12:20 +0200)]
bnc#779642 fdo#46361 oox: handle multiple w:p for groupshape textboxes

One testcase had to be adjusted, as it seems previously we stripped all
newlines at the end (I consider that as a bug), and now we only strip
the last one (so the resulting number of paragraphs on the shape and in
the source document equal).

Change-Id: Ic22b96c2992b53c72e2609e2286622173b86065c
(cherry picked from commit f24e4c74d7d6a7d95090c6fa6a584fed7787706c)

8 years agobnc#779642 VML import: fix TextHorizontalAdjust when layout-flow is vertical
Miklos Vajna [Thu, 5 Sep 2013 12:24:02 +0000 (5 14:24 +0200)]
bnc#779642 VML import: fix TextHorizontalAdjust when layout-flow is vertical

The shape had no special properties about hori/vert text adjustment, so
it should be hori left / vert top. Then it has vertical layout-flow, so
vert should be top and hori should be right (vert was center).

Change-Id: Ia89d8587b6a822ead45198dc5d1ba23907cc3567
(cherry picked from commit b10afb26296e33c77e94a6eda3f2c36c4d34c2aa)

8 years agoBump for 4.0-13suse-4.0-13
Andras Timar [Tue, 3 Sep 2013 17:59:08 +0000 (3 10:59 -0700)]
Bump for 4.0-13

Change-Id: I9dfce7d5ece26409172d6e2e8cdd8aaa966e637a

8 years agofdo#68607 bnc#816593 DomainMapperTableHandler: don't always start a frame
Miklos Vajna [Tue, 3 Sep 2013 09:52:51 +0000 (3 11:52 +0200)]
fdo#68607 bnc#816593 DomainMapperTableHandler: don't always start a frame

This is a port of commit 8fe8bd6c3b5b1a539b7370f8c457fa69c061d2de
"Related: fdo#61594 SwWW8ImplReader::StartApo: don't always start a
frame" from the WW8 filter to the DOCX one.

(regression from edc4861a68e0269b83b17e0ec57912a1ce4220ad)

(cherry picked from commit 78d1f1c2835b9fae0f91ed771fc1d594c7817502)

Change-Id: If1bb4a8a3786aacd618585cf859b57ce9be85c51

8 years agobnc#816593 DOCX import: ignore page breaks in tables
Miklos Vajna [Mon, 2 Sep 2013 08:27:49 +0000 (2 10:27 +0200)]
bnc#816593 DOCX import: ignore page breaks in tables

(cherry picked from commit 7d3778e0ef9f54f3c8988f1b84d58e7002d6c625)

Conflicts:
writerfilter/source/dmapper/DomainMapper.cxx

Change-Id: Ibb250148d41d1929fa17dd993bb71c93c0e09dcf

Conflicts:
writerfilter/source/dmapper/DomainMapper_Impl.cxx

8 years agobnc#816593 DOCX filter: import paragraph spacing from table style
Miklos Vajna [Thu, 29 Aug 2013 12:17:09 +0000 (29 14:17 +0200)]
bnc#816593 DOCX filter: import paragraph spacing from table style

(cherry picked from commit 17e904ed66c3caf87e658b9d3a18d7b13f4a0b52)

Change-Id: I9dce59ecd8a2d2bfadb8c7273cd46c6c0cf17774

8 years agobnc#816593 DOCX import: fix auto table width wrt nested tables
Miklos Vajna [Tue, 3 Sep 2013 13:23:46 +0000 (3 15:23 +0200)]
bnc#816593 DOCX import: fix auto table width wrt nested tables

This is a backport of the fix + 3 other commits from master, which were
needed to make the testcase pass on -4-1 as well.

(cherry picked from commits 74c5ed19f430327988194cdcd6bdff09591a93fa,
824cc4bf4ae9035d4108e8da8e81eb57284f0b54,
53d27a30ce5f2c9f7d37a4089286116854c16215 and
76d1ca523ddcf89cc269fe51c70e66066943ef5a)

Change-Id: I62a1f526cf1d4e4056daa1495d61f1b9f5c0b1b2

Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
writerfilter/source/dmapper/DomainMapperTableManager.cxx

8 years agobnc#816593 docx import: fix incorrect nested table margins
Pierre-Eric Pelloux-Prayer [Fri, 11 Jan 2013 16:40:39 +0000 (11 17:40 +0100)]
bnc#816593 docx import: fix incorrect nested table margins

Change-Id: I07f0f47fcbd3d463d7831820cde338d8d59d9b68
(cherry picked from commit 194ba3a2cacbb5438dfcb8fb35167055e01ca251)

8 years agobnc#816593 DOCX import: let w:before not overwrite w:beforeAutospacing
Miklos Vajna [Wed, 28 Aug 2013 09:43:36 +0000 (28 11:43 +0200)]
bnc#816593 DOCX import: let w:before not overwrite w:beforeAutospacing

And do the same for w:after / w:afterAutospacing. The spec says that if
w:beforeAutospacing is read, w:before should be ignored, this implies
that if we already had w:beforeAutospacing, w:before should not
overwrite the already existing top margin.

(cherry picked from commit de516780bf2d5f74afe643033bfc528c53013902)

Conflicts:
writerfilter/source/dmapper/DomainMapper.cxx

Change-Id: I9437cb5c6fc352a360e27aa279d0a789706c5578

8 years agobnc#816593 DOCX import: fix auto para spacing without compat option
Miklos Vajna [Wed, 28 Aug 2013 09:24:07 +0000 (28 11:24 +0200)]
bnc#816593 DOCX import: fix auto para spacing without compat option

Paragraph auto spacing (before and after) without the
w:doNotUseHTMLParagraphAutoSpacing compat option was incorrect.

(cherry picked from commit 279ff2e03371542d014bf281e73282ba8080cf6b)

Conflicts:
writerfilter/source/dmapper/DomainMapper.cxx

Change-Id: I56d6153f7c489de7fceaf6fab7325c42ee8f9cae

8 years agomake the tinderbox information more reliable in the about dialog (fdo#58034)
Petr Mladek [Thu, 29 Aug 2013 13:41:59 +0000 (29 15:41 +0200)]
make the tinderbox information more reliable in the about dialog (fdo#58034)

Pass the information via config/config_buildid.h. Then
cui/source/dialogs/about.cxx will get rebuilt also in the incremental build.

Also allow to set EXTRA_BUILDID also via environment variable. This is much
easier with tinderboxed that work with static autogen.input.

Change-Id: Ic0b0d13f031c988c096bfd4533e650e245a0ad74
Reviewed-on: https://gerrit.libreoffice.org/5680
Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
Tested-by: Luboš Luňák <l.lunak@suse.cz>
8 years agobnc#834035 DOCX export: fix hyperlinks of illustration index
Miklos Vajna [Mon, 26 Aug 2013 09:35:48 +0000 (26 11:35 +0200)]
bnc#834035 DOCX export: fix hyperlinks of illustration index

We used to export raw Writer bookmarks, but that's not valid in OOXML.
Instead, it has normal bookmarks around the sequence fields, so use them
if they are available.

Change-Id: I0ef2ff7967c2802b53752c9505ef6db4cc2b8265
(cherry picked from commit e9275c08acc2f4f1c925f78b56a1089515cd9a37)

Conflicts:
sw/source/filter/ww8/docxattributeoutput.cxx

8 years agobnc#834035 Introduce msfilter::util::findQuotedText()
Miklos Vajna [Mon, 26 Aug 2013 09:05:04 +0000 (26 11:05 +0200)]
bnc#834035 Introduce msfilter::util::findQuotedText()

This was in writerfilter, but we'll need it soon in sw as well, so move
it down to msfilter.

Change-Id: I8efe02b6bbe8f391d9e14857ed58dbae184d5632
(cherry picked from commit 750f0ebf97d19d1cf305dabe72d52ad6e90adf70)

Conflicts:
include/filter/msfilter/util.hxx
writerfilter/source/dmapper/DomainMapper_Impl.cxx

8 years agobnc#835985: When printing handouts using the default, 'Order' did not count.
Jan Holesovsky [Thu, 22 Aug 2013 07:40:22 +0000 (22 09:40 +0200)]
bnc#835985: When printing handouts using the default, 'Order' did not count.

"Left to right, then down" was the same as "Top to bottom, then right"
when printing handout; set the 6 pages explicitly as the default.

Change-Id: I4a5f58c8fcf2efdc85ad7bb23bde791c5fb87584

8 years agoBump for 4.0-12suse-4.0-12
Andras Timar [Thu, 22 Aug 2013 08:16:54 +0000 (22 01:16 -0700)]
Bump for 4.0-12

Change-Id: I2289f47a27d50c0f6949d8f8b2a5ea38b943d4fe

8 years agon#831457: Placeholders text size is not correct.
Muthu Subramanian [Thu, 15 Aug 2013 12:11:26 +0000 (15 17:41 +0530)]
n#831457: Placeholders text size is not correct.

Placeholders (or shapes without text imported from
the files) have wrong font size. This is because the
size (and probably other text attributes) aren't applied from
the mastertextlist to the shape itself.

8 years agoBump for 4.0-11
Andras Timar [Fri, 9 Aug 2013 12:47:44 +0000 (9 05:47 -0700)]
Bump for 4.0-11

Change-Id: I4c2d47065d945050a20a01d1d03cd1d0092aa2d3

8 years agofix for bnc#834705 missing drop downs for autofilter
Noel Power [Thu, 15 Aug 2013 15:23:46 +0000 (15 16:23 +0100)]
fix for bnc#834705 missing drop downs for autofilter

After commit fc861c7088e9b639a1c2c80f8ba4535c798aeb34 there is now an order
dependency, between any ScPatternAttr flags indirectly set and
SheetDataBuffer::finalizeImport which sets the attributes directly for a column
So the ATTR_MERGE_FLAG that has ScMergeFlagAttr ( and associated
 SC_MF_AUTO flag ) is scrubbed when by the direct writting of the attribute
from SheetDataBuffer::finalizeImport -> Document::SetAttrEntries
I've reordered that Table import here and split the finalize ( which happens
before heetDataBuffer::finalizeImport ) so that the databaseranges which were
created before sheet import still happens, the autofilter part of the import
is now deferred ( until after SheetDataBuffer::finalizeImport )

Change-Id: I11bb45ee7b330760fd93ecca30b23399414ac3a7

8 years agow:spacing in a paragraph should also apply to as-char objects (bnc#780044)
Luboš Luňák [Wed, 14 Aug 2013 13:10:34 +0000 (14 15:10 +0200)]
w:spacing in a paragraph should also apply to as-char objects (bnc#780044)

Otherwise global w:spacing will be used even if overriden locally.

Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
writerfilter/source/dmapper/DomainMapper_Impl.cxx

Change-Id: I01f0a3a323566f6e29faf73bf9d2ba874565eb42

8 years agon#816593: docx consecutive tables with different tblpPr needs to be split
Cédric Bosdonnat [Fri, 31 May 2013 08:51:47 +0000 (31 10:51 +0200)]
n#816593: docx consecutive tables with different tblpPr needs to be split

When importing docx with 2 <w:tbl> following each other, we have 2
possible behaviors: either merge them as one table as we did before or
split them into two tables. The tables need to be split if they have
different floating position properties.

This required the ooxml tokenizer to repeat the table properties for
each row of the table: or how would we know we don't need to split the
table?

The basic idea behind this hack is to temporarily store the table
position and table properties before saving them. Thus we can compare
them at the end of the row and decide to split the table or not.

Conflicts:

sw/qa/extras/ooxmlimport/ooxmlimport.cxx

Change-Id: I2e3e70dfe7386090fe356575ee9d0e81aa031dc4

8 years agobnc#823651 WW8 import: fix paragraph style in empty first page header
Miklos Vajna [Thu, 8 Aug 2013 10:04:36 +0000 (8 12:04 +0200)]
bnc#823651 WW8 import: fix paragraph style in empty first page header

The problem was that the first page SwFmtHeader / SwFmtFooter wasn't
created in case the header/footer text was empty, even if fTitlePage was
set.

(cherry picked from commit 4bc063090c06f0c34980a3852f684b42ab25c501)

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

Change-Id: I5e58419161bcc663e2beb0338b95877469e0fd3c

8 years agoavoid crash when no table grid is given
Luboš Luňák [Mon, 22 Apr 2013 16:06:26 +0000 (22 18:06 +0200)]
avoid crash when no table grid is given

The document may contain just <w:tblGrid/> and <w:tblW w:w="0" w:type="auto"/> .
It appears we do not handle the auto width properly at all, but at least don't crash.

Change-Id: Ibdc9d1ad69c13456acd347a151ec8739bcb98855

8 years agofdo#67498 RTF import: fix missing margins vs continuous section breaks
Miklos Vajna [Mon, 5 Aug 2013 15:08:20 +0000 (5 17:08 +0200)]
fdo#67498 RTF import: fix missing margins vs continuous section breaks

The document had 3 sections, separated by continuous section breaks.
Previously only margins from the last section were imported, this way
the first page had default margins.

Now margins are also applied when we hit continuous section breaks. This
way margin values from the last section break affecting the page wins. A
later commit could improve this further by setting the minimum of these
and setting a section margin for each non-minimal sections.

Change-Id: I4d9a4585e795220533909bd1d467d933caaa0d71
Signed-off-by: Luboš Luňák <l.lunak@suse.cz>
8 years agoBump for 4.0-10suse-4.0-10
Andras Timar [Wed, 7 Aug 2013 12:35:39 +0000 (7 05:35 -0700)]
Bump for 4.0-10

Change-Id: I2122ef126835822b29f6eff2c36c9380b9676a79

8 years agocompatibility setting for MS Word wrapping text in less space (bnc#822908)
Luboš Luňák [Tue, 6 Aug 2013 15:02:42 +0000 (6 17:02 +0200)]
compatibility setting for MS Word wrapping text in less space (bnc#822908)

The document itself is stupid and uses a SURROUND_THROUGH object with a number
of empty lines that make it act is if it in fact was SURROUND_NONE, rather
than actually disabling wrapping for the object and be done with it.
But the difference was that Word still managed to fit those empty lines
next to the object into the little space that was there, while LO already
considered the space too small. So keep a compatibility setting for Word
documents in order to avoid problems with such lame documents and hopefully
that's enough.

Change-Id: I7d17b90de381fd86914ce5efd9c5a29fe4850edc

8 years agofdo#66474 DOCX import: fix handling of mixed fixed/auto cell widths
Miklos Vajna [Fri, 26 Jul 2013 14:50:07 +0000 (26 16:50 +0200)]
fdo#66474 DOCX import: fix handling of mixed fixed/auto cell widths

Instead of checking if any cells have fixed width, check if all calls
have fixed with.  Regression from
74c5ed19f430327988194cdcd6bdff09591a93fa.

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

Change-Id: I58d3d16cbaa2c54a8a1ac309910336c72dcb39b7

8 years agoBump for 4.0-9suse-4.0-9
Andras Timar [Mon, 5 Aug 2013 08:28:56 +0000 (5 01:28 -0700)]
Bump for 4.0-9

Change-Id: Icc9361fb59f2a22e25e21655352eb3e113d82dde

8 years agobnc#593612: workaround for grpFill
Felix Zhang [Mon, 1 Jul 2013 09:04:12 +0000 (1 17:04 +0800)]
bnc#593612: workaround for grpFill

Change-Id: Ib75f2e5e0d77b5a65c6d3d75e7dd477251948bcc
(cherry picked from commit 3b35ad42ed8bea8cab32e2131c81b03c8347cb67)

Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
8 years agoDOCX import fix for table with auto size
Adam Co [Wed, 26 Jun 2013 08:08:56 +0000 (26 11:08 +0300)]
DOCX import fix for table with auto size

Reviewed-on: https://gerrit.libreoffice.org/4496

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

Change-Id: Ic86f4f142e579bdef3e954492e1c1e382a545739

8 years agofollowup fix for bnc#823935 exported xlsx causes errors for mso2007
Noel Power [Wed, 24 Jul 2013 11:36:54 +0000 (24 12:36 +0100)]
followup fix for bnc#823935 exported xlsx causes errors for mso2007

previously we added 'file://' scheme to hyperlink urls detected as SMB
but.. this is just how linux detects those windows share urls, on
windows those urls are detected simply as FILE urls. So... we need
to add the scheme if either FILE or SMB ( basically just relax the patch
a little )

Change-Id: Ie9a2b0c9e297ee08352db88ad9a21583978dbe3d
(cherry picked from commit 40dd3d6e4ed8ed6a2f1c3f953955f9932c0c95ce)

9 years agon#825976: Fixed missing part of condition
Cédric Bosdonnat [Thu, 18 Jul 2013 15:48:31 +0000 (18 17:48 +0200)]
n#825976: Fixed missing part of condition

Change-Id: Icc41828e3c2bd088fb5f7dd876f62c077ddf65ce

9 years agon#825976: Table of Illustration has hyperlinks by default like TOC
Cédric Bosdonnat [Thu, 18 Jul 2013 14:38:39 +0000 (18 16:38 +0200)]
n#825976: Table of Illustration has hyperlinks by default like TOC

...and that fixes the formatting of hyperlinks in docx Tableoof
Illustrations.

Change-Id: I990f31a8c9d0d56f58b7b87e368010576d8c8c0d

9 years agon#825976: handle TOC \h field for illustrations tables in writerfilter
Cédric Bosdonnat [Thu, 18 Jul 2013 13:04:00 +0000 (18 15:04 +0200)]
n#825976: handle TOC \h field for illustrations tables in writerfilter

Change-Id: I9ebc91d5f0e706dc1e316e0aa8494af7aec4da4e

9 years agon#819822: XLSX Chart import with internal data table.
Muthu Subramanian [Thu, 18 Jul 2013 08:34:32 +0000 (18 14:04 +0530)]
n#819822: XLSX Chart import with internal data table.

When the import with xlsx ranges fail - try with
internal data table.
Ported from: 7da06efd74be6500895bab6e5e8ed485914ff45e
and: da4ec594da45210a1f97d31ecb3e7f9c127954e5

9 years agofdo#39904, n#825976: implement hyperlinks for Illustrations index
Cédric Bosdonnat [Tue, 16 Jul 2013 13:49:44 +0000 (16 15:49 +0200)]
fdo#39904, n#825976: implement hyperlinks for Illustrations index

Change-Id: I6f682c382e7ab0e06259b335247fdcebd7412942

9 years agon#820077: Import images with duotone filter.suse-4.0-8
Muthu Subramanian [Wed, 17 Jul 2013 07:43:30 +0000 (17 13:13 +0530)]
n#820077: Import images with duotone filter.

Also, contains implementation for a simple duotone filter.
(Port from commit: 8b716072410bcfd252739fb953d5ac198e27a895)

9 years agoBump for 4.0-8
Andras Timar [Wed, 17 Jul 2013 05:52:01 +0000 (16 22:52 -0700)]
Bump for 4.0-8

Change-Id: I860273728512700469934aa4eabb4827f5247a90

9 years agobnc#829017 fix issue with negative seeks in win32 shell extension
Fridrich Štrba [Tue, 16 Jul 2013 15:13:14 +0000 (16 17:13 +0200)]
bnc#829017 fix issue with negative seeks in win32 shell extension

Change-Id: Ia8072f78ad43281e406377922f50f8de53194f1b
(cherry picked from commit 2a4c55f6d46aec5164ec2ec189ee39cf71c9308c)

9 years agobnc#828598 fdo#59643 SwFormatClipboard: fix undo of paragraph attributes
Miklos Vajna [Fri, 12 Jul 2013 14:02:43 +0000 (12 16:02 +0200)]
bnc#828598 fdo#59643 SwFormatClipboard: fix undo of paragraph attributes

Paragraph attributes were set directly on the SwTxtNodes, instead of
going through SwWrtShell::SetAttr(), which handles undo/redo.

Regression from 357fac9713875302d30185feabaf5c165e040ca4.

Change-Id: I5dc86e20e3c006dab60a075355ce9ad1f1b67bb6
(cherry picked from commit b1cd73d3e62c5192bc3d77f5ecd1036ff42bde61)

9 years agowriterfilter: not every field has a Content property
Michael Stahl [Wed, 10 Jul 2013 10:38:16 +0000 (10 12:38 +0200)]
writerfilter: not every field has a Content property

... so don't try to get it unconditionally  (but SetExpression does
have it).

(regression from c7e4264bed4e77daccf2f72063e5e00f1008c3cf)

Change-Id: I14d24bd70f569ba0bc4f1e48d56ebf43c1441783
(cherry picked from commit 1c90902cbccd4e4f5946dfc454da351c33c24f71)

9 years agoBump for 4.0-7suse-4.0-7
Andras Timar [Mon, 8 Jul 2013 20:58:40 +0000 (8 13:58 -0700)]
Bump for 4.0-7

Change-Id: Icb327ffef5c308b22d4c871e81f0e50493a2b494

9 years agon#820273: Multilevel labels are rotated.
Muthu Subramanian [Thu, 27 Jun 2013 13:16:47 +0000 (27 18:46 +0530)]
n#820273: Multilevel labels are rotated.

It looks odd when multilevel labels are rotated as well.
This patch resets the rotation values for outer labels.

9 years agon#825976: Fixed the import of Table of Figures
Cédric Bosdonnat [Thu, 4 Jul 2013 13:45:01 +0000 (4 15:45 +0200)]
n#825976: Fixed the import of Table of Figures

Support the TOC \c switch and fixed the SetExpression current
presentation property to have updated fields and TOC.

Change-Id: I6fbd7cc38cf8ea7f08a0d15d1f39ffe4805dd62b

9 years agon#825976: Added common flags support for SEQ field import
Cédric Bosdonnat [Thu, 4 Jul 2013 08:13:07 +0000 (4 10:13 +0200)]
n#825976: Added common flags support for SEQ field import

Change-Id: I9a4505cf060880811abfe355b2ebf810cde9a4d6

9 years agoenable MSP creation and bump version number for 1st PTF
Andras Timar [Thu, 4 Jul 2013 10:54:29 +0000 (4 03:54 -0700)]
enable MSP creation and bump version number for 1st PTF

Change-Id: I3f86bdf65f9cc38d4ae8b51afe5264e118132b39

9 years agon#825976: writerfilter initial support of SEQ fields
Cédric Bosdonnat [Wed, 3 Jul 2013 15:43:33 +0000 (3 17:43 +0200)]
n#825976: writerfilter initial support of SEQ fields

No switch and no numeric formatting is taken into account ATM, just the
defaults, but at least we have the fields properly created.

Change-Id: Ib17c5e93199044a05005e4648c7e4cc81baf51dd

9 years agon#820503: initial MCE support in writerfilter ooxml tokenizer
Cédric Bosdonnat [Wed, 3 Jul 2013 12:47:02 +0000 (3 14:47 +0200)]
n#820503: initial MCE support in writerfilter ooxml tokenizer

writerfilter OOXML tokenizer was just ignoring the mce elements and thus
getting the Choice content and the Fallback one. This initial support
drops all mc:Choice contents to read mc:Fallback. At least for drawingML
vs VML support, we have a much better support of the fallback.

Change-Id: Ic0bf69d0436994e9cfcf38accdd57d17e9f391fe

9 years agofastsax: provide the element name instead of prefix for unknown elements
Cédric Bosdonnat [Tue, 2 Jul 2013 13:46:59 +0000 (2 15:46 +0200)]
fastsax: provide the element name instead of prefix for unknown elements

Change-Id: I3effd8a0cfe57875446536bbd0a93a73e630a44f

9 years agodetect -isystem
Luboš Luňák [Fri, 28 Jun 2013 14:03:05 +0000 (28 16:03 +0200)]
detect -isystem

The base part of 151abb8b2b9d3a22229b98cec12e29484d12109b (and follow-up)
fixes, for other commits using ISYSTEM.

Change-Id: I9ab1ef95ec02ad30f943084161f76da1b2985b88

9 years agoconfigure: use -isystem for GSTREAMER_CFLAGS
Michael Stahl [Fri, 31 May 2013 13:24:34 +0000 (31 15:24 +0200)]
configure: use -isystem for GSTREAMER_CFLAGS

... to work around GCC 4.8.0 -Werror=literal-suffix in gst/video/video.h
definition of GST_VIDEO_CAPS_RGB8_PALETTED.

Change-Id: I514b29d58f348bad0b13c7ef66db4b3ee34516cd
(cherry picked from commit 18b0bda1be62da1b0f9c1fc40864ccc486d5b43c)

Signed-off-by: Luboš Luňák <l.lunak@suse.cz>
9 years agoprevent cairo from using -flto with clang, cairo uses it incorrectly
Luboš Luňák [Wed, 26 Jun 2013 13:13:54 +0000 (26 15:13 +0200)]
prevent cairo from using -flto with clang, cairo uses it incorrectly

The option should be used also at link time (as e.g. the gcc man page says),
but cairo doesn't do so, and since -flto makes clang generate .o with LLVM
bytecode, plain ld chokes on it.

Change-Id: Ia5ce9a98afa4f88b8d0943a5971450d7009af913
Signed-off-by: Michael Stahl <mstahl@redhat.com>
9 years agoUpdated core
pje335_NL [Sun, 23 Jun 2013 05:49:27 +0000 (23 07:49 +0200)]
Updated core
Project: dictionaries  b4f6881beba5ad08eee1be27020351d8b92396f9

9 years agobnc#823675 RTF import: fix import of numbering bullet associated font
Miklos Vajna [Wed, 26 Jun 2013 13:47:54 +0000 (26 15:47 +0200)]
bnc#823675 RTF import: fix import of numbering bullet associated font

There were multiple problems here:

- \f had a special handler for the listlevel destination, \af had not
- in case of multiple \f or \af, the first one is used for the bullet
  font
- in case only \af is used for the bullet font, its value should be used
  for \f as well

Change-Id: I6631504c1aa9f2e0792a3469a5fdce5b7bd49518
(cherry picked from commit 55162d7422a3b175c7fe9c175e0dec91b1932b6a)

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

9 years agon#820504: start a new subpath with m and t in VML path decoding
Cédric Bosdonnat [Wed, 26 Jun 2013 09:26:56 +0000 (26 11:26 +0200)]
n#820504: start a new subpath with m and t in VML path decoding

Change-Id: I7bac4b111ede5e815d2ed121c18f4cfe1ad0950e

9 years agoForgot to remove one case where nParamCount is set to twice the value
Cédric Bosdonnat [Mon, 24 Jun 2013 09:39:30 +0000 (24 11:39 +0200)]
Forgot to remove one case where nParamCount is set to twice the value

Change-Id: I3649364a889b7ef6ce7ac4316a1621b6328170eb

9 years agobnc#823655 fix RTF import of freeform shape coordinates
Miklos Vajna [Mon, 24 Jun 2013 12:13:39 +0000 (24 14:13 +0200)]
bnc#823655 fix RTF import of freeform shape coordinates

E.g. 0,1 was imported as 1,0, as we did not differentiate between not
having the coordinate yet and having it as zero.

Change-Id: Ia5fbbcc791dc9c6866ffd4c146793690661d81b4
(cherry picked from commit ddddfe8d6ffa05c467bddb3480e43d7043a3d3c9)

9 years agobnc#823655 RTF import: ignore styles without a type
Miklos Vajna [Fri, 21 Jun 2013 13:48:39 +0000 (21 15:48 +0200)]
bnc#823655 RTF import: ignore styles without a type

Regression from 29dcdf6b56f8dbc1b7de0478afb04122f8dbf0f9.

Change-Id: I970c0e7b3652d7e6f093815b90e04e0c45904b28
(cherry picked from commit c6a941b51b68eb097d4d43323b39ff1aba4c753e)

9 years agofix for bnc#823935
Noel Power [Mon, 24 Jun 2013 10:47:55 +0000 (24 11:47 +0100)]
fix for bnc#823935

Change-Id: Id62e1f4845bfbc610f73499881dc33d3d955923b

9 years agowrite display attr of hyperlink only if value is different from stringtable
Noel Power [Fri, 21 Jun 2013 14:46:08 +0000 (21 15:46 +0100)]
write display attr of hyperlink only if value is different from stringtable

Change-Id: Iff6f16d6cdb539ad80ef01e91db51613e95053d1

9 years agon#820504: VML path import fixes: get back missing points
Cédric Bosdonnat [Mon, 24 Jun 2013 08:37:05 +0000 (24 10:37 +0200)]
n#820504: VML path import fixes: get back missing points

nParamsCount was set to the double of the expected value, but the code
handling the command only took the first set of parameters. Removing
this 2* in nParamsCount.

Change-Id: I2a4bb07fc9167e056a52c7adfbee9e1ef8e2636c

9 years agon#820504: Some imported VML paths are closed, try to detect the
Cédric Bosdonnat [Fri, 21 Jun 2013 08:47:42 +0000 (21 10:47 +0200)]
n#820504: Some imported VML paths are closed, try to detect the

Change-Id: Idefd0277a85bd7b2b727f59cc4e568869b4932a1

9 years agoimport different first page header/footer from doc
Luke Deller [Sat, 9 Feb 2013 15:31:47 +0000 (10 02:31 +1100)]
import different first page header/footer from doc

When a Word section has a different first page header/footer,
this used to be imported into LO as a chain of two page styles.
Now that LO supports a single page style with different first page
header/footer we can import to that.

This change also incidentally fixes fdo#57908.
bnc#654230 had the same underlying problem, so the workaround committed
for that (which includes comments expressing lack of understanding)
has been removed.

Reviewed-on: https://gerrit.libreoffice.org/2065
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
Signed-off-by: Luboš Luňák <l.lunak@suse.cz>
Conflicts:
sw/source/filter/ww8/wrtw8sty.cxx

Change-Id: I6df7e9abc8f2a327a3b33e06322ca943f6f24605

9 years agon#820800: docx import of wrap polyon was based on dest size of picture
Cédric Bosdonnat [Wed, 19 Jun 2013 08:42:47 +0000 (19 10:42 +0200)]
n#820800: docx import of wrap polyon was based on dest size of picture

... instead of the original size of it.

Change-Id: Ib251206dd092a7c47343caf50bd05a3dfec1af09

9 years agobnc#825305 RTF import of fFilled shape property
Miklos Vajna [Tue, 18 Jun 2013 14:22:32 +0000 (18 16:22 +0200)]
bnc#825305 RTF import of fFilled shape property

Change-Id: Iaa2ff9d5d1a28aec046f885acecbd1a44c734ec0
(cherry picked from commit 2af60e2eff4e952fff8cac0228b89f16ce3a436e)

Conflicts:
sw/qa/extras/rtfimport/rtfimport.cxx
writerfilter/source/rtftok/rtfsdrimport.cxx

9 years agon#820836: dmapper, fixed typos in first page style creation
Cédric Bosdonnat [Tue, 18 Jun 2013 09:01:20 +0000 (18 11:01 +0200)]
n#820836: dmapper, fixed typos in first page style creation

Change-Id: I80031cab7c0304311bd5acbb3a2ead48e15594bb

9 years agon#820504: default color hidden by Default style in writerfilter
Cédric Bosdonnat [Mon, 17 Jun 2013 11:42:34 +0000 (17 13:42 +0200)]
n#820504: default color hidden by Default style in writerfilter

Setting the font color of the default paragraph style to Auto makes the
color set in the Writer defaults (from rPrDefault) ignored.

Change-Id: I1dcd92bcd0774f5229785373242899a492ab7b7c

9 years agosync AppUpSUSEWin32.conf with SUSEWin32.conf
Andras Timar [Fri, 14 Jun 2013 14:26:45 +0000 (14 16:26 +0200)]
sync AppUpSUSEWin32.conf with SUSEWin32.conf

Change-Id: Id00334109ba953fb31079668ea52ab731bdb3d6a

9 years agoFixup alpha bitmap generation for Windows.
Thorsten Behrens [Fri, 14 Jun 2013 11:26:43 +0000 (14 13:26 +0200)]
Fixup alpha bitmap generation for Windows.

This improves upon d6f58fd25eeca84a94528409a05b80aa5172b8b8 by
using the BitmapEx ctor instead of manual initialisation. Several
EMF+ files would otherwise show up horribly mangled on Windows.

Change-Id: I1808cb45818f3f0118653164c83c49d6134b9324

9 years agoDon't display the "broken OLE link" icon except on Windows
Tor Lillqvist [Wed, 12 Jun 2013 14:04:49 +0000 (12 17:04 +0300)]
Don't display the "broken OLE link" icon except on Windows

Change-Id: Iede3d98ab5e5f9cd1896465e2a8c61605601999f

9 years agoFixed libcmis handling of related multipart content types
Cédric Bosdonnat [Thu, 13 Jun 2013 12:45:48 +0000 (13 14:45 +0200)]
Fixed libcmis handling of related multipart content types

Change-Id: I8468286be1affc635838b5329d2df72b53f5c9de

9 years agoRevert "bnc#819614: Fix runaway lines."
Petr Mladek [Thu, 13 Jun 2013 12:30:06 +0000 (13 14:30 +0200)]
Revert "bnc#819614: Fix runaway lines."

It caused several regressions when displaying shapes; for example,
in the test document for bnc#762695:

    + missing hyperboloids on several slides, e.g. 13, 14, 15
    + broken bubles on slide 32

This reverts commit c4345bcf488d24a45a6412cda41474de6baf00da.

9 years agon#816593: Floating table width import fix: adjust the frame width
Cédric Bosdonnat [Wed, 22 May 2013 09:34:01 +0000 (22 11:34 +0200)]
n#816593: Floating table width import fix: adjust the frame width

(cherry picked from commit 9f4c8a8bca06b4c2a916a51909367b453fc41a8b)

Conflicts:
sw/qa/extras/ooxmlimport/data/table_width.docx
sw/qa/extras/ooxmlimport/ooxmlimport.cxx

Change-Id: I8212bc5981418f6cbd514bf5002e6a5dbdf53152

9 years agoAdd some error handling to bitmap conversion.
Thorsten Behrens [Thu, 13 Jun 2013 10:47:02 +0000 (13 12:47 +0200)]
Add some error handling to bitmap conversion.

Fixup for 7cf2b5809f7137acc7a5eed9159042b3d748da01, makes sure cairo
has all data committed to the surface, and handle random errors.

Conflicts:
canvas/source/cairo/cairo_canvasbitmap.cxx

Change-Id: I39e5b5777968c4563a8ce3870bac3d4182090f3b

9 years agoRevert "fix fdo#60533, Set TEXT_LAYOUT_BIDI_STRONG flag."
Petr Mladek [Tue, 11 Jun 2013 07:19:03 +0000 (11 09:19 +0200)]
Revert "fix fdo#60533, Set TEXT_LAYOUT_BIDI_STRONG flag."

It caused some regressions. For example, see fdo65414 and fdo65562

This reverts commit 6708ad7f1baa8d4cef1718bdef1d26fb5d8510f3.

Change-Id: I0108463c78bbcb48a4c218d78e51deaa39caec0c

9 years agodon't hide cell content behind pivot table buttons, fdo#60877
Markus Mohrhard [Fri, 7 Jun 2013 03:28:04 +0000 (7 05:28 +0200)]
don't hide cell content behind pivot table buttons, fdo#60877

Change-Id: I1508aafcc7046c576a4d6de87900dc66f32b2f97
Reviewed-on: https://gerrit.libreoffice.org/4184
Reviewed-by: Kohei Yoshida <kohei.yoshida@suse.de>
Tested-by: Kohei Yoshida <kohei.yoshida@suse.de>
9 years agofdo#61923: sw: word completion: do not add trailing '.'
Michael Stahl [Tue, 4 Jun 2013 21:32:09 +0000 (4 23:32 +0200)]
fdo#61923: sw: word completion: do not add trailing '.'

SwAutoCompleteWord::InsertWord(): use the computed nWrdLen to cut off
trailing periods.

(regression from d602a3b280fcc1cf16660d8719cd8eb8797dd2ad)

Change-Id: I9f4ace62f8d9e7d233e7e210f476856d7841d869
(cherry picked from commit 246d7e280ea8b7d1e27e14a6568d2a65cc8c9e7b)
Reviewed-on: https://gerrit.libreoffice.org/4159
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
9 years agofdo#64962 - ignore exceptions from checking with the update service.
Michael Meeks [Wed, 5 Jun 2013 12:03:22 +0000 (5 13:03 +0100)]
fdo#64962 - ignore exceptions from checking with the update service.

Change-Id: If627b303f8710b915dcbdcb899454631f607e217
Reviewed-on: https://gerrit.libreoffice.org/4164
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
9 years agon#779642: 0 width or height in //v:shape[@style] produces weird results
Cédric Bosdonnat [Wed, 12 Jun 2013 14:01:00 +0000 (12 16:01 +0200)]
n#779642: 0 width or height in //v:shape[@style] produces weird results

(cherry picked from commit b7144acb2bfa369fb89146d060dbd8ddd547f4c1)

Conflicts:
oox/source/vml/vmlshape.cxx

Change-Id: I37ba59dd54ac692f234f3228e442799c5a5f450b

9 years agobnc#820819 docx import: don't apply complex font size to non-complex font
Pierre-Eric Pelloux-Prayer [Thu, 20 Dec 2012 14:39:37 +0000 (20 15:39 +0100)]
bnc#820819 docx import: don't apply complex font size to non-complex font

OOXML spec says:
"[szCs] specifies the font size which shall be applied to all
complex script characters in the contents of this run when displayed"

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

9 years agoCairo canvas fixes
Michael Meeks [Mon, 10 Jun 2013 16:02:06 +0000 (10 17:02 +0100)]
Cairo canvas fixes

+ Move BitmapEx construction from an XBitmapCanvas into BitmapEx
  where (arguably) it will be easier to re-factor later, treat a
  mask fetch failure as if we have no mask
+ Teach the cairo canvas to return a non-pre-multiplied RGB +
  separate Alpha BitmapEx when it can to avoid unpleasantness with
  the underlying X resources.
+ Add tentative code-path to convert 32bit color Bitmaps into
  24bit color, to avoid confusing X

Change-Id: Iaf6998c796aea6d73c57bed2bc03152d9636d5f5

Conflicts:
vcl/source/gdi/gdimtf.cxx

9 years agoRevert "pass argb32 pixmaps from vcl to canvas, avoiding x11 roundtrips"
Michael Meeks [Wed, 12 Jun 2013 08:20:19 +0000 (12 09:20 +0100)]
Revert "pass argb32 pixmaps from vcl to canvas, avoiding x11 roundtrips"

This reverts commit 6b8e311ddc633bb13053d13c5d0f29240039846b.

Conflicts:
canvas/source/cairo/cairo_canvasbitmap.cxx
vcl/unx/generic/gdi/salgdi2.cxx

9 years agoRevert "fix canvas bitmap rendering (argb32 pixmaps) fixes color in n#780830"
Michael Meeks [Mon, 10 Jun 2013 11:10:50 +0000 (10 12:10 +0100)]
Revert "fix canvas bitmap rendering (argb32 pixmaps) fixes color in n#780830"

This reverts commit 1a977c09ec478b58eaa49a2372ca8696c4fbe336.

Conflicts:
vcl/inc/salbmp.hxx
vcl/source/gdi/gdimtf.cxx
vcl/unx/generic/gdi/salgdi2.cxx

9 years agobnc#802888 SwPageFrm: one more clickable field fix
Miklos Vajna [Mon, 10 Jun 2013 12:48:59 +0000 (10 14:48 +0200)]
bnc#802888 SwPageFrm: one more clickable field fix

This is similar to a996678ed30804e16103e1cfdc439c8546e5d3b0. If we have
both a background object and some clickable field to select, we should
always prefer the clickable field.

This time, the problem was to click on a clickable field, when the
cursor was in normal text and we had a full-page background object.

Change-Id: Id25036d8cb2ddf62011c22bfc50844b793b942bd
(cherry picked from commit 721baad94ee81d9d6281edb93ee45936f6e0e496)

Conflicts:
sw/source/core/layout/trvlfrm.cxx