summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)AuthorFilesLines
2019-10-08tdf#126589: only consider text to the left of cursor as AutoText short nameMike Kaganski1-2/+3
Given a text "This is a dtfoo bar", and cursor inside "dtfoo" between "t" and "f", invoking AutoText function (F3) currently considers the whole word "dtfoo" as autotext short name. This changes it to only consider the part of the word to the left of cursor, i.e. only "dt" in the example. This removes the requirement to have a word boundary after the autotext short name. Change-Id: I6ba28e63fe25664131b7e03dda39ae997dffa464 Reviewed-on: https://gerrit.libreoffice.org/80419 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2019-10-07Add a SAL_INFO for SwVbaDocument::SaveAs2000()Tor Lillqvist1-0/+2
Change-Id: Ic91b9c3a832d68ca3ccc61ccb19b0e29b488abc0 (cherry picked from commit 6412701313a875aff199dbf862e250faf6861cd0) Reviewed-on: https://gerrit.libreoffice.org/79256 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com> (cherry picked from commit 30f25672a86494625d525086d0a81513db119917) Reviewed-on: https://gerrit.libreoffice.org/80377 Tested-by: Jenkins
2019-10-07Add a SAL_INFO for SwVbaDocuments::Open()Tor Lillqvist1-0/+2
Change-Id: I0c62864f3efa53dde0dc78482d8e9c7ffc35b6ee (cherry picked from commit 0993ccb56eba6e52d5b3b00f60ea069571f2554a) Reviewed-on: https://gerrit.libreoffice.org/79255 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com> (cherry picked from commit 3df903c1e572cf010b71ff6cce8acc3d6174a0b9) Reviewed-on: https://gerrit.libreoffice.org/80376 Tested-by: Jenkins
2019-10-07update sw pchCaolán McNamara1-3/+1
Change-Id: Ica2fb688d3fcf6f9f74399215e3092bf4a2ac9c8 Reviewed-on: https://gerrit.libreoffice.org/80337 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-10-07SvSimpleTableContainer is now unusedCaolán McNamara2-2/+0
Change-Id: I7762d95290a0b35de4f909895a4e28b52c436ed9 Reviewed-on: https://gerrit.libreoffice.org/80307 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-10-07weld SwSendMailDialogCaolán McNamara5-167/+181
Change-Id: Ibb21567c11adef233061cb53f787a73eb56cc282 Reviewed-on: https://gerrit.libreoffice.org/74848 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-10-07Remove unnecessary(?) memsetStephan Bergmann1-1/+0
...that was there ever since 7b0b5cdfeed656b279bc32cd929630d5fc25878b "initial import", while 2e93541d00f9d4aaa6ad2aeb35ee0c901d216cc0 "Resolves: fdo#69220 crash in doc (ww6)" introduced a WW8PLCFxDesc default ctor that initializes all members (even though it initializes some of them to non-zero, but lets assume that that doesn't matter here). Change-Id: I21a75675d59ded81ccb17397f8c464efdfc3d78f Reviewed-on: https://gerrit.libreoffice.org/80316 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-10-07lok: comments: fix hidden text cursor and sudden document scrollMarco Cecchetti1-0/+8
On Android, SwAnnotationWin::Rescale leads to invoke ImpEditEngine::UpdateViews which hides the text cursor. Moreover it causes sudden document scroll when modifying a commented text. Not clear the root cause, anyway skipping this method fixes the problem, and there should be no side effect, since the client has disabled annotations rendering. Change-Id: I572a9c6b3fe39473a596209413945d777bd79506 Reviewed-on: https://gerrit.libreoffice.org/80244 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2019-10-07sw: fix Android buildMiklos Vajna2-2/+2
/home/vmiklos/git/libreoffice/master-android/sw/source/core/txtnode/txtedt.cxx:1203:41: error: loop variable 'rImplicitChange' has type 'const std::pair<int, int> &' but is initialized with type 'std::__ndk1::pair<long, long>' resulting in a copy [-Werror,-Wrange-loop-analysis] Just use auto, the copy that was happening here was not intentional. Change-Id: I2f98519f7891bd52ccf560ba0707ad8eef415e06 Reviewed-on: https://gerrit.libreoffice.org/80364 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-10-07[DECL|IMPL]_ABSTDLG_BASE now unusedCaolán McNamara1-21/+0
Change-Id: I111d96da3615f5084f10b4e81dd10bc559c29757 Reviewed-on: https://gerrit.libreoffice.org/80335 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-10-07related tdf#99602 writerfilter TODO: subscript - use ParaStyle fontsizeJustin Luth1-2/+4
The existing code handled two situations: 1.) if both position(escapement) and fontsize set via direct properties 2.) if fontsize came from the document default properties. That misses both paragraph style fontsize (very common) and character style fontsize. This patch adds checking for the paragraph style's fontsize. Change-Id: I25312cd4544cfd1be09b21c96a270cb05e4f5b8f Reviewed-on: https://gerrit.libreoffice.org/80179 Reviewed-by: Justin Luth <justin_luth@sil.org> Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-10-07sw: prefix members of SwElemItemMiklos Vajna3-85/+85
See tdf#94879 for motivation. Change-Id: I54473674ff0e8928249059efdfb06f90ab7d2ad1 Reviewed-on: https://gerrit.libreoffice.org/80331 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2019-10-07Fix FIXME in swcache.hxxJulien Nabet2-5/+1
by getting rid of useless IsAvail() function Change-Id: I7c3bbf74a9ef3aaa792936ef2b4887021226dd2a Reviewed-on: https://gerrit.libreoffice.org/80327 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2019-10-06Related: tdf#127935 set default activate handler to toggle row expansionCaolán McNamara24-31/+46
Change-Id: I2bbfb1445b8d2e748f642cdf4723d41b7f072e2b Reviewed-on: https://gerrit.libreoffice.org/80305 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-10-06convert equals() to operator== in xmlreader::SpanNoel Grandin1-5/+5
Change-Id: Ic6a8eae344c06be87e2bc4bf7f242a2d18ebc8ad Reviewed-on: https://gerrit.libreoffice.org/80312 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-10-06improve SfxPoolItem operator== implementationsNoel Grandin7-22/+24
(*) make them all call the superclass operator== (*) make the base class check which and typeid to ensure we are only comparing the safe subclasses together (*) remove a couple of operator== that were not doing anything useful Change-Id: Ia6234aed42df04157a5d6a323dc951916a9cb316 Reviewed-on: https://gerrit.libreoffice.org/80308 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-10-05Drop bogus memsetStephan Bergmann1-2/+0
...that is both bad and unnecessary since 57871f98d30c0283969de1a41e72f5838d6c0eb0 "loplugin:useuniqueptr in SwNumRule" changed SwNumRule::maFormats from an array of raw pointers to an array of std::unique_ptr. Change-Id: I0cb05f022b2f067c0b62ecd42878377b139ec4fe Reviewed-on: https://gerrit.libreoffice.org/80281 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-10-05Drop bogus memsetsStephan Bergmann2-7/+1
...that are both bad and unnecessary since 54604f01330063635fb974b0ab4335d6af851551 "loplugin:useuniqueptr in SwNumRulesWithName" changed SwNumRulesWithName::aFormats from an array of raw pointers to an array of std::unique_ptr. (GCC -Wclass-memaccess didn't catch that because it apparently fails when the argument is of array instead of pointer type.) Change-Id: I6a4a03b1d16c203118fc83c0c3c44646be39a5b3 Reviewed-on: https://gerrit.libreoffice.org/80254 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-10-04Related: tdf#127529 make it harder to misunderstand this VirtualDevice ctorCaolán McNamara1-1/+1
Change-Id: I250bc68da118a994a2e0ff8ab9eb11112827756d Reviewed-on: https://gerrit.libreoffice.org/80158 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-10-04Fix typoAndrea Gelmini1-1/+1
Change-Id: I553bbcdeef269317d97bed5242bc64cb1b42f91c Reviewed-on: https://gerrit.libreoffice.org/80227 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
2019-10-04Character dialog - Hyperlink move Events button and labels left alignandreas kainz1-17/+8
Change-Id: I33c3e5a957e84054518836f2cd5efea814bd1815 Reviewed-on: https://gerrit.libreoffice.org/80020 Tested-by: Jenkins Reviewed-by: andreas_kainz <kainz.a@gmail.com>
2019-10-04SvxAutoCorrect::GetPrevAutoCorrWord should not be constMike Kaganski2-2/+2
Change-Id: Icc5f8eae4347e097f7ff22212dd94467d0702353 Reviewed-on: https://gerrit.libreoffice.org/80198 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2019-10-04tdf#52316 Writer status bar: show also printed page countsLászló Németh4-4/+46
if they are different from the "normal" page counts. If the document contains automatically inserted blank pages, and the document setting "Print automatically inserted blank pages" is disabled, the status bar still shows page counts with blank pages. This is a problem especially, if the user wants to print a document range, because it's not possible to read the correct printing range from the status bar, and using the showed values, printing can result unwanted and missing printed pages without any notice if the Preview option is disabled in the Print dialog window (otherwise if the differency was noticed, it could be hard or near impossible to correct the range using the Preview window). Now, for example, if the title page followed an automatically inserted blank page and a third page, the status bar shows the following on the third page, if there is a differency in printing: Page 3 of 3 (Page 2 of 2 to print) If the setting "Print automatically inserted blank pages" of the actual document is enabled on page "LibreOffice Writer" of the File->Print... dialog window, or the document doesn't contain automatically inserted blank pages, there is no information about printed pages in the status bar (because there is no differency in page counting): Page 3 of 3 Change-Id: I4cef762b8a8c10ae8f65d27c7ff550855219621e Reviewed-on: https://gerrit.libreoffice.org/80185 Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: László Németh <nemeth@numbertext.org>
2019-10-04loplugin:unusedfieldsNoel Grandin1-1/+0
Change-Id: If0df5216dccd2c0a7aa790668471993f5d4d5d32 Reviewed-on: https://gerrit.libreoffice.org/80183 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-10-04sw: add DocumentContentOperationsManager::DeleteDummyChar()Michael Stahl3-12/+23
... and lcl_RemoveFieldMarks() uses it; this avoids the problem that lcl_CalcBreaks() would of course remove the dummy character from the deletion range. Change-Id: Iba0f7901b9efe4af273e17c58c6b40d4fd783efd Reviewed-on: https://gerrit.libreoffice.org/80069 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2019-10-04use normal VirtualDevice ctor, not the obscure SystemGraphicsData variantCaolán McNamara1-2/+2
Change-Id: I4be43f692a29b1b1ee3f96bb34133f3ef0cf4eb7 Reviewed-on: https://gerrit.libreoffice.org/80151 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-10-04related tdf#99602 writerfilter: deferredCharProps unhandled in StylesJustin Luth2-0/+9
...so don't add deferred properties during style import. Otherwise, the first paragraph picks up those attributes and applies them. Regression from 2012 - only affects subscript/superscript. Truly fixing this for Character Styles will be tricky, because it depends on the final fontsize - regardless of where it is set. So at the style level, the deferred property needs to be percentized based on SOMETHING, and then at appendText time the fontsize needs to be determined. If escapement is inherited from a style, then the escapement needs to be converted BACK into pointsize (based on style charsize), and then the final percentage can be calculated and directly applied. Yuck. I'm inclined to treat charstyle escapement like pre-2012, which just assigned default values and ignored the actual/given amount. Change-Id: I8e3783533ec18740e1c7d0b36c58b6c7e8ce107f Reviewed-on: https://gerrit.libreoffice.org/80178 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org>
2019-10-04sw: SwXTextPortion "TextFieldSeparator"Michael Stahl3-1/+12
Change-Id: I60a5036168287b1972c18e74431b7a6101d85304 Reviewed-on: https://gerrit.libreoffice.org/80052 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2019-10-04sw: add CH_TXT_ATR_FIELDSEPMichael Stahl6-7/+18
... and handle it in obvious places. Change-Id: I7e9668994be0bd246f89ecc60fd0a42c240cce0c Reviewed-on: https://gerrit.libreoffice.org/80051 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2019-10-04sw: add IDocumentMarkAccess::getFieldmarkAt()Michael Stahl8-11/+30
... and use it where the mark for a given CH_TXT_ATR_FIELD* is retrieved. Change-Id: Id58ac2967ab66be8a07586ef31cfe9e18a5f073d Reviewed-on: https://gerrit.libreoffice.org/80050 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2019-10-04sw: add PortionType for fieldmarks for debuggingMichael Stahl4-2/+11
Change-Id: Ie263b09ac499cf30e294300b9ad609461f6ba0ac Reviewed-on: https://gerrit.libreoffice.org/80049 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2019-10-04sw: remove dead branches in DocumentContentOperationsManagerMichael Stahl1-128/+16
Change-Id: I481b993c54fbd06d399193d0d75212599ca6fa78 Reviewed-on: https://gerrit.libreoffice.org/80048 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2019-10-04sw: Overwrite() should ignore CH_TXT_ATR_INPUTFIELD*Michael Stahl1-0/+2
Change-Id: I8c5b3d8f9d3c16f45b1b958a566121308cbf0468 Reviewed-on: https://gerrit.libreoffice.org/80047 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2019-10-04use SfxUInt16Item for SID_METRIC_ITEMNoel Grandin2-4/+5
because we aren't using the array of values in SfxAllEnumItem Change-Id: I67ccb7737c52f9949495c53881e052d5005882aa Reviewed-on: https://gerrit.libreoffice.org/80165 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-10-04find-unneeded-includes: ignore extra recommendationsGabor Kelemen1-7/+0
When IWYU is used to check cxx files it also checks associated hxx (but for .hxx -> .h too) files too and gives addition/removal recommendations There is no documented way of disabling this. Currently f-u-i does not differentiate between recommendations for the checked file and its header and prints everything. Which means sometimes I need to update .hxx files or blacklist warnings that interestingly are not shown when the same .hxx is checked with IWYU. The worst example is ucb/source/ucp/ftp/curl.hxx where IWYU gives recommendations for /usr/include/x86_64-linux-gnu/curl/curl.h Remedy this with considering the full filename + should add these lines: / should remove these lines: string as beginning of interesting recommendations Also remove some now obsolete blacklist entries from yaml files Change-Id: I1d139536992e4b56c699c31a4cc6491d373c2002 Reviewed-on: https://gerrit.libreoffice.org/80172 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-10-04use the common system PCH header in sw/Luboš Luňák42-0/+84
I suppose a number of these should even better use a shared PCH that also includes Writer headers. Change-Id: I3227bff71ddc2cd2e59ef18c1481606de16f9ea5 Reviewed-on: https://gerrit.libreoffice.org/79816 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2019-10-04Use function-local statics for SwStyleNameMapper lists/mapsMike Kaganski4-609/+395
Simplifies memory management; makes code clearer; in case of SwStyleNameMapper::getHashTable, avoids unnecessary filling of vIndexes at each call. Change-Id: I789bc0695d39dddcccac6cbc43fb48ab94f1321b Reviewed-on: https://gerrit.libreoffice.org/80174 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
2019-10-03DOCX import: fix interaction of table and paragraph style in table cellsMiklos Vajna3-1/+35
Both table and paragraph styles can define paragraph properties for the content of table cells, e.g. line spacing. The intended behavior is that direct formatting has priority, then paragraph style, then the table styles. But in practice table style had priority: table style is turned into a set of property name-value pairs by writerfilter/ code, then this is applied to the content of a cell using SwXCell::setPropertyValue(). To make sure that direct-format-from-table-style doesn't override direct-format, there was already a check to not replace properties which are set directly. The problem is that in case the property value comes from a paragraph style, that's not direct and still should have priority over direct-format-from-table-style. Fix this by checking for custom values not only in the paragraph's item set, but also in its parents. Unless the parent would be the default style, which doesn't count. Or in case the paragraph is numbered, which complicates the situation, so leave that case unchanged. Change-Id: Ib554247cdc51fee0d9a6c7a26aecd38442dfa692 Reviewed-on: https://gerrit.libreoffice.org/80146 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2019-10-03fix GtkGrid does not have a child property called xalignCaolán McNamara1-4/+1
Change-Id: I3e501d935bdb0bc6c3f151564f72b05fcc3b2f16 Reviewed-on: https://gerrit.libreoffice.org/80107 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-10-03loplugin:unusedfieldsNoel Grandin1-5/+0
and filter out the weld fields, since we're not touching them yet Change-Id: I3cc23c46d2650f13cb29c7d381687939d23e2882 Reviewed-on: https://gerrit.libreoffice.org/80104 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-10-03merge msgbox and stdtextCaolán McNamara1-1/+0
Change-Id: If95d78746eff3ae5343e7d4c6bb2433537ccb84d Reviewed-on: https://gerrit.libreoffice.org/80099 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-10-03drop some unnecessary includesCaolán McNamara4-5/+2
Change-Id: I656ed2e29988fe47e4db8fa2ea8edec022bd56c2 Reviewed-on: https://gerrit.libreoffice.org/80098 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-10-03update sw pchCaolán McNamara1-35/+15
Change-Id: I5cf649c825f5dfc7130a2973ea1734bc9de4509f Reviewed-on: https://gerrit.libreoffice.org/80084 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-10-03drop unnecessary includeCaolán McNamara1-1/+0
Change-Id: I0122b989deef01f38e4fe4a1eb2d157ba01d660c Reviewed-on: https://gerrit.libreoffice.org/80067 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-10-03rename SwNumFormatListBox back to NumFormatListBoxCaolán McNamara6-12/+12
Change-Id: Ie5d5a3d4bfad52d1f758a6b4e017a7f685630e97 Reviewed-on: https://gerrit.libreoffice.org/80066 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-10-03NumFormatListBox is unusedCaolán McNamara2-382/+5
Change-Id: I19292f1b1a2eb5abf250a222d0bdb254ae7350f2 Reviewed-on: https://gerrit.libreoffice.org/80065 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-10-03drop some unnecessary includesCaolán McNamara2-9/+0
Change-Id: Ib73e1e87d3b2c0a38dd56d891f4ade84845ce228 Reviewed-on: https://gerrit.libreoffice.org/80064 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-10-03tdf#81100 DOCX import: repeat header according to table styleLászló Németh3-1/+12
Table style based repeating table header wasn't repeated, only direct table formatting. Change-Id: I119e6d32bf22c6c85a84aa42ae4cd6c5f60166b2 Reviewed-on: https://gerrit.libreoffice.org/80053 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org>
2019-10-02weld PrintDialogCaolán McNamara1-1/+1
Change-Id: Id4adbe484f88be74f45dab8e7ef426c66e5cbc8b Reviewed-on: https://gerrit.libreoffice.org/80002 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-10-02Resolves: tdf#127924 give hyperlink tooltip an areaCaolán McNamara1-3/+10
instead of just a point Change-Id: Ibadecd64f3296264790373528427a7a528646c73 Reviewed-on: https://gerrit.libreoffice.org/80038 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>