summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2018-12-07sw_redlinehide_4a: MoveDeletedPrevFrames() should only movefeature/sw_redlinehide_4a_for_libreoffice-6-2Michael Stahl1-4/+10
... frames from a layout with hidden redlines. Change-Id: I8f5d5bbbc5bfd49a8a52579a1c34157b9c5c4515 (cherry picked from commit c1d7cc390c6e095d6e58b856758ba86f7666195f)
2018-12-07sw_redlinehide_4a: fix infinite loop in SwAttrIter::Seek()Michael Stahl1-1/+2
It's actually possible for Seek to be invoked with a position that is neither 0 nor >= the current position: lcl_CalcOptRepaint(), called from SwTextFormatter::FormatLine(), will move backwards via some funny heuristic and call GetCharRect(), which then seeks. Change-Id: If061a768b9a0155d9a95b190c44e7048312f4ba3 (cherry picked from commit c985eba6e9d6f9d3fece903a6b72eca611894b16)
2018-12-07sw_redlinehide_4a: fix asserts caused by invalid index in SwUpdateAttrMichael Stahl2-6/+2
There is no reason for SwpHints::TryInsertHint() to add 1 to the end index of an empty hint, which results in an invalid index when the end of the hint is at the end of the node. The only user of the indexes in SwUpdateAttr is SwTextFrame::SwClientNotify() and it already extends a 0 range to 1. Change-Id: I7355bac931cd8dd390f96d04546d73273f364cda (cherry picked from commit 109a573a644ab7aa760cde30538b1122155adc9f)
2018-12-07sw_redlinehide_4a: stop toggling ShowDelete in SwAutoFormatMichael Stahl1-2/+13
Change-Id: Ib6495d4248faa679d5a55642ac51baf419708287 (cherry picked from commit e7283ebe7a2ba9b608a04d1efbe5504f182369a7)
2018-12-07sw_redlinehide_4a: TextFrameIndex goes liveMichael Stahl1-5/+1
Change-Id: Ie59c09bdc57505e16022c43791d5e65cc233d5b9 (cherry picked from commit aa4f245efa24e25bfd78114ab8651220d0723757)
2018-12-07sw_redlinehide_4a: SwEditShell::AutoCorrect() etc.Michael Stahl1-5/+9
The hope is that the AutoCorrect never deletes nodes, hence never deletes SwTextFrames, hence we can pass in the SwTextFrame::GetText() result and it will be updated via the SwTextFrame::SwClientNotify() on editing operations. Change-Id: Ib644d0373963119b9f7fe6767b028fd89724feb3 (cherry picked from commit 7481e8b5500e86626be5f8eae1e7f48b7f51e21a)
2018-12-07sw_redlinehide_4a: SwAutoFormat::AutoCorrect()Michael Stahl1-54/+63
Change-Id: I0ab7665f8635d6716fce996408db1e2bedf54d0c (cherry picked from commit c03da6a4a429327244bbe27e32e2f6e82b18163d)
2018-12-07sw_redlinehide_4a: SwAutoCorrDoc iterates frames, not nodesMichael Stahl3-41/+148
Adapt this in a similar way, with a DeleteSel() that skips over delete redlines. The Replace functions fortunately only have callers that replace 1 character currently, but there is another ReplaceRange() call that needs a litte more complicated handling. Change-Id: Idd5c80e96c0f355d3dc965b2f70376258d23e1a3 (cherry picked from commit 9926ea7dd07f1f3d012ddf97941a42bb7fa5717d)
2018-12-07sw_redlinehide_4a: SwAutoFormat iterates frames, not nodesMichael Stahl4-343/+399
In order to not require moving the delete redlines out of the document body, rely on the DeleteSel() implementation skipping over the redlines, and also pass the shell's layout to the various SwDoc functions that are called. Previously, the redlines were not deleted by DeleteSel() due to SwAutoFormat setting RedlineFlags::Ignore. Change-Id: Ib05ecb534993368d81f66e70124617968b4c8e9a (cherry picked from commit eb92dc08f2abf5ed088da0d736266f213adf00de)
2018-12-07sw_redlinehide_4a: SwAutoFormat: manually skip redlines when deletingMichael Stahl1-6/+70
Change-Id: I001e61305ee8416f851f834d3068bd91de8281f8 (cherry picked from commit b9a5d49761351eee327e9bc8518d9388d409058d)
2018-12-07sw: fix wrong title of AutoFormat with redlining dialogMichael Stahl1-1/+1
(regression from 9fcef57a34dbd88a98621dfaf8668fa076dd98f1) Change-Id: Id6ea5841dd25a30519deb825c3ae0aaa7469c250 (cherry picked from commit 564260804ee3a8846b921188e36bc269fc8ba98e)
2018-12-07sw: rename misleading DeleteCurrentParagraph()Michael Stahl1-34/+40
Rename also DelPrevPara() and DeleteCurNxtPara(). Also document the state transitions. Change-Id: I0b874852a4c1aab8d5d3a55b9dfef360e313089c (cherry picked from commit c1f1cad3e63afcf6b9bbf6e42f28efa74ec49189)
2018-12-07sw_redlinehide_4a: some page break calls in SwFEShell/PageBreakWinMichael Stahl3-3/+6
... should use layout. Change-Id: Iabb29bb49558ef1c805ede3300042b815f62136a (cherry picked from commit 1af5ca57dc89fffd460a3168a937036b589c3cd7)
2018-12-07sw_redlinehide_4a: fix SwDoubleLinePortion/SwMultiCreator/SwBracketMichael Stahl2-1/+8
Missing TextFrameIndex conversion. Change-Id: Ie7b58b74aa6bb1e2ff8199031a9f59f5c3ba68c0 (cherry picked from commit fd04c73a3897c1a0c450a09b911a14c2128c16b3)
2018-12-07sw_redlinehide_4a: finish conversions guess.cxx,itrcrsr.cxx,porfld.cxxMichael Stahl6-16/+17
... and tests. Change-Id: I847a9441b73cdfc9bd826fad2c9075a9aa1d7d2d (cherry picked from commit 23b008ee75e22cbd3c2b08b7a7968dec22257791)
2018-12-07sw_redlinehide_4a: SwEditShell::GetLineCount()Michael Stahl1-1/+9
Change-Id: Ib9a13eab25b02b919d472ae864213b110e7794c7 (cherry picked from commit a4165e1b08c82b667b209ee38b4d2a2c534c1def)
2018-12-07sw_redlinehide_4a: convert SwTextNode::GetMinMaxSize()Michael Stahl1-11/+11
Change-Id: I1ac09d3dfd95f2a98142c4bfe51aad04926e2d38 (cherry picked from commit 6b54554d93bb0683ae63836a85975f0b17bd1324)
2018-12-07sw_redlinehide_4a: convert SwEditShell::GetScalingOfSelectedText()Michael Stahl4-70/+46
Move SwTextNode::GetScalingOfSelectedText() to SwTextFrame & simplify. Change-Id: I9e9f0059665fb128de6be12a15ca2b4a95ebc5ff (cherry picked from commit 782506335e2b5a1c6d4c0222520165900a91aeb8)
2018-12-07sw_redlinehide_4a: fix the number handling in SwEditShell::GetScriptType()Michael Stahl1-7/+12
This is really to complicated & should be simplified, but while it seems reasonable to assume that a frame always exists (or that nodes without frames should be skipped), there needs to be a way to update a SwScriptInfo if it turns out to be invalid... Change-Id: I185733c2e1e93b0c4d2453eeb3ea48cd4b9b6779 (cherry picked from commit 025ebb415e7dd2d91e6be7b3a913ef78dca7c9a6)
2018-12-07sw_redlinehide_4a: SwEditShell::IsMoveLeftMargin(), MoveLeftMargin()Michael Stahl3-4/+9
Change-Id: I2bc29816af93ae265c0f0d11977b2d694e00ad6c (cherry picked from commit b070202b420129b5edd368420e0e50ec45261d01)
2018-12-07sw_redlinehide_4a: adapt SwEditShell::GetPaMParAttr()Michael Stahl1-1/+7
Change-Id: I97a2081a142fd1f74a5d6be534f094fdc4db45ab (cherry picked from commit a382ecb5689ee425e77f830fd81b8696dc90a68b)
2018-12-07sw_redlinehide_4a: adapt SwEditShell::FillByEx()Michael Stahl1-0/+5
Change-Id: I8a85d1fe580ce8c8a52d0ee00d36e499b5e903dc (cherry picked from commit 695a7f10fa9dd55359fbc99b7fdced1c1a7fe025)
2018-12-07sw_redlinehide_4a: more adapting of SwDoc::SetCounted()/SetNumRule()Michael Stahl3-12/+20
Apply to/reset only the paragraph properties node. Change-Id: I4dd3973a758f4afcc30f905b7351e9687d050e33 (cherry picked from commit c2932c1005968b9d0f1500c6a018704e2ccd4658)
2018-12-07sw_redlinehide_4a: adapt SwEditShell::ResetAttr()Michael Stahl4-8/+20
Change-Id: I5131f5a3ff261a4d86e65b4afff3eb8cdd98cebf (cherry picked from commit 68093f957d936f938213290c790443ed83435361)
2018-12-07sw_redlinehide_4a: adapt SwEditShell::SetTextFormatColl()Michael Stahl4-4/+20
Skip hidden nodes, apply to properties-node. Change-Id: I9c511e87c431bd39dc6efdcddf2cad9bbf18c592 (cherry picked from commit 6bbec38ae2f795b2ca839224a5997f2a883256f8)
2018-12-07sw_redlinehide_4a: adapt SwEditShell::ReplaceDropText()/GetDropText()Michael Stahl1-4/+17
Change-Id: Iaf6101f02bd5dbeb9a07e796932186b5e2b1a563 (cherry picked from commit 3b3a81ce2324a11530142c15c62ce64ac2bfaef5)
2018-12-07sw_redlinehide_4a: InsertItemSet()/InsertPoolItem()Michael Stahl5-34/+162
It's really quite annoying to have RES_BREAK applied to all nodes; so apply the node-items only to the first-/properties-node and skip hidden nodes. Keep applying text/character items as before, except skip over hidden nodes. Change-Id: I085afd59af78caf1ca8dac4080c53bdbdb4e56a1 (cherry picked from commit c253dde883b2cc7fd1fd0a460fd969bcb941d32c)
2018-12-07sw_redlinehide_4a: ignore hidden nodes in SwEditShell::GetPaMAttr()Michael Stahl1-1/+7
MergeValues would set everything to invalid. Change-Id: I45795fe9bd113399e276ac42851cbf5a198c9694 (cherry picked from commit 2ad1767c58a46266401c07d4dd4625f1fc816ac2)
2018-12-07sw_redlinehide_4a: add layout to SwTextNode::GetParaAttr()Michael Stahl6-7/+71
Merge items from first-node and props-node, as they are used in the text formatting. Change-Id: I4cbab55bc3b0f8bc6dc5bd3577da53b3160018a3 (cherry picked from commit eb3481d9d0d67c88e04a9da86e0cee6a7585c386)
2018-12-07sw: rename to SwTextNode::GetParaAttr(), at least that's uniqueMichael Stahl15-31/+32
Change-Id: I1de6b544a4868f0d30077ba2c6d195bffd2e8b00 (cherry picked from commit 2b61043032e2e408e3a721bb91dd13577aa673dc)
2018-12-07sw: simplify SwTextNode::GetAttr()Michael Stahl1-20/+15
Change-Id: I78d32031ebc42d749dbc750b7127983810bbfb1d (cherry picked from commit cb53a34d663626a2ae26ab85d5735bc1371c8aab)
2018-12-07sw: SwTextNode::GetAttr() inconsistencyMichael Stahl5-4/+17
If there are hints, the aFormatSet.Differentiate(rSet) will cause the pre-existing items in the parameter rSet to win, whereas without hints the SwContentNode::GetAttr() calls rSet.Set() which clears everything. It looks like WW8Export::WriteFootnoteBegin() was sort of relying on this; presumably it wants the pCFormat to win over node's items but hints on the position to win over pCFormat. Well that's what it currently gets anyway, so try to preserve that. The other use in SwUnoCursorHelper::SetPropertyValues() looks like an oversight. Change-Id: I80e18e040413fcf26f6f77844ed731de31a464d2 (cherry picked from commit a91992e7b3e7f59e9116aef859696d517a93dab7)
2018-12-07sw_redlinehide_4a: the SwTextNode item set contains XATTR_FILL tooMichael Stahl1-0/+5
... so handle them as well in SwTextFrame::SwClientNotify(). Change-Id: Ifa8bf8f44bcd08a64dc36939bad58efefbd7af55 (cherry picked from commit 52e8b41f1ceec33cd774d3e6b61e208b61a65eb3)
2018-12-07adapt to the change from sal_Int32 to TextFrameIndexhimajin1000002-2/+2
see commit 2136dc24 and commit e721f958 Change-Id: I07ace74f93adc2568003314b5f05c41611d6f77c Reviewed-on: https://gerrit.libreoffice.org/64671 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit a10dd637dc842e0b0221b8ec10965c8f130b4059)
2018-12-06Resolves: tdf#114144 let double click advance to next if 'next' existsCaolán McNamara1-0/+3
Change-Id: Id05ad8b72e0ec4f9bad2a9cfb780a44a27618d37 Reviewed-on: https://gerrit.libreoffice.org/64701 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-12-06OpenCL FVSCHEDULE() error checkingLuboš Luňák1-0/+3
Change-Id: If93a9ea6e0265ba616b4a1fbe138d310ea3e8693 Reviewed-on: https://gerrit.libreoffice.org/64546 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> (cherry picked from commit 3156228b1d737ca47ff4e959a6e357581af3ec2e) Reviewed-on: https://gerrit.libreoffice.org/64613
2018-12-06OpenCL NORMDIST() error checkingLuboš Luňák1-0/+2
Change-Id: I15636a64ad869bf874fc6e2ada87842050da1a9a Reviewed-on: https://gerrit.libreoffice.org/64544 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> (cherry picked from commit 866eb1c49d385f497aa1585284393343910098ab) Reviewed-on: https://gerrit.libreoffice.org/64611
2018-12-06better/sane error checking in OpenCL BESSELJ()Luboš Luňák2-12/+7
Change-Id: I1f1945e7fd2721a320ab11196385e22a70d3da70 Reviewed-on: https://gerrit.libreoffice.org/64542 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> (cherry picked from commit 9881ac6874d0001795e5c8892e2d5ac80eeacdc8) Reviewed-on: https://gerrit.libreoffice.org/64610
2018-12-06fix OpenCL ROUND() when the second parameter is negativeLuboš Luňák1-0/+5
Change-Id: Ibbf374f72e83609a602504d9ffde922896338c2c Reviewed-on: https://gerrit.libreoffice.org/64543 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> (cherry picked from commit 79ed7bbacae43468b690a3d3a6b1acf31e641cee) Reviewed-on: https://gerrit.libreoffice.org/64609
2018-12-06tdf#121935 crash on "set up connect to text files"Caolán McNamara4-18/+33
Change-Id: I73bc93ebb5010f3a376b3b121e1ac873f1be137a Reviewed-on: https://gerrit.libreoffice.org/64677 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-12-06Adapt solenv/flatpak-manifest.in to recent download.lst changesStephan Bergmann1-12/+12
(cherry picked from commit d1a1c9fa49dd24ba9eaee4b865e9ad110e77b13e, adapting the pdfium block, which has only been upgraded to 3550 on libreoffice-6-2) Change-Id: Idffd274a18df14a96e61bf61ba09f837fdbbf9c7 Reviewed-on: https://gerrit.libreoffice.org/64670 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-12-06Fix reading 16 bit millisecond valueStephan Bergmann1-2/+3
It had originally been read as 16 bit via >> in d2000efb31f864e912c6cf52760eea0e602b6893 "#i106421#: move msfilter to filter", then accidentally changed to be read as 32 bit via >> in 9830fd36dbdb72c79703b0c61efc027fba793c5a "date/time IDL datatypes incompatible change" (and later changed to be read as 32 bit explicitly via ReadUInt32 with 15535e32ddcfee451d4dbc9be9de0b8c9f9d78d4 "convert SvStream::operator>> methods to ReadXXX methods"). Change-Id: I5062e67a578d182a0df2726ab8d0bae465f154f3 Reviewed-on: https://gerrit.libreoffice.org/64604 Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> Tested-by: Jenkins (cherry picked from commit f84f5b0a0cdb82f444de572f9d8554a96056f874) Reviewed-on: https://gerrit.libreoffice.org/64635 Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-12-06Revert "tdf#106174 ww8import: bidi - prev adjust? prev bidi?"Justin Luth4-54/+0
This reverts commit 85818da3307a28b2d9c6fa5c1c97ca7833dfe24c which caused bug 121110. Only reverting from 6.2 because I hope to fix this for the current master 6.3, but I won't backport the fix because it isn't trivial. Change-Id: Ie91b707fbb05fbc5c6806aef7d1760ab69abb277 Reviewed-on: https://gerrit.libreoffice.org/64660 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org>
2018-12-06tdf#121830 TogglePause should reset to original state on deactivate_st ?Caolán McNamara2-0/+20
is that how it should work, or should there be an additional TogglePause created at import time to get the apparent intended pause effect Change-Id: I0573bd8d9534271f2b36d7ab3b8cdc20e0f985a1 Reviewed-on: https://gerrit.libreoffice.org/64548 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 1aa10fcb668f67f4313b7170a4090027e52164c5) Reviewed-on: https://gerrit.libreoffice.org/64620
2018-12-05Resolves: tdf#121887 RowModel::mnRow is 1-based, alwaysEike Rathke1-1/+1
Basically this was always wrong. Original code didn't treat the r attribute as optional and resulted in an invalid -1 row for such cases, hence the RowModel wasn't applied later. Then commit af8e6f4f544ecd01d3eda5f38bbd4779d5e8b2c6 CommitDate: Wed May 29 22:05:02 2013 +0200 r is an optional attribute in c and r, fdo#65059 introduced a 0-based SheetDataContext::mnRow but assigned that to a 1-based RowModel::mnRow as well if r attribute was missing, and did not update SheetDataContext::mnRow if r attribute was given. commit ff56553e34dfed01b9226ce7a516dbeb6da32124 CommitDate: Thu Mar 13 18:39:22 2014 -0400 fdo#76032: This row index is 1-based whereas our own mnRow is 0-based. then correctly assigned the decremented r attribute to SheetDataContext::mnRow but did not touch the assignment to RowModel::mnRow if r was not given. Probably confused by the ++mnRow already there which is correct but not sufficient for the assignment. Which we now finally fix herewith.. Change-Id: Iae1563ed01b95e7852ddad4fd59374c07186b493 Reviewed-on: https://gerrit.libreoffice.org/64580 Tested-by: Jenkins Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 76fbe494785faee1313d1c0be8ed2ca7b0d74f68) Reviewed-on: https://gerrit.libreoffice.org/64638
2018-12-05tdf#121719: Revert fix for tdf#96971Xisco Fauli24-27/+27
it's still used on Mac. Revert it until XOL is removed This reverts 258301879bcd20397c38bbd522dea2c923bd9fc2 This also includes https://gerrit.libreoffice.org/#/c/64596/ Thanks Stephan Change-Id: I06548a590f370618ad640724a1b9c59a3faceec2 Reviewed-on: https://gerrit.libreoffice.org/64582 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit be504e8c7ef06637f055c43ad350381377df1e90) Reviewed-on: https://gerrit.libreoffice.org/64631 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2018-12-05tdf#120527 svx GraphicObjectShape: handle XBitmap for GraphicURLMiklos Vajna4-1/+59
This restores compatibility for API users who called getByName() on the bitmap table and expected that the result can be set as a value for the GraphicURL property. The case is similar to the Writer images, which was handled in commit 587803ba46055d43b5b108be744fdde17aeabc7c (sw TextGraphicObject: handle XBitmap for GraphicURL, 2018-08-08) already. Change-Id: I3740a68989b306425d0d6c4d4e350ac163cb4170 Reviewed-on: https://gerrit.libreoffice.org/64069 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit e30f3e76a9350e2b027d99bba5a46aa0a0ff8256) Reviewed-on: https://gerrit.libreoffice.org/64427
2018-12-05tdf#118373 xmlsecurity: avoid stderr output on libxmlsec version checkMiklos Vajna1-0/+6
Make sure that our normal SAL_WARN() reporting is registered during the xmlSecCheckVersionExt() invocation, just like it's registered during other libxmlsec API calls. (cherry picked from commit 099ab643f60efc5be6f151bff89651efd2da1fc9) Change-Id: Ia19368b55dbae47974f48954f86b50e36d1462ff Reviewed-on: https://gerrit.libreoffice.org/64605 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-12-05fixes for OpenCL COVAR()Luboš Luňák1-1/+6
Change-Id: Ie171eea334de65b993554146c11adb95e0dbb85e Reviewed-on: https://gerrit.libreoffice.org/64245 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> (cherry picked from commit 9a446225f4d395b584887eb42851e40cf2ab1fc7) Reviewed-on: https://gerrit.libreoffice.org/64535
2018-12-05make OpenCL SLOPE() handle problems more gracefullyLuboš Luňák1-20/+4
It's silly to just return NaN just because the function can't handle something. If nothing else, at least a proper error should be reported (or in this case, the fallback to the core function will take care of it). Change-Id: I9c971082f4c5c9836318cf63d15fa7c278274273 Reviewed-on: https://gerrit.libreoffice.org/64244 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> (cherry picked from commit c0c03aadb3ec25ca5c4c07f270164158b6667cc2) Reviewed-on: https://gerrit.libreoffice.org/64534
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-20 04:18:03 +0000