Age | Commit message (Collapse) | Author |
|
Reviewed-on: https://gerrit.libreoffice.org/31771
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
(cherry picked from commit cb598029835477326b190bc99abd31a487cc5a91)
Change-Id: I25ce98ed391f70292bed6238645b121b9cf50d5e
|
|
... instead of continuing the detection loop and being
"detected" as plain text. The detection API will from now
return a type based on the file extension only, which is
far more useful than "plain text" anyway. Plus the media
descriptor has a flag to indicate that the detection wasn't
completed, which can be also used by the loading code to
abort the loading process.
Change-Id: Ida37e2687bd5cd86b5780620724e9bce82e11946
Reviewed-on: https://gerrit.libreoffice.org/24428
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
(cherry picked from commit 579c2de3a88483eff0664d3a303b19cbd386db47)
Reviewed-on: https://gerrit.libreoffice.org/31738
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
|
|
This is backport of commits 0afbe8d5 and ce17ebb6 from master.
Change-Id: I155d160a0d19b037e6e765d960daf4545535c0ed
Reviewed-on: https://gerrit.libreoffice.org/31527
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Tested-by: Kohei Yoshida <libreoffice@kohei.us>
|
|
Reviewed-on: https://gerrit.libreoffice.org/31263
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
(cherry picked from commit 7c5aaa254f444d54b9ebf6574f0ccd37af548ee5)
Change-Id: Iec273714108598d7017e73a9e7d384f8410d6ee1
|
|
...from slide master.
The problem caused by that PPTX files contains not a
one-level master slide set, but has two levels: one
called slide master, other called slide layout.
Slide layout inherit properties from slide master and
normal slide inherit propetries from slide layout.
Bug appeared because, slide layout inherited properties
were not forwarded to the normal slide.
Reviewed-on: https://gerrit.libreoffice.org/30969
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
(cherry picked from commit 8d613870b2cd2e3e4396b4fa97dbd8080fda8f52)
Conflicts:
oox/source/drawingml/shape.cxx
Change-Id: I587582498cf4315087f9a576c1b7fc41ee23e2fd
|
|
Text properties are applied on a shape during text insertion,
but if a placeholder shape has no text, then it has a placehodler
text which should have the right text properties.
Reviewed-on: https://gerrit.libreoffice.org/30881
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
(cherry picked from commit 5c7f3e4a7190bf9821bed102f96a926c9a894e59)
Conflicts:
oox/source/ppt/pptshape.cxx
Change-Id: I54175d52dd25915ee4d7153298e01ec07c6be1f6
|
|
Reviewed-on: https://gerrit.libreoffice.org/30731
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
(cherry picked from commit dc024cdd91e3c33eeff8eea22fdef0d90d4dd2c0)
Change-Id: I95b4358f0d4311e8f427c8de18863049fb718d9b
|
|
there might be other variants out there in practice, but this
works for default encrypted xls of excel 2013
(cherry picked from commit 1473ce030314027c01c98f513407ed0897328585)
contains...
be more c++y
(cherry picked from commit fcf7f503b64b2cf7dbef019fb43dde033e3538e8)
hash len is 20 for xls cryptoapi configuration
(cherry picked from commit 491884350ce74f36044b3348bd66356ad1c234af)
clarify hash lengths a bit more
(cherry picked from commit 8db1b13e721683d0263925c8e0300dd86a022814)
hash len isn't going to change depending on who implements it
(cherry picked from commit fcc846e8f29839eaace7e1d28746abea8f4b598a)
move some useful header information to mscodec for reuse
(cherry picked from commit fc514cbf30be1613fdf4d4b7c12cbd55ca08b9b0)
rework things in light of now available documentation
(cherry picked from commit 3fabbd0a22219464545f933fc28c869a6fa89546)
split MSCodec_Std97 into a baseclass MSCodec97
(cherry picked from commit 06916c839b16866b47235306d2db50850df0ad7c)
6e06b8578959b8147043179db57e875b1d98d57d
66cea4b9efb82d29e6c052ac11a6f2eaca823ce0
ee585cba4acad74c11d083085153e2af96c8894f
c7adf3ed3c8279cc93a06975d6fb337210d1af87
f5f75e27191017a8c6a3929e2a70d21840f157c6
a3c41a048169c78684800def94e53fc9f3201e30
91c0e1d1d95fbd1c68966650e7ac7d23276bcbe3
Change-Id: I673b00e111a734bc626ba3d3f6ecf9692f1ce7db
|
|
Make custom shape export more robust. In case of the test
document, WriteCustomGeometry is called, but this call
does not export anything, and so we get a shape without
any geometry in the DOCX file, which causes problem to MS Word.
Reviewed-on: https://gerrit.libreoffice.org/30241
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
(cherry picked from commit f7c61b08d526c79ecd1522dff79386059b6125e0)
Change-Id: Ie7a4e2b8a18bfddaeeb81425ae5f1de04140d43f
|
|
...which (in LIBO_INTERNAL_ONLY) for Clang expands to [[clang::fallthrough]] in
preparation of enabling -Wimplicit-fallthrough. (This is only relevant for
C++11, as neither C nor old C++ has a way to annotate intended fallthroughs.)
Could use BOOST_FALLTHROUGH instead of introducing our own SAL_FALLTHROUGH, but
that would require adding back in dependencies on boost_headers to many
libraries where we carefully removed any remaining Boost dependencies only
recently. (At least make SAL_FALLTHROUGH strictly LIBO_INTERNAL_ONLY, so its
future evolution will not have any impact on the stable URE interface.) C++17
will have a proper [[fallthroug]], eventually removing the need for a macro
altogether.
(cherry picked from commit 14cd5182c5f64c43581c82db8c958369152226ac)
Change-Id: I342a7610a107db7d7a344ea9cbddfd9714d7e9ca
|
|
Change-Id: Idd31b0a53c8318af69bbcd32f6798721ec8eb8e1
Reviewed-on: https://gerrit.libreoffice.org/21945
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
(cherry picked from commit 1ef9f3988ee4dcbc77e1fdefa20442e044a67d4d)
|
|
Reviewed-on: https://gerrit.libreoffice.org/21209
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
(cherry picked from commit 64d624b65124ac02d8ee59b135593fd9d8eb9067)
Change-Id: I9a5940027423ff0791fa7da0b79b617412ce6b86
|
|
A ridiculously fast way of doing this is:
for i in $(pcregrep -l -M -r --include='.*[hc]xx$' \
--exclude-dir=workdir --exclude-dir=instdir '^
{3,}' .)
do
perl -0777 -i -pe 's/^
{3,}/
/gm' $i
done
Reviewed-on: https://gerrit.libreoffice.org/22224
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
(cherry picked from commit a238b1f8d304bf1e2ffb357937f3ec888ee8ac89)
Change-Id: Iebb93eccbee9e4fc5c4380474ba595858a27ac2c
|
|
are actually pointer vars.
Also convert from regex to normal code, so we can enable this
plugin all the time.
Reviewed-on: https://gerrit.libreoffice.org/24391
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
(cherry picked from commit e8fd5a07eca70912ddee45aaa34d434809b59fb7)
Change-Id: Ie36a25ecba61c18f99c77c77646d6459a443cbd1
|
|
DrawingML: The useBgFill attribute specifies that the shape fill
should be set to that of the slide background.
Reviewed-on: https://gerrit.libreoffice.org/23039
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
(cherry picked from commit f3d1ac75c4b7fa63022e54a9cbff46ba99535076)
Change-Id: I8b568e730f00326d51e7b604579f4ff990b26f8a
|
|
The spec says in theory a % suffix could be also supported, but let's
wait till that is seen in a real-world document.
Change-Id: Ie026915e38dcb03c99085a1740075364b00e1c8d
(cherry picked from commit bb646c1472d3b77066b01128baf1c9cafdb40233)
Reviewed-on: https://gerrit.libreoffice.org/24364
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
|
|
It's IMO a bit confusing to see a "graph" header that doesn't
strictly deal with graphs, but graphics.
Backporting to 5.1 series to allow for easier backporting of
other potential hotfixes.
Change-Id: Ic37c6cd78e23d05939486f98667144c4453bb0a3
Reviewed-on: https://gerrit.libreoffice.org/22949
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
|
|
When we export the customshape as polypolygon, we need to
take into account, that the polypolygon of the shape already
has flipped coordinates, but coordinates has to be relative
to the rotated bounding rectangle.
Reviewed-on: https://gerrit.libreoffice.org/21905
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit bd36889b2caa4a74d647e18fc52e455f83529be9)
Change-Id: I4f3b015e439d3d6041adc67eddd460f5bd4dfca1
Reviewed-on: https://gerrit.libreoffice.org/22103
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: I813ca0510b6cfc26c307c510f3511c01c0f65c85
(cherry picked from commit 4eee0f8d1180300bd56942ad23321f8f3f1b6177)
Reviewed-on: https://gerrit.libreoffice.org/21782
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
These hit the assert in lcl_StoreOwnAsOOXML now so better implement some
export.
(cherry picked from commit cb890ae43bacd2be24bc74fad2e2e5cce8910995)
ugh, forgot to git add the test document
(cherry picked from commit fc4fba0c77c849cf19d9c0e1b9270b745db60b89)
Change-Id: I10c005a547e8a85f2a82198a49f9a03fc46a61d7
Reviewed-on: https://gerrit.libreoffice.org/21495
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
let's guard against that.
Change-Id: I970fb801a642592d9c23390572867f0e21f03132
(cherry picked from commit a951d70609fa125def231c3d7579e72c381334f5)
Reviewed-on: https://gerrit.libreoffice.org/21496
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
|
|
... which has nasty dependencies.
Change-Id: I84ba0302142ade6e15291b782453dbe3bac753dd
(cherry picked from commit 3e0bc5c7fe715ebd38bfa64a49b23df58d6d29a9)
Reviewed-on: https://gerrit.libreoffice.org/21493
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
Change-Id: Ibea6944c4e61e9848aac936e399ed08192ec5812
(cherry picked from commit 99ab23d26010120e7e6344cb2b26e192890ec5c3)
Reviewed-on: https://gerrit.libreoffice.org/21488
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
Change-Id: I57d5e085e612908e7a22f444c771ec9fa45485ce
(cherry picked from commit 0b901a9760a22bdc6f83829b077c30ec08613e17)
Reviewed-on: https://gerrit.libreoffice.org/21357
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
... like in sw.
Change-Id: I4ba5d404c4160e907330832b7710c1d96430badf
(cherry picked from commit 00d1c2800c10d542673ab6f5a5baa26aa1cbb20e)
Reviewed-on: https://gerrit.libreoffice.org/21355
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
with broken ole object
Change-Id: I8dc9e1035893d5cb931d13eafcc3e3ec1c9c00d4
(cherry picked from commit 680abab7710b7e8e6f2ba9cee37a5ccd224e2993)
Reviewed-on: https://gerrit.libreoffice.org/21354
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
Change-Id: I9057cd9d574d545929a9f43f40f49164179a6dcc
(cherry picked from commit 89e85e5d2ec337aaccfa74bd7017898df42529b4)
Reviewed-on: https://gerrit.libreoffice.org/21353
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
Uses the same approach as DOCX import to preserve the ProgID; it would
be much better if the MediaType of the stream were preserved instead and
the other things derived from that, but this here was rather quick to do...
This makes the round-tripping of OOXML OLEs in PPTX work again, which
was broken by an earlier commit.
Change-Id: Ic7d0362f0c14bf0e522185713666bcd58db2cf64
(cherry picked from commit d60398ff5b42ff77a4002dcd13b7fb8c9a73eade)
Reviewed-on: https://gerrit.libreoffice.org/21352
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
Change-Id: I4f9769ad496198d2d002775dee4ee0a2f08d6f3b
(cherry picked from commit 9d0d41f0f3c5215770bc7246a089d54a7244df55)
Reviewed-on: https://gerrit.libreoffice.org/21351
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
... with oox::GetOLEObjectStream(), and add the "progId" attribute while
at it. Not sure what the "name" attribute is good for, it appears more
like a unique name than some kind of type classification?
This makes SdExportTest::testBnc822341 fail temporarily, and also breaks
roundtripping of OOXML OLEs in PPTX files.
(cherry picked from commit ca29357f7310f057f79357e80a9129b670914404)
oox: stop pointlessly loading embedded objects to check if it's a chart
This fixes SdExportTest::testBnc822341 again, because the conversion
TryToConvertToOOo() in OleEmbeddedObject no longer breaks it.
(cherry picked from commit d54624ff7e7f97d8d7e8fd70572348f63b8a3da5)
Change-Id: I20043b2a414cf5a28eaa24adaf2ddeb737986250
Reviewed-on: https://gerrit.libreoffice.org/21350
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
Change-Id: I32fa4b6b6d755b613b46b32d3b5961976335c76e
(cherry picked from commit 55bf7e4210e159bbeeaebeb0e092b3700a19d666)
Reviewed-on: https://gerrit.libreoffice.org/21349
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
(cherry picked from commit 627c2469843c9461b665c4571f1214aca7fc36a4)
Change-Id: If3d9f6272031e08ab228cfa58963d60ceede2498
Reviewed-on: https://gerrit.libreoffice.org/21115
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
Revert "bnc#584721: Import subtitle block to master slides"
This reverts commit b3d50feaa87b670baf68288974005ac26ad31736.
It seems the imported subtitle block makes export corrupt the
output. Better to have a valid output.
Change-Id: I1a3d4f03e4fa0c4431a5394495682a1b9d7677bc
(cherry picked from commit a9db17aabc3ac970e6e4754e28310d20138144d9)
Reviewed-on: https://gerrit.libreoffice.org/20923
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
The original code breaks at least in optimized build on Fedora x86,
because there nBits for 256 is computed as 9, not 8.
Change-Id: Ib157c415bc9e231bf7fd544349810e6bc83c8fcc
(cherry picked from commit fd94964ad6611d7f20523272fe6752d38e3aec88)
|
|
As for the change in chart2/qa/extras/chart2export.cxx
Chart2ExportTest::testAxisNumberFormatXLSX() unit test: also Excel
writes string parts of format codes quoted, including minus sign in
negative subformat.
Change-Id: I201bb012df818129cbc65de0eee8eca59e57d829
(cherry picked from commit 509cfa40691cf544519872a63335cff4a4d94006)
|
|
Change-Id: Ie7a53f3ecc05d1d4f6f71aa8165315f9155c60dc
|
|
Regression from commit 2b78f2cd7b9e4bab0f3b3b9119238f36a1bbc7b2 (rhbz#988516:
DOCX import: fix context stack when importing header/footer, 2014-03-05),
though that just made an existing Writer layout problem visible.
RTF/WW8/newer (drawingML) DOCX import doesn't have this problem, as those
import pictures as sw graphics, not draw ones.
<w10:wrap type="through"/> is normally mapped to our page wrap (as it uses
"through" in the "not only wrap around, but also in the holes of the shape, if
it has any" context, not in our "text should go through it, so no wrapping"
one), but for some reason in this case (most probably due to the extreme large
negative margins) Word handles the situation as our through, i.e. the text
should not go to the second page, as it would normally happen with a "Word
through" wrapping.
Work around the strange situation by ignoring the wrapping request for extreme
top margin values.
Change-Id: I20555b1fa7a769e20c40a3a5ff3873807403e937
|
|
Change-Id: I83d03dcc76b5f0d54ebb0513ae972acb0db8eef1
|
|
Change-Id: Ib1f06cb5f925535858bc14aab6f59ad7fd2a3a8d
|
|
Change-Id: I78ddbef3ac96f10f334c45a467dafb95bb9e3453
Reviewed-on: https://gerrit.libreoffice.org/20051
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
|
|
Without this patch Windows Explorer shows different "Character count" for the same text saved with MSW an LO.
Now both stats are explicitly exported this way:
NonWhitespaceCharacterCount -> XML_Characters
CharacterCount -> XML_CharactersWithSpaces
Change-Id: I0a3b827629e88ab5e09aa8440e5f19e7fba2d831
Reviewed-on: https://gerrit.libreoffice.org/20058
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
|
|
in chart2, we remove a local equivalent of the method
Change-Id: I25129a3d1ea1dd724eb9cd38a57be37a78b3d100
|
|
/oox/source/core/xmlfilterbase.cxx: writeAppProperties modified.
Stats are extracted from DocumentProperties->DocumentStatistics.
No stat counter found for the lines of text
Change-Id: Ibc2e848a97776f65f0bfd4a880e5279e9c507dd0
Reviewed-on: https://gerrit.libreoffice.org/20046
Reviewed-by: jan iversen <jani@documentfoundation.org>
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
Change-Id: I3edb77d5b046691e64d600d61dcd44e892c31301
|
|
and improve the script a little
Change-Id: I2792ea4dd5df3a50736fbe209225c3f16fb86b84
Reviewed-on: https://gerrit.libreoffice.org/20033
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
|
|
Ported update_pch.sh to Python with improved performance
and features. The new script is invoked from the same
update_pch.sh which calls it for each library in
parallel, although it can be invoked directly.
The ported script (update_pch) updates all PCH files
in ~15 seconds where the old script took ~4500 seconds.
In addition, the new script supports 3-tiered headers
(system, module, and local) and is very flexible to
support other improvement. It has a per-library
optimal configuration settings that can be updated
using another new scripts (update_pch_autotune.sh)
which finds optimal per-PCH settings.
PCH files have been generated using the new scripts
which builds significantly faster (2-3x, depending
on module and configuration) and the intermediate
binaries are noticably smaller (by several GBs).
The new script stamps each generated PCH file with
the command that generated it to make it trivial
for users to update them, and also adds the command
to invoke another script (update_pch_bisect) that
helps find missing headers or conflicting headers
that may break the build after updating the PCH.
Finally update_pch has built-in unit-tests for
makefile parsing and other core functionality.
Change-Id: Ib933b50e50374d7e2e7e3e95ba8799b0cc8a27fa
Reviewed-on: https://gerrit.libreoffice.org/19965
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
using variations of:
git grep -lP 'Sequence.*OUString.*\(\s*1\s*\)' | xargs perl -0777 -pi -e "s/Sequence<OUString> (\w+)\(1\)\;
\s*OUString\* pArray.*;
.*\[0\]\s*=\s*(\S+)\;/Sequence<OUString> \1 { \2 };/g"
Change-Id: I03c64334ff30ee14dce0d17b67f5122a3893bbe3
Reviewed-on: https://gerrit.libreoffice.org/19971
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
|
|
replaced using the script:
git grep -lP 'Sequence.*OUString.*\(1\)'
| xargs perl -0777 -pi
-e "s/Sequence< OUString > (\w+)\(1\);
.*\[0\] = (\S+);/Sequence< OUString > \1 { \2 };/g"
Change-Id: I23688a91562051a8eed11fc2a85599545c285c34
Reviewed-on: https://gerrit.libreoffice.org/19967
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
|
|
Change-Id: Ie89b64c4399cd0092eee579660c9fe85f8ca8e73
|
|
Change-Id: Ib6d2f8b4e71436c3a7c26bdfc9847152ebaf0739
Reviewed-on: https://gerrit.libreoffice.org/19900
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|