summaryrefslogtreecommitdiff
path: root/sd
AgeCommit message (Collapse)Author
2019-01-17oox smartart, org chart: improve width of non-manager nodesMiklos Vajna
The default case is that all managers have assistants/employees, so nodes under a manager can only use the horizontal space under the manager to avoid overlapping. But in case the previous / next sibling of the manager have no child nodes (assistant/employee) then we can use that space to make the child nodes larger. This improves readability of the chart's text a lot and brings the layout closer to what PowerPoint does for the same input. Handle all this in the hierChild algorithm, i.e. the container for a list of assistants or a list of employees, which means "parent" in this context always refers to a manager node. Change-Id: Ib4125ea2a113339ab7bbcd78e43c5d204f442996 Reviewed-on: https://gerrit.libreoffice.org/66504 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2019-01-16fix crash in draw Format->Bullets and Numbering dialogNoel Grandin
regression from commit a2b78c131db2bbe3555a89dfae32aefcd00949f5 make Format->Bullets and Numbering dialog async Change-Id: Ia726612a492e644f5e40e78a3b537c5ed539aef8 Reviewed-on: https://gerrit.libreoffice.org/66423 Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> Tested-by: Jenkins
2019-01-16tdf#42949 Fix IWYU warnings in sd/source/ui/[s-u]*/*hxxGabor Kelemen
Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Cleaned subdirs: sidebar, slideshow, slidesorter, table, unoidl Change-Id: Iae3b8b2581b6a07dad24b4d2d59ffae24f882fe3 Reviewed-on: https://gerrit.libreoffice.org/65913 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-01-16tdf#122733 NB AlignMiddle before AlignDownandreas kainz
Change-Id: Ib80bf1f85f92c295521e82a9c5bc7c6b32b063f6 Reviewed-on: https://gerrit.libreoffice.org/66401 Tested-by: Jenkins Reviewed-by: andreas_kainz <kainz.a@gmail.com>
2019-01-15tdf#121033 drawtextobjectbar follow now textobjectbarandreas kainz
textobjectbar are now the same in all sw modules orientation was removed cause it's page orientation instead of text orientation Change-Id: I3d1f32d426d6266f7482b93f55fa847d639d91aa Reviewed-on: https://gerrit.libreoffice.org/66174 Tested-by: Jenkins Reviewed-by: andreas_kainz <kainz.a@gmail.com>
2019-01-14Resolves: tdf#122695 Content Type selector tooltip missingCaolán McNamara
Change-Id: I0ffe6448d865f569fb59d9facbb1582d2152a9ba Reviewed-on: https://gerrit.libreoffice.org/66291 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-01-14oox smartart, org chart: fix height of manager nodes without employeesMiklos Vajna
Employees and/or assistants reduce the height of managers -- this effect is wanted even if there are no employees/assistants. Change-Id: I7bfcbf6819ee225aa2fbf21d4e064322912f8d5f Reviewed-on: https://gerrit.libreoffice.org/66304 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2019-01-14no need to test for the presence of the dialog factoryNoel Grandin
Change-Id: I3994b2fcd552ce616d8a2e6fa144069853966a61 Reviewed-on: https://gerrit.libreoffice.org/66100 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-01-14Simplify sd::Window::RequestHelpMike Kaganski
Change-Id: I0d42c5a3133d97464d105a1ff29772c1b63a3a69 Reviewed-on: https://gerrit.libreoffice.org/66282 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2019-01-13array_view was changed to span in upcoming C++20Stephan Bergmann
...see <http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2018/p0122r7.pdf> "span: bounds-safe views for sequences of objects". o3tl::span is still an incomplete approximation of std::span; removed those o3tl::array_view members that are not present in std::span (and were not used in the code). Relies on C++17 __has_include to use standard <span> where available (e.g., in LLVM 7 libc++). Change-Id: I82a7e246b61b2456fa6183025d25eec4121ad3c9 Reviewed-on: https://gerrit.libreoffice.org/66215 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-01-11Drop o3tl/clamp.hxx, use C++17 std::clamp insteadStephan Bergmann
Change-Id: I5043c787dcc3b78bc7fdff130564801194e39f46 Reviewed-on: https://gerrit.libreoffice.org/66177 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-01-11ofz#11243 timeout with bogus lengthCaolán McNamara
Change-Id: I707f31b704ed6e67183bdbd60ea1c1cc126dac09 Reviewed-on: https://gerrit.libreoffice.org/66161 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-01-11make Insert->Header and Footer dialog asyncNoel Grandin
Change-Id: Icb2c507970c35a8ddee47912915882dede87ebca Reviewed-on: https://gerrit.libreoffice.org/66099 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-01-11make Format->Bullets and Numbering dialog asyncNoel Grandin
Change-Id: Ib69c2be7c8ddaa616c08796ad2b8c8cf20ee2db9 Reviewed-on: https://gerrit.libreoffice.org/66098 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-01-11Resolves: tdf#122448 Change menu Item "Slide->Master Slide"Roman Kuznetsov
Change menu Item "Slide->Master Slide" to "Slide->Change Slide Master" Change dialog name "Slide Design" to "Available Master Slides" Change dialog name "Load Slide Design" to "Load Master Slide" Change-Id: I98fab31cdce2e8ddf43f0c8b8519a95e15c13de5 Reviewed-on: https://gerrit.libreoffice.org/65860 Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com> Tested-by: Heiko Tietze <tietze.heiko@gmail.com>
2019-01-11oox smartart, org chart: handle multiple paragraphs on data nodeMiklos Vajna
This problem was similar to the one fixed in cfa76f538a44d4396574ece59e8a3953c22c6eb7 (oox smartart, accent process: handle multiple runs from a data point, 2018-11-21), but this there we handled multiple runs and this handles multiple paragraphs. It seems some smartart types allow multiple paragraphs in a diagram node, others only allow multiple runs. Org chart is in the former category. Change-Id: I281f01fdfa809d0a232d5da7fdaa23de7adcd627 Reviewed-on: https://gerrit.libreoffice.org/66066 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2019-01-10tdf#122454 Impress: Correct d'n'd animation selection in WindowsBrian Fraser
Change-Id: I0f17ff657beb2a5b3dfed91856ec45ddfca793a9 Reviewed-on: https://gerrit.libreoffice.org/65939 Tested-by: Jenkins Reviewed-by: Jim Raykowski <raykowj@gmail.com>
2019-01-10oox smartart, org chart: fix vertical order of assistant nodesMiklos Vajna
It seems the manager -> assistant -> employees ordering is not part of the file format. The order is stored twice in the file: the hierRoot algorithm has 3 layout nodes as a children, and also the data model has an order of the presentation nodes: both describe that employees go before assistant nodes. In contrast to that, PowerPoint orders XML_asst nodes before XML_node ones, so teach the hierRoot algorithm about this. This requires tracking the data model node type for each in-diagram drawingML shape, so that layout can determine if a hierRoot algorithm children has an assistant node or not. Change-Id: Ib81f3666fb092ed3b036d830f69ba7e1b94f8331 Reviewed-on: https://gerrit.libreoffice.org/66048 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2019-01-09use unique_ptr in sdNoel Grandin
Change-Id: Ie212034c286146067c3ce49e62b2c47478ad7282 Reviewed-on: https://gerrit.libreoffice.org/65967 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-01-08convert "*xxx.get()" to "*xxx"Noel Grandin
Change-Id: Ic307226591ff9702957ccdec486ccf70357eb6d9 Reviewed-on: https://gerrit.libreoffice.org/65951 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-01-08use unique_ptr in sd::BluetoothServer::ImplNoel Grandin
Change-Id: I54bd8fbac488182d2017e90b7afced2659f01728 Reviewed-on: https://gerrit.libreoffice.org/65955 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-01-07related tdf#100074: prepare group shapes text input via writerfilterThorsten Behrens
Put various preps into place, that enable us to read txbxContent from group shape children via the writerfilter parser, which gets us much more features Also: - store shapecontexthandler on wrapper class in writerfilter - move adding children shapes to ctor, not dtor - remove RuntimeException in Writer's XShapes::add(), aligns this with Draw/Impress API semantics, and helps here when trying to add the same shape a 2nd time (which we then simply ignore) - make oox's Shape notion of 'inside group' less ad-hoc - make SwTextBoxHelper::getTextRectangle() cope with more than CustomShape - so passing in a group shape will also yield some sensible bounding box - have SwTextBoxHelper handle group content, too - derive WpsContext from ShapeContext, so we can later substitute it for that inside WpgContext - keep WpgContext::onCreateContext() _for the moment_ with the old delegation to ShapeContext (needs to use WpsContext to enable writerfilter text input) Change-Id: I2b0f0583e21137f3321a8dc13823058b14d19773 Reviewed-on: https://gerrit.libreoffice.org/65914 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-01-07oox smartart, org chart: fix font color when defined with quick stylesMiklos Vajna
createStyleMatrixContext() assumed that <dgm:style> contains <dgm:fontRef>, but it contains <a:fontRef> instead. This resulted in a 0 mnThemedIdx, which meant that since commit 89206c472ecf18bfde6824cea8004921cd404365 (bnc#862510: PPTX import: Wrong text color inside shape, 2014-12-21) we ignored the theme color in oox::drawingml::Shape::createAndInsert(). Change-Id: I81045fa58df5cb9e31a4ed3f1b1625224bcd06ad Reviewed-on: https://gerrit.libreoffice.org/65938 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2019-01-07tdf#122312: Expand ComboboxXisco Fauli
Change-Id: I008c3e93d40ee4b6ad7a75ba8ad730e74cafede7 Reviewed-on: https://gerrit.libreoffice.org/65622 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-01-07tdf#42949 Fix IWYU warnings in include/vcl/[v-x]*Gabor Kelemen
Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: I98f49765c6b74808dcbd692e0f375dd2848fcfd4 Reviewed-on: https://gerrit.libreoffice.org/65614 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-01-02oox smartart, org chart: handle multiple elements in hierChildMiklos Vajna
In case one manager has multiple employees, then we laid out only the first one. Recognize non-assistant type as the node type (as a start) to get the correct number of employees (when there are no assistants), and also render employees on a horizontal (and not on a vertical) path. With this, the 1 manager and multiple employees case looks reasonable. Change-Id: I3bbe0413586b1a2c25f9094dbd44f1a86c799c0f Reviewed-on: https://gerrit.libreoffice.org/65813 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2019-01-02sd: fix missing includeMiklos Vajna
Change-Id: I1f4ad3827e5c093222734f2f13f0239f7887aeed
2019-01-02tdf#42949 Fix IWYU warnings in sd/source/ui/[a-r]*/*hxxGabor Kelemen
Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: I0d9cee1cd17e168522f6161c515a325e5edf1496 Reviewed-on: https://gerrit.libreoffice.org/65234 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-01-01Fix typo in QAAndrea Gelmini
Change-Id: Ia52b5bd629b80a37d3205889cb2c720d00a3d484 Reviewed-on: https://gerrit.libreoffice.org/65778 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2018-12-29tdf#115691 Keep focus in effects list after previewJim Raykowski
Fixes gtk2 and gtk3 builds not keeping focus in effects list when sidebar is undocked. Change-Id: Iab2038bbf1ef2c1e6e1707f59776672d1b07404f Reviewed-on: https://gerrit.libreoffice.org/65618 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-12-22tdf#122271 NB Impress use the wrong SpellDialog commandandreas kainz
Change-Id: Ib279e2677b4f58e77c7e03f6cfc21bfa7cbf077c Reviewed-on: https://gerrit.libreoffice.org/65570 Reviewed-by: andreas_kainz <kainz.a@gmail.com> Tested-by: andreas_kainz <kainz.a@gmail.com>
2018-12-21oox smartart, org chart: add initial hierChild/Root algorithmsMiklos Vajna
hierChild is supposed to align and position its child layout nodes in a linear path under the hierRoot layout node, so initially just use a simple vertical layout algorithm. Change-Id: Ie0090a724f8fbd2068fa2e08d8bc342290dcc2f0 Reviewed-on: https://gerrit.libreoffice.org/65554 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2018-12-21pass UserData by unique_ptr in MasterPagesSelectorNoel Grandin
Change-Id: I4dbd6b37f969ea3afb441b449d416eedd6bd5cec Reviewed-on: https://gerrit.libreoffice.org/65530 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-12-21no need to store B2DPolyPolygon on the heap hereNoel Grandin
it's a COW type internally, so only one pointer big Change-Id: I478f5aa6f84c87bedf6f450526e7f8f7c297e7c4 Reviewed-on: https://gerrit.libreoffice.org/65529 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-12-20sd: support for saving into .potx fileVasily Melenchuk
MS PowerPoint template format now supported not only for import, but for export too. Change-Id: Ib61798b5fe966b895ed850f4b4ad7d7d06740adc Reviewed-on: https://gerrit.libreoffice.org/65475 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-12-20tdf#42949 Fix IWYU warnings in include/vcl/[t-u]*Gabor Kelemen
Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: Ib32ea54a3fa690a0722fa75ddb4121ec78c0b64f Reviewed-on: https://gerrit.libreoffice.org/65386 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2018-12-19Simplify containers iterations in sd/*Arkadiy Illarionov
Use range-based loop or replace with STL functions Change-Id: I29ccc94be73ec3ab22c4915f4a18ad0247038cc4 Reviewed-on: https://gerrit.libreoffice.org/65204 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-12-18Related: tdf#103884 remove dangling menubar commandCaolán McNamara
since... commit 08a43cc97ccf88faa9d3a04afc3aacd2c885a2d1 Date: Sat Oct 28 02:28:18 2017 +0200 related: tdf#103884 remove gltf/collada feature Change-Id: I7671746f2b33f8d4eae207448267d0284a3f9804 Reviewed-on: https://gerrit.libreoffice.org/65336 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-12-18NB grouped_compact add impress special view context- elementsandreas kainz
Change-Id: I8c466b04748da44af97b6e21fc8cced7f40304af Reviewed-on: https://gerrit.libreoffice.org/65314 Tested-by: Jenkins Reviewed-by: andreas_kainz <kainz.a@gmail.com>
2018-12-18tdf#121592 add context-Form toolbar to NBandreas kainz
tabbed and groupedbar_compact add context-form support Change-Id: I4a59d4b71bbbc253ee4188c4c15a7353e623e2f1 Reviewed-on: https://gerrit.libreoffice.org/65295 Tested-by: Jenkins Reviewed-by: andreas_kainz <kainz.a@gmail.com>
2018-12-17tdf#121581 update Tools tabb in NBandreas kainz
Change-Id: I788e97ce1f6422ba95a478fb1618773c850764f5 Reviewed-on: https://gerrit.libreoffice.org/65262 Tested-by: Jenkins Reviewed-by: andreas_kainz <kainz.a@gmail.com>
2018-12-17tdf#122154 add DataSort action to data groupandreas kainz
and update some alignments Change-Id: I8d21e2764805e6b86fce776b7587d7bc0f76ae33 Reviewed-on: https://gerrit.libreoffice.org/65259 Tested-by: Jenkins Reviewed-by: andreas_kainz <kainz.a@gmail.com>
2018-12-17Resolve deprecated implicit capture of *this by reference in C++20Stephan Bergmann
...as flagged with -Werror=deprecated by trunk GCC in -std=c++2a mode. But C++17 forbids "this" in combination with a capture-default of "=", so in such cases list any entities explicitly that shall be captured by value. Change-Id: Ic228cd20682277a0f93e3e75798356d0fbbb80d4 Reviewed-on: https://gerrit.libreoffice.org/65241 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-12-17nb groupedbar_compact impress sync table context menuandreas kainz
Change-Id: I31908adeab72a16a5b82fbc3bc8ac3cce9ea4a4f Reviewed-on: https://gerrit.libreoffice.org/65218 Tested-by: Jenkins Reviewed-by: andreas_kainz <kainz.a@gmail.com>
2018-12-16crashtesting: assert on import of ooo121169-1.pptCaolán McNamara
Change-Id: I3b57bdd9a29ef41900bbb244daa27bf6d8c673c7 Error: comparison doesn't meet irreflexive requirements, assert(!(a < a)). Reviewed-on: https://gerrit.libreoffice.org/65228 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-12-16nb groupedbar_compact fix table layout to sync with othersandreas kainz
Change-Id: Iac5a3144f9790457c2ccbe0fb916b66421443a6c Reviewed-on: https://gerrit.libreoffice.org/65216 Tested-by: Jenkins Reviewed-by: andreas_kainz <kainz.a@gmail.com>
2018-12-14oox smartart, accent process: fix missing bullets and large para indentMiklos Vajna
Bulleted paragraphs had a large left indent because we assumed the bullet levels are inherited from the normal master page styles. But that's not true, as <https://support.office.com/en-us/article/add-bullets-to-a-shape-in-a-smartart-graphic-47edc03d-a2f8-4b54-acfd-ca103c515ab4> points out: "It is not possible to change the bullet style for text in a SmartArt graphic." This explains why the margin and bullet char info is missing from the file format, and hints that just hardcoding these to the importer is correct. The result is less linebreaks in the shape text and the lost bullets are also fixed. Change-Id: I60bbee75f3e834551ebb1963a2f42101f3bd91d4 Reviewed-on: https://gerrit.libreoffice.org/65168 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2018-12-14coverity#1441522 FontWorkGalleryDialog mpSdrView member is never nullCaolán McNamara
Change-Id: If17d2984831b0881d39101648206accdadde12aa Reviewed-on: https://gerrit.libreoffice.org/65163 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-12-14update groupedbar_compact drawandreas kainz
Change-Id: Id00bcd45faa3d9e82d3ed23843f5c4320bfa8f79 Reviewed-on: https://gerrit.libreoffice.org/65135 Tested-by: Jenkins Reviewed-by: andreas_kainz <kainz.a@gmail.com>
2018-12-14update groupedbar_compact for impressandreas kainz
Change-Id: I2d6c6d975a3047c879a87a1cee0305772c6b5d49 Reviewed-on: https://gerrit.libreoffice.org/65134 Tested-by: Jenkins Reviewed-by: andreas_kainz <kainz.a@gmail.com>