summaryrefslogtreecommitdiff
path: root/writerfilter
AgeCommit message (Collapse)Author
2013-06-28RTFDesitnationState -> RTFDestinationStateMiklos Vajna
Change-Id: I74e371b531d1a0d5cc9393dd10b9ee2c65ac2e4e
2013-06-28DOCX import fix for table with auto sizeAdam Co
Change-Id: Ic86f4f142e579bdef3e954492e1c1e382a545739 Reviewed-on: https://gerrit.libreoffice.org/4496
2013-06-27n#820800: docx import of wrap polyon was based on dest size of pictureCédric Bosdonnat
... instead of the original size of it. Change-Id: Ib251206dd092a7c47343caf50bd05a3dfec1af09 (cherry picked from commit ae6981601b0e9175efaf9849b1279290ea3380f6)
2013-06-26bnc#823675 RTF import: fix import of numbering bullet associated fontMiklos Vajna
There were multiple problems here: - \f had a special handler for the listlevel destination, \af had not - in case of multiple \f or \af, the first one is used for the bullet font - in case only \af is used for the bullet font, its value should be used for \f as well Change-Id: I6631504c1aa9f2e0792a3469a5fdce5b7bd49518
2013-06-26Kill RTFDocumentImpl::getState()Miklos Vajna
RTFParserState is private to RTFDocumentImpl, exposing it is not a good idea. One more step towards RTFTokenizer not speaking directly to RTFDocumentImpl, but through an interface. Change-Id: I3f626d4f2c560a20d9e24105459e95a66d0a87ca
2013-06-25fdo#66040 RTF import: initial groupshape supportMiklos Vajna
There are two cases here: if the shapes contain tables (or other Writer-specific features), we should use text frames and we should not create the actual group shape, as Writer textframes can't be part of such group shapes. The other case is when the shapes contain simple text, OTOH there are groupshape-level transformations defined, in that case we should choose drawinglayer rectangles and actually create a group shape. This commit implements support for the first case only. Change-Id: I9dc99b0711ce5c7a29ea0b14539df0121f9de3d0
2013-06-25remove unused variableLuboš Luňák
Change-Id: I5dd8dc9a3a256e51706d32249260f6561202bbc9
2013-06-25fdo65400: fix for Character Shading being lostAdam Co
This bug fixes the DOCX import and export filters, adds a new property to the document model and updates the UNO API. There is no need to add layout \ UI updates, because in Word the only way to turn this on\off is using a simple button, and there is no way to control the shading color itself. However, ODF import \ export filters should be updated in a future commit. Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Change-Id: I1d34cec79289e38c08e42a4c6265d998e1edfdef Reviewed-on: https://gerrit.libreoffice.org/4452 Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
2013-06-24bnc#823655 fix RTF import of freeform shape coordinatesMiklos Vajna
E.g. 0,1 was imported as 1,0, as we did not differentiate between not having the coordinate yet and having it as zero. Change-Id: Ia5fbbcc791dc9c6866ffd4c146793690661d81b4
2013-06-24fdo#56679, fdo#65710 : fix for import and export of underline colorAdam Co
Change-Id: Ifc45900d73802ef99c55d7af4ee04314dd04f1c5 Reviewed-on: https://gerrit.libreoffice.org/4459 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-06-23cppcheck: fix inefficient checkingJulien Nabet
Change-Id: If015900345304a9545ab0b66c6998a9d6bad9d1f
2013-06-21bnc#823655 RTF import: ignore styles without a typeMiklos Vajna
Regression from 29dcdf6b56f8dbc1b7de0478afb04122f8dbf0f9. Change-Id: I970c0e7b3652d7e6f093815b90e04e0c45904b28
2013-06-20fdo#43641 writerfilter: tokenize lc:lockedCanvasMiklos Vajna
These are just the minimal changes, so that writerfilter calls into oox::shape::ShapeContextHandler, which does the real work. Change-Id: Ia53731ac8592964b70e8a438ed09262463c05360
2013-06-19fdo#64238: fix for missing footer bugAdam Co
Signed-off-by: Miklos Vajna <vmiklos@suse.cz> Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Change-Id: I328547c41bfc1a23f7e6233db57fbfa415e22cb3 Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
2013-06-19fix rtf import on big endianDavid Tardon
Change-Id: Ia9f589752176849f7f6700483e933767e509edf3
2013-06-19fdo#43460 unoxml,writerfilter,xmlsecurity: use isEmpty()Jelle van der Waa
Change-Id: Iba3b39086212803bc41384f5c8f51e42712a5249 Reviewed-on: https://gerrit.libreoffice.org/4349 Reviewed-by: Noel Power <noel.power@suse.com> Tested-by: Noel Power <noel.power@suse.com>
2013-06-18bnc#825305 RTF import of fFilled shape propertyMiklos Vajna
Change-Id: Iaa2ff9d5d1a28aec046f885acecbd1a44c734ec0
2013-06-18-Werror=maybe-uninitializedStephan Bergmann
Change-Id: Ic2011b6c3db44d12c0dc883019d2d532bbda467b
2013-06-18n#820836: dmapper, fixed typos in first page style creationCédric Bosdonnat
Change-Id: I80031cab7c0304311bd5acbb3a2ead48e15594bb (cherry picked from commit ab653ae64d782e5bd54bd169ab11755dab310553)
2013-06-18n#820504: default color hidden by Default style in writerfilterCédric Bosdonnat
Setting the font color of the default paragraph style to Auto makes the color set in the Writer defaults (from rPrDefault) ignored. Change-Id: I1dcd92bcd0774f5229785373242899a492ab7b7c (cherry picked from commit d7acb5ba0924f848f1ae96eceab50a0169d18445)
2013-06-16Import/export RTF_REVISIONSMiklos Vajna
File -> Properties -> Security -> Record Changes on the UI. Change-Id: I96d321f407abd33e15a4a133e6723d48efa5bc53
2013-06-16RTFDocumentImpl::getShapetextBuffer can go as wellMiklos Vajna
Hopefully this was the last trace of buffered shape import in the RTF filter. Change-Id: I42a531954ef5832473c43c121d569635f144a4d1
2013-06-16RTFDocumentImpl::replayShapetext is no longer neededMiklos Vajna
Change-Id: I3dce867e01049d815b61b5292ec7afacffa5b2e8
2013-06-16docx: fdo#43093 fdo#44029 fix the alignment when the paragraph are RTLFaisal M. Al-Otaibi
this will fix the alignment for RTL paragraph when import/export MS docx file. the alignment should be exchange when the paragraph are RTL. it will also fix text direction export for RTL paragraph. Change-Id: I5fe55205677d6e12142e398570cba78094705692
2013-06-16RTF import of fFitShapeToText shape propertyMiklos Vajna
Change-Id: I1d0cd0d34284e6ecabd0b4dc9bf25bc31b7ff4c1
2013-06-16RTF import: implement support for tables inside text framesMiklos Vajna
Change-Id: I6088adad20212cdbcc03b193cc079c51a305602a
2013-06-16Factor out RTFSdrImport::applyProperty() from RTFSdrImport::resolve()Miklos Vajna
Change-Id: Idd352e712e20e6e64c80490daf4b2a5e74d47a97
2013-06-15RTF filter: import posh/posv property of shapesMiklos Vajna
Change-Id: I55eccccf7f9ed06bba1ada18574890b5bee296f4
2013-06-13Introduce O[U]String::toUInt32Stephan Bergmann
...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 Co
Signed-off-by: Miklos Vajna <vmiklos@suse.cz> Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Change-Id: Icf9949bb00aa905d22aedfd8f2b297dfa89dfedb
2013-06-12Fix typoPavel Janík
(cherry picked from commit 497e0d2ce2169a70aa2d2182fa1cf3096b8b2fbc) Change-Id: I9cf246c94236382bc9d58e3a76c855951dd5166a
2013-06-12rtl_string2UString_status() - Wrong TextEncodingMiklos Vajna
Change-Id: I5d0efc9006cac379a5c03a61817cf989227a06ff
2013-06-11abi#4817 attempt to access an element in an empty containerMiklos Vajna
Change-Id: Ic51ef8b3db182dd34195c9bb808170d20953d406
2013-06-11writerfilter: move the RTF tests to slowcheckMiklos Vajna
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ňák
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 Wittmann
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 Nabet
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 Vajna
Change-Id: I34ce7b172dc94489f7f506796e66b14598aab19c
2013-06-07RTFDocumentImpl::checkUnicode: make this a bit more readableMiklos Vajna
by not using default parameter values. Change-Id: I82c84e3563cba60682d297eb1b1d8a139160d579
2013-06-06valgrind: uninit variableCaolán McNamara
Change-Id: I5640291d9e221c9cffd7daec9d46a313fddfaf4e
2013-06-06add some checks against NULL derefsCaolán McNamara
Change-Id: I85fbf279991ee361ea081d92d9acc84d36677af1
2013-06-05bnc#820509 DOCX import: handle M.d.yyyy date format in w:sdtMiklos Vajna
Change-Id: Iae233c24a9580ffc8ea4680276161a543171f63c
2013-06-05bnc#820509 DOCX import: try harder to disable form design modeMiklos Vajna
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 Vajna
Change-Id: I80a83caebc8fa3f038cf2ff080c6c6ec8e93fb70
2013-06-03re-base on ALv2 code. Includes:Michael Meeks
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 Zhang
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 Zhang
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 Bosdonnat
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 Vajna
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 Vajna
Make sure writerfilter only removes the last character of the text if it's a newline. Change-Id: I96980e2d148ced93363b3147545afdd0dd070e5d