Commit Graph

187 Commits

Author SHA1 Message Date
Adam Co
4a68f12691 Renamed 'SwRedline' to 'SwRangeRedline'
This is in preparation to adding more types of 'SwRedlines'.

Change-Id: Id61217ed3c4622f7689427ea9f30e364f6bb65d1
Reviewed-on: https://gerrit.libreoffice.org/7410
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-01-13 16:40:46 +00:00
László Németh
d665e05824 fdo#71645 remove footnote numbers in cross-references
Change-Id: Ic3780e4389e450d8c7a69d2f0f2a6a7f81b8906e
2013-11-20 07:57:57 +01:00
Oliver-Rainer Wittmann
c2b5521921 Resolves: #i33737# enable in-place editing of Input Fields
(cherry picked from commit c2afeb1c3f11e8f420b59f3786eb8626c99ff595)

Conflicts:
	sw/inc/IDocumentContentOperations.hxx
	sw/inc/crsrsh.hxx
	sw/inc/doc.hxx
	sw/inc/editsh.hxx
	sw/inc/expfld.hxx
	sw/inc/fldbas.hxx
	sw/inc/fmtfld.hxx
	sw/inc/hintids.hxx
	sw/inc/ndtxt.hxx
	sw/inc/txatbase.hxx
	sw/inc/txtfld.hxx
	sw/inc/txtrfmrk.hxx
	sw/inc/txttxmrk.hxx
	sw/inc/viscrs.hxx
	sw/source/core/bastyp/init.cxx
	sw/source/core/crsr/crsrsh.cxx
	sw/source/core/crsr/crstrvl.cxx
	sw/source/core/crsr/findattr.cxx
	sw/source/core/crsr/findtxt.cxx
	sw/source/core/crsr/swcrsr.cxx
	sw/source/core/crsr/viscrs.cxx
	sw/source/core/doc/dbgoutsw.cxx
	sw/source/core/doc/doc.cxx
	sw/source/core/doc/docfld.cxx
	sw/source/core/doc/docfmt.cxx
	sw/source/core/doc/docnum.cxx
	sw/source/core/doc/docredln.cxx
	sw/source/core/doc/docruby.cxx
	sw/source/core/doc/doctxm.cxx
	sw/source/core/doc/visiturl.cxx
	sw/source/core/docnode/nodes.cxx
	sw/source/core/edit/edatmisc.cxx
	sw/source/core/edit/edattr.cxx
	sw/source/core/edit/edfld.cxx
	sw/source/core/edit/edfldexp.cxx
	sw/source/core/edit/editsh.cxx
	sw/source/core/edit/edlingu.cxx
	sw/source/core/edit/ednumber.cxx
	sw/source/core/fields/expfld.cxx
	sw/source/core/fields/fldbas.cxx
	sw/source/core/fields/reffld.cxx
	sw/source/core/frmedt/fefly1.cxx
	sw/source/core/inc/docfld.hxx
	sw/source/core/inc/rolbck.hxx
	sw/source/core/inc/swfont.hxx
	sw/source/core/layout/flycnt.cxx
	sw/source/core/layout/laycache.cxx
	sw/source/core/layout/trvlfrm.cxx
	sw/source/core/text/atrhndl.hxx
	sw/source/core/text/atrstck.cxx
	sw/source/core/text/inftxt.cxx
	sw/source/core/text/porfld.cxx
	sw/source/core/text/porfld.hxx
	sw/source/core/text/txtfld.cxx
	sw/source/core/tox/tox.cxx
	sw/source/core/tox/txmsrt.cxx
	sw/source/core/txtnode/atrfld.cxx
	sw/source/core/txtnode/ndhints.cxx
	sw/source/core/txtnode/ndtxt.cxx
	sw/source/core/txtnode/thints.cxx
	sw/source/core/txtnode/txatbase.cxx
	sw/source/core/txtnode/txatritr.cxx
	sw/source/core/txtnode/txtedt.cxx
	sw/source/core/undo/SwUndoField.cxx
	sw/source/core/undo/rolbck.cxx
	sw/source/core/undo/unsect.cxx
	sw/source/core/undo/untbl.cxx
	sw/source/core/unocore/unocrsrhelper.cxx
	sw/source/core/unocore/unofield.cxx
	sw/source/core/unocore/unoframe.cxx
	sw/source/core/unocore/unorefmk.cxx
	sw/source/core/view/vprint.cxx
	sw/source/filter/ascii/ascatr.cxx
	sw/source/filter/html/htmlatr.cxx
	sw/source/filter/rtf/rtffly.cxx
	sw/source/filter/ww1/fltshell.cxx
	sw/source/filter/ww1/w1filter.cxx
	sw/source/filter/ww8/wrtw8esh.cxx
	sw/source/filter/ww8/wrtw8nds.cxx
	sw/source/filter/ww8/ww8atr.cxx
	sw/source/filter/ww8/ww8par.cxx
	sw/source/filter/ww8/ww8par3.cxx
	sw/source/filter/ww8/ww8par5.cxx
	sw/source/ui/app/applab.cxx
	sw/source/ui/docvw/edtwin.cxx
	sw/source/ui/docvw/edtwin2.cxx
	sw/source/ui/envelp/envfmt.cxx
	sw/source/ui/fldui/fldedt.cxx
	sw/source/ui/fldui/fldmgr.cxx
	sw/source/ui/inc/wrtsh.hxx
	sw/source/ui/lingu/hhcwrp.cxx
	sw/source/ui/shells/basesh.cxx
	sw/source/ui/shells/drwtxtex.cxx
	sw/source/ui/shells/grfsh.cxx
	sw/source/ui/shells/tabsh.cxx
	sw/source/ui/shells/textfld.cxx
	sw/source/ui/shells/textidx.cxx
	sw/source/ui/shells/textsh.cxx
	sw/source/ui/shells/textsh1.cxx
	sw/source/ui/shells/txtattr.cxx
	sw/source/ui/uiview/formatclipboard.cxx
	sw/source/ui/uiview/view.cxx
	sw/source/ui/uiview/view2.cxx
	sw/source/ui/uiview/viewsrch.cxx
	sw/source/ui/uiview/viewstat.cxx
	sw/source/ui/uiview/viewtab.cxx
	sw/source/ui/wrtsh/wrtsh1.cxx
	sw/source/ui/wrtsh/wrtsh2.cxx

