summaryrefslogtreecommitdiff
path: root/writerfilter
AgeCommit message (Collapse)AuthorFilesLines
2012-11-25fdo#44736 RTF import: ignore direct formatting which equals to styleMiklos Vajna8-6/+65
Change-Id: Ie82f18381a95adbfedf7ea02d6844685e44b151d
2012-11-24fdo#51304 Remove @author annotationJosé Guilherme Vanz1-9/+0
This commit removes @author annotations, some templates comments. It has some cleanup. Change-Id: I995ba7b06d661fcec17f26c368d9449c0bf5ab45 Signed-off-by: José Guilherme Vanz <guilherme.sft@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/1146 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2012-11-23writerfilter: sort RTF keywords only once in RTFTokenizerMiklos Vajna2-4/+12
This pushes down import time of http://people.freedesktop.org/~vmiklos/2012/footnote-10k.rtf.xz from 10sec to 5sec on my machine. Change-Id: I39b7e4ea59fb5c05c1d3940920950ebc47adb48b
2012-11-23split qnametostr up to try and make .o's small enough for ppc64Caolán McNamara6-39/+29
i.e. relocation truncated to fix: R_PPC64_TOC16_DS while I'm at it merge the standalone header/footer files into the .xslt and simplify the makefile. Change-Id: Iee0e9b5dd96868f49f1bed22fb5dc6d28c8cef81
2012-11-22AllSettings with LanguageTagEike Rathke2-2/+2
Change-Id: I710ae66e51139662eb442b681fdf9cc9d158551d
2012-11-19n#780645 DOCX import: add support for fixed column widthMiklos Vajna3-1/+77
In general, DOCX tables provide a grid for the table, then use spans in case different number of cells are used in different rows. In this case, the cell width is ignored, as the wished width can be counted from the grid and span values. However, it's also valid to simply provide more cells then the amount defined by the grid, and in this case the cell width should decide the final width of the cells. This commit adds support for this later case. Change-Id: I0dd6c1f0c06f81c2afa00489b7ad1f33ff300a7c
2012-11-17use LanguageTagEike Rathke1-5/+3
Change-Id: I35eaada40120b6d7687e35475b48f832043ed3ba
2012-11-15Remove unused methods from writerfilterMarcos Paulo de Souza4-28/+0
Change-Id: I63b0510fea80c12579985fbc4d4eb4646376e25b Signed-off-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/1074 Reviewed-by: Tor Lillqvist <tml@iki.fi> Tested-by: Tor Lillqvist <tml@iki.fi>
2012-11-14fdo#55525 import RTF_TRLEFTMiklos Vajna1-0/+37
Additionally: 1) Make sure cell margins are zero when they are not defined. 2) Handle cellx values in case of a negative left margin. Change-Id: I9b8fb700b6459e622396c98e4344aba79f62c96e
2012-11-08round() is not portableTor Lillqvist1-1/+1
Change-Id: I0f19fe7866e2ae85608e8a6380d52b66a47a98ec
2012-11-06docx import: round float value to int when computing cells widthPierre-Eric Pelloux-Prayer1-1/+1
Previously, truncating float to int was introducing accumulating rounding errors, which lead to visible change in column widths. Change-Id: I4557c716fba48dfd9a6c1c4d2cd0d0aa7aeae865
2012-11-06fdo#48442 fix default hori/vert frame anchor during RTF importMiklos Vajna1-4/+6
We used to send nothing when we got nothing, but this is not correct: \pvmrg and \phmrg is the default in RTF, but not in Writer. Change-Id: I9f69e282e68f0828c8b5ba98657cad1dd0715eb3
2012-11-05fdo#52989 ignore provided size of JPEG files during RTF importMiklos Vajna2-3/+7
See commit 66fa759b for rationale, this fix just does the same for JPEG files as well. Change-Id: I6a9ead5f4b4b9c4661cae99501bd7c14a2a79409
2012-11-05writerfilter: drop debugservices uno componentMiklos Vajna15-1965/+0
I tried to ask all developers hacking writerfilter, and seems none of us use this at all. Change-Id: I46e59c49c47ec829e5e84cb814e515bf2e8cdafb
2012-11-03WaE uno any conversion does not like intNorbert Thiebaud1-2/+4
Change-Id: I54abaf2cd4dd896b39b4b6993d6d2f7c37f35e18
2012-11-01rework filters test to squeeze through extra flagsCaolán McNamara1-2/+7
that are needed to load .odt, .sxw etc files, and add a regression test for CVE-2012-4233 Change-Id: Ie178725ded3d76942030d12f23074de519cf62de
2012-10-31n#785767 import NS_ooxml::LN_CT_TrPrBase_gridBeforeMiklos Vajna2-3/+8
Change-Id: Id7f1471b49af52e6f6b0515ccd1fe8e12c50d9b5
2012-10-31n#785767 import NS_ooxml::LN_CT_TrPrBase_gridAfterMiklos Vajna2-1/+8
Change-Id: I4cb64ae2b2f2dbf643e38c5208eb759f265acafd
2012-10-30writerfilter: remove PropertyMap::InsertPropsNoOverwrite again:Michael Stahl2-11/+0
Turns out nobody calls that, so the boolean parameter to insert method was not just ugly but entirely pointless. Change-Id: Icb928747d51487d6884a16dcc1f4e22b00c7c22b
2012-10-30writerfilter: clean up PropertyMap::insert mess:Michael Stahl12-38/+47
Rumor has it that MSVC 2010 has problems choosing the right overload in PropertyMap::insert call, which is no surprise as that is a ridiculous piece of garbage. Special bonus points for having another class TablePropsRef that must have a call compatible method because it's used as parameter to the same templates, and for the call with a pointer converted to boolean implicitly in StyleSheetTable.cxx:163. Also remove the silly boolean parameter while at it, just have 2 methods instead. Change-Id: I022d5dd7008f3e6c510d94e19fbacbf04bcf1986
2012-10-30fdo#56512 fix RTF import of non-unicode Hebrew textMiklos Vajna1-1/+5
The trick here is that we can't just fall back to Hebrew encoding for the whole document, as that would mirror shapes as well. Instead, check where \rtlch is used, and there fall back to the default encoding. Change-Id: Iaf155912fab6a559ed165870b8524c23cabcb86d
2012-10-29docx import: handle start/end attribute in tcBordersPierre-Eric Pelloux-Prayer1-0/+2
Change-Id: I148345485534ae50b616857d971ef1c8b1594f28 Reviewed-on: https://gerrit.libreoffice.org/908 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2012-10-29Revert "n#778140 fix import of w:fldSimple character properties"Miklos Vajna2-8/+1
This reverts commit 393262b325338b568c86b9183f37fc950cfbf127. It turns out that this hack is not really needed for n#778140, but it causes problems, for example in case of n#775899. Change-Id: I00b9f7112f951935450c683c5942b0d6c2b7fee2
2012-10-29DOCX: w:doNotUseHTMLParagraphAutoSpacing should affect AddParaTableSpacingMiklos Vajna2-1/+1
commit 5d4bd2f97128adecc5b11699e98c934be3c3a462 unconditionally enabled AddParaTableSpacing doc setting, which broke the layout of some documents, e.g. n#778836. Fix this by doing what the WW8 importer does: enable the setting only in case the w:doNotUseHTMLParagraphAutoSpacing tag is present. Change-Id: I104259a1f37f28e3c4362eb638a134b593fcb851
2012-10-29import RTF_DPROUNDRMiklos Vajna1-1/+6
See the fdo#42407 bugdoc for a reproducer. Change-Id: Ia683a87215c71a238db322cb60ce5e31309eb7e9
2012-10-27usual int == sal_Int32 on 64bit and long == sal_Int32 on 32bit woesCaolán McNamara1-4/+4
Change-Id: I879ed580de72df91e269d38add23cddd29c71982
2012-10-27fix top/left/right/bottom margin of RTF imported inline imagesMiklos Vajna1-0/+4
This is similar to 3d7e168a2a43c2414b0633379102ddb29437e75b, but for RTF (Word default is 0, Writer is something larger). Change-Id: Ibb429eed5d3c1d09777db88ba2a98503c8ed0ed8
2012-10-27fdo#42407 fix RTF import of WMF images inside textframesMiklos Vajna1-1/+5
Since commit f4f4a899, we send the external header of WMF images to the importer, but that seems to be cause problems with this document. To be on the safe side, revert this only for pictures inside textframes. Change-Id: I7e443beb9ca4261abf3e3a1257270d6c70b85918
2012-10-27ignore spaces while reading RTF image dataMiklos Vajna1-1/+1
Change-Id: I6a1af0cd98ed832204d4485e135da6e56e575b4a
2012-10-27writerfilter: make it easy to debug the old RTF filterMiklos Vajna1-0/+13
Change-Id: Ifc1d6b78f55e7f202f5cc391f1401de5b65ed395
2012-10-27use textframes for importing RTF_DPTXBXMiklos Vajna1-5/+41
This allows inline pictures on shapes later, plus matches what the DOC/DOCX filter does. Change-Id: I5da56ccf59a26cc9657925dec94fb58f97692bb8
2012-10-24fdo#46808, convert comphelper::ConfigurationHelper to XComponentContextNoel Grandin1-3/+3
Convert the helper methods to take an XComponentContext parameter, instead of XMultiServiceFactory. Change-Id: I9f0098af37b91f107d8799f14caa04756eac82b1
2012-10-23RtfFilter::filter: not allowed to throw WrongFormatException:Michael Stahl2-4/+13
throw a WrappedTargetRuntimeException instead :( Change-Id: Iebf2b709beea738ba513ec5ce884874b76fbf243
2012-10-23-Werror=maybe-uninitializedStephan Bergmann1-2/+2
Change-Id: I31eefa2444d7d108103818785e83816d07f8cde2
2012-10-23fdo#51145 give better error message on import invalid RTFMiklos Vajna5-6/+36
Change-Id: Idd81e58b8b0b95b1027b7ece434cb362a689f124
2012-10-22DomainMapper::lcl_attribute: typo fixesMiklos Vajna1-3/+3
Change-Id: Ib6ea496f7fb6d87011a74fc49e77c54d62cb09ec
2012-10-19writerfilter: remove unused ctorMiklos Vajna1-1/+0
Change-Id: I17ec2a253e35f90b4f670bb2981aba3402221e1f
2012-10-19import RTF_DPPOLYLINEMiklos Vajna2-1/+35
Change-Id: I65f1ddb9d0d691c126c8e94b2e60c8309b0d33ff
2012-10-18RTF_DOBYPARA import: Y is verticalMiklos Vajna1-1/+1
Change-Id: I46bf69bfce26375a2fb23ef4b00404beb8d8c135
2012-10-18fix import of RTF default page left/right marginMiklos Vajna1-1/+3
This is one more fallout from fdo#42407, which is still incomplete. Change-Id: Ie47f06be598ce5236c45bd3750ea7a21fd98175c
2012-10-18import RTF_DPLINEHOLLOWMiklos Vajna4-8/+16
Change-Id: I580bc2cb38b7fe4b42cfbd78672fc5b8d1d01398
2012-10-17import RTF_DODHGTMiklos Vajna4-8/+17
Change-Id: I6e97c33569e46171ed702b573d42ced805cded78
2012-10-17import RTF_DOBYPARAMiklos Vajna1-0/+8
Change-Id: Ifcfc6e1aca86960f72bcf2a8c7865b192ca1a491
2012-10-17make RTFDocumentImpl::runBreak privateMiklos Vajna3-22/+14
Change-Id: I9af3521d5c7c78da522d02a4436b8eb6ca4f14ce
2012-10-17implement import of RTF_{DPTXBXTEXT,DPTXBX}Miklos Vajna1-0/+13
Change-Id: I2e5f47a3e083ec914a5b95a1e038c21b72025a4f
2012-10-17fix import of RTF_PARD inside RTF_SHPTXTMiklos Vajna1-1/+2
Change-Id: Id722b61cec9b8ae6550122e192affecadfcb1217
2012-10-16RtfFilter::filter: add code to dump input stream for copy&pasteMiklos Vajna1-0/+16
This is especially useful when creating testcases for handling copy&paste input. Change-Id: I11be65484e7ac4dfac3d28576249143b7532a976
2012-10-15fdo#46669 sw: RTF paste should not change page stylesMiklos Vajna6-9/+27
Change-Id: Ic163a639fae9de838258b3cca9567a29ab875a35
2012-10-15fdo#52208 DOCX import: don't always ignore cont sect break at the doc endMiklos Vajna2-2/+11
Regression from commit 1fdd61db155cf63d5dd55cc2bfb45af33796e131, continuous section break does make sense at the end of the doc, if the previous type was a non-continuous. Change-Id: I6d82c67e068d8dc3ce1edb1a5fe6ad293afd805d
2012-10-13Remove consecutive break and a break which follows a returnJulien Nabet1-1/+0
Change-Id: I8dec9eda857f7da452992bc785426449933acc59