summaryrefslogtreecommitdiffstats
path: root/writerfilter
Commit message (Collapse)AuthorAgeFilesLines
* Fix outline numbering for ooxml import filter.Mark Hung2014-11-181-5/+5
| | | | | | | | | Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Reviewed on: https://gerrit.libreoffice.org/12519 Change-Id: Ifd8a562bcee4f57cc99ed3215e6d8d6dd95216b0
* fdo#85542: fix DOCX import of overlapping bookmarksBjoern Michaelsen2014-11-173-14/+29
| | | | | | | | | | | This was broken by 345a3a394e082595924bf219796627f6c00ae2dd. Kill the static variable and instead have some more state in the implementation. Still not ideal, but at least fixes the regression. Change-Id: I562f7d88a1983bd0ec2e01d6bb1e4a53551d0953 Reviewed-on: https://gerrit.libreoffice.org/12491 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
* DOCX import: handle <w:numId> from parent styles as wellMiklos Vajna2014-11-171-2/+27
| | | | | | | | Without this, we may miss the <w:numId> of a paragraph and set no numbering style name; and that leads to not restarting numberings when needed. Change-Id: I9a4896266c5b7f1d7cc2adc43b84e227c004da7c
* sal: clean up public headers with include-what-you-useMichael Stahl2014-11-1711-0/+11
| | | | | | | | | Sadly cannot forward declare "struct {...} TimeValue;". rtl/(u)?string.hxx still include sal/log.hxx but removing osl/diagnose.h was painful enough for now... Change-Id: Id41e17f3870c4f24c53ce7b11f2c40a3d14d1f05
* loplugin:implicitboolconversionStephan Bergmann2014-11-171-1/+1
| | | | Change-Id: I389fa692e4a8f99d8de21cf0af3f2a7f0ac1a6f5
* Improve rtf import filter to handle Chinese suffixes of numbered lists.Mark Hung2014-11-161-4/+3
| | | | | | | | | | | | | | | | | | | | | Currently rtftok doesn't handle multibyte string as destination text very well. For example, RTF files created by MSO 2010 Traditional Chinese version use CP950 (aka BIG5) for unicode to ansi conversion. When a Chinsese numbered list was picked, the Chinese dot ( unicode 0x3001, big5 0xa142 ), was used by default as a list number suffix. However when it is imported , only a single B (0x42) were left. The theory of the patch is to collect both hex string and normal character with m_aHexBuffer, and convert it into OUString as late as possible. It allows prefixes and suffixes to be imported from RTF files created by MSO 2010 TC correctly. Reviewed on: https://gerrit.libreoffice.org/12435 Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx Change-Id: I63062da39bf36ea27ec11e5d0eb1d1abf5018d96
* writerfilter: this is expected to be UTF-8Miklos Vajna2014-11-161-2/+1
| | | | Change-Id: I7408be90f1ff552f4bb33e8a89d4b9075634e3e5
* fdo#83204 RTF import: handle \pard<para props> after \bkmkstartMiklos Vajna2014-11-161-0/+2
| | | | Change-Id: I4f5f0f653f2ce7782ec1d1fc5ef550a21a9c1d35
* writerfilter: these are expected to be UTF-8Miklos Vajna2014-11-165-8/+8
| | | | Change-Id: I8cd2ce341996a219ee885969de3482be422730b3
* RTF import: handle right-to-left tablesMiklos Vajna2014-11-151-1/+1
| | | | Change-Id: If2e60557b7551839c344d56cb3a720ae3659e93c
* fdo#86023 - O[U]String needs a 'clear' methodBrij Mohan Lal Srivastava2014-11-144-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>
* Fix common typos. No automatic tools. Handmade…Andrea Gelmini2014-11-125-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>
* test for membership should be 'not in'Miklos Vajna2014-11-092-4/+4
| | | | Change-Id: I493bad18ed3f728bcf42049377d7f4c6039264c8
* fdo#84645 RTF import: set DontBalanceTextColumns=true for the last section ...Miklos Vajna2014-11-081-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
* writerfilter: SW_DEBUG_RTF_PASTE_{TO,FROM} is expected to be UTF-8Miklos Vajna2014-11-081-2/+2
| | | | Change-Id: Ibcfa71cf9820db0b397a88e22aa6cc964048b71c
* Correct number format mapping for CJK numbered lists in rtf/doc/docx filters.Mark Hung2014-11-072-19/+77
| | | | | | | Reviewed on: https://gerrit.libreoffice.org/12252 Change-Id: I2d8760c7ecb3677464e167528b2424aaca19a0d7
* writerfilter: handle ooxml:CT_TblPrBase_bidiVisualMiklos Vajna2014-11-071-0/+7
| | | | Change-Id: I619a6b161e5ed7e902406b288552b06fe7da487e
* DOCX import: fix rounding error in table cell widthsMiklos Vajna2014-11-071-2/+2
| | | | Change-Id: I733fd4b998ba4d0bde2f91f2b3d76205f0dc8020
* Revert "use the new OUString::fromUtf8 method"Stephan Bergmann2014-11-066-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).
* DOCX import: fix <w:tblW w:type="auto"/> handling when cells have fixed widthsMiklos Vajna2014-11-061-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
* use the new OUString::fromUtf8 methodNoel Grandin2014-11-066-12/+12
| | | | Change-Id: I771004b7ccab3344a67e827e45bc34c22ffa5f77
* fdo#85812: RTF import: better fix for run type in new groupsMichael Stahl2014-11-051-2/+3
| | | | | | | Apparently Word treats \ltrch \rtlch differently from \loch \hich \dbch when groups are opened. Change-Id: I257712521e8e77fa66e76857489797ecc675506e
* fdo#38835 strip out OUString globalsNoel Grandin2014-11-056-69/+69
| | | | | | | they are largely unnecessary these days, since our OUString infrastructure gained optimised handling for static char constants. Change-Id: I07f73484f82d0582252cb4324d4107c998432c37
* fdo#85812: RTF import: fix run type in new groupsMichael Stahl2014-11-051-0/+2
| | | | | | | | Apparently the run type resets to LTR in a new group. (regression from fc49c052dbdbb5ab3b0a02a13143705f769b9662) Change-Id: I61c0fcbe4e44b488a14cc78823063a1a1ad4f4b1
* Use comphelper::SequenceAsVectorMiklos Vajna2014-11-042-8/+3
| | | | Change-Id: Iaf5fb72b065cc0d2a412b027d41d7618654d30b1
* be a little more consistent stylewiseCaolán McNamara2014-11-031-1/+1
| | | | Change-Id: If1d822e0e6c87e792ff4a769a525e161505325c9
* unused includes in RTF filter and related filesMiklos Vajna2014-11-028-47/+0
| | | | Change-Id: Id13e10f2ceed3985c78ccc542e6677eccc0cb1c7
* fdo#82512 RTF import: fix position of column breakMiklos Vajna2014-11-011-0/+8
| | | | Change-Id: Ib0f39c4af7cc32d0f4491f13ea207d90a449a47d
* coverity#1000600 Division or modulo by float zeroCaolán McNamara2014-11-011-11/+18
| | | | Change-Id: If39679b54ef1bb0a7af794c2f7a6186ebd69c2e0
* oox: introduce W_TOKEN() macroMiklos Vajna2014-11-011-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
* Removed duplicated includesAndrea Gelmini2014-10-313-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>
* Use oox::drawingml::convertEmuToHmm()Miklos Vajna2014-10-314-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
* Fixed typos. No automatic tools (sed, and so on).Andrea Gelmini2014-10-301-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>
* fdo#79602: sw: add new compatibiltiy flag PropLineSpacingShrinksFirstLineMichael Stahl2014-10-301-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
* coverity#1202781 Division or modulo by zeroCaolán McNamara2014-10-291-1/+2
| | | | Change-Id: I2908c57badd079c8f19c679f40ed815ce2cba374
* coverity#1000600 Division or modulo by zeroCaolán McNamara2014-10-281-5/+12
| | | | Change-Id: I38fb8a7072eb7905f5dccc8697b3176d8b34c6c2
* Avoid boost::optional<bool>Miklos Vajna2014-10-261-5/+7
| | | | Change-Id: Idaacaf80098e59df47183741402c8664ba5ea631
* fdo#82076 RTF import: handle footnote in table cellMiklos Vajna2014-10-262-2/+20
| | | | Change-Id: I69def7936c320e93db5d4504922d52346caaf9cf
* loplugin:unreffunMiklos Vajna2014-10-251-21/+0
| | | | Change-Id: I7b707ddd526c927ed99e93797d1bd320860d5397
* fdo#82859 RTF import: fillColor is unsignedMiklos Vajna2014-10-251-1/+1
| | | | | | Otherwise ARGB 0xFFFFFFFF would turn into black. Change-Id: I690f34d888ca9a013e8ce1af2c7ef8ed88ee28b0
* fdo#82859 RTF import: don't try to set CustomShapeGeometry on a TextFrameMiklos Vajna2014-10-251-1/+1
| | | | Change-Id: I687fa609559f0484fe6bb804265243de154c3760
* only the now removed OOXML tokenizer called getType()Miklos Vajna2014-10-2516-63/+0
| | | | Change-Id: Id9786ed75bf9d9b637312655af33d790caf93b13
* writerfilter: remove unused dumpXml() methodsMiklos Vajna2014-10-254-140/+0
| | | | | | | Unused since 51d1545e0ce8b30eea710501b84853288dd2563b (writerfilter: Kill debug_logger., 2014-06-11). Change-Id: I01743a9f5c603da06cfd422d29d3258a17d4dd40
* writerfilter: nobody generates FSPA references anymore, only doctok didMiklos Vajna2014-10-253-45/+28
| | | | Change-Id: I3dbfb727c40a71eb70a26fd53ad651477a8a5220
* writerfilter: nobody generates PICF references anymore, only doctok didMiklos Vajna2014-10-253-7/+2
| | | | Change-Id: I65576f09cbc39f98f3d27739e06ec9520d5032c5
* fdo#85179 RTF filter: import image borderMiklos Vajna2014-10-252-8/+25
| | | | | | | Also adjust CppunitTest_sw_htmlexport that implicitly tested that there is no color around the image. Change-Id: I8e14dfa7e7be80c4f8c492999071decae6a492e8
* writerfilter: avoid copy&pasteMiklos Vajna2014-10-251-2/+3
| | | | Change-Id: I72057875cf2803008f63a85fee2be477598d8aff
* Fraction: Revert "fdo#81356: convert Fraction to boost::rational<long> - wip"Jan Holesovsky2014-10-232-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
* Fraction: Revert "error C2677: binary '*' : no global operator found"Jan Holesovsky2014-10-231-1/+1
| | | | This reverts commit 9abc8067365e394bdc7c4fe49f642207a86d13f5.
* Fraction: Revert "fdo#84854 it seems long is not enough on 32 bit"Jan Holesovsky2014-10-232-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