| Age | Commit message (Collapse) | Author | Files | Lines |
|---|
|
to another when importing Powerpoint ppt file
regression from
commit 4245454d0c3d6df2d0e0a75aed6f22f0a26ce3e2
Date: Wed Feb 28 15:50:29 2018 +0200
loplugin:useuniqueptr in SdrPowerPointImport
Change-Id: I5f415dfa1f6125629b9f3be1d799cb596c64c605
Reviewed-on: https://gerrit.libreoffice.org/73607
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
(cherry picked from commit 3309893de4e99a7d89fb1e9b4616631b1f040df0)
Reviewed-on: https://gerrit.libreoffice.org/76309
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
|
|
Change-Id: I78db5b1989dee9ab10d670f26d08237335ffcc29
|
|
Reviewed-on: https://gerrit.libreoffice.org/68668
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
(cherry picked from commit 34ec46571701d639d9bc542b2d19f87a21a83648)
Change-Id: I3b86b6b82318b0d201c3d7db516664520eb47bed
Reviewed-on: https://gerrit.libreoffice.org/68733
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
|
|
This is a combination of 7 commits.
This is the 1st commit:
oox smartart, picture strip: handle bitmap fill of pres nodes
There were two problems here:
1) We did not import bitmap fill from presentation nodes.
2) Presentation nodes contained properties with reference semantics, so
if you set a bitmap fill for a first and a second shape, then at the end
both shapes contained the second bitmap.
With this, both bitmaps are imported exactly once.
(cherry picked from commit 333e9ea15bb57cf1c87ac2ea150de1e3fd79cfcb)
This is the commit #2:
oox smartart, picture strip: fetch # of children only once in snake algo
No functional changes intended.
(cherry picked from commit 90372d52fdcc378473b89f4e6f2de0e206c110ef)
This is the commit #3:
oox smartart, picture strip: expose aspect ratio of children for snake algo
The aspect ratio request of the Shape is not yet used in
AlgAtom::layoutShape(), though.
The heavy-lifting is needed, because the number of cols/rows in the
snake algorithm depends on the aspect ratio request from the child
algorithm, so need to transfer the aspect ratio from child algorithm ->
layout node -> shape -> parent algorithm.
Still no functional changes intended.
(cherry picked from commit a1e10b7968fbf4dba962349be8a6dfb0cb1d3176)
This is the commit #4:
oox smartart, picture strip: fix too many columns with aspect ratio request
The bugdoc has 3 items in the picture strip and PowerPoint laid this out
as a single column with 3 rows (as a snake algorithm). We used to put
the first two items to the first row and the third item to the second
row.
Improve out layout by taking into account what aspect ratio the child
algorithms request: this way it's obvious that we should use a single
column in case we have a large enough aspect ratio and few enough items.
(PowerPoint also uses multiple columns without the aspect ratio
request.)
(cherry picked from commit 159e33ec661b2ce038b2642b2f30600ce7901d1b)
This is the commit #5:
oox smartart, picture strip: fix lack of spacing around the picture list
The snake algorithm in PowerPoint seem to interpret spacing as follows:
if you have N elements, then there should be the requested amount of
spacing between the elements, and also double amount of spacing around
the actual list of elements.
With this, the SmartArt and the title shape in the bugdoc no longer
overlaps.
(cherry picked from commit 0a29c928afa74123bca05dc089c751603d368467)
This is the commit #6:
oox smartart, picture strip: fix lack of margin in text shapes
Shape text has two kind of spacing inside the shape's bounding box: the
shape-level margin and the paragraph-level one. Only the second was
handled in the tx algorithm so far, add support for the first.
The margins taken from constraints were way large by default: the only
explanation I found for that is that SmartArt layout sometimes
calculates in MMs, sometimes in Points, and the ratio between the two is
exactly the Impress / PowerPoint margin. So assume that indeed that unit
difference is the reason for the smaller in-PowerPoint margin values and
do the same on our side.
(cherry picked from commit 279c7f83a57c4d3991930ee80e9d9c287c21270a)
This is the commit #7:
oox smartart, picture strip: fix too wide child shapes
Once the constraints determine the size, the aspect ratio may shrink one
dimension to achieve the requested ratio. Implement the case where a >1
ratio shrinks the width, so the container of the image-text shape pair
has correct aspect ratio.
(cherry picked from commit f4fbb127897ea6afe27055d3b6cfcb0441080902)
Change-Id: I7bac764c031e80bac532c4f97ebd5b5096401096
Reviewed-on: https://gerrit.libreoffice.org/68687
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.timar@collabora.com>
|
|
This is a combination of 6 commits.
This is the 1st commit:
oox smartart, cycle matrix: fix counting presentation children
The markup is:
<dgm:if name="Name6" axis="ch ch" ptType="node node" st="1 1" cnt="1 0" func="cnt" op="gte" val="1">
Where PowerPoint evaluated the condition to true, but Impress evaluated
to false. This means that the undocumented relation between the child
lists is "OR" (not "AND").
Also, our code assumed that "node" has to be a data node (not
presentation node), but it seems the only way this condition can be true
if presentation children is also counted. (The presentation node in
question is not a presentation of anything.)
(cherry picked from commit e3c6f249c10f7f1bcc528e643f5723288c514b29)
This is the commit #2:
oox smartart, cycle matrix: handle left/bottom constraint in composite algo
The bugdoc has 3 shapes in the "outer" circle which have a position
where either x or y is not 0. But these are defined using constraints
talking about the right or bottom edge of the shape.
Map that to top/left, given that we already know the shape size.
(cherry picked from commit b9b4e9223b6c0d6e0b48b694c9aabbe54a250660)
This is the commit #3:
oox smartart, cycle matrix: fix too large height in composite algo
The user-level problem was that the height of the entire smartart was
too large. The reason for this was that:
- composite algorithm gets the constraint height should be 77% of width,
this means 6096000 -> 4693920 EMUs
- at the same time the parent container is already smaller, 4064000 EMUs
- a few lines later we already limit the max height with std::min(), but
in the meantime an incorrect y position is calculated, exactly due to
the lack of early limited height
Solve the problem by making sure composite algorithm never works with a
height (even when using it to calculate vertical center) that exceeds
the height of the parent.
(cherry picked from commit 5b2e38e0cfc7006d6982f741cf158a8a98dc8630)
This is the commit #4:
oox smartart, cycle matrix: handle aspect ratio in composite algo
This way the 4 quadrant shapes in the center of the SmartArt form a
circle, as width is shrinking.
It's not height growing, as OOXML spec clearly says "ar" always just
shrinks one axis.
(>1 and <1 "ar" is to be handled when they are seen in action in an
actual document.)
(cherry picked from commit 34383064ac061497b0c46c449313877c6b6a2087)
This is the commit #5:
oox smartart, cycle matrix: handle destination order in connections
It is possible to have connections from multiple data nodes to the same
presentation node with a presOf type. We use to order these based on as
they appear in the data XML, but we need to order them according to the
destOrd attribute.
Introduce an std::map for that, so get ordering automatically as we
iterate. Turn the std::pair into a struct to make the code a bit more
readable.
(cherry picked from commit ecb733da58b74714eb66d2063a2835ce5c471870)
Conflicts:
oox/source/drawingml/diagram/diagramlayoutatoms.cxx
This is the commit #6:
oox smartart, cycle matrix: fix fill and line props of shape
The topmost shape may not have 0 depth, but something larger.
In that case at least it's safe to still use fill & line properties. The
B1 quadrant of the test file now has the proper orange background, and
B2's border is also properly orange.
(cherry picked from commit 8193e697d286595aa62859011761adeb002244e3)
Conflicts:
oox/source/drawingml/diagram/diagramlayoutatoms.cxx
Change-Id: Iccc5f6993693a0f1cf8f50d163003c24d3ad690e
Reviewed-on: https://gerrit.libreoffice.org/68149
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.timar@collabora.com>
|
|
This is a combination of 3 commits.
(cherry picked from commit 48ef20f2039d1a300a4324072e9b712c9994b406)
(cherry picked from commit 00e89430a2f8cd1f9ec702a7583a1e4c886a2b46)
(cherry picked from commit 1f0206d940cd8f7fb627a59cfe4165c0bfebaf46)
Change-Id: Ic6fa6f335623e2114fc8bea76dc54833284d2a02
Reviewed-on: https://gerrit.libreoffice.org/68154
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.timar@collabora.com>
|
|
This is a combination of 10 commits.
This is the 1st commit:
oox smartart, org chart: add initial hierChild/Root algorithms
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.
(cherry picked from commit 3103f9f9461f6eabb61a70be73862ef4be98010e)
This is the commit #2:
oox smartart, org chart: handle multiple elements in hierChild
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.
(cherry picked from commit dcd378bf614c99d705312259a0a0a25b40d88e2b)
This is the commit #3:
oox smartart, org chart: fix font color when defined with quick styles
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().
(cherry picked from commit 5dfd5755c709e91d2903bd7be4582f7832e89780)
This is the commit #4:
oox smartart, org chart: fix vertical order of assistant nodes
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.
(cherry picked from commit 22086e70c4f3bb41620ff81ecaf57fd2af6ccbce)
This is the commit #5:
oox smartart, org chart: handle multiple paragraphs on data node
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.
(cherry picked from commit dfc97dd381ef516ca4a7e99b29f9da1033a380f4)
This is the commit #6:
oox smartart, org chart: fix height of manager nodes without employees
Employees and/or assistants reduce the height of managers -- this effect
is wanted even if there are no employees/assistants.
(cherry picked from commit 8638cc1b737195df16a160b148d2cd2c68131174)
This is the commit #7:
oox smartart, org chart: improve width of non-manager nodes
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.
(cherry picked from commit 3a655975e5ea43417885513d0752da3627dd25ed)
This is the commit #8:
oox smartart, org chart: implement support for hierBranch conditions
The relevant part of the layout is the <dgm:layoutNode
name="hierChild2"> element that has a <dgm:choose> with two branches:
<dgm:if name="Name34" func="var" arg="hierBranch" op="equ" val="std">
<dgm:if name="Name36" func="var" arg="hierBranch" op="equ" val="init">
The connectors were missing as we took the first branch
(ConditionAtom::getDecision() returned true if the arg was hierBranch),
even hierBranch on the parent layout node was set to "init".
With this, the correct number of connectors are created, previously all
employee connectors were missing. Their size / position is still
incorrect, though.
(cherry picked from commit ae34f471030869dfc0da1784597cae6f9131f8c5)
This is the commit #9:
oox smartart, org chart: fix shape type of connectors
PowerPoint renders these as bent connectors, not as arrow shapes.
Also add a bit of vertical spacing between the nodes, otherwise the
connectors have no way to be visible. Their position is still incorrect,
though.
(cherry picked from commit 1791e08e9f27453ac5563ef400c715e30c791133)
This is the commit #10:
oox smartart, org chart: fix position and size of connector shapes
Finally the bugdoc rendering result is reasonable and even looks like a
tree as it should.
(cherry picked from commit 2bfb9117b287a371066a157267614b9bdb367d71)
Change-Id: I4e7a729afd3d2c5af2e7f41903737bd56be406fa
Reviewed-on: https://gerrit.libreoffice.org/66718
Tested-by: Jenkins
Reviewed-by: Aron Budea <aron.budea@collabora.com>
|
|
This is a combination of 9 commits.
This is the 1st commit:
oox smartart, accent process: add support for reading values from constraints
(cherry picked from commit b389aafee9cfba9dc4dfa552347be39ff9fe41b2)
This is the commit #2:
oox smartart, accent process: add support for zorder offsets
(cherry picked from commit cd348a6244a092c251a8e1362cd78de562d7bef6)
This is the commit #3:
oox smartart, accent process: fix overlapping shape pairs
(cherry picked from commit 67e062aa5e5946d4985921fe2b6f87766f363ddc)
This is the commit #4:
oox smartart, accent process: handle multiple runs from a data point
(cherry picked from commit cfa76f538a44d4396574ece59e8a3953c22c6eb7)
This is the commit #5:
oox smartart, accent process: handle followSib axis of forEach
(cherry picked from commit aedc5427e4b6645ff3257e523c33190cf5e1934d)
This is the commit #6:
oox smartart, accent process: handle connector shape between pairs
(cherry picked from commit 7f66a340933339974b5c6d70af4ae3c17e4f001a)
This is the commit #7:
oox smartart, accent process: adjust size of connector from constraints
(cherry picked from commit ddc2786831367577967e806d603f337a2e42806a)
This is the commit #8:
oox smartart, continuous block process: read space width from constraint
(cherry picked from commit ee6787fc5597b7f730c4ee3a1f2a1b261d0a5644)
Conflicts:
oox/source/drawingml/diagram/diagramlayoutatoms.cxx
This is the commit #9:
oox smartart, accent process: fix missing bullets and large para indent
(cherry picked from commit 6277a767f33bb5327408dafff2fed199087e938d)
Change-Id: I60bbee75f3e834551ebb1963a2f42101f3bd91d4
Reviewed-on: https://gerrit.libreoffice.org/65352
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
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/65338
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
|
|
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.
(cherry picked from commit e30f3e76a9350e2b027d99bba5a46aa0a0ff8256)
Conflicts:
sd/qa/unit/misc-tests.cxx
Change-Id: I3740a68989b306425d0d6c4d4e350ac163cb4170
Reviewed-on: https://gerrit.libreoffice.org/64643
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
was: Re-factor internal filter logic, and impl. preload properly.
Reviewed-on: https://gerrit.libreoffice.org/63761
Tested-by: Jenkins
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
(cherry picked from commit 7b34fb18a4d60bfc4e32b7c382ac596cbc2e776f)
Reviewed-on: https://gerrit.libreoffice.org/63850
Conflicts:
sd/inc/sdfilter.hxx
sd/source/ui/app/sddll.cxx
Change-Id: I4c55ceb19d5db2c1e4756901d0d8b14878641a99
Reviewed-on: https://gerrit.libreoffice.org/64616
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
|
|
Change-Id: I5b776f89b7a49307e7a3ed4382f28ac58fc738ff
Reviewed-on: https://gerrit.libreoffice.org/64054
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 2bb070f95a05d52cba6fa36450d6317ab883d881)
Reviewed-on: https://gerrit.libreoffice.org/64074
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
|
|
Change-Id: I3e6af9c2a555599e4aa288b8d6e99b43b09d35a6
Reviewed-on: https://gerrit.libreoffice.org/63570
Tested-by: Jenkins
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
(cherry picked from commit 60e6593f042e3e2869ece89cc43390b3254b3205)
Reviewed-on: https://gerrit.libreoffice.org/63698
|
|
This is a combination of 7 commits.
This is the 1st commit:
oox: ignore SmartArt "fallback" with empty shape list
This way at least something shows up in the import result. Far from
perfect, though.
(cherry picked from commit a7e86beb00e9635ea4556ef4f8f8e24ff9965391)
Conflicts:
sd/qa/unit/import-tests-smartart.cxx
This is the commit #2:
oox smartart: fix width of shapes with agl=lin, linDir=fromT
Smaller width only makes sense in the fromL/fromR cases, I think.
(cherry picked from commit b61d2784271bf8b042642c378f50e8b446682548)
This is the commit #3:
oox smartart: work towards accessing parent constraints
The "Vertical Box List" preset in PowerPoint contains two linear
layouts, the inner one nested in the outer one. All the constraints are
stated on the parent layout. This commit doesn't actually read those
constraints yet, but adds infrastructure to look up parents of layout
nodes and also to get the constraints of a layout node.
No functional changes intended.
(cherry picked from commit 923061d17d4b5b8bf0d4a8111b270c99a7c649a9)
This is the commit #4:
oox smartart, linear layout: take width from constraints
Finally the "parent text" of the test document now has correct width.
(cherry picked from commit b083b0808121d19f398a9f6ead195ae7e14ed047)
This is the commit #5:
oox smartart, linear layout: take horizontal position from constraints
Both horizontal size and position looks sane now.
(cherry picked from commit 397b64afc62a5632a6648598558a4d2c3ca0d283)
This is the commit #6:
oox smartart, vertical bracket list: fix node counter condition
The visible effect of this was that the 2nd level text nodes were
missing from the layout result.
The cause is that when it comes to counting nodes of a condition, we
assumed that the current layout node is a presentation of a model node,
but this is not necessarily true.
Fix the problem doing a "first presentation child of", then a "presentation
of" navigation in that case, which leads us to the correct model node,
so counting its children works.
(An alternative way of getting non-zero children would be a
"presentation parent of" navigation, followed by a "presentation of"
navigation, but that would lead us to the document root, so we would
count the number of 1st level elements, not the correct 2nd level
elements.)
(cherry picked from commit e49c42d17f50c8b0cac9db08dedc375dd5aa8a98)
This is the commit #7:
oox smartart, table list: fix too large width of children
It's possible all children request 100% of space, need to scale down in
that case. This means that children other than the first one is now
readable in the layout result.
(cherry picked from commit c753a896aa32577e780d531032a08a699b960229)
Change-Id: Iae5a073d458598e7b5059ebdf435d50ce7c7df80
Reviewed-on: https://gerrit.libreoffice.org/63115
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.timar@collabora.com>
|
|
Regression from 9348b322a5c230dfcc2231661b73e480b130fcd9
Change-Id: Ibf9d6b65f0dbcc3a751e3ac5f3dbc28d908d6c25
Reviewed-on: https://gerrit.libreoffice.org/62952
Tested-by: Jenkins
(cherry picked from commit ebd24b39eee5ac72d33ad731e31469cf8f330631)
Reviewed-on: https://gerrit.libreoffice.org/62965
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
|
|
where the dialog originally inherited from SfxModalDialog.
Change-Id: Ibe0006de93b0a9f05fb3b6181baf3ba1b4cf04c8
Reviewed-on: https://gerrit.libreoffice.org/61313
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-on: https://gerrit.libreoffice.org/61326
Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
|
|
With this patch the "Resize shape to fit text" property
(TextAutoGrowHeight-->spAutofit/noAutofit) will be exported
correctly to PPTX format.
Change-Id: I5fa975c6390a17bad30c360b3b17aa944bbe72af
Reviewed-on: https://gerrit.libreoffice.org/60043
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
(cherry picked from commit 86b14cc8bd910651cef422a0f7408adc0fc51a17)
Reviewed-on: https://gerrit.libreoffice.org/60306
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
This was using the SfxPoolItem serialisation of XATTR_FILL* items,
where only XFillColorItem and XFillStyleItem were actually used;
the binary serialisation was removed without being aware of this
feature.
Fix this by using uno::Any instead, rather than reviving the binary
serialisation.
Also change the clipboard format strings, just to be safe.
(regression from 97b889b8b2b2554ce33fd6b3f0359fc18f39832d)
Change-Id: I1828621a9aae606a1ca47835eef608062efe64a0
Reviewed-on: https://gerrit.libreoffice.org/62455
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Tested-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 0a6813ad5d57d0df72562c797a8b0581bfd65a11)
Reviewed-on: https://gerrit.libreoffice.org/62469
Tested-by: Jenkins
Tested-by: Xisco Faulí <xiscofauli@libreoffice.org>
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
|
|
Unfortunately the comparison was inverted, so a style is copied
iff it already exists, which is clearly the reviewer's fault...
(regression from 57db6e24b5ad43d447c30e44a112c74c7e75b46b)
Change-Id: I3425982feb08e980eca9243cc16120897b65a70f
Reviewed-on: https://gerrit.libreoffice.org/62436
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit be9f3db2306150a37ef18e4ccc8d8f4a1934c5c1)
Reviewed-on: https://gerrit.libreoffice.org/62449
Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>
|
|
Change-Id: Iccbbeab3b52d1d7369c19e333756713b42e83830
Reviewed-on: https://gerrit.libreoffice.org/62021
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
|
|
because lock was taken when toolbar layout wasn't set yet
Change-Id: I695493d4fb637210c72b9ce53af9f089c79b0c7b
Reviewed-on: https://gerrit.libreoffice.org/61849
Tested-by: Jenkins
Tested-by: Xisco Faulí <xiscofauli@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
When SdrPresObj's get constructed, e.g. when loading/
opening an Impress, the Styles for the PresObj's
(PresentationObjects) need to be constructed carefully
the same way as in former versions. This is a combination
of creating the SdrObject, adding a Style and setting default
Attributes, combined with in.-between corrections. All these
combinations make these fragile, plus the im/export using
ODF XML format and UNO API. With last SOSaw080 changes
not all places were correctly converted (mainly due to
new timing when and how a SdrObject belongs to a SdrPage).
Corrected this now, checked im/export/echange with
libreoffice-6-0 versions.
Stuff is more complicated that initially thought, see comment
added at AttributeProperties::GetObjectItemSet() for more info.
Adaption of the two UnitTest-Files is explained there, too.
Change-Id: Ia90a37492f3a92030790fbd27b7c532883bce923
Reviewed-on: https://gerrit.libreoffice.org/55029
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>
(cherry picked from commit 6ebe8b9068be019d9e8ce4f558eb07304e2023f6)
Reviewed-on: https://gerrit.libreoffice.org/61209
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
|
|
This is a combination of 3 commits.
1st commit:
Longer term the core Impress shape has to be improved so that it can have
text in multiple columns.
Shorter term, map text with multiple columns to table shapes, that gives
correct layout in many cases and requires changes to the import filter
only.
(cherry picked from commit aef569ed83a3ccc02639e5b2a1c7cc131ba262fc)
Commit #2:
Related: tdf#120028 PPTX import: fix font size of multi-col shape text
Normal shapes have a TextFitToSize property for this, but table cell
content has to be scaled manually, as the rendering has no automatic
support for them. Luckily the file format has the info we need to scale
at import time.
(cherry picked from commit c8b2849d140677f7b35523096eb2bc715b3dc507)
Commit #3:
Related: tdf#120028 PPTX import: fix font color of multi-col shape text
Not just font color, anything defined via list styles were not imported.
(cherry picked from commit 800bf1071a30955ff70373b2fb5886eadce59dee)
Change-Id: Id7942b16882ab1f083ded2f0e577e8c9e128697c
Reviewed-on: https://gerrit.libreoffice.org/61243
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.timar@collabora.com>
|
|
icons are off by default so not usually seen
Change-Id: I6076fd87250fc4595d279c830e14779147b7857a
Reviewed-on: https://gerrit.libreoffice.org/60936
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
|
|
Regression from c57f10b67fceef47d304d74dce93be7389a7720c,
where I disabled the master background in Impress but not in Draw,
and both share some common code.
Besides, disable master background in draw as well. Follow-up of bug
tdf#111306
Change-Id: I772382b5ed8eff3a35d001ea498810613137d172
Reviewed-on: https://gerrit.libreoffice.org/60914
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
|
|
Also simplify parent/child relationships, get rid
of double data (SdrPage/Parent infos in SdrObjects,
also in SdrObjList). This is all not needed - when a
SdrObject is inserted to a SdrPage, get SdrPage by
traveling over parents (no double info, member as soon
as inserted, ...).
More cleanups/reworks included, will need some more
cleanups, too.
Stabilizing: SetRectsDirty/DefaultStyleSheet
Had to correct the SetRectsDirty stuff for 3D due to
going down the hierarchy while the 2D implementation
goes the other direction -> endless loops. Added special
handling for 3D stuff for now (will be chnaged again when
SnapRect is no longer needed at SdrObject level).
Also had to adapt how the DefaultStyleSheet is set at
incarnated SdrObjects - better: their properties. Since
we now always have a SdrModel, it is possible to correctly
initialize with the correct default StyleSheet from that
SdrModel.
This needs to be done after ForceDefaultAttributes and in a
way that again deletes Items that are set in the StyleSheet.
This leads to an error in CppunitTest_sd_import_tests where
I checked tdf100491 - it is okay and thus I change the control
instance of the imported, XML-dumped file.
The less hard attributes, the better for Styles in general.
Cleanup of comments for last two commits
Corrected SvxShape::getParent()
Needed to get the direct parent, so test for SdrObject
first (to get SdrObjGroup/E3DScene), for SdrPage second
Fixed CppunitTest_sc_subsequent_export_test
Several problems arose. The used SdrCaptionObj was
Cloned, but the clone not inserted to a SdrPage. This
leads to not being able to access a UNO API imlementation
of the SdrPage (SvxPage) on lower levels.
It worked before due to SdrObject having a SdrPage*
additionally to being added to a SdrPage - this is exactly
the main cleanup this change does.
Looked for why it is cloned, could see no reasons. The
SdrCaptionObj exists during all im/export, not difference
to other SdrObjects (that do not get cloned). It is not
changed in any way. It *might* be to suppress a crash that
happened due to UNO API Service emfio/emfio not being
available in the UnitTest scenario. Interestingly it
did not crash with the cloned SdrCaptionObj, but the
Graphic exported was probably wrong.
Fixed by no longer Cloning the SdrCaptionObj and adding
emfio/emfio UNO API Service.
d139f821a5b39535a3e7b9c6261df7e18f8ae8ac
910e7f4bc628a715fda7545dffaf3369d5e76ea0
ca1de01b723051e09ac37d7ec7bba978beea41c5
3a76da1471dfe75e69847f64a6a3519ad21c8c9c
Change-Id: I986586e326b563acebf00d931a7084c6eb09e5f8
Reviewed-on: https://gerrit.libreoffice.org/54689
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>
Reviewed-on: https://gerrit.libreoffice.org/60535
Tested-by: Jenkins
|
|
when visible
Change-Id: Id4d6df2a85aebd6887949f285e1a5ec1046dbf64
Reviewed-on: https://gerrit.libreoffice.org/59456
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 50c9ed67d29d6105f3907cb7a2fe3322685af53c)
Reviewed-on: https://gerrit.libreoffice.org/59975
Tested-by: Xisco Faulí <xiscofauli@libreoffice.org>
|
|
since...
commit a4cd841541a729d7b8126d27d91fa28e30b01403
Date: Thu Feb 13 16:10:47 2014 +0530
n#757432: Styles (rename &) copy to different decks.
While copying slides to different slide decks,
styles were not being copied if there is already one
with the same name. This patch renames and copies those
to keep the formatting intact.
if a SdStyleSheet is not freshly created, but reused, it ends up in
the rCreatedSheets list, and so when the copy is undone
(via SdMoveStyleSheetsUndoAction), the SdStyleSheet is unconditionally
remove from the StylePool and so its ref count hits 0 and is removed,
even though there are still objects depending on it.
the problem becames more common since...
bash-4.4$ git show 57db6e24b5ad43d447c30e44a112c74c7e75b46b
commit 57db6e24b5ad43d447c30e44a112c74c7e75b46b
Date: Tue Aug 15 02:51:07 2017 +0530
Removing old SfxItemSet::getHash usage
improves the SfxItemSet comparison.
Assuming that its correct to leave SdStyleSheetPool::CopySheets
with those reused SdStyleSheets in the list, change things so
that a flag is passed around to indicate if the SdStyleSheet
should be removed or not by undo
Change-Id: I82b5bd93183fd1ff9e67957ccfb5babef81fd36d
Reviewed-on: https://gerrit.libreoffice.org/59434
Tested-by: Jenkins
Tested-by: Xisco Faulí <xiscofauli@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
refactor and reuse fdo#35779 solution for this case
Change-Id: I0631cd2560aa2acc2310f95b5c4dea36a2845a58
Reviewed-on: https://gerrit.libreoffice.org/59167
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
Change-Id: Ice8c141db20d43ccc8d6e2b56004a4a28d2b257a
Reviewed-on: https://gerrit.libreoffice.org/58729
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/58840
Reviewed-by: Andras Timar <andras.timar@collabora.com>
|
|
Change-Id: Icf3a07c6b79296feb233bbe08a6d69ab21a41414
Reviewed-on: https://gerrit.libreoffice.org/58746
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/58841
Reviewed-by: Andras Timar <andras.timar@collabora.com>
|
|
Change-Id: Ifb921b56387ca183b5a57126f6e88e2f9a4ecb3d
Reviewed-on: https://gerrit.libreoffice.org/58430
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/58839
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
|
|
"Font effect" implementation, instead of normal
text, content is converted to "fontwork".
Change-Id: I5d02c7faedb66a4b919e64ae1b830bffb69984c1
Reviewed-on: https://gerrit.libreoffice.org/58358
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/58838
Reviewed-by: Andras Timar <andras.timar@collabora.com>
|
|
Background is lost if it's changed from the sidebar in master or
notes view, thus hide the widget for now, until the real issue is fixed.
Keep the insert image button visible as it works.
The background can be changed from the page properties dialog
Change-Id: Ic3f6116cb0997024096343cb20ec40ac07307918
Reviewed-on: https://gerrit.libreoffice.org/57440
Tested-by: Jenkins
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
(cherry picked from commit c57f10b67fceef47d304d74dce93be7389a7720c)
Reviewed-on: https://gerrit.libreoffice.org/58184
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
|
|
and make NotifyFreeObj a virtual method of SvxMSDffClientData, finding
the sc case where the client data was neither SvxMSDffImportData nor
ProcessData.
make the sc case a XclImpDrawObjClientData whose NotifyFreeObj is a noop
Change-Id: I07422e7a3415114674bb1e3c1ef120299adf2dc8
Reviewed-on: https://gerrit.libreoffice.org/58552
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
|
|
Better do that explicitly in the SvxTableController::MergeRange, so
that the UI-driven operation still optimizes the table, but import
code gets the initial column count, and not throw trying to access
the deleted column.
Change-Id: Ib4b4d716935ec2036ccb839c36f1be5b0cb878d5
Reviewed-on: https://gerrit.libreoffice.org/58359
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/58380
Reviewed-by: Andras Timar <andras.timar@collabora.com>
|
|
regression from
commit 7d14555ef7e867c5b1a0e195e3ef056885697c59
convert SvxDateFormat to scoped enum
Change-Id: I9d365c710a20054e249433f54635068f713afa72
Reviewed-on: https://gerrit.libreoffice.org/58202
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
(cherry picked from commit 93baa280670367ef6246d837080706f2c80eab0b)
Reviewed-on: https://gerrit.libreoffice.org/58289
|
|
Change-Id: I09d5df8d7f07eb4b6c4341d9cd281131fc2df23b
Reviewed-on: https://gerrit.libreoffice.org/57535
Tested-by: Jenkins
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Reviewed-on: https://gerrit.libreoffice.org/58216
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
of textfield component in DOCX/PPTX by handling properties
AX_FLAGS_MULTILINE and AX_FLAGS_WORDWRAP during the import
and export. Both of them need to be enabled to get multiline
textfield in MSO, but LibreOffice has got only one multiline
property. With this fix, LibreOffice imports only really
multiline textfields as multiline, and it doesn't export
multiline textfields as single line anymore.
Change-Id: I9b567c3fcdc5d01a5838a3ec2517579f8d788954
Reviewed-on: https://gerrit.libreoffice.org/57552
Reviewed-by: László Németh <nemeth@numbertext.org>
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-on: https://gerrit.libreoffice.org/57619
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
|
|
Import custom document property _MarkAsFinal as LoadReadonly
setting, export LoadReadonly as _MarkAsFinal in DOCX, XLSX
and PPTX documents.
Before this fix, LibreOffice opened read-only OOXML documents
as editable, also saved and exported _MarkAsFinal=true silently,
resulting unintented read-only warning info bar in MSO.
This commit improves interoperability a lot, because this is a
basic document protection of MSO, recommended on its UI.
Note: LoadReadonly (on File->Properties...->Security, property
"Open file read-only") doesn't show "Edit read-only" info bar
from commit 630186ff4e0eba7317e542f8c3eca39ebd068721,
but it's still possible to switch on editing by Edit->Edit Mode.
MSO shows info bar for _MarkAsFinal. (There is an advantage to
hide the info bar in LibreOffice in a mixed environment,
to avoid overwriting of press-ready MSO files by LibreOffice.)
Note 2: Other differences of LoadReadonly in LO and _MarkAsFinal
in MSO: (1) Switching on editing doesn't remove the LoadReadonly
property automatically in LO. (2) Saving with LoadReadonly doesn't
switch off editing of the actual (still opened) document in LO.
(cherry picked from commit 9a5c56a9c4e04589b0a6bb710573922e459d9685
and bbdb6cb8ed0d77eeb2e413b38f29d2084bd8257b (unit tests))
Change-Id: I79897605e1fabe0708cce0b0c6216c152b201fc9
Reviewed-on: https://gerrit.libreoffice.org/56752
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
Change-Id: Ie3b1a626eb0ca4f39e015a18fede935b36ed194e
Reviewed-on: https://gerrit.libreoffice.org/57493
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
|
|
The state of the attributes for spacing are now read and set
correctly.
Change-Id: I661c00e247b55c64ea39c03db77dab9fa0775852
Reviewed-on: https://gerrit.libreoffice.org/55455
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 5b72382516d94bc27321461297ded92f8af8112d)
Reviewed-on: https://gerrit.libreoffice.org/57388
Tested-by: Jenkins
|
|
The new CharmapControl action will be used instead of InsertSymbol
Change-Id: I9a2e519fb7b8b773763b4c58f8aaa40e6af810b6
Reviewed-on: https://gerrit.libreoffice.org/57283
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a@gmail.com>
(cherry picked from commit 3ffd06f141f86a695deb8672a34b95f31f4d1b16)
Reviewed-on: https://gerrit.libreoffice.org/57289
|
|
Function isn't available any more. codebase has to be cleanded up
Change-Id: I42597cde5b5d2472f670552f49776775d5bf391e
Reviewed-on: https://gerrit.libreoffice.org/57185
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
|
|
Change-Id: Iea7d7a234d9904cd31c2a2355297ad8438d82b17
Reviewed-on: https://gerrit.libreoffice.org/57084
Tested-by: Jenkins
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
|
|
Impress
Menubar -> Insert -> Slide Number open the Header and Fooder Dialog
Change-Id: Ie6c03358254265422ef2b760aa182515a44480d4
Reviewed-on: https://gerrit.libreoffice.org/56976
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com>
(cherry picked from commit c50e4badfcb701d9e3927dae6617bb0d33f386e0)
Reviewed-on: https://gerrit.libreoffice.org/56994
Reviewed-by: andreas_kainz <kainz.a@gmail.com>
|
|
Since MakeVisible() is called on both
mousebuttom-down and mousebuttom-up,
this also eliminates useless double-processing.
In the problematic use case, the user pressed Ctrl-A to select
a tall table. When clicking to de-select the cells, the contents
moved around in unexpected ways because the rectangle is at the
end of the selection during down-click, not at the cursor location.
The re-arrangment of the screen invalidates the mouse-up,
so the intended cursor position shifted.
In the bug's calendar example, position the screen so that items
20-31 are hidden, select the whole month, and then click
on 5. Before, it would move the screen down to show 31, and
the cursor would be placed at the screen position where 5
had originally been. Solved by only repositioning on
mouse-click up.
However, mouseButtonDown must still be honoured while
selecting, otherwise you can't select off-screen content
with the mouse.
This backport contains part of NFC commit b25f5909,
missing initialization commit
93bfc16d7d520042f58fa26968a2a9adbbe2afbe
and cancel MouseSelecting commit
e1bab58778fd501f2d2aff7e5dc61eefdc229c9a
Change-Id: I41c90a7b113dc59a3c8c385139a5bb41993646fa
Reviewed-on: https://gerrit.libreoffice.org/56262
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
Reviewed-on: https://gerrit.libreoffice.org/56799
Tested-by: Justin Luth <justin_luth@sil.org>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
|
|
support for "mandatory" property was introduced in
d77f8eef165a7c6fd97cc06dcbc4ead55e7b633c but implementation was
made only for Calc and Draw.
decrease minimal width for "size" element: it is using too much
horizontal space in small window.
Change-Id: I184ac3a03ffa0a018f012d0f5da3c2da54f6c365
Reviewed-on: https://gerrit.libreoffice.org/56719
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 48e14cbb13ff967e86136b11cf1bebf29e3f54cc)
Reviewed-on: https://gerrit.libreoffice.org/56915
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
|
|
When passing DND_ACTION_MOVE to View::InsertGraphic, the whole object gets
replaced. DND_ACTION_LINK should be used, because it just replaces the
graphic and keeps crop information.
Marking the object is not needed, because InsertObjectAtView and
ReplaceObjectAtView already take care of that.
Change-Id: I0d829ec39a9d484a7c8946252e90eddb12ea9756
Reviewed-on: https://gerrit.libreoffice.org/56401
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
(cherry picked from commit 3f3c16e433f727bf52a6f894956b489187ab6dce)
Reviewed-on: https://gerrit.libreoffice.org/56837
Reviewed-by: Paul Trojahn <paul.trojahn@gmail.com>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
|
|
...followup to commit 76505bbd862b17b9b02a2d6e68bac308890dec70
which made the border invisible by setting the color to COL_AUTO.
But being invisible isn't good enough because on a round-trip
we are now losing the "noFill" attribute and saving a defined
border. However, COL_AUTO is turned into white during import,
in both LO and in MSO, so round-tripping displayed a
white border instead of an invisible one.
Change-Id: If6cb513ca6e4336e49bc56a9509aede2e1937063
Reviewed-on: https://gerrit.libreoffice.org/55658
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Tested-by: Szymon Kłos <szymon.klos@collabora.com>
(cherry picked from commit 4087130d0531a31456310bfe5c41a028dacd5a4d)
Reviewed-on: https://gerrit.libreoffice.org/56747
|
