summaryrefslogtreecommitdiff
path: root/writerfilter
AgeCommit message (Collapse)AuthorFilesLines
2013-06-16RTF import: implement support for tables inside text framesMiklos Vajna4-13/+54
Change-Id: I6088adad20212cdbcc03b193cc079c51a305602a
2013-06-16Factor out RTFSdrImport::applyProperty() from RTFSdrImport::resolve()Miklos Vajna4-48/+54
Change-Id: Idd352e712e20e6e64c80490daf4b2a5e74d47a97
2013-06-15RTF filter: import posh/posv property of shapesMiklos Vajna3-0/+48
Change-Id: I55eccccf7f9ed06bba1ada18574890b5bee296f4
2013-06-13Introduce O[U]String::toUInt32Stephan Bergmann1-1/+1
...which has become necessary since bd60d41176da540b01d7583cfe00637431967f39 "Handle oveflow in O(U)String::toInt() functions" reduces values in the range (SAL_MAX_INT32 .. SAL_MAX_UINT32] to zero, but some calls of toInt32(16) relied on getting a correct (unsigned) value for the whole input range ["0" .. "FFFFFFFF"] (see libreoffice-4-1 commit 9bf6c83367cedb7be81bf67f30d2147d26c7a8c3 "Revert overflow checks in O[U]String::toInt{32,64} again"). Audited all uses of toInt32/64 with non-decimal radix. (There is still a TODO comment in oox/source/helper/attributelist.cxx, and stoc/source/typeconv/convert.cxx will still need some love and test code.) Change-Id: Iadaca1c0e41dab553687d0ce41c20c10cd657a95
2013-06-13fdo#65655 : fix for Different_Odd_And_Even_Pages flag ignoredAdam Co1-2/+8
Signed-off-by: Miklos Vajna <vmiklos@suse.cz> Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Change-Id: Icf9949bb00aa905d22aedfd8f2b297dfa89dfedb
2013-06-12Fix typoPavel Janík2-2/+2
(cherry picked from commit 497e0d2ce2169a70aa2d2182fa1cf3096b8b2fbc) Change-Id: I9cf246c94236382bc9d58e3a76c855951dd5166a
2013-06-12rtl_string2UString_status() - Wrong TextEncodingMiklos Vajna1-1/+1
Change-Id: I5d0efc9006cac379a5c03a61817cf989227a06ff
2013-06-11abi#4817 attempt to access an element in an empty containerMiklos Vajna2-1/+7
Change-Id: Ic51ef8b3db182dd34195c9bb808170d20953d406
2013-06-11writerfilter: move the RTF tests to slowcheckMiklos Vajna1-1/+1
These now take around 5sec here, which is slow enough to be annoying -- if you have to wait for it after every partial build. Change-Id: I795fefcd79889aca7b00a5b3d408ee3488b13b03
2013-06-11hack for reading properly textencoding for opensymbol from old LOLuboš Luňák1-0/+8
Which did it because of bullet font not having it correctly (fixed in 44c133ef996e32ebdfc9560bcf14b0cd77196a9e). Change-Id: I6992de03816661cf6970140eb35816e26cf0e612
2013-06-10Correct the XML document handler...Oliver-Rainer Wittmann5-48/+43
which is used to parse Microsoft Word OOXML documents in case of unknown XML elements (cherry picked from commit 22e334845346f4e3189c72e706d744385953af19) Conflicts: writerfilter/source/ooxml/OOXMLDocumentImpl.cxx writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx Change-Id: Ibcd3e808abfb35291bb04aa10190a7800f0837fa
2013-06-10Related fdo#33895 add some checks against NULL derefsJulien Nabet1-1/+6
Change-Id: I9c62a063788a494125ce8dc27748ed66022f5c48 Reviewed-on: https://gerrit.libreoffice.org/4199 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-06-10fdo#64656 RTF import: handle levelnumbers without leveltextMiklos Vajna2-0/+11
Change-Id: I34ce7b172dc94489f7f506796e66b14598aab19c
2013-06-07RTFDocumentImpl::checkUnicode: make this a bit more readableMiklos Vajna2-11/+11
by not using default parameter values. Change-Id: I82c84e3563cba60682d297eb1b1d8a139160d579
2013-06-06valgrind: uninit variableCaolán McNamara1-2/+3
Change-Id: I5640291d9e221c9cffd7daec9d46a313fddfaf4e
2013-06-06add some checks against NULL derefsCaolán McNamara2-0/+6
Change-Id: I85fbf279991ee361ea081d92d9acc84d36677af1
2013-06-05bnc#820509 DOCX import: handle M.d.yyyy date format in w:sdtMiklos Vajna1-2/+3
Change-Id: Iae233c24a9580ffc8ea4680276161a543171f63c
2013-06-05bnc#820509 DOCX import: try harder to disable form design modeMiklos Vajna5-5/+24
Previously this only worked if we had indexes in the document as well, but actually these are independent. Change-Id: I28afa60d2606230c901948d4c1da8f5a7c50a9f7
2013-06-04fdo#62044 RTF import: don't overwrite existing styles when pastingMiklos Vajna3-8/+11
Change-Id: I80a83caebc8fa3f038cf2ff080c6c6ec8e93fb70
2013-06-03re-base on ALv2 code. Includes:Michael Meeks1-22/+13
Patches contributed by Mathias Bauer gnumake4 work variously http://svn.apache.org/viewvc?view=revision&revision=1394707 http://svn.apache.org/viewvc?view=revision&revision=1394326 http://svn.apache.org/viewvc?view=revision&revision=1397337 http://svn.apache.org/viewvc?view=revision&revision=1397315 http://svn.apache.org/viewvc?view=revision&revision=1396797 Patches contributed by Andre Fischer Fixed getcsym.awk to handle #-comments that contain special regexp chars. http://svn.apache.org/viewvc?view=revision&revision=1230971 118778: Added ADDITIONAL_REPOSITORIES environment variable and its automatic setup in configure. http://svn.apache.org/viewvc?view=revision&revision=1232004 118160: Added external CoinMP library. http://svn.apache.org/viewvc?view=revision&revision=1233909 Patches contributed by Herbert Duerr #i119168# use generic LICENSE file for langpacks and sdks http://svn.apache.org/viewvc?view=revision&revision=1310178 macosxotoolhelper: need to quote perl regexp if it may contain regexp metachars http://svn.apache.org/viewvc?view=revision&revision=1183367 allow gbuild with empty sysroot on linux http://svn.apache.org/viewvc?view=revision&revision=1179186 Patches contributed by Ingo Schmidt native373: #164472# improvements for msi database http://svn.apache.org/viewvc?view=revision&revision=1167540 http://svn.apache.org/viewvc?view=revision&revision=1167539 Patches contributed by Jurgen Schmidt adapt setup package scripts to handle special DS_Store file for developer snapshot builds http://svn.apache.org/viewvc?view=revision&revision=1232430 imported patch extensions_i117681.patch http://svn.apache.org/viewvc?view=revision&revision=1172102 Patches contributed by Michael Stahl gbuild: RepositoryFixes.mk should be optional http://svn.apache.org/viewvc?view=revision&revision=1166123 xslt filter: remove the FLA horror wordml import filter: replace FLA usage with plain XSLT http://svn.apache.org/viewvc?view=revision&revision=1363727 Patch contributed by Oliver-Rainer Wittmann i#88652: applied patch, remove unicows deps http://svn.apache.org/viewvc?view=revision&revision=1177585 Remove lots of OS2 conditionals, re-extract Rhino Java, unwind cppunit pieces, cleanup Mac image bits, remove coin-mp and re-package lpsolve, Oxygen & Crystal, fixup qstart bits, expand MPLv2 subset checking. Change-Id: Iad5c8a76399620b892671633c0d8c29996db3564
2013-06-03Related: #i119607#, text font spacing in comments doesn't expand/condense...Jian Fang Zhang3-4/+19
by the expected value Found by: xiao ting xiao, tingxiaox@gmail.com Patch by: bjcheny, companycy@gmail.com Review by: zhangjf (cherry picked from commit 11fda1bd134b07c5bcaca6186d63107ec9f47b98) Conflicts: writerfilter/source/dmapper/DomainMapper.cxx writerfilter/source/dmapper/DomainMapper_Impl.cxx writerfilter/source/dmapper/DomainMapper_Impl.hxx Change-Id: Iecdaee97e49395df59719d724e1544e1802d947d
2013-05-31Resolves: #i119558# set default page mode value to false for docxJian Fang Zhang3-13/+15
To avoid default page mode affect the calculation of table row height Found by: xiao ting xiao, tingxiaox@gmail.com Patch by: zhaoshzh, aoo.zhaoshzh@gmail.com Review by: zhangjf (cherry picked from commit 28e1cb1240e7c7a274a04756c7cab2f5797de400) Conflicts: sw/inc/unomap.hxx sw/inc/unoprnms.hxx sw/source/core/unocore/unomap.cxx sw/source/core/unocore/unoprnms.cxx sw/source/ui/uno/unotxdoc.cxx writerfilter/source/dmapper/PropertyIds.cxx Change-Id: I41745eb9d727a5ae87d34872f9dc3f4442c7bc8d
2013-05-31n#816593: docx consecutive tables with different tblpPr needs to be splitCédric Bosdonnat7-9/+107
When importing docx with 2 <w:tbl> following each other, we have 2 possible behaviors: either merge them as one table as we did before or split them into two tables. The tables need to be split if they have different floating position properties. This required the ooxml tokenizer to repeat the table properties for each row of the table: or how would we know we don't need to split the table? The basic idea behind this hack is to temporarily store the table position and table properties before saving them. Thus we can compare them at the end of the row and decide to split the table or not. Change-Id: I2e3e70dfe7386090fe356575ee9d0e81aa031dc4
2013-05-30bnc#817956 DOCX import of page border shadowMiklos Vajna7-6/+40
See the comment in SectionPropertyMap::ApplyBorderToPageStyles() on what and how is mapped. The control flow is like this: BorderHandler::lcl_attribute() notices w:shadow, then PageBordersHandler::lcl_sprm() gets it, passes it to SectionPropertyMap::SetBorder(), finally SectionPropertyMap::ApplyBorderToPageStyles() uses the UNO API. Change-Id: Ib0aef3245f58c62655769357f1f4dd07eef77f62
2013-05-29bnc#817956 DOCX import: missing last character of shape textMiklos Vajna1-1/+4
Make sure writerfilter only removes the last character of the text if it's a newline. Change-Id: I96980e2d148ced93363b3147545afdd0dd070e5d
2013-05-29import RTF_BACKGROUNDMiklos Vajna3-1/+23
That destination contains a whole shape, but the only interesing detail of it is the fill color, which is the page background color. Change-Id: I9527db8954c48c980f8734c9bbeaa6ccd3c48fbc
2013-05-28n#816593: Floating table width import fix: adjust the frame widthCédric Bosdonnat1-3/+17
Change-Id: I8212bc5981418f6cbd514bf5002e6a5dbdf53152
2013-05-27bnc#817956 DOCX import of document background colorMiklos Vajna4-1/+10
See wwSectionManager::SetSegmentToPageDesc(), this has to be applied to every page style. Change-Id: Iea2707ae665a55eabda3ed7575cf3658f7af5237
2013-05-27writerfilter: update READMEMiklos Vajna1-4/+8
Change-Id: Icd098ab4efcd307c83fe42d2f5815b48d1bff669
2013-05-27fdo#64671 Some special RTF characters were not skipped correctlyUrmas1-1/+1
Some special characters, like { and }, were not skipped when they occured as a replacement character for \uN keyword. Change-Id: I19b66a290cd9880924774fa89bb29df280e44a3c
2013-05-24WaE: implicit conversion of NULL constant to nullptr_tTor Lillqvist6-7/+7
Change-Id: I2eefbca1ef986219f04504cba4ca09a22972e8cb
2013-05-23map docx line alignment properly to writer's line-of-text align (bnc#820792)Luboš Luňák3-11/+35
Apparently the top/bottom line of text alignment in writer is backwards compared to all others, while alignment to the top of a page puts an object's top edge at the top of the page, top of line of text puts the object on top of the line (i.e. bottom edge of the object at the line). The handling of NS_rtf::LN_YAlign suggests that swapping bottom and top in the input filter is the right way of handling this. Change-Id: I916c8ea0f2fd00de3e17b16b31433c9b6ba92e64
2013-05-23Related #i120832#, the style and color set on table text by user...Jian Fang Zhang1-6/+0
should have higher priority than that from table style Found by: Jinlong Wu,wujinlong@gmail.com Patch by: bjcheny,companycy@gmail.com Review by: zhangjf (cherry picked from commit fe7e723a727f6def90ee80ef2964a40546b37a90) Conflicts: writerfilter/source/dmapper/DomainMapper.cxx Change-Id: I3f4c96d49de40b21cc3da9bcb5e588a270434cd8
2013-05-21bnc#818997 RTF import: don't ignore page breaks between shapesMiklos Vajna5-0/+35
Change-Id: Ief71ba9a3c60356714e73d08e88d0a3105b17b1a
2013-05-21fdo#46808, Use service constructorsNoel Grandin1-14/+4
Change-Id: Ib428bb78751e9707c89dcf311b8ab86ad8184775
2013-05-20#i121134#, more fix for i119657, fallback to old logic to use current ↵Jian Fang Zhang1-0/+2
AbstractNum when the desired one can not find Found by: Li Lin Yi Patch by: Jinlong Wu,wujinlong@gmail.com Review by: zhangjf (cherry picked from commit aa53b457faaf0fc50a8b38d17bf219de427a1044)
2013-05-20Related: #i119657#, importing docx, add code to handle the problem...Jian Fang Zhang4-3/+56
that an AbstracNum references to a style, which references to another Num Found by: xiao ting xiao Patch by: Jinlong Wu,wujinlong@gmail.com Review by: zhangjf (cherry picked from commit d6870e145cc7373a422b414c31380cc1399e64cc) Conflicts: writerfilter/source/dmapper/DomainMapper.cxx writerfilter/source/dmapper/NumberingManager.cxx Change-Id: I9be0b82d601bf43da31842edb02c4b0d4e50e84f
2013-05-16bnc#779630 DOCX import: improve w:sdt size guessingMiklos Vajna1-1/+6
The problem was that when border was enabled (and the importer leaves it unchanged, and it's on by default), there was not enough space for the text. Change-Id: I3ce770eb523389bcf7c5e83d4e76155e2c45de6d
2013-05-15fdo#62977 allow SAL_MAX_INT16..SAL_MAX_UINT16 when importing RTF_UMiklos Vajna1-1/+4
Change-Id: Ie36d5881b0ebe8c38526690ca27d02bfb7af7829
2013-05-15Spelling "separate" (etc) correctly is hardTor Lillqvist1-1/+1
2013-05-14fdo#64249: make sure we have matching start/end level for table in shapesCédric Bosdonnat1-7/+6
Change-Id: I4928f6a54e6cca9b26c0d2391fc1545688be2375
2013-05-12cppcheck: fix redundantAssignInSwitchJulien Nabet1-4/+4
Change-Id: I0cda1957488ed1f0b279d8c783fe28c90579b466
2013-05-11Resolves: #i119161# copy sStyleIdentifierI and sStyleIdentifierD...Jürgen Schmidt1-0/+2
from StyleSheetEntry when constructing a new TableStyleSheetEntry object Patch by: Jinlong Wu (cherry picked from commit 11eb354532cfb354f9f7c3a72b170c9c8289b75c) Change-Id: I80054bc6c36bc7c5ed1034e0aadd88cd1a2f3091
2013-05-07oox: remove Package_generated and Package_tokensMichael Stahl2-3/+5
Change-Id: Iab5eb4fbfecea905f4eeb9f1b1f503c1908dadc8
2013-05-07writerfilter: remove Package_sprmidsMichael Stahl2-34/+0
Change-Id: I3791f7f513246faaeb76f9209c08008c78a38619
2013-05-07fdo#64256 writerfilter: handle void GraphicURL in ListsManager::lcl_sprmMiklos Vajna1-1/+3
Change-Id: I4d8b1b527d5099781a36cc1265318c167205340e
2013-05-02handle graphic bullets in .docx also when saved as <w:pict>Luboš Luňák4-2/+23
Change-Id: I7225b4b024c6b7c549d0c9fbf5204df653577bec
2013-05-02Fix out-of-bonds Sequence access in NumberingManager with page numberingFridrich Štrba1-1/+2
Change-Id: Ib35fcee1605215fb22ae9838b29fe1d8be5eaf58
2013-05-02bnc#779630 initial DOCX import of w:sdt's w:dateMiklos Vajna7-67/+246
Also factor out the w:sdt-related methods to a helper class to avoid DomainMapper_Impl become a God object. Change-Id: Ic1a388940bce89688e8558818f92ce9ac997609c
2013-05-02Update pchAurimas Fišeras1-0/+2
Change-Id: Ia400389ca7c4fbe752e19ca2d38f2fee00f6ee7d Reviewed-on: https://gerrit.libreoffice.org/3736 Reviewed-by: Tor Lillqvist <tml@iki.fi> Tested-by: Tor Lillqvist <tml@iki.fi>
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-08 13:02:28 +0000