summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)AuthorFilesLines
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
2016-01-19Silence some odd -Werror=strict-overflow (GCC 6)Stephan Bergmann1-0/+8
Change-Id: I7facae62c7ce0977e8c40d60720e4fe32460cd3d
2016-01-19Missing dependencyStephan Bergmann1-0/+3
Change-Id: I549116095255426dd2036a2122097567bf40a204
2016-01-19loplugin:unusedmethods in sw/Noel Grandin22-163/+0
Change-Id: Id452bfac5c83f130a138e06984a0c79c37af70ac
2016-01-19tdf#85523 DOCX import: fix unexpected extra char at comment endMiklos Vajna2-0/+8
Change-Id: Ic3eb073d11a395a81b90fd1a9292d6ecf2940c09
2016-01-19Wrong copy-pasteMaxim Monastirsky5-5/+5
Change-Id: If7f606973eeae92994fa06efee2266ff5dffe384
2016-01-19Fix typoMaxim Monastirsky1-1/+1
Change-Id: If2c92108e1f19cd766b36dabd1c9e9215242de11
2016-01-19tdf#93837 Convert Writer context menus to xmlMaxim Monastirsky73-15/+2909
Change-Id: I9bc4d5dbef899a31f485123ec841f8d6585a4529
2016-01-19Kill .src based Writer context menusMaxim Monastirsky6-1310/+4
Change-Id: I854e2dd48b2f59b561c0d0cd3e52297046d25b96
2016-01-18basebmp now only used from vcl/headless codeCaolán McNamara3-9/+0
Change-Id: I068d404431d3565f6ad5741edbd3693225824a4d
2016-01-18Convert NULL/0 to nullptrPeter Foley1-1/+1
Change-Id: Iee6bb0867afd8aebe36e62b507f1332e3a581838 Reviewed-on: https://gerrit.libreoffice.org/21549 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2016-01-18drawmodes header goneCaolán McNamara3-3/+0
Change-Id: Ia1b9ad96dbe41bebc5c2819385950a6d2980608b
2016-01-18cppcheck: nullPointerCaolán McNamara1-10/+3
Change-Id: I2f96d4ea73ccf47b2783ade35890c2dd8e558e5f
2016-01-18avoid Mouse Not Captured warningCaolán McNamara1-2/+3
Change-Id: I832e7f891d2f37775e266942320c12c536adcc9d
2016-01-18tdf#96600: use frame RTL property for determining active ruler columnMike Kaganski3-2/+17
Text direction doesn't necessarily coincide with it Change-Id: I768208d6c4109d2ccd4fc9e6824f8dbd8eabe76b Reviewed-on: https://gerrit.libreoffice.org/20820 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Oliver Specht <oliver.specht@cib.de>
2016-01-18loplugin:bodynotinblockStephan Bergmann1-2/+2
...probably an oversight in 0d127baed75929e744d5b6249f510012cfbc0e88 "tdf#91083 - .doc: emulate table keep-with-next paragraph." The following comment had been oddly hanging around there ever since 84a3db80b4fd66c6854b3135b5f69b61fd828e62 "initial import," leaving it unclear whether it belongs to the preceding or following code, so just keep it hanging there oddly... Change-Id: I0c5cea5955b4b91efcffa499019975c810e6c983
2016-01-18loplugin:unusedfieldsNoel Grandin1-3/+1
Change-Id: I321b594f1190cdd997b4769161e1c02d31f46213 Reviewed-on: https://gerrit.libreoffice.org/21566 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
2016-01-18vcl: change Font::SetName() to Font::SetFamilyName()Chris Sherlock13-28/+28
Change-Id: I9b7bd1ec25955981ebcb9085579cbb9fbaa802d5 Reviewed-on: https://gerrit.libreoffice.org/21560 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
2016-01-18tdf#93637 TAB_OVER_MARGIN support for a few more casesJustin Luth2-1/+19
Extending nMaxRight when TAB_OVER_MARGIN compatibility is set and the right tabstop goes beyond the right margin fixes PDF output as well as certain cases of screen display. Change-Id: Ida4b4f399f06670d9bdefdc21978adf19a81d53a Reviewed-on: https://gerrit.libreoffice.org/19635 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Justin Luth <justin_luth@sil.org>
2016-01-18tdf#91083 - .doc: emulate table keep-with-next paragraphJustin Luth4-17/+29
connect table with the following paragraph. Move forward to a new page together with the following paragraph if necessary. Most of the added code allows the table to split if all of the kept items do not fit on one page - allowing the emulated table to match the layout of kept tables. The only difference with .doc occurs when the table itself is larger than one page. In that case it ALWAYS starts a new page. Although it does not match .odt, it DOES match how MSWord handles that .doc. Change-Id: Ic6f495c0dc5cd4e9f8029a8cec9e31b4fab4b20f Reviewed-on: https://gerrit.libreoffice.org/20233 Reviewed-by: Justin Luth <justin_luth@sil.org> Tested-by: Justin Luth <justin_luth@sil.org>
2016-01-17vcl: rename Font::GetName to Font::GetFamilyNameChris Sherlock22-479/+600
Change-Id: Ie20871a3078bf875c1782b7761d60591a9c9704f Reviewed-on: https://gerrit.libreoffice.org/21529 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
2016-01-16revert vcl patch series that brok Mac and WindowsNorbert Thiebaud31-627/+506
revert: 9bc2f3de8672e812f3a67541c6d7069b434a7e42 vcl: add comment about ImplFontMetric::{Get|Set}LineHeight() 26371f105bc44e04469ec03fc5bb12505e651c6b vcl: FontAttributes::GetSlantType() -> FontAttributes::GetItalic() 2dd0b4317372b8022efe3911b38b4fa02956d8b9 vcl: font.hxx and metric.hxx cleanup, make ctors explicit and the dtor virtual 5ab13bf3ead3539e4ad847656da81e7eb6029652 vcl: tabify font.hxx f99550dae55e40e49bf9c9875053fe2abb4c71ca vcl: change Font::SetName() to Font::SetFamilyName() 2b297116cb6bb1061c43e5714e2609c8ee9f57d2 vcl: rename Font::GetName to Font::GetFamilyName Change-Id: I23f38921187d66b970ca815eb30dda4222a2da62
2016-01-16vcl: change Font::SetName() to Font::SetFamilyName()Chris Sherlock13-28/+28
Change-Id: I54a4036544c680c4a49607677af776aa7a433fbc Reviewed-on: https://gerrit.libreoffice.org/21510 Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com> Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>
2016-01-16vcl: rename Font::GetName to Font::GetFamilyNameChris Sherlock22-478/+599
Change-Id: I83927e0992dfe0a2a79d139818a9f45d3761aae5 Reviewed-on: https://gerrit.libreoffice.org/21509 Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com> Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>
2016-01-16use a map for dispatchBjoern Michaelsen1-65/+40
Change-Id: I29c88c834a01f8d04a2998ea3edfa95cd0cadb85
2016-01-16remove bDone band-aidBjoern Michaelsen1-37/+7
Change-Id: I7c4783ab70e7456d30ee86bb1c415e6d54df3285
2016-01-16refactor out to limit scope: RES_PARATR_NUMRULEBjoern Michaelsen1-17/+19
Change-Id: Iecea747a436de1afe529e024974006a256aa5f5a
2016-01-16refactor out to limit scope: RES_PARATR_DROPBjoern Michaelsen1-31/+25
Change-Id: I8813b5676504e6de2af70d181fa9e905538fb05c
2016-01-16refactor out to limit scope: RES_TXTATR_CJK_RUBYBjoern Michaelsen1-29/+27
Change-Id: I02b37ead4f930a91f9e8c6d472ffe0d2991bb78f
2016-01-16refactor to limit scope: SID_SWREGISTER_COLLECTIONBjoern Michaelsen1-9/+14
Change-Id: I67c259f4da968b9decc4ac95195864a28283d1b5