summaryrefslogtreecommitdiff
path: root/oox
AgeCommit message (Collapse)AuthorFilesLines
2014-09-30bnc#584721: invisible text because of wrong color (white)Zolnai Tamás1-10/+20
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/11723 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-09-30Resolves: fdo#79129 Crash in oox::drawingml::LayoutNode::setupShapeCaolán McNamara1-1/+9
Change-Id: I0bafd2c43d29806eea0ff0cb165e67aece53488f (cherry picked from commit c84ce79132c674b4c2d31da8997ed77671323dfe) Reviewed-on: https://gerrit.libreoffice.org/11727 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-09-26bnc#897769: OOXML import: Import border lines using reference too.Matúš Kukan1-22/+33
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)
2014-09-17fdo#65836 bnc#621241 Do not compress WMF / EMF file incase of OOXML exportNikhil Walvekar1-2/+2
(cherry picked from commit 8fe352be80ff69552f622f3c7a6a6f269912ab71) Change-Id: Ic498e5703ab48719f998be6da3f245843cc0979d Reviewed-on: https://gerrit.libreoffice.org/11426 Reviewed-by: Nikhil Walvekar <nikhil.walvekar@synerzip.com> Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-09-17bnc#591147: OOXML import: Import video file too.Matúš Kukan1-13/+27
Change-Id: Ie9b6c5ff866269e5d7a26d025cb1c0d884ff1134 (cherry picked from commit b7006f3c2f8f71f4d4721c6e5cdc122628c756f0) Reviewed-on: https://gerrit.libreoffice.org/11468 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-09-12bnc#892610: OOXML import: Improve chart number formats.Matúš Kukan5-26/+23
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/11415 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-09-12bnc#480256: OOXML import: Respect table background properties a bit moreMatúš Kukan2-6/+38
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/11352 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-08-31bnc#822347: if number type is not set, skip numberingTomaž Vajngerl1-1/+4
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/11180 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-08-28PPTX import: fix missing document metadataMiklos Vajna1-0/+2
Without this, the creation / modification date is lost on import. (cherry picked from commit ef2668bad976f1fbb70759887cafd35ea7833655) Signed-off-by: Andras Timar <andras.timar@collabora.com> Conflicts: sd/qa/unit/import-tests.cxx Change-Id: I0b74ac91aee7b8b3e0bc763247086a3a39816bc1
2014-08-12bnc#887227: Do not set TextAutoGrowHeight for vertical text.Matúš Kukan1-1/+5
It's horribly broken and it would resize text box horizontally which is not supposed to happen. (cherry picked from commit d068f13596f6d1023a70d98ec2059d38ad6fd777) Change-Id: I201ec8dbcddca56d21bf46ea8ee838d01923c442 Reviewed-on: https://gerrit.libreoffice.org/10585 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-11Fix some number format issues, bnc#862510Matúš Kukan3-6/+6
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/10782 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2014-08-11bnc#862510: PPTX import: Properly show data labels in percent format.Matúš Kukan1-2/+5
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/10781 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2014-08-06bnc#886540: Default chart background for pptx docs should be transparent.Kohei Yoshida3-1/+19
Charts in docx and xlsx OTOH use solid white as the default fill style. (cherry picked from commit 4a8f2431718f99de6fd9ee3461d703d007261c03) Conflicts: oox/source/drawingml/chart/chartspaceconverter.cxx oox/source/ppt/pptimport.cxx Change-Id: Ic4351fe65cabc12d60214b67c7026a317841f2c7 Reviewed-on: https://gerrit.libreoffice.org/10737 Reviewed-by: Matúš Kukan <matus.kukan@collabora.com> Tested-by: Matúš Kukan <matus.kukan@collabora.com>
2014-07-25bnc#862510: PPTX import: bullets have color as following text by default.Matúš Kukan1-0/+2
aTextCharacterStyle contains font theme color set in Shape::createAndInsert. (cherry picked from commit d60cec0e60c5c0880f8098d39443c391abed80b2) Change-Id: I55e66aeaa7176fbd3f64dcdf075d411f460947d4 Reviewed-on: https://gerrit.libreoffice.org/10514 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-07-21bnc#887230: always use theme color for hyperlinks in ImpressMatúš Kukan1-2/+1
Change-Id: I888f107c61037162439ad2d1ba99ad8185532f71 (cherry picked from commit 92f74f6ccb5a55807724db85815f7ea0c49370e0) Reviewed-on: https://gerrit.libreoffice.org/10383 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-07-18use rtl::math::round here to get the same number on 32/64bit platformsMatúš Kukan1-1/+2
This fixes sd_import_tests where 100*0.35 was 34 on 32bit platform. Change-Id: I45705326e91892beb814bd94e074b0a652709768 (cherry picked from commit ba6da9545764f2545313ba085ed4a096165180fd) Reviewed-on: https://gerrit.libreoffice.org/10382 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-07-17bnc#887225: OOXML import: Correctly apply table style for lastRow.Matúš Kukan1-1/+1
nMaxColumn and nMaxRow are indexes, so use size() - 1. Change-Id: I20055e55cf2464710fe553fb8067bad13a339084 (cherry picked from commit 47645734c350f244b4a5642a709132ca1b7dc75d) Reviewed-on: https://gerrit.libreoffice.org/10329 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-07-17Do not prefer bandRow over firstCol/lastCol, nor the same with bandCol.Matúš Kukan1-2/+6
Change-Id: I0c573d721212c870e9ecc99ba5e8494073e09aaf (cherry picked from commit 5d2f12a44d2af3e42e0c3a17ff556f5ada27b1b8) Reviewed-on: https://gerrit.libreoffice.org/10330 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-07-17bnc#862510: Improve handling of OOXML gradientsTor Lillqvist2-26/+192
OOXML gradients can have an arbitrary number of "stops". LibreOffice gradients have just a start and end colour, plus an optional uniformly coloured border (on the "start" side). In addition, LibreOffice has the "axial" gradient mode, which means the gradient is reflected in the middle. It is thus obviously impossible in general to losslessly map OOXML gradients to LibreOffice ones. But let's try a bit harder than earlier to get visually more similar result, in at least some simple sample cases. We look for the widest gradient segment and use that for the start and end colours of the LibreOffice gradient. Also, map an OOXML gradient to an axial LibreOffice gradient only if it is symmetrical. Also, use the border property when suitable. In general, look for the widest OOXML gradient segment (once a segment corresponding to the LibreOffice gradient border, if any, has been accounted for) and use that as the LibreOffice gradient. Possibly some perceptionally better heuristic should be used... Like, if we have a three-segment gradient, with a wide gradient segment between two visually very similar colours (for example, two shades of red), and a narrower segment ending with a visually very different colour (for example, yellow), it probably would be best to represent that in LibreOffice as a gradient from the first red shade to yellow, instead of as a gradient between the two shades of red. Or even, if a first or last gradient segment is between very similar colours, equalize those start and end colours, thus using a border colour in LibreOffice instead. The possibilities for bikeshedding are endless. I am sure there are instances where the old code (by accident?) produced visually more pleasing results... But hopefully this works more pleasingly and consistently in a larger number of cases. Change-Id: If153e986ad943454307e3ba718479d5ac4cdc7ab Reviewed-on: https://gerrit.libreoffice.org/10359 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-07-15Related: fdo#52226 ensure graphics are swapped in on DrawingML::WriteImageCaolán McNamara1-8/+26
I imagine it would be best that the Graphics were delivered pre-swapped in by higher levels in case there are second level caches or more complex caching systemed wrapped around it, so warn about it in debug mode but give it a last-ditch shot anyway. i.e. while the .docx problem should be fixed there is a report of a very similar .xlsx problem Change-Id: Ie40ee10fe5cba8ff9c321f47b83e33ee2c1425fd (cherry picked from commit 6e580f3f53ae2de086a08c8ba1958b67874eb9c5) Reviewed-on: https://gerrit.libreoffice.org/10300 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-07-10bnc#881025: Mark axis a percent axis only when all data series are percent.Kohei Yoshida2-10/+34
(cherry picked from commit b8c444a46b2f41dae673c6118d84276be0e6c87d) Signed-off-by: Andras Timar <andras.timar@collabora.com> Conflicts: oox/inc/drawingml/chart/axisconverter.hxx Change-Id: I302cc1e5b164b2ce9999087293b034ec930951af (cherry picked from commit 3997f7b8e5f07312466e66f6bcf0a4ac1c8c5a39) Signed-off-by: Andras Timar <andras.timar@collabora.com>
2014-07-10Adjust for the splitting of number format properties in chart.Kohei Yoshida3-12/+5
Since 1d38cb365543924f9c50014e6b2227e77de1d0c9, "number format" and "link number format to source" properties are 2 separate properties. Adjust OOXML import code for that split. Also, always set axis' number format via NumberFormat property even when it's a percent format. The axis object doesn't keep a non-percent and percent number formats separately. Change-Id: I8667b6f1a78d88cc37d059518919ad1b37f154e1 (cherry picked from commit af5a6615dfdbe5c2cacdcacb00fc6f418b925c06) (cherry picked from commit 29d5f3db525e275c62cd2eafb18899fe68198ea3) Signed-off-by: Andras Timar <andras.timar@collabora.com>
2014-07-09bnc#882383: Do not ignore themeOverride for charts in .pptxMatúš Kukan3-1/+68
Otherwise wrong colors are displayed. (cherry picked from commit 08818d8a45e034ad825c7fafbb76766f106f1d1d) Conflicts: oox/source/drawingml/shape.cxx Change-Id: I5d7444100355fdbc5fcd2aaa1c01202ace54312d Reviewed-on: https://gerrit.libreoffice.org/10164 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-07-08fix crash loading ooo100546-1.xlsCaolán McNamara1-4/+4
regressions around inserted extra enum values into ShapePropertyId (cherry picked from commit aacfd5038d05a02f8b1eade3a5896d3d7e959f3d) Conflicts: include/oox/drawingml/shapepropertymap.hxx oox/source/drawingml/chart/objectformatter.cxx Change-Id: I06696c8cfe4acc3836723c31d5e714bd7d8439b3 Reviewed-on: https://gerrit.libreoffice.org/10136 Reviewed-by: Matúš Kukan <matus.kukan@collabora.com> Tested-by: Matúš Kukan <matus.kukan@collabora.com>
2014-07-03bnc#812796: Correctly handle static value array for OOXML charts.Kohei Yoshida3-5/+7
We need to pass the role of the data sequence in order to avoid unreliable guess work when importing static value array. Also, not all Excel's scatter plots have real numeric X values; some have textural X values in which case Excel switch to generating 1, 2, 3, ... as X values. When importing to our chart implementation, using "categories" role in such cases instead of "values-x" results in a more faithful chart rendering. (cherry picked from commit 6c4e21a234f12e1310ba06f9859e08b424acf8bf) Signed-off-by: Andras Timar <andras.timar@collabora.com> Conflicts: chart2/source/inc/InternalDataProvider.hxx chart2/source/tools/InternalDataProvider.cxx Conflicts: chart2/source/inc/InternalDataProvider.hxx dbaccess/source/core/inc/DatabaseDataProvider.hxx dbaccess/source/core/misc/DatabaseDataProvider.cxx sc/source/filter/inc/excelchartconverter.hxx Change-Id: If4bc1f650bb024dcd1b1b36537f457fb38404a78 Signed-off-by: Andras Timar <andras.timar@collabora.com>
2014-07-03bnc#812796: Don't create data series when the series has no values.Kohei Yoshida1-0/+4
Change-Id: I92e2d7a3fab0948aea0557cf3cb65d57d48f3f59 (cherry picked from commit 5e2b7e37a29edf45f829ccee2302a942b54568a1) Signed-off-by: Andras Timar <andras.timar@collabora.com>
2014-07-01Use a new fast parser instance for each XML fragment.Kohei Yoshida1-1/+5
Otherwise a crash ensues when the threaded XML parsing kicks in. Change-Id: Ic41e5a29bbb860d7b63b70f2f0d8896264d9d53e (cherry picked from commit dc93074f71f91efd8a615ad8f1a5289deb210b75) Reviewed-on: https://gerrit.libreoffice.org/10003 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2014-06-26n#828390: Reset charescapement.Muthu Subramanian1-0/+3
Unless the value is reset - the escapement seems to continue to the next set of textruns. (cherry picked from commit fdf77f50ab825bd2b44e980552f3383acf637b12) Signed-off-by: Andras Timar <andras.timar@collabora.com>
2014-06-12Related bnc#862510: extend handling of txXfrmZolnai Tamás2-28/+34
We don't actually need to check mbAnchorCtr to change text spacing. This txXfrm workaround works only with rectangles, because other shapes' text area can be smaller then the shape size. So add some condition to avoid using it for other shapes. Plus fix typos cause regression introduced in: 53c376d35b7223d53e8c9403390afe53d1f69089 (cherry picked from commit 98dd0f2bb5801f974374ef341037e094e4275cbb) Conflicts: sd/qa/unit/import-tests.cxx Change-Id: I87917b8e0b2bb97ae1bba773e7dda7f81682736f Reviewed-on: https://gerrit.libreoffice.org/9728 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-06-10bnc#880763: PPTX import: wrong z-order becuause of wrong import orderZolnai Tamás2-9/+12
importExtDrawings() must be called as soon as possible, before parser starts to parse the next shape. Call it when graphicFrame tag is closed. This tag include the reference to the SmartArt. Plus fix up import tests. (cherry picked from commit 46d682eec92bb241f4604a4b6ab42a3859cd0d48) Conflicts: oox/source/drawingml/graphicshapecontext.cxx sd/qa/unit/data/xml/n819614_0.xml sd/qa/unit/import-tests.cxx Change-Id: I9e8d54c2b1afeb78a1122390dc4982d580c152ae Reviewed-on: https://gerrit.libreoffice.org/9671 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-06-062nd part of bnc#870233: import font color from color fragment for SmartArtsZolnai Tamás3-41/+60
SmartArt import ignores some fragments during import if drawing fragment exists, which seems to be not complete. In this case font style is blank (white) in data (and drawing) fragment and the real value is defined in the ignored color fragment. So first make color fragment parsing work, then apply font color of "node0" style on nodes of the SmartArt. Actually, it's a workaround, because "node0" style label is hardcoded, for a proper solution layout fragment should be parsed too to get the right style label, but it interferes with the drawing fragment by now. (cherry picked from commit 639571d52b1b7e4cf912803642ca245c5dd86839) Conflicts: oox/source/drawingml/diagram/diagram.cxx oox/source/drawingml/diagram/diagramfragmenthandler.cxx Change-Id: I7db89176a07eee928563d42d3896fbd02190dfa8 Reviewed-on: https://gerrit.libreoffice.org/9662 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-06-061st part of bnc#870233: wrong list style in shapesZolnai Tamás1-0/+28
Text list styles were copied, without proper copy constructor and operator. It lad to mix up list styles and so text font. (cherry picked from commit 31650d5b4255c484faec11d570cb98a80f0120cc) Conflicts: sd/qa/unit/import-tests.cxx Change-Id: Iee7a6c0c1f74322fd7b80e41a262849f948e463a Reviewed-on: https://gerrit.libreoffice.org/9661 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-05-31bnc#870237: wrong text position in grouped listZolnai Tamás2-4/+23
In grouped list text area does not cover the whole shape but just a part of it at the top. To get the same visual effect modify text distance attribute. (cherry picked from commit 53c376d35b7223d53e8c9403390afe53d1f69089) Conflicts: sd/qa/unit/import-tests.cxx Change-Id: I32f30d0afbc1975f940c4562ec65f46596e97060 Reviewed-on: https://gerrit.libreoffice.org/9569 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-05-25Resolves: fdo#79137 Crash in oox::vml::InputStream::updateBufferJulien Nabet1-0/+2
bt shows: Program received signal SIGSEGV, Segmentation fault. 0x00002aaadba213fb in oox::vml::InputStream::updateBuffer (this=0x8d7fd80) at /home/julien/compile-libreoffice/libreoffice/oox/source/vml/vmlinputstream.cxx:339 339 while( (mnBufferPos >= maBuffer.getLength()) && !mxTextStrm->isEOF() ) (gdb) bt 0x00002aaadba213fb in oox::vml::InputStream::updateBuffer (this=0x8d7fd80) at /home/julien/compile-libreoffice/libreoffice/oox/source/vml/vmlinputstream.cxx:339 0x00002aaadba21048 in oox::vml::InputStream::available (this=0x8d7fd80) at /home/julien/compile-libreoffice/libreoffice/oox/source/vml/vmlinputstream.cxx:326 0x00002aaacf5a0249 in sax_fastparser::FastSaxParserImpl::parseStream (this=0x89aea30, maStructSource=...) at /home/julien/compile-libreoffice/libreoffice/sax/source/fastparser/fastparser.cxx:810 Indeed, mxTextStrm is invalid, so let's test its validity in InputStream constructor Cherry-picked from 372d5d74ad8cfb9b69dc20557359c4a2c1597b57 Change-Id: Ifed79603e33b64d11eb07656df17824b7f98058f Reviewed-on: https://gerrit.libreoffice.org/9466 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-05-21n#862510: Ignore baseline attributes with zero.Muthu Subramanian1-1/+1
Change-Id: I1adc46e62c82c23645ccad0e11d5a7cb07114539 (cherry picked from commit 19abfaffe74b925e4428943d14187a7008797982) Signed-off-by: Andras Timar <andras.timar@collabora.com>
2014-05-16Use SVM (metafile) instead of PNG for diagrams (SmartArt)Tor Lillqvist1-16/+10
It seemed a bit pointless to waste CPU cycles on PNG-compressing a bitmap image only to later then uncompress it anyway. vcl's PNG writing code showed up as 13% on the time profile of TiledLibreOffice when displaying a document full of SmartArts. Miklos suggested I try using SVM (which I guess means "StarView Metafile") instead. When using SVM, no rendering of diagrams to bitmaps during loading is done, but the diagram stays stored in a resolution-independent (vector-ish) form. Which means it will be rendered nicely and crisply regardless of the zoom level. At least, that is my understanding, and experimentation (on OS X and Linux) seems to confirm. ce8c0ff07559ddcc729bffd7a68f4c6f281882e3 Change-Id: Ice8c0ff07559ddcc729bffd7a68f4c6f281882e3 (cherry picked from commit 633003965a4be0c535b43cc3072c5c4a95109d34) Reviewed-on: https://gerrit.libreoffice.org/9382 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-05-11n#862510: anchorCtr controls the anchoring as well.Muthu Subramanian2-4/+4
(cherry picked from commit c17eb67460293fbe72ffa8e80cd10743df493afa) Signed-off-by: Andras Timar <andras.timar@collabora.com> Conflicts: oox/source/drawingml/textbodypropertiescontext.cxx Change-Id: Ib244d89a9f7d400b3891d477314cd5f0193552e0
2014-05-01handle brightness+contrast from msoffice (bnc#875713)Luboš Luňák1-2/+24
This is the same like 1139d618b8bc6ab823a96184bd0f0257980aad24, for docx. (cherry picked from commit 893fe88469dec5b727d96f8ea1b4edb9e88288a7) Conflicts: oox/source/drawingml/fillproperties.cxx Change-Id: I1ef4e18444e8c60e9ae8f67249bcef1053f0d62d Reviewed-on: https://gerrit.libreoffice.org/9217 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-04-28n#870234: Import gradfill for text colors.Muthu Subramanian2-0/+7
Uses the first color from the gradfill list. (Which is better than plain black!) (cherry picked from commit cfc76de83e3c0a56abd30a8f3bd7c69d3500d223) Signed-off-by: Andras Timar <andras.timar@collabora.com> Conflicts: oox/source/drawingml/textcharacterproperties.cxx oox/source/drawingml/textcharacterpropertiescontext.cxx Change-Id: I4c1c0c4b031f3681c95b75b3c0683eb4de95bffb
2014-04-28n#862510: Fix text rotation.Muthu Subramanian1-1/+2
Fix breaks document in n#783433 - the one there is damaged - resaving it using mso 2010 should fix the problem there. Change-Id: Ib2ee7ab20489d716dc189ac6810d705763a16476 (cherry picked from commit e3e12b1d1e36e1a0d4fc4c6423b584d677693897) Signed-off-by: Andras Timar <andras.timar@collabora.com>
2014-03-28write (no)wrap of text only for custom shapes to .pptx (fdo#71961)Luboš Luňák1-1/+3
Apparently checking the TextWordWrap property in DrawingML::WriteText() gives false by default for objects that do not have it set, which happens to be everything except for custom shapes, which seem to be the only ones to actually obey it. So all normal text would be exported as nowrap to .pptx and read back as custom shape that has non-wrapping text. I tried to make the property return true (which is what it should be in practice), but that appears to be an exercise in futility, or I'm not mad enough to follow the complicated property sets and whatnot. So just write it out only for custom shapes. UNO purists, if any, are welcome to change the dynamic_cast to something UNO-better if they manage without an ambiguous base class error. Conflicts: sd/qa/unit/import-tests.cxx Change-Id: I3ed906285fde88d902ac9c801986a82a7515638b Reviewed-on: https://gerrit.libreoffice.org/8774 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-03-25fdo#76222 oox: add support for MSO 2007 SP2 encrypted documentsTomaž Vajngerl1-0/+1
Change-Id: I8fa586d49437ff5422fc3daa4c81439146e598a0 Reviewed-on: https://gerrit.libreoffice.org/8734 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-03-23fdo#75955 use SHA1 from openssl/nss instead of rtl_digest_sha1Tomaž Vajngerl1-6/+38
Change-Id: I92186b2ed8426d59e31080cfb629beb02cd01c41
2014-03-17oox: try to fix incremental buildMiklos Vajna1-1/+2
The problem was that the input of the generated vmlexport-shape-types.cxx got changed, but it was only built when building from scratch. Fix this by depending on the makefile as well. (cherry picked from commit b916fc4840ba67ef30e45ea735408237a3422b56) Signed-off-by: Michael Stahl <mstahl@redhat.com> Conflicts: oox/CustomTarget_generated.mk Change-Id: Ia2d7f059aae2f5819bb8a1329fefa74c56660607
2014-03-17cp#1000025: Import casemaps from pptx.Muthu Subramanian1-0/+2
(Ported from: 887bc4dd3e62fe6dd19dc9d1c3ba273a5b21b5ec and 9dbcb79782d6a5b80c21a0c093537d18425b826f) Change-Id: I211491e06273aedf5c8ddbd0ca3fc35f3d168aaa Reviewed-on: https://gerrit.libreoffice.org/7848 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-03-17n#821567: Import PPTX background images with table-name.Muthu Subramanian2-2/+18
Ported from 2ec4d410de5bd98527336a9dc49abb76656373df Change-Id: I19cefa3097d8a7c2da057089efb52ec8fd45b2b0 Reviewed-on: https://gerrit.libreoffice.org/8544 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-03-16n#828390: Bullet sizes set wrong.Muthu Subramanian1-1/+1
(cherry picked from commit e5cd547846663c69bd66aa1ba94e3b4dcce30a89) Signed-off-by: Andras Timar <andras.timar@collabora.com>
2014-03-16fdo#73627 n#828390: Explictly export font properties.Muthu Subramanian1-4/+4
Seems like the status is returned as default, but the font properties needs to be still exported. (cherry picked from commit 33b796eb1484b9a3fc11a189faddb7fc36509856) Signed-off-by: Andras Timar <andras.timar@collabora.com> Change-Id: I65619d10f44ad54ab79874c718e47677049a2ff8
2014-03-11handle OOXML strict namespacesMarkus Mohrhard16-28/+247
Change-Id: I198862388426161e3f054a5f128639c59f3c9d24 support OOXML strict documents in Calc Conflicts: oox/source/core/relations.cxx Change-Id: I277d76aeec28e173d913ccc1506464afe4d09c6d import date cells from OOXML Change-Id: Id0b9ec034d559d489ca4ee2d1d6aca1bdf1beb9d no need to add another layer of macros Change-Id: I49992559a7d10127d55dbf0c7e257c86619fd8d6 fix one more relation type for OOXML strict Change-Id: Ia63309271ac225883540ca0453fc5da21844d3ad make more places aware of OOXML strict relations Change-Id: I292217537eb592cbad9af11f87402baa9f4cc442 fix strict namespace list generation The two perl scripts were apparently only generating the same order by luck. It did not work on all systems. Change-Id: Ib83ee5c6572d3bae2e2ac1846850bd65303e7d43 allow OOXML strict relationships in writer Conflicts: writerfilter/source/ooxml/OOXMLDocumentImpl.cxx writerfilter/source/ooxml/OOXMLStreamImpl.cxx Change-Id: I1c09280f68467748faedee19c4a66be3bc7d7aa3 make sure the two namespace lists are sorted the same way Change-Id: I90b3182e10dbbfc8993010dd885509537d2fe537 fix OOXML strict chart import Change-Id: I84a2fd575ced64d4774147063f13ebb8605c100f add the xml strict namespaces to misc/namespaces.txt Change-Id: Ie83b5c94f1f002851bff3b39b1d9b676a3e44aa1 Reviewed-on: https://gerrit.libreoffice.org/8515 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-03-10fdo#72481 drawingml import: don't set CharEscapementHeight unconditionallyBjörgvin Ragnarsson1-1/+1
Commit 840a8573c8cebe67ddd3c9fe106c7dbd789bb334 (Fix fdo#70220 Superscript not imported from pptx., 2013-10-07) made it possible to set CharEscapementHeight even if moBaseline is not set, but this causes problems in the docx importer + not necessary, according to the bugdoc; so just don't do that. Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Commit and message cherry picked from: commit 798a563db133ebed3876c245459d90ef54ee7c9a Author: Miklos Vajna <vmiklos@collabora.co.uk> Change-Id: Ib95ac449bd8fdf6376261ddc86108f0d23f2200e Reviewed-on: https://gerrit.libreoffice.org/8415 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 09:15:39 +0000