summaryrefslogtreecommitdiff
path: root/sw/source/core/txtnode
AgeCommit message (Collapse)AuthorFilesLines
2012-11-30re-base on ALv2 code. Includes:Michael Meeks14-322/+245
Patches contributed by Oliver-Rainer Wittmann sw34bf06: #i117783# - Writer's implementation of XPagePrintable - apply print settings to new printing routines http://svn.apache.org/viewvc?view=revision&revision=1172115 sw34bf06: #o12311627# use <rtl_random> methods to create unique ids for list styles and list ids http://svn.apache.org/viewvc?view=revision&revision=1172112 sw34bf06 #i114725#,#i115828# - method <SwDoc::ClearDoc()> - clear list structures completely http://svn.apache.org/viewvc?view=revision&revision=1172122 i#118572 - remove ui string and help content regarding usage of Java Mail in Writer's Mail Merge as Java Mail is not used. http://svn.apache.org/viewvc?view=revision&revision=1197035 Patches contributed by Mathias Bauer cws mba34issues01: #i117718#: provide filter name in case storage of medium does not allow to detect one http://svn.apache.org/viewvc?view=revision&revision=1172350 cws mba34issues01: #i117721#: directly provide parameters retrieved from SfxMedium http://svn.apache.org/viewvc?view=revision&revision=1172353 gnumake4 work variously http://svn.apache.org/viewvc?view=revision&revision=1394707 http://svn.apache.org/viewvc?view=revision&revision=1394326 http://svn.apache.org/viewvc?view=revision&revision=1396797 http://svn.apache.org/viewvc?view=revision&revision=1397315 cws mba34issues01: #i117723#: convert assertion into trace http://svn.apache.org/viewvc?view=revision&revision=1172355 cws mba34issues01: #i117699#: keep layout alive until swdoc dies http://svn.apache.org/viewvc?view=revision&revision=1172362 cws mba34issues01: #i117943#: missing color attributes in RTF clipboard http://svn.apache.org/viewvc?view=revision&revision=1172363 Patch contributed by Henning Brinkmann imported patch i#103878 http://svn.apache.org/viewvc?view=revision&revision=1172109 Patches contributed by Michael Stahl sw34bf06: #i117955#: WW8 export: disable storing of section breaks in endnotes http://svn.apache.org/viewvc?view=revision&revision=1172119 Patch contributed by imacat Fixed the Asian language work count. http://svn.apache.org/viewvc?view=revision&revision=1241345 Patch contributed by Pedro Giffuni i#20878 - Add comment with BZ issue for reference. http://svn.apache.org/viewvc?view=revision&revision=1244517 Patch contributed by Andre Fischer Do not add targets for junit tests when junit is disabled. http://svn.apache.org/viewvc?view=revision&revision=1241508 add writerperfect dependency.
2012-11-23some i18n wrappers with LanguageTagEike Rathke1-3/+3
Change-Id: I2ceaa3159e8669c2c569fa8559c1e061dcad399d
2012-11-19remove unnecessary #includeMatteo Casalin1-3/+1
Change-Id: I5b05a7aded3ed80e0269155100ad075bffecf9ea
2012-11-07sal_Bool to boolTakeshi Abe3-11/+11
Change-Id: Ia1001ff0f4778bdf5e22bf2800f533dfba80c048
2012-11-05sal_Bool to boolMatteo Casalin1-9/+9
Change-Id: I8a4890c6b0e466417387a09259e32dff57c640d6 Reviewed-on: https://gerrit.libreoffice.org/979 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2012-11-04Remove unused local variableMatteo Casalin1-1/+0
Change-Id: Ib8dc3b5b37c8777acca3f16ece81f4e1c01c582d
2012-10-28fix some VS 2010 specific issuesDavid Ostrovsky1-2/+2
Change-Id: Iae27a96c1e2ed72d2744fcbe100d6ada7dc41c82 Reviewed-on: https://gerrit.libreoffice.org/914 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2012-10-28sal_Bool to boolTakeshi Abe1-4/+4
Change-Id: Ia71a4dc13e09a5fc42c282efc2b0d46b2ff007ab
2012-10-24sal_Bool to boolTakeshi Abe1-1/+1
Change-Id: I47f376f431276396a9f3168a5e39e2c9e9e55cbe
2012-10-22sal_Bool to boolTakeshi Abe1-3/+3
Change-Id: I71842ace16eb65b3269754cc36408fe52843b2ea
2012-10-20sal_Bool to boolTakeshi Abe1-4/+4
Change-Id: Ideb46a876ef74f505b71e2a788d5f8da50e251af
2012-10-19replace sxub_Unicode by sal_UnicodeNorbert Thiebaud3-11/+11
Change-Id: Icf4b434a1961cc4964ee6e362491868e898a1831 Reviewed-on: https://gerrit.libreoffice.org/887 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2012-10-15postfix operator++ -> prefix operator++Luboš Luňák2-5/+5
Change-Id: I51506a83009db838d8e12d5559c46b404e59f9b5
2012-10-12mark lcl_ functions static or rename them if they are not local at allLuboš Luňák5-18/+18
http://lists.freedesktop.org/archives/libreoffice/2012-October/039639.html Change-Id: I21e12d6a4dfb9697d2346a4e564e96af0ad03f96
2012-10-10sal_Bool to boolTakeshi Abe2-8/+8
Change-Id: I2549e597bc11d0a4b4bcdc42c77914dda01a1c5f
2012-08-29Resolves: fdo#38983 allow extra word boundary charactersCaolán McNamara1-20/+59
i.e. word overrides emdash and endash to be word boundary characters for the purposes of counting words. And there are some who want to treat =,- etc similarly. Default to a configuration that gives the same results as Word for word counting. Change-Id: Ia8ce6ac12011a1d6e547f11644c76163c4c993c5
2012-08-27Resolves: fdo#51908 count empty paragraphs if they're numberedCaolán McNamara1-36/+45
we want to count the numbering/bullet of otherwise empty paragraphs Change-Id: I6cdf5348bcbb97081afc743d24e6c4ffb355d085
2012-08-25SwpHintsArray::Check(): reindent thatMichael Stahl1-18/+20
Change-Id: I9fede393b5a0fb6bd2fe0425f6a4b60b754aeb0b
2012-08-25SwpHintsArray: refactor assertions:Michael Stahl1-8/+12
Since 4623c603bde7678004fe6019f9d9e4b816a3d6c6 the assertions in lcl_IsLessStart/lcl_IsLessEnd trigger spuriously, because the comparison is invoked always now even on identical pointers, while the SvArray only invoked it if the 2 hints didn't have the same address; move the assertion to SwpHintsArray::Check(). Change-Id: Ida6c8e268452343ed3e90410636703c6baffbabd
2012-08-22fdo#53399 Word count is inconsistent and wrong with non-breaking spaceMuhammad Haggag1-10/+3
This change replaces lcl_IsSkippableWhitespace with a call to ICU's u_isspace, which covers all Unicode separators. It also updates and fixes one of the SwScanner unit tests. Bug details: SwScanner::NextWord skips whitespace before calling into ICU's BreakIterator. The function used to identify whitespace (lcl_IsSkippableWhitespace) doesn't cover the full category of Unicode separators (code [Zs], 18 in total. See: http://www.fileformat.info/info/unicode/category/Zs/index.htm). Since 0xA0 (no-break space) is not identified as whitespace and not skipped, we end up calling ICU starting at the position 0xA0, asking it to get us the boundary of the next word forward. ICU sees that it's called at the end of a word, and reverses the query direction to backward, and returns the word before. This causes NextWord to think we've hit the end of the string and call it a day, terminating word count for the rest of the line. Change-Id: I29c89ddb0b26e88da822501253898856b28e3fa5 Reviewed-on: https://gerrit.libreoffice.org/453 Reviewed-by: Andras Timar <atimar@suse.com> Tested-by: Andras Timar <atimar@suse.com>
2012-08-03Related: fdo#46757 unsafe to pass expanded text to maskingCaolán McNamara1-9/+2
So, use improved ModelToViewHelper to remove the hidden text right from the start, which drops the need to mask out the hidden text and we can remove the nNumOfMaskedChars hack Change-Id: I3bd90598e496d4e82cd9cef4c8f9e61c180cb945
2012-08-03Related: fdo#46757 extend ModelToViewHelper for more casesCaolán McNamara1-36/+116
beef up ModelToViewHelper to be able to optionally expand fields, collapse hidden text and collapse/expand redline deleted text Change-Id: I6d4d0969102ad9699f7fafe091b2eff6a5707bc4
2012-07-31SwpHintsArray::DeleteAtPos: Apple GCC unused variable warningMichael Stahl1-0/+1
Change-Id: Idc56569da52554a5478fc23548b8d3395648a2bf
2012-07-31SwpHintsArray: deploy some assertsMichael Stahl1-8/+4
Change-Id: I16f416cb63221860ff743ce2e2291af99cd19de2
2012-07-31fix some problems in previous STL conversion:Michael Stahl1-20/+21
- use o3tl::find_partialorder_ptrequals to allow multiple hints on same position - GetPos must not dereference its argument - unused IsEquals Change-Id: I274203be96ff90d1e9a46bab17fd00355514a4fa
2012-07-31sw: convert SwpHtStart SwpHtEnd to sorted_vectorNoel Grandin1-90/+30
Change-Id: I74696094ef066687582bd961d61a4877673016fd
2012-07-30First step to change sorted vector with LookupTree for word autocompletion.Tomaž Vajngerl1-2/+2
With this commit autocompletion words are inserted into a LookupTree instance and used when autocompleting words. Previouslly used sorted vector is still used for the GUI. Change-Id: Ib5aed38d575fbef7221afbebe824a440d4ffbc7e
2012-07-30rather pointless cast to longCaolán McNamara1-2/+2
Change-Id: I1509269455a074285d209a5ab80e3517407d322d
2012-07-30ditch SV_DECL_PTRARR_SORT_DELCaolán McNamara1-4/+0
Change-Id: Ie57f283b2087564afe9b700d1f35a3be52f1e940
2012-07-26Convert SV_DECL_PTRARR_SORT_DEL(_SwRedlineTbl) to o3tl::sorted_vectorNoel Grandin2-3/+3
Change-Id: Ie7edc6b32b373619d4c0ac154da93650743049cf
2012-07-26refactor ModelToViewHelper, should have unchanged resultsCaolán McNamara3-57/+33
Change-Id: Ib57f0d6f9491d12ffacada5ec0ae8bc68874c25b
2012-07-26Convert SV_DECL_PTRARR_SORT(_SwFtnIdxs) to o3tl::sorted_vectorNoel Grandin3-11/+9
Change-Id: I84c4cd5686ea0649ad9ca6c879d51bffe6d693c2
2012-07-25delete svl/svstdarr.hxxMichael Stahl2-2/+0
Change-Id: Ia3d1d8dbe100443410b80c3881f10ab51b2d0419
2012-07-20behind (hinter) -> afterCaolán McNamara1-2/+2
Change-Id: I3bc9ca4e20bfaa5d14fbd5bbbb827444071b19ad
2012-07-19Related: fdo#46757 fix weird word/char count with hidden deleted textCaolán McNamara1-0/+5
i.e. changes on, but not shown then unseen deleted text counted in word/char count Change-Id: I5725063edfbfc1f6545fe1dcea9b224dbfa3a418
2012-07-180xFFF9 is a better choice for CH_TXTATR_INWORD than 0x0002.Caolán McNamara3-9/+9
a) the default properties for the code point make it not split a word it appears in into two different words in any break mode we have. Which is what we want from a CH_TXTATR_INWORD b) unicode TR#20 gives for the interlinear annotation anchor: "What to do if detected: In a proxy context or browser context, remove U+FFF9", so when we need to strip it from text to run that text through e.g. the spellchecker or word counting then there's a solid precedent for stripping it In addition I *do* want the footnote placeholder to break the word it appears in, that gives the desired wordcount and cursor travelling behaviour The BREAKWORD and other *random* selection of CH_TXTATR are still odd choices, and there's way too many of them. Change-Id: I930ff8ff806af448829bc1a1ae6cb92053e9a284
2012-07-17warning C4701: potentially uninitialized local variable usedMichael Stahl1-1/+1
Change-Id: Id82ecd3bfa7da6740d475ccaeea599529b090fe6
2012-07-17Resolves: fdo49629 GotoEndOfWord fails with footnote at word endCaolán McNamara1-15/+38
a) remove special handling of 0x0002 in our custom icu rules. Which brings us a step closer to getting rid of at least some of them in favour of the defaults b) expand the 0x02 in SwTxtNode::BuildConversionMap like we do for fields so Good side effect is our word count and character count now take into account the actual footnote indicator text, as does our cursor travelling. Both of which are more word-alike. Change-Id: I3b0024ac4b10934bee7a9e83b0fce08a18556c7b
2012-07-09Resolves: fdo#51908 drop word/char count cache when numbering rule changesCaolán McNamara1-0/+4
Word Count doesn't update immediately when Numbering is applied or removed Change-Id: I44ac2313cdeef92e6394b86316ff1037fc8d8f18
2012-07-09some UniString->rtl::OUStringCaolán McNamara3-6/+6
Change-Id: Ie69b30094da25df23a36baca2c7723d6a41f48c3
2012-07-04Convert Svptrarr to std::deque<const SwTxtAttr*>Noel Grandin1-13/+12
Change-Id: I527814582214401a1f7dd9c192e6aa96e45f7819
2012-07-03ditch String::CreateFromAsciiCaolán McNamara2-8/+7
Change-Id: I2b482bd323ac510629c5ee31868010b7cd6ce691
2012-07-01Remove unused definesThomas Arnhold1-8/+0
Change-Id: Ic36b131ee9964a6671f7f41e1cad1631c43ad565
2012-06-21replace all but one .hdl include with equivalent .hpp includes.Michael Meeks6-9/+9
Change-Id: I15e94f112144549692d0c2babeb48c77adcb93a9
2012-06-21re-base on ALv2 code.Michael Meeks6-141/+87
Change-Id: I6c145e984c885c7e06caa1c27bfb354ea49ad9ce
2012-06-20Convert SV_DECL_PTRARR_DEL of Sw*Fmts to std::vectorNoel Grandin1-1/+1
- I had to convert SwFrmFmts, SwSpzFrmFmts, SwCharFmts, SwSectionsFmts, SwTextFormatColl, SwGrfFmtColl all together because of the code that wants to work with any of them. - Introduce a pure virtual base class SwFmtsBase, since there are a handful of methods that want to work with any of the std::vector<Sw*Fmt> types. - the class SwSpzFrmFmts was dropped, and the code changed to use SwFrmFmts instead, since the 2 types are identical. Change-Id: I8c4056b5aedd574a33666e2d649a8b849958441c Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
2012-06-19merge together hand-crafted traditional/simplified chinese testsCaolán McNamara1-4/+5
merge together a gadzillion hand-crafted isSimpleChinese/isTraditionalChinese/isKoreanVariants/isCJK implementations which should fix a goodly amount of them add a MsLangId::isFamilyNameFirst for locales where family name appears first while I'm at it. Change-Id: I65377793be037d16fe7250cd7450b28aec689e83
2012-06-15fdo#46757 Word/character count incorrect with record changes enabledMuhammad Haggag1-7/+6
We were ignoring redlined (deleted) text when counting characters, but not when counting words or characters without spaces. We now mask all redlined/hidden content from the expanded node text before operating on it. Change-Id: If882a6dde883a2ba0ca99909ca7ac2b9abd4a1fb
2012-06-11fdo#50141: Character count (with spaces) incorrect with numbering on.Muhammad Haggag1-1/+1
There was a typo in the character counting code of text nodes. When a numbered list is detected, the code attempts to add the character count of the "item number" to the total count, but ends up overwriting it instead (uses '=' instead of '+='). This resulted in the item number strings to be the only ones counted in a numbered list. Change-Id: I9d96311065f66026dd4f05d3cd5ae61e2c0dafb4
2012-06-09Remove superfluous empty lines on topThomas Arnhold10-20/+0
More than two lines are removed for readability. Change-Id: Ibff6cf68d7c512e240a54065b54a225bb23a782b
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 22:03:50 +0000