summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)Author
2018-11-15sw_redlinehide_3: transport layout from ExpandField() to Expand()Michael Stahl
While at it, rename that to ExpandImpl() so it's unique. Change-Id: I217deb72b4dfdca777e28e18ff56e49863e66640
2018-11-15sw_redlinehide_3: add layout parameter to SwField::ExpandField()Michael Stahl
If the bCached=true, it shouldn't matter what the layout is, because the field won't be expanded properly anyway. Except for the SwInputField which disables caching, but that one often has a different code path anyway. For most fields it doesn't matter anyway, e.g. database fields. Change-Id: I628195f43c5d26feba94af0a832386791c072ba1
2018-11-15sw_redlinehide_3: adapt SwFormatFootnote::GetFootnoteText()Michael Stahl
Change-Id: I206d7345525a4de0f9ece6bac575f82ff1f96df8
2018-11-15sw_redlinehide_3: SwGetRefField::GetExpandedTextOfReferencedTextNodeMichael Stahl
Change-Id: I98530004f2d75b10fc4cd3241b06d513ed57675b
2018-11-15sw_redlinehide_3: pass layout into SwTextNode::GetExpandText()Michael Stahl
Thanks to [loplugin:nullptr] and [loplugin:implicitboolconversion] for finding one of the call sites; 3 current C++ compilers would otherwise have implicitly converted the parameters into nonsense without warning. Change-Id: I3cf6697b37616570fd56fd32da27752983a66f4a
2018-11-15sw_redlinehide_3: pass current layout through ModelToViewHelperMichael Stahl
The expansion of footnotes (and soon text fields) depends on the layout's mode. In SwXFlatParagraphIterator, just use whatever is SwDoc's "current" layout, should be good enough... Change-Id: Ica3b9eae56b14910c435c0f9c3f8ab6dbcda105f
2018-11-15sw_redlinehide_3: SwNodeText::GetExpandText overload is...Michael Stahl
... apparently only used by ToX code; rename uniquely & add layout parameter. Change-Id: I0f94787fecd913912f122a654f183ac59b16e30a
2018-11-15sw_redlinehide_3: add second result to SwGetRefFieldMichael Stahl
... and init it in SwGetRefField::UpdateField(). Change-Id: I69af00678e84214d4a122d8b2d940fcdda5f4ccf
2018-11-15sw_redlinehide_3: add second result to SwChapterFieldMichael Stahl
Now it can store both the result for Show as well as for Hide mode. Change-Id: I15a14b76a96ef77683cd63039b1a8f5e1e94e4c9
2018-11-15sw_redlinehide_3: adapt SwChapterField::ChangeExpansion()Michael Stahl
Add layout parameter to find the correct outline node. Change-Id: I15477dff18c3e5e34b291a92878d938d04497436
2018-11-15sw: prefix members of SwChapterFieldMichael Stahl
Change-Id: I180806bfe40150398fb45f57c7d93e429464f2cb
2018-11-15sw: parameter of SwChapterField::ChangeExpansion() is requiredMichael Stahl
Change-Id: I2d992719c86ec7d0203173c6f9008cf4845b3855
2018-11-15sw_redlinehide_3: fix comment of SwUndoRedlineDeleteMichael Stahl
GetUndoComment() just returns "$1" and then SwUndoRedlineDelete::GetRewriter() just replaces all of that; seems to work... Change-Id: Iaaa563b8dc6848506a5f8e186248f4f6fb9c80e9
2018-11-15sw_redlinehide_3: adapt SwEditShell::GetScriptType()Michael Stahl
Change-Id: Iffb09b9145b72a1ac8710e41a0a7d7ad3abe5c33
2018-11-15sw_redlinehide_3: adapt PDFExport lcl_HasPreviousParaSameNumRuleMichael Stahl
Reuse some formerly static functions in docnum.cxx Change-Id: I8d6bcca28a4f8a6e197a1c302acdf22ce6de01ff
2018-11-15sw_redlinehide_3: adapt more SwCursorShell InFrontOfLabel funcsMichael Stahl
SwCursorShell::LeftRight() and SetCursor(). Change-Id: I71cd382f06a4050c4676864ac50fb268cd099226
2018-11-15sw_redlinehide_3: adapt SwCursorShell::LRMargin/IsAtLRMarginMichael Stahl
Change-Id: I4576a464b37e786178a3cb31a0be922f1b55db88
2018-11-15sw: remove pointless indirection to SwTextNode::GetNumRule_Michael Stahl
Change-Id: I4b5d34d3efd4f49f8b1690ed4c2b063c782b9d20
2018-11-15sw_redlinehide_3: adapt SwCursorShell::UpdateMarkedListLevel()Michael Stahl
Change-Id: I2cd143baafae09324ad0a439cfad3f916ddb13b3
2018-11-15sw_redlinehide_3: hide deleted numbered nodes in field dialogMichael Stahl
This reuses the IDocumentOutlineNodes code for IDocumentListItems; the only client of it is the field dialog cross reference page. Adapt SwCursorShell::GetContentAtPos() too. Change-Id: I9a9ed464b176dd26bf39969ba94041f995ba8c7e
2018-11-15sw_redlinehide_3: fix footnotes not being removed when deletedMichael Stahl
If there already is a merged SwTextFrame and a footnote is being deleted in a non-first node hence UpdateFramesForAddDeleteRedline() is called, the SwFootnoteFrame isn't removed unless by some accident. Just let CheckParaRedlineMerge iterate all top-level nodes. Change-Id: I65ac90636a283d5178b4c0323bcc0ae28b3f1196
2018-11-15sw_redlinehide_3: move assert in SwContentNode::DelFrames()Michael Stahl
This is happening in MoveParagraph; the UpdateMergedParaForDelete will reset the pParaPropsNode pointer so move assert below that. Change-Id: I31069578a9bfdb05f01ea778bbe9e9ae43c865c6
2018-11-15sw_redlinehide_3: update frames in MoveParagraph()Michael Stahl
... if redlining is disabled and MoveNodeRange is called. Change-Id: I8c4e35b1b783446ab9bd888599bcce44222857e8
2018-11-15sw_redlinehide_3: SetHideRedlines() must iterate doc when Show->HideMichael Stahl
Something must call AddToListRLHidden() on all the nodes. Change-Id: Ibe23f499372b7fd07a2894ee3f90684d53d67aef
2018-11-15sw_redlinehide_3: fix SwDoc::MoveParagraph copying of redlined textMichael Stahl
If redlining is enabled, the selection is copied and so delete redlines become insert redline; better to delete the delete redlines so the insert redline consists only of the visible text. Change-Id: I5f7da96dd957262ccc2b83d0abe6add258b7067f
2018-11-15sw_redlinehide_3: adapt SwDoc::MoveParagraph()Michael Stahl
Very tricky... Change-Id: Ic4157d14c2a3ee7c90f103561a376ac6f753a694
2018-11-15sw_redlinehide_3: update frames in SwDoc::MoveParagraph()Michael Stahl
... for hidden mode. Change-Id: I61f240ee7e4e3b61d53b07170be195c15fd679ae
2018-11-15sw_redlinehide_3: fix bad redlines in SwDoc::MoveParagraph()Michael Stahl
Avoid creating a redline that ends on an EndNode (if the moved node is the last in the body), and also ensure that the redline has valid SwIndex nContent in its positions (because lcl_CheckPosition asserts that). Change-Id: I9b89d8cbc180453c24d9690ac937adb4512f0aeb
2018-11-15sw_redlinehide_3: SwTextNode::AddToList ignore Undo-array nodesMichael Stahl
The node is moved between undo-array and doc-array and each time AddToList is called; it doesn't make sense to add a node that is currently in undo-array to a list, and it leaks the mpNodeNum because IsInList will return false because the SwNodeNum lacks a parent, and it triggers some recently added asserts, so just don't do that. Change-Id: I75e51386806ce3845b7c61206020a59c092577fe
2018-11-15sw_redlinehide_3: adapt setters in SwEditShell tooMichael Stahl
SwEditShell::SetNumRule(), DelNumRules(), NumUpDown() The selection could start in a different node than the props-node but the operation with hidden redlines should apply to the props-node. Change-Id: I307f6497c8fabdf8e12e352c6b9f2c4bf9101720
2018-11-15sw_redlinehide_3: adapt SwEditShell::GetPaMAttr/GetPaMTextFormatCollMichael Stahl
These are Num-relevant. Change-Id: Ic07dc2574590713357aec484051f52bfe792eabb
2018-11-15sw_redlinehide_3: adapt SwWrtShell::NumOrBulletOn/OffMichael Stahl
Change-Id: I5cd89bc0595f96125d58a05e01d9e33b965621fe
2018-11-15sw_redlinehide_3: adapt SwFEShell::GetNumRuleNodeAtPos()/IsNumLabel()Michael Stahl
Change-Id: Ifd65b7b294cd7bc2a93c9e574712dce200bdfcf3
2018-11-15sw: remove this nonsense, see SwPam::Delete()Michael Stahl
Change-Id: Ic8425801e51219627fd37e0b63161590a61b2857
2018-11-15sw_redlinehide_3: adapt even more SwEditShell NumMichael Stahl
IsNoNum(), GetNumLevel(), IsNumRuleStart(), GetNodeNumStart() Change-Id: I38e592835f3e6e3e7faa901e5b6533b2222fb35a
2018-11-15sw_redlinehide_3: adapt more SwEditShell NumMichael Stahl
ReplaceNumRule(), SetNumRuleStart(), SetNodeNumStart() Change-Id: I7e58d477b02e0e242ce3c12eca0071856533debf
2018-11-15sw_redlinehide_3: adapt SwEditShell::SearchNumRule()Michael Stahl
Change-Id: Ic7d07a1e4920d5776a8fec3893cd2cd2aff2c6fc
2018-11-15sw_redlinehide_3: adapt SwDoc::GotoNextNum()/GotoPrevNum()Michael Stahl
... and callers in SwCursorShell / SwEditShell. Change-Id: Iffe4ca7893b97df8bd07f25c9e0e1dc908011e3f
2018-11-15sw_redlinehide_3: SwEditShell::HasNumber, HasBullet etc.Michael Stahl
Change-Id: I6db8421a52f7a9bece5ebb95b377dd3bb0a39af4
2018-11-15sw_redlinehide_3: SwEditShell::IsFirstNumRuleAtPos()Michael Stahl
IsFirstOfNumRule() needs a layout so it can check the correct SwNodeNum. Change-Id: Ic6bd9adc909d7c325f5e450fd9e53a15f68e7a63
2018-11-15sw_redlinehide_3: adapt SwEditShell callers of SwDoc::GetNumRuleAtPosMichael Stahl
Change-Id: I192a9743300a77bc463319789064abd89d046b0a
2018-11-15sw_redlinehide_3: adapt SwTextNode::IsNumbered() & callersMichael Stahl
Answer depends on layout. Change-Id: Ibc7bddfa1b04630ddcfcfa429fbb507347073ce2
2018-11-15sw_redlinehide_3: call UpdateAllFootnote() in UnHideRedlines()Michael Stahl
... if the numbering is per-chapter, because only with a hidden layout can the footnotes be numbered properly per-hidden-chapter. Change-Id: I32732b7b8eec0adcbf4349aac3c87492802e38b6
2018-11-15sw_redlinehide_3: adapt SwFootnoteIdxs::UpdateFootnote()Michael Stahl
... and UpdateAllFootnote() in the FTNNUM_CHAPTER case; the former is particularly nasty since the hidden-chapter may effectively start before and/or end after the "normal" chapter. Change-Id: Ifd73dec28011c47c8b23319cb7d3bf16c84f0cfd
2018-11-15sw_redlinehide_3: filter outline nodes in SwListShell::Execute()Michael Stahl
Change-Id: I31677211d0aa5637e0cce0034e29b9db724c791b
2018-11-15sw_redlinehide_3: adapt some SwEditShell functionsMichael Stahl
SwEditShell::IsOutlineCopyable(), IsOutlineMovable(), IsProtectedOutlinePara(), GetCurrentParaOutlineLevel() all filter. Change-Id: Ie5fb181e21d4bf606482bec9cb108dbd70f4209e
2018-11-15sw_redlinehide_3: adapt SwCursorShell::GetOutlinePos()Michael Stahl
Filter merged outline nodes. Change-Id: I959dd4bfd2e6b279b8476ffed6b3e6e70651ed49
2018-11-15sw_redlinehide_3: adapt SwCursorShell::GetContentAtPos()Michael Stahl
Have SwNode::FindOutlineNodeOfLevel() check if the outline node is merged away in the layout. Change-Id: I2da0bf8afe993f1bb60f488a015a33b5e15af217
2018-11-15sw_redlinehide_3: adapt SwEditShell::OutlineUpDown()Michael Stahl
Change-Id: I1d1f4604c580fe4dd764cfb908cd18657ea54255
2018-11-15sw_redlinehide_3: adapt GotoOutline for SwCursrShellMichael Stahl
Adapt SwDoc::GotoOutline(), SwCursorShell::GotoNextOutline(), SwCursorShell::GotoPrevOutline() to skip over outline nodes that are merged away in the layout. Change-Id: Id6f6bb93177753ed21a438c89dc6d90098e11455
generated by cgit (git 2.34.1) at 2025-01-15 00:31:54 +0000