Commit Graph

361 Commits

Author SHA1 Message Date
Caolán McNamara
c1198cf209 remove yet another StringHash impl
Change-Id: I1f7894a4a08b193b48dceb40bf0a451d4a3b3d6d
2013-10-02 16:03:54 +01: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
Matteo Casalin
9811d92776 Formel to Formula
Change-Id: I757bcfb1f425190a9fb62d1e0428f724230fe194
2013-09-29 10:46:59 +02:00
Matteo Casalin
d614742057 Prefer return value to reference argument
Change-Id: I1ba2f9abfad6c8a8e48f62e6cf69c7c36b6e1ace
2013-09-29 10:46:58 +02:00
Matteo Casalin
27a236601b String to OUString and minor scope reduction
Change-Id: Ic12bb1b51a9b256614876fdfde0056558fa663e9
2013-09-29 10:46:57 +02:00
Noel Grandin
39ba0533e1 convert sw/inc/IDocumentContentOperations.hxx from String to OUString
Change-Id: I0ee1415b0ae8a0707faafd05f3b2f95200062614
2013-09-19 10:14:17 +02:00
Noel Grandin
3352648178 convert sw/inc/IDocumentRedlineAccess.hxx from String to OUString
Change-Id: If3f918bba1571b99588d62148f7ac446d72de6c9
2013-09-19 10:14:15 +02:00
Matteo Casalin
d4c97a522e String to OUString
Change-Id: I4e35c8876d9bfbddb9da6c96cd605905343df1e7
Reviewed-on: https://gerrit.libreoffice.org/5626
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
2013-08-25 15:22:52 +00:00
Matteo Casalin
f83a1f8e1c String to OUString
Change-Id: I364c5eabf45a3a5011c0b1709da68cbeb38a6997
Reviewed-on: https://gerrit.libreoffice.org/5610
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
2013-08-25 13:28:45 +00:00
Matteo Casalin
4a386c42f0 String to OUString
Change-Id: I7aa1eda2689081aea624f1de64380322ed2fd0fa
Reviewed-on: https://gerrit.libreoffice.org/5620
Reviewed-by: Matteo Casalin <matteo.casalin@yahoo.com>
Tested-by: Matteo Casalin <matteo.casalin@yahoo.com>
2013-08-25 11:49:22 +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
Matteo Casalin
04314cc124 String to OUString
Change-Id: Ib8309e687c375a05739e8b6f4db95d004a3b97cb
Reviewed-on: https://gerrit.libreoffice.org/5482
Reviewed-by: Matteo Casalin <matteo.casalin@yahoo.com>
Tested-by: Matteo Casalin <matteo.casalin@yahoo.com>
2013-08-17 21:10:00 +00:00
Matteo Casalin
3b82a237ff String to OUString
Change-Id: I0c4a87e49097c3fa1de46f6aff337c2fbaa63718
Reviewed-on: https://gerrit.libreoffice.org/5443
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
2013-08-17 12:53:04 +00:00
Matteo Casalin
cafcf33915 String to OUString + prefix names of data members
Change-Id: Ic0cd2bdfde8c6ba915e89a346bcccd6fef1ca267
Reviewed-on: https://gerrit.libreoffice.org/5404
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
2013-08-14 21:21:56 +00:00
Michael Stahl
91c8008051 fdo#58040: sw: fine tune async word count
- count characters instead of paragraphs to better account for large or
  small paragraphs
- start out with a relatively small value (5k chars) on the first run to
  quickly show something to the user

Change-Id: Ic4013545692f267aab39e084415d5d794bb5a4ca
2013-08-13 18:46:47 +02:00
Matteo Casalin
f4fd558ac9 String to OUString and some reduction of scope
Change-Id: Ia760c5f3f8c158bea30be3102841a66330e5180a
Reviewed-on: https://gerrit.libreoffice.org/5339
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
2013-08-13 08:05:41 +00:00
Matteo Casalin
86637135b8 String to OUString and some optimizations
Change-Id: I9d93d6aa26b2c9d20f7be8d201051a51e8e4ce7a
2013-08-12 18:31:05 +02:00
Jan Holesovsky
697b1039bc Pass this string by reference, not by value.
[plus kill some unrelated unwanted whitespace]

