| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Change-Id: Icfe653b3a5f307d21a8c99ce4c133234aa36378b
|
|
|
|
|
|
|
|
|
| |
(cherry picked from commit 36c64bc194714d60a5c18f63bcfc0f721c2056db)
Conflicts:
writerfilter/source/dmapper/DomainMapperTableManager.hxx
Change-Id: If592f5a2f29c207daf9a603a4332da9bc8c5ae3b
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
(cherry picked from commit d0cde9640b52ccfbb28ed1f65bba0927afd7b69b)
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
writerfilter/source/dmapper/DomainMapperTableManager.cxx
writerfilter/source/dmapper/DomainMapperTableManager.hxx
writerfilter/source/dmapper/TablePositionHandler.cxx
writerfilter/source/dmapper/TablePositionHandler.hxx
Change-Id: I706d36358db98524bdf5d1caf0f0543b9170b0bc
|
|
|
|
|
| |
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
In case the right margin is larger then the tab position (e.g. the right
margin of 7cm, there is a tab position at 16cm and right margin begins
at 9cm), we have a conflicting case. In Word, the tab has priority, so
in this conflicting case, the text can be outside the specified margin.
In Writer, the right margin has priority. Add a compat flag to let
the tab have priority in Writer as well for Word formats.
This is similar to TabOverflow, but that was only applied to left tabs
and only in case there were no characters after the tabs in the
paragraph.
(cherry picked from commit bdfc6363d66aa079512cc8008996b633f693fed1)
Conflicts:
sw/inc/IDocumentSettingAccess.hxx
sw/inc/doc.hxx
sw/source/core/doc/doc.cxx
sw/source/core/doc/docnew.cxx
sw/source/filter/xml/xmlimp.cxx
sw/source/ui/uno/SwXDocumentSettings.cxx
writerfilter/source/filter/ImportFilter.cxx
Change-Id: Ib07abd5db1daa916b8b4d9530d09d4d0c4af026e
|
|
|
|
|
|
| |
These were ignored previously, and in case they contained some margins,
the resulting table was potentially smaller than necessary.
(cherry picked from commit 672de66ff8ad6d1fbf8a198ee518c996611b9e2d)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
At the end of the header/footer import, the last empty paragraph was
removed. In case the last but one paragraph was empty, but had character
properties (e.g. a custom font size), the removal changed these, and
used the character properties of the last paragraph instead.
Simply dispose the last paragraph, this way character properties are
always kept.
(cherry picked from commit e8b661dd0aed9b35104e910acbb814748a2c3af0)
Conflicts:
writerfilter/source/dmapper/DomainMapper_Impl.cxx
Change-Id: Ic78f197fe99458becb9d86901bee6dfcb7076a13
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
...or we may have some additional properties set on some styles.
(cherry picked from commit b95d203bc17c83ec0fe5139f519d53ed1d842d3a)
Conflicts:
sw/inc/IDocumentSettingAccess.hxx
sw/inc/doc.hxx
sw/source/core/doc/doc.cxx
sw/source/ui/uno/SwXDocumentSettings.cxx
writerfilter/source/filter/ImportFilter.cxx
Change-Id: I5a5d307931a2a6c1f25bd2da93381d8de65c2480
|
|
|
|
|
|
|
| |
Change-Id: I32317a1a6500377f7e7bb98d1dcc65ad86feb9a2
(cherry picked from commit 7e3923520c27ff139bc3abab35a1c01e1a785fb1)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Regression from commit d2d77fd86e6cb7341e113557e2cfe3d7948759bd
(cherry picked from commit 41890bf714803969515578b47e63fa9730ea7090)
Change-Id: I7accc5c383de3fa53c12527766c3fc155bfa9863
Reviewed-on: https://gerrit.libreoffice.org/1235
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Previously textframes inside groupshapes were tried to be imported as
TextFrames, but then their addition to a GroupShape failed, so the text
simply ended up as a normal paragraph. Fix this by importing members of
groupshapes as drawinglayer objects, just like how the WW8 import does.
Also fix two testcases, which implicitely tested that the groupshape VML
element is ignored on import.
(cherry picked from commits 7fe05dc95d0c9a584e07483c04b13c071d55293f and
d5c934d150cb6cea5f96cbbee4fb5e8312bf027e)
Conflicts:
oox/source/vml/vmlshape.cxx
oox/source/vml/vmltextbox.cxx
Change-Id: I1a9fba8a5fd532203a825e55b1d5996277ea12fa
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
In general, DOCX tables provide a grid for the table, then use spans in
case different number of cells are used in different rows. In this case,
the cell width is ignored, as the wished width can be counted from the
grid and span values.
However, it's also valid to simply provide more cells then the amount
defined by the grid, and in this case the cell width should decide the
final width of the cells. This commit adds support for this later case.
(cherry picked from commit ad913681c0e0cdaaa706329f518f59ee54b86d43)
Conflicts:
writerfilter/source/dmapper/DomainMapperTableManager.cxx
Change-Id: I0dd6c1f0c06f81c2afa00489b7ad1f33ff300a7c
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
See commit 66fa759b for rationale, this fix just does the same for JPEG
files as well.
(cherry picked from commit ebc61e11cdb02f5cc33aeabead3d191eaf0d23d3)
Conflicts:
sw/qa/extras/rtfimport/rtfimport.cxx
Change-Id: I6a9ead5f4b4b9c4661cae99501bd7c14a2a79409
Reviewed-on: https://gerrit.libreoffice.org/991
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We used to send nothing when we got nothing, but this is not correct:
\pvmrg and \phmrg is the default in RTF, but not in Writer.
(cherry picked from commit 7b7bee4ed5722ce59ffd3394a0330d71d69d66b3)
Conflicts:
sw/qa/extras/rtfimport/rtfimport.cxx
Change-Id: I9f69e282e68f0828c8b5ba98657cad1dd0715eb3
Reviewed-on: https://gerrit.libreoffice.org/993
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The image was special in that the resulting Graphic's
GetPrefMapMode().GetMapUnit() wasn't MAP_PIXEL.
(cherry picked from commit 5ef0f1dc9a70c20fe6879832b782a0c34724353f)
Conflicts:
writerfilter/source/rtftok/rtfdocumentimpl.cxx
Change-Id: I681e344a042721b99f6cb2e599f9c65156d219a4
Reviewed-on: https://gerrit.libreoffice.org/860
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Regression from commit 1fdd61db155cf63d5dd55cc2bfb45af33796e131,
continuous section break does make sense at the end of the doc, if the
previous type was a non-continuous.
(cherry picked from commit abd4ffadf30e02284290ea35e8f45d9ffd8eb5ee)
Change-Id: I6d82c67e068d8dc3ce1edb1a5fe6ad293afd805d
Reviewed-on: https://gerrit.libreoffice.org/877
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
|
|\
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
desktop/source/app/sofficemain.cxx
instsetoo_native/util/openoffice.lst
solenv/inc/minor.mk
Change-Id: I3e9510067c7173f6c71368e70ba6dfe168c5318e
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Replace the 2 duplicate implementations of this in ww8 and writerfilter
with a common one. Differences were:
2) ww8 doubles the with, writerfilter does not
13) unsupported, mapped to THINTHICK_SMALLGAP vs. THICKTHIN_SMALLGAP
22) unsupported, mapped to DASHED vs. SOLID
26) INSET not supported in writerfilter
27) OUTSET not supported in writerfilter
Change-Id: I533b77394388e736f38d70284a6a11061d81e813
(cherry picked from commit ecd70a727d7f559ebda1dd726cea1be472948270)
Reviewed-on: https://gerrit.libreoffice.org/846
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Unused temporary XShape need to be disposed to avoid remaining garbage
in the document.
Change-Id: Iaf6e720a1c47605136f7f9ccafb605cab6dc260a
(cherry picked from commit f1fc7c5655dde547b721b3afffabcd8bdbe0add2)
Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
0 means auto, and for fdo#50539, this value was ignored. However a next
sample shows that we should send something to the dmapper: COL_AUTO.
Change-Id: I8d7d35125c9027dfb45288bbfbfa81ba4799e78d
Reviewed-on: https://gerrit.libreoffice.org/740
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Usually table text comes after the \intbl control word, but it turns out
text is allowed earlier. Make sure such text is buffered, otherwise
we'll send paragraph / run properties to the dmapper in the middle of
table properties, which is obviously not allowed.
(cherry picked from commit af6b7d8ba30d395e5f4a17876526434cf0a06005)
Change-Id: I34f1df7e171316a7d926179689627301860d492f
Reviewed-on: https://gerrit.libreoffice.org/689
Reviewed-by: Noel Power <noel.power@suse.com>
Tested-by: Noel Power <noel.power@suse.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
E.g. 0x010d was parsed as a newline character... This also makes the RTF
workaround from fdo#39856 unnecessary.
(cherry picked from commit b3603e0e0e5dbfbeaa2426c499e8f64be2d15765)
Change-Id: I5e4a95b4436e1492b64961820702caace0a33e4b
Reviewed-on: https://gerrit.libreoffice.org/665
Reviewed-by: Noel Power <noel.power@suse.com>
Tested-by: Noel Power <noel.power@suse.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
(cherry picked from commit ebf0e1953ef422bb83201c89f0558bb9071edf63)
Change-Id: Ib7b48986d5b01c75ae0be8dd6618a2e8be2ae51c
Reviewed-on: https://gerrit.libreoffice.org/663
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This is similar to fdo#40686 (dyaLinePitch only valid between [1-31680]) for
the .doc format
Change-Id: I7d2745d695320b4b6b22ec2b519f092932587c2e
(cherry picked from commit a9b7ceea2bf3d6d38fb6c8a4c1fffb9be4714348)
Reviewed-on: https://gerrit.libreoffice.org/599
Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
Tested-by: Luboš Luňák <l.lunak@suse.cz>
|
| |
| |
| |
| | |
Change-Id: Id7f1471b49af52e6f6b0515ccd1fe8e12c50d9b5
|
| |
| |
| |
| | |
Change-Id: I4cb64ae2b2f2dbf643e38c5208eb759f265acafd
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This a follow up of commit 53b7f7df0617bcbd7bbef9a34ef53e5097eb16dc
Reviewed-on: https://gerrit.libreoffice.org/714
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
(cherry picked from commit 3cb619bd15a6017f253891f4c377fc790d8aae82)
Change-Id: Ia0f79ca24418636af14162e9f339237d847dc221
|
| |
| |
| |
| |
| |
| | |
This reverts commit 29982fd31b163730ad54c414bf772e021af31e9b. It turns
out that this hack is not really needed for n#778140, but it causes
problems, for example in case of n#775899.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
commit 5d4bd2f97128adecc5b11699e98c934be3c3a462 unconditionally enabled
AddParaTableSpacing doc setting, which broke the layout of some
documents, e.g. n#778836. Fix this by doing what the WW8 importer does:
enable the setting only in case the w:doNotUseHTMLParagraphAutoSpacing
tag is present.
(cherry picked from commit 68338abfd657ad5511a8a77b431ace8ad465c35e)
Conflicts:
writerfilter/source/dmapper/DomainMapper_Impl.cxx
writerfilter/source/filter/ImportFilter.cxx
Change-Id: I104259a1f37f28e3c4362eb638a134b593fcb851
|
| |
| |
| |
| |
| | |
Change-Id: I181fcae021eed07608b06744b469628e4d78ccba
(cherry picked from commit 847c5c1339bf0cfd9f3e3c92e8d81ef32bee6c21)
|
| |
| |
| |
| | |
Change-Id: I2bd76799cf0a5da09664d0e1b1a9adb466633be1
|
| |
| |
| |
| | |
Change-Id: I7720cfc706d9612fcc1e8a53b13a31f22b91d99e
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When a nested table is ended, it resets the m_nCell to 0... and thus the
filter forgets about the previous cells of the outer table row it is
importing. Using a vector to store the m_nCell values for each table
solves the problem
Change-Id: I8007960f4c95d713bfedc6b815d5783a5d25af23
|
| |
| |
| |
| | |
Change-Id: Idba155358166db358b0ef36b71a0bcf5abf77ce9
|
| |
| |
| |
| | |
Change-Id: I72188eef689c656b56e2c19e60e0104a1e6d87bf
|
| |
| |
| |
| | |
Change-Id: I9e8dee39f63a08517eb654e33747bd8c95d84b59
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Word clips pictures that are bigger than a page instead of scaling them
down. This patch introduces a new compatibility option to allow clipping
a picture in Writer instead of scaling it down.
Conflicts:
sw/inc/IDocumentSettingAccess.hxx
sw/inc/doc.hxx
sw/source/core/doc/doc.cxx
sw/source/core/doc/docnew.cxx
sw/source/filter/xml/xmlimp.cxx
sw/source/ui/uno/SwXDocumentSettings.cxx
writerfilter/source/filter/ImportFilter.cxx
Change-Id: I4defbee05be81e23ec28a2ed272eaf4e4cc6faf5
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This fixes docx import of page breaks in empty paragraphs, when the
compat option in question is set.
Even empty paragraphs have an "end of paragraph" character in dmapper:
import page breaks there, instead of delaying the import till the
all-catcher importer at the start of the next paragraph.
Change-Id: Ie5c37042b3c445e0669771d15c8eb46380192db3
(cherry picked from commit 40d93d978d4f8fa709bdeb061b106122789d8e32)
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Subscript relative font size (w:position) is in percents in Writer, but
is in half points in Word. When checking for the default font size to
count the percent value, the mapper should search font size (w:sz) not
only in direct character properties, but also in default character
properties (w:rPrDefault).
Change-Id: I9286d44c6498c765ddfee795d50921ef58b80071
(cherry picked from commit 0c8017a364efb0e8a1cab57b22257e9b319fa0a1)
|
| |
| |
| |
| |
| |
| |
| | |
SvxEscapementItem stores the vertical offset as percentage, so it depends
on the font size.
Change-Id: I1b2d5b2c230b6243a6c1a4580147c4e0c4ae94cc
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
There currently does not seem to be any sane way to process
an attribute or sprm that depends on another one that may not
possibly be there yet (e.g. in e7ab4bb6b0e83f01148ffff41e8c5eaa0c5ba0a4,
or w:position which for Svx internal reasons depends on fontsize
and thus w:sz).
So make it possible to defer such properties and process them
only before they are actually used, instead of trying to get them
out of PropertyMap, possibly in more places and possibly having
to undo the changes that have been done to them already.
Conflicts:
writerfilter/source/dmapper/DomainMapper_Impl.hxx
Change-Id: I1630057ecdf46443647ec1dd5253983ae15a083f
|
| |
| |
| |
| |
| |
| |
| |
| | |
This dark magic is needed to have a behavior similar to the one of Word
for images anchored in headers/footers. Writer can't have pictures laid
over the header/footer but below the body text.
Change-Id: I2c001d4f696c1623370c531059b74e3d5fa4f5b7
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If w:doNotUseHTMLParagraphAutoSpacing is enabled, it should be 100, not
200, see SwWW8ImplReader::GetParagraphAutoSpace().
(cherry picked from commit 526e007bb6340e2c4a2cb96f5612ba268fcd5583)
Conflicts:
writerfilter/source/dmapper/DomainMapper.cxx
Change-Id: I29c5e97c828f0f55b655410198bfa03dc42a196d
|
| |
| |
| |
| |
| | |
Change-Id: I129e154a3fea8a96607dc6350a99f4d6ca68196e
(cherry picked from commit 211916f86585cb4f6258eb30e0474e4c21cd37f1)
|
| |
| |
| |
| |
| |
| |
| |
| | |
The problem was that the framePr token made the table import fail. Given
that frames inside w:sdtContent are invisible anway, just ignore them.
Change-Id: I88ab9d5dd6cf362c629de74bc079c3108725f0a1
(cherry picked from commit 73bd937420b9a99e1e35950e3f9dcbcfd874876d)
|
| |
| |
| |
| |
| |
| |
| | |
Previously cell-margin was unconditionnaly used to compute table position.
Office only does so on top-level tables and if tblInd is missing.
Change-Id: I183647bcf090d5822b3f2e04e097c8bbd277168d
|
| |
| |
| |
| |
| | |
Change-Id: Ib9e9cce5abdcf00c2546f831c8af191da10e1b15
(cherry picked from commit 1a60519fcd7706b487ceb7c5e879a81a6109f839)
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This reverts commit 61c94cbe2cbbbcaa1e44edecc4add60eb6d7937d (as it
touched values which are not in the spec) and sets the correct paragraph
top/bottom margin in case the compat option is enabled.
(cherry picked from commit a10bb9a08b7a96477eefce59f8900cf49604316d)
Conflicts:
writerfilter/source/dmapper/SettingsTable.cxx
writerfilter/source/dmapper/SettingsTable.hxx
Conflicts:
writerfilter/source/dmapper/SettingsTable.cxx
Change-Id: I152a76d8fcdef3acf5491783c2ccacd2d48e76b3
|
| |
| |
| |
| |
| |
| |
| | |
The character properties of the field are applied when the next run
begins, so insert an empty run right after the field to fix the issue.
Change-Id: I18d747d99d6604fa331a0e70e6989f9f4975eab2
|
| |
| |
| |
| |
| | |
Change-Id: If2e0d2f4805cd04bec0dd7983ec544b9922ef796
(cherry picked from commit 61c94cbe2cbbbcaa1e44edecc4add60eb6d7937d)
|