summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)AuthorFilesLines
2016-02-01sw: for better or worse getParagraph() is 1-basedMichael Stahl7-13/+14
Change-Id: I2bc99b4cbb86a368b6218b3c1a7dfc693858d1c9
2016-02-01writerfilter: tdf#97417: don't insert numbering on end-of-sectionMichael Stahl2-0/+12
... paragraph, it will be copied to every following paragraph. (Before commit 2b78f2cd7b9e4bab0f3b3b9119238f36a1bbc7b2 the properties of the end-of-section paragraph would be overwritten by the properties inside the header) Change-Id: Ibe095cf873a09ef9e12f898d09b5fd6f61c914c9
2016-02-01boost::unordered_set is not used anymoreNoel Grandin1-1/+0
Change-Id: I0d38b254a1a23c124247a7b747f5d1331c571f54 Reviewed-on: https://gerrit.libreoffice.org/21977 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
2016-01-31boost::tuple -> std::tupleCaolán McNamara2-17/+17
Change-Id: Ia08c184b792ff73d3ed49d6a5d54dec1a35943e9 Reviewed-on: https://gerrit.libreoffice.org/21955 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-01-31tdf#97362: Deleted CheckTable.java(this test translated to Python already.)kadertarlan2-293/+0
v2: Deleted CheckTable.java in JunitTest_sw_complex.mk Change-Id: I737a887d6f48fb2cacbe893289a430dd8312b3d8 Reviewed-on: https://gerrit.libreoffice.org/21949 Reviewed-by: jan iversen <jani@documentfoundation.org> Tested-by: jan iversen <jani@documentfoundation.org>
2016-01-31OSL_THIS_FUNC is a rip-off of BOOST_CURRENT_FUNCTION so we can use thatCaolán McNamara1-1/+0
as a direct drop in I guess Change-Id: I3add63f1459f4e659019bd6db54da2f5431958ce Reviewed-on: https://gerrit.libreoffice.org/21941 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-01-31unnecessary use of OUString constructorNoel Grandin5-12/+12
Change-Id: Idd31b0a53c8318af69bbcd32f6798721ec8eb8e1 Reviewed-on: https://gerrit.libreoffice.org/21945 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2016-01-31sequence->vector in PrinterOptionsHelperNoel Grandin1-2/+2
Change-Id: I643519397a4e714e3407ec0c3a10d329654b9f7d Reviewed-on: https://gerrit.libreoffice.org/21887 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2016-01-31tools: rename FontUnderline to FontLineStyleChris Sherlock35-195/+195
Change-Id: I4750ad8569a1003b2f8c29052f3e25003ee433ca Reviewed-on: https://gerrit.libreoffice.org/21892 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
2016-01-30Remove unused includesMiklos Vajna3-4/+0
Change-Id: I38784900d5b4fcf99d5fc881f0ec7a9833fe2d5b Reviewed-on: https://gerrit.libreoffice.org/21917 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2016-01-30Fix typoDavid Ostrovsky2-8/+8
Change-Id: I6fe407bb449b0f91509bfc91f42c0b0f320ecb09 Reviewed-on: https://gerrit.libreoffice.org/21914 Reviewed-by: David Ostrovsky <david@ostrovsky.org> Tested-by: David Ostrovsky <david@ostrovsky.org>
2016-01-30tdf#97362: Convert Java unit test to Python (check_named_property_values.py)kadertarlan1-11/+14
Change-Id: Icb94cdf3601d6d985ea147e3c80eadba2999ccee Reviewed-on: https://gerrit.libreoffice.org/21877 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: jan iversen <jani@documentfoundation.org>
2016-01-30tdf#89708 Fix crash on printing from print previewJan-Marek Glogowski1-1/+1
Prevents crash when previewing merged documents with page ranges from a view shell without a SwWrtShell, as the print preview. Change-Id: Ifa5f3de4c006da3ea8f61a56ab499843432f3203
2016-01-29CppunitTest_sw_rtfexport: add RtfExport::WriteRevTab() testcaseMiklos Vajna2-0/+24
Change-Id: Ie091a38b34f14f6f641d591092bcbc38b0c548f6 Reviewed-on: https://gerrit.libreoffice.org/21910 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2016-01-29RTF export: remove unused parameter of IsExportNumRule()Miklos Vajna1-3/+1
Change-Id: I75bc321a1997fe250ac6a7cb5dced50a76c36413 Reviewed-on: https://gerrit.libreoffice.org/21909 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2016-01-29sw: refactor SwPageFrame::HandleWhitespaceHiddenDiff()Miklos Vajna4-8/+14
As suggested at <https://gerrit.libreoffice.org/21445>. Change-Id: Id1e7a6381954c6d56a2593a064c37cc185475a56 Reviewed-on: https://gerrit.libreoffice.org/21899 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2016-01-29tdf#96175 RTF filter: export \companyMiklos Vajna3-0/+31
Change-Id: I590d015aa50350cceef70313498e72474d242789 Reviewed-on: https://gerrit.libreoffice.org/21897 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2016-01-29tdf#97362: Fixed Python unit test (check_indexed_property_values.py)kadertarlan1-6/+8
Change-Id: Ib8cfaccaaf5bf75169c96e46d95ff118cc850f79 v2: Deleted whitespaces Reviewed-on: https://gerrit.libreoffice.org/21886 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: jan iversen <jani@documentfoundation.org>
2016-01-29vcl: add text alignment functions to ImplFont and FontAttributesChris Sherlock2-2/+2
ImplFont and FontAttributes now have GetAlignment and SetAlignment, and I have renamed Font::GetAlign to Font::GetAlignment, and Font::SetAlign to Font::SetAlignment. See commit description in 8bfccd3a71d911b6d ("vcl: Create accessor and mutator for font scaling in FontMetric") for reasoning behind patch. Unit test added to vcl/qa/cppunit/font.cxx to test text alignment. Change-Id: I6272c84fc9416c90616d957d1897eba9469fe7ba Reviewed-on: https://gerrit.libreoffice.org/21876 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
2016-01-28tdf#97371 DOCX import: fix text covered by shapeMiklos Vajna3-0/+16
Regression from commit 358666e4204364ce915ee95372dc6f2fca545253 (tdf#90153 DOCX import: fix default sw TextFrame roundtrip, 2015-09-28), the problem was that at the moment SwTextBoxHelper::syncProperty() doesn't handle an AnchorType at-para -> at-char transition, so the importer shouldn't do that for TextBoxes till sw core gets extended to support the scenario. Change-Id: I8308bfd306672bc68984fbf019767c174130e18d Reviewed-on: https://gerrit.libreoffice.org/21885 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2016-01-28sw: add AnchorType parameter to .uno:PasteMiklos Vajna5-15/+21
Which allows not hardcoding as-char for LOK. Change-Id: I3b2987abbaf1f259c614b7b2a8709f15048d362d
2016-01-28Resolves: tdf#96580 Sequence::get doesn't return the start of the dataCaolán McNamara1-1/+1
it returns the start of the underlying uno_Sequence commit 78c83032b266fbb6fc20ddca86df80affaff7c24 Author: Caolán McNamara <caolanm@redhat.com> Date: Wed Sep 30 09:40:16 2015 +0100 maSvgDataArray only populates a uno::Sequence, so use that instead Change-Id: I335d5ee70e95e1a3b204d34f6df4cb62f3fb3cad Change-Id: I8d2c07fec039e58d3644e4ab5eb074ee215f075e
2016-01-28tdf#97362: Convert Java unit test to Python (check_indexed_property_values.py)kadertarlan4-128/+92
Change-Id: I6c3be8496b4a2225375072d9380d5e226b663905 Reviewed-on: https://gerrit.libreoffice.org/21853 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: jan iversen <jani@documentfoundation.org>
2016-01-27tdf#95416 Get rid of #include "../foo/bar.hxx" style includesburcinakalin4-6/+6
Change-Id: Ie05b032012124699c7f774f4b04bdf3d686e228e Signed-off-by: burcinakalin <brcnakalin@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/21840 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2016-01-27Renable insert endnote in Writer's standard toolbarYousuf Philips1-1/+1
Change-Id: Ied1a1d57b465b436009de3e2c0524c52ba81fd08 Reviewed-on: https://gerrit.libreoffice.org/21845 Reviewed-by: Yousuf Philips <philipz85@hotmail.com> Tested-by: Yousuf Philips <philipz85@hotmail.com>
2016-01-27Related: rhbz#1293210 crash in SwFlowFrm::BwdMoveNecessaryCaolán McNamara1-2/+3
Change-Id: I3b902b7fbd02b32f5d13dc47854445558e93b341
2016-01-27loplugin:fpcomparison in sw/Noel Grandin2-6/+6
Change-Id: Icce2ecee0c47fbbddb4fca72d724cbc770b52606 Reviewed-on: https://gerrit.libreoffice.org/21776 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2016-01-27Convert Java unit test to Python (check_named_property_values.py)kadertarlan4-112/+88
Change-Id: I70d05395b8b5ca89c6a2ebf63c1b4a7760a1559e Reviewed-on: https://gerrit.libreoffice.org/21829 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2016-01-27tdf#84317 convert missing numbering types to OOXML tokens.Mark Hung4-2/+59
CIRCLE_NUMBER -> decimalEnclosedCircle CHARS_ARABIC --> arabicAlpha CHARS_THAI --> thaiLetter CHARS_PERSIAN --> hindiVowels NUMBER_NONE --> none All the reset --> decimal All the types above were converted to 'none' before. Change-Id: Ie97e3fd4a00b7e4cc80ffb3776028e431e0535de Reviewed-on: https://gerrit.libreoffice.org/21741 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2016-01-26tdf#95376 DOCX import: fix incorrectly indented tab stopsMiklos Vajna2-0/+9
Regression from commit f4badd9a485f32f787d78431ed673e2932973887 (tdf#92454 DOCX import: allow overriding para prop from num style in para style, 2015-09-22), the problem was yet another priority mishandling in the maze of various styles and indentation handling. In the tdf#92454 bugdoc, both a numbering-from-paragraph-style and a paragraph-style defined indentation, and Word preferred the numbering, while Writer preferred the paragraph style, that's why the import-time conversion was added. However, it turns out there is a 3rd source that's still not direct indentation formatting: a direct numbering. So the correct priority is: direct-ind > ind-from-num > ind-from-parastyle > ind-from-num-from-parastyle Which means in this case the indentation should not be set directly: the two conflicting value (ind-from-num and ind-from-parastyle) will be resolved correctly by Writer core. Given that we always first get the para style info, and only then the numbering, we just need to undo the conversion added for the other bug if we see a direct numbering, then both the old bugdoc and this new one will be handled properly. Change-Id: I09cc84605d5df6159da985ad069d46b580a53358
2016-01-25InterfaceContainer2 with vector instead of SequenceNoel Grandin17-51/+72
create an InterfaceContainer2 class to replace InterfaceContainer. It uses a std::vector instead of a Sequence for the mutable listener list, which provides far better performance. Switch all our internal use-sites to the new class. Change-Id: I6b56cfa511ded2395faa22e68fab3b2f16c3cb88
2016-01-24cppcheck: fix a duplicateExpressionJulien Nabet1-1/+1
Change-Id: If3fadffa9b43c88552e8e2cbf213bd840ab9204a
2016-01-22sw tiled rendering: avoid unnecessary invalidation in SwView::SetVisArea()Miklos Vajna3-2/+30
SwWrtShell's visible area is set to the entire document since 12e3b51abe883202af09769873f87b27d7de118b (tdf#94237 tiled rendering: Use the entire document as the visual area., 2015-09-15). Let's be consistent and do the same for SwView, so that SwView::PageDown() and all other similar functions do not cause unnecessary invalidations, as this way later we'll realize that SwView's and SwWrtShell's visible area is the same. Change-Id: Ia22f07ddfb18c6f5ab6cbafede7cf8799b1177a1
2016-01-22tdf#89708 Adjust print page range for unprinted blank pagesEilidh McAdam2-1/+61
Depending on whether automatically inserted blank pages are to be printed or not, the range of pages to print is expressed differently to the pages displayed in the preview in the Print dialog - i.e. the page range includes blank pages, whereas the preview doesn't (if blank pages are not to be printed). This patch adapts the range so that if blank pages are ignored upon printing, the range can be expressed across printable pages only, same as the Print dialog preview. An example is a merged document of several records into a single page letter or document - blanks are automatically put in between documents but usually aren't displayed/printed. Previously, printing page 2 would print the blank page between the 1st and 2nd merged document. After this change, printing page 2 will print the 2nd merged document instead. The "Pages" (print range) text box in the Print dialog defaults to the current page - this patch adjusts this when blanks are not to be printed so that it is expressed as the current page minus any blanks since the start of the document. Change-Id: Ic1d4d374a82c6f921bb41a97130838757c6b74b1 Reviewed-on: https://gerrit.libreoffice.org/18420 Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> Tested-by: Jan-Marek Glogowski <glogow@fbihome.de>
2016-01-22editeng: ImpEditView::mbTiledRendering is never readMiklos Vajna2-2/+0
Change-Id: Ie8e33d075f0cedbb9f7148717c4318f4494ed419
2016-01-22Yes, output the name earlyStephan Bergmann1-1/+1
Change-Id: Ib2975598b2b1e4ddd875ab873de9716418949868
2016-01-21Check for valid SidebarWinMaxim Monastirsky1-2/+2
Change-Id: Ia483408b5fef0880d44f37b6372054956f0ab069
2016-01-21Quickfix for deterministic SvpSalBitmap checksumsStephan Bergmann1-1/+1
...that include the junk parts of the mpDIB->mpBits array in the calculation. MALLOC_PERTURB_=153 in gb_CppunitTest_malloc_check (solenv/gbuild/platform/unxgcc.mk) causes those junk bytes to normally contain 0x66 on Linux, but ASan makes them contain 0xBE instead. Change-Id: I74429c5e539e667cb936b3a486de31867eef3e50
2016-01-21sw tiled editing: default to anchoring new images as-charMiklos Vajna1-0/+5
Change-Id: I6aeb06fe1697b7a30e83a3b1b364f44e5822fe95
2016-01-21sw: MSVC 2013 --enable-dbgutil does not need 3 overloads...Michael Stahl1-26/+0
... of these structs so remove them again, sorry for the noise. Change-Id: Ic1b5fc0fd3d778cf8ab915774a12efecd5c5b451
2016-01-21loplugin: unused return valuesNoel Grandin40-103/+59
Change-Id: I4eb1f0c9245c04058fd5e47046f043f8840a79c7 Reviewed-on: https://gerrit.libreoffice.org/21628 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
2016-01-21vcl: rename Font::GetFamily to Font::GetFamilyTypeChris Sherlock14-21/+21
Change-Id: Ie427a43bd126dcdd89c6f66582736e67130f2254 Reviewed-on: https://gerrit.libreoffice.org/21633 Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com> Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>
2016-01-20tdf#93837 sw: Convert comment context menu to xmlMaxim Monastirsky20-52/+192
Change-Id: If449bff057a78802ed0b74d75a3c1a8a23def31a
2016-01-20Drop unused definesMaxim Monastirsky1-13/+0
Change-Id: Iab5c64c38ae0fb38ae87721d82f6743c74f18841
2016-01-20coverity#1349701 Dereference before null checkCaolán McNamara1-4/+8
Change-Id: If919191ac4629885c782e5da39be3c1ce7e4e3dd
2016-01-20replace use of basebmp in vcl entirely nowCaolán McNamara1-1/+1
we're just using it to store bitmap data and to convert to preferred destination format, so we can use the preexisting vcl BitmapBuffer for that Change-Id: I0e800956d95faddfafa53d2c48b09494a7a867c0
2016-01-20loplugin:passstuffbyrefStephan Bergmann1-1/+1
Change-Id: Ic4d2e018f193525be00da03fc14e147d6b68257f
2016-01-20sw: indentation fixesMiklos Vajna2-55/+55
Change-Id: I8b281b425483fb7fc3cf34e31533c2ddc1b03637
2016-01-20sw: (mea culpa) fix unostyle.cxxChris Sherlock1-558/+437
Unfortunately in commit 2b297116cb6bb1061c4 I messed up whilst doing a rebase via meld to incorporate my changes. This meant that I overwrote changes made to sw/source/core/unocore/unostyle.cxx. Even more regrettably, my original changes missed making changes in Windows and OS X builds as I pushed too quickly from within gerrit, assuming that the build errors weren't caused by me. These series of VCL changes I had made were quite rightly reverted, and I worked towards fixing them up again - sadly my ISP (iiNet) had connectivity problems so it took me some time to even gain access to the repository to do the cherry-picks of my previous commits so I could fix them up and resubmit them. I honestly didn't notice that I had overwritten the changes in unostyle.cxx previously, as I was so intent on fixing my errors that this entirely passed me by. This unfortunately led to this commit, where I overwrote the changes a second time: 28c96fc2553a5c3dee108f1e2060d7bc081a7e7e I was informed of this problem via the mailing list [1] which I read the next morning immediately after I work up. I take full responsibility and very much regret having made these mistakes. This commit fixes the issue and I will take steps to ensure that it doesn't occur again. I can reassure all that this was not intentional, nor would I ever do such a thing on purpose - quite frankly I'm mortified. 1. http://lists.freedesktop.org/archives/libreoffice/2016-January/072067.html Change-Id: I336626059d4acd175669832950f3ed52b2539087 Reviewed-on: https://gerrit.libreoffice.org/21618 Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com> Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>
2016-01-19place it safe with MSVC 2008 buildNoel Grandin1-0/+24
revert a couple of pieces of commit 5fe99ea3ee7b33a80f1419f2a4c9c1ea56dd00ee "loplugin:unusedmethods in sw" Change-Id: If1eb9c7f01dcdea7ef7059165470357d5186ff93