Age | Commit message (Collapse) | Author |
|
PPT can't store an OOXML custom shape with fill bitmap, PowerPoint
generates a fallback bitmap when saving to PPT.
We used to keep the bitmap and loose the custom shape geometry, but that
was changed with commit f4ba484183a1e7b9824f10580d633466c266828f (ooxml
import: supprt cropping to shape, 2019-05-13).
Fix the regression by going back to keeping the bitmap, a full fallback
bitmap (ala PowerPoint), would be more work, taking e.g. blurry shadows
(changing the shape position and size) into account.
(cherry picked from commit 7032be2e9edd82dad2d67f1582aaa57676bda4a1)
Change-Id: I7192f912077f2de026573855dbebbdf576e39ebc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106264
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
Impress has a two stage load, eventually because of the optional
template manager. Since I don't know, what the 2nd load URL
"private:object" is used for otherwise in LO, this just marks the
empty and default documents as replaceable in Impress.
Regressed-by: 61e1e0413296928d929f99c0f006c6cbbcf4ac40
Change-Id: Ief8d9eeaa65e8fb40400e64c16768d37ca343893
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104581
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
(cherry picked from commit d4892e5452bff155da6c34063ffe8c331284d8e9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105065
|
|
Consider "Height" property of the the table while calculating
the minimum row height.
Change-Id: I4dbb0f7f87517423fd3075515b4b9817d6a9a71a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105422
Tested-by: Jenkins
Tested-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
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/+/105480
|
|
Change-Id: I121e8951807404c9aead36f199340a3b10031595
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105371
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
(cherry picked from commit ac6df04b5c5a7c227fec3b8897c79be5e99cbe01)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105461
|
|
Change-Id: Ia3c75206a5207a95162970ac6607be96dac9fcb7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105243
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
(cherry picked from commit cd142f2ab2e165b13c5ab14728b70bdd40d8517a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105460
|
|
Change-Id: Ic27f41e6e2dd7fd65fdae8477ef314f1df83819f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105042
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
|
|
Change-Id: I438a06dfd0d19271853bc1efd8098195f6f37ef8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104988
Tested-by: Jenkins
Reviewed-by: Jim Raykowski <raykowj@gmail.com>
(cherry picked from commit 46ecd31445bda45e10d58e937ff468a1a8f17da2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104966
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: I6dea25b3d212072df9a6638dc774f35e203e1f80
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98602
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104878
|
|
Added a box besides the pages option that lets the user choose between left and right pages/left pages/right pages.
Change-Id: Iee0386f4f3cfd2dac3fcf898a3fefb5434cb27a8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96612
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104877
Reviewed-by: Sophie Gautier <sophi@libreoffice.org>
|
|
Regression from commit 0024c48b4822062995effed7db4f1281196384bb (oox
smartart: consider rules when scaling in linear layout, 2020-07-31), the
problem is that I only tested horizontal layouts and this is not working
for vertical layouts.
Just disable the vertical case for now, to avoid unwanted side effects.
(cherry picked from commit c719db99166a7b4770855a9599ec65c70cd256c5)
Change-Id: I31a894157996a2371b8d0ec482ee91dc4d5b053e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104550
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
|
|
Change-Id: I9884c1cd579fff85c425ffe51e1ed60f7095ad90
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104154
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Tested-by: Jenkins
|
|
Regression from commit 10bb02efd8afd42e633e370480104e2575546d8e
(tdf#129685 PPTX import: fix unexpected centering of shape text,
2020-09-18), now the problem was that some text should be left aligned,
but was centered.
Fix the problem by reverting most of the above commit: XML changes,
changes to SdImportTest::testTdf113198() (manual testing show that this
change is not needed after all) and changes to the
TextBodyPropertiesContext ctor in oox/ (but not the testcase itself).
Fix tdf#113198 again, this time in Shape::createAndInsert(), which is
meant to be closer to what the binary PPT import does.
With this, all cases from tdf#104722, tdf#113198, tdf#129685 and
tdf#137023 are meant to be handled correctly at the same time.
(cherry picked from commit dfa1856cdb4c69985ef1e809d33055427b6fbd76)
Change-Id: Id785252c26fc407cd74c9cfb55624091798d7773
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104006
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
|
|
1) When applying double outside spacing, introduced with commit
0a29c928afa74123bca05dc089c751603d368467 (oox smartart, picture strip:
fix lack of spacing around the picture list, 2019-02-26), make sure that
is only applied in the direction of a signle row: i.e. the bugdoc case
is left/right outer spacing, but no top/bottom spacing.
2) If a child shape has an aspect ratio request, make sure that it only
decreases what would be allocated by default, so the children never
leave the parent's rectangle.
3) Fix a mis-match between the first and second row, the unexpected
small left padding in the second row was because code assumed that all
child shapes have the same width; which is not true, when widths come
from constraints.
With this in place, we finally do a good rendering of the bugdoc, and
child shapes are always within the bounds of the background.
(cherry picked from commit 71303c5c23bdb385e9f12c0dbe5d2a0818b836ec)
Change-Id: Ia2606dcd945402f7dfe17c6e2f261bfd98667022
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103697
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
This requires tracking what is the total of the width request of child
shapes, then scaling them according to what is the total available
width.
Additionally, the height of child shapes should be adjusted based on
their aspect ratio requests. A related trap is when an (invisible)
spacing shape is at the end of the row, that would result in smaller
spacing between the rows, so track the max height of shapes inside a
single row.
With this, finally the 6 child shapes are arranged on 2 rows, not 3
ones.
(cherry picked from commit 5d899bf3ee59a226f855c8c56389344862efaa95)
Change-Id: I4eb2f06676df11c1432e0934ca3a0ec8891c5843
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103696
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
If the child's aspect ratio request will shrink the width, then take
that into account when calculating how many rows / cols we need.
This reduces the number of columns for the bugdoc from 4 to 3, which is
needed, but not enough to render it correctly.
(cherry picked from commit acc9aead3cc5162379d34a455aa15f7b13907cf1)
Change-Id: I1d02df4834b8a2ce97d5e006db0e3135d3d42917
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103694
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
the "end" call will close the shell, which is deleted directly so the local shared_ptr remains
pointed to something which is already deleted.
So:
a) Have activate return true/false to indicate the failure and require the caller to call
'end' in response to failure.
b) A bunch of stuff in the call-stack expects the ViewShell not to get deleted while they are
calling it, so additionally launch that 'end' to happen in the next event loop.
==2838867== Invalid read of size 8
==2838867== at 0x32F4B83C: sd::ViewShellBase::GetDocShell() const (ViewShellBase.hxx:97)
==2838867== by 0x335BBCFC: sd::ViewShell::GetDocSh() const (viewshel.cxx:1389)
==2838867== by 0x3357CAC1: sd::PresentationViewShell::~PresentationViewShell() (presvish.cxx:73)
==2838867== by 0x330AA34B: void __gnu_cxx::new_allocator<sd::PresentationViewShell>::destroy<sd::PresentationViewShell>(sd::PresentationViewShell*) (new_allocator.h:156)
==2838867== by 0x330AA2DF: void std::allocator_traits<std::allocator<sd::PresentationViewShell> >::destroy<sd::PresentationViewShell>(std::allocator<sd::PresentationViewShell>&, sd::PresentationViewShell*) (alloc_traits.h:531)
==2838867== by 0x330AA0BE: std::_Sp_counted_ptr_inplace<sd::PresentationViewShell, std::allocator<sd::PresentationViewShell>, (__gnu_cxx::_Lock_policy)2>::_M_dispose() (shared_ptr_base.h:560)
==2838867== by 0x32D10D33: std::_Sp_counted_base<(__gnu_cxx::_Lock_policy)2>::_M_release() (shared_ptr_base.h:158)
==2838867== by 0x32D10C79: std::__shared_count<(__gnu_cxx::_Lock_policy)2>::~__shared_count() (shared_ptr_base.h:733)
==2838867== by 0x330A03BD: std::__shared_ptr<sd::PresentationViewShell, (__gnu_cxx::_Lock_policy)2>::~__shared_ptr() (shared_ptr_base.h:1183)
==2838867== by 0x3309F847: std::shared_ptr<sd::PresentationViewShell>::~shared_ptr() (shared_ptr.h:121)
==2838867== by 0x3320E1E8: sd::SlideShow::activate(sd::ViewShellBase&) (slideshow.cxx:999)
==2838867== by 0x3357CF33: sd::PresentationViewShell::Activate(bool) (presvish.cxx:118)
==2838867== Address 0x2fb5f320 is 256 bytes inside a block of size 272 free'd
==2838867== at 0x483BEDD: operator delete(void*) (vg_replace_malloc.c:584)
==2838867== by 0x33466537: sd::PresentationViewShellBase::~PresentationViewShellBase() (PresentationViewShellBase.cxx:82)
==2838867== by 0x823076C: SfxViewFrame::ReleaseObjectShell_Impl() (viewfrm.cxx:1113)
==2838867== by 0x8234B1C: SfxViewFrame::~SfxViewFrame() (viewfrm.cxx:1652)
==2838867== by 0x8234FEB: SfxViewFrame::~SfxViewFrame() (viewfrm.cxx:1646)
==2838867== by 0x8230D6C: SfxViewFrame::Close() (viewfrm.cxx:1165)
==2838867== by 0x81E4217: SfxFrame::DoClose_Impl() (frame.cxx:142)
==2838867== by 0x821709A: SfxBaseController::dispose() (sfxbasecontroller.cxx:982)
==2838867== by 0x3337A59F: sd::DrawController::dispose() (DrawController.cxx:164)
==2838867== by 0x6F35CC0: (anonymous namespace)::XFrameImpl::setComponent(com::sun::star::uno::Reference<com::sun::star::awt::XWindow> const&, com::sun::star::uno::Reference<com::sun::star::frame::XController> const&) (frame.cxx:1485)
==2838867== by 0x6F3834E: (anonymous namespace)::XFrameImpl::close(unsigned char) (frame.cxx:1692)
==2838867== by 0x81E3CFA: SfxFrame::DoClose() (frame.cxx:108)
==2838867== by 0x823802C: SfxViewFrame::DoClose() (viewfrm.cxx:2525)
==2838867== by 0x3320B971: sd::SlideShow::end() (slideshow.cxx:696)
==2838867== by 0x3320E1C2: sd::SlideShow::activate(sd::ViewShellBase&) (slideshow.cxx:995)
==2838867== by 0x3357CF33: sd::PresentationViewShell::Activate(bool) (presvish.cxx:118)
Change-Id: Ida91228b7584491c9a5dc9c0b3f76ce63218a92a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103326
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
|
|
Regression from commit 89f0af144c18efafe2573801641689a1432c0cae (tdf#113198 set
default shape paragraph alignment.., 2019-11-19), the old bugdoc had this
markup:
<a:bodyPr ... anchor="ctr"/> (centered)
The new bugdoc has 2 shapes with text:
<a:bodyPr .../> (aligned to left)
<a:bodyPr ... anchorCtr="1"/> (should be centered)
"anchor" is about vertical, "anchorCtr" is about horizontal centering of text.
Checking what the binary filter does, it maps horizontal centering to
TextHorizontalAdjust, so fix the original bug differently, by leaving
ParaAdjust alone, and tweaking TextHorizontalAdjust intead: this keeps the old
bugdoc working but fixes the new one.
This caused a number of "change detector" XML-based tests to fail: all of them
are unchanged visually, so the XML files are adapted to the new state.
The tdf#113198 fix itself was fixing a regression from tdf#104722, and that
commit had no testcase, I tested that we don't regress there, manually.
(cherry picked from commit 10bb02efd8afd42e633e370480104e2575546d8e)
Change-Id: I81a7b3e8c76bfbce5c5569d16d5238958ac20f75
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103088
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
Change-Id: I495b90b9661c32ad3ec71c2a2455d1576fb8f918
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102116
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
|
|
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
|
|
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>
|
|
Change-Id: Iaa2eefbe08fad3a7dd6eff98bf5fb513053a263d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100533
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
Change-Id: If5c9a69549e683eb4af619b1f27a22833c36e34d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98081
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: I4df8fefa7f875e0a25585c4fef22f077dcd0b83d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97300
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: Icb8a1add327e7b11b4095c1e3f60cddf2ea0f5c3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97296
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
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>
|
|
...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>
|
|
- 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
|
|
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
|
|
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
|
|
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>
|
|
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>
|
|
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
|
|
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
|
|
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
|
|
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
|
|
...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
|