summaryrefslogtreecommitdiff
path: root/include
AgeCommit message (Collapse)AuthorFilesLines
2014-09-10bnc#480256: OOXML import: Respect table background properties a bit moreMatúš Kukan1-0/+1
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>
2014-09-09Rewrite import and export of custom dashes in ooxml filter (fix)Adam Co1-2/+2
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
2014-09-04fdo#44081 don't remove 'edit' pop-up menu entry from form in design modeLionel Elie Mamane3-3/+8
Conflicts: sw/source/core/uibase/app/docsh.cxx Change-Id: I009b0e1a155c298bd7f461547125df4ba76805d9 Reviewed-on: https://gerrit.libreoffice.org/11232 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2014-09-04Upgrade libgltf to 0.0.1Zolnai Tamás1-0/+2
News in this version: - Solve some limitations of walkthrough mode (fdo#81425) - Multisampling (better rendering quality, mainly at the edges) - Better error handling (no crash in case of invalid input file) Reviewed-on: https://gerrit.libreoffice.org/11179 Reviewed-by: Zolnai Tamás <tamas.zolnai@collabora.com> Tested-by: Zolnai Tamás <tamas.zolnai@collabora.com> Conflicts: download.lst external/libgltf/UnpackedTarball_libgltf.mk external/libgltf/pathces/append_shader_version.patch external/libgltf/pathces/missing_include.patch vcl/source/opengl/OpenGLContext.cxx Change-Id: I46fdf56b00476614487fbcc04178e43e33a01794 Reviewed-on: https://gerrit.libreoffice.org/11194 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2014-09-03Allow STYLE_OPTION_MONO to be unset from toolkit-created windowLionel Elie Mamane1-1/+0
This was keeping form controls (e.g. CheckBox and RadioButton) to transition from flat style to 3d style, while the 3d-to-flat transition was allowed, making flat some unescapable pit of doom. Whatever the goal of that pinning, it will have to be achieved in a different way. Change-Id: Icc4dfb9673a7dfe4a7d8726fbfd23f75499f8b41 Reviewed-on: https://gerrit.libreoffice.org/9554 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2014-08-29Handle collada libraries seperately: --disable-colladaZolnai Tamás1-0/+4
Depends on gltf support. (cherry picked from commit 191f0944fd8fc30493eda58c7adfdfa0b538f507) Conflicts: config_host.mk.in sd/source/ui/func/fuinsert.cxx Change-Id: Ief0452da3d03b0ddbca45272e5f5cd268691aeca Reviewed-on: https://gerrit.libreoffice.org/11193 Tested-by: Rene Engelhard <rene@debian.org> Reviewed-by: Rene Engelhard <rene@debian.org>
2014-08-27DOCX import: fix handling of embedded DOCX filesMiklos Vajna1-0/+1
The problem was that SwXTextEmbeddedObject::getEmbeddedObject() returned an empty reference for those embedded objects, so the HTML filter couldn't extract their content when it wanted to do so. It turns out the reason for this was that the DOCX importer only handled the replacement image + raw native data for the object. Fix this by creating the embedded object with the correct CLSID and import the raw data into the empty embedded document model. This is similar to what is done for XLSX-in-PPTX in oox::drawingml::ShapeExport::WriteOLE2Shape(), just for the import part. (cherry picked from commit 41aa970b3120837ca9cadb12997a53ad322145a4) Conflicts: writerfilter/source/dmapper/OLEHandler.cxx writerfilter/source/dmapper/OLEHandler.hxx Also squash in 3 fixes on top of that in the HTML filter which are relevant only after the embedded DOCX import is fixed: 1) sw HTML export: don't crash on embedded object without native data (cherry picked from commit 35e954149d976e0e69a9f8b382fc67f5abc5eaa7) 2) sw HTML export: handle embedded text documents (cherry picked from commit 8d670c9452e930460be600212d73e22acd61cc0f) 3) sw HTML export: avoid invalid output for embedded documents When an sw document is embedded inside an sw one, then the inner sw HTML export should just write what's inside the <body>. Add a filter option for that in sw, similar to the one already existing in sc. (cherry picked from commit 8760b2b05c23e5fdf8ad7ad3f447a7489c2ddeac) Conflicts: sw/source/filter/html/wrthtml.cxx Change-Id: Id2cef966c1022ba45a3540bff234029c1d396778 Reviewed-on: https://gerrit.libreoffice.org/11151 Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Tested-by: Tomaž Vajngerl <quikee@gmail.com>
2014-08-12Resolves: #i125386# secured user request and changed some bools to bitfieldArmin Le Grand1-0/+3
(cherry picked from commit 5e3cbe056c19bea5018dbf1fd4b2bc8f8b030ff3) Conflicts: comphelper/inc/comphelper/embeddedobjectcontainer.hxx comphelper/source/container/embeddedobjectcontainer.cxx sfx2/source/appl/linkmgr2.cxx svtools/source/misc/embedhlp.cxx Change-Id: I7e9b20a87ca6afe8cb91c577860a6c6b72368ee9 (cherry picked from commit d005acae3aa315921f2c331612131626c470bd22)
2014-08-11bnc#821916: Better algorithm to find placeholder shape.Matúš Kukan1-2/+5
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>
2014-08-11fix memory leak around function descriptionsMarkus Mohrhard1-3/+2
Found by Lsan. Change-Id: Ia443ed6eb2a20854998a615f3c2bd9fdac156a8c (cherry picked from commit 3d6521280929ecacc53b7c358d29d0b5d31b3462) Reviewed-on: https://gerrit.libreoffice.org/10740 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-08-06hidpi, startcenter: Don't set fixed font heigt in the startcenter.Jan Holesovsky1-0/+3
Change-Id: I68efbd08d21b514ab1659cd6bddfc2c4788c4a74 Reviewed-on: https://gerrit.libreoffice.org/10682 Reviewed-by: Zolnai Tamás <tamas.zolnai@collabora.com> Tested-by: Zolnai Tamás <tamas.zolnai@collabora.com>
2014-08-06bnc#886540: Default chart background for pptx docs should be transparent.Kohei Yoshida1-0/+3
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>
2014-07-30bnc#885825: Handle ODF import and export of data label border properties.Kohei Yoshida1-0/+4
Change-Id: Ic8c7bc873768008537cd52a3fd4b11031b403139 (cherry picked from commit 6c2c974dd3f0b21a23bc3bc5560487d28bbe0fad) Reviewed-on: https://gerrit.libreoffice.org/10563 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-07-30bnc#885825: OOXML import and export of data label borders.Kohei Yoshida2-3/+2
(cherry picked from commit 48f31a924280a418046f0c816f8a7d20b672dac6) Conflicts: oox/source/export/chartexport.cxx Change-Id: I0fd808145aaeb0aa36d3ec30d7b977890642dcff Reviewed-on: https://gerrit.libreoffice.org/10562 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-07-29Resolves: fdo#81641 the new style shouldn't be a conditional styleCaolán McNamara1-0/+3
regression from commit 715d79bcc59d68c77dc84a1038998dd873df92e9 Author: Cédric Bosdonnat <cedric.bosdonnat@free.fr> Date: Fri Nov 30 11:51:46 2012 +0100 Styles & Formatting: added SFXSTYLEBIT_ALL_VISIBLE and show hidden styles commit 2fd9c2bf9af0c50dae3af3dbe5e22965ccdb4ae7 Author: Cédric Bosdonnat <cedric.bosdonnat@free.fr> Date: Sun Nov 25 15:24:42 2012 +0100 Allow to hide styles in the "Styles & Formating" dialog In its current state, the feature only hides the styles. Things to sort out are: + Add some automatic filter to show hidden styles + Make the visibility persist in the file format (cherry picked from commit 1af0e46102350114dd5e854b7692c640dae2727f) Conflicts: sw/source/uibase/app/docst.cxx Change-Id: I7244d424765db0d5ed3aeaf380a8e1af56aa7eaf Related: fdo#81641 exclude 'all styles' category from organizer page it doesn't make sense to be able to assign a style to 'all styles' Change-Id: I632c62f293b553e436ceb8da0baf2bb39941fd39 (cherry picked from commit 2223ff6cb99df097a357674801835c7a260b551d) style category listbox depends on being unsorted regression from commit 6ecfbf153a7c11c63d208630ac6a27064058099d Author: Caolán McNamara <caolanm@redhat.com> Date: Wed Mar 13 15:10:25 2013 +0000 drop unused resources and toggle label to activate replacement widget Change-Id: I65ca8ec58ed984120f3c2e7ba68507cbf8acf089 (cherry picked from commit 11fab6b705638359b2ca0e3e85590aa7cc70a03a) Related: fdo#81641 create new styles with an initial name instead of creating with a blank name and changing it later this way undo of a style creation is initialized with its name and so create a style followed by deleting a style and undoing all those steps doesn't crash (cherry picked from commit e904562af54545684b32d2042ded6bdb9459edca) Conflicts: sw/source/uibase/app/docst.cxx Change-Id: Ida7a34410d5d7b05edcb86950aabb3c672b82c8f Reviewed-on: https://gerrit.libreoffice.org/10502 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-07-25Related: fdo#81457 skip setting an empty allocationCaolán McNamara1-5/+9
if the dimension is 0, don't bother calculating a bunch of <= 0 sizes, rely on the parents clipping to hide the lot instead Change-Id: I5b593a5b6b6c3614beb7f9bf3328fa469b700972 (cherry picked from commit 13807fbf9f3a4aae6767da8bcf796bea4b065159) and Related: fdo#81457 quadratic time required when setting a11y name when calling SetAccessibleName GetAccessibleName is called in order to send a name changed a11y event. Getting an Accessible Name is very slow in a non-layout aware widget because it scans for a "nearby" label and there is none in this widget, but it has a huge pile of other widgets to iterate over. call add_mnemonic_label before hand to cut off that entire branch. While we're at it, only call InitControl to adjust to a new width if the new width is different from the old width Change-Id: Ie4ba1276127226e49442278e46447b84bbeb1cde (cherry picked from commit aff263c8b814c6bf352312403d3c1e448c8013a3) Reviewed-on: https://gerrit.libreoffice.org/10461 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-07-21fdo#81055: Crash due to inadequate checks for GL version / capabilitiesZolnai Tamás1-0/+3
Base line is OpenGL 2.1 + extensions. GL_ARB_framebuffer_object (part of OpenGL 3.0) for glGenFramebuffers, glGenRenderbuffers... GL_ARB_vertex_array_object (part of OpenGL 3.0) for glGenVertexArrays, glBindVertexArray... GL_ARB_sampler_objects (part of OpenGL 3.3) for glGenSamplers, glBindSampler... (cherry picked from commit 378b1d24a958114eb4484cb10f609f6e482772ec) (and cherry picked some part of commit 23c876deeb357b6306712ff0586a819176151c15) Change-Id: I3a3caeab7ef593188ee742c53e6715648bf14f50 Reviewed-on: https://gerrit.libreoffice.org/10440 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-07-21bnc#883684: Better fix for this.Kohei Yoshida1-7/+0
Instead of making all chart objects exempt from unloading, check each OLE object on whether or not it already has its persistent storage created. If not, don't unload it else it would have nothing to load back from once unloaded. (cherry picked from commit a0bd5587a5ac62974bdb10731d3fd21584521a72) Conflicts: svx/source/svdraw/svdetc.cxx Change-Id: I2312e86c9376d3699ef4aa1e0cf2f4c04f706c1e Reviewed-on: https://gerrit.libreoffice.org/10237 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-07-17bnc#862510: Improve handling of OOXML gradientsTor Lillqvist1-0/+1
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 (cherry picked from commit f4a2f1e647354efb75be8c90384d6cd3e5f9b9bd) Signed-off-by: Andras Timar <andras.timar@collabora.com>
2014-07-15fdo#81309: Adjust references during sort.Kohei Yoshida1-0/+12
(cherry picked from commit 5c6ee09126631342939ae8766fe36083d8c011e3) Conflicts: sc/inc/sortparam.hxx sc/source/ui/docshell/dbdocfun.cxx sc/source/ui/undo/undodat.cxx Change-Id: I2b98610f6b774400ecfaffe2905201c27fcab33f Reviewed-on: https://gerrit.libreoffice.org/10305 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-07-15Revert "fdo#79673 quartz: draw 'bullet' for 'space' directly in one pass"Norbert Thiebaud1-20/+4
This reverts commit 36ff78d83b6a012d2a2c8ef2c6d8f0db62ecffc9.
2014-07-15fdo#79673 quartz: draw 'bullet' for 'space' directly in one passNorbert Thiebaud1-4/+20
the current implementation of CoreText simply dropped the proper implementation of DrawTextArray, by ignoring DXArray this very visibly borked the show-non-displayable character feature of writer.. the bullet representing the 'spaces' was quite misplaced. This solve specifically this problem. More work is needed to bring proper support of DXArray back to CoreText cherry picked from master 87854755bcefdc931f7d0b4a50f25f1c62e49e07 Change-Id: Ia8cf6cb3352e49b8a06cd9be5bc36f2d41e3449e Reviewed-on: https://gerrit.libreoffice.org/10318 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2014-07-11Introduce osl_areCommandArgsSet.Andrzej Hunt1-0/+5
We cannot call osl_setCommandArgs twice, however there is currently no way to determine whether or not this has already been done. This is necessary e.g. for LibreOfficeKit where we may also be using UNO separately (and also for unit tests where LO is already set-up prior to the unit test running, and therefore we can't set up osl again from within LOK). Change-Id: Id1f357ef604eb2b6b7814c9a04ac6933a39fd3eb Signed-off-by: Michael Meeks <michael.meeks@collabora.com>
2014-07-10bnc#882383: Do not ignore themeOverride for charts in .pptxMatúš Kukan2-0/+41
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/10134 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-07-10bnc#883684: Make chart objects exempt from automatic unloading.Kohei Yoshida1-0/+7
The Memory option page contains "Number of objects" setting which controls how many OLE objects can be loaded at any given time. When the number of total OLE objects exceeds this number the oldest ones get unloaded. Note that the total number is across all open documents, not per document. Technically, chart objects are OLE objects, but unlike other OLE objects that are embedded Calc, Writer, Draw documents, chart objects normally "belong" to the host document. It therefore makes no sense to subject chart objects to this automatic unloading. In the future we may want to apply this exemption to other types of OLE objects, like formula objects for example.. Or maybe this setting can be removed altogether... (cherry picked from commit b023565d4f064cd0312e8c1fcc23a9f552112935) Conflicts: svx/source/svdraw/svdetc.cxx Change-Id: I7dd92550880efb4db8fc843cf1c915c712166da4 Reviewed-on: https://gerrit.libreoffice.org/10179 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-07-09bnc#881025: Mark axis a percent axis only when all data series are percent.Kohei Yoshida1-6/+4
(cherry picked from commit b8c444a46b2f41dae673c6118d84276be0e6c87d) Conflicts: oox/inc/drawingml/chart/axisconverter.hxx Change-Id: I302cc1e5b164b2ce9999087293b034ec930951af Reviewed-on: https://gerrit.libreoffice.org/10124 Reviewed-by: Matúš Kukan <matus.kukan@collabora.com> Tested-by: Matúš Kukan <matus.kukan@collabora.com>
2014-07-07fix crash loading ooo100546-1.xlsCaolán McNamara1-4/+4
regressions around inserted extra enum values into ShapePropertyId (cherry picked from commit aacfd5038d05a02f8b1eade3a5896d3d7e959f3d) Conflicts: oox/source/drawingml/chart/objectformatter.cxx Change-Id: I06696c8cfe4acc3836723c31d5e714bd7d8439b3 Reviewed-on: https://gerrit.libreoffice.org/10108 Reviewed-by: Matúš Kukan <matus.kukan@collabora.com> Tested-by: Matúš Kukan <matus.kukan@collabora.com>
2014-07-05Resolves fdo#79276 Add fallback system for autocorrection of French variantsJulien Nabet1-1/+2
1) Replace the creation of acor_fr-FR.dat by acor_fr.dat since there's no specific for variants of fr 2) Add a fallback system to use it Cherry-picked from 82f291d2f7630938ce6ca740f904cab07d1ff90d Reviewed-on: https://gerrit.libreoffice.org/9825 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Change-Id: Ia3e11fff0f266839dc148077b50c1b2f798d1c50 Reviewed-on: https://gerrit.libreoffice.org/10063 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-07-04fdo#78908 Revert "Merge back branch alg_writerframes to trunk"Miklos Vajna17-219/+76
This reverts commit 6e61ecd09679a66060f932835622821d39e92f01. Better not to have this on libreoffice-4-3 without 7d9bb549d498d6beed2c4050c402d09643febdfa (Related: #i124638# Second step of DrawingLayer FillAttributes..., 2014-06-02). Conflicts: cui/source/inc/backgrnd.hxx cui/source/inc/cuitabarea.hxx cui/source/tabpages/backgrnd.cxx cui/source/tabpages/tparea.cxx include/basegfx/numeric/ftools.hxx include/svx/svxids.hrc include/svx/unoshprp.hxx sc/source/ui/drawfunc/drawsh.cxx sd/source/ui/func/fuarea.cxx sfx2/source/dialog/tabdlg.cxx sw/inc/fillattributes.hxx sw/inc/format.hxx sw/inc/frmatr.hxx sw/inc/swatrset.hxx sw/inc/unobrushitemhelper.hxx sw/qa/extras/rtfexport/rtfexport.cxx sw/source/core/attr/format.cxx sw/source/core/attr/swatrset.cxx sw/source/core/doc/docfly.cxx sw/source/core/doc/notxtfrm.cxx sw/source/core/inc/frame.hxx sw/source/core/inc/frmtool.hxx sw/source/core/layout/fillattributes.cxx sw/source/core/layout/paintfrm.cxx sw/source/core/txtnode/fntcache.cxx sw/source/core/uibase/shells/frmsh.cxx sw/source/core/unocore/unobrushitemhelper.cxx sw/source/core/unocore/unoframe.cxx sw/source/core/unocore/unostyle.cxx xmloff/source/text/txtexppr.cxx xmloff/source/text/txtprhdl.cxx Also: Revert "cppcheck: Prefer prefix ++/-- operators for non-primitive types" This reverts commit 80ec4885e97b3fcb34b93e71ced52a4aab43ce93. Revert "WaE: implicit conversion of literal of type 'sal_Bool' to 'bool'" This reverts commit d5d10b03b1f3e4bf784ad35254cb55d719a8c1b3. Revert "i#124638 support for DrawingLayre FillStyle for GraphicFrames and ..." This reverts commit 4a0b5e569d070c286daefb0fdfe45c0dd15d241c. Revert "svx: fix SID_OFFER_IMPORT and SID_ATTR_CHAR_GRABBAG having the same SID" This reverts commit b66d87086804460c1986df1b832fd6b2ea075a90. Revert "SwXStyle::getPropertyValue: don't try to read a float into a sal_Int32" This reverts commit 1e3c7b854baac2502bed72ff8e3e1b21b507735b. Revert "SwXTextFrame: also restore semi-lost BackColorTransparency property" This reverts commit 102bb87ca1a5dee3a09442bf503a54bb703c79ea. Revert "SwXTextFrame: restore semi-lost BackColor property" This reverts commit 5ce92b73ce06c805c66e53c48aa2c70c722aaf60. Revert "DocxAttributeOutput: port to FillAttributes" This reverts commit ec221b7339f8fe5520926ef85b450daa94392780. Revert "MSWordExportBase::OutputItemSet: handle fill attributes as frame ones" This reverts commit 84c40768f8acb0342dcfa223133497f57620fc14. Revert "sw: put getSvx* and setSvx* to a namespace, now that these are public" This reverts commit ebf960960a69c1edb5da1994c330ddddbecac44d. Revert "sw: fix DOC/DOCX/RTF export of TextFrame background color" This reverts commit c7837b8caad61b8c0dfd3704a133cdeaffd69b06. Revert "sw: still use SvxBrushItem for page style background" This reverts commit e826950e9d7736a6e3f9042755ba1b528f58a505. Revert "cui: unused code in SvxAreaTabPage::ClickBitmapHdl_Impl" This reverts commit 2032e9f5d7683e49b8753d7c7362899c690005b6. Revert "cui: unused code in SvxAreaTabPage::ClickGradientHdl_Impl" This reverts commit f4fa202b31277276dc4f05046c82152c0830ef21. Revert "cui: unused code in SvxAreaTabPage::ClickColorHdl_Impl" This reverts commit 1478e89e08a54f02a137c74c0cde6ae75e80d9f3. Revert "cui: unused code in SvxAreaTabPage::ClickHatchingHdl_Impl()" This reverts commit e9c9f3f793a91525ac4fb74f8791ba74222515e4. Revert "svx: fix Writer's insert -> frame crash" This reverts commit 831b8751fc9f423fd4e459623e54801c0a020eb3. Revert "sw: adapt frame/templatedialog4.ui to FillAttributes" This reverts commit 55916fc50a5b2d6273bca8c9ef6253011cf4fdbc. Revert "-Werror,-Wunused-variable" This reverts commit d0542fe7251d9c6538331b22a4b5e2e294a92e97. Revert "loplugin:implicitboolconversion,literaltoboolconversion" This reverts commit 47862e75de51a4ac7476acff773b504fdc0d6e76. Revert "loplugin:saloverride" This reverts commit be89e8b8ac19c0feca8850ccaddd90205c63dbe5. Revert "loplugin:literaltoboolconversion" This reverts commit 355b31fe347479f63906e41300042ec5cb38837c. Revert "-Werror,-Wunused-private-field" This reverts commit df9d13dd2e754184a4c6e321b8910ee1bc0cafa1. Revert "-Werror,-Wunused-const-variable" This reverts commit d757a98001a65baf4066c2eda037a08ab1beda46. Revert "unused XFillStyleItem ctor" This reverts commit b735fe1d67e6ad7ad448e448f237dcabef1a1c38. Revert "unused XGradient::VclGradient" This reverts commit 5bbc90be755aae4b87125f9d748828d74efe645d. Revert "fix "transparency" of floating tables in docx import (fdo#77723)" This reverts commit 313b59d787357ef3da34e2833fefcf1143b09b5e. Change-Id: If855b090f94288d384f8733f88ef1172e68c50a6 Reviewed-on: https://gerrit.libreoffice.org/10077 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2014-07-04Make OpenGL 2D rendering working again.Markus Mohrhard6-82/+2
Change-Id: I29101aee77ac37f5a8e1b929793d7554bc425b26 Reviewed-on: https://gerrit.libreoffice.org/10075 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us>
2014-07-03bnc#812796: Correctly handle static value array for OOXML charts.Kohei Yoshida1-4/+4
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) Conflicts: chart2/source/inc/InternalDataProvider.hxx chart2/source/tools/InternalDataProvider.cxx Change-Id: If4bc1f650bb024dcd1b1b36537f457fb38404a78 Reviewed-on: https://gerrit.libreoffice.org/10040 Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-06-30use VCL_HIDE_WINDOWS env on Mac to 'simulate' headless mode on MacNorbert Thiebaud1-0/+1
Building, and running the unit/subsequent test on Mac cause massive amount of flashing windows creation/destruction that make building with test very annoying on a box used for other purposes. This patch prevent the windows to be actually displayed hence mitigating the problem Signed-off-by: Michael Meeks <michael.meeks@collabora.com> Conflicts: vcl/source/window/window.cxx Change-Id: Ied2a36699b50856e0c4e6b618212481796ec99d3
2014-06-27clang: Use-after-freeCaolán McNamara1-1/+1
Change-Id: I5dd857dbf39c8cd62df8b8cd0323b873a79976ae (cherry picked from commit 112645f75816c4902ccf8a2a97ef57e8f13429b8)
2014-06-23fdo#71076, fdo#71767: Preserve number formats when charts are copied.Kohei Yoshida16-26/+56
(cherry picked from commit 1d38cb365543924f9c50014e6b2227e77de1d0c9) Conflicts: sd/source/ui/view/sdview3.cxx xmloff/source/chart/SchXMLExport.cxx Change-Id: If5ae8852152012483237e7602e56a0c46ea8748a Reviewed-on: https://gerrit.libreoffice.org/9836 Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-06-23LOK: kill saveAsWithOptions.Andrzej Hunt2-13/+4
The saveAsWithOptions/saveAs split existed for reasons of historical API compatibility. Since we're breaking the API currently we can now get a clean start, and get rid of the redundant saveAs, and make saveAsWithOptions the standard saveAs function. Change-Id: Ia3e2294a8604cab08e95b07544c9d10d42dd1152 Signed-off-by: Michael Meeks <michael.meeks@collabora.com>
2014-06-18LOK: kill double initialize.Andrzej Hunt2-6/+0
Change-Id: I4d3dd913faea8b9f4a0bd3c13af37d097ced9888
2014-06-17LOK: Split into instance and class.Andrzej Hunt2-14/+23
Change-Id: I2b6f33eaf12343c7da1328a932eb703bb4e4ef6f Signed-off-by: Michael Meeks <michael.meeks@collabora.com>
2014-06-13resolved fdo#79978 propagate error through DoubleArray of matrixEike Rathke1-0/+4
Regression introduced with 83f77ab0661df992f241e5f9ecb1aa8f8eaeafec. Interpreter errors are transported using NaN coded doubles, using simple setNan()/isNan() to flag and ignore non-numeric values skips all error values. Change-Id: I0d3cb30262bc5ba7ee77e53a2bc45e56569fbc4b (cherry picked from commit a288bebbcec0b16e1ced09a601de5ffbb6b1bbe0)
2014-06-13resolved fdo#79957 propagate ForceArray through jump tokensEike Rathke2-5/+10
ForceArray parameters weren't propagated and enforced to array arguments on svJump tokens (FormulaJumpToken), namely IF, CHOOSE, IFERROR and IFNA. Change-Id: Icf9074f11b826655a52858d778d9a0122d207aa4 (cherry picked from commit c9d037e5e8e5850e9c69372580e7a506b573fc2a)
2014-06-13Extract kmz and collada converter code to a seperate functionZolnai Tamás1-0/+2
Plus fix some problems related to temp files. e.g. kmz converter was creating temp files next to the input file. Change-Id: Ib3f367fe1c4ef3cb25f5ca1c3d06b2dde78c5e45 (cherry picked from commit 573ced4087f46788a8596fb89c657d3427be4bf8)
2014-06-12liblok: add include for size_t.Michael Meeks1-0/+2
Change-Id: Icd7d78a332fbb67e32ab929f0afc5881ab7448eb
2014-06-12cast loses precisionCaolán McNamara1-4/+4
Change-Id: Ic688f08cada4ae70ea1dfb1e29e249a166456452
2014-06-12liblok: check new methods via macros on nSize, not by de-referencing.Michael Meeks2-1/+11
We can't check for NULL from beyond the end of a smaller structure. Change-Id: Id3754bf747c402cf0d767eda5fd4b5ad6b5789e9
2014-06-12Complete LibreOfficeKit C++ renaming.Andrzej Hunt1-3/+2
Change-Id: Ice611cf5913051346a3a0c0b00ed35a35a0dfe3c
2014-06-11Upgrade LibreOfficeKit C++ API.Andrzej Hunt1-10/+14
Change-Id: If263b8fc748f67a1ed423c0f3f7cd465cf533993
2014-06-11Rename C api of LibreOfficeKit.Andrzej Hunt2-18/+18
However for the sake of ABI compatibility we can't change liblibreoffice_hook. Change-Id: I0e921efeeab40ef1b53a67c0e7a89d4c75ced831
2014-06-11Move liblibreoffice into LibreOfficeKit.Andrzej Hunt2-0/+149
Conflicts: include/LibreOfficeKit/LibreOfficeKit.hxx Change-Id: Ib2754a77be470faaa6f9b27644a1d8dd082ed2b8
2014-06-10make that variable protected againMarkus Mohrhard1-2/+2
Change-Id: I17235397e490458c250165c36bec97bf1ce326d7
2014-06-10avoid problems with poppler's and vcl's FontInfo during runtimeMarkus Mohrhard5-35/+38
Change-Id: I1dbd256812cccae1e6ed0ad8bb34ce427e5e5be8 Conflicts: include/vcl/metric.hxx svtools/source/control/ctrlbox.cxx svtools/source/control/ctrltool.cxx svtools/source/control/stdmenu.cxx svx/source/sidebar/nbdtmg.cxx
2014-06-07we only support GLX 1.3+Markus Mohrhard1-2/+2
Change-Id: I2447498cf92da91a7fb2d67ee041d603ae16fe25
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 02:33:48 +0000