summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)Author
2014-03-04Related: #i123480# correct the previous made refactoringOliver-Rainer Wittmann
(cherry picked from commit aa46680dd96539848bf8bef0293e2a614172515d) Conflicts: sw/source/core/undo/undobj.cxx Change-Id: I4689d5fe02ab2c814e15a1c11ebd3ad11d6e56c8
2014-03-04Resolves: #i124338# assure sorted mark containers...Oliver-Rainer Wittmann
when updating <SwIndex> instances due to inserted characters (cherry picked from commit 770c0e6b910129710b4be5cb9e9bae39bfa6bd5a) Conflicts: sw/source/core/bastyp/index.cxx sw/source/core/crsr/bookmrk.cxx sw/source/core/doc/docbm.cxx sw/source/core/inc/bookmrk.hxx sw/source/core/inc/crossrefbookmark.hxx Change-Id: Ie4531c3b33aff0a7f3d139ee81a21c3823474f84
2014-03-04bnc#821208 DOC import: don't overwrite WW8Num* character stylesMiklos Vajna
In general we're overwriting styles on import in case we're not pasting. But these WW8Num* character styles are in general not from the document, they are created because Writer needs a character style for each numbering level to handle what's in the DOC file. So, in case there is a character style with the same name as our "character style for numbering" styles, prefer the later ones, as that's intended most likely. Change-Id: I675f867722360aca765bb96b0b43ea47deab9847
2014-03-04sw: include contents of char styles in doc model xml dumpMiklos Vajna
Change-Id: Ie62d808e9b498ef7125d603f20594ab1bb665a50
2014-03-04CppunitTest_sw_ooxmlsdrexport: make this failure a bit more readableMiklos Vajna
Change-Id: Ia71f5ea712ad16d6eef3af1136613d38cd27b581
2014-03-04Add mode linesTakeshi Abe
Change-Id: Iae71a0779839015b7c853f93703fe263f84a591a
2014-03-03make sw_ooxmlsdrexport 'work' on macNorbert Thiebaud
Change-Id: I35558dfb71007932e9a371408e6306216cfbd0f9
2014-03-03Use cstdlib std::abs instead of stdlib.h absStephan Bergmann
...because the latter lacks the abs(long) overload in some popular environments, cf. <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=60401> "stdlib.h does not provide abs(long) overload." Similarly, stdlib.h lacks the abs(float), abs(double), abs(long double) overloads compared to cmath there, whose use was apparently intended in sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx. Rewrote that to use CPPUNIT_ASSERT_DOUBLES_EQUAL instead, which revealed that the comparisons need rather large deltas of .1 resp. .2 (which the original code hid with an implicit conversion to integral type, thus using an effective delta of 1). Discovered with -Wabsolute-value ("absolute value function 'abs' given an argument of type 'long' but has parameter of type 'int' which may cause truncation of value") recently introduced on Clang trunk towards 3.5. Change-Id: I4c41575ffdccb2944498b662bd3a53fd510cb0c0
2014-03-03sw/qa: clean up xray instructionsMiklos Vajna
Change-Id: I34ed7b81a838a2c994bb028e92f463d7b08f242f
2014-03-03fdo#47811: fix setPropertyValue("Name") of Database fieldmasterMichael Stahl
This one is assigning to the wrong pType variable. (regression from CWS swwarnings) Change-Id: I9a74734d22313f215ed69c9a57edf7eb035736ea
2014-03-03RTF import: fix paragraphs in header/footerMichael Stahl
Change-Id: I91f04cad7a39428ce6f9555d18b974f0d45181f7
2014-03-03RTF import: add unit test for page break in continuous sectionMichael Stahl
Change-Id: I8b766aa61b1121f9b7068f5ccbdc24ef97253432
2014-03-03RTF import: fix spurious page breaks at doc end (related: rhbz#1065629)Michael Stahl
When a document ends with \sect it's possible that a spurious page break is created. In fact the spurious page break is always created by the RTF importer, sometimes it is deleted again by DomainMapper_Impl::RemoveLastParagraph() and sometimes not. It is created because on the final \sect RTFDocumentImpl::sectBreak() still calls startSectionGroup(), and the popState() for the \rtf1 group then calls sectBreak() another time. To prevent this, do not call startSectionGroup() from sectBreak() but instead from setNeedSect(), and ensure that it is called as soon as anything after \sect is read. One unit test fails because the \page is not handled properly: the conversion to \skbpage \sect \skbnone is not correct, because the \skb* keywords are an exception and affect the \sect that precedes them, not the following one; sending the \skbpage later unfortunately requires additional cleanup later. Change-Id: I3c1a3bceb2c8b75bbecdc748170562451ce5f5c3
2014-03-03loplugin:implicitboolconversionStephan Bergmann
Change-Id: I8c8b8211416916d612ade161ea4a742166b95574
2014-03-03editeng: sal_Bool->boolNoel Grandin
Change-Id: I51b4ae54c2c440d38879439f74d4fea39d243004
2014-03-03editeng: sal_Bool->boolNoel Grandin
Change-Id: I26b1fe14023737b85bcf23628e4881c8be79f071
2014-03-02coverity#705000 Unchecked dynamic_castCaolán McNamara
Change-Id: Iae20a0ab45779483fc501e5ab982e38f38ba21b7 Reviewed-on: https://gerrit.libreoffice.org/8425 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-03-02coverity#704999 Unchecked dynamic_castCaolán McNamara
Change-Id: I09b2e3f0b1989249fc49ebc3256dd6fcf5762e75 Reviewed-on: https://gerrit.libreoffice.org/8424 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-03-02coverity#735536 Logically dead codeCaolán McNamara
Change-Id: I92f3abe7e6dbc45455a531c0965ce14936b4f86e
2014-03-02coverity#705422 Improper use of negative valueCaolán McNamara
Change-Id: I28feee353b75d3810358f70dcafb8763918f86fe
2014-03-02coverity#1038300 Explicit null dereferencedCaolán McNamara
Change-Id: Id16363ad334c9c5801851806984cb14a6244bf54
2014-03-02coverity#735954 Dereference after null checkCaolán McNamara
Change-Id: I5f3b296b725a7a8bc342813dd2896fba861652f2
2014-03-02coverity#735953 Dereference after null checkCaolán McNamara
Change-Id: Id69a568f404ce689f9e9accf7c9f237b51fe391d
2014-03-02coverity#735952 Dereference after null checkCaolán McNamara
Change-Id: Ia244c5668cd73c7d25e30c0b370cbf17bec85935
2014-03-02coverity#735951 Dereference after null checkCaolán McNamara
Change-Id: I7a2215fd3aee26ba4b881f435ceb72b47f7e02e9
2014-03-02coverity#735950 Dereference after null checkCaolán McNamara
Change-Id: I3417231c570333a9797fb4efe24f21292e99c6f3
2014-03-02coverity#735948 Dereference after null checkCaolán McNamara
Change-Id: I71ae6e3cc9aac46a16c377f5b46e141ee638835c
2014-03-02nOrigTxtStt is never readMatteo Casalin
Change-Id: I9ace298d66aaaa46cecdeacfc633144715535e50
2014-03-02Rework SwAutoFormat::IsBlanksInStringMatteo Casalin
The old code was convoluted and suffered the following issues: * Relied on OUStrings being zero-terminated, which is not granted * Systematically missed the end of string, accessing unrelated memory, in case there was just a single trailing space Change-Id: I98dd0f94a8f48f40c467a02dfd01c7866266d9d4
2014-03-02Avoid consecutive OUString appends and a temporaryMatteo Casalin
Change-Id: Iee8998a4947a253f869fefb7bde316e3d3b4129b
2014-03-02Use mutable instead of casting thisMatteo Casalin
Change-Id: Ifdf6334af72637b1c18a9ea2bd2be317d5ae8b20
2014-03-02Bail out early and avoid temporariesMatteo Casalin
Change-Id: Iee0f72995c59c03189c6e187c7e24f9247ff844d
2014-03-02D'oh! I forgot something in commit 3e43a891e89aa6eb8eeecd9d3528f2a002371646Matteo Casalin
Change-Id: I2bd3c13eccd94dfb06d2245dd68e97f08c50cbdb
2014-03-02Do not use heap for two temporariesMatteo Casalin
Change-Id: I49750170fbe68159fc5555ca686344857156c18d
2014-03-02sal_uInt16 to size_tMatteo Casalin
Change-Id: If3cbea546716b7476e362e9b19f4656b27ff34a2
2014-03-02sal_Bool to boolMatteo Casalin
Change-Id: Ie04d9314f66bcda8e1c7939248af79a15fbdaaeb
2014-03-02Don't use tricks to get normal C++ featuresMatteo Casalin
* Use "mutable" to allow modification of a flag, maintaining logical constness * No need to explicitly cast this to the base type inside a base class method Change-Id: I50c015ba977d93e82331c97259d9f9fb774bb198
2014-03-02sal_Bool to boolMatteo Casalin
Change-Id: If63bfcfe4e16dd9232f3ef6fa29fadd0a6d01653
2014-03-02pProgress is always NULLMatteo Casalin
Change-Id: I278103075582a0f0a5cde7b749db408c5912f82e
2014-03-02bStopPrt is always falseMatteo Casalin
Change-Id: I14559b1360ae9f845e0054c5125f1280d9786dff
2014-03-02sal_Bool to boolMatteo Casalin
Change-Id: Iad75baebdf868cdd2ad13d23299385564277010e
2014-03-02sal_Bool to boolMatteo Casalin
Change-Id: Ib1db475feea0f8fdbb724273cc368f41d39e50c8
2014-03-01Merge HTML detection to text detection serviceMaxim Monastirsky
Setting the filter name explicitly is not really required, because TypeDetection::impl_checkResultsAndAddBestFilter is able to select the correct filter anyway. But it seems that other detection services also do it, so I followed that way. Change-Id: I6e73fa79c6867d82f98d63e8d2b7865446f088ef Reviewed-on: https://gerrit.libreoffice.org/8213 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us>
2014-02-28sw: hey, don't forget about big-endian parts in wrtasc.cxx!Douglas Mencken
Change-Id: I8e71c35dfb4f8ce475357412cc9121c50830069e Reviewed-on: https://gerrit.libreoffice.org/8401 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-28Avoid a resource leakTakeshi Abe
It seems an aged mistake to pass pUnoCrsr to a std::auto_ptr too early Change-Id: I99ab2d8c8719fb9f0fc3e90f36534007b4cde990 Reviewed-on: https://gerrit.libreoffice.org/8393 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2014-02-28ooxml: rountrip test for w:compatSettings and mc:IgnorableTomaž Vajngerl
Change-Id: I69a602f3a5eb83f116113b1dbe8bb9f208bd5e5d
2014-02-28ooxml export: write w:compatSettings if present in GrabBagTomaž Vajngerl
Change-Id: Ie5f3ba8f12ca8d5b9729c5bfa13da3b34dbfda2d
2014-02-28ooxml export: write mc:Ignorable for w14 and wp14 namespaceTomaž Vajngerl
Change-Id: Ifc461da32fa732bafd3bab4d5bcb0760992c2679
2014-02-28ooxml export: rename member settings to m_aSettingsTomaž Vajngerl
Change-Id: Ic286df1c6d8bd611c7771482f91e5e375af3745c
2014-02-28Resolves: fdo#73851 promote labels to headingsCaolán McNamara
Change-Id: Ia12b32abfad987bfaecc54005a73ccbeb158f61b