summaryrefslogtreecommitdiff
path: root/writerfilter
AgeCommit message (Collapse)AuthorFilesLines
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
2012-10-13writerfilter: fix new clang warningsMiklos Vajna6-21/+12
Change-Id: I0f7cec0f300290fe3ea465f344cfda642824ed0b
2012-10-11fdo#55493 fix RTF import of specific PNG imageMiklos Vajna1-1/+4
The image was special in that the resulting Graphic's GetPrefMapMode().GetMapUnit() wasn't MAP_PIXEL. Change-Id: I681e344a042721b99f6cb2e599f9c65156d219a4
2012-10-11n#783638 DOCX import of wp:inline's distT/B/L/R attributesMiklos Vajna1-9/+19
Change-Id: I181fcae021eed07608b06744b469628e4d78ccba
2012-10-10writerfilter: these can be static in ConversionHelperMiklos Vajna1-0/+2
Change-Id: I2436a884627c4f9b112086cb7ca1a096093ea3f6
2012-10-09add editeng::ConvertBorderWidthFromWord:Michael Stahl1-65/+4
Replace the 2 duplicate implementations of this in ww8 and writerfilter with a common one. Differences were: 2) ww8 doubles the with, writerfilter does not 13) unsupported, mapped to THINTHICK_SMALLGAP vs. THICKTHIN_SMALLGAP 22) unsupported, mapped to DASHED vs. SOLID 26) INSET not supported in writerfilter 27) OUTSET not supported in writerfilter Change-Id: I533b77394388e736f38d70284a6a11061d81e813
2012-10-08cppcheck: unreadVariablejailletc361-5/+4
Defined the aStr within the #ifdef block where it is used. Change-Id: I2878d2db002411783e814b0ecf02e2a030d2d6d4
2012-10-04fdo#46808, Adapt xml::sax::XParser UNO service to new styleNoel Grandin1-10/+2
The xml.sax.Parser service already existed, it just did not have a new-style service to create it. Change-Id: I6f145a7504ff9e149c802f723991954a2801cbc9
2012-10-04Related: rhbz#862467 band-aid when creating embedded object failsCaolán McNamara1-0/+3
Change-Id: Ie5ecc8f56636e692a6e17a2e8fab0cefd46cdfb4
2012-10-03probably a rather ugly hack for inline text frame in a table (bnc#780851)Luboš Luňák2-3/+17
Change-Id: I2bd76799cf0a5da09664d0e1b1a9adb466633be1
2012-10-03fdo#44278: fix leaked image when import docxCédric Bosdonnat1-0/+4
Unused temporary XShape need to be disposed to avoid remaining garbage in the document. Change-Id: Iaf6e720a1c47605136f7f9ccafb605cab6dc260a
2012-10-02Use prefixTor Lillqvist2-2/+2
Change-Id: I128623b27bd88795e21de13d7a6fc960de3b6ea8
2012-10-02Make Clang happyMiklos Vajna1-2/+2
Change-Id: I69c886d0a1875ec674f40c2422dc1490418c1da3
2012-10-02docx import: properly import table positionPierre-Eric Pelloux-Prayer1-16/+11
This a follow up of commit 53b7f7df0617bcbd7bbef9a34ef53e5097eb16dc Change-Id: Ia0f79ca24418636af14162e9f339237d847dc221 Reviewed-on: https://gerrit.libreoffice.org/714 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2012-10-02docx import: set table above/bottom spacing to 0Pierre-Eric Pelloux-Prayer1-0/+5
Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: I3e0397dd3d5d14f1e584ac7bc3d22d4638393b06
2012-10-01Replace usage of rtl_*Memory with equivalent from string.hArnaud Versini1-1/+1
Change-Id: I50ffc10f007f03c3252ef0196b59b881429cc159 Reviewed-on: https://gerrit.libreoffice.org/734 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2012-10-01n#782345 import DOCX w:splitPgBreakAndParaMark compat optionMiklos Vajna3-0/+21
This fixes docx import of page breaks in empty paragraphs, when the compat option in question is set. Even empty paragraphs have an "end of paragraph" character in dmapper: import page breaks there, instead of delaying the import till the all-catcher importer at the start of the next paragraph. Change-Id: Ie5c37042b3c445e0669771d15c8eb46380192db3
2012-10-01fdo#52475 fix import of RTF_CHCBPAT with value 0Miklos Vajna1-2/+1
0 means auto, and for fdo#50539, this value was ignored. However a next sample shows that we should send something to the dmapper: COL_AUTO. Change-Id: I8d7d35125c9027dfb45288bbfbfa81ba4799e78d
2012-09-30writerfilter: unused includes in DomainMapperMiklos Vajna1-3/+0
Change-Id: Ia84271c5fe7064bfa2d71b84da9fa4d9df945d51