summaryrefslogtreecommitdiff
path: root/sw/source/filter/ww8/ww8par.hxx
AgeCommit message (Collapse)AuthorFilesLines
2014-04-30sw: sal_Bool->boolNoel Grandin1-11/+11
Change-Id: I324a0ffde2ddcca105451c19e7aadcfad15211d8
2014-04-15sw: clean up inter-module includesThomas Arnhold1-1/+1
Change-Id: I812842e76ae0b7bc252530d2b4aaa2b452c2babf
2014-04-03filter/msfilter: sal_Bool->boolNoel Grandin1-2/+2
Change-Id: I24deda680469ce99ba358a68e83551bdb584751a
2014-03-29Typo: varient->variantJulien Nabet1-2/+2
Change-Id: I0b62f630573dc76d90e3c1f659b2ac359758b243
2014-03-27Second batch of adding SAL_OVERRIDE to overriding function declarationsStephan Bergmann1-21/+21
...mostly done with a rewriting Clang plugin, with just some manual tweaking necessary to fix poor macro usage. Change-Id: Ie656f9d653fc716f72ac175925272696d509038f
2014-03-23Full colour borders in .doc import/exportLuke Deller1-11/+11
The BRC (BoRder Control) structure used in .doc files to specify border properties has undergone several revisions over time. LibreOffice supports the WW6 and WW8 (Word '97) BRC versions, which allow the border colour to be selected from a palette of only 16 colours. This changeset adds support for the WW9 (Word 2000) BRC version, along with some new SPRMs (Single PRoperty Modifiers) which use it, so that border colours are preserved accurately in .doc import/export. This change covers: - page borders - paragraph borders - borders around a sequence of characters - table / table cell borders (import only) Further work is required to extend coverage to borders of pictures and export of borders in tables. The LO code was using the same class WW8_BRC to store the bits for either the WW6 or WW8 BRC. This becomes a bit unmanagable when adding a third BRC version, so I have split this into a separate class for each version. Fixes fdo#68475, fdo#50185 Change-Id: I7ebc15236497cbab9312d8659fe7ed0bee2c59ed Reviewed-on: https://gerrit.libreoffice.org/8646 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-03-17sw: prefer passing OUString by referenceNoel Grandin1-5/+5
Change-Id: Iaa846ec8f19567f0a9f30154d74cc53df93eff16
2014-03-13coverity#708504 Uninitialized scalar fieldCaolán McNamara1-1/+8
Change-Id: I36fd2d6f419ffbb3770e821019c1d665cf4b2c8b
2014-02-27Remove visual noise from swAlexander Wilms1-22/+7
Conflicts: sw/inc/unodraw.hxx sw/inc/unoframe.hxx sw/sdi/swriter.sdi sw/source/core/unocore/unoframe.cxx sw/source/core/unocore/unoparagraph.cxx sw/source/filter/ww8/rtfexportfilter.cxx sw/source/ui/inc/unotxvw.hxx sw/source/ui/lingu/hyp.cxx sw/source/ui/lingu/sdrhhcwrap.cxx sw/source/ui/uno/swdetect.hxx Change-Id: Ic0a3fb2392187c277c9b36915ffb10dcf0317908 Reviewed-on: https://gerrit.libreoffice.org/8322 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-19coverity#738895 unused memberCaolán McNamara1-1/+0
Change-Id: I6bca0a36708e4e8fd3a22a23d76a89525b6d75bc
2014-02-14sal_Bool->boolNoel Grandin1-2/+2
Change-Id: Ibd5178f35d735e94065a3fbb6b61de53e53b1b0c
2014-02-13coverity#705539 Unintentional integer overflowCaolán McNamara1-5/+5
Change-Id: I3d170feeabcdd5f1ac3e64e1018edfb30b2b3c4c
2014-02-06Typo: formating -> formattingJulien Nabet1-1/+1
Change-Id: If4aba89909a3ef049a756182c37d8a5d6812ae70
2014-02-04DOC import: fix nested commentsMiklos Vajna1-0/+2
See 2.9.70 (FBKF) in the spec, the ibkl field should be used to find the position in PlcfBkf. Previously we assumed that PlcfBkl and PlcfBkf is parallel for annotations, as but that's not true for nested comments. Change-Id: I76a6a757b41d2f9b7fe7fe9c9e01a92c251f7b32
2014-01-15starting chopping out aEmptyOUStrCaolán McNamara1-1/+1
Change-Id: I4d944018bb471d78d6ebb3604d445b90899ea893
2013-12-20typo fixesAndras Timar1-1/+1
Change-Id: Ia5f104bfd707bcf4e159c78ca2764c861fb0b6d9
2013-11-23xub_StrLen to sal_Int32Matteo Casalin1-5/+5
Change-Id: I395e62831f624b05e2979169440ff8663f76e835
2013-11-07these longs are really 32bitCaolán McNamara1-1/+1
Change-Id: I6c71f1ce32df6067f0be820656d86e851d288291
2013-11-05fixincludeguards.sh: swThomas Arnhold1-2/+2
Change-Id: I8e0889200d1a1c36e53022a74792728efd66c2fc
2013-11-01Resolves: #i120927: Import/Export Hyperlink Info of Graphic with Anchor...Jian Hong Cheng1-0/+48
Type Except “As Character” to MS Word Binary File * sw/source/filter/ww8/escher.hxx * sw/source/filter/ww8/wrtw8esh.cxx * sw/source/filter/ww8/wrtww8.hxx * sw/source/filter/ww8/ww8graf.cxx * sw/source/filter/ww8/ww8par.cxx * sw/source/filter/ww8/ww8par.hxx Interoperability of Hyperlink within Flying object Patch by: Jane Kang,<kangjane2012@gmail.com> Found by: Yan Ji,<yanji.yj@gmail.com> Review by: Jian Hong Cheng,<chengjh@apache.org> (cherry picked from commit 8f7c7a5713e92aecfe4837e628a001b7668c9540) Conflicts: sw/source/filter/ww8/wrtw8esh.cxx sw/source/filter/ww8/wrtww8.hxx sw/source/filter/ww8/ww8graf.cxx sw/source/filter/ww8/ww8par.cxx Fix non-pro build breaker: SvMemoryStream has no member GetRecLeft() Possible introduced from copy and paste from sc, see sal_Size XclImpStream::GetRecLeft() function in class:XclImpStream sc/source/filter/inc/xistream.hxx (cherry picked from commit 4a3a3afa32785d0b1051d9d1104adbbb0e61a820) Conflicts: sw/source/filter/ww8/ww8par.cxx 9ce792333ba3f6aa0f8d8660533bc740e1354597 Change-Id: Icbecea61bf6ec3e7baa02e678a575d64fcfca731
2013-10-24Resolves: #i120879# import "Microsoft Word TOC bookmarks" as...Oliver-Rainer Wittmann1-10/+31
cross reference bookmarks and suppress the import of unreferenced ones. Review by: zhengfan (cherry picked from commit e3a34e95823105fda68fd29a4ded22a9d52523fb) Conflicts: sw/source/core/crsr/crossrefbookmark.cxx sw/source/core/inc/crossrefbookmark.hxx sw/source/filter/inc/fltshell.hxx sw/source/filter/ww1/fltshell.cxx sw/source/filter/ww8/ww8par.cxx sw/source/filter/ww8/ww8par.hxx sw/source/filter/ww8/ww8par5.cxx Change-Id: I5898cbd33c9a17b9517040e19ca8eda4355a1eac also remove symbol-visibility problems in IDocumentMarkAccess.hxx (cherry picked from commit de9ea83df087ba3f8e614a69e8b18403d54b9589) Conflicts: sw/inc/IDocumentMarkAccess.hxx Change-Id: I2f51cc4412525c6e62d120df5c7fe1c223e35972
2013-10-23Resolves: #i119963#, #i120877# import and export actual TOC contentOliver-Rainer Wittmann1-0/+11
Patch by: zhengfan, Oliver Review by: Oliver reintegrate from branch writer001 (cherry picked from commit 8f2a21eac4a904db3cc4c448179e2d2cf5878ef4) Conflicts: sw/inc/tox.hxx sw/source/core/tox/tox.cxx sw/source/filter/ww8/dump/ww8scan.cxx sw/source/filter/ww8/wrtw8nds.cxx sw/source/filter/ww8/wrtww8.cxx sw/source/filter/ww8/ww8atr.cxx sw/source/filter/ww8/ww8par.cxx sw/source/filter/ww8/ww8par.hxx sw/source/filter/ww8/ww8par5.cxx sw/source/filter/ww8/ww8par6.cxx Change-Id: I75b2971f23754afa0bcb0b549bfb820dd5924b3b
2013-10-22Bin comments that claim to say why some header is includedTor Lillqvist1-3/+3
They are practically always useless, often misleading or obsolete. Change-Id: I2d32182a31349c9fb3b982498fd22d93e84c0c0c
2013-10-21drop CharSet typedefCaolán McNamara1-4/+4
Change-Id: Ia160d7cbaa2ee71773483c3f91306f89cdad5947
2013-10-18converting remaining usage of String in SW to OUStringNoel Grandin1-1/+1
Change-Id: Iaaa3812412dc880eb9d08144219ebe428007884e
2013-10-15convert sw/source/filter/ww8/*.cxx from String to OUStringNoel Grandin1-1/+1
Change-Id: Ibdd454008244b9a6db5037f511ac2da723648d89
2013-10-14don't include unused tools/string.hxxChr. Rossmanith1-1/+0
Change-Id: Ia7ac4594c1b9cb853b5f8f5bf76864703376710e Reviewed-on: https://gerrit.libreoffice.org/6236 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-10-10convert sw/source/filter/ww8/*.hxx from String to OUStringNoel Grandin1-21/+21
Change-Id: I8b26dcc671771f3a26c1270b94ef7e342074fa3c
2013-09-25Resolves: fdo#66400 import combined characters from docxCaolán McNamara1-2/+3
move .doc combined character parser stuff from sw to filter for reuse in .docx and fix bad length problem when nSavPtr == -1 after String->OUString conversion thanks for the pasta CloudOn Change-Id: I368ca30c14fd089271902b9b874de1099eb40038
2013-09-19String to OUStringMatteo Casalin1-5/+5
Change-Id: I463a42e7fa755aa534cddbd150ee0c82d2827b0f Reviewed-on: https://gerrit.libreoffice.org/5968 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-09-11Related: fdo#38838 Remove String::SearchChar()Thomas Arnhold1-1/+1
Change-Id: Ide40e0ef91aec04c2ae274aaf2a957dd5064854c Reviewed-on: https://gerrit.libreoffice.org/5894 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-09-08CharBrd 9.4: DOC filtersZolnai Tamás1-1/+2
-WW8 filter is the only MS filter which ignores padding of character border. Change-Id: I17973d8d2ae624d68356729334c701864fe0a10d
2013-09-03String to OUStringMatteo Casalin1-36/+37
Change-Id: I41bda1a4d37bff782a51d07e36d471df2d6b421b Reviewed-on: https://gerrit.libreoffice.org/5776 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-09-01String to OUStringMatteo Casalin1-1/+1
Change-Id: Ibb2489e4e895f3f855208fe20749f7078a360710 Reviewed-on: https://gerrit.libreoffice.org/5737 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-09-01String to OUStringMatteo Casalin1-2/+2
Change-Id: I0285d1ad9edaf07be869c5e8325ed693beaee5f2 Reviewed-on: https://gerrit.libreoffice.org/5730 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-09-01Remove pointless comments and ASCII artTor Lillqvist1-2/+2
Change-Id: I387d7b301643f359f2d6a4c5f51a4dd7f5e1c296
2013-08-21String to OUStringMatteo Casalin1-1/+1
Change-Id: I1117318d9201a8951017ebe835b6c57c6b4ad706 Reviewed-on: https://gerrit.libreoffice.org/5561 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-08-15String to OUString, some formattingMatteo Casalin1-1/+1
Conflicts: sw/source/filter/basflt/fltini.cxx sw/source/ui/dialog/ascfldlg.cxx Change-Id: Ifa12105aa6f747e2797891b6c71128bd96f78bf3
2013-07-29Resolves: #i35763# fix WW8: Wrong import/export of underlining coloursLei De Bin1-0/+1
more detail pls check http://wiki.services.openoffice.org/wiki/Writer/Underline_Color Reported by: gonzalez Patch by: Chen Zuo Jun Review by: Lei De Bin (cherry picked from commit 74f769f8c9ff5f4bba2ee08f4921ca54dd0c4c82) Conflicts: sw/source/filter/ww8/ww8atr.cxx Change-Id: Ie9c01c3c7fcd74c059e97ff98a1c67b15c5fcd5c
2013-07-14String::SearchAndReplaceAllAscii -> OUString::replaceAllCaolán McNamara1-1/+1
Change-Id: I5091835c9f71c712f15996e5c6263fc5f21f6f96
2013-07-10IsContinous -> IsContinuousLuboš Luňák1-1/+1
Change-Id: Ib2f5eaf58060125134d3c9ba3f570c4fdceb3732
2013-05-15Spelling "separate" (etc) correctly is hardTor Lillqvist1-1/+1
2013-05-13SwWW8ImplReader::ParseTabPos: make this non-staticMiklos Vajna1-1/+1
I'll need to access the non-static maSectionManager in this method soon. Change-Id: Ia056ec9c812020c4ac0f4a0f1460a0c9506b12fa
2013-05-13sw: move WW8TabBandDesc to ww8par.hxxMiklos Vajna1-0/+56
I'll need this struct in ww8par6.cxx soon. Change-Id: I4cf546ff585c89c076e4fdad93dbbb9b8ea72eca
2013-04-07mass removal of rtl:: prefixes for O(U)String*Luboš Luňák1-22/+22
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-03-14Fix issue #i119405: Numbering text style changed after importing the *.docJian Hong Cheng1-1/+15
* main/sw/inc/doc.hxx * main/sw/inc/IDocumentContentOperations.hxx * main/sw/inc/ndtxt.hxx * main/sw/source/core/doc/docfmt.cxx * main/sw/source/core/txtnode/thints.cxx * main/sw/source/filter/inc/fltshell.hxx * main/sw/source/filter/ww1/fltshell.cxx * main/sw/source/filter/ww8/ww8par.cxx * main/sw/source/filter/ww8/ww8par.hxx * main/sw/source/filter/ww8/ww8par3.cxx MS Word Binary compatibility Patch by: Fan Zheng,<zheng.easyfan@gmail.com> Found by: Jian Hong Cheng,<chengjh@apache.org> Review by: Jian Hong Cheng,<chengjh@apache.org> Conflicts: sw/source/filter/inc/fltshell.hxx sw/source/filter/ww1/fltshell.cxx sw/source/filter/ww8/ww8par.cxx sw/source/filter/ww8/ww8par.hxx (cherry picked from commit ee3b12ab1d62faedcd2d62fcb8011b7454ea0474) Change-Id: I2f72969a54db53e6a51edcf3a3216647cec9424c
2013-03-13WaE: various warngs, e.g. unused argument, variables, orderingCaolán McNamara1-2/+2
Change-Id: I551ccf9b098d7f916bd889dbc82d22c0dc5c63f3
2013-03-13Fix #i120928: Import Graphic Bullets of MS Word DocumentJian Hong Cheng1-0/+2
* sw/inc/numrule.hxx * sw/source/core/doc/number.cxx * sw/source/filter/ww8/attributeoutputbase.hxx * sw/source/filter/ww8/escher.hxx * sw/source/filter/ww8/rtfattributeoutput.cxx * sw/source/filter/ww8/rtfattributeoutput.hxx * sw/source/filter/ww8/rtfexport.hxx * sw/source/filter/ww8/rtfexport.cxx * sw/source/filter/ww8/writerhelper.cxx * sw/source/filter/ww8/writerhelper.hxx * sw/source/filter/ww8/wrtw8esh.cxx * sw/source/filter/ww8/wrtw8nds.cxx * sw/source/filter/ww8/wrtw8num.cxx * sw/source/filter/ww8/wrtww8.cxx * sw/source/filter/ww8/wrtww8.hxx * sw/source/filter/ww8/wrtww8gr.cxx * sw/source/filter/ww8/ww8attributeoutput.hxx * sw/source/filter/ww8/ww8par.cxx * sw/source/filter/ww8/ww8par.hxx * sw/source/filter/ww8/ww8par3.cxx * sw/source/ui/wrtsh/wrtsh1.cxx Graphic Bullets Fidelity Patch by: chengjh,<chengjh@apache.org> Found by: chengjh,<chengjh@apache.org> Review by: Fan Zheng,<zheng.easyfan@gmail.com> Conflicts: sw/inc/numrule.hxx sw/source/filter/ww8/writerhelper.cxx sw/source/filter/ww8/wrtw8nds.cxx Change-Id: I7b00590a9f05da745678b5ba99b6f6f4e870d197 Signed-off-by: Cedric Bosdonnat <cedric.bosdonnat.ooo@free.fr> Signed-off-by: Fridrich Strba <fridrich.strba@bluewin.ch>
2013-03-05res. bug on numbered paragraph when .doc importMaxime de Roucy1-0/+9
This patch solve an issue on .doc import (on paragraph numbering). It was created from the code found in SwDoc::DelNumRules. To see the problem you can download simple test document : wget ftp://craoc.fr/{a,b,c,d}.{doc,png} Each document contain a paragraph "Test test test2" using Normal/default style (this paragraph is imported correctly) and a "Test test test1" using nouveau_style paragraph style. In a.doc no direct paragraph formating are apply to the test1 paragraph. a.doc is imported correctly. To create b.doc, in Microsoft Office Word I opened a.doc, put my cursor in front of the first charactère of the test1 paragraph (T) and push "backspace". The result is that it apply some direct paragraph formating on test1 : * disable paragraph numbering * apply some indent To create c.doc I did on b.doc the same things I did to a.doc to create b.doc. c.doc direct paragraph formating on test1 : * disable paragraph numbering * apply some (other) indent To create d.doc I did on c.doc the same things I did to a.doc to create b.doc. d.doc direct paragraph formating on test1 : * disable paragraph numbering Without this patch, when importing {b,c,d}.doc in Writer : The "disable paragraph numbering" direct formating isn't correctly apply and test1 remain a numbered paragraph (even if the "dot" in front of the paragraph is removed). The indent are not correctly apply. With this patch {a,b,c,d}.doc are correctly imported. It also reset the left indent of paragraph when the numbering style is remove. Change-Id: If0568f341b82c2e8354f1728e5fc6f1ab310ea51 Reviewed-on: https://gerrit.libreoffice.org/2046 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Tor Lillqvist <tml@iki.fi> Reviewed-by: Muthu Subramanian K <muthusuba@gmail.com> Tested-by: Muthu Subramanian K <muthusuba@gmail.com>
2013-02-11import different first page header/footer from docLuke Deller1-5/+3
When a Word section has a different first page header/footer, this used to be imported into LO as a chain of two page styles. Now that LO supports a single page style with different first page header/footer we can import to that. This change also incidentally fixes fdo#57908. bnc#654230 had the same underlying problem, so the workaround committed for that (which includes comments expressing lack of understanding) has been removed. Change-Id: I6df7e9abc8f2a327a3b33e06322ca943f6f24605 Reviewed-on: https://gerrit.libreoffice.org/2065 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-17 23:41:34 +0000