Commit Graph

3310 Commits

Author SHA1 Message Date
2e0f89980f writerfilter: convert sprm:P{TableDepth,FInTable,Cell,Row}
With this, source/ooxml no longer depends on the 'NS_sprm' namespace
doctok provides.

Change-Id: I58d5514dea25f1fbc8806863d976f6a24934ea61
2014-03-02 19:53:39 +01:00
d3f96d7458 DomainMapperTableHandler::endTable: fix this comment
Change-Id: I0c22123d8b1707092938474891e2469e32a1823d
2014-03-01 17:41:32 +01:00
cd79d4a25d writerfilter: remove last sprm tokens from ooxml/model.xml
Change-Id: I3b18ed95bd0144240a586fefb2b1deb0bcd658c4
2014-03-01 17:30:47 +01:00
c3c6d7f886 writerfilter: convert sprm:C{Shd,FBiDi,ComplexScript,Kcd}
Change-Id: Ia1dd99f0850d444fe9521fdcd0645e92bfc905a5
2014-03-01 10:50:19 +01:00
f821b00c6d Cosmetics.
Change-Id: I71c7b711f583079de7d5c075616d7d437fa992db
2014-02-28 22:12:39 +01:00
acd5d5fc92 writerfilter: put w:compatSettings into a document level GrabBag
Change-Id: Iefb8ef14c61e7966098754b8f3395f994bb9bda7
2014-02-28 20:24:37 +01:00
cf28abed08 writerfilter: extend tokens and model.xml for w:compatSettings
Word stores compatibility mode and additional compatibility
settings (like enableOpenTypeFeatures) in w:compatSetting. This
needs to be preserved as well.

Change-Id: I40895cc00952b7c3799edff0bf7f4328106305a1
2014-02-28 20:24:36 +01:00
db58eee6f5 writerfilter: add mising color values for w14 CT_SchemeColor
Change-Id: I0fef224b75d67798dfa37585a9210285eac575b5
2014-02-28 20:24:36 +01:00
9beccfbd37 writerfilter: undocumented class
Change-Id: I6c7774cacba116ccdea10d17afcca67883bb56a5
2014-02-28 16:52:19 +01:00
1107ddf30b writerfilter: convert sprm:C{Hps,HpsBi,Highlight,SfxText}
Change-Id: I7092bd2b99460f083da0ef1515929c41bca6e9b9
2014-02-27 21:38:55 +01:00
cdd3fb6df0 writerfilter: put w14:stylisticSets & w14:cntxtAlts into GrabBag
Change-Id: Ic5b7bf51a073c4434cd09ae42fecdad25f904d26
2014-02-27 17:35:03 +01:00
c6c7aa50c9 writerfilter: add w14:stylisticSets & w14:cntxtAlts into model.xml
Change-Id: Icab0aad1fbf6634c8a3bdb449eef77c290f2d714
2014-02-27 17:35:03 +01:00
237205f66e writerfilter: put w14:numSpacing elements/attributes into a GrabBag
Change-Id: I242507aaa1a72ea912f043e0d6795279e8e27dcf
2014-02-27 17:35:02 +01:00
14a15f4122 writerfilter: add w14:numSpacing into model.xml
Change-Id: I4ddeb415583183ab33d30b9b736977907c184ced
2014-02-27 17:35:01 +01:00
4fad8bbaea writerfilter: add w14:numForm into model.xml
Change-Id: I36f74ed35331141ca0d9d91b4af18c5a76a116ff
2014-02-27 17:35:00 +01:00
6d81d3f35e writerfilter: put w14:numForm elements/attributes into a GrabBag
Change-Id: I34a5791343c1a76055281969c1a666df357c9e03
2014-02-27 17:35:00 +01:00
7f172fa098 writerfilter: put w14:ligatures elements/attributes into a GrabBag
Change-Id: I8c3ac3698210e6e3a6bdd01c2a9ce7f6248a3c5b
2014-02-27 17:34:59 +01:00
023b0af6a9 writerfilter: reference CT_Ligatures for w14:ligatures
Change-Id: Ie4a4735a0ba165b0864ae0c8d5caf94c2273eb1e
2014-02-27 17:34:59 +01:00
08f02e9a1b writerfilter: add w14:ligatures into model.xml
Change-Id: Ied68f150169197f3919ba98ee230f778e2c40da3
2014-02-27 17:34:58 +01:00
a4bdeebac2 Missing includes
Change-Id: I6561641eb44dd1f81136f21e930411c4e3d7d79c
2014-02-27 16:11:55 +01:00
e3283f9f05 writerfilter: unused global string
Change-Id: I85afca0a74516375958aeb93919e55fd3b7cf7a7
2014-02-27 11:22:57 +01:00
da3a77c36c writerfilter: put w14:props3d elements/attributes into a GrabBag
Change-Id: Iebc465c1b5587ddddc546e2eef5cd33f6b247d2e
2014-02-27 09:12:04 +01:00
aedf140ee4 writerfilter: w14:props3d update in model.xml
Change-Id: I3c29f97f319656ddbf5c44654ae9820468b9926b
2014-02-27 09:12:04 +01:00
81709ebaf5 writerfilter: put w14:scene3d elements/attributes into a GrabBag
Change-Id: I9681e6a5dd96877ea87376b449242a2317a7d6b1
2014-02-27 09:12:03 +01:00
bc5a8d1adf writerfilter: w14:scene3d update in model.xml
Change-Id: Ic0b5e28bfb39bfd03a11b0e0c8b3892a3acc4a91
2014-02-27 09:12:02 +01:00
af74d1750c writerfilter: register w14:textFill to be add into CharGrabBag
Change-Id: Iaa16cb0cdfba152b08e2d12268fc6f8f37a256b1
2014-02-27 09:12:01 +01:00
49f5395459 writerfilter: add w14:textFill and w14:scene3d to model.xml
Change-Id: I4f22ada3a6b1ebd5cfe9e0baf1cb3abb6a877035
2014-02-27 09:12:01 +01:00
5c57c9b6eb writerfilter: remove code duplication
Change-Id: I55dfeb9b0505bb5f46d5bcf98b10bd2ba7b187f9
2014-02-27 08:30:19 +01:00
ed2d5968fa Unused writerfilter::dump()
Change-Id: I226d4338e22585a9a03377feb9d39788346316be
2014-02-26 21:56:44 +01:00
05e7456b00 rtftok: bHasTableStyle is never read
Change-Id: Iad287d3f619d7c912aa6c2dc059b1aa63c3c0053
2014-02-26 21:56:43 +01:00
273fae4032 writerfilter: convert sprm:C{DxaSpace,CharScale,HpsKern,HpsPos}
Change-Id: I880569a283d0776a7dec51994a001d20153f86d9
2014-02-26 21:42:30 +01:00
1c993627d8 sw: write other types of embeddings properly to docx
Improves patch 1428ec6f4e2bfe0d8654a9ccc713e274e08c6423

