Commit Graph

344887 Commits

Author SHA1 Message Date
Caolán McNamara
b2fed833b2 Updated core
Project: help  b25ad898a35fc268897622a3068179da5f8d819b
2014-02-11 14:32:47 +00:00
Adam Co
07c84c123a Add XML dumping of the new 'SwExtraRedlineTbl'
Change-Id: Ifeba2d07391258ebf55ff3aa9f604e679cc5d7c9
Reviewed-on: https://gerrit.libreoffice.org/7824
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-02-11 14:29:27 +00:00
Adam Co
d688069023 Add support for 'Table Row Redlines' in SW core
This patch adds support for 'Table Row Redlines' (such as 'table row inserted'
or 'table row deleted' in SW core).
This is done by adding a new object called 'SwExtraRedlineTbl' that holds all
the redlines that are not of type 'SwRangedRedline'.
Also this patch adds a function for adding these types of redlines to the
'SwExtraRedlineTbl' object.
It also further develops the 'SwTableRowRedline' object.

Change-Id: Ic285f33e4f5af8f197d8fc24c2a8a3777755afad
Reviewed-on: https://gerrit.libreoffice.org/7821
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-02-11 14:18:34 +00:00
Adam Co
6cab3069ca Nit-pick: Added a 'default' clause for a switch-case
Change-Id: I241d7cc1cc530b8d3fae7fd7bd185285e16e3b5b
Reviewed-on: https://gerrit.libreoffice.org/7819
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-02-11 14:04:52 +00:00
Stephan Bergmann
f12b902d97 Fix the -Werror=strict-overflow correctly
...from 2bf2dee04c "Werror=strict-overflow."  The
warning (generated e.g. by --disable-debug --disable-dbgutil builds with
GCC 4.8.2) orginates from the call to

  InvalidateRange( SwCharRange( GetOfst(), COMPLETE_STRING ) );

in SwTxtFrm::Prepare further down in txtfrm.cxx, which inlines the IsIdxInside
code to

  if( GetOfst() > GetOfst() + COMPLETE_STRING )

where COMPLETE_STRING is SAL_MAX_INT32.  The problem is that before
ba27366f3d "Resolves: #i17171# Writer paragraph
cannot be longer than 65534 characters" that code would inline to

  if( GetOfst() > GetOfst() + STRING_LEN )

where STRING_LEN was 0xFFFF, so the calculation on effectively 16-bit quantities
stayed nicely in the bounds of (32-bit) int.

Change-Id: I958514e52e9102236844eefa4fe92a401be6ab01
2014-02-11 14:53:44 +01:00
Adam Co
af84f04c10 Refactor some code for handling redline in DOCX importer
Change-Id: Id5d0814c1ebbcd85507d11cf562d394a748773a6
Reviewed-on: https://gerrit.libreoffice.org/7807
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-02-11 13:51:46 +00:00
Adam Co
88fbcba044 Add 'Track Changes Handler' for 'Extra' redlines
This handler will process 'track changes' information for 'extra' redline
objects (such as 'table row insert\delete' redlines)

Reviewed on:
	https://gerrit.libreoffice.org/7802

Change-Id: I8dd0bd70dbdcb3cb7eae76595957817de08c66fc
2014-02-11 14:41:56 +01:00
Adam Co
94429caa64 Refactor the code for converting 'Date' string to 'DateTime'
Change-Id: I20632258709856cd4c6680e1c8a1d92271ad0453
Reviewed-on: https://gerrit.libreoffice.org/7817
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-02-11 13:32:34 +00:00
Adam Co
25e6760c34 Add some property IDs in the DOCX importer (for future table redline patch)
Change-Id: Id9d7e6903d6cd36f04c96fb509da1508d493cef8
Reviewed-on: https://gerrit.libreoffice.org/7818
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-02-11 13:27:11 +00:00
Stephan Bergmann
fef4a0f3d4 loplugin:implicitboolconversion
Change-Id: I1b8cf992b574fe6155701711a619bad5bfc34265
2014-02-11 14:26:30 +01:00
Stephan Bergmann
6c697a99c9 Related fdo#74597: Java on Mac doesn't use javaldx/library path fiddling
...so no need to return non-empty SunInfo::getLibraryPaths (for the Oracle JRE,
cf. how this had always returned an empty set for the Apple JRE in
otherjre.cxx).

