summaryrefslogtreecommitdiff
path: root/writerfilter
AgeCommit message (Collapse)AuthorFilesLines
2014-11-15RTF import: handle right-to-left tablesMiklos Vajna1-1/+1
Change-Id: If2e60557b7551839c344d56cb3a720ae3659e93c
2014-11-14fdo#86023 - O[U]String needs a 'clear' methodBrij Mohan Lal Srivastava4-4/+4
Added clear() method to OString and OUString class, Updated appropriate call-sites. Change-Id: I0ba97fa6dc7af3e31b605953089a4e8e9c3e61ac Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2014-11-12Fix common typos. No automatic tools. Handmade…Andrea Gelmini5-5/+5
Change-Id: I1ab4e23b0539f8d39974787f226e57a21f96e959 Reviewed-on: https://gerrit.libreoffice.org/12164 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
2014-11-09test for membership should be 'not in'Miklos Vajna2-4/+4
Change-Id: I493bad18ed3f728bcf42049377d7f4c6039264c8
2014-11-08fdo#84645 RTF import: set DontBalanceTextColumns=true for the last section ...Miklos Vajna1-0/+6
... if it has multiple columns. See commit d185204737031955c56a24356ed003d342548434 (DOCX import: set DontBalanceTextColumns=true for the last section, 2014-07-17) for the DOCX equivalent of this problem; this just adapts the RTF tokenizer to dmapper. Change-Id: Ib30f9b386e204b8b2987832ab17ee0cc53b3f0bc
2014-11-08writerfilter: SW_DEBUG_RTF_PASTE_{TO,FROM} is expected to be UTF-8Miklos Vajna1-2/+2
Change-Id: Ibcfa71cf9820db0b397a88e22aa6cc964048b71c
2014-11-07Correct number format mapping for CJK numbered lists in rtf/doc/docx filters.Mark Hung2-19/+77
Reviewed on: https://gerrit.libreoffice.org/12252 Change-Id: I2d8760c7ecb3677464e167528b2424aaca19a0d7
2014-11-07writerfilter: handle ooxml:CT_TblPrBase_bidiVisualMiklos Vajna1-0/+7
Change-Id: I619a6b161e5ed7e902406b288552b06fe7da487e
2014-11-07DOCX import: fix rounding error in table cell widthsMiklos Vajna1-2/+2
Change-Id: I733fd4b998ba4d0bde2f91f2b3d76205f0dc8020
2014-11-06Revert "use the new OUString::fromUtf8 method"Stephan Bergmann6-12/+12
This reverts commit 05050cdb23de586870bf479a9df5ced06828d498, not all places that use e.g. OStringToOUString to convert potential UTF-8 are guaranteed to fulfil the prerequisites necessary to use fromUtf8 (and some places like e.g. in codemaker are happy with the best-effort effect of OStringToOUString's OSTRING_TO_OUSTRING_CVTFLAGS).
2014-11-06DOCX import: fix <w:tblW w:type="auto"/> handling when cells have fixed widthsMiklos Vajna1-10/+1
Commit 74c5ed19f430327988194cdcd6bdff09591a93fa (DOCX import fix for table with auto size, 2013-06-26) correctly recognized that in case the width type is auto, that doesn't always mean text::SizeType::VARIABLE. However, when the size is fixed, then we should simply not do anything, and that'll lead to the right behavior (by setting the column separators on each row), don't try to be smart and try to set TablePropertyMap::TABLE_WIDTH here. Change-Id: I997b88e5fa34bbabe7c6940879c81a1d62d69043
2014-11-06use the new OUString::fromUtf8 methodNoel Grandin6-12/+12
Change-Id: I771004b7ccab3344a67e827e45bc34c22ffa5f77
2014-11-05fdo#85812: RTF import: better fix for run type in new groupsMichael Stahl1-2/+3
Apparently Word treats \ltrch \rtlch differently from \loch \hich \dbch when groups are opened. Change-Id: I257712521e8e77fa66e76857489797ecc675506e
2014-11-05fdo#38835 strip out OUString globalsNoel Grandin6-69/+69
they are largely unnecessary these days, since our OUString infrastructure gained optimised handling for static char constants. Change-Id: I07f73484f82d0582252cb4324d4107c998432c37
2014-11-05fdo#85812: RTF import: fix run type in new groupsMichael Stahl1-0/+2
Apparently the run type resets to LTR in a new group. (regression from fc49c052dbdbb5ab3b0a02a13143705f769b9662) Change-Id: I61c0fcbe4e44b488a14cc78823063a1a1ad4f4b1
2014-11-04Use comphelper::SequenceAsVectorMiklos Vajna2-8/+3
Change-Id: Iaf5fb72b065cc0d2a412b027d41d7618654d30b1
2014-11-03be a little more consistent stylewiseCaolán McNamara1-1/+1
Change-Id: If1d822e0e6c87e792ff4a769a525e161505325c9
2014-11-02unused includes in RTF filter and related filesMiklos Vajna8-47/+0
Change-Id: Id13e10f2ceed3985c78ccc542e6677eccc0cb1c7
2014-11-01fdo#82512 RTF import: fix position of column breakMiklos Vajna1-0/+8
Change-Id: Ib0f39c4af7cc32d0f4491f13ea207d90a449a47d
2014-11-01coverity#1000600 Division or modulo by float zeroCaolán McNamara1-11/+18
Change-Id: If39679b54ef1bb0a7af794c2f7a6186ebd69c2e0
2014-11-01oox: introduce W_TOKEN() macroMiklos Vajna1-4/+4
It was inconsistent that when parsing <a:foo> elements, A_TOKEN(foo) was available, but for <w:foo> elements there was no W_TOKEN() macro. Also, there were two manual variants (NMSP_doc|XML_foo or via OOX_TOKEN(doc, foo)), replace both of them with W_TOKEN() for easier searching. Change-Id: Ic5cd027f07518535b92671ffe3c486016a3f9f0a
2014-10-31Removed duplicated includesAndrea Gelmini3-3/+0
Change-Id: I5362d997bfa086c9fb1726efcb15132a966684f6 Reviewed-on: https://gerrit.libreoffice.org/12160 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2014-10-31Use oox::drawingml::convertEmuToHmm()Miklos Vajna4-17/+11
And get rid of the writerfilter copy, that does no rounding. Adjusted testcases: - testFdo80555: 245 -> 247 (should be 246.944444444, so a good change) - testDMLGroupShapeChildPosition: roundtripped values are now closer to the initial ones, so also a good change Change-Id: I4dec7857a0df77face01b7a8ba1da7c647a24b6c
2014-10-30Fixed typos. No automatic tools (sed, and so on).Andrea Gelmini1-1/+1
Change-Id: Ia43976d84eede6f699381bc4f3daf89b95e4cb4f Reviewed-on: https://gerrit.libreoffice.org/12150 Reviewed-by: Bryan Quigley <gquigs@gmail.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-10-30fdo#79602: sw: add new compatibiltiy flag PropLineSpacingShrinksFirstLineMichael Stahl1-0/+1
This is enabled by default, to get the new formatting where the first line of a paragraph is shrunk if a proportional line spacing < 100% is applied; existing OOo documents get the previous (before LO 3.3) formatting. Since the formatting in LO releases is broken anyway, it does not matter much which way documents written by old LO get formatted. Change-Id: I0952f568a933c137bd03070759989cac3517d8b9
2014-10-29coverity#1202781 Division or modulo by zeroCaolán McNamara1-1/+2
Change-Id: I2908c57badd079c8f19c679f40ed815ce2cba374
2014-10-28coverity#1000600 Division or modulo by zeroCaolán McNamara1-5/+12
Change-Id: I38fb8a7072eb7905f5dccc8697b3176d8b34c6c2
2014-10-26Avoid boost::optional<bool>Miklos Vajna1-5/+7
Change-Id: Idaacaf80098e59df47183741402c8664ba5ea631
2014-10-26fdo#82076 RTF import: handle footnote in table cellMiklos Vajna2-2/+20
Change-Id: I69def7936c320e93db5d4504922d52346caaf9cf
2014-10-25loplugin:unreffunMiklos Vajna1-21/+0
Change-Id: I7b707ddd526c927ed99e93797d1bd320860d5397
2014-10-25fdo#82859 RTF import: fillColor is unsignedMiklos Vajna1-1/+1
Otherwise ARGB 0xFFFFFFFF would turn into black. Change-Id: I690f34d888ca9a013e8ce1af2c7ef8ed88ee28b0
2014-10-25fdo#82859 RTF import: don't try to set CustomShapeGeometry on a TextFrameMiklos Vajna1-1/+1
Change-Id: I687fa609559f0484fe6bb804265243de154c3760
2014-10-25only the now removed OOXML tokenizer called getType()Miklos Vajna16-63/+0
Change-Id: Id9786ed75bf9d9b637312655af33d790caf93b13
2014-10-25writerfilter: remove unused dumpXml() methodsMiklos Vajna4-140/+0
Unused since 51d1545e0ce8b30eea710501b84853288dd2563b (writerfilter: Kill debug_logger., 2014-06-11). Change-Id: I01743a9f5c603da06cfd422d29d3258a17d4dd40
2014-10-25writerfilter: nobody generates FSPA references anymore, only doctok didMiklos Vajna3-45/+28
Change-Id: I3dbfb727c40a71eb70a26fd53ad651477a8a5220
2014-10-25writerfilter: nobody generates PICF references anymore, only doctok didMiklos Vajna3-7/+2
Change-Id: I65576f09cbc39f98f3d27739e06ec9520d5032c5
2014-10-25fdo#85179 RTF filter: import image borderMiklos Vajna2-8/+25
Also adjust CppunitTest_sw_htmlexport that implicitly tested that there is no color around the image. Change-Id: I8e14dfa7e7be80c4f8c492999071decae6a492e8
2014-10-25writerfilter: avoid copy&pasteMiklos Vajna1-2/+3
Change-Id: I72057875cf2803008f63a85fee2be477598d8aff
2014-10-23Fraction: Revert "fdo#81356: convert Fraction to boost::rational<long> - wip"Jan Holesovsky2-11/+11
This reverts commit 47a2d7642d249d70b5da0c330a73f3a0032e4bba. Conflicts: cui/source/tabpages/transfrm.cxx svx/source/svdraw/svdedtv1.cxx svx/source/svdraw/svdibrow.cxx sw/source/filter/ww1/w1filter.cxx tools/source/generic/rational.cxx Change-Id: I4849916f5f277a4afef0e279b0135c76b36b9d15
2014-10-23Fraction: Revert "error C2677: binary '*' : no global operator found"Jan Holesovsky1-1/+1
This reverts commit 9abc8067365e394bdc7c4fe49f642207a86d13f5.
2014-10-23Fraction: Revert "fdo#84854 it seems long is not enough on 32 bit"Jan Holesovsky2-8/+8
This reverts commit 582ef22d3e8e30ffd58f092d37ffda30bd07bd9e. Conflicts: svx/source/svdraw/svdedtv1.cxx svx/source/svdraw/svdibrow.cxx sw/source/filter/ww1/w1filter.cxx Change-Id: I80abc7abdeddc267eaabc9f8ab49611bb3f8ae83
2014-10-23WaE: unused parametersTor Lillqvist2-0/+2
Change-Id: I689754378773fc6926e4cebe3ec14b5056fb8986
2014-10-23loplugin: cstylecastNoel Grandin1-2/+2
Change-Id: Iad39bce8e7562821bc8fbf8156ea56aedc19c7d6
2014-10-22i#84172 RTF import: handle nested groups inside redlinesMiklos Vajna2-0/+16
The problem was that in case we had {\revised foo {bar}}, then we only started a redline before "foo", but we ended it twice: during handling of both "}". Make sure that the end of the redline is only handled by the second one. Change-Id: I41ab8b486e8615d3479fa0fadd6016476859b4b2
2014-10-21WaE: unused parametersTor Lillqvist1-0/+2
Change-Id: I080677b1add4f82315ed063af2478c9e41d267ac
2014-10-20DOCX import: fix <w:pageBreakBefore> wrt. inherited stylesMiklos Vajna1-4/+1
We used to ignore this element with a "false" logical attribute, but that causes a problem when an inherited style wants to explicitly disable this element from a parent style. Change-Id: I2fc4c5b2002987d44679d863ea3f19114b9ab7a4
2014-10-19fdo#83464 RTF import: \plain should reset \rtlch and \hich as wellMiklos Vajna1-0/+2
Regression from 36246aa9fb57c9fe4e546c91a8274d8828b1424e (RTF import: fix handling of \loch \hich \dbch \ltrch \rtlch, 2014-06-03), now that \f no longer means the ascii font name, \plain should reset a few more parser state members. Change-Id: Ia6b0bdf25563dd5300e108b46731751f0886f67d
2014-10-18i#74153 RTF import: fix track changes vs superscript char propMiklos Vajna2-2/+15
Since 9dbf817fe5c5253fba0831aefa17575ae0ba3af1 (handle scope of w:pPrChange and w:rPrChange properly (bnc#821804), 2014-10-01), this caused an assertion failure -> crash. Change-Id: I680edf58854d0c9be6e77c44c1e6beb1e0442a49
2014-10-17UBSan: Don't force sal_Int32/float values into sal_uInt32Stephan Bergmann1-4/+10
...overload of TagLogger::attribute. Not withstanding that function looks just silly anyway. Change-Id: I6cc3c5004884e564aac1397cab6eb6fae7a06f7e
2014-10-17Work around Clang 3.2 -Wnull-conversion bugStephan Bergmann25-169/+169
...by running all of writerfilter through loplugin:nullptr rewriter Change-Id: Ie6ec5dd989dc2035ccd10941bc38e557e128be0f