Age | Commit message (Collapse) | Author | Files | Lines |
|
(cherry picked from commit 6b5ef795ed4a56195bf09633b03e88474f0b133c)
Conflicts:
sw/qa/extras/rtfexport/rtfexport.cxx
Change-Id: I482735e3fc4091be983b2c7484e086f5d0dd283a
Reviewed-on: https://gerrit.libreoffice.org/8056
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Commit 279ff2e03371542d014bf281e73282ba8080cf6b (bnc#816593 DOCX import:
fix auto para spacing without compat option, 2013-08-28) corrected the
value of "auto" paragraph spacing, but unfortunately this triggers a
layout problem:
warn:legacy.osl:12692:1:sw/source/core/layout/tabfrm.cxx:2513: debug assertion: <SwTabFrm::MakeAll()> - format of table lowers suppressed by fix i44910
resulting in "the rest of the table is not rendered by the layout".
Given that we backported the original fix to stable branches as well,
just stay on the safe side and revert back to the original behavior in
case the document requests the web layout.
(cherry picked from commit 8b6ff51bb89db0d7050bb4d00c0ec797b4754f25)
Conflicts:
writerfilter/source/dmapper/SettingsTable.cxx
Change-Id: I72683530b5218beff084bec8218cc99946b44802
Reviewed-on: https://gerrit.libreoffice.org/8081
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Regression from bbef85c157169efa958ea1014d91d467cb243e6f (bnc#779620
DOCX import: try harder to convert floating tables to text frames,
2013-10-01), the conversion of nested tables is delayed by default till
we know the page size. However, in case the anchor is in a table, we
should convert it right away, because the conversion of the parent table
would invalidate our XTextRange references.
(cherry picked from commit e5fd7c2dacf3c128cdc62622e736ce8abbc578a5)
Change-Id: Id41556e721c6e1c7239e4ea25abd57c999d2219b
Reviewed-on: https://gerrit.libreoffice.org/8080
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
In this document written by "XMLmind XSL-FO Converter" there are less
\cellx than \cell and thus when reading \nestrow/\row a whole buffered
nested table \cell is lost and then subsequently the rest of the nested
table too. Try to fix that by counting both \cell and \cellx and
replaying until the maximum of those.
Cannot count \intbl since we synthesize that in various places.
(regression in LO 3.5)
Change-Id: I3b64ad94af842e076611418589a0c83bd18841c6
(cherry picked from commit 07ef4cf096015f0e427ffd17cd26bb6837e75481)
Reviewed-on: https://gerrit.libreoffice.org/8100
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
Commit 9389cf78e304a5a99bcf1745b9388e14ac36281a (cp#1000018 RTF import:
empty para at the end of footnote text got lost, 2013-11-15) assumed
that \par at the end of all substreams means an empty paragraph, but it
turns out this is only true for footnotes/endnotes, but not for e.g.
headers.
Additionally, that commit actually causes a memory leak, which is
detected by an assert in the SwIndexReg dtor, so crash-testing caught
this.
(cherry picked from commit f7ef84640258e4ee6ddc4cc5cbf58a2d89860afa)
Change-Id: Idfa040bf3026a9515a120cd7afaf7d314553a131
Reviewed-on: https://gerrit.libreoffice.org/7663
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
|
|
Conflicts:
sw/qa/extras/rtfimport/rtfimport.cxx
Change-Id: I6bbad2d69863020ea870be800f49e13e763b80bf
Reviewed-on: https://gerrit.libreoffice.org/7667
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
|
|
The table manager can work with more table simultaneously
and so m_aCellWidths contains more table's properties.Only one
item of it belongs to the current table (getCurrentCellwidths).
Regression from 74c5ed19f430327988194cdcd6bdff09591a93fa
(cherry picked from commit d0c383256ef72d5212d8e2db77582d0ebe417209)
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Change-Id: I93efac0c004af1b2524c955ffb20c3ecd74a2920
Reviewed-on: https://gerrit.libreoffice.org/7543
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
Change-Id: I9bf24eb2d3087e855d54c0ee7aba4e98dc856cc2
(cherry picked from commit e8d10f215e9da65617988a9a471be18775afad00)
|
|
And not the other way around, how
24ee3df385cf2aa95cd888581c84fdf90cc682dc (RTF import: fix priority
handling of shpz vs dhgt, 2012-04-10) did, this time with a reproducer.
Change-Id: I9412341c6b35ca2760e4490a18f11bc6a0e0b78a
(cherry picked from commit ff7ac1a9b82bc20fe6e3d82322e53a7024edb84f)
|
|
Call endtrackchanges when rPrChange ends so the
corresponding redline will be removed.
(cherry picked from commit 75e7d6f12e914b63e66968890533b2a56d0b1a7e)
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Reviewed on:
https://gerrit.libreoffice.org/7195
Change-Id: I4091d7b54e0a74f3158cc979f210577a2dc29783
|
|
These describe an explicit horizontal merge, that is not something Word
itself creates, but it turns out the Calc RTF export does.
(cherry picked from commits bb562304c1e1c61a882e6db65806cfdf8601bcbf,
97dcf77841d19d344d58d5bdacdab141cdea4817 and
6eb02ac8a77f9f89f256b190281029f6cbd60d95)
Change-Id: I1b6ec10bb8e8bd40e24791ccc96f2f066dd0d5d5
|
|
In case the groupshape contains textboxes and they contain table, we
don't import the groupshape itself, just the children, as drawinglayer
rectangles wouldn't handle tables.
If that's the case, don't try to apply properties on the groupshape, as
that would crash (the Writer drawpage implements XShapes, but not the
XShape interface).
Change-Id: Ie34039170314b772dd050eb354681cfaec61c1fa
(cherry picked from commit 3e199f81473d1f85a75238ac03d38a220f3ab818)
|
|
This reverts commit 66e68fe28a7bfb37d4fdeee9bed1d9a0ff840935.
there some error in this patch.
|
|
Change-Id: I39462fc722a58b32e8829a9f2005a411871f255d
|
|
Word wants this, so it's added by the exporter to the document, but on
import we should ignore it.
Change-Id: Idcb669ba624bf462a50a85eb4aacf397afb6efe6
(cherry picked from commit b38629ae210b204a6d24d6e9c5c62eaaf563d494)
|
|
Change-Id: I0f475c396ec76ee7faa2cd0699181c58934e61e7
|
|
Change-Id: Ib1cb82d46322bd7c6791fa9a8937492ef27ec370
|
|
|
|
Change-Id: Ia48c8e3ef9dfb1f1f881845813ada518231352f2
(cherry picked from commit 44397a6f36ae6db697899c4595afe617e5fbe8ca)
|
|
Change-Id: I3f9d69ddbb2144c60a724e4242128b65ae167455
(cherry picked from commit a56bfe734a7bed40a175e0eeb7e86e7006a83f83)
|
|
Change-Id: I5c3903a40b69867684707d33acbc92b1f80a93ec
|
|
Also, adapt anchoring to what we have in VML import as well: when the
paragraph moves, the shape should stay at the same place. (This is a bit
odd, as ideally Word does not support at-paragraph anchoring, but this
change results in the behavior what Word does at the end.)
Change-Id: I3b849b2898d303e48920e6056c472f08fbb43af1
|
|
Change-Id: I8880c7413b10a284c9e55170afa35527dc7593ea
|
|
Change-Id: Ia89552658dc79568cc46b92e949fc1935434e43d
|
|
change code like
aStr = OUString("xxxx");
to
aStr = "xxxx";
Change-Id: Ib981a5cc735677ec5dba76ef9279a107d22e99d4
|
|
Change-Id: I9a0cb95d875328dab21950ead06d56c4dac8305d
|
|
The XInputStream for activeX.bin files is stored as the PropertyValue
"OOXActiveXBin" into the "InteropGraBag"
Added mxActiveXBinList object which holds XInputStreams for each
activeX.bin from activeX folder.
Added .bin files entry to respective acivex.xml's .rels file.
Added Unit Test to test all .bin files are stores properly.
Reviewed on:
https://gerrit.libreoffice.org/6679
Change-Id: I3a0e9462a6cc53d8cbb9c7d59ed24631d77d4d30
|
|
Problem Description:
In "w:spacing" value of "w:line" attribute value in table is not getting is preserved.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/6678
Change-Id: I2b0284a22da3a828c81876960f488049be4f8681
|
|
During import a flag and fixed value is stored in InteropGrabBag and
during export we check for fixed value and value available in para spacing
object. Write autospacing only if para spacing values are not modified during
edit.
Reviewed on:
https://gerrit.libreoffice.org/6575
Change-Id: If34c5b61c3180b01e68dfe83862784c3d6f33981
|
|
Updated 3 testcases, in all cases first checked that the new behavior
matches what Word does.
Also added a new test, to check that empty para at footnote end is now
kept.
Change-Id: I96b8788feb4d730b5a64ba3a743311a0180ab41f
|
|
The XDocuments representing the DOM of an OOXML's activex document
is stored as the PropertyValue "OOXActiveX" into the "InteropGraBag".
Added mxActiveXDomList object which holds xDocument for each
activeX.xml from activeX folder.
This changeset stores only activeX[n].xml files.
Relationship files (example activeX.bin) from activex are not stored
yet. (Working on it.)
Reviewed on:
https://gerrit.libreoffice.org/6654
Change-Id: I658e361211e1446ed095a73b0422da0c4f74df1c
|
|
When importing bitmaps coming from VML code, we were mistakenly ignoring
rotation information: we have just added it to the existing XShape object.
In the case of bitmaps expressed in DrawingML, the code was transforming
them into SwXTextGraphicObjects which don't have rotation information.
We are now preventing that transformation when rotation value differs from
zero, leaving the XShape object that was built in the first pass through
the document.
Added a unit test.
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Reviewed on:
https://gerrit.libreoffice.org/6484
Change-Id: I40100f8919894e48c005f8ed445bb5cad4f58d8b
|
|
Change-Id: I8b9e0629710c3b48c26a19158ab54bb250d79d5c
|
|
Change-Id: Ida3365b0451b947e04d7097799ac5108f76fc1a5
|
|
...so it will be able to use SvtSecurityOptions internally.
Change-Id: Id7433247e8fc53651935578510bedbcca5aa2ac9
|
|
Commit af7d4a5ebf3e6a09cd2079f241dee16aa22e0276 (n#820503: initial MCE
support in writerfilter ooxml tokenizer, 2013-07-03) introduced initial
support for this, always reading the Fallback branch. Improve this, so
an array can contain the list of features we support.
Change-Id: I2d6ba2207f6bfc62dc1e15c1a605311ede1d7eeb
|
|
Change-Id: Ibf04062ca86ed866202d748c3b62a210d30ed6ec
|
|
Change-Id: I34d2c6c1fc9338cea025ac510621d370f23805a2
|
|
Previous code assumed that either we're dealing with VML shapes (where
the shape knows its position, anchoring, etc.) or with Wrtier pictures.
drawingML shapes are a third category: they don't know their anchoring
(and similar properties), still they are not Writer pictures.
For now just fix the anchoring, other properties should be handled in a
later follow-up commit.
Change-Id: I2fede3b11cfbd423cd50cfc0c032d424c81c6c4a
|
|
These are just the minimal changes, so that writerfilter calls into
oox::shape::ShapeContextHandler, which does the real work.
Change-Id: I4f44a508736d780ff090bca0d12526160ddd167f
|
|
The XDocuments representing the DOM of an OOXML's customxml property
document is stored as the PropertyValue "OOXCustomXmlProps" into the
"InteropGraBag".
Added mxCustomXmlDomPropList object which holds xDocument for each
itemProps.xml from relationship of item.xml.
Exporting all itemprops files from customxml.
Reviewed on:
https://gerrit.libreoffice.org/6603
Change-Id: I3973e6ce40382bbc4da247b5b27d99b03e851744
|
|
Such renames only make sense if the exporter does the opposite of them,
but in this case the stiName array in the exporter explicitly looks for
the "Strong" character styles. So at the end it's better to not rename
it at all.
Change-Id: I69b699c76d287b1fe3b81ea3fe66b77992c6e2f1
|
|
Change-Id: I40b4c0ff90055e4d388f97fbe19be30d3f66b1b4
|
|
Change-Id: Id6e984cff8c171099e3bf0ec6940a28b4000b2e9
|
|
Change-Id: I8a4d15a7d7948a19df0fb8a585969d56f9918772
|
|
Change-Id: Ie3c8f7ea546418a1de1113a54292fd31c64a1f7b
|
|
Change-Id: Ia261995b98e2108ab673c7b240a1aa822d3db96e
|
|
Change-Id: Ie0bc9aff722d87fcd246d0cf1971ad6f34f0996a
|
|
Change-Id: Id24eb2ab53e62961e6cbe2ea72221c6bfe7262d7
|
|
And use some templates inside include/com/sun/star/uno/Sequence.hxx
Change-Id: I48875fa1517751fc4cb0cf2b6c08b88975a29b47
Reviewed-on: https://gerrit.libreoffice.org/6599
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
|