summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)AuthorFilesLines
2016-10-11tdf#103001 DOCX export: fix RelId cache when switching streamsMiklos Vajna5-16/+44
RelIds are used to refer to external streams, e.g. images. A RelId cache tries to avoid storing the same image more than once in the export result. RelIds are relative to an XML stream, so caching them across stream switches is problematic. There was code already to notify the cache after a header or footer was written, but: 1) It was only done after a switch, not before and 2) It cleared the whole cache, instead of stashing it away, and restoring it when the write of the special stream is done. Regression from commit b484e9814c66d8d51cea974390963a6944bc9d73 (tdf#83227 oox: reuse RelId in DML/VML export for the same graphic, 2015-09-07), this existing problem became more visible when caching started to include draw images, not just writer ones. Fix both problems by turning the cache into a stack that is pushed/popped around stream changes. Change-Id: If9ec168823eea5e272197e28f6125ba626605550 Reviewed-on: https://gerrit.libreoffice.org/29684 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2016-10-11move round-tripables to ooxmlexportJustin Luth167-2028/+2254
This serves two purposes. It helps to prevent regressions and it allows focus on features that still don't export properly. The standard .mk file had trouble on the Mac, so I ended up copying ooxmlimport.mk instead of trying to tweak the export template. The huge section of tests excluded from Win32 testing is still excluded here. The ole-anchor test works as export in the import code, but didn't work from the ooxmlexport directory, so left that one as import only. Change-Id: I9d72202c577940ba94855096c5a11d4dec4790a5 Reviewed-on: https://gerrit.libreoffice.org/29588 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Justin Luth <justin_luth@sil.org>
2016-10-10tdf#101390 Add "Dimesion Line" command to the writer arrowsbox.Gulsah Kose6-0/+23
Change-Id: I238bc37871c029d547b21ce7c8ef3cb0c0ff95b8 Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/29669 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
2016-10-10safemode: Add uno command and menu entrySamuel Mehrbrodt6-0/+14
Change-Id: I1843767160b79041c42e506eff0cf39399c74f26 Reviewed-on: https://gerrit.libreoffice.org/29668 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2016-10-10these navigator menu items should be radio checksCaolán McNamara1-5/+5
Change-Id: Ib785ce929ea33250b275969187d63c528fbafe6f
2016-10-10SwHelpToolBox doesn't do anything nowCaolán McNamara5-78/+8
Change-Id: I5b8865218d3cd8492d148af8d69389c256bbb27f
2016-10-10dropping document into these toolbars does nothing alreadyCaolán McNamara2-17/+2
so might as well drop that support here. Dropping into the main panel works (for master documents its quite sensible) Change-Id: Ic7a088d7ff7054430d55032158a186d610f10da1
2016-10-10de-src solo NumericFieldCaolán McNamara4-20/+5
Change-Id: Idfdf54015f150d48a5b9af0ed8301ca6e7748f19
2016-10-10sw: prefix members of HTMLTableMiklos Vajna1-515/+515
Change-Id: I0c791be9185fb12fad5864554e0a8d26235da016 Reviewed-on: https://gerrit.libreoffice.org/29653 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2016-10-10tdf#89307: Removed SvRef::operator T*()Jacek Fraczek14-57/+57
Conditional statements are using SvRef::Is() method. Changed static_cast<T*>(svRef<T>) occurances to svRef.get(). Added operator == and != to SvRef. SbxObject::Execute is using SbxVariableRef internally. SbxObject::FindQualified is using SbxVariableRef internally. Change-Id: I45b553e35d8fca9bf71163e6eefc60802a066395 Reviewed-on: https://gerrit.libreoffice.org/29621 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2016-10-10cppcheck: clarifyConditionJochen Nitschke2-3/+6
Change-Id: I4dfcaec8764699cc1dfd725b9cd1100750ee3d0f Reviewed-on: https://gerrit.libreoffice.org/29629 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2016-10-10tdf#95367 DOCX: allow r-t of changed first/follow sectionsJustin Luth7-31/+39
Change-Id: Ibb97411a7dfeebc3edbdd149842bfe626942cf7f Reviewed-on: https://gerrit.libreoffice.org/29559 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-10-08tdf#101442 change "Hyperlink" to "Link" for a modern vocabularyFederico Bassini5-5/+5
Changes to be committed: modified: sw/uiconfig/swriter/ui/characterproperties.ui modified: sw/uiconfig/swriter/ui/charurlpage.ui modified: sw/uiconfig/swriter/ui/framedialog.ui modified: sw/uiconfig/swriter/ui/objectdialog.ui modified: sw/uiconfig/swriter/ui/picturedialog.ui Change-Id: Id424d45d03eb744c3c9a14db0f7a7f3ace94c234 Reviewed-on: https://gerrit.libreoffice.org/29573 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2016-10-07Non-BMP chars are now covered by HTMLOutFUncs::Out_CharStephan Bergmann1-16/+5
...and use the rtl/character.hxx functions for surrogate handling Change-Id: I32002f990e4f211932a99652cdfd7992d3ea6329
2016-10-07two unused CheckBox resources in swCaolán McNamara2-13/+0
Change-Id: I5716c22693c89c7d546c62703d63b7d150daa2cd
2016-10-07loplugin:staticmethods: swStephan Bergmann11-17/+17
Change-Id: I2b06eb926ebc8ab04883da3272ea239a12e09436
2016-10-07tdf#102997 Fix Error in OOXML Transparency Conversion Mathlbenes2-1/+1
This fixes the import logic for tdf#100830 to handle transparencies other than 50%. Change-Id: If4e2e369a9674488878bb0a4378d48292ea4e0cb Reviewed-on: https://gerrit.libreoffice.org/29581 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-10-07Base SvxLineWindow_Impl on ToolbarPopupMaxim Monastirsky1-1/+0
Change-Id: I93dbb180fc65bca77e0eb58f116d0a0a5266556a
2016-10-06de-src RID_JUMP_TO_SPEC_PAGE and RID_PVIEW_ZOOM_LBCaolán McNamara3-39/+14
Change-Id: Ideb8eff9d89dbc207dcf7d1228070b2e4a954723
2016-10-06drop unused HID_JUMP_TO_SPEC_PAGE hidCaolán McNamara2-3/+0
Change-Id: I746787eb0a4d961a00372bf40dc1bb98e8ef3607
2016-10-06tdf#101813 sw,sfx2: enable inserting master document as sectionMichael Stahl2-3/+5
Traditionally only ordinary com.sun.star.text.TextDocument could be inserted as a section but then commit 3da8f3680556e0163f660a0a159930337c8c32ff unintentionally enabled inserting everything, including master documents (com.sun.star.text.GlobalDocument). I'm really not sure if this should be allowed or not but apparently somebody finds it useful so here we add some crude hacks to enable it (to be reverted in case it causes trouble). (regression? from 805fd1ca343d6295b8114a24cc29bdac332f266d) Change-Id: I439b2516fcbe54977ff04e487a920acd38c27152
2016-10-06I can't see any evidence of any remaining magenta mask using image resourcesCaolán McNamara2-9/+0
Change-Id: I12865d743daa3e6479edb60584d5bd01f88e818d
2016-10-06ImageList just reads and discards the MaskColor, so drop itCaolán McNamara6-18/+5
Change-Id: I243e739fea28e3f38b91534182cc54c2aa660f0e
2016-10-06drop now unused sfx2/sidebar/ResourceDefinitions.hrcCaolán McNamara1-1/+0
Change-Id: I151a37a37435a44e7331d957bd9d36f84cdf8677
2016-10-06sw: remove unused DbgRectMiklos Vajna1-26/+0
Seems the last user was removed in commit 2513329487f2b39740f3fa16eb1b07d9b191c699 (2004/06/23 12:50:40 cmc 1.7.568.1: #i30554# remove unused code inside #ifdef USED guards). Change-Id: If49b4d34786b091f06df7064c5b0fd649310365d Reviewed-on: https://gerrit.libreoffice.org/29550 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2016-10-06Related: tdf#102499 (4), default css::ucb::XCommandEnvironment.Giuseppe Castagno1-2/+14
Make use of a dedicated interaction wrapper to serve ssl certificates correctly. See comphelper::SimpleFileAccessInteraction for details. Change-Id: Id78cd3f21223a797791598459af32eeec3539f2a Reviewed-on: https://gerrit.libreoffice.org/29541 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Giuseppe Castagno <giuseppe.castagno@acca-esse.eu>
2016-10-06tdf#75757 Remove inheritance from std::vectorTakeshi Abe3-7/+3
Change-Id: I87572c545559ef22d4f74fb63218910681c1a7d7 Reviewed-on: https://gerrit.libreoffice.org/29533 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Takeshi Abe <tabe@fixedpoint.jp>
2016-10-05tdf#103025 sw: don't format header/footer in SwPageFrame::PreparePage()Michael Stahl3-16/+9
This has always been dead code because it used wrong constants FRMTYPE_HEADER|FRMTYPE_FOOTER which is actually Page|Column and SwPageFrame and SwColumnFrame are not direct children of SwPageFrame. Then commit 901e5c3a21a1299d10c44bc844246fe8c329bb82 fixed the constants but somehow the early formatting of header/footer results in wrong expansion of variable text fields, so just remove this code. Change-Id: I0af13168970f26355a1b247e071235166d08b7a4
2016-10-05sw: remove correctMarksAbsolute pre-condition check for now...Michael Stahl1-3/+0
... in case the post-condition check fails it can be added for debugging. Change-Id: Id3ee0895af598080a8bda10e8e9edff883188cbc
2016-10-05convert the last two lonely FixedInfos to FixedTextCaolán McNamara27-27/+2
Change-Id: Ia6ed5f71931a6141efb3d5e5eb329149d6850342
2016-10-05NoAppFocusClose is for menus that have submenusCaolán McNamara4-4/+4
and don't want the parent menu to be auto popped down when the submenu gains focus. or floating windows that explicitly don't want to go away when they lose focus, which all these popups aren't Change-Id: I53f1f3ac586ff295597c4b9046032d3d976d053e
2016-10-05Base SvxFrameToolBoxControl on PopupWindowControllerMaxim Monastirsky1-1/+0
Change-Id: I7666c7c5c99b1705bc8ece2913c2cdf9fdecced3
2016-10-05loplugin:unnecessaryoverride in swNoel Grandin20-92/+0
Change-Id: I641175c9c17fcc46b582b6487b8207deb343e645
2016-10-05convert MapUnit to scoped enumNoel Grandin113-247/+247
I left a prefix on the names "Map" so that I would not have to re-arrange each name too much, since I can't start identifiers with digits like "100thMM" And remove RSC_EXTRAMAPUNIT, which doesn't seem to be doing anything anymore. Change-Id: I5187824aa87e30caf5357b51b5384b5ab919d224 Reviewed-on: https://gerrit.libreoffice.org/29096 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
2016-10-05Remove _TYPED suffix from tools/link.hxx macrosStephan Bergmann266-1285/+1285
...which was introduced with 3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed "Gradually typed Link" to distinguish the new, typed versions from the old, untyped ones, but is no longer necessary since 382eb1a23c390154619c385414bdbe6f6e461173 "remove untyped Link<>" removed the old versions. Change-Id: I494025df486a16a45861fcd8192dfe0275b1103c
2016-10-04can now remove both PopupContainer copiesCaolán McNamara1-2/+0
the recently unused svx one, and the forgotten not-built sfx2 one Change-Id: I1a4ede49dc74bb71f250ee3eee999d1a3dfbee57
2016-10-04These are just floating windows, no need for all the special intrastructureCaolán McNamara7-7/+0
get rid of the roundabout way that these popups are popup controllers (of a kind) for real popups for the moment keeping them as loaded from resources Change-Id: I083e8609ab133e3dc4a036daf8bfb44c08a6719f
2016-10-04remove PopupControl as an intermediate stepCaolán McNamara3-8/+0
Change-Id: I31438860511af6ae00bf7a94fb29326c3ed1a10c
2016-10-04sw: fix assert in MarkManager::deleteMarks()Michael Stahl1-1/+9
On loading tdf89405-1.odt there is a "DdeLink" bookmark and a range annotation at the same position: info:sw.core:17729:1:sw/source/core/doc/docbm.cxx:290: N2sw4mark8BookmarkE __DdeLink__30_388680695 11,11 11,52 info:sw.core:17729:1:sw/source/core/doc/docbm.cxx:290: N2sw4mark7UnoMarkE __UnoMark__16_673019520 11,11 11,11 info:sw.core:17729:1:sw/source/core/doc/docbm.cxx:290: N2sw4mark7UnoMarkE __UnoMark__19_673019520 11,12 11,12 While deleting the annotation's field character at 11,11-11,12 the DdeLink one is moved but the UnoMarks are special-cased and remain where they are, so just do some more sorting in this case. Change-Id: If077329bf675cdf8dd788cc145252a078aba3750
2016-10-04comphelper: move setTiledPainting() from SfxViewShellMiklos Vajna4-9/+44
And make it a static one. The primary point of that member function is to prevent invalidations during paint, and since multiple views are allowed, it wasn't extended to filter out invalidations from all views, not just from the current one. (Same goes for other callback types.) Change-Id: I23e6b2c2ff94227f2b72c481148b2d8279ae2905
2016-10-04simplify loopJochen Nitschke1-5/+1
Change-Id: I7c6041239fcd5f0fa29fffcb34f06085306a1682 Reviewed-on: https://gerrit.libreoffice.org/29487 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-10-04crashtesting: use a stack with the expected dtor order for its elementsCaolán McNamara1-0/+0
contains test document which crashes if it doesn't Change-Id: Ieeee6cc7007a90d37225fffd636c9648289f04d7
2016-10-04tdf#100830 drawingML import: handle <a:alphaModFix>Miklos Vajna2-0/+6
Fill transparency on the UI. Regression from commit 57450afb768c085df0ba2344aa94b5f843060178 (DOCX import: declare wps as a supported feature, 2013-12-03), as the VML import handled this. Change-Id: I654b51d51448d25d400979a4a62189b86126ac01 Reviewed-on: https://gerrit.libreoffice.org/29517 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2016-10-04loplugin:countusersofdefaultparams in swNoel Grandin57-114/+112
Change-Id: I65beb17816641cff6a07379b7ba234afe26806b3 Reviewed-on: https://gerrit.libreoffice.org/29488 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2016-10-03set translatable attributes in .ui filesAndras Timar2-6/+6
Change-Id: Idcdf9fbbc6b980a376fc0b5d607cbb48aa1dc5f1 Reviewed-on: https://gerrit.libreoffice.org/29503 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2016-10-03Fix typosAndrea Gelmini20-26/+26
Change-Id: Ia59d287a015482e9e97b701a6695463a7d235203 Reviewed-on: https://gerrit.libreoffice.org/29439 Reviewed-by: jan iversen <jani@documentfoundation.org> Tested-by: jan iversen <jani@documentfoundation.org>
2016-10-03loplugin:countusersofdefaultparams in sw..vclNoel Grandin31-76/+75
Change-Id: I152df55f5a30e073c66cfd3a64d5090a20cb232d Reviewed-on: https://gerrit.libreoffice.org/29471 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2016-10-03sw: prefix members of WW8FibMiklos Vajna17-1039/+1039
Change-Id: I69f8b6dda03b9a8cc19fc1dbe5e8031cfb7329d2 Reviewed-on: https://gerrit.libreoffice.org/29470 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2016-10-03n#780843 revert part of docx testcaseJustin Luth3-18/+34
revert testcase for commit 211916f86585cb4f6258eb30e0474e4c21cd37f1 On import, it is impossible to know where automatic end-of-pages will be, so it cannot be known that all the content before the page-break will be on the first page. Removing this testcase because Writer does not have the capability to dynamically assign headers/footers to continuous break sections. This test worked on this particular document, but not on generic documents. Replacing it with a version of the document with more text before the continuous break, which produces the exact opposite footer results. Change-Id: If660edd47b4eb19798f79babe65c37e1a9848739 Reviewed-on: https://gerrit.libreoffice.org/29408 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-10-03Fix typosAndrea Gelmini4-4/+4
Change-Id: Ie75beb4e282a4d1b784a5847262e39cf9c851527 Reviewed-on: https://gerrit.libreoffice.org/29440 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>