When embedding an object into a docx, several things interact:

* The properties in the <o:OLEObject> tag in document.xml
* The ContentType for the file defined in [Content_Types].xml
* The Type of the Relationship defined in document.xml.rels

You need the right combination of those three elements for Word to
properly recognize the embeddings in exported documents.

To know which values must be written, I store some interoperability
information in the import phase in the document grab bag. The
relevant information is the value of the ProgID attribute in the
<o:OLEObject> tag.

I have defined three cases depending on the value of ProgID, but more
could be needed in the future:
* Embedded xlsx sheet.
* Embedded pptx presentation.
* Generic OLE, this should work with embedded odt/ods in combination
  with the ProgID attribute stored in the import phase.

Change-Id: I26336cb3fe47bd33e1cef11dd1c7edcf390f2e56
2014-02-26 20:18:36 +01:00
5e21a413c7 cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
2014-02-26 18:22:20 +01:00
cd35fd41df -Werror,-Wunused-private-field
Change-Id: Ie64ffd691f3528136414bfc67f89881f3c778f1f
2014-02-26 16:14:39 +01:00
8440c9ed92 Remove visual noise from writerfilter
Change-Id: I2470e26f1b0a7c3b28fbc0ec44170565f250fc40
Reviewed-on: https://gerrit.libreoffice.org/8342
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-26 07:05:36 -06:00
598d02d71f fdo#75133: Preseved bibliography after round trip.
Conflicts:
	sw/qa/extras/ooxmlexport/ooxmlexport.cxx
	writerfilter/source/dmapper/DomainMapper_Impl.hxx
Reviewed on:
	https://gerrit.libreoffice.org/8124

Change-Id: Ieaea19600fbda3b536549a1a100f847f9ae3654b
2014-02-26 12:50:29 +01:00
263938c4a8 fdo#73596 [DOCX] Multiple Columns in Index
The number of columns in an Index is given by the "\c" switch.
During export, added section breaks before and after the Index;
this is to preserve the layout of the round tripped file in MS Office.

