Commit Graph

1284 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
db58eee6f5 writerfilter: add mising color values for w14 CT_SchemeColor
Change-Id: I0fef224b75d67798dfa37585a9210285eac575b5
2014-02-28 20:24:36 +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
237205f66e writerfilter: put w14:numSpacing elements/attributes into a GrabBag
Change-Id: I242507aaa1a72ea912f043e0d6795279e8e27dcf
2014-02-27 17:35:02 +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
a4bdeebac2 Missing includes
Change-Id: I6561641eb44dd1f81136f21e930411c4e3d7d79c
2014-02-27 16:11:55 +01:00
da3a77c36c writerfilter: put w14:props3d elements/attributes into a GrabBag
Change-Id: Iebc465c1b5587ddddc546e2eef5cd33f6b247d2e
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
af74d1750c writerfilter: register w14:textFill to be add into CharGrabBag
Change-Id: Iaa16cb0cdfba152b08e2d12268fc6f8f37a256b1
2014-02-27 09:12:01 +01:00
5c57c9b6eb writerfilter: remove code duplication
Change-Id: I55dfeb9b0505bb5f46d5bcf98b10bd2ba7b187f9
2014-02-27 08:30:19 +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
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
a6f73aca84 writerfilter: put w14:textOutline attributes into a GrabBag
Change-Id: Id2ca1ee04a44c4fe17f057397646f621f8d899f7
2014-02-25 12:08:52 +01:00
73f4fcc0f6 writerfilter: simplify element id->name mapping
Change-Id: I842c27a8717d63fef0c11ee57a998e73bce0e1b9
2014-02-25 12:08:49 +01:00
01826dc125 fdo#74105 : Prservation of Numbered lists-Starting with Value '0'
Issue :
	  - DOCX containing Numbered lists- Strating with
            value '0' is not preserved after RT.
          - LO exports document with Numbered lists starting
            from '1' instead of '0'.
          - LO "Import" and "Export" need fixes.
          - If LO will imports correctly, export will get
            correct value.

       Implentation :
          - Added code at Import and Export side.
          - Added Export Unit test case to check that
            <w:start> is not present in numbering.xml
            for 0th level.

       NOTE : <w:start> is optional. If not mentioned
              Numbered lists starts from '0'.

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

Change-Id: I30910c41fd188f30a1723cf8e07be5ea1cde1be0
2014-02-25 10:13:55 +01:00
8978f494e8 writerfilter: sprm:CFNoProof -> ooxml:EG_RPrBase_noProof
Change-Id: I4a4c05554c336aca8407f4b22fc581659dcaeb88
2014-02-24 22:12:53 +01:00
155720819b writerfilter: put w14:reflection attributes into a GrabBag
Change-Id: I0738b3a69df9acc6e636849fbb78231621e1cad9
2014-02-24 00:11:23 +01:00
7ad9184506 writerfilter: TextEffectsHandler - simplyfy switch
Change-Id: I9fe8967892f2298729940af3b3781fde760de69d
2014-02-24 00:11:23 +01:00
add5fc3730 writerfilter: add property ids for all w14 main elements
Change-Id: Ieb622364c1fbb2e5177392ff576a457a57b5cbb0
2014-02-24 00:11:22 +01:00
6e38e82b7c writerfilter: convert sprm:CF{Outline,Shadow,Emboss,Imprint}
Change-Id: I03a2d24d5ff6b868cd67c7b3e1d19c6a2243b92f
2014-02-23 21:57:38 +01:00
ea7dd1a055 writerfilter: restructure call to TextEffectsHandler
Change-Id: Iba02edccfb09c2b42be164c62c57315b58884c98
2014-02-23 17:40:09 +01:00
ab2b20b663 ooxml: handle w14:shadow in import/export
Refactor the code to support an additional main element at processing
of w14 elements for rPr.

Change-Id: Iaf18a11bbda245b0b5b629e5f2e9f1f9682e6d41
2014-02-23 17:40:09 +01:00
675ff51f2e writerfilter: convert sprm:CF{Caps,SmallCaps,Strike,DStrike}
Change-Id: Ib582a8266990a3a6ccccdd630baeca588ed68fdb
2014-02-23 10:52:28 +01:00
148905281d writerfilter: convert sprm:CF{Bold,BoldBi,Italic,ItalicBi}
Change-Id: Ide2116ac380fd563fa7cc9e60f46a7cc62ffc94b
2014-02-22 20:36:20 +01:00
ed9d0db080 writerfilter: sprm:SBkc -> ooxml:EG_SectPrContents_type
Change-Id: I6a6b73967e11a9346cd766dde9d04af63466c206
2014-02-22 20:36:20 +01:00
6306c7c2f2 some build fixage for old 32bit int/sal_Int32/long bustage
Change-Id: I809b8d6bad9c435333231c53001b1a961b6325d2
2014-02-21 23:24:17 +00:00
b5b22e5c04 Fix 32-bit builds
Change-Id: I904bd077a0a519f296155ba0d83c083e8bca67d2
2014-02-22 00:19:53 +01:00
02d8db735b writerfilter: add more w14:glow attributes into GrabBag
Fix and add more attributes into the GrabBag, add attributes for
an element into its own collection.

Change-Id: I8d2e2fa35f4bc447c7e913e5c39223fc01f39d5a
2014-02-21 23:33:04 +01:00
4b544037c4 writerfilter: convert sprm:P{WAlignFont,TightWrap,OutLvl}
Change-Id: Id2090637953d98e899481a2e802815cdc6244e50
2014-02-21 22:23:38 +01:00
07338e2066 Kill copy'n'paste.
Change-Id: I3d457efc89873ca92a4458b1ac0a125848c942a8
2014-02-21 14:33:24 +01:00
fd859ee580 Related fdo#38054: Don't crash when opening this document.
The document itself is (I think) corrupted, but we shouldn't crash anyway.

Change-Id: I7ecfaed7003de2976e47992c89bb695a5cdffda4
2014-02-21 14:33:23 +01:00
470b21a2bc coverity#708680 Uninitialized scalar field
Change-Id: Ic96a03a987d668756b9bfb4cfaf2a7fd9eebfa46
2014-02-21 12:40:36 +00:00
03e3c22840 -Werror,-Wunused-variable
Change-Id: Icd55f3d51c94be6b14ab8e6cb66755180db6e290
2014-02-20 19:29:02 +01:00
52b6c17a7a writerfilter: convert sprm:P{FBiDi,ContextualSpacing,Jc,FrameTextFlow}
Change-Id: Id28eed2ecc177cf0724813dca29bd448f5c51d27
2014-02-20 19:09:20 +01:00
deabda6b38 DOCX import: fix missing underline in comment text
Regression from fb5ee5c9953635a423d3102b901e409d15800096 (sw: Add
support for different grab bags at PropertyMap., 2013-11-29),
PropertyMap::GetPropertyValues() assumed all XTextRange implementations
support the new property, which is not true for at least editeng.

Change-Id: Ib5657be522d30f203cecbbbae74d6594cef984fb
2014-02-20 18:39:23 +01:00
6e157dc78d writerfilter: Write w14:glow and subelements into a CharGrabBag
TextEffectsHandler is responsible to add all subelements
(using nesting of Sequence and Property objects) of text
effects (like w14:glow) into a CharGrabBag.

Change-Id: Ie011a059b905b7cd43528dd7d40be186c4fc4229
2014-02-20 17:54:49 +01:00