... instead of the original size of it.
Change-Id: Ib251206dd092a7c47343caf50bd05a3dfec1af09
(cherry picked from commit ae6981601b0e9175efaf9849b1279290ea3380f6)
This bug fixes the DOCX import and export filters, adds a new property
to the document model and updates the UNO API.
There is no need to add layout \ UI updates, because in Word
the only way to turn this on\off is using a simple button,
and there is no way to control the shading color itself.
However, ODF import \ export filters should be updated in a future
commit.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Change-Id: I1d34cec79289e38c08e42a4c6265d998e1edfdef
Reviewed-on: https://gerrit.libreoffice.org/4452
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
These are just the minimal changes, so that writerfilter calls into
oox::shape::ShapeContextHandler, which does the real work.
Change-Id: Ia53731ac8592964b70e8a438ed09262463c05360
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
(cherry picked from commit d7acb5ba0924f848f1ae96eceab50a0169d18445)
this will fix the alignment for RTL paragraph when import/export MS docx file.
the alignment should be exchange when the paragraph are RTL.
it will also fix text direction export for RTL paragraph.
Change-Id: I5fe55205677d6e12142e398570cba78094705692
Which did it because of bullet font not having it correctly
(fixed in 44c133ef996e32ebdfc9560bcf14b0cd77196a9e).
Change-Id: I6992de03816661cf6970140eb35816e26cf0e612
Previously this only worked if we had indexes in the document as well,
but actually these are independent.
Change-Id: I28afa60d2606230c901948d4c1da8f5a7c50a9f7
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.
Change-Id: I2e3e70dfe7386090fe356575ee9d0e81aa031dc4
See the comment in SectionPropertyMap::ApplyBorderToPageStyles() on what and
how is mapped. The control flow is like this: BorderHandler::lcl_attribute()
notices w:shadow, then PageBordersHandler::lcl_sprm() gets it, passes it to
SectionPropertyMap::SetBorder(), finally
SectionPropertyMap::ApplyBorderToPageStyles() uses the UNO API.
Change-Id: Ib0aef3245f58c62655769357f1f4dd07eef77f62
Apparently the top/bottom line of text alignment in writer is backwards
compared to all others, while alignment to the top of a page puts
an object's top edge at the top of the page, top of line of text
puts the object on top of the line (i.e. bottom edge of the object
at the line). The handling of NS_rtf::LN_YAlign suggests that swapping
bottom and top in the input filter is the right way of handling this.
Change-Id: I916c8ea0f2fd00de3e17b16b31433c9b6ba92e64
should have higher priority than that from table style
Found by: Jinlong Wu,wujinlong@gmail.com
Patch by: bjcheny,companycy@gmail.com
Review by: zhangjf
(cherry picked from commit fe7e723a727f6def90ee80ef2964a40546b37a90)
Conflicts:
writerfilter/source/dmapper/DomainMapper.cxx
Change-Id: I3f4c96d49de40b21cc3da9bcb5e588a270434cd8
that an AbstracNum references to a style, which references to another Num
Found by: xiao ting xiao
Patch by: Jinlong Wu,wujinlong@gmail.com
Review by: zhangjf
(cherry picked from commit d6870e145cc7373a422b414c31380cc1399e64cc)
Conflicts:
writerfilter/source/dmapper/DomainMapper.cxx
writerfilter/source/dmapper/NumberingManager.cxx
Change-Id: I9be0b82d601bf43da31842edb02c4b0d4e50e84f
The problem was that when border was enabled (and the importer leaves it
unchanged, and it's on by default), there was not enough space for the
text.
Change-Id: I3ce770eb523389bcf7c5e83d4e76155e2c45de6d
from StyleSheetEntry when constructing a new TableStyleSheetEntry object
Patch by: Jinlong Wu
(cherry picked from commit 11eb354532cfb354f9f7c3a72b170c9c8289b75c)
Change-Id: I80054bc6c36bc7c5ed1034e0aadd88cd1a2f3091
Also factor out the w:sdt-related methods to a helper class to avoid
DomainMapper_Impl become a God object.
Change-Id: Ic1a388940bce89688e8558818f92ce9ac997609c
commit f837c4288cdae4921b3fb6747ba2e2cd5ce2dcd2 moved the handling of
w10:wrap tag in oox, but thus no wrapping was imported any more.
The fix consists in letting the w10:wrap element be handled by writerfilter's
dmapper if the shape has already been retrieved from oox (which is the
case for textboxes). In other cases, make sure that we don't set the
Surround property once again in writerfilter as that would override what
has been done in oox.
(cherry picked from commit 51d5e90b7c09cb980bc72a2c6b1a65303ef15ea2)
Conflicts:
oox/inc/oox/vml/vmlshape.hxx
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Change-Id: I8ab158641afcf6b9945c52238e7f5adb9e8b3adf
The code relies on NS_ooxml::LN_CT_Style_type being handled first
(because of m_pImpl->m_pCurrentEntry being reset there), so
at least check for it. Still no idea how to actually ensure
the correct ordering in this overdesigned $#%@! writerfilter thing.
Change-Id: Ib6a2129a078728e162257275ac2a1243dbaf4017
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
Maybe just works around the root issue (I did not debug deeper if this is
correct to have 0 here), but improves the code overall, so why not to do this.
Change-Id: I7c2b7f7e410faea5c1d6f3c15f1bc0f155dfb1f4
