Commit Graph

355108 Commits

Author SHA1 Message Date
Caolán McNamara
8a0230e78c coverity#735444 Logically dead code
Change-Id: I32b6475812be6dfd9912f7fc6646b349cdbfbbe1
2014-06-06 21:28:28 +01:00
Caolán McNamara
6d462764cf coverity#735442 Logically dead code
Change-Id: I8e182a18e70f230e67f2f452bbfca442e5585212
2014-06-06 21:28:28 +01:00
Caolán McNamara
9656d6c488 coverity#735441 Logically dead code
Change-Id: I790904fb030d2bfc96cd967b2b4b449e62f8c536
2014-06-06 21:28:28 +01:00
Caolán McNamara
05aa604f02 coverity#735910 Dereference after null check
Change-Id: Ifc85be1fc2c0e6d6764c0f1c4a237623d6d13a7b
2014-06-06 21:28:27 +01:00
Caolán McNamara
cf62446302 coverity#735806 Dereference after null check
Change-Id: Ie7a05e694585bcc624bd69b4400d84a05fbc48fb
2014-06-06 21:28:27 +01:00
Caolán McNamara
105021a1f3 coverity#735798 Dereference after null check
Change-Id: I57accad3d086f0c4ac4592b1f4dbd9852596196b
2014-06-06 21:28:27 +01:00
Jan Holesovsky
f7d51f43de html export: More standard time specification in <meta/>.
Change-Id: I1a62d12531029cc36fb8aeabecb9d92a8af837f7
2014-06-06 21:55:06 +02:00
Thomas Arnhold
c2034f3993 fixincludeguards: fix include guards
Change-Id: Ie6e8d4272b0b1d0d2ce93bcbc2e818a9eac1a56b
Reviewed-on: https://gerrit.libreoffice.org/9629
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
2014-06-06 19:16:40 +00:00
Jacobo Aragunde Pérez
0ed60a9737 fdo#76281: Fix wrong square brackets in exported citations
There was a pair of unbalanced ifs in the code to write the opening
and the closing bracket, they should have the same condition.

Change-Id: I9b3e64486d1b87a8df65d351f01eb4cc9a8b8c44
2014-06-06 20:19:49 +02:00
Jan Holesovsky
b00d84975e sd html: Provide some minimal reasonable defaults.
Change-Id: I72b02f7d87cf6075d318c1cc0d7288e27bbe1b9c
2014-06-06 18:25:27 +02:00
Jan Holesovsky
2f54153491 sd html: Unit test for the metadata export.
Change-Id: I1e38e28b57e816a0829d1a56f2ffcb32d8f93718
2014-06-06 18:25:26 +02:00
Jan Holesovsky
db9f42f0c0 html export: Close the <meta> tags.
Change-Id: Icca58dd1531f2442fe5878ed9524a3611c0601ea
2014-06-06 18:25:26 +02:00
Jan Holesovsky
1380f5d542 sd html: Implement export of metadata in the single document case.
Change-Id: Icf99c9bcea187e2a3127b97050d6ddb072540b0d
2014-06-06 18:25:26 +02:00
Jan Holesovsky
0fe9defae6 sw html: Translate some german comments.
Change-Id: I4b8e83dc53e09ba18b5cd0e907ce2412d7f7dd98
2014-06-06 18:25:26 +02:00
Miklos Vajna
8ab695374e CppunitTest_sw_ooxmlexport: port testFdo58577 to textboxes
Change-Id: Ic309c7f2a3df46a4813646902a595408f4751fcd
2014-06-06 17:58:56 +02:00
Michael Stahl
26f76e8597 revert sw part of "don't swap in all images when loading files"
Half of commit 9b9eb2e4f6 is obsoleted
by orw's fix for i#124999; not sure about the other half.

Change-Id: I337a4bbf79912c02be7c7c56c5705253b3d7b125
2014-06-06 17:51:09 +02:00
Oliver-Rainer Wittmann
b181a3cdf8 i#124999: - call <SwGrfNode::onGraphicChanged()> only when <Graphic>
instance has been set, too

- <SwGrfNode::onGraphicChanged()> - assure that graphic is swapped
  out in case its swap in has been triggered by this method.

(cherry-picked from commit 4dbdc0ce931d7686583a49e68f8df09827357beb)

Change-Id: I3e6aa68d9507095925dec37075abcdf9da58c804
2014-06-06 17:51:08 +02:00
Oliver-Rainer Wittmann
adb1bb21f8 Resolves: #i125000# check last status of newly created...
<Gdiplus::Bitmap> instance before using it.

(cherry picked from commit b127235917610b9c68e19df29bb39af496906569)

