summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)Author
2016-09-09remove direct memory managementDavid Tardon
Change-Id: I9696b1c0ffe100c8089494197940377d3c6223f5
2016-09-09remove direct memory managementDavid Tardon
Change-Id: I5857df56c782131a5849417f69067e6481fd6f6f
2016-09-09resolve the snafu with 2 separate refcounted basesDavid Tardon
Change-Id: Ia275596d54ea27436f03d01297fb78b6ca09e8a6
2016-09-08tdf#75221: make margin collapsing implementation conform OASIS proposalMike Kaganski
Since the margin collapsing (aka contextual spacing, implemented for LO 3.6 by Miklos Vajna, commits 6f04bf5e90ff75288dcf75c43843edf798641e3d, 0662778b0b4b9958ee5e5bd3bac69f9e290f9495, 11059331718fb8faab483c75633b4e80d8028b7d, 03f9b6bebc0ca77021be46664c7bcbe4cb297503, 8631dbf85fb5ed56d225e32ea5a9c36c96b0d649, 9f4bb5bd4f55b4a80544413efde26391849b1d7f, f722299e133568fe75f7cf9ce0c103a1553474c4) is only meant to suppress fo:margin-top and fo:margin-bottom, as seen in https://issues.oasis-open.org/browse/OFFICE-3767, current implementation is inconsistent: it nullifies all spacing, including normal line spacing. This patch makes sure that collapsing conforms to specification. Change-Id: I413f6469d7891dd85f1f7a2c666f219187ddaec4 Reviewed-on: https://gerrit.libreoffice.org/28692 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-09-08remove IMAGEROTATION and IMAGEREFLECTION SfxSlotMode enums...Caolán McNamara
unused since... commit 7affe26a1291eef8c77e890228061f13e987bff1 Author: Maxim Monastirsky <momonasmon@gmail.com> Date: Mon Feb 22 18:47:15 2016 +0200 Kill sfx2 menu support Change-Id: I902957b8379be7c314f5357750aeba5a2fcc0a00 Reviewed-on: https://gerrit.libreoffice.org/28749 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-09-08sw: remove qa/tiledrendering/tiledrendering.cxx againMiklos Vajna
It was first removed in aa94466699a98730d9e8d112fd52cea63c2226b2 (Executable_tiledrendering is obsolete and can be killed, 2015-03-24), and then it was re-introduced with 00f2787a4a68633206635743298926bf2e65a8fa (vclwidgets: wrap all vcl::Window subclasses allocated on stack in VclPtr, 2015-04-09) due to a mismerge. Change-Id: I243375d6a8d7804ed23f2080d2dbb3c0132789f1 Reviewed-on: https://gerrit.libreoffice.org/28747 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2016-09-08tdf#81345 docx import fix default page break regressionJustin Luth
"regression" from 4e653d15eff26aa5283d8ba20611893f4c573f57 If there are new style elements, then don't treat a default break in columns as a continuous break. This fixes both round-tripping, and initial import of columns and headers on this particular document. Since MS and LO treat sections so differently, it is a balancing act of what to change. Change-Id: I9c79bc1246108da6a5ebbf744acbcfcbb9d33d48 Reviewed-on: https://gerrit.libreoffice.org/28728 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Justin Luth <justin_luth@sil.org>
2016-09-08loplugin:constantparam in swNoel Grandin
Change-Id: Ibae4cac28e6ff52298c804519f683017729c07a5
2016-09-08more workaround lack of constexprNoel Grandin
Change-Id: I1be117f9845d502d4b8dfa238dc13198f8b76dd6
2016-09-08workaround lack of constexprNoel Grandin
when dealing with switch statements and o3tl::typed_flags Change-Id: Ia72a3ff643ea1c41f9b328e980ba51f3cdfdf582
2016-09-08loplugin:constantparam in swNoel Grandin
Change-Id: Ic49d1c3c7b57fb213964ddc21b0f774c762aad94
2016-09-08convert nsRedlineMode_t to typed_flagsNoel Grandin
including fixing a bug in SwXMLExport::exportDoc where it was ORing with a constant from a different type: nsRedlineType_t::REDLINE_INSERT Change-Id: I2bb154c9a35d106e64fd1a8b6e928d0384c9fafe
2016-09-08loplugin:constantparam in swNoel Grandin
Change-Id: Ifcb05b7fbca7fc6c8ad82bad38a927ba9f9511bf
2016-09-08tdf#101712 Writer Table Style; odf export; remove parent export for cell styleJakub Trzebiatowski
Do not export the parent-style-name attribute for a cell style. The parent-style-name attribute should refer to a style of table-cell family. Not a table-template element. Reviewed on: https://gerrit.libreoffice.org/28729 Change-Id: I350ec7cef0ac544ce4e5dec54015412a4070b1d8
2016-09-07tdf#78727 sw: fix missing textbox text when anchored inside flying tableMiklos Vajna
It was missing as the shape text range was deleted twice, as DelFlyInRange() thought both the fly and the draw frame format own its contents range, while only the fly one does (when called by SwDoc::MakeFlyAndMove(), called by SwXText::convertToTextFrame()). Thanks Red Hat for the pizza! Change-Id: I26e23550df085511e0e87f593f1a461057413d0e
2016-09-07Adjust labels in the bullets and numbering dialogYousuf Philips
Change-Id: If8892446dcabd8dc51d1193fe1fcccd64fa07bac Reviewed-on: https://gerrit.libreoffice.org/28706 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2016-09-07Make PageColumnPopup Dropdown-onlySamuel Mehrbrodt
Change-Id: I69d8fd528238548521f1e201a19d1681c4ee3ec1
2016-09-07Make PageOrientationPopup Dropdown-onlySamuel Mehrbrodt
Change-Id: I48b119e2bc7571ccaa609e7a8cef7eb4ad8aeb0f
2016-09-07Page column popup converted to use outside the sidebarSzymon Kłos
Change-Id: Iedb239eba5d74d10cef68276c2a03028f8cf81bf Reviewed-on: https://gerrit.libreoffice.org/28703 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2016-09-07tdf#90597 Revert "Jump to next change when accepting or rejecting a change"Samuel Mehrbrodt
This reverts commit 1deaa9d304239b2d603cc85bbcb8b8f50d8714da. Change-Id: I4718ffea3f288b654cb037a5edbfa66f704a6eb5
2016-09-07Do not change the OBJ_CAPTION code pathMaxim Monastirsky
(and fix static method call) Change-Id: I5a73695eaa8b6b5b3506acd34b303dea28cfb5e5
2016-09-07tdf#101390 Add Arrows toolbox functions on writer drawingbar.Gulsah Kose
Writer arrows toolbox includes following commands .uno:LineArrowEnd .uno:LineCircleArrow .uno:LineSquareArrow .uno:LineArrows .uno:LineArrowStart .uno:LineArrowCircle .uno:LineArrowSquare .uno:Line Change-Id: I91af27826ea411eabfa61c11962cfb85d2d2aab2 Reviewed-on: https://gerrit.libreoffice.org/28363 Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
2016-09-07BigToolBox painting fixSzymon Kłos
If the button was dropdown only type the arrow was on the same position as a text. Change-Id: I3d9693ef57c5c2d27549987339a1c388bc3ff724 Reviewed-on: https://gerrit.libreoffice.org/28721 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2016-09-07convert HTML_CNTXT constants to typed_flagsNoel Grandin
Change-Id: I94197bd40e4eca751452494d41abba05f69c8b8c
2016-09-07convert HTML_FF flags to typed_flagsNoel Grandin
Change-Id: I61c1c008925bcd4b51de327004b73e1c18b34189
2016-09-07loplugin:constantparam in swNoel Grandin
Change-Id: I16badc615e98202668b1b201035b5137cb94c10c
2016-09-07cosmetic, substitute text::HoriOrientation::NONE for 0Caolán McNamara
Change-Id: I793597b65a8bacac2cab67ece70b42478c793aad
2016-09-06if we throw in sw on HoriOrientation::NONE then don't pass it in from rtfCaolán McNamara
Change-Id: Ie01cca9b7cc432fc1fe14bb600af5083d6ca6a0d Reviewed-on: https://gerrit.libreoffice.org/28687 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-09-06tdf#44986 RTF import: handle \trwWidthA by faking cellsMiklos Vajna
The DOCX import handles this at a tokenizer level, so let's do the same in the RTF case as well. Change-Id: Id7ff43fa9e9bcd05b13d187623d39fb072758057 Reviewed-on: https://gerrit.libreoffice.org/28679 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2016-09-06Make character dialog's hyperlink tab accessibleYousuf Philips
Change-Id: I6b2351b5a46562236dc93c6de3daa185e2a72fb2 Reviewed-on: https://gerrit.libreoffice.org/28653 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-09-05sw: prefix members of SwEntryBrowseBoxMiklos Vajna
Change-Id: If6e368a5d3bd1dfddb58556cbd9c249f9ced32fe Reviewed-on: https://gerrit.libreoffice.org/28671 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2016-09-05Page orientation popup converted to use outside sidebarSzymon Kłos
* popup converted to .ui file * added .uno:Orientation * label & icon for .uno:Orientation * control inserted to the notebookbar.ui (Page layout tab) Change-Id: I93f35a65c4461635d0cfd1afd4546a9d2a8c4d04 Reviewed-on: https://gerrit.libreoffice.org/28405 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2016-09-05convert Orientation to scoped enumNoel Grandin
Change-Id: Ifbfcf3557ca2a16d21e7a1d613ee54c1c6625f07
2016-09-05convert ScrollType to scoped enumNoel Grandin
Change-Id: I6dd02d4f7df028dada6cfd5d767a6ec1b1c1efe1
2016-09-05convert GradientStyle to scoped enumNoel Grandin
Change-Id: Ib740da708612df7a5f4b8c82262b9b1bd436604d
2016-09-05convert LineStyle to scoped enumNoel Grandin
Change-Id: I30cfa5a0649b806604c443f55683d1f2a430983d
2016-09-05convert RasterOp to scoped enumNoel Grandin
Change-Id: I136423c105316c9b5b18e64d04a248fd7ac5590b
2016-09-04loplugin:defaultparams: Default method parameterGiuseppe Castagno
Change-Id: I79f9eefecc6389bbf288d2be6b13129cd8f467ef Reviewed-on: https://gerrit.libreoffice.org/28663 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Giuseppe Castagno <giuseppe.castagno@acca-esse.eu>
2016-09-03cppcheck: variableScopeZolnai Tamás
Change-Id: Id290ca5e53c75b2c27dda6a6bb228a380084b115
2016-09-03cppcheck: variableScopeZolnai Tamás
Change-Id: I3850017bdf3ac2ac0436d4f64f45d61be9c8691a
2016-09-03cppcheck: variableScopeZolnai Tamás
Change-Id: Idd96330afaee66dcbeddc62c93691139c2a1830d
2016-09-03coverity#1372444 Dereference after null checkCaolán McNamara
Change-Id: Ia756854e1f4a848b62dda38c9667ddd032989605
2016-09-02tdf#62847 import image hyperlink in docxdrazil
The image hyperlink is a resource id in the document and needs to be translated into real URL. First I define a new type CT_Hyperlink_URL in the model and associate it with an action handleHyperlinkURL. In OOXMLFastContextHandlerProperties::handleHyperlinkURL I dispatch it to OOXMLHyperlinkURLHandler to translate resource id to real URL then set the PropertySet with real URL. Then the correct URL will be captured while resolving GraphicImport, which will be stored in GraphicImport_Impl::sHyperlinkURL as an OUString. Finally the property will be set in the GraphicImport::applyName if the length of the sHyperlinkURL is not 0. Also adds a test file image-hyperlink.docx and a test in ooxmlimport.cxx. Change-Id: I6194b9cc6bcc1bfaa033ab05e94836fe96e33f14 Reviewed-on: https://gerrit.libreoffice.org/28432 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-09-02Resolves: rhbz#101681 set hyperlink tooltip for the full hyperlink areaCaolán McNamara
not just a single point in it. This way gtk3 knows the successive tooltip hints for the positions along the hyperlink are for the same tooltip Change-Id: I46a8c960e528f6a9aaab5bea145c6870f22e46c5
2016-09-02tdf#76349 SpacingWithoutBorders: enable .doc RTJustin Luth
Microsoft allows spacing in textboxes even if the borders are not shown, but LO does not. Added a compatible setting, used an existing setting to allow the spacing, and changed .doc export not to zero out the spacing if the border was zero-width. Using the compatible setting in the export code is almost redundant, but it does require that the document was LOADED as .doc, and not "save as" from another format. This patch simply allows round-tripping - any user attempt to modify the border settings will enforce normal LO border rules. Change-Id: I60ac036e1bfac381eea15e33c21495ad3800277a Reviewed-on: https://gerrit.libreoffice.org/28601 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-09-02sw lok: avoid hiding / showing sdr mark handles on focus changeMiklos Vajna
For one, this is unwanted: in the LOK case we want to switch between the windows without any side effect to be able to e.g. paint tiles. For another, this caused an invalidation loop when two views selected the text frames or images in Writer. The loop looked like: 1) Press a key in view #1, so a setView(0) + paintTile() is necessary in view #0. 2) SfxLokHelper::setView(0) to switch from view #1 to view #0. 3) SwFEShell::ShellLoseFocus() on view #1, which hides sdr marks -> invalidate. 4) SwFEShell::ShellGetFocus() on view #0, which shows sdr marks -> invalidate. 5) paintTile() in view #0. 6) SfxLokHelper::setView(1) to paint tiles due to 3). (Generates invalidations in both views.) 7) SfxLokHelper::setView(0) to paint tiles due to 4). And so on, this way a call to SfxLokHelper::setView(0) resulted in an another (async) call to SfxLokHelper::setView(0) all the time. Change-Id: Ice855b9128f61bb7b823b499cad366998f297b5d Reviewed-on: https://gerrit.libreoffice.org/28611 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2016-09-01tdf#101361: Fix cursor key movement in RTL textKhaled Hosny
Revert "tdf#32531 Fix for key movement in table cell of different directionality" This reverts commit a215cec969f7401b08cabb686c5b2b1d803399d0. This seems like the wrong fix for the original issue, as it breaks how “visual” cursor movement works in RTL text.
2016-09-01Missing dependency of test on instdir/share/template/common/internal/html.stwStephan Bergmann
...when testing sw/qa/core/exportdata/html/pass/cp1000068.odt, leading to the problem described in bf3c6237bb110d3eb84970e44593a7880e2e8536 "pTemplate can probably be null here" Change-Id: Ic96fabb3cab83b005a1ebae573a5bf4549270603
2016-09-01pTemplate can probably be null hereStephan Bergmann
Observed with "make clean && make CppunitTest_sw_filters_test" (which misses a dependency, a bug to be fixed next, so happens to not set up m_pTemplate in SwHTMLWriter::WriteStream, so dereferences a null pTemplate here. Don't know whether there's also legitimate scenarios that can lead to a null pTemplate here, but at least the code in SwHTMLWriter::WriteStream setting up m_pTemplate takes into account that it can be set up as null, and the code in the called SwHTMLWriter::GetTemplateFormat takes into account that the passed in pTemplate (which used to be the same object as the outer pTemplate/pDoc, before breaking IDocumentStylePoolAccess out of SwDoc, see below) can be null. Regression introduced with 535971f3a166da6c0e44a6b7211c7f8c298f388f "Refactored IDocumentStylePoolAccess out of SwDoc." Change-Id: Iabb4ae2ca018ce3a19756d62b9002b245cb409cd
2016-09-01More informative warningTor Lillqvist
No idea whether the warning is useful, though, but at least now it tells what the value of Pos is and how much "too big" that is. Change-Id: Ib2794f0484a660715c78e1341b1f8c66e3e2f77e