summaryrefslogtreecommitdiff
path: root/writerfilter/source/dmapper
AgeCommit message (Collapse)AuthorFilesLines
2013-06-18-Werror=maybe-uninitializedStephan Bergmann1-2/+1
Change-Id: Ic2011b6c3db44d12c0dc883019d2d532bbda467b
2013-06-18n#820836: dmapper, fixed typos in first page style creationCédric Bosdonnat1-2/+2
Change-Id: I80031cab7c0304311bd5acbb3a2ead48e15594bb (cherry picked from commit ab653ae64d782e5bd54bd169ab11755dab310553)
2013-06-18n#820504: default color hidden by Default style in writerfilterCédric Bosdonnat1-2/+1
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-16docx: fdo#43093 fdo#44029 fix the alignment when the paragraph are RTLFaisal M. Al-Otaibi1-4/+19
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-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-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-06valgrind: uninit variableCaolán McNamara1-2/+3
Change-Id: I5640291d9e221c9cffd7daec9d46a313fddfaf4e
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-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 Bosdonnat4-5/+72
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-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 Vajna3-0/+9
See wwSectionManager::SetSegmentToPageDesc(), this has to be applied to every page style. Change-Id: Iea2707ae665a55eabda3ed7575cf3658f7af5237
2013-05-24WaE: implicit conversion of NULL constant to nullptr_tTor Lillqvist3-4/+4
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 Vajna3-0/+29
Change-Id: Ief71ba9a3c60356714e73d08e88d0a3105b17b1a
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-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-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 Vajna5-67/+242
Also factor out the w:sdt-related methods to a helper class to avoid DomainMapper_Impl become a God object. Change-Id: Ic1a388940bce89688e8558818f92ce9ac997609c
2013-04-30bnc#779630 initial DOCX import of w:sdt's w:dropDownListMiklos Vajna4-0/+101
Change-Id: I57d4768a26476d1a0535087c60535393b7004b24
2013-04-30n#592908: docx import, fixed handling of w10:wrapCédric Bosdonnat1-11/+1
commit f837c4288cdae4921b3fb6747ba2e2cd5ce2dcd2 moved the handling of w10:wrap tag in oox, but thus no wrapping was imported any more. The fix consists in letting the w10:wrap element be handled by writerfilter's dmapper if the shape has already been retrieved from oox (which is the case for textboxes). In other cases, make sure that we don't set the Surround property once again in writerfilter as that would override what has been done in oox. (cherry picked from commit 51d5e90b7c09cb980bc72a2c6b1a65303ef15ea2) Conflicts: oox/inc/oox/vml/vmlshape.hxx sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: I8ab158641afcf6b9945c52238e7f5adb9e8b3adf
2013-04-24check for NS_ooxml::LN_CT_Style_type being processed firstLuboš Luňák1-3/+12
The code relies on NS_ooxml::LN_CT_Style_type being handled first (because of m_pImpl->m_pCurrentEntry being reset there), so at least check for it. Still no idea how to actually ensure the correct ordering in this overdesigned $#%@! writerfilter thing. Change-Id: Ib6a2129a078728e162257275ac2a1243dbaf4017
2013-04-22avoid crash when no table grid is givenLuboš Luňák1-0/+4
The document may contain just <w:tblGrid/> and <w:tblW w:w="0" w:type="auto"/> . It appears we do not handle the auto width properly at all, but at least don't crash. Change-Id: Ibdc9d1ad69c13456acd347a151ec8739bcb98855
2013-04-22n#382137: Do run out of bounds (& consequently crash) when we have 0 spans.Jan Holesovsky1-4/+1
Maybe just works around the root issue (I did not debug deeper if this is correct to have 0 here), but improves the code overall, so why not to do this. Change-Id: I7c2b7f7e410faea5c1d6f3c15f1bc0f155dfb1f4
2013-04-19fdo#63685 wp:inline's distT/B/L/R is in EMU's, not twipsMiklos Vajna1-4/+4
Regression from 3d7e168a2a43c2414b0633379102ddb29437e75b. Change-Id: I9ab3f9f41316a01d5a74f3e500bad7a83c8d2dca
2013-04-16fdo#61193 fix crash on RTF paste of footnoteMiklos Vajna1-3/+7
Regression from 232ad2f2588beff50cb5c1f3b689c581ba317583. Change-Id: Ia0873851979df5bba0a4693f044aab2aeff2b8e4
2013-04-11Resolves: #i119464# Update default alignment value for docx [Sub]TitleYong Lin Ma1-1/+18
Patch by: Ying Zhang Review by: mayongl (cherry picked from commit 22602686933abaa1512ebd3bca77dbb9987b6ad5) Change-Id: I04cf1bbbeadf23147fa2cbc1c08c850288ef943a
2013-04-10coverity#1000707: out of bounds accessMarkus Mohrhard1-1/+1
Change-Id: I889ccb08f8f44bd558d95505342af0336dca0b0f
2013-04-07Fix variables not initializedJulien Nabet1-0/+5
Change-Id: Ib741c7144bfa48f8071c2b86478c111dbf09b14e
2013-04-07remove needless forward rtl::OUString declarationsLuboš Luňák1-1/+0
Change-Id: I97d91a758dd82d64768d75c1d2ddd279de5f6034
2013-04-07mass removal of rtl:: prefixes for O(U)String*Luboš Luňák2-4/+4
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
2013-04-05new module i18nlangtagEike Rathke1-1/+1
Moved portions from module i18npool, all of former i18nisolang1 library that now is i18nlangtag. Included are languagetag, isolang and mslangid. This i18nlangtag code is now even used by module comphelper, so disentangling i18npool and making this an own module was needed to not create circular module dependencies. Change-Id: Ib887c3d6dde667403fd22d382310ba5f1a9b0015
2013-04-05Resolves: #i119621# Outline level in sample file lostJürgen Schmidt3-6/+16
fix: - PropertyMap.hxx, add definition for outline level min value - DomainMapper.cxx, import outline level for paragraph property - DomainMapper_Impl.cxx, fix TOC import if no range is given Patch By: Yolanda Zhang Ying Reviewed By: jsc (cherry picked from commit 5b87b9b8bc679dfbb308646a6da7584d4b418337) Conflicts: writerfilter/source/dmapper/DomainMapper_Impl.cxx Change-Id: I2149a7338b128d0dd1c1317a259e537d2a1e1063
2013-04-04DOCX import of w:numPicBulletMiklos Vajna7-9/+160
Change-Id: Ifc827d5180ce1dc0e3db095c2b92023f4c2d72ec
2013-04-04Resolves: #i119544# sequence number is not displayed in docxJürgen Schmidt1-1/+27
fix: add code to handle the SEQ field command... Patch By: Jin Long Wu Found By: Don Jun Zung Reviewed By: jsc (cherry picked from commit 0d2415df82388eb1a9a00c2d5e6bd3d9193057db) Change-Id: Ia588857aa453ea05cde2e66f6efd403e8eb282f2
2013-04-03writerfilter: fix silly init causing trivial STL assertion in testMichael Stahl1-2/+2
(regression from 35b75ed510f49ff64cd86b38e228c2b5b9a9f3fc) Change-Id: I4342fd619f4d1f760b8fef2594a67b9fb7cd8f0e
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-21 01:20:15 +0000