Change-Id: I97364cf963424b0e8d0b52b3c995bd4defdca067
2014-06-06 16:40:17 +01:00
Noel Grandin
a10a621b48 simplify SfxListener::EndListening and StartListening
No-one is using the return values, so we can simplify the methods

Change-Id: Icc2dbfb797bcd82afcbf42ed3bdc20b0426ccba1
Reviewed-on: https://gerrit.libreoffice.org/9542
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2014-06-06 15:39:42 +00:00
Miklos Vajna
016e1f8889 CppunitTest_sw_ooxmlexport: port testFdo66688 to textboxes
Change-Id: Iada46e037844b010959b153b5e895fd2be021d68
2014-06-06 17:31:25 +02:00
Kohei Yoshida
c4ac853409 fdo#78860: Swap the logic here: Disable -> Enable.
Because the UNO property logic had been swapped earlier.

Change-Id: I35af3e8cee3c4cbc8da43d7bc478f506048887b0
2014-06-06 11:25:31 -04:00
Miklos Vajna
28e9b5bc01 oox: support non-TextFrame shapes in WpsContext::onCreateContext
Change-Id: I692fa22132cd3a722b58de22e3dbb759ff888e5d
2014-06-06 17:15:17 +02:00
Stephan Bergmann
b6bfcaa054 loplugin:saloverride
Change-Id: I5ee17a1e5ea28e6ecf371bea30b36923586f41cc
2014-06-06 16:58:22 +02:00
Stephan Bergmann
81ec888f25 -Werror,-Wmismatched-tags
Change-Id: Iac83316d69e85f2da3de32d8023c228f678c8f08
2014-06-06 16:56:25 +02:00
Zolnai Tamás
46d682eec9 bnc#880763: PPTX import: wrong z-order becuause of wrong import order
importExtDrawings() must be called as soon as possible,
before parser starts to parse the next shape.
Call it when graphicFrame tag is closed. This tag include
the reference to the SmartArt.

Plus fix up import tests.

Change-Id: I9e8d54c2b1afeb78a1122390dc4982d580c152ae
2014-06-06 16:50:04 +02:00
Stephan Bergmann
37183595bb Fix memory leaks, by refcounting LwpObject
Change-Id: I1539597cd5bcabcbf0295d1acc320c503ad53604
2014-06-06 16:49:44 +02:00
Stephan Bergmann
7abe976be5 Avoid undefined mis-aligned memory access
(assuming this shall always be little endian, given "Intel" in the function names)

Change-Id: Iff7e1305108dd0f8d9fae762c1f715e2e7b481b3
2014-06-06 16:49:44 +02:00
Tor Lillqvist
9b57a0aeb8 PackageMaker does not exist any more
Change-Id: Iefd1980fc87daa709e8e5c833407c2595e71b401
2014-06-06 17:48:00 +03:00
Tobias Lippert
3aca57fb9c TOX: Extract generation of tab stop attributes to its own class.
This allows us to pass through less parameters which are only used for
this functionality.

Conflicts:
	sw/inc/ToxTextGenerator.hxx
	sw/source/core/tox/ToxTextGenerator.cxx

Change-Id: I5a03cf8ec6d86d05f2a7f7771668585669c1e595
Reviewed-on: https://gerrit.libreoffice.org/9613
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-06-06 14:02:16 +00:00
Caolán McNamara
67b4b34cce coverity#1202902 Uncaught CoinError exception
Change-Id: I93488fa942f1975b9c32be6d37fc76ea955a2067
2014-06-06 14:56:28 +01:00
Miklos Vajna
735cd34078 CppunitTest_sw_ooxmlexport: port testTextFrameBorders to textboxes
Change-Id: I4d7a6a13a721282450a1c217defb84f386535a74
2014-06-06 15:40:21 +02:00
Miklos Vajna
020035a0e0 CppunitTest_sw_ooxmlexport: port testTextFrames to textboxes
Change-Id: Id52ab22e2981ebda3960acabe473fadfafc67e72
2014-06-06 15:40:20 +02:00
Stephan Bergmann
fa49b57806 Fix memory leaks, by refcounting XFFont
Change-Id: Iecfddf21f19313f46ee2544fad9c4df1e399e0f5
2014-06-06 15:19:50 +02:00
Caolán McNamara
c50c800f9c coverity#708822 Unused pointer value
Change-Id: I6ccd4c2ab97237806652059d6ae2cd23a6dc1625
2014-06-06 14:11:12 +01:00
Caolán McNamara
4d33acbfbd coverity#708896 Unused pointer value
Change-Id: I8cb1d720a8fb22ba2153c5f556e4bd538f5ea8af
2014-06-06 14:11:12 +01:00
Caolán McNamara
4c4901893f coverity#708898 Unused pointer value
Change-Id: Ida87450bda99260d9e153bb9e48d8867f53d42ca
2014-06-06 14:11:12 +01:00
Caolán McNamara
6407a1bd80 coverity#708901 Unused pointer value
Change-Id: Idb9be9f594b9ab3d1837c003d4a748f9693f5ceb
2014-06-06 14:11:11 +01:00
Miklos Vajna
96965fb39d DOCX drawingML export: don't export textboxes of shapes twice
We already had code, so that in case a shape has a textbox, then we
wrote the textbox contents as the shape text, but textboxes were still
exported independently as well.

