summaryrefslogtreecommitdiff
path: root/writerfilter
AgeCommit message (Collapse)AuthorFilesLines
2014-11-29Resolves: fdo#86449 CVE-2014-9093 backport rtf fixesCaolán McNamara3-34/+177
The actual bug is against 3.5.4 and 4.2 doesn't crash in anything like the same way but it does still crash. So these fixes stop the provided examples from crashing in 4.2 on using top on an empty stack, which isn't the same as actually being a fix for CVE-2014-9093 as seen in 3.5.X empty Reference valgrind + bff (cherry picked from commit 0a42632a74596cbc781746931bf8f2650994b80f) empty m_aStates valgrind + bff (cherry picked from commit e3247719911f4e9b61ec43ea1c9ce04bcddc4ff8) 3bd526b7ebf0f4fce5d0c7054809e0dc2908e73f Reviewed-on: https://gerrit.libreoffice.org/12965 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit b4840d3632e4404bee4bd192a7db916cbad3a401) Conflicts: writerfilter/source/dmapper/DomainMapperTableHandler.cxx writerfilter/source/rtftok/rtfdocumentimpl.cxx Resolves: fdo#86451 guard all the tops post pop Reviewed-on: https://gerrit.libreoffice.org/12966 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 566300ebd57e6ff07fdb014321e23a92c9bcf5ee) Conflicts: writerfilter/source/rtftok/rtfdocumentimpl.cxx 98be6f014893dfc7cee770c44cd9d0be32b39f5c Change-Id: Id3c039a46dec5d2d4a4642dfb53d23a76972dde2
2014-10-03shared_ptr is too smart to accept NULLChristian Lohmaier1-1/+1
Change-Id: Id1bc223ffe2a8811219cdc47d145cd139199281a Reviewed-on: https://gerrit.libreoffice.org/11767 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2014-10-03Resolves: fdo#79130 Crash in DomainMapper_Impl::CloseFieldCommandCaolán McNamara1-1/+1
Change-Id: Ia59e0c79ec7f2066891b78657559f41eaeb80a09 (cherry picked from commit a392a1deb0bb55f39f0232f9b3df8ad9ac9062af) Reviewed-on: https://gerrit.libreoffice.org/11666 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-10-03Related: fdo#73608 don't crash on missing table stylesCaolán McNamara1-1/+15
(cherry picked from commit 5fd7382651d64f77e8ad1d9a5c053f52f3641f9f) Conflicts: writerfilter/source/dmapper/DomainMapperTableHandler.cxx Change-Id: I340b43b7afc4c5c4d6dc8e4ed182279240306540 Resolves: fdo#73608 bail out on loop in style sheet hierarchy Change-Id: I03975d1ce8eaceceb4d5c263eb11c1521bcd57eb (cherry picked from commit be18133e84120625734a09380594ee89b23c4322) Reviewed-on: https://gerrit.libreoffice.org/11680 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-09-25add missing breakLuboš Luňák1-0/+1
Should have been included in 3891ba42a886fa85eb43da24d1badf44e765d54c. Change-Id: I22e5ba931a58c83efdbf996ce701c52dcf0bf9c5
2014-09-24Blind fix: writerfilter::TableManager used without template parameterscp-4.2-15Tor Lillqvist1-1/+1
Change-Id: I351478d9dbde6f7459145b82a73fb5bb119a6bdb
2014-09-23handle docx's w:anchor layoutInCell attribute (bnc#891663)Luboš Luňák3-0/+9
(cherry picked from commit 3891ba42a886fa85eb43da24d1badf44e765d54c) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx writerfilter/source/dmapper/PropertyIds.cxx writerfilter/source/dmapper/PropertyIds.hxx Change-Id: I8268567b84aa0f6e42624bfd0f79c8c49c153edd
2014-09-11Resolves: fdo#82114 RTF import: fix handling of first page in non-first sectionMiklos Vajna1-4/+9
Change-Id: If06c6bcdda97447e6014223d997c7ff8abd64b48 (cherry picked from commit 04fe5e6a31c9701177a744bbc8a53b2f664fe71c) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx
2014-09-11Related: fdo#82114 Copy first-header-footer test from ww8 to ooxmlLuke Deller2-41/+15
The test document was converted from doc to docx using MS Word 2010. Several fixes were required to make this test pass: - Do not clear the "FirstIsShared" property on page styles, as the code instead uses the old fashioned method of translating a Word section with "different first page header/footer": two page styles linked together, the first page style and the follow page style. (Also remove a wrong test case which checks the FirstIsShared property) - Do not clear the "HeaderIsShared"/"FooterIsShared" properties on the first page style, only on the follow page style. - Actually set the "FollowStyle" property on the first page style to link it to the follow page style. This didn't matter for the very first Word section because it was mapped to the default page styles "First Page" and "Standard" which are already linked, but it does matter for subsequent Word sections. - For some reason setting a new page style at a section break was excluded in the case where the following section had a title page. Remove this exclusion. - The exclusion mentioned in the last point was masking that bnc#751077 was not entirely fixed. To resolve that issue: When checking if the last paragraph of the section is empty, consider not just text content but also shapes. - Remove a workaround for bnc#780843 involving copying of headers and footers from the "Standard" (first section) page style in the case where the following section had a title page. This workaround is no longer needed as the test case passes without it. (cherry picked from commit b4ccde72b8e2e45e7276d5b08b182495a1b1a617) Change-Id: Iacc9bba0720c11414da3e852892cff301ebbc4fe
2014-09-11Related: fdo#82114 Kill copy'n'paste.Jan Holesovsky2-60/+25
(cherry picked from commit 07338e20663f9a52f819d0d0c93e8599406d1ff2) Conflicts: writerfilter/source/dmapper/DomainMapper_Impl.hxx Change-Id: I3d457efc89873ca92a4458b1ac0a125848c942a8
2014-09-11Related fdo#38054 fdo#82114: Don't crash when opening this document.Jan Holesovsky1-5/+5
The document itself is (I think) corrupted, but we shouldn't crash anyway. (cherry picked from commit fd859ee5802d6fa353526e632b49a8208444769e) Change-Id: I7ecfaed7003de2976e47992c89bb695a5cdffda4
2014-09-09fdo#77129 DOCX:Only Six pages were loaded out of 60 pages.sushil_shinde2-11/+24
- Footer reference was inside TOC field. - m_bStartTOC flag was enabled while handling TOC from document. - Since m_bStartTOC was enabled while importing footer it was inserting extra textcursors entries to m_aTextAppendStack. - Due to bad entries in textappendstack, footer was not popped properly. - Because of this all lost data after sixth page was inserted into footer node and it was not visible on page. - Added new flag to differentiate TOC from main document and Header or Footer. Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Reviewed on: https://gerrit.libreoffice.org/9930 (cherry picked from commit 9948d9566e86b190e74a62e63f273f5fa0eb8929) Signed-off-by: Luboš Luňák <l.lunak@collabora.com> Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx writerfilter/source/dmapper/DomainMapper_Impl.cxx Change-Id: I5288f5c313c890e0fdddf3c60c4609eab30edde6
2014-09-08fdo#81944 fdo#82107: writerfilter: RTF import: don't drop fonts in stylesheetMichael Stahl3-36/+24
The font definitions in the style sheet meet an untimely death in StyleSheetTable::lcl_sprm(), which special-cases LN_EG_RPrBase_rFonts, routing it into TblStylePrHandler. Avoid this by sending style entries to the domain mapper in the same way as the OOXML tokenizer, i.e., with paragraph and run properties nested below CT_Style_pPr/rPr. This reveals that the CT_Style_basedOn was wrongly handled as paragraph property. (cherry picked from commit f8e8e476aa0a5576234dbb4daac9dc299e044e61) Conflicts: writerfilter/source/rtftok/rtfdocumentimpl.cxx Change-Id: Ic724ba48fe36bf782b1b430bdafdb1df480d5ad3
2014-09-08fdo#79959 RTF import: trim whitespace around style namesMiklos Vajna1-2/+2
(cherry picked from commit 305ecd1848a802a6c43ecc6e76f4c6bc36a03418) Conflicts: writerfilter/source/rtftok/rtfdocumentimpl.cxx Change-Id: Id23cbd62b057442c577fef124a5705e4d551076f
2014-09-08fdo#74229 import RTF_TRGAPHMiklos Vajna1-0/+11
Regression from commit c4b91ae3178011c66c76c711c1a6469ba658872e (fdo#55525 import RTF_TRLEFT, 2012-11-13). (cherry picked from commit 54bdfe0a891f2119bc35c5d82ecbc94c8cb13c0b) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx writerfilter/source/rtftok/rtfdocumentimpl.cxx Change-Id: I90f2c6399cfaf8399de0cf3488a23af6cc84710d
2014-08-26fdo#39056 fdo#75431 Section Properties if section starts with tableVinaya Mandke5-3/+108
Section properties are not imported if the section starts with a table for DOCX, and also for a few RTF files with combination of tables and section breaks. SwXBodyText::createTextCursorByRange is not able to find the start of section and hence section properties are not applied. As a workaround added an empty paragraph at the beginning of every section which has the the first element as a table. And then removed it when the section ends ( DomainMapper::lcl_endSectionGroup is called). Also handled to add the paragraph earlier, if there is a bookmark so that the bookmark is not attached to the dummy paragraph. Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Reviewed on: https://gerrit.libreoffice.org/9097 Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx writerfilter/source/dmapper/DomainMapper.cxx Change-Id: I717ba40e22b055d974bc83d4414aeb2945e16d26
2014-08-21fix build, coverity#1209547 Unchecked dynamic_castCaolán McNamara1-4/+7
(cherry picked from commit f4c80aaf3f2b97661ecf1cfd014aaa5ad00da846) Change-Id: Ibf614156aeafcd74be444cf388e02a9273d38d5f Reviewed-on: https://gerrit.libreoffice.org/11019 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-21check for empty m_aStatesCaolán McNamara2-0/+4
valgrind + bff Change-Id: Ib818d508e10877a845b733c4aa223d1e2cbbc05e (cherry picked from commit e2b9531e43d37677109aa13eb6e2ebf857961016) Reviewed-on: https://gerrit.libreoffice.org/10959 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-21fdo#81993: Revert "Resolves: #i119464# Update default alignment ...Michael Stahl1-17/+1
... value for docx [Sub]Title" This reverts commit acc671ec74c874ffd22803bb2ee54a1f2c027155. The commit is clearly unnecessary: 1) commit 3f9e7e72c53ecbe8ee1ab060f811cb41eadfc7e1 appears to be a better fix for alignment 2) commit b95d203bc17c83ec0fe5139f519d53ed1d842d3a should have disabled the Center default in Writer already Change-Id: Ib0cc60af037f12be0a1ab94ab32c743f7fca2b1d (cherry picked from commit d4b96b45727314585d02394bb5a084393b647729) Reviewed-on: https://gerrit.libreoffice.org/10734 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-08-21fdo#80986: disable highlight DOCX importZolnai Tamás1-1/+1
Highlight support is not implemented fully, so it seems better to disable DOCX import of it until it is finished. Highlight can't be modified on the UI and is not saved to ODT/DOC (regression). Regression from: 8b949134441056a1455d67ddfdd7e0bc5f2ee682 (cherry picked from commit b5e60724ac73bb0e62b249145a8931fd6166bb69) Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Change-Id: I94891769766ae90017e8afa70e65d080d5270202 Reviewed-on: https://gerrit.libreoffice.org/10721 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-08-21fdo#78904 : LO hangs while saving the document.Umesh Kadam1-6/+17
- In case of framePr attributes being omitted in original xml, LO defaults such attributes to incorrect values. - Correcting these values in this fix. - This fix stops LO from getting hang while saving the document, the actual fix needs to be somewhere in the table layout. We need to restrict the frame from being considered as part of the table as MSO does not allow frame to be part of a table. Reviewed-on: https://gerrit.libreoffice.org/9774 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 75fc9e669f209472ec6a282848166d96d02d84d9) This also fixes fdo#79391, but not compeletely on this branch. Change-Id: I4c35f7eff6ca1122901f5667fc26b849df527f60 Signed-off-by: Michael Stahl <mstahl@redhat.com>
2014-08-21fdo#81384: writerfilter: turn the horrible btLr cell text dir hackMichael Stahl2-4/+4
... by 5 degrees to starboard, which lets the row in the bugdoc appear, altough the height is a bit insufficient still. Why that works, is a nautic mystery to me, i'd say this whole btLr emulation nonsense needs to be keel-hauled, but after this patch i'll need some rum, arrrr... (regression from commit 0208ead70a9412ccd554fcef3e9308f8ca17037b and commit 970160f78ef6cc7abacfa252daa8451e1f0117bb) Change-Id: Ie0c6ec88b6d6635379b9127f6460647f14776aad (cherry picked from commit 5893a7536a0bbce57c4a2f89680dcb4cff3d06d7) Reviewed-on: https://gerrit.libreoffice.org/10631 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-08-21fdo#78502: writerfilter: RTF import: handle \u keyword inside levelnumbersMichael Stahl1-1/+6
The ";" terminates an entry and shall not be inserted as text, even if some over-engineered producer encodes it as {\uc1 \u59 ?}. Also, remove the special-casing of the \leveltext destination, since the bugdoc does contain \uc inside it and it's not obvious why that should be ignored. (cherry picked from commit e93f0852477b44df986807860c821319a921b199) fdo#78502: actually empty parameter to getParagraph() is not tested (cherry picked from commit b9dca968c6fd0ab5ca140c65b0e54d153cd34986) Change-Id: I1e19c9df39597cb1b22bbda97853c829d7812e29 Reviewed-on: https://gerrit.libreoffice.org/10398 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-08-21coverity#1194911 Unchecked dynamic_castMiklos Vajna1-1/+1
Change-Id: I1e7f4bcd8f54219d86ad7a003469d5a486090f47 (cherry picked from commit 8736c5222a8e83a1310713a92492e63198749467) Reviewed-on: https://gerrit.libreoffice.org/10630 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-07-22(related: fdo#78502) writerfilter: RTF import: fix invalid string copyMichael Stahl1-1/+1
... in leveltext destination. Change-Id: I74de6d14170130bf33923854a0c9851dc7cc390f (cherry picked from commit b94bd40b915ab32d18d43fc60dfda932e4e00ca8) Reviewed-on: https://gerrit.libreoffice.org/10397 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-07-22fdo#81173 abi#3623 RTF import: missing null pointer checkMiklos Vajna2-1/+8
(cherry picked from commit 08fb25ab7941c52d4eed0435a45a38b03aff588c) Signed-off-by: Michael Stahl <mstahl@redhat.com> Change-Id: I5861e5fec0d822f42dfeb994500a818a968e69fb
2014-07-22Fix ignoring large twips values like MSO does (cp#1000087)Matúš Kukan1-5/+5
which was introduced in 10b4da63e3143108ba75891e9e98fdaa2f7953ab. Since 1e47614cdb84b018a22a334dad0cdd9f0f53892c, only convertTwipToMM100Unsigned() ignores large values, which presumably was not the intention. At least commit message suggests so. So, move the check back to convertTwipToMM100(). (cherry picked from commit 4d1621136c464b462a598571ecdcfe2ae119d8c7) Conflicts: writerfilter/source/dmapper/ConversionHelper.cxx Change-Id: I17040f1987e24789b9de39a837d9f7ecaed520fb Reviewed-on: https://gerrit.libreoffice.org/10193 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-07-06fdo#73241 RTF import: ignore page break in tablesMiklos Vajna1-0/+4
(cherry picked from commit fdc235126d6d73f47a5b56d453e1d3db8ba3e816) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx writerfilter/source/rtftok/rtfdocumentimpl.cxx Change-Id: Ibee9fec0f421b4c2ff3d45c861bc3fcfc97cbf15 Reviewed-on: https://gerrit.libreoffice.org/10093 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-07-06fdo#76803: writerfilter: fix image wrap polygon import againMichael Stahl1-2/+4
The division in Fraction::init() should be a signed one, to prevent a change in sign, e.g., -220869/9 = +477194047. (regression from f8307e5ae11e8235fa1fb88ed52625bf9c650dc2) Change-Id: Icbbd1721144ff42c53ae71312641bd601ba60762 (cherry picked from commit dcbac37efebb9877a72f7c9914b63d60f46a5656) Reviewed-on: https://gerrit.libreoffice.org/10079 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-07-04bnc#884615 VML import: import OLE objects in header with background wrappingMiklos Vajna3-4/+12
We already do this for drawingML shapes since commit 500343105707a9905f5198a4af6ad58fe307b7c2 (DOCX drawingML shape import: always set Opaque, 2013-12-04), make the VML / OLE case behave the same as well. (cherry picked from commit 15c3a08b8b1e8060f9659c7bc98480a39d1802c5) Conflicts: sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx Change-Id: Ic22f1f3cfd325ccbbb9bd6fe9814553683e4de55
2014-07-04fdo#69649 RTF import: don't crash on empty TOC resultMiklos Vajna2-1/+9
Regression from commit 9679e9c23216decb5f9f25f85b04cb3f25211111 (fdo#69649 Fix for pre-rendered Table Of Contents, 2013-12-30), the situation that the field doesn't have a result wasn't handled, resulting in a m_aTextAppendStack.pop() call in dmapper, without a matching .push() one. Change-Id: I456d9096d01fb27832a40f6b72802ec555d62647 (cherry picked from commit 018bbe6c538d99c2f14fd4c761048848dc458f4a) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2014-07-03bnc#865381 DOCX import: handle w:jc=center inside w:textDirection=btLrMiklos Vajna4-0/+26
Change-Id: I102c70429457515b34e74cb8e82e1417e6276d1d (cherry picked from commit 3325e0f206ce864730468c3556ce06760042c157)
2014-06-18fdo#76633: writerfilter RTF import: disappear the rectangle shapes on imagesMichael Stahl3-6/+15
If the shape properties are inside \picprop destination, don't set shapeType. (regression from 9f1f7199736e2ae07b34849ba66f61a1ef5782e8) Actually this does not fix the root cause, this is just a work-around, the extra shape is still inserted but it's invisible now. Change-Id: I6cf093de2a5657533f393863ed8010ae083bec16 (cherry picked from commit b7857e5cfe9d5d007785ae93e5505620fc8ed475) Reviewed-on: https://gerrit.libreoffice.org/9773 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-06-18related: fdo#77979: writerfilter RTF import: read encoded font nameMichael Stahl1-4/+5
The font name is encoded in the font's charset given by \fcharset. (cherry picked from commit 04d5a280beeeb6e056df68395dc9c3b3a674361b) Conflicts: writerfilter/source/rtftok/rtfdocumentimpl.cxx (cherry picked from commit 790df682574eb4b3da9a973c3116b54d7666837c) Conflicts: writerfilter/source/rtftok/rtfdocumentimpl.cxx Change-Id: Id9520649a1eb3b55f4314e140abda7399f23d925 Reviewed-on: https://gerrit.libreoffice.org/9749 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-06-16DOCX import: fix additional empty paragraphs around footnote textMiklos Vajna3-1/+8
Regression from commit abe1e852a232e3bdab7b9177d099fe3929f5a4aa (handle properly page breaks even if a page contains only a frame (fdo#55381), 2014-04-21), DomainMapper::lcl_endSectionGroup() inserted an empty paragraph before and after the real footnote text. Disable addition of the dummy paragraph for footnotes. (cherry picked from commit 4d120b6ab181f530d3fedc963b1c6ec777f2608a) Signed-off-by: Luboš Luňák <l.lunak@collabora.com> Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx writerfilter/source/dmapper/DomainMapper.cxx Change-Id: I6e1954c9bd5520ac284d66244ce1c9004e970305
2014-06-10RTF import: fix handling of \loch \hich \dbch \ltrch \rtlchMichael Stahl2-5/+20
The logic is not immediately obvious from the RTF spec; let's do what the editengine RTF import does, but without the unnecessary complexity. (cherry picked from commit 36246aa9fb57c9fe4e546c91a8274d8828b1424e) Conflicts: writerfilter/source/rtftok/rtfdocumentimpl.cxx writerfilter/source/rtftok/rtfdocumentimpl.hxx Change-Id: I60e69130e6e5aed1f5d237f64b1656c3141e402a Reviewed-on: https://gerrit.libreoffice.org/9634 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-06-10fdo#79384: replace the work-around with a different oneMichael Stahl1-7/+7
Word will reject Shift-JIS following \loch, but apparently OOo could read and (worse) write such documents, so accept Shift-JIS regardless of run charset type. (cherry picked from commit d71387ca81b61416b9a7b82cd6cf67d496b81fc2) Conflicts: writerfilter/source/rtftok/rtfdocumentimpl.cxx Change-Id: Ib181956e9f218548a52037dd76fa1d3ecdc006bd Reviewed-on: https://gerrit.libreoffice.org/9633 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-06-10fdo#79384: RTF import: fix literal Shift-JIS textMichael Stahl2-5/+31
This is a variable-length encoding, and the second byte may be a RTF syntax character like \, {, }. (cherry picked from commit 061190a62fcdbfb3a0b266d5afffbd257a3e692e) Conflicts: writerfilter/source/rtftok/rtfdocumentimpl.cxx writerfilter/source/rtftok/rtfdocumentimpl.hxx Change-Id: I813ccafda18388af3bf05eb7ce9a0253c627b1c4 Reviewed-on: https://gerrit.libreoffice.org/9632 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-06-10fdo#79547 fdo#69649 Fix for pre-rendered Table Of ContentsVinaya Mandke3-17/+84
Added Import and Export Uts for the same Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Reviewed on: https://gerrit.libreoffice.org/7207 (cherry picked from commit 9679e9c23216decb5f9f25f85b04cb3f25211111) Conflicts: writerfilter/source/dmapper/DomainMapper_Impl.cxx Change-Id: I966b3d268dd407aa05823e29fe1da4d097091265
2014-06-10fdo#79384 RTF import: allow { without } in style namesMiklos Vajna1-1/+6
This is not valid, but LO 3.4 supported it, so add a workaround... (cherry picked from commit 6092e2eba3f74c9632f7862b2368b0fcf7732f85) Conflicts: writerfilter/source/rtftok/rtfdocumentimpl.cxx Change-Id: Ib8eefdf41fe9801db6f7e5873eaa1436518912fb Reviewed-on: https://gerrit.libreoffice.org/9625 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-06-02discard more header/footer stuff when discarding headers/footers (bnc#875718)Luboš Luňák1-4/+10
782adba4d436c65cdf85d48f28486321873b15ed discards unneeded headers/footers, but only the text, not e.g. frames or fields. The test document therefore ends up with a frame with a page number inside the body text, because the text in the footer it should be anchored to was discarded. This commit fixes this by discarding more (although probably the whole header/footer shouldn't even be parsed to begin with). The test from b349d2483e1fe64316d87b55d0b3b4c8f2293e2e actually checked for this incorrect frame, so change that (the whole test is suspicious, as the end result is quite far away from what the original doc looks like). (cherry picked from commit 5510f563502168defa4ccfc54214d781a7c92868) Signed-off-by: Andras Timar <andras.timar@collabora.com> Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: I2e7192e00237db1f030d0524c5667fe92c9e496b
2014-06-02fdo#78900 RTF import: allow \dpxsize inside \dptxbxtextMiklos Vajna1-0/+11
Previously we assumed that they always appear under \do directly. Change-Id: Ie3a978da856986f604a3815d6127abb4191323c0 (cherry picked from commit 21c11ffe254612ac46aa891addacb0024d5b93f0) Reviewed-on: https://gerrit.libreoffice.org/9488 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-05-29handle direct formatting for numbering in .docx (bnc#875717)Luboš Luňák3-0/+5
Change-Id: I3ed0f926e79f3878c5702c2becae97d99d00e201
2014-05-18fdo#78313 RTF import: retain font colorsMiklos Vajna3-1/+21
This is a cherry-pick of two master commits: RTFValue::equals: consider the number of attributes/sprms as well (cherry picked from commit 4452fa9a2e741834a19c9b322fc8d9c8b06450de) Related: fdo#77600 RTF import: RTFValue::equals: compare attribute content Previously only the number of nested sprms / attributes was compared. With this, the font of the bugdoc is correctly Arial, not Times. (cherry picked from commit 8e8f9388c323ad3c32cef3f91609ad19386b7d56) Conflicts: writerfilter/source/rtftok/rtfsprm.hxx Change-Id: I351de414b6734336b31c1334dbd2349072f16002 Reviewed-on: https://gerrit.libreoffice.org/9316 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-05-18writerfilter: DomainMapper_Impl::SetSymbolData() should take an intMiklos Vajna2-2/+2
One wonders how did this work so far. Change-Id: I6aee6a2f7e15c1c4931ca5d65b6ad39d025ff9ed (cherry picked from commit 671eb12dee290607ed66f3b325f28e7bd4695cba) Signed-off-by: Andras Timar <andras.timar@collabora.com>
2014-05-18fdo#78384: Fix for corruption if file contains symbols.Rohit Deshmukh3-1/+25
* In case of symbol, symbol character get imported first and then font of symbols. * So we are storing symbol character and when we parse symbol font then create UNO object for text. Reviewed-on: https://gerrit.libreoffice.org/9281 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit f51640c5f40d5132b396a9fb6589420383df1610) Signed-off-by: Andras Timar <andras.timar@collabora.com> Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx writerfilter/source/dmapper/DomainMapper_Impl.cxx Change-Id: If5b79521c6a59aec02b165e8120dafdd472cdaeb
2014-05-01actually read brightness/contrast when reading docx (bnc#875713)Luboš Luňák1-0/+4
It's read for the shape in oox/ , but it didn't make it any further apparently. Change-Id: I0885a675f72d63b3d262f1ef7e42f5d2e03588b6 (cherry picked from commit 804da2a977989ba1f046847b9e00f00c83749e30) Reviewed-on: https://gerrit.libreoffice.org/9216 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-04-30fdo#70853 writerfilter: refactor to avoid redundant Papx class in doctokMiklos Vajna3-26/+40
(cherry picked from commit f453cf1d328f96dd5ad8e94b102bff3124e06154, but only the rtftok part, the rest is not needed to fix the bug) Conflicts: writerfilter/source/dmapper/DomainMapper.cxx writerfilter/source/dmapper/StyleSheetTable.cxx writerfilter/source/doctok/resources.xmi writerfilter/source/rtftok/rtfdocumentimpl.cxx Change-Id: Ic65e750bab99fb6b4c862418ccc53aa4b1f1298e Reviewed-on: https://gerrit.libreoffice.org/9173 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-04-30Resolves: rhbz#1089377 crash on loading a specific rtfCaolán McNamara2-13/+40
(cherry picked from commit 5aeaba2e6592dab0404301dcef644144f82ffcbf) Change-Id: I26864f3a2247f5d7184f395cfed91eaf92e36295 Reviewed-on: https://gerrit.libreoffice.org/9131 Tested-by: David Tardon <dtardon@redhat.com> Reviewed-by: David Tardon <dtardon@redhat.com>
2014-04-29123792: complete annotations on text ranges featureOliver-Rainer Wittmann3-31/+48
- rely annotations on text ranges on new annotation marks - support arbitrary text ranges for annotations - fix undo/redo regarding annotations an text ranges - support annotations on overlapping text ranges - fix *.docx import for annotations on overlapping text ranges - fix ODF import of annotations on text ranges cherry-picked from branch ooxml-osba (cherry picked from commit ebd2922ebd3cf2d3899fb80780d38f367197aadf) Conflicts: sw/Library_sw.mk sw/inc/IDocumentMarkAccess.hxx sw/inc/SidebarWin.hxx sw/inc/doc.hxx sw/inc/docufld.hxx sw/inc/hintids.hxx sw/inc/ndhints.hxx sw/inc/txatbase.hxx sw/inc/unobookmark.hxx sw/inc/unofield.hxx sw/inc/unoport.hxx sw/source/core/access/accpara.cxx sw/source/core/bastyp/init.cxx sw/source/core/crsr/bookmrk.cxx sw/source/core/crsr/findtxt.cxx sw/source/core/doc/dbgoutsw.cxx sw/source/core/doc/docbm.cxx sw/source/core/doc/doccorr.cxx sw/source/core/doc/docdde.cxx sw/source/core/doc/docedt.cxx sw/source/core/doc/docfld.cxx sw/source/core/doc/doclay.cxx sw/source/core/doc/tblrwcl.cxx sw/source/core/docnode/ndcopy.cxx sw/source/core/docnode/nodes.cxx sw/source/core/docnode/section.cxx sw/source/core/edit/edfld.cxx sw/source/core/fields/docufld.cxx sw/source/core/fields/postithelper.cxx sw/source/core/fields/reffld.cxx sw/source/core/inc/MarkManager.hxx sw/source/core/inc/crossrefbookmark.hxx sw/source/core/text/inftxt.cxx sw/source/core/text/itratr.cxx sw/source/core/text/txtfrm.cxx sw/source/core/txtnode/atrfld.cxx sw/source/core/txtnode/ndtxt.cxx sw/source/core/txtnode/thints.cxx sw/source/core/undo/undel.cxx sw/source/core/undo/undobj.cxx sw/source/core/unocore/unofield.cxx sw/source/core/unocore/unoport.cxx sw/source/core/unocore/unoportenum.cxx sw/source/filter/html/htmlatr.cxx sw/source/filter/html/htmlgrin.cxx sw/source/filter/html/wrthtml.cxx sw/source/filter/writer/writer.cxx sw/source/filter/ww1/fltshell.cxx sw/source/filter/ww8/wrtw8nds.cxx sw/source/filter/ww8/ww8par.cxx sw/source/ui/dialog/uiregionsw.cxx sw/source/ui/dochdl/swdtflvr.cxx sw/source/ui/docvw/PostItMgr.cxx sw/source/ui/docvw/SidebarWin.cxx sw/source/ui/fldui/fldmgr.cxx sw/source/ui/fldui/fldref.cxx sw/source/ui/inc/fldmgr.hxx sw/source/ui/inc/wrtsh.hxx sw/source/ui/shells/textfld.cxx sw/source/ui/uiview/view2.cxx sw/source/ui/utlui/navipi.cxx sw/source/ui/wrtsh/wrtsh2.cxx writerfilter/source/dmapper/DomainMapper_Impl.cxx writerfilter/source/dmapper/DomainMapper_Impl.hxx writerfilter/source/dmapper/PropertyMap.cxx xmloff/inc/txtfldi.hxx xmloff/source/text/txtfldi.cxx xmloff/source/text/txtparae.cxx (cherry picked from commit 0761f81643a6890457e9ef7d913ab5c88c2593a4) Conflicts: sw/source/core/access/accpara.cxx sw/source/core/fields/reffld.cxx sw/source/core/text/txtfrm.cxx sw/source/core/txtnode/modeltoviewhelper.cxx sw/source/core/txtnode/thints.cxx sw/source/core/unocore/unoportenum.cxx writerfilter/source/dmapper/DomainMapper_Impl.cxx Change-Id: Ie4cc467dbb837054c73742262ee20f35c151ff3f
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-01 05:15:53 +0000