summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)AuthorFilesLines
2017-02-09tdf#91596 sw: make Format All Comments persistentMichael Stahl1-0/+2
Change-Id: I8f9a20084d2dc8abd7699f64307b81321699498c
2017-02-09use proper message passingBjoern Michaelsen8-38/+51
Change-Id: Ic41c7acc73c2d275dfdb6b2ffcbb24fba5f8be72 Reviewed-on: https://gerrit.libreoffice.org/33980 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2017-02-09tdf#105852: don't merge cells if there were no merge continuationMike Kaganski2-0/+64
In RTF, it's possible to start a cells merge using \clmgf, and simply omit following cells in the row - they must merge automatically. This makes HorizontallyMergedCell::m_nLastCol/Row uninitialized. Previously, the uninitialized values arrived as 0,0 - thus the first range's cell got merged with cell 0,0. This change prevents the merge; in scenario above, absence of additional cells in row will create merged cell automatically. Change-Id: I68b84b7ec70d9512c541a077689369fa4a8dc0c5 Reviewed-on: https://gerrit.libreoffice.org/34079 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
2017-02-09sw: even more integers acting upMichael Stahl1-2/+2
Change-Id: I55f6d49ca831ca421e7615c096cd7ac7147caf62
2017-02-09sw: fix even more integer madnessMichael Stahl1-14/+15
Change-Id: Id785992300de7f8ae714b7fdcf822b42d11353b1
2017-02-09tdf#103567 xmloff: ODF import: fix more lossage on Writer framesMichael Stahl2-0/+36
There's another context that reads draw:frame, and it has the same problem as the one used for Impress shapes. This causes SVG images in Writer to lose contour polygons and image maps. Fix this the same way as the other context. (likely regression from 44cfc7cb6533d827fd2d6e586d92c61d7d7f7a70) Change-Id: I16cf55e68829b4e1b0841f2015d0729be0ce3725
2017-02-09Reapply "create ErrorHandlerFlags scoped enum for error handling flags""Noel Grandin5-17/+17
This effectively reverts commit 32cae6a2eaa41568888df9c8fc5605debd8d704a. Change-Id: I15bb0a5c4acaeee6d47dd93a71601d9687d701bc Reviewed-on: https://gerrit.libreoffice.org/34028 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-02-09loplugin:unusedenumconstants read-only constants in vcl (2)Noel Grandin1-3/+0
Change-Id: Ia3da23e0ef2fa710403745bd11255ed001516da4 Reviewed-on: https://gerrit.libreoffice.org/34020 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-02-08replace localresource of strings and keys with StringArrayCaolán McNamara1-135/+39
Change-Id: I402f5485af0c1e60677b8291c879bc7ca14633d3
2017-02-08remove unused constants from RES_MSGNoel Grandin1-6/+0
Change-Id: I3eaa1f051440a91c8c5b4996e28dea4e0d3933e5 Reviewed-on: https://gerrit.libreoffice.org/33994 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-02-07Revert "remove ugly operator* in DynamicErrorInfo"Michael Stahl5-15/+15
This reverts commit b5e3f8a5fa98a249ecd50021c33cf2a5c7a3b4fc. The problem is this: ==24217== Conditional jump or move depends on uninitialised value(s) ==24217== at 0x29A25FCE: SfxObjectShell::SetError(unsigned int, rtl::OUString const&) (objmisc.cxx:220) ==24217== by 0x29A35E6E: SfxObjectShell::ImportFrom(SfxMedium&, com::sun::star::uno::Reference<com::sun::star::text::XTextRange> const&) (objstor.cxx:2300) ==24217== by 0x29A3705C: SfxObjectShell::DoLoad(SfxMedium*) (objstor.cxx:765) ==24217== by 0x29A6BC48: SfxBaseModel::load(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) (sfxbasemodel.cxx:1802) The commit is bogus because it introduces a DynamicErrorInfo::GetErrorCode(), which overloads ErrorInfo::GetErrorCode(), which is used at least in DynamicErrorInfo_Impl::RegisterEDcr() and used to return a constructor argument of DynamicErrorInfo but now returns pImpl->lErrId, which is what this statement is trying to initialize. Ultimately this causes my clang+ASAN build to fail because the uninitialized error code happens to be detected as a mere Warning: Test name: testMathMalformedXml::Import assertion failed - Expression: !xComponent.is() - loading succeeded: sw/qa/extras/ooxmlimport/data/math-malformed_xml.docx Change-Id: I9141144e0bc356ee54279948f2fce036d1831a86
2017-02-07Revert "create ErrorHandlerFlags scoped enum for error handling flags"Michael Stahl5-17/+17
This reverts commit 05e78bde26d8b8b257ed22a0ce20c5b386a629d1. Depends on the other commit that needs reverting
2017-02-07flatten ShellResource resourceCaolán McNamara5-240/+203
Change-Id: Ib071a21778289f4dc68273cb305d38bf260a31a7
2017-02-07convert resources containing strings to stringarray resourcesCaolán McNamara2-105/+31
Change-Id: I61e815a9545f55a3b886322e7d2c0d50040584bd
2017-02-07Replace macro with functionStephan Bergmann1-16/+15
Change-Id: Icb4488ea38b99a329a071063292db4001799ecc8
2017-02-07Bring back initui.hrcStephan Bergmann1-0/+58
...presumably missing from 19ea3db6d33e8e1de57104e42796454757facd45 "revert unready stuff" Change-Id: I74ab88dc1bd1bdd92d8bebc3120d036f032f5049
2017-02-07Made lcl_DrawDashedRect() more readable and faster a bitgkorepanov1-26/+14
Change-Id: I58e06f090248e034541e276f11cecef8b26e874a Reviewed-on: https://gerrit.libreoffice.org/33394 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2017-02-07revert unready stuffCaolán McNamara5-234/+287
Change-Id: I2b112a17a2bc70bfe4d5a6af7964a3c1d7eacf9b
2017-02-07flatten ShellResource resourceCaolán McNamara5-240/+203
Change-Id: I6094f86eb7da89ba5e21be909417b23f9f375351
2017-02-07convert resources containing strings to stringarray resourcesCaolán McNamara2-105/+31
Change-Id: I8a306b417dcf533a148e34a6314e37589dcdda12
2017-02-07Fix check_flies.py to be more pythonicEdmund Wong1-14/+8
Change-Id: Id5f44aaa97539b7ec97b81b39da30bd8d170c011 Reviewed-on: https://gerrit.libreoffice.org/33139 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2017-02-07create ErrorHandlerFlags scoped enum for error handling flagsNoel Grandin5-17/+17
Change-Id: I30c80979c87bad7bc98f36a158c31c88d80d1caf Reviewed-on: https://gerrit.libreoffice.org/33991 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-02-07Clean up some OUString creationStephan Bergmann1-1/+1
Change-Id: I62d312436432939d28aced7cfc4a018adbd94c8c
2017-02-07a2ndIter is unused nowBjoern Michaelsen1-2/+0
Change-Id: I123bfda1c22350580f20b8f66cf7d855297c28d1 Reviewed-on: https://gerrit.libreoffice.org/33979 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2017-02-07sw RTF filter: add \leveljc1 testcaseMiklos Vajna2-0/+44
lcov pointed out this had no coverage previously (unlike the 0 and the 2 case). Change-Id: Iaa480015d1ddfe7c489a3cbbf079a38d20e6d45c Reviewed-on: https://gerrit.libreoffice.org/33987 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2017-02-07remove ugly operator* in DynamicErrorInfoNoel Grandin5-15/+15
I can see why you'd want to hide this horrible tunnelling of information with objects registering themselves in a global list. Urrgh. Change-Id: Ib151a0d2d5a4508dc456e52883e488ce56d9a095 Reviewed-on: https://gerrit.libreoffice.org/33984 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-02-07convert CursorType to scoped enumNoel Grandin12-129/+128
and drop unused CURSOR_INVALID constant Change-Id: I190908a03317f93d247c0a9c806c70bb286b8ecb Reviewed-on: https://gerrit.libreoffice.org/33964 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-02-07remove unused value from SW_KeyState enumNoel Grandin1-2/+1
Change-Id: Ied6ac5724957ff10fd1e9e217bbb32c1187f3cba Reviewed-on: https://gerrit.libreoffice.org/33963 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-02-07Silence "Invalid SlotId" warningsMaxim Monastirsky1-0/+2
Change-Id: I7c3742fc94ef587526e4f6079c4f7aa245a0c116
2017-02-06sw: convert some OSL_ENSURE to assertMichael Stahl1-29/+18
Change-Id: I93fa70ef9b09afb9a4582a5942b4269afeece666
2017-02-06tdf#101626: replace soft-hyphen by hard-hyphen in ooxml importPatrick J2-0/+21
If a list bulletChar is a soft-hyphen, it will disappear in PDF export. Therefore, replace it by a hard-hyphen. Change-Id: If0b535e7d2e23454136f25a2b7acf4b294b8dd27 Reviewed-on: https://gerrit.libreoffice.org/33707 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2017-02-06Add missing #includesStephan Bergmann20-0/+26
...and remove some unncessary using directives/declarations, in preparation of removing now-unnecessary #includes from cppumaker-generated files, post e57ca02849c3d87142ff5ff9099a212e72b8139c "Remove dynamic exception specifications". Change-Id: Iaf1f268871e2ee1d1c76cf90f03557527ebc9067
2017-02-06tdf#92492 function placed in a wrong category in customise functions listpv2k1-3/+3
"Table To Text","Text To Table" and "Text<->Table" have been removed from "Options" category and placed in "Table" category Change-Id: Ic5717e4cf91ce3fde2d40b3a3f567747fa7b983f Reviewed-on: https://gerrit.libreoffice.org/33919 Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> Tested-by: Katarina Behrens <Katarina.Behrens@cib.de>
2017-02-06sw: translate more german commentsMichael Stahl1-60/+51
Change-Id: I662cde51b6fbf4e44c8a0a0314f057fdc1a764f0
2017-02-06remove unused values from SwDocumentSettingsPropertyHandles enumNoel Grandin1-7/+0
Change-Id: I9aa77050b2e6c3e0d364428eb759b389c078b206 Reviewed-on: https://gerrit.libreoffice.org/33957 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-02-06Translate German commentsLukas Röllin1-103/+73
Change-Id: Iafca03642f7053cb9c5009163cb80528d88bca47 Reviewed-on: https://gerrit.libreoffice.org/33960 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2017-02-06sw: prefix members of SwAccessibleFrameMiklos Vajna3-4/+4
Change-Id: Ia8513e6c9c32c9c80c7b261eb356ae793ae7ab32 Reviewed-on: https://gerrit.libreoffice.org/33951 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2017-02-06Indentation fixesMiklos Vajna1-9/+9
Change-Id: I3e7262c26c848f8c16564d4b27218611bf880903
2017-02-06lok: Disable map mode when calculating annotation rectanglesPranav Kant1-0/+10
Change-Id: I4803ca9b52ce76ff9f7461253ec78bfcbc26690c Reviewed-on: https://gerrit.libreoffice.org/33879 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: pranavk <pranavk@collabora.co.uk>
2017-02-06lok: Emit modify comment callback when anchor changesPranav Kant3-0/+11
Change-Id: Ibe4a66b93768eb446a04cab8cfdd4bdebee13d1f Reviewed-on: https://gerrit.libreoffice.org/33878 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: pranavk <pranavk@collabora.co.uk>
2017-02-06lok: comments: emit add callback after layout finishesPranav Kant3-11/+19
Change-Id: Ie6eba244dd5eb78813185f8c7aceed841d05d48b Reviewed-on: https://gerrit.libreoffice.org/33877 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: pranavk <pranavk@collabora.co.uk>
2017-02-05.uno:ScriptOrganizer should be menu:menuitemMaxim Monastirsky6-6/+6
... so it won't show as an empty submenu in the customization dialog, and allow accidentally overwriting it. Change-Id: I9431e5240485a58f63a2333850a9052e475db63e
2017-02-05IndentationPranav Kant1-4/+6
Change-Id: I723438eb4258f12413a16b5b727f5c8f6eb3083c Reviewed-on: https://gerrit.libreoffice.org/33876 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: pranavk <pranavk@collabora.co.uk>
2017-02-05lok: Send complete anchor rectanglePranav Kant3-4/+13
... instead of just sending the X, Y coordinates Change-Id: Ie87b252ebfd64e806e1e5f66cfc27e77282cbaab Reviewed-on: https://gerrit.libreoffice.org/33875 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: pranavk <pranavk@collabora.co.uk>
2017-02-05tdf#103258 Add contextual edit footnote endnote command.Gulsah Kose7-2/+41
Change-Id: I68126d2ec8b8dfb12c45ce577d110be2b94a4e33 Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/33803 Tested-by: Jenkins <ci@libreoffice.org> Tested-by: Maxim Monastirsky <momonasmon@gmail.com> Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
2017-02-04this windows-only quote replacement looks out of dateCaolán McNamara1-8/+0
its there since initial checkin and I rather feel things have moved on since then Change-Id: Iea3aa1c5a1637cecdd18539987ef8b84db095e9a
2017-02-03sw: translate german commentsMichael Stahl2-73/+60
Change-Id: I1f2a4e249274a2dfd74da11553d7bb9fb35b5d53
2017-02-03TyposJulien Nabet1-1/+1
Change-Id: Ic54695e86b4b462419fa7d5ded7b1ddb19ee8ed5 Reviewed-on: https://gerrit.libreoffice.org/33904 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
2017-02-03loplugin:simplifyboolStephan Bergmann1-3/+5
Change-Id: If9d73319988b9d6ac5fcdee2ec815738320a62a0
2017-02-03TyposJulien Nabet3-5/+5
Change-Id: I36f443c266670bd26aa6b813075e18653f372f52 Reviewed-on: https://gerrit.libreoffice.org/33900 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>