summaryrefslogtreecommitdiff
path: root/sw/inc/ndtxt.hxx
AgeCommit message (Collapse)Author
2015-11-06com::sun::star->css in sw/incNoel Grandin
Change-Id: I6ffdb1deaa32156c65f997a1a1056928b7cd863d Reviewed-on: https://gerrit.libreoffice.org/19803 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2015-10-30sw: prefix members of SwNodeMiklos Vajna
Change-Id: I3ce33c8ea0c09948785621785d199ece6eda128a
2015-10-12Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY codeStephan Bergmann
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
2015-09-09tdf#92036: sw: fix idle spelling loopMichael Stahl
There is a sort of intentional infinite loop in the idle spell checking handler: while the user is typing a word, it should not be marked as invalid yet, in order not to annoy them with red underlines. So the word where the cursor is positioned always remained dirty, unless you happen to have a grammar checker enabled, which clears the paragraph's dirty flag from a separate thread. To avoid the infinite loop, add another spell checking state "PENDING" which is the same as dirty except that it should cancel the idle spell checking. The idle spell checking will run again when the user does the next editing operation. Notably this means if the user just moves the cursor out of the wrongly spelled word, it won't be underlined yet, but that appears a minor issue, and checking when the cursor leaves the word appears too hard to implement. Change-Id: Ifb3d6d17f94f9f1cfad82e70dfa79f1594c38647
2015-08-20loplugin: defaultparamsNoel Grandin
Change-Id: If105665a016183f08a2be13366e5068060b5954c
2015-07-04Fix typosAndrea Gelmini
Change-Id: Id9296115f30858e7fd470a199e59343a96d7deec Reviewed-on: https://gerrit.libreoffice.org/16712 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
2015-06-23Revert "Typo: iff->if"Julien Nabet
This reverts commit cf92da3d6e1de14756efe3f1ee79f393a2f3787d. iff can mean "if and only if" so not a typo
2015-06-23Typo: iff->ifJulien Nabet
Change-Id: I3fc60856b5a56e71d70b55c89323be074bdec3b3
2015-05-20bin/rename-sw-abbreviations.shlibreoffice-5-0-branch-pointChristian Lohmaier
renames the most annoying abbreviations in Writer (and partially in the shared code too). Change-Id: I9a62759138126c1537cc5c985ba05cf54d6132d9
2015-05-14tdf#86639 SwEditShell: when setting para style, reset char attrs if neededMiklos Vajna
The old internal RTF filter used to call SwTxtNode::SetAttr() without setting SetAttrMode::NOFORMATATTR, so character attributes which cover the whole node got converted to paragraph attributes. The new UNO filter goes through SwXText::insertTextPortion(), which sets SetAttrMode::NOFORMATATTR, so this doesn't happen. The result of this is that when the UI sets a new paragraph style on the text node, then such character attributes are no longer removed. Given that in RTF you can't really have character properties on a paragraph, going back to the document model produced by the old internal filter doesn't sound like the good direction -- not to mention that changing SwXText::insertTextPortion() this way would be an implicit API change. Fix the problem by tweaking SwEditShell::SetTxtFmtColl() instead, so that it removes these full-text-node character attributes, too. The logic in SwTxtNode::RstTxtAttr() can be extended later if necessary to delete more attributes, but to be on the safe side, just handle the bare minimum necessary to fix the problem for now. Change-Id: I5faa3226fc0f9c18e005da185fe0830d8c393256
2015-04-24loplugin:simplifyboolStephan Bergmann
Change-Id: Ic90d247e6c8e36e27ff444ace10fd37e06d46b50
2015-03-11fix windows buildNoel Grandin
after my commit 5eea85ec4fa7c458785be749a0e370a0883ff693 "convert SwMoveFlags and SwInsertFlags from enum to enum class" Change-Id: If5af977fdd77b82de447b71e166d81fca5840395
2015-03-11convert SwMoveFlags and SwInsertFlags from enum to enum classNoel Grandin
Change-Id: I067656a47845c5d3fa143ce400b4ef0f8bf9ac5f
2015-03-11convert SetAttrMode to enum classNoel Grandin
Change-Id: If7dd0c49480756afb7d4eaaba597ecc305c35f64
2015-03-01Extract SwTxtNode::dumpAsXml() from nodedumpMiklos Vajna
Change-Id: Ic9711129b5b5db2151889e2db511f0ae5b216bc0
2014-11-20sw: move IsIgnoredCharFmtForNumbering() to SwTxtNodeMiklos Vajna
I need this in SwTxtFormatter. Change-Id: Ib1586299f468a88e92fdb367fbab69a683791dc9
2014-10-01sw: std::auto_ptr -> std::unique_ptrStephan Bergmann
Change-Id: I60ac3706b9be335c31039ed0997cb8215808ddaa
2014-10-01Constify dumpAsXml and friendsJan-Marek Glogowski
All these dump functions should never change the dumped objects so 'const' all of them. Change-Id: Id83422e3950a73e48feb4708fbd4c251506997e0
2014-09-18fdo#82577: Handle FontNoel Grandin
Put the VCL Font class in the vcl namespace. Avoids clash with the X11 Font typedef. Change-Id: I1a84f7cad8b31697b9860a3418f7dff794ff6537
2014-08-06Call SwTxtNode-specific part of DelFrms while SwTxtNode is still SwTxtNodeStephan Bergmann
...when SwCntntNode::DelFrms is called from ~SwTxtNode -> ~SwCntntNode. * SwCntntNode::DelFrms now needs a flag to distinguish calls from inside ~SwCntntNode from other calls. bIsDisposeAccTable happens to already serve that purpose, so I reused it, but that may be a bad idea from a semantic point of view? * ~SwTxtNode is careful to mimic old behavior and only calls DelFrms_TxtNodePart if GetDepends() is true; no idea whether that's really necessary, though. * Shifting the work done by DelFrms_TxtNodePart from within ~SwCntntNode to before ~SwTxtNode calls ~SwCntntNode hopefully has no negative consequences. Change-Id: I1532b4cfef7fbf9ba82e64b919a08cbefa335421
2014-07-22sal_uInt16/MSHORT to SwTwips/sal_Int32Matteo Casalin
Change-Id: Ie069f5203591e90210850bc7e5d3f03609df144c
2014-07-22return bool instead of sal_uInt16 (0 or 1)Matteo Casalin
Change-Id: I3e8d014a2772b55793cd7ea4666aeb022e5b28e4
2014-07-01loplugin:saloverrideStephan Bergmann
Change-Id: I6679d397754f1777441b35910059bda9a917ae2d
2014-07-01Related: #i124638# Second step of DrawingLayer FillAttributes...Armin Le Grand
for Writer objects, now added support for Paragraph and PageStyle (including Header and Footer) for direct attributes and style attributes (cherry picked from commit cc25c58f7052827bfebdc9fbeec668c8fa29ed1b) Conflicts: cui/source/factory/dlgfact.cxx cui/source/factory/dlgfact.hxx cui/source/inc/bbdlg.hxx cui/source/inc/cuires.hrc cui/source/tabpages/bbdlg.cxx cui/source/tabpages/bbdlg.src cui/source/tabpages/page.cxx cui/source/tabpages/tparea.cxx include/svx/pagectrl.hxx include/svx/svxdlg.hxx include/svx/svxids.hrc include/xmloff/PageMasterStyleMap.hxx include/xmloff/prstylei.hxx include/xmloff/txtprmap.hxx svx/Package_inc.mk svx/inc/svx/hdft.hxx svx/source/dialog/hdft.cxx svx/source/dialog/pagectrl.cxx svx/source/tbxctrls/tbxcolorupdate.cxx svx/source/unodraw/unobrushitemhelper.cxx sw/Library_sw.mk sw/inc/fillattributes.hxx sw/inc/format.hxx sw/inc/frmatr.hxx sw/inc/frmfmt.hxx sw/inc/hintids.hxx sw/inc/hints.hxx sw/inc/ndtxt.hxx sw/inc/node.hxx sw/inc/swunohelper.hxx sw/inc/unobrushitemhelper.hxx sw/inc/unoprnms.hxx sw/source/core/attr/format.cxx sw/source/core/attr/hints.cxx sw/source/core/doc/docdesc.cxx sw/source/core/doc/docdraw.cxx sw/source/core/doc/docfmt.cxx sw/source/core/doc/docnew.cxx sw/source/core/doc/docredln.cxx sw/source/core/doc/poolfmt.cxx sw/source/core/doc/visiturl.cxx sw/source/core/docnode/node.cxx sw/source/core/inc/frame.hxx sw/source/core/inc/frmtool.hxx sw/source/core/inc/rolbck.hxx sw/source/core/layout/atrfrm.cxx sw/source/core/layout/fillattributes.cxx sw/source/core/layout/findfrm.cxx sw/source/core/layout/paintfrm.cxx sw/source/core/txtnode/ndtxt.cxx sw/source/core/txtnode/thints.cxx sw/source/core/txtnode/txtedt.cxx sw/source/core/undo/rolbck.cxx sw/source/core/unocore/swunohelper.cxx sw/source/core/unocore/unoframe.cxx sw/source/core/unocore/unomap.cxx sw/source/core/unocore/unoparagraph.cxx sw/source/core/unocore/unoprnms.cxx sw/source/core/unocore/unostyle.cxx sw/source/ui/chrdlg/paradlg.src sw/source/ui/chrdlg/pardlg.cxx sw/source/ui/fmtui/tmpdlg.cxx sw/source/ui/fmtui/tmpdlg.src sw/source/uibase/app/docst.cxx sw/source/uibase/app/docstyle.cxx sw/source/uibase/frmdlg/colex.cxx sw/source/uibase/shells/basesh.cxx sw/source/uibase/shells/textsh1.cxx sw/source/uibase/uiview/viewstat.cxx sw/source/uibase/utlui/uitool.cxx xmloff/inc/PageMasterImportContext.hxx xmloff/inc/xmloff/XMLShapeStyleContext.hxx xmloff/source/draw/XMLShapeStyleContext.cxx xmloff/source/draw/sdpropls.hxx xmloff/source/style/PageMasterExportPropMapper.cxx xmloff/source/style/PageMasterImportContext.cxx xmloff/source/style/PageMasterPropHdlFactory.cxx xmloff/source/style/PageMasterStyleMap.cxx xmloff/source/style/prstylei.cxx xmloff/source/text/txtexppr.cxx xmloff/source/text/txtprhdl.cxx xmloff/source/text/txtprmap.cxx xmloff/source/text/txtstyli.cxx Conflicts: svx/source/dialog/hdft.cxx sw/source/core/doc/visiturl.cxx sw/source/core/txtnode/thints.cxx sw/source/core/txtnode/txtatr2.cxx sw/source/core/unocore/unostyle.cxx Change-Id: I7e8779db6c0cbd1e242b63eab888f468f2de509a
2014-06-09loplugin: inlinesimplememberfunctionsNoel Grandin
Change-Id: I42119f656ca528286fb25d2d36c0af54b7d04a6b
2014-05-07fdo#74790: sw: Compare Document: fix assertions about RSID-only hintsMichael Stahl
For ordinary documents the SwTxtNode::MakeFrm() would set the m_bFormatIgnoreStart/End flags of the RSID-only hints, but the document loaded by Compare Document (and Merge Document) is special because it is loaded, there are editing operations on it, but it has no layout, so the assertions about these flags trigger. (regression from 6db39dbd7378351f6476f6db25eb7110c9cfb291) Change-Id: I8a6e02b68f22e609640adbe93ff194e4081d9856
2014-05-05simplify ternary conditions "xxx ? yyy : false"Noel Grandin
Look for code like: xxx ? yyy : false; Which can be simplified to: xxx && yyy Change-Id: Ia33c0e452aa28af3f0658a5382895aaad0246b4d
2014-04-30sw: sal_Bool->boolNoel Grandin
Change-Id: I324a0ffde2ddcca105451c19e7aadcfad15211d8
2014-03-27Second batch of adding SAL_OVERRIDE to overriding function declarationsStephan Bergmann
...mostly done with a rewriting Clang plugin, with just some manual tweaking necessary to fix poor macro usage. Change-Id: Ie656f9d653fc716f72ac175925272696d509038f
2014-03-26Split TYPEINFO into plain and TYPEINFO_OVERRIDEStephan Bergmann
...where the latter contains SAL_OVERRIDE annotations Change-Id: Id64794b388d83dfe7026440e8b20a5b5efd412d1
2014-03-11Bin noise "SMARTTAG" comments from 2006Tor Lillqvist
Change-Id: I43e948fc7895e4dbd5ea4e3e5aeefd298ee40007
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-16sal_Bool to bool and minor optimizationsMatteo Casalin
Change-Id: Iddee0b723ce8a0ac9020b0b048a31212dc377430
2014-02-03Remove SW_DLLPRIVATE -> SAL_DLLPRIVATE indirectionStephan Bergmann
Change-Id: I5498266e5496f196d420a2897b804da8599917b5
2013-12-19Do not expose TXTNODE_MAX and cleanup related code/commentsMatteo Casalin
Change-Id: Ia114688ebbdf81122b81183456924c6b9cff835d Reviewed-on: https://gerrit.libreoffice.org/7105 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Matteo Casalin <matteo.casalin@yahoo.com> Tested-by: Matteo Casalin <matteo.casalin@yahoo.com>
2013-12-15xub_StrLen/sal_uLong to sal_Int32 + minor optimizationsMatteo Casalin
Change-Id: Ibbca8e2d2a4742247648a611337bd8a75db7ee2f
2013-12-03convert SwTxtNode::GetLang from xub_StrLen->sal_Int32Noel Grandin
Change-Id: I2740622a5e30916d050e01350208a0de268e42ac
2013-11-20fdo#71645 remove footnote numbers in cross-referencesLászló Németh
Change-Id: Ic3780e4389e450d8c7a69d2f0f2a6a7f81b8906e
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-14longparas: change GetExpandTxt to sal_Int32Caolán McNamara
Change-Id: I34b6f91d104e5f095f0aad58869d62d0a367d2b3
2013-11-14xub_StrLen to sal_Int32 in SwIndex and some relatedMatteo Casalin
Change-Id: I66735635a88844c30a7fa1c886d2c1df34008f4f
2013-11-05fixincludeguards.sh: swThomas Arnhold
Change-Id: I8e0889200d1a1c36e53022a74792728efd66c2fc
2013-10-22Bin some pointless commentsTor Lillqvist
Change-Id: Ia7c5b1654f3decc549b363c4443863f40c3f26e6
2013-10-02remove @authorPhilipp Riemer
Change-Id: I64fab3ab8f4ef113a723772054a367e404bad90d Reviewed-on: https://gerrit.libreoffice.org/6080 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-10-02remove/add blank linesPhilipp Riemer
Conflicts: sw/source/core/unocore/unoprnms.cxx Change-Id: Icc044955b7b9f28d9f237e97865198cd2ded89a1 Reviewed-on: https://gerrit.libreoffice.org/6079 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-10-02remove zhaojianwei code markersPhilipp Riemer
Conflicts: sw/source/core/doc/docfmt.cxx Change-Id: Iddda0d57ae547680634d45aaf8c6deb40855b860 Reviewed-on: https://gerrit.libreoffice.org/6078 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-09-30Resolves: #i123389#: revert change made for #i121897#Oliver-Rainer Wittmann
- method <SwTxtAttr::RstAttr(..)> - correct consideration of parameter <bInclRefToxMark> used by Undo to fix 121897 (cherry picked from commit 685921ea31de48e26ad33e8aab9c3053cc622a34) Conflicts: sw/source/core/txtnode/txtedt.cxx sw/source/core/undo/untblk.cxx Change-Id: I8c66d535b5d6d51443876f1789e379bcceabfec7
2013-08-08convert more SwTxtNode methods to OUStringMichael Stahl
Change-Id: If7cc107e521e1a70ba00b0f24057039fcdd2c576
2013-08-08make SwTxtNode::Replace0xFF static functionMichael Stahl
Change-Id: I4da73eab3e767c2ed7699808e00c40d440a40dbe
2013-08-08convert some SwTxtNode methods to OUStringMichael Stahl
Change-Id: Id60ffcc392d0ee71d3ddcb8de21bdaca4d0b54cd