Change-Id: Id5140c96b0bf10f3e4e5a8a54bca15cb4c452278
2013-07-23 11:30:41 +02:00
Matteo Casalin
026de9b0ae No need to pass this argument by pointer, and clarify some code.
Change-Id: I2df52771fa3c4c9bc1ce94d693f0cec3aa52d493
Reviewed-on: https://gerrit.libreoffice.org/5338
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-08-11 20:08:44 +00:00
Luboš Luňák
8f8b31abd0 compatibility setting for MS Word wrapping text in less space (bnc#822908)
The document itself is stupid and uses a SURROUND_THROUGH object with a number
of empty lines that make it act is if it in fact was SURROUND_NONE, rather
than actually disabling wrapping for the object and be done with it.
But the difference was that Word still managed to fit those empty lines
next to the object into the little space that was there, while LO already
considered the space too small. So keep a compatibility setting for Word
documents in order to avoid problems with such lame documents and hopefully
that's enough.

Change-Id: I7d17b90de381fd86914ce5efd9c5a29fe4850edc
2013-08-06 17:17:53 +02:00
Matteo Casalin
31ab7f0c7d String to OUString
Change-Id: I8d4f62b473ad43807621a9dbb826ed33857b737e
Reviewed-on: https://gerrit.libreoffice.org/5189
Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
Tested-by: Luboš Luňák <l.lunak@suse.cz>
2013-07-30 14:40:30 +00:00
Miklos Vajna
e2484e3998 fdo#63273 sw: let word count not update stat. fields
Updating fields would generate loads of selection change events and it's
not what we asked for.

Regression from ce14342c42.

Change-Id: If237df1f31436357022ca8d77b924681e403abd8
2013-07-16 18:46:20 +02:00
Michael Stahl
f8dfa3a81a sw: remove SwDoc::ShareLayout
It is a crude hack that is no longer necessary because the underlying
problems that caused crashes when deleting the layout have been fixed.

Change-Id: I601bdb0dc0aff5f4ddb8b8f4ba4c8d1f72c76666
2013-07-03 16:38:35 +02:00
Michael Stahl
e012f326c1 sw: implement proper Undo for SwDoc::UpdateRsid
This is annoying because it's not possible to use StartUndo/EndUndo
because that would break grouping via SwUndoInsert::CanGrouping();
also SwUndoAttr is somehow incapable of removing the inserted hints of a
grouped insert (it seems to leave no-length hints behind); so add an
explicit call to DeleteAttributes which should avoid the no-length
hints.

Change-Id: I1533daed9b2cf59886f380141b4eace4b22c15e0
2013-06-20 00:34:38 +02:00
Armin Le Grand
c0eb5e7772 Resolves: #i121448# Aligned default fill color/line style for all apps
(cherry picked from commit 81664c037c8d6094b66c1660b6eee9693eadf401)

Conflicts:
	sc/inc/document.hxx
	sc/source/core/data/documen2.cxx
	sc/source/core/data/documen3.cxx
	sc/source/core/data/documen9.cxx
	svx/inc/svx/svdmodel.hxx
	svx/source/svdraw/svdmodel.cxx
	sw/inc/doc.hxx
	sw/source/core/doc/docdraw.cxx
	sw/source/core/doc/docnew.cxx
	sw/source/ui/app/docshini.cxx

Change-Id: Id0f62f0cd5b83794e2dbaee4e8b6afa704a0c23a
2013-06-06 21:04:07 +01:00
Jian Fang Zhang
6e426582ec Resolves: #i113606# in SwDoc dtor release the cyclic reference...
between XFormModel and bindings/submissions

Patch by: zhangjf
Review by: zhangjf

(cherry picked from commit adc0946638e8817d5e57b0003b414249ac481df0)

Conflicts:
	sw/inc/doc.hxx
	sw/source/core/doc/docnew.cxx
	sw/source/core/doc/docxforms.cxx

Change-Id: I3124daea8925b1efd8e151f3064582786d461718
2013-06-05 11:35:52 +01:00
Armin Le Grand
72e54b6960 Resolves: #i120106# implement a SwPosFlyFrms which avoids memory leaks
Use boost::shared_ptr and stl tools to implement a SwPosFlyFrms which can be
used and handed over by value and cleans up it's content to avoid memory leaks.

Found by: Chao Huang
Patch by: Chao Huang, alg
Review by: Chao Huang, alg

(cherry picked from commit c26f80aa1ba65b63e313dce9c6d7e40ab8efede6)

Conflicts:
	sw/inc/doc.hxx
	sw/inc/flypos.hxx
	sw/source/core/doc/doclay.cxx
	sw/source/core/layout/flypos.cxx
	sw/source/core/unocore/unoobj2.cxx
	sw/source/filter/html/htmlfly.cxx
	sw/source/filter/ww8/writerhelper.cxx

Change-Id: If610457654b1056d799d4336cd249815f7878a96

Fix build breaker from i120106

Patch by: Chao Huang
Suggested by: alg

(cherry picked from commit 880aadbeba4e31049d5b7f0a34323553fb6249fb)

Conflicts:
	sw/source/filter/ww8/writerhelper.cxx

Change-Id: I516fcb6ee69944c54cc9eb76c069eb8b28749050
2013-05-13 20:38:19 +01:00
Tor Lillqvist
c72bb2da7b Bin CLOOK comments and un-split one large switch statement
CLOOK = "Compiler Limit: Out Of Keys", an error reported by Microsoft's
compiler a long time ago. No such problem in those versions we support. No
need to mention CLOOK in comments any more.

While at it, re-combine one large switch statement that was split to avoid
CLOOK.

Change-Id: Id93d973a5fb3c81b6c754eef0ba3b0bd55a649d2
Reviewed-on: https://gerrit.libreoffice.org/3640
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-04-28 14:28:29 +00:00
Maxime de Roucy
f215e634de comments and code reformat
Change-Id: Ib4e45cb85c9e5e5ffa6476c939300c6795412b1a
Reviewed-on: https://gerrit.libreoffice.org/3582
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-04-25 08:55:10 +00: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
Oliver-Rainer Wittmann
f0d001a378 Resolves: #i119292# remove misusage of <SwDoc::Set|IsLoaded()>
...for the adjustments of certain AT_PAGE anchored objects

Addresses the underlying problem of fdo#37024 fixed by
9d32497c01

(cherry picked from commit b41eec25c2c6bc44eef55ae1c4ef57b9012fc8e6)

Conflicts:
	sw/inc/doc.hxx
	sw/source/core/doc/doclay.cxx
	sw/source/core/doc/docnew.cxx
	sw/source/core/layout/frmtool.cxx

Change-Id: I786eabdf84677e14c6f4b67d79e1e210e0532a21
2013-04-02 10:39:13 +01:00
Jian Hong Cheng
1c22545edf Fix issue #i119405: Numbering text style changed after importing the *.doc
* main/sw/inc/doc.hxx
* main/sw/inc/IDocumentContentOperations.hxx
* main/sw/inc/ndtxt.hxx
* main/sw/source/core/doc/docfmt.cxx
* main/sw/source/core/txtnode/thints.cxx
* main/sw/source/filter/inc/fltshell.hxx
* main/sw/source/filter/ww1/fltshell.cxx
* main/sw/source/filter/ww8/ww8par.cxx
* main/sw/source/filter/ww8/ww8par.hxx
* main/sw/source/filter/ww8/ww8par3.cxx
MS Word Binary compatibility

Patch by: Fan Zheng,<zheng.easyfan@gmail.com>
Found by: Jian Hong Cheng,<chengjh@apache.org>
Review by: Jian Hong Cheng,<chengjh@apache.org>
Conflicts:
	sw/source/filter/inc/fltshell.hxx
	sw/source/filter/ww1/fltshell.cxx
	sw/source/filter/ww8/ww8par.cxx
	sw/source/filter/ww8/ww8par.hxx

(cherry picked from commit ee3b12ab1d62faedcd2d62fcb8011b7454ea0474)

Change-Id: I2f72969a54db53e6a51edcf3a3216647cec9424c
2013-03-14 10:08:38 +01:00
Miklos Vajna
2c9f9832fc SwDoc: rename member variables missing their prefix
Change-Id: Id4683649aa9115f9075717768aa6cef4110c2ad2
2013-02-18 07:59:13 +01:00
Michael Meeks
c138a8aec8 asynchronous word-count. 2013-02-13 12:13:56 +00:00
Miklos Vajna
bdfc6363d6 n#793998 sw: add TabOverMargin compat mode
In case the right margin is larger then the tab position (e.g. the right
margin of 7cm, there is a tab position at 16cm and right margin begins
at 9cm), we have a conflicting case.  In Word, the tab has priority, so
in this conflicting case, the text can be outside the specified margin.
In Writer, the right margin has priority. Add a compat flag to let
the tab have priority in Writer as well for Word formats.

This is similar to TabOverflow, but that was only applied to left tabs
and only in case there were no characters after the tabs in the
paragraph.
2013-01-08 14:17:27 +01:00
pkoroau pkoroau
7a5272dc29 fdo#38837: Timers must end eventually [Writer idle timer]
Change-Id: I36c6c56d7277b9b3853b846c86c1f4dd47ebdb08
Signed-off-by: Luboš Luňák <l.lunak@suse.cz>
2012-12-20 12:18:57 +01: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
Michael Stahl
9c5d6ea5ef sw: remove WorkaroundForB6375613
... which is incidentally the last user of XDocumentInfo.

Change-Id: I47dc31c8739aa1d50c2a3b26ac51a239417fa5b0
2012-11-22 12:10:31 +01:00
Takeshi Abe
677a3f75e7 sal_Bool to bool
Change-Id: Icc13eb7a8c6720ac53163e3ee7842a22c2862ab3
2012-11-20 10:06:46 +09:00
Takeshi Abe
5bac137d48 sal_Bool to bool
Change-Id: I95a8effcc90a9651e30dc43f8db6edeaa7ace5ef
2012-11-15 00:01:58 +09:00
Takeshi Abe
88e457dc60 sal_Bool to bool
Change-Id: Idfbc33106b20b06c5247c50d099972305f016a51
2012-11-08 13:11:58 +09:00
Takeshi Abe
91b2da3bc4 sal_Bool to bool
Change-Id: I3e8b7db8422680b865c10c7ead4ad782e2d5c5e1
2012-11-06 16:21:15 +09: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
a94b902736 sal_Bool to bool
Change-Id: Ia71a4dc13e09a5fc42c282efc2b0d46b2ff007ab
2012-10-28 23:47:55 +09:00
Takeshi Abe
9e44e1a819 sal_Bool to bool
Change-Id: I8b76ba6d6a27cebefca3307a648bd5baafd27262
2012-10-25 17:01:50 +09:00
Takeshi Abe
cc64715977 sal_Bool to bool
Change-Id: I47f376f431276396a9f3168a5e39e2c9e9e55cbe
2012-10-24 09:46:07 +09:00