Change-Id: I6758d6719e1fd523797cc6ee2648ffcb47d52595
2013-11-19 15:51:27 +00:00
Caolán McNamara
8820448bfe longparas: change GetExpandTxt to sal_Int32
Change-Id: I34b6f91d104e5f095f0aad58869d62d0a367d2b3
2013-11-14 11:05:38 +00:00
Matteo Casalin
ebeff3f074 xub_StrLen to sal_Int32 in SwIndex and some related
Change-Id: I66735635a88844c30a7fa1c886d2c1df34008f4f
2013-11-14 09:23:19 +01:00
Miklos Vajna
ffbad09336 SwDoc::DelNumRule: fix out-of-bounds index access
When nPos == USHRT_MAX, even if later we checked for that case, just for
the sake of an assert(), we already called operator[] with nPos.

(To reproduce: right click on List 1 -> New -> Cancel, results in a
crash.)

Change-Id: I465b5519000b79bd8b2eaa3b3c1ceb80a182a25a
2013-11-08 16:08:15 +01:00
Tor Lillqvist
a7724966ab Bin comments that claim to say why some header is included
They are practically always useless, often misleading or obsolete.

Change-Id: I2d32182a31349c9fb3b982498fd22d93e84c0c0c
2013-10-22 16:56:28 +03:00
Noel Grandin
8051bb7e18 converting remaining usage of String in SW to OUString
Change-Id: Iaaa3812412dc880eb9d08144219ebe428007884e
2013-10-18 09:59:25 +02:00
Noel Grandin
d6e321f826 convert sw/source/core/doc/*.cxx from String to OUString
Change-Id: I08caf2c9b7b2368f715fd582c93d40d69de2c875
2013-10-18 09:59:22 +02:00
Caolán McNamara
d1563b818d Related: fdo#38838 make String::CompareTo private
Change-Id: Ibb17bb9e5df9fa9cf9abc4c05dc6ae8fa15b4058
2013-10-17 16:52:11 +01:00
Noel Grandin
86989abe6e convert sw/inc/doc.hxx from String to OUString
Change-Id: I8ddf0f59de506df4e3fea77824b5bb5679bcf7b1
2013-10-15 12:25:42 +02:00
Noel Grandin
324642325c convert sw/inc/IDocumentListItems.hxx from String to OUString
Change-Id: Ie3b1e8a5d1796ef36919293f293fbc10b7cf6870
2013-10-15 12:25:41 +02:00
Noel Grandin
d036580f8a convert sw/inc/IDocumentListsAccess.hxx from String to OUString
and convert these methods parameter passing convention from
"const OUString" to the more normal "const OUString&"

Change-Id: I267b20f4c817f8353c8df9bbc0ca6cad3fcbfcaa
2013-10-15 12:25:41 +02:00
Noel Grandin
f400bc7567 convert sw/inc/IDocumentOutlineNodes.hxx from String to OUString
Change-Id: If21f545b4850755343428a29e3236f891ed9ba12
2013-10-15 12:25:40 +02:00
Noel Grandin
ba53043aa4 convert sw/inc/listfunc.hxx from String to OUString
Change-Id: I50ed5e2943aefff85e0d492df8610c4f1baf5576
2013-10-15 12:25:36 +02:00
Philipp Riemer
1cd2575ac9 remove zhaojianwei code markers
Conflicts:
	sw/source/core/doc/docfmt.cxx

Change-Id: Iddda0d57ae547680634d45aaf8c6deb40855b860
Reviewed-on: https://gerrit.libreoffice.org/6078
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-10-02 15:17:07 +00:00
Caolán McNamara
c1198cf209 remove yet another StringHash impl
Change-Id: I1f7894a4a08b193b48dceb40bf0a451d4a3b3d6d
2013-10-02 16:03:54 +01:00
Tor Lillqvist
b95a901089 Avoid randomness in one more place in the LIBO_ONEWAY_STABLE_ODF_EXPORT case
Change-Id: Ia77979cd998549ae9641c52bd4253f207e479b68
2013-10-02 13:09:48 +03:00
Philipp Riemer
a323a7df85 whitespace work in sw/source/core/doc/
Change-Id: I79561a63db523b8da8de72a1096e908d184a8a0b
Reviewed-on: https://gerrit.libreoffice.org/6076
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2013-10-02 08:17:35 +00:00
Tor Lillqvist
c1015fdd51 Add hack to optionally get stable ODF output from the same input
To be used in regression testing and similar scenarios, where the output ODF
is *not* intended to be further manipulated in LibreOffice. An environment
variable LIBO_ONEWAY_STABLE_ODF_EXPORT is used to toggle this behaviour. I am
not 100% sure whether the generated ODF with the hack toggled on is even fully
correct, but correctness is not the purpose of the hack anyway.

Two classes of issues handled: 1) Automatic style names and 2) use of
randomness.

For class 1), when the hack toggle is in effect, we generate the names at
first as strings based on all the properties of the style, and sort them based
on those, and then rename them (for brevity in the output) to the "normal"
form of a short prefix plus a number (like "P12").

Sure, it would have been better to just figure out *why* the automatic style
naming currently is not stable in the first place, but outputs the styles in
different order (with some styles being assigned different numbers) in
separate invokations of LibreOffice), but I was unable to understand that.

Possibly this code could be used in all cases, except that it does break some
unit test (can't recall which right now). I don't know whether that is simply
because the unit test assumes too much knowledge of the internal workings of
the automatic style name generation, or whether the generated ODF is actually
invalid.

For 2), I found a handful of places where randomness was used to generated
various kinds of identifiers in ODF output. I changed those to just use large
(64-bit) non-overlapping integers instead. I assume there *is* a point in the
original code in each case that explains why randomness is needed, so the hack
definitely needs to be optional and used only for the above mentioned
scenarios.

Change-Id: I17b657197e38bcf24abdfe61ad4a277f4339eeae
2013-09-30 17:40:53 +03:00
Philipp Riemer
2b8dc46ef3 delete code that was commented out
Change-Id: I86f53763305682946098ece4fd6d58bcfdc5a73f
Reviewed-on: https://gerrit.libreoffice.org/6083
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2013-09-30 08:28:07 +00:00
Matteo Casalin
1b0f6be2d0 There are no users of this optional argument
Change-Id: I74b4988a3c93e0964580bdd35210b3495365d5b6
2013-09-29 10:46:59 +02:00
Matteo Casalin
8b7bc95275 String to OUString
Change-Id: I6cff1659b0bacef0bed90fb9767513018a7eeba7
2013-09-29 10:46:59 +02:00
Luboš Luňák
64b993e046 finish deprecation of O(U)String::valueOf()
Compiler plugin to replace with matching number(), boolean() or OUString ctor,
ran it, few manual tweaks, mark as really deprecated.

Change-Id: I4a79bdbcf4c460d21e73b635d2bd3725c22876b2
2013-08-21 15:10:35 +02:00
Matteo Casalin
64b315df9b GetOutlineRuleName: return OUString instead of char*
Change-Id: I79cd722aa2d3bb0292f9b0f7fb6989e2e17d0ff0
Reviewed-on: https://gerrit.libreoffice.org/5563
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
2013-08-21 11:43:35 +00:00
Matteo Casalin
5cd96a57b3 String to OUString
Change-Id: I1117318d9201a8951017ebe835b6c57c6b4ad706
Reviewed-on: https://gerrit.libreoffice.org/5561
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
2013-08-21 10:47:37 +00:00
Matteo Casalin
c35f100bbb String to OUString
Change-Id: I3161b18f73fd3141b9832e0277d3f1071f75ba39
Reviewed-on: https://gerrit.libreoffice.org/5560
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
2013-08-21 10:15:22 +00:00
Philipp Riemer
c99476fcfc deleted needless blank lines in sw/source/core/doc/
Change-Id: I5349ab03f7d2a4e66bf8ac5ef67382f47eb5b5d5
2013-08-09 22:44:41 +02:00
Michael Stahl
92a2862e5c convert some SwTxtNode methods to OUString
Change-Id: Id60ffcc392d0ee71d3ddcb8de21bdaca4d0b54cd
2013-08-08 23:25:25 +02:00
Matteo Casalin
43941d9a53 sal_Bool to bool and some cleanup
Change-Id: I4b20be1a3558e6b48a224e37e7f50944bb6bd237
2013-06-08 21:59:18 +02:00
Marcos Paulo de Souza
0f200cc30e fdo#63154: Change Min/Max/Abs for std::min/max/abs
Now all these usages were removed from LO.

Change-Id: I8a7233db20abdcdbb18428ad4004c78cc516a0e6
Reviewed-on: https://gerrit.libreoffice.org/3326
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-04-20 11:09:54 +00:00
Philipp Riemer
af5526cf86 more work on comments in sw/source/core/doc
Change-Id: I4fbf683da081ad04dfd1b9ea830aa94c38f33d43
Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
2013-04-08 10:42:33 +02:00
Luboš Luňák
1946794ae0 mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).

Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
2013-04-07 14:23:11 +02:00
elixir
7d1f4cdec3 fdo#38838: Converting String/UniString to OUString
Change-Id: If64db96005fcd8a42e4fa24041867b99183965f9
Reviewed-on: https://gerrit.libreoffice.org/2586
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-03-11 15:50:44 +00:00
Jean-Noël Rouvignac
08603e66f9 fdo#38838 search replace for String::CreateFromInt32().
I ran the following code replace:
    s/(Uni|Xub)?String\s*::\s*CreateFromInt32/OUString::number/

Change-Id: Ic500593e3a0b593522c9469b18da0145285007da
Reviewed-on: https://gerrit.libreoffice.org/2280
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
2013-02-22 17:32:12 +00:00
Caolán McNamara
753628eec2 fix sw build
Change-Id: I2d42420307f359b30cce5422629689bdc964ebd9
2013-02-22 11:57:04 +00:00
Miklos Vajna
2c9f9832fc SwDoc: rename member variables missing their prefix
Change-Id: Id4683649aa9115f9075717768aa6cef4110c2ad2
2013-02-18 07:59:13 +01:00
Kohei Yoshida
1aaf9a9b36 Renamed hard-to-remember 8-char headers in editeng.
Change-Id: If255802082890e1b1b4c5197a791fa79a011773e
2013-02-12 15:15:06 -05:00
Maxime de Roucy
7841fd1536 use static/reinterpret_cast and minor rewrite
Change-Id: I9d2f21394c03e29d573dc197da90a91c96d55409
Reviewed-on: https://gerrit.libreoffice.org/2047
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
2013-02-11 02:46:04 +00:00
Michael Meeks
caaeb0a046 re-base on ALv2 code. Includes:
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-30 10:10:38 +00:00
Luboš Luňák
c1200f5eee unused variables
Change-Id: I216b6ddff479ecf45a9950c05d4d65d55afbc7a1
2012-11-21 16:05:31 +01:00
Takeshi Abe
2a9fd5d683 sal_Bool to bool
Change-Id: I35412e2d2e36e3eabdff2a6692bf6edc68a2d724
2012-11-03 12:20:23 +09:00
Takeshi Abe
3034266024 sal_Bool to bool
Change-Id: I10f8d534d664c5f27a32214c00aeee890d993d18
2012-11-01 09:48:51 +09:00
Takeshi Abe
136ae4bc2f sal_Bool to bool
Change-Id: I87d6e518aebcd0074f673b84b66df27ae9a0a15a
2012-10-30 11:50:20 +09:00
Takeshi Abe
cc64715977 sal_Bool to bool
Change-Id: I47f376f431276396a9f3168a5e39e2c9e9e55cbe
2012-10-24 09:46:07 +09:00
Luboš Luňák
f2655f92c1 postfix operator++ -> prefix operator++
Change-Id: I51506a83009db838d8e12d5559c46b404e59f9b5
2012-10-15 23:33:09 +02:00
Michael Stahl
b61991ba2c sw: tweak comment translations
0413cc28 5513e24e d93196c8
2012-10-13 22:27:57 +02:00
Luboš Luňák
21d10c6f32 mark lcl_ functions static or rename them if they are not local at all
http://lists.freedesktop.org/archives/libreoffice/2012-October/039639.html

Change-Id: I21e12d6a4dfb9697d2346a4e564e96af0ad03f96
2012-10-12 16:56:54 +02:00
Stephan Bergmann
84db94e97b -Werror,-Wunused-private-field (various sw)
Change-Id: Ib2becb2af810da0fa3d24bd0aa21887d41e2f34c
2012-09-11 17:11:12 +02:00
Michael Stahl
f6f265313f some tweaks in RTF filter 2012-07-27 17:50:22 +02:00