This fixes the bug that selecting the Oracle JRE in the Advanced options pane
didn't stick, because jfw_areEqualJavaInfo was called on a JavaInfo read back
from XML where nRequirements had been cleared (in CNodeJavaInfo::loadFromNode)
and a JavaInfo where non-empty SunInfo::getLibraryPaths ->
VendorBase::needsRestart() == true -> nRequirements == JFW_REQUIRE_NEEDRESTART,
so always returned false.

(There's multiple errors here.  It is questionable whether jfw_areEqualJavaInfo
should take nRequirements into account, at least when used from
SvxJavaOptionsPage.  And VendorBase::getLibraryPaths appears to be only used to
compute VendorBase::needsRestart, ignoring the actual path data.  But leave that
for future clean-up.)

Change-Id: I5f004434b1cb7e909a153c43c474a2317f24b0c1
2014-02-11 14:21:07 +01:00
Matúš Kukan
b1add8f4ac native code generator: components tweaking
We should survive without deployment_component_getFactory,
although Android build may need some changes.

ContextChangeEventMultiplexer seems to be useful.

Change-Id: I20544429425675449ad0471190968c5bfb97bbf9
2014-02-11 14:20:31 +01:00
Jan-Marek Glogowski
8d11531565 Copy mail merge source instead of loading
Currently a mail merge loads the styles from the source document
and also loads the original source per mail merge dataset.

The new code is based on the MergeDocuments function and swaps the
loading with an internal document copy to improve mail merge
throughtput.

For a mail merge with 99 datasets and a two pages document,
callgrind shows an improvement from routhly 44 to 31 billion
inclusive instructions for the single SwXMailMerge::execute call.

Change-Id: I6929ba371f81c3ea1f26ea3a25e7751bc53256e3
Reviewed-on: https://gerrit.libreoffice.org/7433
Tested-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
2014-02-11 13:18:09 +00:00
Adam Co
e1f90846af Add tokens for 'table row' redlines (future patch)
This patch adds 2 tokens for future patche's use of table row
redline preservation.

Change-Id: I20e6d1dd84a07f515076aaa3cd5b32c492ec476d
Reviewed-on: https://gerrit.libreoffice.org/7801
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-02-11 13:17:41 +00:00
Stephan Bergmann
af619501b7 -Werror,-Wunused-function
Change-Id: I0b3399478c00e7e6db8973e9e4811f3f75c5a3db
2014-02-11 14:03:35 +01:00
Caolán McNamara
55c413b9cb edit->changes->show has empty filter settings
Change-Id: I98999c0f402cf84d89b3a1167480dc27fdbc2be9
2014-02-11 12:11:44 +00:00
Caolán McNamara
281bdaaa0b convert manage languages dialog to .ui
Change-Id: I1a50f8715040e64758cf18bee8ca6ac1d04652c8
2014-02-11 12:11:44 +00:00
Caolán McNamara
91d714c5dd silence unknown packing spew
Change-Id: Ic9fa7761ef03594a9609044a963c838f7dda555b
2014-02-11 12:11:43 +00:00
Caolán McNamara
f8c1bc4ac3 coverity#707925 Uninitialized pointer field
Change-Id: I0e1034a2ef064f9a3a05a0b8837efdff767ea715
2014-02-11 12:11:43 +00:00
Caolán McNamara
110c193988 Related: #i97873# (coverity#705407) Improper use of negative value
a pity the other one wasn't fixed when the first one was fixed
back in 2002 with 0645e6a1a1

