summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* pivot layout dialog: remove SAL_OVERRIDE from destructorsTomaž Vajngerl2014-04-035-5/+5
| | | | | | | | Conflicts: sc/source/ui/inc/PivotLayoutTreeList.hxx sc/source/ui/inc/PivotLayoutTreeListData.hxx Change-Id: Icdb048a2ad9c49308213c3bb57f540e4ff567593
* pivot: new pivot table layout dialogTomaž Vajngerl2014-04-0315-7/+2352
| | | | | | | | | | | | | | | This commit adds a new pivot table layout dialog which was implemented from scratch. Instead of custom controls this one uses list boxes for field entries which greatly reduces the code. It also fixes some visual and behaviour bugs and adds the possibility to edit the "Data" field. Conflicts: sc/Library_sc.mk sc/UIConfig_scalc.mk sc/source/ui/view/tabvwshc.cxx Change-Id: I6c01252acee5a2e8910e40e65904504d00e03057
* sccomp: Add very simple unit test for lp solvers.Matúš Kukan2014-04-023-0/+183
| | | | | | | | | (cherry picked from commit d059866a38ca555050abea1554ceaf7da98edfac) Conflicts: sccomp/Module_sccomp.mk Change-Id: I359737ad57decf2b1988afbceab85645fbbf1f33
* Install coinmp and lpsolve linear solvers in parallel.Matúš Kukan2014-04-0216-24/+165
| | | | | | | | | | | | | | (cherry picked from commit de7cdbc5840fd7d958d486901e405890eff224b9) + some amending Conflicts: Repository.mk sccomp/Module_sccomp.mk scp2/InstallModule_calc.mk scp2/InstallModule_ooo.mk scp2/source/calc/module_calc.scp Change-Id: I2358ae0fa22b097176446f8aea0a61cdd4e06adf
* 118160: Use CoinMP as replacement for lp_solve.Andre Fischer2014-04-021-0/+648
| | | | | | | | | | | | | Original author: Niklas Nebel (cherry picked from commit 6d492447a37ec268fb5924e7fc5631c29c67325d) Conflicts: sccomp/source/solver/makefile.mk sccomp/source/solver/solver.cxx Change-Id: I84f9acb13a65cdfc9d173434ef630cbeb635db05 (cherry picked from commit 230309c541ff9a8683e5ef749cf2f6512ad0d9df)
* Rename sccomp/source/solver/solver.cxx to solver-lpsolve.cxxMatúš Kukan2014-04-022-1/+1
| | | | | Change-Id: I5034cdcbf08d68b2ed0fc9d16ee2635ba30a731b (cherry picked from commit 9047edf9a65856b663e7a6ce3fcf305aa5951a14)
* Add CoinMP external as an alternative to lpsolve.Matúš Kukan2014-04-0211-0/+3356
| | | | | | | | | | | (cherry picked from commit dbe6e76332c4eda87aa2d2168dd14c274a4930d4) Conflicts: Makefile.fetch download.lst external/Module_external.mk Change-Id: I9bf5c339a34655c3b842cef3af76814a14c483bc
* Disable unit test.Muthu Subramanian2014-04-011-0/+2
| | | | | | (Export framework is not available on the branch) Change-Id: I3e432625008aab725d96796a5ac26c10ed63afa2
* n#870234: Import gradfill for text colors.Muthu Subramanian2014-03-313-0/+9
| | | | | | | | | Uses the first color from the gradfill list. (Which is better than plain black!) Ported from: cfc76de83e3c0a56abd30a8f3bd7c69d3500d223 Change-Id: I772274634c0e3ab13b7b03a5b676138999a4439a
* n#862510: anchorCtr controls the anchoring as well.Muthu Subramanian2014-03-313-4/+5
| | | | | | Ported from: c17eb67460293fbe72ffa8e80cd10743df493afa Change-Id: I7b5885c3ac9ec30970bdb8b2c9318dc181dda5bd
* n#862510: Fix text rotation.Muthu Subramanian2014-03-311-1/+2
| | | | | | | | Fix breaks document in n#783433 - the one there is damaged - resaving it using mso 2010 should fix the problem there. Ported from: e3e12b1d1e36e1a0d4fc4c6423b584d677693897 Change-Id: I56fbefa9de6b0714592cc64dffc011b27d1907f4
* write (no)wrap of text only for custom shapes to .pptx (fdo#71961)Luboš Luňák2014-03-273-1/+39
| | | | | | | | | | | | | | | | | | | 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
* cp#1000044 DOC import: fProtEnabled means document is not totally read-onlyMiklos Vajna2014-03-263-1/+12
| | | | | | | | | | | | | | | | | | | Reading the spec, it seems that we have two cases here: - if lKeyProtDoc is set and fProtEnabled is 1, then editing forms is allowed - if lKeyProtDoc is set, but fProtEnabled is 0, then the document is totally read-only So in the first case avoid the SetModifyPasswordHash() call to allow form field editing. (cherry picked from commit 8757bea2e88c6e349e1fe98d8e9695d7b9c6179e) Conflicts: sw/qa/extras/ww8import/ww8import.cxx Change-Id: Id0c48e8eb4bde75c5520a7b108fcfada51148faf
* apparently some table .docx properties shouldn't be < 0Luboš Luňák2014-03-263-3/+10
| | | | | | | | Somewhat related to 10b4da63e3143108ba75891e9e98fdaa2f7953ab , a similar doc has negative value inside w:tblCellMar, which MSO seems to ignore (altering the value has no visible effect), so ignore it as well. Change-Id: I846e9b55fea0d4e66f03ce615584516360b8b7dd
* avoid repeated table layouting (fdo#75622)Luboš Luňák2014-03-251-2/+29
| | | | | | | | | | With the document from fdo#75622, this saves 3775 calls and leaves only 13. e586fe4585dc07e6f6dd061d09f6a7fb0b22948c removed avoiding the call to LayoutTable(), which made loading slow. I checked that the doc from that bugreport still works, so if very original code was correct in avoiding the call sometimes, this should be ok too. Change-Id: Ia80f974d4497e5cb04612331527eb87b579ddb76
* Resolves: #i123500# unified Graphic processing to use GraphicPrimitive2DArmin Le Grand2014-03-244-88/+84
| | | | | | | | | | | | | | | (cherry picked from commit f5d69b2b8b002ca6905496a9d9065ef76b5641d7) Conflicts: sw/source/core/doc/notxtfrm.cxx (cherry picked from commit 2e5167528f7566dd9b000e50fc1610b7bf99132a) Signed-off-by: Luboš Luňák <l.lunak@centrum.cz> Conflicts: sw/source/core/doc/notxtfrm.cxx Change-Id: I1758aadcbe97ece271277378e62300b895421768
* fix $(MAKE) usage in a make defineLuboš Luňák2014-03-241-4/+4
| | | | | | $(FOO) is expanded already during the $call, $$(FOO) will become $(FOO). Change-Id: Ia5d6966c16c57e4ec688f2c7623315cc2c74c78d
* use $(MAKE) for recursive make invocationLuboš Luňák2014-03-241-16/+16
| | | | | | | | | | That's apparently the only proper way (to get e.g. -j right), and even the toplevel Makefile is so full of gmake-ism that it simply has to be invoked using GNU make already, hence $GNUMAKE is pointless except for usage in configure (which says to start the build by invoking it). Change-Id: I6060da6f1dad2afc5845ac29b8ac02348c057d3d
* make it possible to do 'make -C sw/' even with builddir!=srcdirLuboš Luňák2014-03-242-1/+8
| | | | | | | The change in partial_build.mk assumes all the Makefile's using it are in builddir/<module>/ , but that seems to be the case. Change-Id: Iddc8fa2ec0842f181780f7491cf5a2244efd014a
* make it possible to build without the obnoxious forced -j to makeLuboš Luňák2014-03-242-15/+18
| | | | | | | | | | | | | Rework --with-parallelism to not add any extra -j to make if 0 or --without is used. This requires explicit -j usage, which - builds even compilerplugins in parallel - builds 'make -C sw/' in parallel (since you don't forget the -j) - avoids jobserver disabling if -j is explicitly passed to the toplevel make IMO this is just a relic of the old build system and the option should be dumped altogether, but I don't feel like arguing right now. Change-Id: I71479391bcfc84aa5e9fd9696880702da496d45c
* Make it harder to accidentally set print range to '- none -'.Kohei Yoshida2014-03-213-15/+7
| | | | | | | | | | | | | | | | | And make the current print range behavior a bit more intuitive. People often "remove" ranges to quickly clear any custom ranges if set. They wouldn't expect this to actually set the print range to "none". Also, change the wording of the menu item from "Remove" to "Clear", to refect this behavior change. (cherry picked from commit f2d009a675755136e2e06b2866bc055b06cea6c8) Conflicts: sc/source/ui/view/tabvwsh3.cxx sc/source/ui/view/tabvwsha.cxx Change-Id: I0369020fedf1c7463d718809875022adef697bf4
* set resolution to 72 DPIAndras Timar2014-03-201-0/+0
| | | | Change-Id: I44258fdd8f7de3a4ee1aef901fc9372b051a9e89
* Chnage the wording for empty preview messages.Kohei Yoshida2014-03-191-2/+2
| | | | | Change-Id: I90e12d6e2999522ef0d252e1592b8649e8e4560c (cherry picked from commit f277f8eca83475f7bb1d95c75d5de53ad4d26578)
* cp#1000022: Display message in print preview when there is nothing to show.Kohei Yoshida2014-03-196-3/+98
| | | | | | | | | | | | | | | To make this experience slightly less confusing. (cherry picked from commit 9040ef49f0b2886a51630878c06b2fb9cf94b927) Conflicts: sc/inc/globstr.hrc sc/source/ui/inc/printfun.hxx sc/source/ui/src/globstr.src sc/source/ui/view/preview.cxx sc/source/ui/view/printfun.cxx Change-Id: I844dd2cdbc0349433d445955cdcf5e9723673286
* rhbz#1057977 avoid use of invalidated pointersDavid Tardon2014-03-192-6/+59
| | | | | | | | | | | (cherry picked from commit 6b127d40c7d57745bc602d9ff7914392f9d3b92b) Signed-off-by: Luboš Luňák <l.lunak@centrum.cz> Conflicts: vcl/source/gdi/outdev3.cxx Change-Id: Ib81f79da696b5e8002f5a2ddcf160903231dc3f1
* check for return of -1 from getTokenCaolán McNamara2014-03-191-2/+4
| | | | | | | | | as demonstrated by ooo91883-1.doc Change-Id: I11a7f0747334f4cecbfd34c9353598d875be02c2 (cherry picked from commit 8f25d823a8d5488ae4880ae009a026f6fc07f611) Signed-off-by: Luboš Luňák <l.lunak@centrum.cz>
* error: friend declaration specifying a default argument must be a definitionStephan Bergmann2014-03-196-6/+6
| | | | | | | | | | | | ...(Clang trunk towards 3.4); this appears to be specific to C++11, which added at the end of 8.3.6/4 [dcl.fct.default]: "If a friend declaration specifies a default argument expression, that declaration shall be a definition and shall be the only declaration of the function or function template in the translation unit." Change-Id: I750c60a2206d7af41322ebb31aa6deca2491067f (cherry picked from commit 39f42b0b03489459540404dd218c38709853c021) Signed-off-by: Luboš Luňák <l.lunak@centrum.cz>
* error: comparison between pointer and integer (Clang trunk towards 3.4)Stephan Bergmann2014-03-195-8/+6
| | | | | | | | | ...the check in itga.cxx was useless anyway, as new[] does not return null. Change-Id: I4de5a46e14a83ab134d0a098a62748e909dc9c00 (cherry picked from commit b63524d269a792e20777a91e4ed7e8ceae7ff55f) Signed-off-by: Luboš Luňák <l.lunak@centrum.cz>
* fix 'error: comparison between pointer and integer'Luboš Luňák2014-03-191-1/+1
| | | | Change-Id: I99df639d9df667c07f2756313bac6a78de607bee
* ...and similarly for __cxa_allocate_exception and __cxa_throwStephan Bergmann2014-03-194-17/+44
| | | | | | | | | | | (cherry picked from commit c17f01753ce94e9f57d6e4a2763152240fbcd50a) Signed-off-by: Luboš Luňák <l.lunak@centrum.cz> Conflicts: configure.ac Change-Id: I87ae299aac97180f0587c553d85b051decca155c
* Adapt gcc3_linux_intel to Clang 3.4Stephan Bergmann2014-03-193-24/+42
| | | | | | | | | | | ...same as 5ba3d1740b03efa394b2d2bf34fb8a8d3db2331d "Clean up declaration of __cxa_get_globals" plus c17f01753ce94e9f57d6e4a2763152240fbcd50a "...and similarly for __cxa_allocate_exception and __cxa_throw." Change-Id: I02361cfca260577ce13fb634b5637938daf0283d (cherry picked from commit 9dc337e9d073352cd9c9018d30b40bd4dcd5b1cb) Signed-off-by: Luboš Luňák <l.lunak@centrum.cz>
* Clean up declaration of __cxa_get_globalsStephan Bergmann2014-03-195-9/+54
| | | | | | | | | | | | | | | | | | | At least Clang trunk towards 3.4 now rejects incompatible declarations of the same extern "C" function in different namespaces, so that trick of getting at the function that is exported by libstdc++ but only rudimentarily if at all exposed in cxxabi.h no longer worked. TODO: This change should be reflected in any other bridges where it is relevant, too. (cherry picked from commit 5ba3d1740b03efa394b2d2bf34fb8a8d3db2331d) Signed-off-by: Luboš Luňák <l.lunak@centrum.cz> Conflicts: configure.ac Change-Id: Ie3ccbdb7d75cc98636d02c0435958532620724f2
* purple brand themeAndras Timar2014-03-1911-467/+347
| | | | Change-Id: Iab7cef9f94f268b7844eb92c7ee020977469b7ed
* workaround for rounding errors when handling merged cells (fdo#38414)Luboš Luňák2014-03-181-3/+13
| | | | Change-Id: I4d36e4b86c77a7356a8c221cbfc5735e925392ba
* fdo#75260: Improve double line drawing for writer table.Kohei Yoshida2014-03-184-114/+84
| | | | | | | | | | | (cherry picked from commit 1c6fb266567c8e397e3c65663b21f0fa50696aa5) (cherry picked from commit 77b6c1602aaa0bd059077765e7fabb53d9e6ddeb) (cherry picked from commit 32391d25293935fbbf0075e3ccf68625951427f0) (cherry picked from commit 24b4fbfa39f212c769bf4d966258a8fb4c98c201) (cherry picked from commit 07909e0045d9f94329861fe2e7b3403a5c4befed) (cherry picked from commit 335470edf00cabb47abb9d7dcc4dd3a5a0e79616) Change-Id: Id350531f09b3ded66fd05ea7ebeefe8771260b62
* fdo#76195: Set the border type to NONE to ensure it won't be drawn.Kohei Yoshida2014-03-181-15/+27
| | | | | | | | | | We can no longer rely on the width being zero for no border condition. Change-Id: I02c5c825661b4a0aa4190306e8276bdfd8bff944 (cherry picked from commit d2eb2c5a02718b83475bc718e117eb6255cbac98) Reviewed-on: https://gerrit.libreoffice.org/8636 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
* RTF import: fix ordering of old-style dhght in case of equal valuesMiklos Vajna2014-03-177-12/+43
| | | | | | | | | | | | | | | | | | | Commit 1eaab77c718ffa254068ae6032862dfb5a03db67 (fdo#60722 import RTF_SHPZ, 2013-03-06) changed how we handle z-order, in case two shapes have the same value. Turns out for drawing-objects the order is the opposite in this situation. So fix this by adding a new mode, that keeps the original testcase happy without breaking older documents. (cherry picked from commit e4fe3610eb17c441217c80536f0acf4123abd683) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx writerfilter/source/rtftok/rtfsdrimport.cxx writerfilter/source/rtftok/rtfsdrimport.hxx Change-Id: Ib2d284cefc3c0dce40ac2e516ba260d6cd04ce43
* RTF import: anchor drawing objects at-character by defaultMiklos Vajna2014-03-173-0/+14
| | | | | Change-Id: I292ab1a6f12a9372b1cfdd4e8e59fbae57c6ceca (cherry picked from commit d05b67a7b9448c67c3a923ecb33dac74b52dd192)
* RTF import: fix dobxpage before dptxbxMiklos Vajna2014-03-173-1/+26
| | | | | | | | | | The problem was that dobxpage arrived first, set HoriOrientRelation to FRAME, then dptxbx tried to apply defaults, which overwrote the already set HoriOrientRelation. Fix this by only applying properties which are not set yet. Change-Id: I108f3363a2758eee0242533fe92e511e8c522b68 (cherry picked from commit 7c53577f325e5260c538f9ca42cda54ca1a24b7a)
* cp#1000045 adjust DS_StoreAndras Timar2014-03-151-0/+0
| | | | Change-Id: Iadd1dae05b6585c57ff59becffd79a0399a111a2
* n#862510: Ignore baseline attributes with zero.Muthu Subramanian2014-03-141-1/+1
| | | | | | Ported from 19abfaffe74b925e4428943d14187a7008797982 Change-Id: I5447c16193f7c3e619ce10658c9696014d3d5a22
* fdo#76030: Use the table boundaries view option to toggle border drawing.Kohei Yoshida2014-03-121-12/+9
| | | | | | | | | | | Unless I'm missing something, fixing the problem reported in fdo#75118 this way is more reliable, and certainly avoids the problem reported in fdo#76030. Change-Id: Ife524d9db12e9fa4528c2232e619bfacde367659 (cherry picked from commit 2b9e7a0cb2492f19745f61a4829ff3802b25291f) Reviewed-on: https://gerrit.libreoffice.org/8533 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
* ignore large twips values like MSO does (cp#1000043)Luboš Luňák2014-03-121-2/+5
| | | | | | | Conflicts: writerfilter/source/dmapper/ConversionHelper.cxx Change-Id: Ib304245b6ae64c15cfb6c999580f73e5e228c440
* n#862516: Remember slides sorter view setting.Muthu Subramanian2014-03-121-0/+2
| | | | | | Keep the number of slides per row when moving across tabs. Change-Id: I316dac87c9dc8c88149b510f93be88940d91d98c
* Related: #i124106# correct handling of page break attributesOliver-Rainer Wittmann2014-03-111-2/+5
| | | | | | | | | | | | | | | i.e. those which are providing the default value explicitly (cherry picked from commit 5a15ef3da683566d7bd443f96eeec3a9a3f70aeb) Conflicts: writerfilter/source/dmapper/DomainMapper.cxx writerfilter/source/dmapper/PropertyMap.cxx (cherry picked from commit c30fb7d7269b5bdd1853ac22120f57aa2bfd13a5) Change-Id: Ib8721f2fce060d26ee75b0515b3bf62a603fd40c Signed-off-by: Miklos Vajna <vmiklos@collabora.co.uk>
* Bump version to 4.1-6cp-4.1-6Andras Timar2014-03-111-1/+1
| | | | Change-Id: I6ccfde95ad8032bee780604df648ab23a541032f
* fdo#52547 SOT: Prefer embedding image data to embedding linked image.Andrzej Hunt2014-03-101-9/+9
| | | | | | | | | | | | | | | | | | When copying an image from e.g. Firefox or Chromium the clipboard will contain both the image itself, and the url of the image -- presumably it makes more sense to store the image data itself if it is available -- the order of the items in the *_FREE_AREA_Copy defines the order of preference for which data in the clipboard should be used. Change-Id: Id8b862a9f2fce3a34adbb16509e9b7372500a239 Reviewed-on: https://gerrit.libreoffice.org/7928 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit c47db038f98aaf7aec3cbe57c4e5683591afa23e) Reviewed-on: https://gerrit.libreoffice.org/8384 (cherry picked from commit 91a55de7be6a23685a875517495c1af67f3a8b60) Reviewed-on: https://gerrit.libreoffice.org/8499
* rhbz#988516: DOCX import: fix context stack when importing header/footerMichael Stahl2014-03-103-1/+17
| | | | | | | | | | | | | | | | | | | | | | | When a header/footer substream is parsed, a ParagraphGroup is started, but not ended; so the properties of the last paragraph in the header/footer are applied to a paragraph in the body. The obvious fix to add a call to endParagraphGroup() at the end of w:p element breaks table cells. So add a call to endParagraphGroup() at the end of the "hdr"/"ftr" element. (The problem in the bugdoc became much more visible with commit ca555c596043c88894b964ac5e21f5a7271d5f3b, but was there before) (cherry picked from commit 2b78f2cd7b9e4bab0f3b3b9119238f36a1bbc7b2) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: Ib054f1882793049b39424c1076ba5d4b319cd027 Reviewed-on: https://gerrit.libreoffice.org/8476 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
* resolved fdo#61520 do not add multiple empty strings to the validation listEike Rathke2014-03-101-0/+12
| | | | | | | | | | | (cherry picked from commit 7122ef19847b26529ed1d5bad40df869e91a8495) Backported. Change-Id: I4f6180b2f8c914a965965ca362e1670e8b434d37 Reviewed-on: https://gerrit.libreoffice.org/8470 Tested-by: Kohei Yoshida <libreoffice@kohei.us> Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
* fdo#59329 Fix docked window border linesAhmad H. Al Harthi2014-03-101-14/+38
| | | | | | | | | | This patch completes the missing border lines. This is intended for versions 4.1 and 4.2 only. Change-Id: Ib15cb3b01dca4631f643a0036475cf684793d256 Reviewed-on: https://gerrit.libreoffice.org/8413 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
generated by cgit (git 2.34.1) at 2024-07-26 20:47:48 +0000