summaryrefslogtreecommitdiff
path: root/sd
AgeCommit message (Collapse)Author
2020-09-15oox smartart: handle <dgm:prSet ... custT="1"/>Miklos Vajna
Which defines that a data node has text properties as direct formatting, so autoscale should not happen. We decide autofit at a shape level, smartart defines custom text props at a data node level. So take the shape, go to its first presentation node, get its data node and see if it has custom text props. If not, continue to scale text down till it fits. smartart-autofit-sync.pptx is extended to contain a 3rd shape: the first two have their autofit scaling synchronized, while the 3rd has a fixed font size of 10pt. (cherry picked from commit 89b385c2336e5b3868d2a040e11134b349b7d010) Change-Id: I6caacdaab9a36072b9ad5021bd217c955b09b790 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102712 Tested-by: Jenkins Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com>
2020-09-15oox smartart: add support for syncing font heights of multiple shapesMiklos Vajna
When 2 or more shapes have their text set to autofit and they have a constraint like: <dgm:constr type="primFontSz" for="des" forName="node" op="equ"/> Then make sure that the automatic font size is the same for all shapes and all content fits, by using the smallest scaling factor from all relevant shapes. Some rework is needed, because normally oox::drawingml::Shapes don't have access to their parents, at the same time there can be multiple SmartArts on a single slide, so storing the grouping info in the filter is problematic, too. Solve this by storing the grouping in the toplevel oox::drawingml::Shape and exposing them in XmlFilterBase just during the time the children of the toplevel shape of the SmartArt are added. This works, because we know SmartArts can't be nested. (cherry picked from commit 1bd3474c7c7945e1182dfbaca89be05ea98dd3e8) Conflicts: include/oox/core/xmlfilterbase.hxx Change-Id: I6c591eadc7166c7c42752650afdb7ee1e416cff6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102711 Tested-by: Jenkins Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com>
2020-09-15crashtesting: failed on export of tdf118002-1.potx to pptxCaolán McNamara
because the bg isn't set a master isn't exported, so the endelement XML_sldMasterIdLst isn't exported and the document is broken so don't exit early if the propertyset isn't found and always call ImplWriteSlideMaster Modify the ppt variant PPTWriter::ImplWriteSlideMaster to do nothing on an empty propertyset allowing PowerPointExport:ImplWriteSlideMaster to output its XML_sldMasterIdLst on the last master Change-Id: I512ee10b3b3c80b6566827d708b737c6c502c3b5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102451 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit b7756fdde63b1eef85ef13772fc3578e345d34dc) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102422 Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-09-08blind fix for tdf129346 test intermittent failureCaolán McNamara
Change-Id: Ib3bc0ce0bdeee01c3c752d935e195f677b6f6d4c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101978 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 3b0f53beed3e0e21b0fc4d8efc38d404637404a0) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101962 Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-09-07tdf#136474 wait until mouse grab is dropped to trigger selection callbackCaolán McNamara
Change-Id: I495b90b9661c32ad3ec71c2a2455d1576fb8f918 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102116 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-09-01tdf#133015 Add test for multicolumn textboxes.Gülşah Köse
Change-Id: I92d6af17313fb5a4a27fc8768b8f3fbe64db1816 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100452 Tested-by: Jenkins Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101751
2020-08-25tdf#134174 Fix the rotation of bitmap filled custom shapes.Gülşah Köse
During import we were rotating only custom shape. Not its bitmap. Custom shape and its bitmap rotated with same rotation value in that commit. Change-Id: I02d19c820670df7b4d1622836156c6bf8ed1c154 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101255 Tested-by: Jenkins Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com> (cherry picked from commit 9fe881410909c5273cef517433411bc4eceee294) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101164 Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-08-12tdf#135442 min supported version of gtk3 is 3.18 not 3.20Caolán McNamara
Change-Id: Iaa2eefbe08fad3a7dd6eff98bf5fb513053a263d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100533 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2020-08-10tdf#134847 fix nullptr use crashJim Raykowski
Grabbing focus back to the document when OLE object last had focus sets focus to the frame containing the OLE object. sd::ViewShell is no good in this case and crashes when undo manager tries to pass ViewShellId to EnterListAction. Other areas in the code set ViewShellId(-1) and then check if ViewShell is good before getting ViewShellId. This patch follows these practices. Change-Id: I89093686c4d98148ac032832711f80479366741d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99759 Tested-by: Jenkins Reviewed-by: Jim Raykowski <raykowj@gmail.com> (cherry picked from commit f52f86a3905fc099832187ad20fd29f0ab73b43f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100226 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2020-08-07tdf#128345 pptx export: add transparence gradient in solid fillRegina Henschel
In case of solid color fill a transparence gradient was not saved. OOXML has no separate element for gradient transparency but has transparency in color gradient stop elements. The patch detects a transparence gradient, combines it with the fill color and exports it as gradFill element. The import was already correct, besides a wrong start or end value in case of a symmetric gradient, which becomes AXIAL in LibreOffice. (cherry picked from commit d187f22b7ff73954e1da39fb954c64bc315298cb) Conflicts: sd/qa/unit/export-tests-ooxml1.cxx Change-Id: I4243656821629f90125d0408a38165a8a29e6e24 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100282 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-08-05oox smartart: add support for <dgm:layoutNode ... chOrder="t">Miklos Vajna
This changes the order of children, which matters when they have no explicit ZOrder. With this, the text shapes on the arrow shape are on top of the arrow, not behind it. The trick is that nominally chOrder can be "t"(op) or "b"(ottom), defaulting to bottom, but there is a difference between an explicit "b" and not setting it. When not setting it, the layout node is expected to inherit it from its parent layout node, recursively. This would probably make sense for other algorithms as well, but set it only for the linear algorithm for now, as that's where we have a bug document showing the PowerPoint behavior. (cherry picked from commit 3c185bf386b4c9609ab32d19bf95b83fe0eeeea3) Change-Id: I433f92c620149ef5590aebc8cbf43110e1d2fb85 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100107 Tested-by: Jenkins Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com>
2020-08-05oox smartart, linear layout: limit height of children to parent sizeMiklos Vajna
Constraints are OK to request more, but it seems PowerPoint doesn't allow leaving the parent, which simplifies the layout as well. (cherry picked from commit b7481a026348c3417fa13a440312521dccee9ec8) Change-Id: Id67a8740f1eff506e4beae0c797ad50e0218dfe6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100105 Tested-by: Jenkins Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com>
2020-08-05oox smartart, linear layout: fix scaling of spacing without rulesMiklos Vajna
With this, finally the arrow shape has the correct horizontal position and width, even if the markup is as complex as the PowerPoint UI generates it (the previous version was a more minimal version). (cherry picked from commit 880673412143a7db7ea1bf4766040662dfc085dc) Change-Id: I59f237c582053067e890180a1ae40471e5f46dea Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100104 Tested-by: Jenkins Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com>
2020-08-05oox smartart, linear layout: correctly scale spacings wrt constraints and rulesMiklos Vajna
When constraints request a width which is larger than 100%, we scale down. Then rules decide which children should be scaled down and which ones stay as-is. This commit adjusts the size of children which have no rule, but their size has a constraint that they're a fraction of a scaled down child. (cherry picked from commit 91f0f7e5e0a55cb1dbd729a1d7de52388b1cfb15) Change-Id: I0a007d82f49f18951215afb1bfe8c0f1328ecd41 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100103 Tested-by: Jenkins Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com>
2020-08-05oox smartart: consider rules when scaling in linear layoutMiklos Vajna
The bugdoc has an arrow shape which is 100% wide, and there are multiple shapes before it, which also have a 100% wide constraint. The reason PowerPoint scales down the shapes (but not the arrow) is because rules declare it should happen this way. So start taking rules into account in linear layouts. (cherry picked from commit 0024c48b4822062995effed7db4f1281196384bb) Change-Id: I352443277e88be0eb711659489587127727a258f Conflicts: sd/qa/unit/import-tests-smartart.cxx Change-Id: I352443277e88be0eb711659489587127727a258f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100102 Tested-by: Jenkins Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com>
2020-08-05tdf#133687 Fix the placeholders priority order.Gülşah Köse
When we don't have type attribute on slide but have on slidelayout we have to use it instead of default type. Change-Id: Ibb874b5ee39c48641484fe1a8686f66c31695f76 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99904 Tested-by: Jenkins Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com> (cherry picked from commit e0018be102edd6e376e0622e0a9384176d2f119c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100052 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2020-07-29throw if length of keys and values are differentXisco Fauli
See https://crashreport.libreoffice.org/stats/signature/%60anonymous%20namespace'::WriteAnimateValues This is expected to start rejecting broken files, instead of accepting invalid data silently, as it did before. This is not a regression, and should be indication of corrupted generator, which is the actual cause of the bug... Change-Id: I66dbb380e8b2d313e58cddf938d952aed4a635b7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99327 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit bcdcdaa5dfc5f1d50e0239055161b71e97f5f022) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99392 Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-07-09Resolves: tdf#134674 object inserting using dialogs SdrModelCaolán McNamara
not the target Documents one Change-Id: I07088bddc7c15109e7d377f86c6d0a7819faa658 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98347 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-07-06tdf#134521 hierarchical search needed, not just toplevel entriesCaolán McNamara
Change-Id: If5c9a69549e683eb4af619b1f27a22833c36e34d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98081 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-06-27cid#1464973 & cid#1464975 Resource leakCaolán McNamara
Change-Id: I4df8fefa7f875e0a25585c4fef22f077dcd0b83d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97300 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-06-27cid#1464975: RESOURCE_LEAK (sd/sdpptwrp)Julien Nabet
Change-Id: Icb8a1add327e7b11b4095c1e3f60cddf2ea0f5c3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97296 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-06-23tdf#134053 tweak dash and space length for ooxmlRegina Henschel
OOXML does not specify how line caps are applied to dashes. MS Office keeps dash and space length for preset dash styles and for round custom dash styles and add them for square line caps on custom dash styles. ODF specifies, that the linecaps are added to the dashes and the spaces are reduced, so that the dash-space pair keeps its length. This patch changes the dash and space length on import and export so, that they look nearly the same in LibreOffice as in MS Office. For custom dash styles with square line cap the first dash is longer as in MS Office. I have no solution for that. But I consider it as minor problem, because MS Office has not even an UI for that case. It should not hinder the improvement for the usual cases. Change-Id: I3e3e4b7c9d71e440ed301d2be423100440cb688b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96769 Tested-by: Jenkins Reviewed-by: Regina Henschel <rb.henschel@t-online.de> (cherry picked from commit 3f3b50015e4fd9efc3459612a70409fca49cf390) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96796 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-06-17tdf#132093: Take aUIScale into account againStephan Bergmann
...which had inadvertently gone missing with bbab991c70e2a1867493d701168f49a0d0dcbd48 "Avoid -fsanitize=implicit-signed-integer-truncation in weld::MetricSpinButton" Change-Id: Idaccb7d1d088f1a3183f19deb3d8ca413d8b1440 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96470 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit ab00a877e00dfd77467fd4eecbe8756bd9806cb5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96429 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-06-16tdf#133268: Update non cmd icons, update Glue point iconsRizal Muttaqin
- Update some menubar visibility Change-Id: I7a464691b8608d01f0a8b3924c37e0fd510df45c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96468 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin <riz_17_oke@yahoo.co.id> (cherry picked from commit 9a75493c69cdd79bfc1cb3d9faf003948e084ae3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96427
2020-06-15PPTX export, custom shape, bitmap fill: fix source vs fill rect confusionMiklos Vajna
Commit 682ab832522b1349f1714bcb16f6e83468ea2920 (drawingML export\import: cropping of shape's fill texture, 2014-02-12) improved the DOCX filter, so the fill rectangle of a custom shape with bitmap fill is handled. The problem is drawingML has a source rectangle (similar to our crop rect) to limit the usage of the bitmap, and also it has a fill rectangle in case some margin is wanted around a stretched bitmap. We don't have a mapping for the later. Fix the problem by limiting the above work for DOCX, this way PPTX's source rectangle won't be turned into a stretch's fill rectangle. This way no unwanted margins will appear around the image -- those margins can be large enough that the image effectively disappears on export. Change-Id: Ic35063545a56eec9eaf885bbd397a854705d134f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96025 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins (cherry picked from commit b00e43fa5848be0cc7ba81b185021511d94cdc00) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96097
2020-06-13tdf#132137 Rename Default Style to Default Drawing Style in Draw and Impress.Srijan Bhatia
Change-Id: I130bd0e070a3449753cc76a8f7e6352c8b7a1bba Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95403 Tested-by: Heiko Tietze <heiko.tietze@documentfoundation.org> Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org> (cherry picked from commit 4949050c43300eee047531d856bd4a25e60980c3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96217 Tested-by: Jenkins
2020-06-12tdf#130227 Tabbed UI remove second extension manager buttonandreas kainz
Change-Id: I07a57afeb1c3a7814fe2f3fd63eb214d96d4af9a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95773 Tested-by: Jenkins Reviewed-by: Andreas Kainz 🦅 <kainz.a@gmail.com> (cherry picked from commit 4fcf45bd1fb014a07fb062fb3ad1bd92427be9d8) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95876 Reviewed-by: Andreas Kainz <kainz.a@gmail.com>
2020-06-09tdf#127122 Sync View and Review group in groupedbar appsandreas kainz
Change-Id: I3b583ef79e651385a044f47b17684a21541467db Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95771 Tested-by: Jenkins Reviewed-by: Andreas Kainz 🦅 <kainz.a@gmail.com> (cherry picked from commit 08c3a7b74037812eda566924d3d8696768461fb8) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95879 Reviewed-by: Andreas Kainz <kainz.a@gmail.com>
2020-06-04Use "Radius" instead of "Rad" for new propertiesTomaž Vajngerl
Change-Id: Ifd232bccf1519e0ed68195cf4344893175a675e0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95331 Tested-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> (cherry picked from commit 7313ed6a5b63e06ddd8ce90c3b5b2f168743a2c9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95322 Tested-by: Jenkins
2020-05-28oox smartart import, composite alg: implement vertical centeringMiklos Vajna
The bugdoc's case was that the total height would be used by 2 shapes, but then a constraint decreases the height of one shape, so not all vertical space is used. We used to just count from the top, need to center vertically, as PowerPoint does it. Change-Id: I436019e9e837b73130e387c9bcd309e20045b0f9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94948 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins (cherry picked from commit acdde3c643fde015214c546b1567727272ea799e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94962
2020-05-28Resolves: tdf#133411 drop CONTENT_FLOWS_TO from dialog to search resultsCaolán McNamara
in the document, looks like only the calc one actually works, and when it works on large quantities of results calc grinds to a complete halt This was introduced with: commit b41332475783c31136673fb44cf4c411bb0148f8 Date: Mon Dec 2 15:54:29 2013 +0000 Integrate branch of IAccessible2 and has been a problem on and off with calc's potentially ~infinite grid There is the on-by-default search results dialog in calc (which has a limit on how many it shows) which provides an alternative route to iterate through the results Change-Id: I2685e480d2d15220be0bddbc83baad3992e7d5d1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95006 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 0b94169d820482434dc98a37c3c1633ca46fd0dc) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95012
2020-05-28Related: tdf#133411 SetDocWin is using the previous search success stateCaolán McNamara
not the new state The order of calls probably didn't matter in the past where the use of the flag was deferred until the Accessibility data was queried which would happen in another event loop. This makes it more clear that it appears that only calc actually does anything productive here. I think this flow-to has created more trouble that its worth and I'll remove it but if we need to restore it, then this, I think, it the working state to restore to. Change-Id: Id6fbb483c081f6d5142100d70c1b29705dcb6452 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95005 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 13769dea65137fc3c537de6257d15cb87b51f8ae) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95011
2020-05-26Fix loplugin:simplifypointertobool for libstdc++ std::shared_ptrStephan Bergmann
...where the get member function is defined on a std::__shared_ptr base class, so loplugin:simplifypointertobool used to miss those until now. (While e.g. using libc++ on macOS found those cases.) 366d08f2f6d4de922f6099c62bb81b49d89e0a68 "new loplugin:simplifypointertobool" was mistaken in breaking isSmartPointerType(const clang::Type* t) out of isSmartPointerType(const Expr* e); c874294ad9fb178df47c66875bfbdec466e39763 "Fix detection of std::unique_ptr/shared_ptr in loplugin:redundantpointerops" had introduced that indivisible two-step algorithm on purpose. The amount of additional hits (on Linux) apparently asked for turning loplugin:simplifypointertobool into a rewriting plugin. Which in turn showed that the naive adivce to just "drop the get()" is not sufficient in places that are not contextually converted to bool, as those places need to be wrapped in a bool(...) functional cast now. If the expression was already wrapped in parentheses, those could be reused as part of the functional cast, but implementing that showed that such cases are not yet found at all by the existing loplugin:simplifypointertobool. Lets leave that TODO for another commit. Besides the changes to compilerplugins/ itself, this change has been generated fully automatically with the rewriting plugin on Linux. Change-Id: I83107d6f634fc9ac232986f49044d7017df83e2a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94888 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Jenkins
2020-05-26oox smartart import: fix aspect ratio of shape with composite algoMiklos Vajna
The layout node has alg=composite, then a parTx and a desTx child layout nodes. No matter what order is used (parent first, child first), the result will be wrong, as the constraints refer to each other. I did not spot any description in ISO 29500-1 that would describe what is the expected behavior. Researching this, found "One other consideration when specifying composite constraints is that the constraints must be specified in the same order as the nested layout nodes." at <http://web.archive.org/web/20111015151600/http://msdn.microsoft.com/en-us/magazine/cc163470.aspx>, which suggests to handle constraints for each shape in a parent -> child order, but keep a shared state when iterating over the children which gives us: - parent node, all direct constraints - for each child node: - child's constraints from parent - child's own constraints This way the desTx top value can depend on the parTx's height, and it's supported to define parTx's height only in the parTx layout node, not in the composite parent. And after all, it matches what PowerPoint does, so the column headings in the bugdoc have a 4:10 height:width aspect ratio. Change-Id: Ideb76c1ddd1ffff8d2a217cddf81106d1bb97eb9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94872 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2020-05-25Do not time out execute_dialog_through_commandStephan Bergmann
If something goes wrong, better keep the testing Python and the tested soffice process in a state in which the actual problem can (hopefully) be debugged better. I happened to run into a hung UITest_options on Linux, where soffice.bin was still at > Thread 1 (Thread 0x7fa6371d9fc0 (LWP 1210042)): > #0 futex_abstimed_wait_cancelable (private=0, abstime=0x7fa633a17f80, clockid=<optimized out>, expected=0, futex_word=0x60e000024e88) at /usr/src/debug/glibc-2.31-17-gab029a2801/sysdeps/nptl/futex-internal.h:320 > #1 __pthread_cond_wait_common (abstime=0x7fa633a17f80, clockid=<optimized out>, mutex=0x60e000024e38, cond=0x60e000024e60) at /usr/src/debug/glibc-2.31-17-gab029a2801/nptl/pthread_cond_wait.c:520 > #2 __pthread_cond_clockwait (abstime=0x7fa633a17f80, clockid=<optimized out>, mutex=0x60e000024e38, cond=0x60e000024e60) at /usr/src/debug/glibc-2.31-17-gab029a2801/nptl/pthread_cond_wait.c:677 > #3 __pthread_cond_clockwait (cond=0x60e000024e60, mutex=0x60e000024e38, clockid=<optimized out>, abstime=0x7fa633a17f80) at /usr/src/debug/glibc-2.31-17-gab029a2801/nptl/pthread_cond_wait.c:665 > #4 0x00007fa66899be08 in std::condition_variable::__wait_until_impl<std::chrono::duration<long, std::ratio<1l, 1000000000l> > >(std::unique_lock<std::mutex>&, std::chrono::time_point<std::chrono::_V2::steady_clock, std::chrono::duration<long, std::ratio<1l, 1000000000l> > > const&) (this=0x60e000024e60, __lock=..., __atime=...) at include/c++/10.0.1/condition_variable:210 > #5 0x00007fa66899b895 in std::condition_variable::wait_until<std::chrono::duration<long, std::ratio<1l, 1000000000l> > >(std::unique_lock<std::mutex>&, std::chrono::time_point<std::chrono::_V2::steady_clock, std::chrono::duration<long, std::ratio<1l, 1000000000l> > > const&) (this=0x60e000024e60, __lock=..., __atime=...) at include/c++/10.0.1/condition_variable:120 > #6 0x00007fa668997505 in std::condition_variable::wait_until<std::chrono::_V2::steady_clock, std::chrono::duration<long, std::ratio<1l, 1000000000l> >, SvpSalInstance::DoYield(bool, bool)::$_2>(std::unique_lock<std::mutex>&, std::chrono::time_point<std::chrono::_V2::steady_clock, std::chrono::duration<long, std::ratio<1l, 1000000000l> > > const&, SvpSalInstance::DoYield(bool, bool)::$_2) (this=0x60e000024e60, __lock=..., __atime=..., __p=...) at include/c++/10.0.1/condition_variable:159 > #7 0x00007fa668995460 in std::condition_variable::wait_for<long, std::ratio<1l, 1000l>, SvpSalInstance::DoYield(bool, bool)::$_2>(std::unique_lock<std::mutex>&, std::chrono::duration<long, std::ratio<1l, 1000l> > const&, SvpSalInstance::DoYield(bool, bool)::$_2) (this=0x60e000024e60, __lock=..., __rtime=..., __p=...) at include/c++/10.0.1/condition_variable:186 > #8 0x00007fa66899408e in SvpSalInstance::DoYield(bool, bool) (this=0x611000001bc0, bWait=true, bHandleAllCurrentEvents=false) at vcl/headless/svpinst.cxx:497 > #9 0x00007fa667e7114d in ImplYield(bool, bool) (i_bWait=true, i_bAllEvents=false) at vcl/source/app/svapp.cxx:455 > #10 0x00007fa667e70708 in Application::Yield() () at vcl/source/app/svapp.cxx:519 > #11 0x00007fa66498f6cd in Dialog::Execute() (this=0x618003c16480) at vcl/source/window/dialog.cxx:1030 > #12 0x00007fa667a93812 in SalInstanceDialog::run() (this=0x616000575780) at vcl/source/app/salvtables.cxx:1482 > #13 0x00007fa2e8711b8d in weld::DialogController::run() (this=0x60c004e70d80) at include/vcl/weld.hxx:2289 > #14 0x00007fa2e98a6cbc in OfaTreeOptionsDialog::run() (this=0x60c004e70d80) at cui/source/options/treeopt.cxx:1937 > #15 0x00007fa2e90c4d15 in CuiAbstractController_Impl::Execute() (this=0x60300187b4f0) at cui/source/factory/dlgfact.cxx:103 > #16 0x00007fa688bc9b2d in SfxApplication::OfaExec_Impl(SfxRequest&) (this=0x604006f2fe10, rReq=...) at sfx2/source/appl/appserv.cxx:1311 > #17 0x00007fa688b17655 in SfxStubSfxApplicationOfaExec_Impl(SfxShell*, SfxRequest&) (pShell=0x604006f2fe10, rReq=...) at workdir/SdiTarget/sfx2/sdi/sfxslots.hxx:1270 > #18 0x00007fa6892521f6 in SfxShell::CallExec(void (*)(SfxShell*, SfxRequest&), SfxRequest&) (this=0x604006f2fe10, pFunc=0x7fa688b17530 <SfxStubSfxApplicationOfaExec_Impl(SfxShell*, SfxRequest&)>, rReq=...) at include/sfx2/shell.hxx:197 > #19 0x00007fa6891dbb1f in SfxDispatcher::Call_Impl(SfxShell&, SfxSlot const&, SfxRequest&, bool) (this=0x6020013430b0, rShell=..., rSlot=..., rReq=..., bRecord=true) at sfx2/source/control/dispatch.cxx:252 > #20 0x00007fa6891defd6 in SfxDispatcher::PostMsgHandler(std::unique_ptr<SfxRequest, std::default_delete<SfxRequest> >) (this=0x6020013430b0, pReq=std::unique_ptr<class SfxRequest> = {...}) at sfx2/source/control/dispatch.cxx:989 [...] but the Python process was already at > Traceback (most recent call first): > <built-in method waitpid of module object at remote 0x60800002d140> > File "instdir/program/python-core-3.7.7/lib/subprocess.py", line 1611, in _try_wait > (pid, sts) = os.waitpid(self.pid, wait_flags) > File "instdir/program/python-core-3.7.7/lib/subprocess.py", line 1653, in _wait > (pid, sts) = self._try_wait(0) > File "instdir/program/python-core-3.7.7/lib/subprocess.py", line 1019, in wait > return self._wait(timeout=timeout) > File "uitest/libreoffice/connection.py", line 133, in tearDown > ret = self.soffice.wait() > File "uitest/libreoffice/connection.py", line 178, in tearDown > self.connection.tearDown() > File "uitest/uitest/framework.py", line 46, in tearDown > self.connection.tearDown() > File "instdir/program/python-core-3.7.7/lib/unittest/case.py", line 631, in run > self.tearDown() > File "instdir/program/python-core-3.7.7/lib/unittest/case.py", line 676, in __call__ > return self.run(*args, **kwds) > File "instdir/program/python-core-3.7.7/lib/unittest/suite.py", line 122, in run > test(result) > File "instdir/program/python-core-3.7.7/lib/unittest/suite.py", line 84, in __call__ > return self.run(*args, **kwds) > File "instdir/program/python-core-3.7.7/lib/unittest/runner.py", line 176, in run > test(result) > File "uitest/test_main.py", line 128, in <module> > result = unittest.TextTestRunner(stream=sys.stdout, verbosity=2).run(test_suite) and the relevant > ====================================================================== > ERROR: test_tdf78133_options_app_colors (tdf78133.tdf78133) > ---------------------------------------------------------------------- > Traceback (most recent call last): > File "sw/qa/uitest/options/tdf78133.py", line 38, in test_tdf78133_options_app_colors > self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") #optionsdialog > File "uitest/uitest/test.py", line 78, in execute_dialog_through_command > raise DialogNotExecutedException(command) > uitest.test.DialogNotExecutedException: Dialog not executed for: .uno:OptionsTreeDialog had not yet been written to workdir/UITest/options/done.log (Python's unittest appears to unhelpfully hold back such vital information until the very end of the full test run). There appears to be no test code that relies on a timed-out execute_dialog_through_command throwing an exception instead of hanging (at least, there is no explicit catching of DialogNotExecutedException anywhere in the code, and a full `make check screenshot` on Linux kept working with this change). (This is similar to 19d3dba72fd744ab8dc1288b1c7c4c811b24ca28 "Do not time out close_dialog_through_button".) Change-Id: Ie907a091ae09b59e65c4b2676298e147c9d2da2f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94786 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-05-25sd: add XPackageEncryption write support for binary pptVasily Melenchuk
This adds save support for API-based MS-CRYPTO algos. If we have custom encryption data in media descriptor and corresponding service is available it will be used during saving. Change-Id: Id82f8b3fa7ea045b00d7d81e2c9ce5e130c8060c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/84442 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Jenkins
2020-05-25sd: add XPackageEncryption support for binary pptVasily Melenchuk
This adds read support for API-based MS-CRYPTO algos. DRM encryption is implemented as a service and description will be called if we found corresponding streams inside binary OLE package. Change-Id: Ib91538d53ee1f53a3cd14a44d47fd6f6136c0472 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/84441 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-05-24remove some unused definesNoel Grandin
Change-Id: Ibfdc84f07642db6ec8362c4d76195b4f39dc103c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94731 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-05-24inline some use-once typedefsNoel Grandin
Change-Id: Idddba2f3fd05265b08dbc88edb6152d34a166052 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94730 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-05-24tdf#101181: drop useless "GlowEffect" boolean propertyMike Kaganski
Just use GlowEffectRad to indicate effect presense: radius of 0 means effect is disabled. Change-Id: Ic06bba34f5a851f120d3d00cb7e20c429ead9ee1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94732 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2020-05-23sd: move SearchSelection constructor to header fileTomaž Vajngerl
Change-Id: I71d7986044208b6c733c1d46db7bf84bc6254915 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94727 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2020-05-22tdf#129686: Revert "tdf#118776: pptx import: draw char noFill as transparent"Xisco Fauli
Revert it for now towards LibreOffice 7.0 and add unittest This reverts commit e01df3488abe6d319c6874ca870afb82a3ad9b1e. Change-Id: Ic6aba5948f9c6e55199def0476918fbd496321bf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94704 Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2020-05-22smartart import: handle multiple <a:schemeClr> in <dgm:fillClrLst>Miklos Vajna
The TODO in the ColorFragmentHandler ctor was right: we only handled the last <a:schemeClr> child, but there can be multiple one. Use them based on the index of a shape in a <dgm:forEach> loop. Move the TODO to the only place which still assumes a single color in the color list. Change-Id: I1c5c4f82e621f1110ef06b0490ff79f82f60f214 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94697 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2020-05-22move InterimItemWindow to vclCaolán McNamara
Change-Id: If0a4a14708810c44d087b51961f2ecb3fda4df23 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94649 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-05-21use for-range on Sequence in i18npool..sdNoel Grandin
Change-Id: I19eba57bc6058c317473d0746f06699a09ba2830 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94608 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-05-21Make Impress Insert Table dialog asyncSzymon Kłos
Change-Id: If8b48cfe983819387c066d3bd81a42dad8947489 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94591 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94612 Tested-by: Jenkins
2020-05-20sd: FuSearch - prefix member varsTomaž Vajngerl
Change-Id: I6048962a5db43b7ff9a9d20398484d7082648840 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94601 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2020-05-19tdf#97630 xmloff: ODF export: fix draw:fit-to-size mess, step 2Michael Stahl
Restrict the export of draw:fit-to-size to only the standard values "true"/"false". Keep the broken export for ODFVER_012_EXT_COMPAT, since it's easy to do. Change-Id: Ieaab3b635a116a1d0b6155115f8f7f74935a125a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93226 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-05-14Use convertTwipToMasterUnit instead of hardcoded numberSamuel Mehrbrodt
Change-Id: Ief34c9f041d491ffdb5efc2d888cf6f77de7b27b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94104 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2020-05-14tdf#79082 Improve ppt tab import/exportSamuel Mehrbrodt
Import/export the paragraph tabs without any text offset, tabs are relative to the text box anyway. Change-Id: Ife3b762e7581548e65500c16259a4481cc07a88f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94101 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
generated by cgit (git 2.34.1) at 2024-06-17 02:49:47 +0000