Age | Commit message (Collapse) | Author | Files | Lines |
|
This reverts commit c764a3d978beb2e6197a8d3f7df53d81ebf72467.
|
|
Change-Id: I61686bf61ff1e0561c385492c563e4495456ca47
Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
(cherry picked from commit 45dfbdca6a9afba1a6aef21623ec025ded635a4d)
Reviewed-on: https://gerrit.libreoffice.org/15446
Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: David Tardon <dtardon@redhat.com>
|
|
Change-Id: I1a281b096e4d1831bcf67ca03180afff043fbcfd
(cherry picked from commit 135907f2061550624ee1859745d94eee01849070)
Reviewed-on: https://gerrit.libreoffice.org/15321
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
|
|
Change-Id: Ie416d757b73e99836d14b7f24a5cb4b370284d8c
(cherry picked from commit 30936e3f6f8242950526ce9a0d02971a881b7910)
|
|
Change-Id: Iebc3d87642c93fcdecddd6332fd57b7fdfb2d337
(cherry picked from commit 96c05f82cd4df35505497bc29d96c8a250072db0)
|
|
Change-Id: I1a448e9c954a3851fe3590a0fae73ed5b27555f0
(cherry picked from commit e68ceaec43f0c0ff326064642072bb8f904e7e8a)
|
|
Change-Id: I1aad3e40ad61a1397b619bdc6e0f578e2c9c141e
(cherry picked from commit ec2c8a602ecb8664b24d77e6ca6af17bf59d211c)
|
|
PowerPoint ignores a:ext cx and cy value of p:xfrm, and uses
real table width and height. PowerPoint 2010 saves files where
cx and cy contains good values, but I found files in the wild
whose cx and cy values did not match to actual table width and
height, and there was a visible difference between rendering
of Impress and PowerPoint.
Reviewed-on: https://gerrit.libreoffice.org/15123
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit 037fe3671cbdad51f52d2f69f72f47f463dba7c2)
Conflicts:
oox/source/drawingml/shape.cxx
sd/qa/unit/import-tests.cxx
Change-Id: I3f80c0cea4cac46763d449f918bb78dca1a6562d
Reviewed-on: https://gerrit.libreoffice.org/15133
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
|
|
Problems were with those table styles which used
color themes to define cell fill color.
Reviewed-on: https://gerrit.libreoffice.org/15089
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit debf3ffb87d607704ddea97f6710c3ceaa9a243d)
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Conflicts:
sd/qa/unit/import-tests.cxx
Change-Id: Ibde90df81ff253ba65618dde4038093d1caabfe8
|
|
5ac575ee3e109 did not get it right, the vert attribute (i.e. the
rotation of text) is relevant, not the rotation of the shape. In
that case both text and shape rotation were 270 degrees. I checked
that the bugdoc of bnc#773048 looked good after this.
Reviewed-on: https://gerrit.libreoffice.org/15076
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit af686aa8694903bde5952656cd69993c8c8393d7)
Conflicts:
sd/qa/unit/import-tests.cxx
Change-Id: I6e0401cd138a82040df82d7da1a47311db7771e4
Reviewed-on: https://gerrit.libreoffice.org/15085
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Preset shape text rotation values are read in a few places and stored in
moRotation. With these changes, moRotation is always read unchanged, but
multiplied by -1 when it's used.
Change-Id: I633d665c21daa69e15fa828a43300f10d2bf2054
Reviewed-on: https://gerrit.libreoffice.org/13561
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit 921cea89da8adbe714ea8f71169dd6afc42354c4)
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/15084
|
|
(cherry picked from commit 302f413eec4da8c8572911d08e939186c5ac57cf)
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
Change-Id: Ie65a8adbd077997f4a13914dd8e0ba4d55afd7b7
Reviewed-on: https://gerrit.libreoffice.org/15017
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
|
|
Change-Id: I96bafad0cc73b27c2a08b5205a35b10b4901afb9
(cherry picked from commit 547c58a6173535c679027c83fb3ed77f6060fd09)
|
|
Change-Id: I7dbc3017f2bba7b186174be2e4fd8c9ce7005d34
(cherry picked from commit 708d201884c4940647dc65e43e887803f06dce87)
|
|
(cherry picked from commit 15174177091367332b57cd79575e2f7dd27388b2)
Conflicts:
oox/source/core/xmlfilterbase.cxx
Conflicts:
oox/source/core/xmlfilterbase.cxx
Change-Id: I4052c6f1e5dde71ce4cede1ec9a313f461861d71
|
|
Conflicts:
oox/source/drawingml/chart/chartspacefragment.cxx
oox/source/drawingml/chart/chartspacemodel.cxx
Change-Id: Ie143751d22404dac8f31c8ecef90a0e185e07973
|
|
Change-Id: I07080c0d42029b7e44f4a6104c18dd75c7356ae0
|
|
Change-Id: I943be2cf660d2dc77eebd776208af96c0b5f67a4
(cherry picked from commit 0d1bd8c4f12d4e60d1f33f7df0a201d2affb7767)
|
|
Change-Id: I53002c0b97da66c44429b5ace0fc709b5e8a325f
(cherry picked from commit de684f47da785c0da6194df1f582648ebf3d1569)
|
|
Change-Id: Iee7fea0f55cf54d43a349b6cc0ffa25995069e40
(cherry picked from commit 32fe0c6adcff25a0df536127ca980413e1cabefd)
|
|
Change-Id: I7b488e222cd44e75d1e0ff7f8e545e9399f418b5
(cherry picked from commit a51300bc9223b28fc5da6059e4fe1d2af62fb323)
|
|
Reviewed-on: https://gerrit.libreoffice.org/14346
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit b1751e6ed0fd6d6d26141e4405df92520e3c04cd)
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
Change-Id: Iaa880528cf3c899ce66e4349c6d989dfbe5cbeb6
|
|
When alignment is not specified, it should be set to the
default "left" value just on time, when properties are
pushed to the property set, otherwise uninitialized value
is better.
(cherry picked from commit 7a64988dbc7a1542aa38f0e8f9a8a47941fbc67d)
Conflicts:
sd/qa/unit/import-tests.cxx
Conflicts:
sd/qa/unit/import-tests.cxx
Change-Id: Ic294c5d7cc477f7515aea1c071ad9b67275c012d
Reviewed-on: https://gerrit.libreoffice.org/13607
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit 50c9a8bf7473bf369ccd7e3060ef732ac6cf58f5)
|
|
When theme index is 0, it means it's unset so we should not
apply that.
(cherry picked from commit 89206c472ecf18bfde6824cea8004921cd404365)
Conflicts:
sd/qa/unit/import-tests.cxx
Conflicts:
sd/qa/unit/import-tests.cxx
Change-Id: I62a9cd2a9b4c19f5acffc334d5e8263fe24fc8fd
Reviewed-on: https://gerrit.libreoffice.org/13606
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit 4679ba35ad02a720789a8d0c571fafe4122d91a2)
|
|
-Make embedded text documents exported by analogy with spreadsheet
embedded documents.
-Convert MS ole objects to LO sepcific objecst to allow
exporting those ole objects too.
Plus use gb_CppunitTest_use_rdb instead of wasting time on
finding out which missing components cause test failing.
Especcially when we have platform dependent components
(e.g. related to embedded object)
(cherry picked from commit 0c3d5fb0ad35ff7fc18917fc86fa58d9312fe3ae)
Conflicts:
sd/CppunitTest_sd_export_tests.mk
sd/qa/unit/export-tests.cxx
ERROR: Attribute 'spid' must appear on element 'p:oleObj'.
As pointed out by CppunitTest_sd_export_tests.
(cherry picked from commit 124c33dd1d6bf2040f0153de8c9ecaebe759c3bd)
ERROR: Invalid content was found starting with element 'p:pic'.
Again, as pointed out by CppunitTest_sd_export_tests. Sadly it seems that the
spec and PowerPoint is not in sync here, so just do what makes both happy. This
fixes the --with-export-validation build.
(cherry picked from commit cf15306ccf49da290b391517e2c5dd22a4f1be45)
Change-Id: Ic76d659b51274777a1669c215344a1169ebcba81
Reviewed-on: https://gerrit.libreoffice.org/13601
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit 2f7a4c04c0531a74b92546a7b8808d03a51ecd99)
|
|
Change-Id: I0d248a195852c14cd95d4e337823076dd2fbc19d
(cherry picked from commit 8302d048653d9ac25d3cb9ab9277df715053ad6a)
(cherry picked from commit a757e1b1300dde12fb865c1efd64bfd2bef00e2c)
Reviewed-on: https://gerrit.libreoffice.org/13272
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
See also:
81cd386facedfbb15be6dffc10351262abf733f3
(cherry picked from commit 664a56b3c81503bdf199edf1806676f0a35b956f)
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Conflicts:
sd/qa/unit/import-tests.cxx
Change-Id: Ibb21d3e5b52a4d4996202acd4a989910fa223632
|
|
The problem was that the background color defined by theme
was not imported correctly, because the different fill
style comes from different sources (master slide, theme,
direct formatting) were applied on the shape in wrong order.
To solve this we need to store master slide defined fill style
in a different variable so theme style can be applied after master
slide defined style but before direct formatting.
(cherry picked from commit 81cd386facedfbb15be6dffc10351262abf733f3)
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Conflicts:
sd/qa/unit/import-tests.cxx
Change-Id: I99ea981858b9fa391915570187c8ddfdf2be1f7a
|
|
(cherry picked from commit 02e52b15908a6d89b4aeb3c349e7414240eb9563)
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Conflicts:
oox/source/export/drawingml.cxx
sd/qa/unit/export-tests.cxx
Change-Id: Ia17b14c4b27e808ceab388aa33602875e67433a5
|
|
Conflicts:
oox/source/drawingml/chart/objectformatter.cxx
Change-Id: I116e7e8c9046009cfcadc04b5367a6fe25f88d96
Reviewed-on: https://gerrit.libreoffice.org/11910
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
|
|
There is a missing dependency on one of the generated header files.
Change-Id: Id3fa2ccf2c2a31527b795861afdf557882f56972
(cherry picked from commit 63e6cbc3180047000787a9071513152fdd9ce942)
Reviewed-on: https://gerrit.libreoffice.org/11844
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Color::getColor() method uses some caching mechanism which
works wrong when the result depend on one of the input parameters.
So avoid caching in these cases.
(cherry picked from commit cfe658c289de030dc3a8fecd3bac0a0004a18061)
Conflicts:
sd/qa/unit/import-tests.cxx
Change-Id: Ifa9221e21e685715454de86d5cec09ff6c266307
Reviewed-on: https://gerrit.libreoffice.org/11724
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
Change-Id: I0bafd2c43d29806eea0ff0cb165e67aece53488f
Reviewed-on: https://gerrit.libreoffice.org/11726
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
This is a squash of commits f6fa787 to e5bbc721 .
Change-Id: Ieb76ccb2fe8a425af3204de144021b7a731d0778
Reviewed-on: https://gerrit.libreoffice.org/11701
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
Change-Id: I545ed112b54fb3d81e67b0f42230811cd48de626
(cherry picked from commit 4652700776666e385946c47235363c1120846d5d)
Reviewed-on: https://gerrit.libreoffice.org/11653
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
|
|
Do not ignore 'lnRef' element.
Also fix typo to apply 'seCell' properties to the right cell (southeast).
Change-Id: Ia45f7016f358b70e6db06a232c569335ce9d7051
(cherry picked from commit 18898e13fda25fe6dc85318dd0711355c7b2cc26)
Reviewed-on: https://gerrit.libreoffice.org/11652
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: Ie9b6c5ff866269e5d7a26d025cb1c0d884ff1134
(cherry picked from commit b7006f3c2f8f71f4d4721c6e5cdc122628c756f0)
Reviewed-on: https://gerrit.libreoffice.org/11469
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
|
|
Change-Id: I1d428ccd434b7b6f61461ea29447291759c3a7bf
(cherry picked from commit 732e7bdfa2d0e7b0296599517f53d194c02acfee)
|
|
If sourceLinked is used, do not set "PercentageNumberFormat" even if
showPercent is true. The format string should be used for "NumberFormat".
c8cc89ff802d86b1f3a69afe1b4835b7df7f70c7 unnecessarily disabled
"LinkNumberFormatToSource". Use that for data labels but not for axis.
Also, actually make attaching number format supplier work for Calc.
Previously, non standard formats were added into wrong supplier,
and they were thrown away later because it was attached too late.
(See also ChartModel::attachNumberFormatsSupplier)
(cherry picked from commit d22a4d945ccf1456fbdb2c39802d956afa583a2a)
Conflicts:
chart2/qa/extras/chart2import.cxx
oox/source/drawingml/chart/chartconverter.cxx
Change-Id: Iaf9945abc3d82d0ac63d9f36b8888eb49f39ab57
Reviewed-on: https://gerrit.libreoffice.org/11414
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
|
|
Only getBackgroundFillProperties() (fill) was used.
Use also getBackgroundFillStyleRef() (fillRef).
Also, do not replace table background color value with cell color,
we have to interpolate the two colors (if cell color is transparent).
Unfortunately, we don't use background table property in LibreOffice, so
this seems to be a best workaround.
(cherry picked from commit 43efd9b40d40b791a2c2deedcac36b99f7efb2cf)
And add unit test.
(cherry picked from commit 5681725f1a2535a13b86104d8b8a33f750f34efc)
Change-Id: I21bcc87a149c9f6d865ebee4012132ccc3a54af2
Reviewed-on: https://gerrit.libreoffice.org/11353
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
The import mechanism of custom-dash (a:custDash) was wrong, and imported
wrong values, which causes that if you would import-export-import-export -
you would get inflated values, which might cause a corruption.
The attributes for custom-dash nodes (a:ds) are of type 'PositivePercentage'.
Office will read percentages formatted with a trailing percent sign or
formatted as 1000th of a percent without a trailing percent sign, but only
write percentages as 1000th's of a percent without a trailing percent sign.
During import - LO did not check if it was in '%' format or in
'1000th of a percent' format. So that was fixed. Also - when exporting -
it always exports now in '1000th of a percent' format.
Reviewed-on: https://gerrit.libreoffice.org/9681
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit 2211a67cc5e577f8abdcc96c9c63865be5fb988d)
Conflicts:
oox/source/export/drawingml.cxx
Change-Id: I6bd74df26951974f85173227c832386c70034afb
|
|
Change-Id: I8c611b49e3bf4645736425bd33c2994ae2c28337
Reviewed-on: https://gerrit.libreoffice.org/11270
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
If numbering is detected then (level is > 0) and the number type
is not set, the defult bullet symbol is written. This is not
correct as the default should be SVX_NUM_NUMBER_NONE which should
skip numbering or set it to none. With this change the numbering
is skipped (as in MSO).
(cherry picked from commit 14fa2698f2f651343675761e75be01b84c4c5ff1)
Conflicts:
oox/source/export/drawingml.cxx
Change-Id: I8d08a6325509c7bd6f96f64c8d29e5f3045458ca
Reviewed-on: https://gerrit.libreoffice.org/11181
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
Without this, the creation / modification date is lost on import.
(cherry picked from commit ef2668bad976f1fbb70759887cafd35ea7833655)
Conflicts:
sd/qa/unit/import-tests.cxx
Change-Id: I0b74ac91aee7b8b3e0bc763247086a3a39816bc1
Reviewed-on: https://gerrit.libreoffice.org/11167
Reviewed-by: Zolnai Tamás <tamas.zolnai@collabora.com>
Tested-by: Zolnai Tamás <tamas.zolnai@collabora.com>
|
|
If subTitle placeholder is not found, try body instead of title.
And use body text styles instead of title, for subTitle.
Also improve PPTShape::findPlaceholder to find placeholder
with just nSecondSubType type without the same index.
(cherry picked from commit 2a7119021edea8346e4673d57cac3f051a5d0968)
Conflicts:
oox/source/ppt/pptshape.cxx
Change-Id: I470e7268088eb989fb934007dfcf704f67d8cb1d
Reviewed-on: https://gerrit.libreoffice.org/11065
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
|
|
It's horribly broken and it would resize text box
horizontally which is not supposed to happen.
Change-Id: I201ec8dbcddca56d21bf46ea8ee838d01923c442
(cherry picked from commit d068f13596f6d1023a70d98ec2059d38ad6fd777)
Reviewed-on: https://gerrit.libreoffice.org/10541
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
|
|
Placeholder type seems to be more relevant than index.
Change-Id: I9d6c6cad8e0a51b2385801f65d7d1c697ad7998e
Reviewed-on: https://gerrit.libreoffice.org/10844
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
|
|
Set "LinkNumberFormatToSource" to false, so that format code is not
ignored.
Also, do not inherit format code common for all labels, if there is
specific format code for a data label.
Change-Id: I505311d5df641d61e616e354734bd332609fa122
(cherry picked from commit c8cc89ff802d86b1f3a69afe1b4835b7df7f70c7)
Reviewed-on: https://gerrit.libreoffice.org/10780
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
|
|
Usually, "General" is "0.00" number format, but in this case, when we
want to show percent value, MSO writes that instead of "0%".
Change-Id: I748719765f58e66f9f3fb43c2b527c6823ef6fa1
(cherry picked from commit 5f47e319428a703ea53ce49d166e7628aaa60789)
Reviewed-on: https://gerrit.libreoffice.org/10779
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
|
|
Charts in docx and xlsx OTOH use solid white as the default fill style.
(cherry picked from commit 4a8f2431718f99de6fd9ee3461d703d007261c03)
(cherry picked from commit 013744a5b475e151ca0918565fb369e22dfbc1db)
Conflicts:
oox/source/drawingml/chart/chartspaceconverter.cxx
Change-Id: Ic4351fe65cabc12d60214b67c7026a317841f2c7
Reviewed-on: https://gerrit.libreoffice.org/10736
Reviewed-by: Matúš Kukan <matus.kukan@collabora.com>
Tested-by: Matúš Kukan <matus.kukan@collabora.com>
|