Modified MSWordExportBase::NoPageBreakSection so that
an incorrect "nextPage" section break is not exported.

Conflicts:
	sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
	https://gerrit.libreoffice.org/8047

Change-Id: I364e19d6739c4c6a60e3c605044fc1fafd9147d3
2014-02-26 11:27:58 +01:00
02a46f9394 Unused writerfilter::toString()
Change-Id: I8e3fa0519f1ab84c9470a82e11bb751599844185
2014-02-25 21:03:31 +01:00
a65729e763 writerfilter: sprm:CFVanish -> ooxml:EG_RPrBase_{vanish,webHidden}
Change-Id: I17a6e7717db331feb2e461bb53e0131012ab0066
2014-02-25 20:47:19 +01:00
c30fb7d726 Related: #i124106# correct handling of page break attributes
i.e. those which are providing the default value explicitly

(cherry picked from commit 5a15ef3da683566d7bd443f96eeec3a9a3f70aeb)

Conflicts:
	writerfilter/source/dmapper/DomainMapper.cxx
	writerfilter/source/dmapper/PropertyMap.cxx

Change-Id: Ib8721f2fce060d26ee75b0515b3bf62a603fd40c
2014-02-25 16:12:24 +00:00
f7e1e02433 writerfilter: attempt to appease Mac tinderboxes
Change-Id: I014f71642f275716c8ebe7a471bf211c342145fb
2014-02-25 16:48:32 +01:00
ddac853e0c rtftok: pushProperties -> sendProperties
We're not pushing these properties to the parser stack (as the old name
suggested), but sending them to dmapper.

Change-Id: I9725b7b92e653064c18d723f48a350ebc8e740c8
2014-02-25 16:46:43 +01:00
54ce662d30 remove unused code writerfilter::resourcemodel::resolveAttributeProperties
Change-Id: I4f48d11889d4d6b963ea9b3a1f43636cc6e66daa
2014-02-25 15:17:02 +02:00
c8f83ce1db rhbz#1065629: RTF import: re-implement nested tables
The previous fix for this bug only fixed a symptom, this a fix for the
real problem; with the real problem fixed the nCellEnds is unnecessary.

Given that top-level table properties may be put either before or after the
table cells, the only way that works to import tables is to buffer a whole
top-level table row, but currently the buffer is replayed already at the
end of a nested table row.

Fortunately the RTF spec guarantees that \nesttableprops must occur
after the nested table cells of the nested row, so it should be
sufficient to remember the cell properties for the current nested table
row only, in addition to the cell properties for the top-level table row.

With this change, skipping a \nesttableprops destination when there is
a table style turns out to mangle ooo98040-1.rtf badly, so stop doing
that workaround.

RTFDocumentImpl::popState() was copying various buffers up the state
stack which is a clear indication that these shouldn't be members of
RTFParserState in the first place, move them to RTFDocumentImpl.

Change-Id: Ic2d8f7b3e00844b224d61605b405ca651239e5f7
2014-02-25 14:06:14 +01:00
8dcb56fdce RTFSdrImport::resolveDhgt(): fix crashing C-cast
Inside DomainMapper::graphicZOrderHelper() this is offset by 0x40 so
whatever that cast does, it's doing it wrong.

Change-Id: Ie48467c12828137a521cba47c2e04cac65201d1d
2014-02-25 14:06:13 +01:00
73e0656d6c writerfilter: fix typo in SAL_INFO log area (and put this in an ifdef)
Change-Id: Ib195fe8f66244ae98f68cdb6bba6b62d70567014
2014-02-25 14:06:13 +01:00
a6f73aca84 writerfilter: put w14:textOutline attributes into a GrabBag
Change-Id: Id2ca1ee04a44c4fe17f057397646f621f8d899f7
2014-02-25 12:08:52 +01:00
029b2e15c2 writerfilter: add w14:textOutline to model.xml
Change-Id: I3b4164a3fccff015a37b43e6fcba225947fb9d16
2014-02-25 12:08:51 +01:00
73f4fcc0f6 writerfilter: simplify element id->name mapping
Change-Id: I842c27a8717d63fef0c11ee57a998e73bce0e1b9
2014-02-25 12:08:49 +01:00
12cf9f08f5 writerfilter: add w14:textOutline attributes to model.xml
Change-Id: I3e29bbc68a6fa784831c9f56b902c1f67749751f
2014-02-25 12:08:48 +01:00