Build a list of textboxes at the start of the export, and ignore
anything that's on that list during export. In the future, if both RTF
and DOC will support textboxes, then this can be moved to
MSWordExportBase.

Change-Id: I9370b2bbda515ef605281ad398a358b2f24d8f0e
2014-06-06 14:54:15 +02:00
Stephan Bergmann
3b8ce44eba -Werror,-Wunused-macros
Change-Id: If8685cf1cfcfb25fd611e385d0b32d0b7963cd21
2014-06-06 14:42:45 +02:00
Caolán McNamara
a3c0ba9c32 Updated core
Project: help  a87da6b2546423f1727b2d857dcfe78aa6bf53af
2014-06-06 12:40:38 +00:00
Stephan Bergmann
d4259530a6 loplugin:saloverride
Change-Id: I67ce0ceea8ee022493311d58acd0211897208631
2014-06-06 14:40:23 +02:00
Caolán McNamara
5918209d28 Resolves: fdo#73675 tweak conversion to use SvSimpleTable
Change-Id: Ibfa5c806581c450a0b0407cb07751e06dd3a787e
2014-06-06 13:36:24 +01:00
sk94
c45c6e4116 RID_SCDLG_COND_FORMAT_MANAGER conversion to .ui
Change-Id: If3e0ac5afd73ed31f8c21ab68d0c3c765cb447f4
Reviewed-on: https://gerrit.libreoffice.org/9660
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-06-06 12:36:13 +00:00
Stephan Bergmann
bbb44f9d9b -Werror,-Wmismatched-tags
Change-Id: I2c6dd21595815c4f382bed2bfb66551929630372
2014-06-06 14:35:15 +02:00
Miklos Vajna
049f30c37f DOCX drawingML export: avoid duplicated <wps:spPr> for textboxes
It's valid to have multiple ones from these, but the first one was
generated from the shape, the second from the textbox. Given that we use
the textbox only as a container, don't write its properties, it's not
necessary and may cause problems.

Change-Id: Id1f8bb92c587fe8c1437e412b41510803595dd80
2014-06-06 14:24:27 +02:00
Miklos Vajna
8c677716c4 DOCX drawingML export: if shape has textbox, export its contents as shape text
Change-Id: I54a51189e1c595841b8b02f3b4436da4a29f1dac
2014-06-06 14:24:26 +02:00
Miklos Vajna
ff1c74f53a SwTextBoxHelper::findTextBox: add an UNO version
Export filters don't have access to SwXShape, and it's probably good to
have that way.

Change-Id: I039bafec10d2fde7c7acdcfad5b07068a2a519f1
2014-06-06 14:24:26 +02:00
Tobias Lippert
0a1b1511fa Unittest generation of text for chapter entries in the TOC
Conflicts:
	sw/inc/ToxTextGenerator.hxx
	sw/qa/cppunit/tox/test_ToxTextGenerator.cxx
	sw/source/core/tox/ToxTextGenerator.cxx

Change-Id: I343958f85fb6718215a0caa456a825d72f168a57
Reviewed-on: https://gerrit.libreoffice.org/9612
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-06-06 12:19:12 +00:00
Jacobo Aragunde Pérez
1534c33633 fdo#79558: Do not overwrite w:shd value
When a w:shd has some pattern with two colors, LO blends both to
render the paragraph background. We must compare that blended color
with the paragraph color on export to know if the user has edited it
or not. We were using the w:fill attribute to compare, but that was
incorrect.

Modified an existing unit test to check this behaviour. The unit test
had to be retouched because Word remove some redundant information
from the original .docx file when I saved it again with some
background changes.

Change-Id: Ia2f1ddc4afd2637e1d87b6eccd441c26853045c4
2014-06-06 13:56:55 +02:00
Jacobo Aragunde Pérez
4f1684dc37 fdo#79558: Preserve missing attributes in paragraph w:shd
The missing attributes are w:val, w:color, w:themeColor, w:themeShade,
w:themeTint, w:themeFillShade and w:themeFillTint.

Change-Id: I67dd7c367d820216c1d11f82e3430fbf550cede8
2014-06-06 13:56:55 +02:00