summaryrefslogtreecommitdiff
path: root/sw/source/filter/ww8
AgeCommit message (Collapse)Author
2013-05-14initialized with plain 0, instead of sal_False/falseTakeshi Abe
Change-Id: I2df1bd52293c4423de5ac4c41f9392be1e8d2ccf
2013-05-13Resolves: #i120106# implement a SwPosFlyFrms which avoids memory leaksArmin Le Grand
Use boost::shared_ptr and stl tools to implement a SwPosFlyFrms which can be used and handed over by value and cleans up it's content to avoid memory leaks. Found by: Chao Huang Patch by: Chao Huang, alg Review by: Chao Huang, alg (cherry picked from commit c26f80aa1ba65b63e313dce9c6d7e40ab8efede6) Conflicts: sw/inc/doc.hxx sw/inc/flypos.hxx sw/source/core/doc/doclay.cxx sw/source/core/layout/flypos.cxx sw/source/core/unocore/unoobj2.cxx sw/source/filter/html/htmlfly.cxx sw/source/filter/ww8/writerhelper.cxx Change-Id: If610457654b1056d799d4336cd249815f7878a96 Fix build breaker from i120106 Patch by: Chao Huang Suggested by: alg (cherry picked from commit 880aadbeba4e31049d5b7f0a34323553fb6249fb) Conflicts: sw/source/filter/ww8/writerhelper.cxx Change-Id: I516fcb6ee69944c54cc9eb76c069eb8b28749050
2013-05-13WaE: unused parameter 'nCurrentLeft'Tor Lillqvist
Change-Id: I9aa9b0215d9d2c8db7b88fbb1e0d30bcc4889a36
2013-05-13fdo#64531 : Tab-stops exported to DOCX added too much indentationAdam Co
Change-Id: I12747006c8aac663f9529b495914f4a08301c66f Reviewed-on: https://gerrit.libreoffice.org/3884 Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr> Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
2013-05-13Related: fdo#61594 SwWW8ImplReader::StartApo: don't always start a frameMiklos Vajna
Word supports floating tables, Writer does not. We can map floating tables to fly frames, containing just a table, but then those can't span over multiple pages. We could avoid creating frames in case the table is of multiple pages, but that's hard to determine. One easy case is when the table width is >= the text area with, in that case we can be sure that no wrapping would be performed anyway, so we can avoid putting the table to a frame. Two more related problems: 1) When we need to decide if a frame should be created or not, we typically don't know yet the table width. That's why TestApo() has to always succeed (in case the paragraphs are wrapped), and then we always enter StartApo(), where we can avoid creating the frame, if necessary. 2) Even if we decide that we don't create a frame, floating and non-floating table rows are different, so a separate table should be created for such rows. By doing all the StartApo() / StopApo(), we are safe here. Change-Id: Ifc0e0e2f7320c3784698d0ff278031b46864e2e5
2013-05-13SwWW8ImplReader::ParseTabPos: make this non-staticMiklos Vajna
I'll need to access the non-static maSectionManager in this method soon. Change-Id: Ia056ec9c812020c4ac0f4a0f1460a0c9506b12fa
2013-05-13sw: move WW8TabBandDesc to ww8par.hxxMiklos Vajna
I'll need this struct in ww8par6.cxx soon. Change-Id: I4cf546ff585c89c076e4fdad93dbbb9b8ea72eca
2013-05-10resolved fdo#35756 import more than 64k HTML table cellsEike Rathke
Enhanced EditEngine to be able to hold more than 64k paragraphs. Used also in RTF import Calc and Writer, so that could benefit as well. * changed all EditEngine,Outliner,... related paragraph index/count variables from sal_uInt16 to sal_Int32 * sal_Int32 instead of sal_uInt32 to match accessibility API * matched some Outliner methods' paragraph parameters from sal_uLong to sal_Int32 * containers capable to hold size_t nevertheless are limited to a maximum of sal_Int32 * changed definition of EE_PARA_NOT_FOUND and EE_PARA_ALL to SAL_MAX_INT32 + added EE_PARA_MAX_COUNT and EE_TEXTPOS_MAX_COUNT to initialize ESelection with what previously were hard coded 0xFFFF all over the place + for similar reason added EE_TEXTPOS_ALL corresponding to EE_PARA_ALL to initialize an ESelection spanning all available text like aSel(0,0,EE_PARA_ALL,EE_TEXTPOS_ALL) Change-Id: I62d1b9c399cd709a4f93dbac31b219a61c46ec00 Reviewed-on: https://gerrit.libreoffice.org/3838 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2013-05-09WW8FlyPara::Read: replace hardwired numbers with constantsMiklos Vajna
Change-Id: I298499d09ac44e0fdbbd62fc0bd07a25f1b33aa3
2013-05-07writerfilter: remove Package_sprmidsMichael Stahl
Change-Id: I3791f7f513246faaeb76f9209c08008c78a38619
2013-05-07Fix style renaming confusion in ww8 filter (solves fdo#63603)Luke Deller
- Mapping LO default style to Word "Normal" style for docx output used a hard coded style name, so it broke when LO's default style was renamed in 4.0 (plus it would never have worked for non-English languages) - This renaming did not cater for nameclashes, leading to fdo#63603 - Similar renaming when importing doc styles did cater for nameclashes, but had a minor bug in that Change-Id: Id23f3021c6507b474c16e93abf43ba748606ebc7 Reviewed-on: https://gerrit.libreoffice.org/3743 Reviewed-by: Luboš Luňák <l.lunak@suse.cz> Tested-by: Luboš Luňák <l.lunak@suse.cz>
2013-05-06fdo#42144 WW8 export: avoid writing pointless empty footersMiklos Vajna
Regression from 1348288905ffa75d3634eee4392ba4660d28cdb9 (mismerge, I guess), when header was enabled, actually empty footer was exported, even in case footer was disabled. Change-Id: Ied55dc2a9f0faef87689c07935a47db384d37e1a
2013-05-05follow up to commit 2e109641648bed508318d3b65a385f5b9e78edf7Philipp Riemer
Norbert cherry-picked the original patch [1] without changes. However some sentences in it where translated misleadingly. So here I am merging my remarks/corrections to it, plus some minor changes regarding whitespaces in front of punctuations. [1] see https://gerrit.libreoffice.org/3788 Change-Id: If5fa033c48b2bd16fc0b83195ba4d46f5051414b
2013-05-05Partially translate german comments in sw/source/filter/ww8/Joren De Cuyper
Please, only apply this patch if you are a native speaking German. I'm not a native speaker, so a double check is really necessary and appreciated. Thanks in advance! Change-Id: I9493d128e124d319391aa851ae364aefeb27c512 Reviewed-on: https://gerrit.libreoffice.org/3788 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2013-05-02Resolves: #i119516# allow 0x1 0x1 as well as 0x8 0x1 detection for canvasesArmin Le Grand
Be prepared to allow not only 0x8 0x1 detection for canvases, but also 0x1 0x1. Patch by: Lei Debin Detected by: louqle Review by: alg(cherry picked from commit 0711fae8c3f99c53bc1cb091eb218f10f3d8b15f) Conflicts: sw/source/filter/ww8/ww8par.cxx Change-Id: Ib1d8d892470261639fa46ae9955079759c0aebaa
2013-05-02Resolves: #120098# Memoryleak fixed at escher sw exportArmin Le Grand
remember and destroy the used stream. Found by: Chao Huang Patch by: Chao Huang Review by: alg (cherry picked from commit 9914b3172fd4e3867693e5e63c8085dd66f18b5f) Conflicts: sw/source/filter/ww8/wrtww8.cxx Change-Id: I5bccdd71312f32f861291fc600396dc111fc11c7
2013-04-30Move to MPLv2 license headers, with ESC decision and author's permission.Michael Meeks
2013-04-27some eco-activismThomas Arnhold
Change-Id: Ib447cd8633c3102ee78c919cfbeabcc88018b130
2013-04-22n#382137: Band-aid to avoid crash when saving the .odt to .docx.Jan Holesovsky
Change-Id: I6994da8a79cd7d6ca559ca41823a912381bdd61e
2013-04-22Move to MPLv2 license headers, with ESC decision and author's permission.Michael Meeks
2013-04-20fdo#63154: Change Min/Max/Abs for std::min/max/absMarcos Paulo de Souza
Now all these usages were removed from LO. Change-Id: I8a7233db20abdcdbb18428ad4004c78cc516a0e6 Reviewed-on: https://gerrit.libreoffice.org/3326 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2013-04-19sw: missing prefix for global pBreakItMiklos Vajna
Change-Id: I7fa8e697537ce8eb915da00920bf6882603b115a
2013-04-18date/time IDL datatypes incompatible changeLionel Elie Mamane
- nanosecond precision - signed (allowed negative) year Also: assorted improvements / bugfixes in date/time handling code. Some factorisation of copy/pasted code. Change-Id: I761a1b0b8731c82f19a0c37acbcf43d3c06d6cd6
2013-04-16Bin pointless comments describing allegedly why each #include is neededTor Lillqvist
Change-Id: I3f4405a598cb11fb1c529517eb96260beed9cb86
2013-04-16Add missing #include <rtl/tencinfo.h>Tor Lillqvist
Change-Id: I4d9a28b50f773857f8f6af7df4a0968f8bb1de4a
2013-04-15sw: remove unused classes in RTF exportMiklos Vajna
- RTFProtect was never used by the RTF export filter, unused since the old RTF import is gone - RTFVertOrient and RTFHoriOrient is obsoleted by the new-style posrelh and posrelv textframe properties Change-Id: I0a7d306870900b9ff86d5a173b540db04aed012d
2013-04-15initial RTF export of Writer textframe gradientsMiklos Vajna
Change-Id: Ida9774a41964dbeb8840e79425811993a28588af
2013-04-15RtfAttributeOutput::FormatBackground: export fillColorMiklos Vajna
Change-Id: I9d187fc5b52a27ff5b8bc847a52fe95c63558a40
2013-04-15RtfAttributeOutput: export fShadow, shadowColor, shadowOffset*Miklos Vajna
Change-Id: Ia6d27eadb41d66de558c290bc07b6d1c491f5f1c
2013-04-15RtfAttributeOutput::FormatBox: export line{Color,Width} shape propertiesMiklos Vajna
Change-Id: Id1fd8b4c7ebcc8ffd3b6914596385eb3eda922c6
2013-04-15Silence false warningStephan Bergmann
Change-Id: Ie854ab8b8b7ea4d98ee33d6802ea3a1e65ef2769
2013-04-15fdo#60724 correct spellingThomas Arnhold
Change-Id: Ieb653adbd0cb4371ec5db57e70bcc551872f647f
2013-04-15fdo#60724 correct spellingThomas Arnhold
Change-Id: I7318a9f4f3410edf4dbe67bf08f31682fcb4edc7
2013-04-15Resolves: #i119567# wmf in PICT assure correct scaling...Oliver-Rainer Wittmann
in case that the size is substituted. Found by: Yan Ji <yanji.yj at gmail dot com> Patch by: zjchen <zjchencdl at gmail dot com> Review by: Oliver <orw at apache dot org> (cherry picked from commit 69ea079e09f64ac037686f874617efc63d0449f5) Change-Id: I1eb4b0be184fcefca26eee5f98ba6135a32574c2
2013-04-14Resolve: #i119581# fix import issue for various .doc macro button importsLei De Bin
fix import issue for 'checkin' 'checkout' 'showsample' macro button in writer Reported by: Lou Qingle Patch by: Lei De Bin Review by: Li Jian Yuan(cherry picked from commit 7a3114b8e6960153900759a81a6edf1f74b3981c) Change-Id: Iec6c2945a587c0451b8a404eb449c53237eeb7dc
2013-04-14Fix issue #i120140: After doc file saved by AOO, one more section is createdJian Hong Cheng
* sw/source/filter/ww8/wrtww8.cxx * sw/source/filter/ww8/ww8atr.cxx MS Word Binary Interoperability Patch by: Lin Yuan,<yuanlin.ibm@gmail.com> Found by: Yan Ji,<yanji.yj@gmail.com> Review by: Jian Hong Cheng,<chengjh@apache.org> Conflicts: sw/source/filter/ww8/wrtww8.cxx Change-Id: If32bcced32b671f026ec8c32dd21684eb9e7b1fe
2013-04-14Fix compilation problem caused by previous commitXisco Fauli
Change-Id: I5fe90dd5a39c705b7b4dbc0c8d0b9e383c62e449
2013-04-14#i119466# Doc file loaded by AOO, table with incorrect text wrapping property.Chen ZuoJun
Reported by: louqle Patch by: Chen Zuo Jun Review by: Lei De Bin
2013-04-13sw: fix frame size of textboxes in DOCX/RTF exportMiklos Vajna
In case the frame is AutoSize and the nominal height is less than the real height, we used to end up with textboxes having height small enough that some of the content was unreadable. Instead, do what the WW8 export does and relay on sw::Frame to provide the layout size. Change-Id: I2a6cf4373c8565eef780273745a6ef27ddc65753
2013-04-13i#119446# correct condition for fields containing '.' or '/'Oliver-Rainer Wittmann
See also: i#61075, i#89667, i#111684 Found by: Yan Ji Patch by: zjchen Review by: Oliver (cherry picked from commit 2eeb8010f1afbe47b56387a5ba96db41ece13fcc) Conflicts: sw/source/filter/ww8/ww8par5.cxx Change-Id: Ia53b599c01d1a4b46bd52eac8a933ac6c0605586
2013-04-13Resolves: #i119953# Fixed crash on File->Insert.Andre Fischer
Reported by: Yan Ji Patch by: Oliver-Rainer Wittmann Review by: Andre Fischer (cherry picked from commit 66cef81342b38e23c6785c101fe204a9512f0646) Conflicts: sw/source/filter/ww8/ww8par.cxx Change-Id: Ia014c0c3b9fb78caf8e1d40bd629eb685d40fdd3
2013-04-12RTF export: fix position of at-character-anchored textframesMiklos Vajna
Our importer could deal with the frames without these, but not Word. Change-Id: I6f7d13aba45129357fcf8c11e60d5a9dbc7a8ca2
2013-04-12sw: rework RTF export of text framesMiklos Vajna
Export these as new-style frames. Not counting future possibilities, this commit finally fixes the following problems: - borders: spacing to contents wasn't exported at all - wrap: top/bottom and left/right spacing exported even in case they do not equal Change-Id: I058e00e677e20bc9501b8de320f941f256e8b6f1
2013-04-12Resolves: #i119632# Macro button lost if save template to .doc fileLei De Bin
Add export MACROBUTTON field codes in AttributeOutputBase::TextField Found by: yan ji Patch by: Lei De Bin Review by: Chen Zuo Jun(cherry picked from commit b51d354f043d19c1a8f22e1cfff6d0b43eb62b5e) Conflicts: sw/source/filter/ww8/ww8atr.cxx Change-Id: I419ce091bb676aecfe8b53660549da40eec6057f
2013-04-12i#101884: Fix crash on load.Jan Holesovsky
This was originally fixed in commit 792cbc03aef3873ba89c61db708898d96d6a52f8 due to fix of i#99564. But later we reworked the handling of empty paragraphs in tables in commit 56b2cf0c10d9caa01ebae1d80465e342d046a85c, which caused the fix from i#99564 to regress. Change-Id: Ief063181cee87c7cd43404469247d85eb96bcfe1
2013-04-12Related: #i119624# method <SwWW8ImplReader::IsObjectLayoutInTableCell(..)>Oliver-Rainer Wittmann
- correction of condition interpreting <LayoutInTableCell> attribute - include support for Microsoft Office 2010 version Found by: louqle <louqingle at gmail dot com> Patch by: Oliver-Rainer Wittmann <orw at apache dot org> Review by: zjchen <zjchencdl at gmail dot com> (cherry picked from commit 3b8b3136a51af56321a1a35fcdd9ec1d7126daa3) Conflicts: sw/source/filter/ww8/ww8graf.cxx Change-Id: I065ba88f0e08c5c5e892665933587fa2b796226e
2013-04-10add msfilter::util::ConvertColor to avoid copy&pasteMiklos Vajna
Change-Id: Ia5507f8d1ec18a45d3128c809d03f8f41849f93c
2013-04-07Fix #120224# Mapping the text rotation in Writer table cell with MSOLei De Bin
Reported by: Yan Ji Patch by: Chen Zuo Jun Review by: Lei De Bin Conflicts: sw/source/filter/ww8/wrtww8.cxx Change-Id: I4d830cbedc033ec7abb6d0d1d4e1572ce5f45c26
2013-04-07Fix issue #i119650: Font size increased if saved by AOOJian Hong Cheng
* sw/source/filter/ww8/ww8atr.cxx MS Word Binary compatibility Patch by: Chen Peng,<chenpeng2006@gmail.com> Found by: Yan Ji,<yanji.yj@gmail.com> Review by: Jian Hong Cheng,<chengjh@apache.org>(cherry picked from commit 980ee15bad53f765a0df1a4507befc9184fc0c63) Conflicts: sw/source/filter/ww8/ww8atr.cxx Change-Id: I6f2d3bcd4cea6718e1291c3297fd4a3681c07ee8
2013-04-07Fix issue #i120568: Hyperlink of Graphihc with Anchor Type "As Character"Jian Hong Cheng
lost after save as doc format * main/sw/source/filter/ww8/wrtww8gr.cxx MS Word Binary compatibility Patch by: Huaidong Qiu,<qiuhuaidong@gmail.com> Found by: Huaidong Qiu,<qiuhuaidong@gmail.com> Review by: Jian Hong Cheng,<chengjh@apache.org> (cherry picked from commit bf1449731638d6432fb9adfef3a8a303ad9bf76b) Conflicts: sw/source/filter/ww8/wrtww8gr.cxx Change-Id: I6a5923a015eefc8aaadeacd897848cf1a2f15362
generated by cgit (git 2.34.1) at 2024-07-16 06:17:01 +0000