summaryrefslogtreecommitdiff
path: root/writerfilter/source/rtftok/rtfdocumentimpl.cxx
AgeCommit message (Collapse)AuthorFilesLines
2014-03-06writerfilter: convert sprm:PFWidowControlMiklos Vajna1-1/+1
Change-Id: I4ec9cfc07030ef83a44d6a2fdf7c9743242be602
2014-03-05rtftok: stop sending sprm:CRgFtc{0,1,2} tokensMiklos Vajna1-27/+57
Change-Id: I5009fb6214da763750fba3aa7067e1e28441d7dd
2014-03-04writerfilter: convert sprm:P{DxaRight,DxaLeft,DxaLeft1}Miklos Vajna1-16/+24
Change-Id: Iffb80e9844132aeeaf3e338c4817b44520e40f3a
2014-03-03writerfilter: convert sprm:C{Lid,LidBi,RgLid0,RgLid1}Miklos Vajna1-7/+21
Change-Id: I07e73a792230e6dc344c7120e3ad3c5f92a40769
2014-03-03-Werror,-Wtautological-constant-out-of-range-compareStephan Bergmann1-4/+4
(If the underlying type of an unscoped enumeration is unfixed, it need not be signed.) Change-Id: I26a406504863512a0d3861ad8b28523b0a6dccaa
2014-03-03RTF import: fix paragraphs in header/footerMichael Stahl1-1/+2
Change-Id: I91f04cad7a39428ce6f9555d18b974f0d45181f7
2014-03-03RTF import: fix spurious page breaks at doc end (related: rhbz#1065629)Michael Stahl1-21/+49
When a document ends with \sect it's possible that a spurious page break is created. In fact the spurious page break is always created by the RTF importer, sometimes it is deleted again by DomainMapper_Impl::RemoveLastParagraph() and sometimes not. It is created because on the final \sect RTFDocumentImpl::sectBreak() still calls startSectionGroup(), and the popState() for the \rtf1 group then calls sectBreak() another time. To prevent this, do not call startSectionGroup() from sectBreak() but instead from setNeedSect(), and ensure that it is called as soon as anything after \sect is read. One unit test fails because the \page is not handled properly: the conversion to \skbpage \sect \skbnone is not correct, because the \skb* keywords are an exception and affect the \sect that precedes them, not the following one; sending the \skbpage later unfortunately requires additional cleanup later. Change-Id: I3c1a3bceb2c8b75bbecdc748170562451ce5f5c3
2014-03-02writerfilter: convert sprm:P{TableDepth,FInTable,Cell,Row}Miklos Vajna1-6/+6
With this, source/ooxml no longer depends on the 'NS_sprm' namespace doctok provides. Change-Id: I58d5514dea25f1fbc8806863d976f6a24934ea61
2014-03-01writerfilter: remove last sprm tokens from ooxml/model.xmlMiklos Vajna1-1/+1
Change-Id: I3b18ed95bd0144240a586fefb2b1deb0bcd658c4
2014-03-01writerfilter: convert sprm:C{Shd,FBiDi,ComplexScript,Kcd}Miklos Vajna1-2/+2
Change-Id: Ia1dd99f0850d444fe9521fdcd0645e92bfc905a5
2014-02-27writerfilter: convert sprm:C{Hps,HpsBi,Highlight,SfxText}Miklos Vajna1-4/+4
Change-Id: I7092bd2b99460f083da0ef1515929c41bca6e9b9
2014-02-26rtftok: bHasTableStyle is never readMiklos Vajna1-4/+0
Change-Id: Iad287d3f619d7c912aa6c2dc059b1aa63c3c0053
2014-02-26writerfilter: convert sprm:C{DxaSpace,CharScale,HpsKern,HpsPos}Miklos Vajna1-5/+5
Change-Id: I880569a283d0776a7dec51994a001d20153f86d9
2014-02-25writerfilter: sprm:CFVanish -> ooxml:EG_RPrBase_{vanish,webHidden}Miklos Vajna1-1/+1
Change-Id: I17a6e7717db331feb2e461bb53e0131012ab0066
2014-02-25writerfilter: attempt to appease Mac tinderboxesMichael Stahl1-1/+1
Change-Id: I014f71642f275716c8ebe7a471bf211c342145fb
2014-02-25rtftok: pushProperties -> sendPropertiesMiklos Vajna1-3/+3
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-25rhbz#1065629: RTF import: re-implement nested tablesMichael Stahl1-155/+284
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-24harmonize Tell() Seek() type.Norbert Thiebaud1-7/+7
Change-Id: I2e472aa0279d0763762d3c660207cd74da512626
2014-02-23writerfilter: convert sprm:CF{Outline,Shadow,Emboss,Imprint}Miklos Vajna1-3/+3
Change-Id: I03a2d24d5ff6b868cd67c7b3e1d19c6a2243b92f
2014-02-23writerfilter: convert sprm:CF{Caps,SmallCaps,Strike,DStrike}Miklos Vajna1-4/+4
Change-Id: Ib582a8266990a3a6ccccdd630baeca588ed68fdb
2014-02-23coverity#735576 nKeyword can only be RTF_SBASEDON hereCaolán McNamara1-1/+1
Change-Id: I26b0dc18e9b4a99b267a28d768c235ef5abbe755
2014-02-22writerfilter: convert sprm:CF{Bold,BoldBi,Italic,ItalicBi}Miklos Vajna1-4/+4
Change-Id: Ide2116ac380fd563fa7cc9e60f46a7cc62ffc94b
2014-02-22writerfilter: sprm:SBkc -> ooxml:EG_SectPrContents_typeMiklos Vajna1-4/+4
Change-Id: I6a6b73967e11a9346cd766dde9d04af63466c206
2014-02-21writerfilter: convert sprm:P{WAlignFont,TightWrap,OutLvl}Miklos Vajna1-1/+1
Change-Id: Id2090637953d98e899481a2e802815cdc6244e50
2014-02-20writerfilter: convert sprm:P{FBiDi,ContextualSpacing,Jc,FrameTextFlow}Miklos Vajna1-3/+3
Change-Id: Id28eed2ecc177cf0724813dca29bd448f5c51d27
2014-02-20Remove vcl/settings.hxx from vcl/svapp.hxx and vcl/outdev.hxxTobias Lippert1-0/+1
Added vcl/settings.hxx to all cxx files which require it. This helps to speed up compilation after changes to the settings. Conflicts: sc/source/ui/dbgui/pvlaydlg.cxx Change-Id: I211a0735c47f72d6879f6f15339355abfe0e3cf4 Reviewed-on: https://gerrit.libreoffice.org/7933 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-19writerfilter: convert PF{OverflowPunct,TopLinePunct,AutoSpaceDE,AutoSpaceDN}Miklos Vajna1-1/+1
Change-Id: Ibe0d43c35afa12f2bad33645ec4f849b5fb8a811
2014-02-19unotools: sal_Bool -> boolStephan Bergmann1-1/+1
Change-Id: I8051c0756e0474a5b4f748e0aa15a9922e82ea97
2014-02-18writerfilter: sprm:P{Shd,FNoAutoHyph} -> CT_PrBase_{shd,suppressAutoHyphens}Miklos Vajna1-1/+1
Change-Id: I3ca8805428469cebf67737fd9fce9a74641e88ce
2014-02-18writerfilter: convert sprm:PF{PageBreakBefore,NoLineNumb}Miklos Vajna1-2/+2
Change-Id: I1dd89236e81a7f62bb7abef5503f7520387772a0
2014-02-18rhbz#1065629: RTF import: don't drop nested cells if not enough \cellxMichael Stahl1-0/+14
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
2014-02-18writerfilter: convert some fprintf to SAL_INFOMichael Stahl1-1/+1
Change-Id: I5fe47cfaee84c17584ba7c3d160e65b55f4e3474
2014-02-17writerfilter: sprm:{PFKeepFollow,PFKeep} -> ooxml:CT_PPrBase_keep{Next,Lines}Miklos Vajna1-2/+2
Change-Id: I59e48e420a4ec276680a1ba5cfb002f656b3c4a9
2014-02-16writerfilter: PBrc{Top,Left,Bottom,Right} -> CT_PBdr_{top,left,bottom,right}Miklos Vajna1-1/+1
Change-Id: I955d905dfccb4b02afebbf0552a55713dc22e49c
2014-02-15writerfilter: sprm:PI{lvl,lfo} -> ooxml:CT_NumPr_{ilvl,numId}Miklos Vajna1-4/+4
Change-Id: I96cdf20d3ef53bda100dd2d06a18b74d374bab42
2014-02-14writerfilter: sprm:P{Wr,FLocked} -> ooxml:CT_FramePr_{wrap,anchorLock}Miklos Vajna1-5/+5
Change-Id: I7d73e3d6e2b56e39b2e098fa81827886dec7e2e8
2014-02-13writerfilter: NS_sprm::LN_PDx/yaFromText -> NS_ooxml::LN_CT_FramePr_h/vSpaceMiklos Vajna1-10/+10
Change-Id: I651a1fd5279afa07929e6cfae4440f5b008d6215
2014-02-13writerfilter: No need to namespace these constants, they have prefix already.Jan Holesovsky1-1/+1
Change-Id: I5590adbf0f60b10d309ddf2a6b9e50231245a659
2014-02-12writerfilter: sprm:PDxaWidth/WHeightAbs -> ooxml:CT_FramePr_w/hMiklos Vajna1-8/+8
Change-Id: I4ae8e58c6187563e5846d58a3c83ef74f1cacb5c
2014-02-12convert SvStream::operator>> methods to ReadXXX methodsNoel Grandin1-10/+10
First, I updated the clang rewriter to do the conversion. Then I lightly hand-tweaked the output for the few places where the rewriter messed up, mostly when dealing with calls on "this". Change-Id: I40a6a977959cd97415c678eafc8507de8aa3b1a9 Reviewed-on: https://gerrit.libreoffice.org/7879 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-02-10fdo#74709 RTF import: implement RTF_CLPAD*Miklos Vajna1-0/+28
Change-Id: I482735e3fc4091be983b2c7484e086f5d0dd283a
2014-02-03writerfilter: continous -> continuousMiklos Vajna1-1/+1
Change-Id: Ie36ac366af0563485b2d937903a63a9b3aca8931
2014-01-26RTF import: fix handling of font color from paragraph styleMiklos Vajna1-1/+3
Change-Id: I6bbad2d69863020ea870be800f49e13e763b80bf
2014-01-25writerfilter: remove no longer needed generated resourceids.hxx in doctokMiklos Vajna1-1/+0
Change-Id: I5777e4846daccfbd78fa8a4f47c313a225d7aed2
2014-01-24writerfilter: refactor to avoid redundant Papx class in doctokMiklos Vajna1-18/+31
Change-Id: Ic65e750bab99fb6b4c862418ccc53aa4b1f1298e
2014-01-23writerfilter: NS_rtf::LN_SGC -> NS_ooxml::LN_CT_Style_typeMiklos Vajna1-3/+3
Change-Id: Ie684da85620e14ae1f10c1fc8dd00ea738fafe54
2014-01-22writerfilter: refactor to avoid redundant FSPA class in doctokMiklos Vajna1-4/+7
Change-Id: Ic546c62ec24ef3c6b9189ba8378686a6f94714dc
2014-01-19writerfilter: refactor to be able to remove redundant Font class in doctokMiklos Vajna1-1/+23
Change-Id: I98516cbdb7e80a7dfe7048909ad4acb0418dbf9c
2014-01-18writerfilter: refactor to remove redundant ListLevel class in doctokMiklos Vajna1-1/+17
Change-Id: I762e4f09b55d957bdd57e76651417bed11cb1e74
2014-01-18writerfilter: remove METAFILEPICT class in doctokMiklos Vajna1-4/+4
Change-Id: Icb124a2f7445ca17f04dc0024dc17cbcc4b0ca6d
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-11 05:40:36 +0000