Change-Id: Ia7ac0f57a6805dc8ff09668198d0530b1cfc31db
2014-02-11 12:11:43 +00:00
Caolán McNamara
29eac263c5 coverity#705324 Missing break in switch
Change-Id: I72c9a16c5236824424b33df353606e3e14aa4607
2014-02-11 12:11:43 +00:00
Caolán McNamara
14744ab708 coverity#705161 Missing break in switch
Change-Id: If936313919b41183d3fe657f5e21f885a89838b6
2014-02-11 12:11:42 +00:00
Caolán McNamara
4ba25fbab6 coverity#705112 Using invalid iterator
Change-Id: I6d05e418436b9d0b12be977b7842e1230ba3c7b1
2014-02-11 12:11:42 +00:00
Caolán McNamara
7c19ff431b coverity#704934 Dereference after null check
Change-Id: I5242f89448431efb4a3f7ad5c84ab685b2e40f68
2014-02-11 12:11:42 +00:00
Caolán McNamara
685f84dfc2 coverity#704933 Unchecked dynamic_cast
Change-Id: Ia094aca7dbc031eb7b3a205deb953ded2b735e5c
2014-02-11 12:11:42 +00:00
Caolán McNamara
9827d35990 coverity#704932 Dereference after null check
Change-Id: Ibc0dfcf5195d54158bf93bf2b2fb15dd26ea07af
2014-02-11 12:11:41 +00:00
Caolán McNamara
a730261474 coverity#704930 Dereference after null check
Change-Id: I268945b00e0470f5aade3022fd676a2a69d2590d
2014-02-11 12:11:41 +00:00
Caolán McNamara
03bdb83f5c coverity#704929 Unchecked dynamic_cast
Change-Id: Ic302482419f99ffd221e126006891fa9e97996a7
2014-02-11 12:11:41 +00:00
Caolán McNamara
56333571ca coverity#704928 Dereference after null check
Change-Id: I6d2852c3027175aac0ec77b3d8b1a7cea9be2bd1
2014-02-11 12:11:40 +00:00
Caolán McNamara
191fecdb26 coverity#704925 Dereference after null check
Change-Id: Ideb2720058b94bdecbfcbb76421b475b6c6e3304
2014-02-11 12:11:40 +00:00
Caolán McNamara
f4e4fe93ed coverity#704926 Dereference after null check
Change-Id: Idf13ac6fd71d5142b8ad2643d9ec461d40775fda
2014-02-11 12:11:40 +00:00
Caolán McNamara
f179b16337 coverity#704927 Dereference after null check
Change-Id: I774014bfb57d7511a86d398dd1dfcd1d96cbf7e2
2014-02-11 12:11:40 +00:00
Caolán McNamara
6a4ed76e2d coverity#1158076 Unchecked dynamic_cast
Change-Id: Iefe9db0746f0e35e2deb65da5b03c175e55a7783
2014-02-11 12:11:39 +00:00
Caolán McNamara
6a53525c5d mnData2 is never used
Change-Id: I4830f6186c4fb7e13c7d81aa849a1bc4bf055425
2014-02-11 12:11:39 +00:00
Caolán McNamara
6ddc1b038b coverity#708919 Use after free
Change-Id: I992369c97d068452d87a9c618875c7abb6c90a41
2014-02-11 12:11:39 +00:00
Caolán McNamara
d89c4916bd Updated core
Project: help  d331784b77abd32c9a2b9de883bb480519b84dfc
2014-02-11 12:11:15 +00:00
Adam Co
8c2dca9d05 Add derived class 'SwTableRowRedline' stub
Add stub derived class 'SwTableRowRedline' that will hold information
about the table row that got the changes, including the actual change
that was done (inserted\deleted).

