summaryrefslogtreecommitdiff
path: root/sw/source/filter/ww8/ww8par3.cxx
AgeCommit message (Collapse)Author
2014-05-20Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part18Julien Nabet
Change-Id: Ibf958dbfbf7cdbe6ad31d390138be8d4d468c225
2014-05-17Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part15Julien Nabet
Change-Id: I38e855966598342eb2352e70e04f7a5e09e54f83
2014-05-14sprmids is used only inside sw/source/filter/ww8Miklos Vajna
Change-Id: Iebae4a08a452117e71f72836ed686221031a61e6
2014-04-30sw: sal_Bool->boolNoel Grandin
Change-Id: I324a0ffde2ddcca105451c19e7aadcfad15211d8
2014-04-24Finish cleaning up ASCII art in the sw moduleChris Laplante
Change-Id: If4f11093b791902514dee8e216c92f66b075211d Reviewed-on: https://gerrit.libreoffice.org/9117 Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
2014-03-17sw: prefer passing OUString by referenceNoel Grandin
Change-Id: Iaa846ec8f19567f0a9f30154d74cc53df93eff16
2014-03-13coverity#708507 Uninitialized scalar fieldCaolán McNamara
Change-Id: I3e5a4432ae8a4ea455935e4d089f9436ef539851
2014-02-27Remove visual noise from swAlexander Wilms
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-24Remove unnecessary bool2anyStephan Bergmann
Change-Id: Ie2caee1d5a7912011d76172539c2f8f37eaee5cf
2014-02-23Remove unneccessary commentsAlexander Wilms
Change-Id: I939160ae72fecbe3d4a60ce755730bd4c38497fb Reviewed-on: https://gerrit.libreoffice.org/8182 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-14sal_Bool->boolNoel Grandin
Change-Id: Ibd5178f35d735e94065a3fbb6b61de53e53b1b0c
2014-02-12convert SvStream::operator>> methods to ReadXXX methodsNoel Grandin
First, I updated the clang rewriter to do the conversion. Then I lightly hand-tweaked the output for the few places where the rewriter messed up, mostly when dealing with calls on "this". Change-Id: I40a6a977959cd97415c678eafc8507de8aa3b1a9 Reviewed-on: https://gerrit.libreoffice.org/7879 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-02-03some more continuous correctionsThomas Arnhold
2014-01-31sw: hardcoded NS_sprm::LN_CPbiIBulletMiklos Vajna
Change-Id: I51d4638b588da290853422750b90365b454c046f
2014-01-28sw: hardcoded NS_sprm::LN_CPbiGrfMiklos Vajna
Change-Id: I2a63d1c937392be194c00909213bc89ffe26a550
2013-12-20typo fixesAndras Timar
Change-Id: Ia5f104bfd707bcf4e159c78ca2764c861fb0b6d9
2013-12-13cppcheck: fix rTwo.GetPoolHlpFileId() == rTwo.GetPoolHlpFileId()Julien Nabet
Change-Id: I2af19d62bb14af52ce8c2fc6b5d65ad97d910a6d
2013-11-23Don't subtract 1 to just add it backMatteo Casalin
Change-Id: I2d7e08b70047c98e9164b8b733bae50ca8872142
2013-11-23xub_StrLen to sal_Int32 and some optimizationsMatteo Casalin
Change-Id: I49d398ab9f086c769941767bb4431bbbb96f56b0
2013-11-19Resolves: #i33737# enable in-place editing of Input FieldsOliver-Rainer Wittmann
(cherry picked from commit c2afeb1c3f11e8f420b59f3786eb8626c99ff595) Conflicts: sw/inc/IDocumentContentOperations.hxx sw/inc/crsrsh.hxx sw/inc/doc.hxx sw/inc/editsh.hxx sw/inc/expfld.hxx sw/inc/fldbas.hxx sw/inc/fmtfld.hxx sw/inc/hintids.hxx sw/inc/ndtxt.hxx sw/inc/txatbase.hxx sw/inc/txtfld.hxx sw/inc/txtrfmrk.hxx sw/inc/txttxmrk.hxx sw/inc/viscrs.hxx sw/source/core/bastyp/init.cxx sw/source/core/crsr/crsrsh.cxx sw/source/core/crsr/crstrvl.cxx sw/source/core/crsr/findattr.cxx sw/source/core/crsr/findtxt.cxx sw/source/core/crsr/swcrsr.cxx sw/source/core/crsr/viscrs.cxx sw/source/core/doc/dbgoutsw.cxx sw/source/core/doc/doc.cxx sw/source/core/doc/docfld.cxx sw/source/core/doc/docfmt.cxx sw/source/core/doc/docnum.cxx sw/source/core/doc/docredln.cxx sw/source/core/doc/docruby.cxx sw/source/core/doc/doctxm.cxx sw/source/core/doc/visiturl.cxx sw/source/core/docnode/nodes.cxx sw/source/core/edit/edatmisc.cxx sw/source/core/edit/edattr.cxx sw/source/core/edit/edfld.cxx sw/source/core/edit/edfldexp.cxx sw/source/core/edit/editsh.cxx sw/source/core/edit/edlingu.cxx sw/source/core/edit/ednumber.cxx sw/source/core/fields/expfld.cxx sw/source/core/fields/fldbas.cxx sw/source/core/fields/reffld.cxx sw/source/core/frmedt/fefly1.cxx sw/source/core/inc/docfld.hxx sw/source/core/inc/rolbck.hxx sw/source/core/inc/swfont.hxx sw/source/core/layout/flycnt.cxx sw/source/core/layout/laycache.cxx sw/source/core/layout/trvlfrm.cxx sw/source/core/text/atrhndl.hxx sw/source/core/text/atrstck.cxx sw/source/core/text/inftxt.cxx sw/source/core/text/porfld.cxx sw/source/core/text/porfld.hxx sw/source/core/text/txtfld.cxx sw/source/core/tox/tox.cxx sw/source/core/tox/txmsrt.cxx sw/source/core/txtnode/atrfld.cxx sw/source/core/txtnode/ndhints.cxx sw/source/core/txtnode/ndtxt.cxx sw/source/core/txtnode/thints.cxx sw/source/core/txtnode/txatbase.cxx sw/source/core/txtnode/txatritr.cxx sw/source/core/txtnode/txtedt.cxx sw/source/core/undo/SwUndoField.cxx sw/source/core/undo/rolbck.cxx sw/source/core/undo/unsect.cxx sw/source/core/undo/untbl.cxx sw/source/core/unocore/unocrsrhelper.cxx sw/source/core/unocore/unofield.cxx sw/source/core/unocore/unoframe.cxx sw/source/core/unocore/unorefmk.cxx sw/source/core/view/vprint.cxx sw/source/filter/ascii/ascatr.cxx sw/source/filter/html/htmlatr.cxx sw/source/filter/rtf/rtffly.cxx sw/source/filter/ww1/fltshell.cxx sw/source/filter/ww1/w1filter.cxx sw/source/filter/ww8/wrtw8esh.cxx sw/source/filter/ww8/wrtw8nds.cxx sw/source/filter/ww8/ww8atr.cxx sw/source/filter/ww8/ww8par.cxx sw/source/filter/ww8/ww8par3.cxx sw/source/filter/ww8/ww8par5.cxx sw/source/ui/app/applab.cxx sw/source/ui/docvw/edtwin.cxx sw/source/ui/docvw/edtwin2.cxx sw/source/ui/envelp/envfmt.cxx sw/source/ui/fldui/fldedt.cxx sw/source/ui/fldui/fldmgr.cxx sw/source/ui/inc/wrtsh.hxx sw/source/ui/lingu/hhcwrp.cxx sw/source/ui/shells/basesh.cxx sw/source/ui/shells/drwtxtex.cxx sw/source/ui/shells/grfsh.cxx sw/source/ui/shells/tabsh.cxx sw/source/ui/shells/textfld.cxx sw/source/ui/shells/textidx.cxx sw/source/ui/shells/textsh.cxx sw/source/ui/shells/textsh1.cxx sw/source/ui/shells/txtattr.cxx sw/source/ui/uiview/formatclipboard.cxx sw/source/ui/uiview/view.cxx sw/source/ui/uiview/view2.cxx sw/source/ui/uiview/viewsrch.cxx sw/source/ui/uiview/viewstat.cxx sw/source/ui/uiview/viewtab.cxx sw/source/ui/wrtsh/wrtsh1.cxx sw/source/ui/wrtsh/wrtsh2.cxx Change-Id: I6758d6719e1fd523797cc6ee2648ffcb47d52595
2013-11-07fdo#63020: Replace ::comphelper::stl_begin()...Marcos Paulo de Souza
And use some templates inside include/com/sun/star/uno/Sequence.hxx Change-Id: I48875fa1517751fc4cb0cf2b6c08b88975a29b47 Reviewed-on: https://gerrit.libreoffice.org/6599 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2013-11-06convert xub_StrLen to sal_Int32Noel Grandin
convert for loops using xub_StrLen to use sal_Int32 Change-Id: I5f635ca078966fefe938dbc7e8dea7c8d0d0b554
2013-10-22Bin comments that claim to say why some header is includedTor Lillqvist
They are practically always useless, often misleading or obsolete. Change-Id: I2d32182a31349c9fb3b982498fd22d93e84c0c0c
2013-10-18converting remaining usage of String in SW to OUStringNoel Grandin
Change-Id: Iaaa3812412dc880eb9d08144219ebe428007884e
2013-10-15WW8 import: fix handling of sprmPIlfo when sprmPIlvl is missingMiklos Vajna
Commit 542a0d7260e4767d8aff839eb593e748a82ced48 (#100044# Cleanup for optimization defines->enums, 2002-08-14) added the problematic "else" without mentioning the reason, so I assume it's safe to just revert that part. Change-Id: Id90fbdfb1116be458a76c9653fec0633edc34fac
2013-10-15fdo#36868 WW8 import: allow outline numbering and list style in the same ...Miklos Vajna
.. paragraph style The original problem (from a user's point of view) was that the second level of the numbering started from 1.1 instead of 2.1 in the bugdoc. This was fixed by using outline numbering for level 2 as well, but this is problematic in many cases: we want to have outline numbering exactly when outline numbering is enabled for the given paragraph style. So revert the change in SwWW8ImplReader::SetStylesList() and fix it differently: SwWW8ImplReader::RegisterNumFmtOnStyle() explicitly ignores list style if outline numbering is available with no good reason. Both the WW8 format and Writer core allows to have outline numbering and a list style at the same time, so set list style even when outline numbering is available. This fixes the original issue, too -- without introducing nasty fake outline numbering usage. Also add a testcase for the original issue. (regression from e3d5c3e0746916c4056389dd8c2daa6c451c8f6e) Change-Id: Id7d2d67a96a858aee3230110cb518fea51d19d38
2013-10-15convert sw/source/filter/ww8/*.cxx from String to OUStringNoel Grandin
Change-Id: Ibdd454008244b9a6db5037f511ac2da723648d89
2013-10-10convert sw/source/filter/ww8/*.hxx from String to OUStringNoel Grandin
Change-Id: I8b26dcc671771f3a26c1270b94ef7e342074fa3c
2013-09-26typo fixes in commentsAndras Timar
Change-Id: Iaadec33715f8e0e0c6595c5e684606905274fdab
2013-09-03String to OUStringMatteo Casalin
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-08-21String to OUStringMatteo Casalin
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-21String to OUStringMatteo Casalin
Change-Id: I3161b18f73fd3141b9832e0277d3f1071f75ba39 Reviewed-on: https://gerrit.libreoffice.org/5560 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-07-01Robustify WW8FormulaControl::FormulaRead reading SvStream.Mark Wielaard
The >>operator of SvStream doesn't initialize a variable if the stream is faulty. So initialize the variables before usage to prevent reading wrong/random bits. Change-Id: Ia66dd6d8574c36e7229a58347f2e2c1e0fe2e248 Reviewed-on: https://gerrit.libreoffice.org/4636 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-06-26Resolves: #i120582# consider the case that a right indent is set...Oliver-Rainer Wittmann
at the paragraph - some minor reformatting and cleanup of older comments (cherry picked from commit e4578fcc2408a530d373653b01c0a88ef46ea26f) Conflicts: sw/source/core/text/txttab.cxx sw/source/filter/ww8/ww8par.cxx Change-Id: I345a20c78f26be60de3eb01ac6f5303de46c2fc1
2013-04-07mass removal of rtl:: prefixes for O(U)String*Luboš Luňák
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-14Code cleanup for i#120928 patchCédric Bosdonnat
Change-Id: Ic46acc5207bab70f080c4eba5a8113de8376ad36
2013-03-14Fix issue #i119405: Numbering text style changed after importing the *.docJian Hong Cheng
* 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 McNamara
Change-Id: I551ccf9b098d7f916bd889dbc82d22c0dc5c63f3
2013-03-13Fix #i120928: Import Graphic Bullets of MS Word DocumentJian Hong Cheng
* 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 Roucy
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-03-04remove trailing whitespacesThomas Arnhold
Change-Id: Ib6684fe00e063e150af30477fd704d9b3f029282
2013-02-22fdo#38838 search replace for String::CreateFromInt32().Jean-Noël Rouvignac
I ran the following code replace: s/(Uni|Xub)?String\s*::\s*CreateFromInt32/OUString::number/ Change-Id: Ic500593e3a0b593522c9469b18da0145285007da Reviewed-on: https://gerrit.libreoffice.org/2280 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-02-12Renamed hard-to-remember 8-char headers in editeng.Kohei Yoshida
Change-Id: If255802082890e1b1b4c5197a791fa79a011773e
2012-12-28Some cppcheck cleaning in swJulien Nabet
Change-Id: I3dd51a8ddd0c01c453331934869413d5999a826f
2012-12-18SwMSConvertControls::InsertControl: typoMiklos Vajna
2012-12-18sw: kill C2U in filterMiklos Vajna
2012-11-30re-base on ALv2 code. Includes:Michael Meeks
Patches contributed by Oliver-Rainer Wittmann sw34bf06: #i117783# - Writer's implementation of XPagePrintable - apply print settings to new printing routines http://svn.apache.org/viewvc?view=revision&revision=1172115 sw34bf06: #o12311627# use <rtl_random> methods to create unique ids for list styles and list ids http://svn.apache.org/viewvc?view=revision&revision=1172112 sw34bf06 #i114725#,#i115828# - method <SwDoc::ClearDoc()> - clear list structures completely http://svn.apache.org/viewvc?view=revision&revision=1172122 i#118572 - remove ui string and help content regarding usage of Java Mail in Writer's Mail Merge as Java Mail is not used. http://svn.apache.org/viewvc?view=revision&revision=1197035 Patches contributed by Mathias Bauer cws mba34issues01: #i117718#: provide filter name in case storage of medium does not allow to detect one http://svn.apache.org/viewvc?view=revision&revision=1172350 cws mba34issues01: #i117721#: directly provide parameters retrieved from SfxMedium http://svn.apache.org/viewvc?view=revision&revision=1172353 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=1396797 http://svn.apache.org/viewvc?view=revision&revision=1397315 cws mba34issues01: #i117723#: convert assertion into trace http://svn.apache.org/viewvc?view=revision&revision=1172355 cws mba34issues01: #i117699#: keep layout alive until swdoc dies http://svn.apache.org/viewvc?view=revision&revision=1172362 cws mba34issues01: #i117943#: missing color attributes in RTF clipboard http://svn.apache.org/viewvc?view=revision&revision=1172363 Patch contributed by Henning Brinkmann imported patch i#103878 http://svn.apache.org/viewvc?view=revision&revision=1172109 Patches contributed by Michael Stahl sw34bf06: #i117955#: WW8 export: disable storing of section breaks in endnotes http://svn.apache.org/viewvc?view=revision&revision=1172119 Patch contributed by imacat Fixed the Asian language work count. http://svn.apache.org/viewvc?view=revision&revision=1241345 Patch contributed by Pedro Giffuni i#20878 - Add comment with BZ issue for reference. http://svn.apache.org/viewvc?view=revision&revision=1244517 Patch contributed by Andre Fischer Do not add targets for junit tests when junit is disabled. http://svn.apache.org/viewvc?view=revision&revision=1241508 add writerperfect dependency.
2012-11-03sal_Bool to boolTakeshi Abe
Change-Id: I35412e2d2e36e3eabdff2a6692bf6edc68a2d724
2012-10-25sal_Bool to boolTakeshi Abe
Change-Id: I8b76ba6d6a27cebefca3307a648bd5baafd27262
2012-10-14sw: fix new clang warnings in ww8 filtersMiklos Vajna
Change-Id: I76db821d5388e756d6007dff9af2bc029972ea72
generated by cgit (git 2.34.1) at 2024-08-10 20:00:46 +0000