summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)Author
2017-05-19conditionaly execute tests that depend on additional fontsMarkus Mohrhard
Change-Id: Ie32c69d0ec66006807adfc58ea956a8a0906d238 Reviewed-on: https://gerrit.libreoffice.org/37798 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2017-05-18Revert "Fix typos"Stephan Bergmann
This reverts commit 26a67002fcb9381b54de6cae1aaa37120d49066a. "Iff" is not a typo, see 2a65bf32ec270484dcea4d22d3c93552dc0c24dd "Revert 'Typo: iff->if'".
2017-05-18conditional execute test that depends on additional fontsMarkus Mohrhard
Change-Id: Ib08cba9074eb6d8149eac518794178c4f72998f0 Reviewed-on: https://gerrit.libreoffice.org/37784 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2017-05-18Fix typosAndrea Gelmini
Only replaced "iff" with "if" Change-Id: Ib9dfa5c12b05500043147fe3b65f923b1b12a581 Reviewed-on: https://gerrit.libreoffice.org/37782 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com>
2017-05-18Remove parentheses around some comparisonsStephan Bergmann
...where Clang would otherwise start to emit -Wparentheses-equality as soon as the order of arguments were switched by loplugin:comparisonwithconstant Change-Id: If064c2c6e2f81478154395137138b71f2d1c6534
2017-05-18sw lok: Make the default for the Web view larger.Jan Holesovsky
Change-Id: I943711e084adcfa0af2a79cf83d5c3e1b6dc45e6 Reviewed-on: https://gerrit.libreoffice.org/37758 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2017-05-18Replace macro with functionStephan Bergmann
Change-Id: I41603579d71190b60e6b7c349b2296120757e4f2
2017-05-18tdf#100072 zero height of shape's path was causing geometry errorsVasily Melenchuk
DOCX custom geometry shape's path width and height are now used independently for scaling calculations. Change-Id: I368dd4dc065b8f122c4eb2911261e45047f03c70 Reviewed-on: https://gerrit.libreoffice.org/37639 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-05-18html import: Don't create HTML: <meta name="changedby" content="..."> postit.Jan Holesovsky
Change-Id: I8deea3b60d9bb86c20539be2ad23e6b07f44e51b Reviewed-on: https://gerrit.libreoffice.org/37729 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jenkins <ci@libreoffice.org>
2017-05-18loplugin:unusedmethodsNoel Grandin
Change-Id: I1c50d176e793397a1f9625f797a3750cf191a61c Reviewed-on: https://gerrit.libreoffice.org/37679 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-05-18Clean up a set of RTL-related commentsTor Lillqvist
It is fairly pointless to have a comment like "--- RTL --- (mirror mouse pos)" in front of code that obviously is related to RTL anyway, like "if( AllSettings::GetLayoutRTL() )". Also, the fact that many comment were exactly the same indicates that they has been added as an in-line version control change marker. In other places, comments were informational, but no need for them to include yet another metasyntax, "--- RTL ---". Just "RTL:" works fine. Change-Id: I20feef308ed8ac9d32a8bf440fc20b442753c4ff
2017-05-18Watermark: Insert watermark commandSzymon Kłos
* added new command .uno:Watermark * if no arguments are provided the dialog is opened where user can enter the text * with provided Text argument the watermark is created * created SfxWatermarkItem to transfer watermark properties * dialog loads current setings * SetClassification use SetWatermark Change-Id: Ifc1319f5aa7c11bb141f8e4b5b9a5088613021c2 Reviewed-on: https://gerrit.libreoffice.org/37599 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2017-05-17lok: Update state of undo after a comment modification.Jan Holesovsky
Change-Id: Ibb6a902f928b951bd480e32cb1f91d100420dccb Reviewed-on: https://gerrit.libreoffice.org/37726 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jenkins <ci@libreoffice.org>
2017-05-17Use more secure HTTPS URL for dev-www.libreoffice.orgPaul Menzel
Run the command below to convert all URLs for *dev-www.libreoffice.org* to use the more secure HTTPS URL. ``` git grep -l 'http://dev-www' | xargs sed -i 's,http://dev-www.libreoffice.org,https://dev-www.libreoffice.org,g' ``` If a redirect is implemented for the insecure HTTP requests, also one request would be saved. ``` $ curl -I http://dev-www.libreoffice.org HTTP/1.1 200 OK Date: Wed, 17 May 2017 10:00:52 GMT Server: Apache/2.2.12 (Linux/SUSE) Content-Type: text/html;charset=ISO-8859-1 $ curl -I https://dev-www.libreoffice.org HTTP/1.1 200 OK Date: Wed, 17 May 2017 10:00:57 GMT Server: Apache/2.2.12 (Linux/SUSE) Content-Type: text/html;charset=ISO-8859-1 ``` Change-Id: I99626ded90f72239f98ce76fd1b2760c31c34408 Reviewed-on: https://gerrit.libreoffice.org/37703 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-05-17tdf#100033: Frames with the same name are removedTamás Zolnai
Allow to have frames with the same name. For removing real duplicated frames (generated by LO earlier) check other things also next to the frame name: position, size or whether the two frames are anchored to the same position. Change-Id: I191ae5128d0228eb85f78f065b44b1f0b3ba6dcf Reviewed-on: https://gerrit.libreoffice.org/37702 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2017-05-16ExternalZoom and ExternalScroll are unusedCaolán McNamara
which leads to CommandWheelMode::ZOOM_SCALE becoming unused and so touch/touch.h is unnecessary Change-Id: I7cb9a4f6af2719deb0d768e35d514b59010daf79 Reviewed-on: https://gerrit.libreoffice.org/37671 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-05-16tdf#107889 DOCX import: consider page breaks for multi-page floattablesMiklos Vajna
This is the DOCX equivalent of commit 6aba29576df7a2a40e54040d4dd09d94d6594741 (tdf#107773 DOC import: consider page breaks for multi-page floattables, 2017-05-11): a specific case where it's clearly superior to import a multi-page floating table as a multi-page one, rather than a floating one. Change-Id: I71a92d2b10e52e505665831caacad2948d22b4e1 Reviewed-on: https://gerrit.libreoffice.org/37683 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2017-05-16tdf#107801 docx export: support w:kernJustin Luth
Writer only enables or disables pair kerning (autokern). Word uses a minimum font size to determine which characters to kern. Since these documents are round-tripping through Writer, and every size is kerned by Writer, the minimum size is forced to 1pt and the original minimum font size is lost. This is a followup to commit 38b0c24fa5cbb4246e03d77ac022dfdc9fdede03 for related tdf#105454 DOCX import: fix unwanted enabled-by-default kerning. Tested in Word 2003, 2007, 2013. Change-Id: I7678a544f455fd06bec5e7d864b5c27ab26bf6d3 Reviewed-on: https://gerrit.libreoffice.org/37574 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-05-16tdf#107852 Support DisplayName property for table stylesMaxim Monastirsky
Change-Id: I62bfdbea0a1bc62677d5fe25043e9251811b3ac7 Reviewed-on: https://gerrit.libreoffice.org/37663 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
2017-05-16ofz#1632 direct leakCaolán McNamara
Change-Id: Ib1c347f9ee15717ce17b3189b07f3622efd8d689
2017-05-16tdf#106953 RTF import: fix missing paragraph left marginMiklos Vajna
See commit 3915bf2dc877d5f1140798e24933db0f21386a4a (tdf#95376 DOCX import: fix incorrectly indented tab stops, 2016-01-26) for the various sources that can determine the paragraph indentation. In this case the problem was that too aggressive RTF style deduplication removed a direct indent, which then meant a fallback to the ind-from-num value, not to the ind-from-parastyle one. Change-Id: I3b47b2bbeaaedf405baef24505d23dc49bd01865 Reviewed-on: https://gerrit.libreoffice.org/37660 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2017-05-16loplugin:unusedfields improve write-only analysisNoel Grandin
by whitelisting a couple of methods we know only write to their parameters Change-Id: Id7aef9c03c23d10c27707b21eb9a0db4a6c2757c Reviewed-on: https://gerrit.libreoffice.org/37647 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-05-15sw: prefix members of SwGlobalTreeMiklos Vajna
Change-Id: I894b7c6f63ac80fa54edf985e2314aa48948407e Reviewed-on: https://gerrit.libreoffice.org/37623 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2017-05-15loplugin:useuniqueptrNoel Grandin
ignore SAL_LOG type stuff in the destructor Change-Id: If014382ca0c96edd3f2b325a28451d83b3d1f278 Reviewed-on: https://gerrit.libreoffice.org/37539 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-05-15remove some unnecessary lockingNoel Grandin
Change-Id: I7da9e82930d3fe8f927c495aeca270b8bb5cf65c Reviewed-on: https://gerrit.libreoffice.org/37602 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-05-14tdf#107197 Replace relationship URIFakabbir Amin
Hard coded relationship URI in sd/source/, sw/source/filter and oox/source/export/ directory has been replaced with method calls. Change-Id: Ie1b9542325fa4143bddea2582aa5e946094e457d Reviewed-on: https://gerrit.libreoffice.org/37433 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2017-05-14Remove more %20 from style commandsMaxim Monastirsky
And fix a typo found in H5/H6 commands in Writer's style toolbar. Change-Id: Ieb8f701d055870040010da66a9a108bbd089bc0a
2017-05-14Revert "tdf#96444 Replace chr(20) with '%20' in style uno commands"Maxim Monastirsky
This reverts commit 939abe5a79674525ce134637947fe424a7e2332a. This causes styles to not appear as having keyboard shortcuts in Tools > Customize... > Keyboard, and style buttons that were added using tdf#106681 to not have their keyboard shortcuts in their tooltips. Given that the original bug is a local problem in MenuBarManager, I prefer to fix it there, rather than put workarounds all over the place, including those ugly "%20". Change-Id: I797f463df2b37ab69f73f357ab9d120697e0ff33
2017-05-13sw: fix gcc-4.8 buildMiklos Vajna
After commit 2308bea5ba38250133d7e344484e688ecaab6d8d (sw: change SwCursorShell::Pop() parameter from meaningless bool to enum, 2017-05-12). Change-Id: I64ecdf3ea16383c3938b32acdf69a78a31938ae6
2017-05-13sw: some old GCC apparently doesn't like that, let's try thisMichael Stahl
Change-Id: I1d6e74ae990faecfd3a28e0971ed6abe20bcef75
2017-05-12sw: change SwCursorShell::Pop() parameter from meaningless bool to enumMichael Stahl
Change-Id: Iadc660025e1501118cb0a659d92d42af924b1c6f
2017-05-12tdf#39468: Translate German comments/terms sw/source/filter/html/htmlfldw.cxxJens Carl
Change-Id: I7e1e55632668f7947dbab7b2f00b19b76aecc0a3 Reviewed-on: https://gerrit.libreoffice.org/37526 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2017-05-12tdf#39468: Translate German comments/terms in sw/source/filter/html/swhtml.cxxJens Carl
The fourth set of translations. Change-Id: I1d3c2a14d702a8b50130752fe653a783e1c54794 Reviewed-on: https://gerrit.libreoffice.org/37525 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2017-05-12tdf#107795 fixed cursor position after inserting input fieldBernhard Widl
Change-Id: I3c063c0393b524132e522914a7a9885c8a9c3b78 Reviewed-on: https://gerrit.libreoffice.org/37536 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2017-05-12sw: table-in-footnote: delete SwFootnoteFrame if it becomes emptyMichael Stahl
Crashed in a11y code with a SwFootnoteFrame that survived a JoinNode and subsequent deletion of its reference-containing SwTextFrame and thus had a stale "pRef" member; presumably the SwTableFrame needs to delete an empty footnote frame like the SwTextFrame does from SwContentFrame::Cut(), called from DelFrames(), called from CutImpl(). Change-Id: I5a30357ecd3bf474bfc4a5451de89beb245fb0ae
2017-05-12tdf#107568 sw: prevent moving/splitting of tables in footnotesMichael Stahl
The problem here is that for a table in a footnote on page 42, SwTabFrm::MakeAll() calls Split(), which first creates a follow-table-frame and then reformats the last row of the table; somehow the SwTextFrame id="4636" in that row doesn't fit and wants to split and then move to the following page with that page's footnote container as its parent. So this doesn't work currently. commit 971adcd9e19e0bcab5855aae9be58d2203b46169 tried to prevent just the moving forward of the table itself, but the table can still be split; if IsMoveable() returns false then that also prevents splitting the table. Change-Id: I1977c65f97cb0f66dbe5b89d7ef7e2cd05125331
2017-05-12tdf#100072 extra test for DOCX shape import with zero heightVasily Melenchuk
Corresponding bug is already fixed in tdf#107104. However created tests do care only for width, but not for height, like we have in this testcase. Change-Id: I6f24e66e3c5e9289e158e0ca043ef01a3ea42880 Reviewed-on: https://gerrit.libreoffice.org/37538 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-05-12Resolves: tdf#107786 crash on null pointer accessCaolán McNamara
Change-Id: I371d509e7ab6e7e0ef757e302d54ab75aa6c4c9b
2017-05-12ofz: sanity check L_VAR2 record boundsCaolán McNamara
Change-Id: I862457a7239108974f360a87b4f6ccf433eae364 Reviewed-on: https://gerrit.libreoffice.org/37534 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-05-12loplugin:constantparamNoel Grandin
Change-Id: I67d74072c776c32a1f91df94c621efe180baf5dc Reviewed-on: https://gerrit.libreoffice.org/37481 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-05-12coverity#1406101 Dereference null return valueCaolán McNamara
and coverity#1406100 Dereference null return value coverity#1406099 Dereference null return value coverity#1406098 Dereference null return value coverity#1406097 Dereference null return value Change-Id: I26d5c0f2e69dc049a87a607ca28586dc575a8ca3
2017-05-12sw laycache: clean up debug code that doesn't even build anymoreMiklos Vajna
Change-Id: I52ad9ac6d43881a02c4817ea7527761105a12786 Reviewed-on: https://gerrit.libreoffice.org/37529 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2017-05-12remove unused uno::Reference varsNoel Grandin
found by temporarily marking Reference as SAL_WARN_UNUSED. Change-Id: I18809b62654467f890016adcc92576980ced393b Reviewed-on: https://gerrit.libreoffice.org/37511 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-05-12convert SdrLayerId to strong_intNoel Grandin
Also - rename SetOfByte to SdrLayerIDSet - add asserts in SdrLayerAdmin::GetUniqueLayerID so that we don't allocate overlapping SdrLayerID values - add a new constant SDRLAYERPOS_NOTFOUND to be returned from SdrLayerAdmin::GetLayerPos Change-Id: I3bb3489f9338e3d02c4040bcbd811744699941c8 Reviewed-on: https://gerrit.libreoffice.org/37467 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-05-11tdf#107773 DOC import: consider page breaks for multi-page floattablesMiklos Vajna
See commit 8fe8bd6c3b5b1a539b7370f8c457fa69c061d2de (Related: fdo#61594 SwWW8ImplReader::StartApo: don't always start a frame, 2013-05-13) for the context, this is one more case where having a multi-page floattable as a multi-page one is a better option. The additional condition is that in case there is a break right after the table, then always import the table as a non-floating one, as there won't be any wrapping anyway (due to the break). Change-Id: I3dd4174226cfc1e825c00607221feeed51b7133f Reviewed-on: https://gerrit.libreoffice.org/37513 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2017-05-11Comment on suspicious use of U+00B5 MICRO SIGNStephan Bergmann
...which had been like that at least since 7b0b5cdfeed656b279bc32cd929630d5fc25878b "initial import". Change-Id: I16e3cc14ed459c5833f2bfa6ead3bec4e819db31 Reviewed-on: https://gerrit.libreoffice.org/37184 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-05-11lok: sw: change tracking: deleted characters aren't deleted right awayMarco Cecchetti
Problem: Start/open a document in CS Writer, and enable track changes. - Type a few characters. - Delete a couple of them with backspace or delete. => The deleted characters are still shown in the document (but not in the tracking comment). Findings: In SwViewShell::ImplEndAction pRegion is 0, so no call to SwRootFrame::Paint->vcl::Window::Invalidate occurs. That is due to the fact that the call to SwLayAction::Action() does not lead to populating *pRegion with rectangles (SwViewShellImp::AddPaintRect). In fact we stop at SwLayAction::TurboAction_ since pCnt->IsValid() returns true and so SwLayAction::PaintContent() is never invoked. SwFrame::IsValid() returns: mbValidPos && mbValidSize && mbValidPrtArea. Here SwFrame::mbValidSize is the one that makes the difference: it is true in Online and false in Desktop. (In our case the other 2 data members are always true). The reason is that the computation of the text range (SwShellCursor::FillRects) in SwRedlineTable::LOKRedlineNotification, which occurs just before collecting paint rectangles, leads to invoke SwContentFrame::MakeAll which in turns set SwFrame::mbValidSize to true. Solution: Call SwFrame::InvalidateSize() on any frame on which MakeAll is invoked soon after we finish to compute the text range in SwRedlineTable::LOKRedlineNotification. Change-Id: Id5e29b06c044f14207722e67d6f5facbf786ffa6 Reviewed-on: https://gerrit.libreoffice.org/37508 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2017-05-11tdf#107258 Create show/hide all comments toggle button.Gulsah Kose
Created new show/hide all comments button for calc by ShowAnnotations command. Unifyied writer, calc and impress's ShowAnnotations slot. Change-Id: I27149d09ee1763b84258c5e0c890a9628c8874c0 Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/36697 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com>
2017-05-11ofz there may be no m_pSmartTagDataCaolán McNamara
Change-Id: Ibd529c5db35f2ca64372629ab1fe0ecd08e2ea01
2017-05-11ofz clear the *other* cache too to avoid lsan leak whiningCaolán McNamara
Change-Id: Ib8ce5b83d711e4425bb9f441b8d495a05af820bf Reviewed-on: https://gerrit.libreoffice.org/37501 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>