Change-Id: I8b6ef9da3f3d9859a1e908dbcc018bc5c54b8329
Reviewed-on: https://gerrit.libreoffice.org/7466
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-02-11 12:02:19 +00:00
Michael Stahl
bfeef3f723 sc: add some missing locks in new code
Change-Id: Ia35693f6c5915e898e5b137920431c7bebfc761c
2014-02-11 12:52:24 +01:00
Michael Stahl
e3e4f19bbc sd: add some missing locks in new code
Change-Id: Id0efc9a0e108886c261e75bc109e090a16fba960
2014-02-11 12:52:23 +01:00
Michael Stahl
368cff78a4 accessibility: add some missing locks in new code
Change-Id: Ic38a07c592a89973ca1df807505f87910e84a17f
2014-02-11 12:52:22 +01:00
Michael Stahl
06d5616f65 svtools: add some missing locks in new code
Change-Id: I6f000fb0f205b437e4ff5238c8ede5735c403077
2014-02-11 12:52:22 +01:00
Michael Stahl
414fa67bf2 sax: my suggestion was not as good as i thought...
... as indicated by the failing unit test.

Change-Id: I1a8a8b933b10673e71261726dc8887dfe1d3e2ee
2014-02-11 12:52:21 +01:00
Adam Co
7949b380e0 New redline object and table for non-ranged redlines called 'SwExtraRedline'
Added a new redline object for non-ranged redlines called 'SwExtraRedline'.
Examples for such redlines are 'table row was inserted \ deleted',
'table properties changed', 'text was moved' etc.
Also - added a table for these redlines called 'SwExtraRedlineTbl'.

Change-Id: I9190093c97108b7e4923bc8a9feb441ad5c5694f
Reviewed-on: https://gerrit.libreoffice.org/7464
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-02-11 11:42:50 +00:00
Noel Grandin
08c40a2474 sal_Bool->bool
Change-Id: I31fb9d5b49260fd1a8fc1312b01fd5632c97ab2e
2014-02-11 12:50:43 +02:00
Arnaud Versini
785c4f10b8 fdo#72468 avoid out of bounds array access
Change-Id: I2bccdf1aaeb290a3cb8f76cd831a419e1776e92f
Reviewed-on: https://gerrit.libreoffice.org/7775
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
2014-02-11 10:38:53 +00:00
Matúš Kukan
c864bd3105 fwk: Constructor feature for one instance ContextChangeEventMultiplexer.
Change-Id: Ibb89e4dd46fc5d1f8a85f96b7e4677fa764bb112
2014-02-11 11:28:55 +01:00
Matúš Kukan
72139db6b4 fwk: Constructor feature for one instance SessionListener.
Converted as usual service implementation.

Change-Id: I37c2f25e8a463abb236753c1299cc0aeb3007cd9
2014-02-11 11:28:55 +01:00
Tor Lillqvist
0d0abfaae9 Bin old leftover debugging fprintf
Change-Id: Ia169881d8b13ce8b7e4d709ef831e638085ef3ab
2014-02-11 12:23:29 +02:00
Armin Le Grand
38ea39b517 Resolves: #i15508# keep the original file and format AFAP...
when breaking links to graphic contents in Writer

(cherry picked from commit a9325263271883fb147351d287c817ea7984fbe9)

Conflicts:
	sw/source/core/graphic/ndgrf.cxx

Change-Id: I86e2b80b95f4e26a734f56d060f97e6430ae56b8
2014-02-11 09:24:11 +00:00
Miklos Vajna
be7d41a2be Revert "fdo#72563 : PAGEREF field tag not preserved during Roundtrip"
This reverts commit 138bd3d656. See
comment 5 in the bugreport, the fix in its current form causes more
trouble than it fixes.

Conflicts:
	sw/qa/extras/ooxmlexport/ooxmlexport.cxx

Change-Id: I64f64f02a2e073b96e165c81bd2f85928e5527bc
2014-02-11 09:51:17 +01:00